From 4c699e0d0acc0aafab37e36206a92b1919282dac Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Sun, 17 Apr 2011 19:29:28 -0700
Subject: [feature/avatars] Modularized Avatars

A modularized avatar system that easily allows plugins to be created
for various avatar services, such as Gravatar.

This inital commit includes module support and is backwards
compatible with 3.0 avatars, but does notcontain ACP or UCP modules
for manipulating new avatars.

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php         |   2 +-
 phpBB/includes/acp/acp_users.php          |   2 +-
 phpBB/includes/avatars/avatar_base.php    |  75 +++++++++++++++++
 phpBB/includes/functions_display.php      | 128 +++++++++++++++++++++++++-----
 phpBB/includes/mcp/mcp_notes.php          |   2 +-
 phpBB/includes/mcp/mcp_warn.php           |   4 +-
 phpBB/includes/ucp/ucp_groups.php         |   2 +-
 phpBB/includes/ucp/ucp_pm_viewmessage.php |   2 +-
 phpBB/includes/ucp/ucp_profile.php        |   2 +-
 9 files changed, 193 insertions(+), 26 deletions(-)
 create mode 100644 phpBB/includes/avatars/avatar_base.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 607254adb5..9ad157f78a 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -553,7 +553,7 @@ class acp_groups
 				$type_closed	= ($group_type == GROUP_CLOSED) ? ' checked="checked"' : '';
 				$type_hidden	= ($group_type == GROUP_HIDDEN) ? ' checked="checked"' : '';
 
-				$avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />';
+				$avatar_img = (!empty($group_row['group_avatar'])) ? get_group_avatar($group_row) : '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />';
 
 				$display_gallery = (isset($_POST['display_gallery'])) ? true : false;
 
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 97f4b1b5fd..390e421a51 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1715,7 +1715,7 @@ class acp_users
 				}
 
 				// Generate users avatar
-				$avatar_img = ($user_row['user_avatar']) ? get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height'], 'USER_AVATAR', true) : '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />';
+				$avatar_img = ($user_row['user_avatar']) ? get_user_avatar($user_row, 'USER_AVATAR', true) : '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />';
 
 				$display_gallery = (isset($_POST['display_gallery'])) ? true : false;
 				$avatar_select = basename(request_var('avatar_select', ''));
diff --git a/phpBB/includes/avatars/avatar_base.php b/phpBB/includes/avatars/avatar_base.php
new file mode 100644
index 0000000000..c84a6e8a7f
--- /dev/null
+++ b/phpBB/includes/avatars/avatar_base.php
@@ -0,0 +1,75 @@
+<?php
+/**
+*
+* @package avatars
+* @copyright (c) 2005, 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base class for avatar modules
+* @package avatars
+*/
+class phpbb_avatar_base
+{
+	/**
+	* User data this avatar may use to generate a url or html
+	* @type array
+	*/
+	private $user_row;
+	
+	/**
+	* This flag should be set to true if the avatar requires a nonstandard image
+	* tag, and will generate the html itself.
+	* @type boolean
+	*/
+	public $custom_html = false;
+
+	/**
+	* Construct an avatar object
+	*
+	* @param $user_row User data to base the avatar url/html on
+	*/
+	public function __construct(&$user_row)
+	{
+		$this->user_row = $user_row;
+	}
+
+	/**
+	* Get the avatar url and dimensions
+	*
+	* @param $ignore_config Whether $user or global avatar visibility settings
+	*        should be ignored
+	* @return array Avatar data
+	*/
+	public function get_data($ignore_config = false)
+	{
+		return array(
+			'src' => '',
+			'width' => 0,
+			'height' => 0,
+		);
+	}
+
+	/**
+	* Returns custom html for displaying this avatar.
+	* Only called if $custom_html is true.
+	*
+	* @param $ignore_config Whether $user or global avatar visibility settings
+	*        should be ignored
+	* @return string HTML
+	*/
+	public function get_custom_html($ignore_config = false)
+	{
+		return '';
+	}
+}
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 9335cabc15..eba123be9d 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1272,52 +1272,144 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 /**
 * Get user avatar
 *
-* @param string $avatar Users assigned avatar name
-* @param int $avatar_type Type of avatar
-* @param string $avatar_width Width of users avatar
-* @param string $avatar_height Height of users avatar
+* @param array $user_row Row from the users table
 * @param string $alt Optional language string for alt tag within image, can be a language key or text
 * @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
 *
-* @return string Avatar image
+* @return string Avatar html
 */
-function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false)
+function get_user_avatar(&$user_row, $alt = 'USER_AVATAR', $ignore_config = false)
 {
-	global $user, $config, $phpbb_root_path, $phpEx;
+	global $user, $config, $cache, $phpbb_root_path, $phpEx;
 
-	if (empty($avatar) || !$avatar_type || (!$config['allow_avatar'] && !$ignore_config))
+	if (!$config['allow_avatar'] && !$ignore_config)
 	{
 		return '';
 	}
 
-	$avatar_img = '';
-
-	switch ($avatar_type)
+	$avatar_data = array(
+		'src' => $user_row['user_avatar'],
+		'width' => $user_row['user_avatar_width'],
+		'height' => $user_row['user_avatar_height'],
+	);
+	
+	switch ($user_row['user_avatar_type'])
 	{
 		case AVATAR_UPLOAD:
+			// Compatibility with old avatars
 			if (!$config['allow_avatar_upload'] && !$ignore_config)
 			{
-				return '';
+				$avatar_data['src'] = '';
+			}
+			else
+			{
+				$avatar_data['src'] = $phpbb_root_path . "download/file.$phpEx?avatar=" . $avatar_data['src'];
+				$avatar_data['src'] = str_replace(' ', '%20', $avatar_data['src']);
 			}
-			$avatar_img = $phpbb_root_path . "download/file.$phpEx?avatar=";
 		break;
 
 		case AVATAR_GALLERY:
+			// Compatibility with old avatars
 			if (!$config['allow_avatar_local'] && !$ignore_config)
 			{
-				return '';
+				$avatar_data['src'] = '';
+			}
+			else
+			{
+				$avatar_data['src'] = $phpbb_root_path . $config['avatar_gallery_path'] . '/' . $avatar_data['src'];
+				$avatar_data['src'] = str_replace(' ', '%20', $avatar_data['src']);
 			}
-			$avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/';
 		break;
 
 		case AVATAR_REMOTE:
+			// Compatibility with old avatars
 			if (!$config['allow_avatar_remote'] && !$ignore_config)
 			{
-				return '';
+				$avatar_data['src'] = '';
+			}
+			else
+			{
+				$avatar_data['src'] = str_replace(' ', '%20', $avatar_data['src']);
 			}
 		break;
+
+		default:
+			$class = 'phpbb_avatar_' . $user_row['user_avatar_type'];
+			
+			if (!class_exists($class))
+			{
+				$avatar_types = $cache->get('avatar_types');
+			
+				if (empty($avatar_types))
+				{
+					$avatar_types = array();
+				
+					if ($dh = @opendir($phpbb_root_path . 'includes/avatars'))
+					{
+						while ($file = @readdir($dh))
+						{
+							if (preg_match("/avatar_(.*)\.$phpEx/", $file, $match))
+							{
+								$avatar_types[] = $match[1];
+							}
+						}
+
+						@closedir($dh);
+
+						sort($avatar_types);
+						$cache->put('avatar_types', $avatar_types);
+					}
+				}
+
+				if (in_array($user_row['user_avatar_type'], $avatar_types))
+				{
+					require_once($phpbb_root_path . 'includes/avatars/avatar_' . $user_row['user_avatar_type'] . '.' . $phpEx);
+				}
+			}
+
+			$avatar = new $class($user_row);
+
+			if ($avatar->custom_html)
+			{
+				return $avatar->get_custom_html($ignore_config);
+			}
+
+			$avatar_data = $avatar->get_data($ignore_config);
+
+			break;
+	}
+
+	$html = '';
+
+	if (!empty($avatar_data['src']))
+	{
+		$html = '<img src="' . $avatar_data['src'] . '" ' . 
+			($avatar_data['width'] ? ('width="' . $avatar_data['width'] . '" ') : '') .
+			($avatar_data['height'] ? ('height="' . $avatar_data['height'] . '" ') : '') .
+			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
 	}
 
-	$avatar_img .= $avatar;
-	return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
+	return $html;
+}
+
+/**
+* Get group avatar
+*
+* @param array $group_row Row from the groups table
+* @param string $alt Optional language string for alt tag within image, can be a language key or text
+* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
+*
+* @return string Avatar html
+*/
+function get_group_avatar(&$group_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
+{
+	// Kind of abusing this functionality...
+	$avatar_row = array(
+		'user_avatar' => $group_row['group_avatar'],
+		'user_avatar_type' => $group_row['group_avatar_type'],
+		'user_avatar_width' => $group_row['group_avatar_width'],
+		'user_avatar_height' => $group_row['group_avatar_height'],
+	);
+
+	return get_user_avatar($group_row, $alt, $ignore_config);
 }
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index 99dbb8d86d..fe5be5dc0b 100644
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -179,7 +179,7 @@ class mcp_notes
 		}
 
 		$rank_title = $rank_img = '';
-		$avatar_img = get_user_avatar($userrow['user_avatar'], $userrow['user_avatar_type'], $userrow['user_avatar_width'], $userrow['user_avatar_height']);
+		$avatar_img = get_user_avatar($userrow);
 
 		$limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
 		$sort_by_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_IP'], 'd' => $user->lang['SORT_ACTION']);
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index d8e655000f..3af021565f 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -308,7 +308,7 @@ class mcp_warn
 		}
 
 		$rank_title = $rank_img = '';
-		$avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']);
+		$avatar_img = get_user_avatar($user_row);
 
 		$template->assign_vars(array(
 			'U_POST_ACTION'		=> $this->u_action,
@@ -413,7 +413,7 @@ class mcp_warn
 		}
 
 		$rank_title = $rank_img = '';
-		$avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']);
+		$avatar_img = get_user_avatar($user_row);
 
 		// OK, they didn't submit a warning so lets build the page for them to do so
 		$template->assign_vars(array(
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index a7c6479759..98bdf17d3f 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -438,7 +438,7 @@ class ucp_groups
 					$group_name = $group_row['group_name'];
 					$group_type = $group_row['group_type'];
 
-					$avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : '<img src="' . $phpbb_root_path . 'adm/images/no_avatar.gif" alt="" />';
+					$avatar_img = (!empty($group_row['group_avatar'])) ? get_group_avatar($group_row) : '<img src="' . $phpbb_root_path . 'adm/images/no_avatar.gif" alt="" />';
 
 					$template->assign_vars(array(
 						'GROUP_NAME'			=> ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name,
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index c55e8850a6..a807e3a537 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -350,7 +350,7 @@ function get_user_information($user_id, $user_row)
 		include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 	}
 
-	$user_row['avatar'] = ($user->optionget('viewavatars')) ? get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']) : '';
+	$user_row['avatar'] = ($user->optionget('viewavatars')) ? get_user_avatar($user_row) : '';
 
 	get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']);
 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 9d81503f0a..f61e692f32 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -587,7 +587,7 @@ class ucp_profile
 
 				$template->assign_vars(array(
 					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-					'AVATAR'		=> get_user_avatar($user->data['user_avatar'], $user->data['user_avatar_type'], $user->data['user_avatar_width'], $user->data['user_avatar_height'], 'USER_AVATAR', true),
+					'AVATAR'		=> get_user_avatar($user->data, 'USER_AVATAR', true),
 					'AVATAR_SIZE'	=> $config['avatar_filesize'],
 
 					'U_GALLERY'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=profile&amp;mode=avatar&amp;display_gallery=1'),
-- 
cgit v1.2.1


From 1bd3d40121960c203d0dabb4b1a04c16c564b6f1 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Sun, 17 Apr 2011 19:29:41 -0700
Subject: [feature/avatars] Refactor avatars to use manager

Manager now stores singletons of each driver to speed loading.

PHPBB3-10018
---
 phpBB/includes/avatar/driver.php       | 89 +++++++++++++++++++++++++++++++++
 phpBB/includes/avatar/manager.php      | 91 ++++++++++++++++++++++++++++++++++
 phpBB/includes/avatars/avatar_base.php | 75 ----------------------------
 phpBB/includes/functions_display.php   | 51 ++++++-------------
 4 files changed, 196 insertions(+), 110 deletions(-)
 create mode 100644 phpBB/includes/avatar/driver.php
 create mode 100644 phpBB/includes/avatar/manager.php
 delete mode 100644 phpBB/includes/avatars/avatar_base.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver.php b/phpBB/includes/avatar/driver.php
new file mode 100644
index 0000000000..777b225e84
--- /dev/null
+++ b/phpBB/includes/avatar/driver.php
@@ -0,0 +1,89 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2005, 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base class for avatar drivers
+* @package avatars
+*/
+abstract class phpbb_avatar_driver
+{
+	/**
+	* Current board configuration
+	* @type phpbb_config
+	*/
+	protected $config;
+	
+	/**
+	* Current $phpbb_root_path
+	* @type string
+	*/
+	protected $phpbb_root_path;
+	
+	/**
+	* Current $phpEx
+	* @type string
+	*/
+	protected $php_ext;
+	
+	/**
+	* This flag should be set to true if the avatar requires a nonstandard image
+	* tag, and will generate the html itself.
+	* @type boolean
+	*/
+	public $custom_html = false;
+
+	/**
+	* Construct an avatar object
+	*
+	* @param $user_row User data to base the avatar url/html on
+	*/
+	public function __construct(phpbb_config $config, $phpbb_root_path, $php_ext)
+	{
+		$this->config = $config;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+	}
+
+	/**
+	* Get the avatar url and dimensions
+	*
+	* @param $ignore_config Whether $user or global avatar visibility settings
+	*        should be ignored
+	* @return array Avatar data
+	*/
+	public function get_data($user_row, $ignore_config = false)
+	{
+		return array(
+			'src' => '',
+			'width' => 0,
+			'height' => 0,
+		);
+	}
+
+	/**
+	* Returns custom html for displaying this avatar.
+	* Only called if $custom_html is true.
+	*
+	* @param $ignore_config Whether $user or global avatar visibility settings
+	*        should be ignored
+	* @return string HTML
+	*/
+	public function get_custom_html($user_row, $ignore_config = false)
+	{
+		return '';
+	}
+}
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
new file mode 100644
index 0000000000..04a4d8f425
--- /dev/null
+++ b/phpBB/includes/avatar/manager.php
@@ -0,0 +1,91 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* @package acm
+*/
+class phpbb_avatar_manager
+{
+	private $phpbb_root_path;
+	private $php_ext;
+	private $config;
+	private $cache;
+	private static $valid_drivers = false;
+
+	public function __construct($phpbb_root_path, $php_ext = '.php', phpbb_config $config, phpbb_cache_driver_interface $cache = null)
+	{
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+		$this->config = $config;
+		$this->cache = $cache;
+	}
+
+	public function get_singleton($avatar_type)
+	{
+		if (self::$valid_drivers === false)
+		{
+			$this->load_valid_drivers();
+		}
+
+		if (isset(self::$valid_drivers[$avatar_type]))
+		{
+			if (!is_object(self::$valid_drivers[$avatar_type]))
+			{
+				$class_name = 'phpbb_avatar_driver_' . $avatar_type;
+				self::$valid_drivers[$avatar_type] = new $class_name($this->config, $this->phpbb_root_path, $this->php_ext);
+			}
+
+			return self::$valid_drivers[$avatar_type];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	private function load_valid_drivers()
+	{
+		require_once($this->phpbb_root_path . 'includes/avatar/driver.' . $this->php_ext);
+
+		if ($this->cache)
+		{
+			self::$valid_drivers = $this->cache->get('avatar_drivers');
+		}
+
+		if (empty($this->valid_drivers))
+		{
+			self::$valid_drivers = array();
+
+			$iterator = new DirectoryIterator($this->phpbb_root_path . 'includes/avatar/driver');
+
+			foreach ($iterator as $file)
+			{
+				if (preg_match("/^(.*)\.{$this->php_ext}$/", $file, $match))
+				{
+					self::$valid_drivers[] = $match[1];
+				}
+			}
+
+			self::$valid_drivers = array_flip(self::$valid_drivers);
+
+			if ($this->cache)
+			{
+				$this->cache->put('avatar_drivers', self::$valid_drivers);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/avatars/avatar_base.php b/phpBB/includes/avatars/avatar_base.php
deleted file mode 100644
index c84a6e8a7f..0000000000
--- a/phpBB/includes/avatars/avatar_base.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
-*
-* @package avatars
-* @copyright (c) 2005, 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base class for avatar modules
-* @package avatars
-*/
-class phpbb_avatar_base
-{
-	/**
-	* User data this avatar may use to generate a url or html
-	* @type array
-	*/
-	private $user_row;
-	
-	/**
-	* This flag should be set to true if the avatar requires a nonstandard image
-	* tag, and will generate the html itself.
-	* @type boolean
-	*/
-	public $custom_html = false;
-
-	/**
-	* Construct an avatar object
-	*
-	* @param $user_row User data to base the avatar url/html on
-	*/
-	public function __construct(&$user_row)
-	{
-		$this->user_row = $user_row;
-	}
-
-	/**
-	* Get the avatar url and dimensions
-	*
-	* @param $ignore_config Whether $user or global avatar visibility settings
-	*        should be ignored
-	* @return array Avatar data
-	*/
-	public function get_data($ignore_config = false)
-	{
-		return array(
-			'src' => '',
-			'width' => 0,
-			'height' => 0,
-		);
-	}
-
-	/**
-	* Returns custom html for displaying this avatar.
-	* Only called if $custom_html is true.
-	*
-	* @param $ignore_config Whether $user or global avatar visibility settings
-	*        should be ignored
-	* @return string HTML
-	*/
-	public function get_custom_html($ignore_config = false)
-	{
-		return '';
-	}
-}
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index eba123be9d..3aeee5f704 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1278,10 +1278,12 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 *
 * @return string Avatar html
 */
-function get_user_avatar(&$user_row, $alt = 'USER_AVATAR', $ignore_config = false)
+function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
 {
 	global $user, $config, $cache, $phpbb_root_path, $phpEx;
 
+	static $avatar_manager = null;
+
 	if (!$config['allow_avatar'] && !$ignore_config)
 	{
 		return '';
@@ -1334,48 +1336,27 @@ function get_user_avatar(&$user_row, $alt = 'USER_AVATAR', $ignore_config = fals
 		break;
 
 		default:
-			$class = 'phpbb_avatar_' . $user_row['user_avatar_type'];
-			
-			if (!class_exists($class))
+			if (empty($avatar_manager))
 			{
-				$avatar_types = $cache->get('avatar_types');
-			
-				if (empty($avatar_types))
-				{
-					$avatar_types = array();
-				
-					if ($dh = @opendir($phpbb_root_path . 'includes/avatars'))
-					{
-						while ($file = @readdir($dh))
-						{
-							if (preg_match("/avatar_(.*)\.$phpEx/", $file, $match))
-							{
-								$avatar_types[] = $match[1];
-							}
-						}
-
-						@closedir($dh);
+				$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->get_driver());
+			}
 
-						sort($avatar_types);
-						$cache->put('avatar_types', $avatar_types);
-					}
-				}
+			$avatar = $avatar_manager->get_singleton($user_row['user_avatar_type']);
 
-				if (in_array($user_row['user_avatar_type'], $avatar_types))
+			if ($avatar)
+			{
+				if ($avatar->custom_html)
 				{
-					require_once($phpbb_root_path . 'includes/avatars/avatar_' . $user_row['user_avatar_type'] . '.' . $phpEx);
+					return $avatar->get_html($user_row, $ignore_config);
 				}
-			}
-
-			$avatar = new $class($user_row);
 
-			if ($avatar->custom_html)
+				$avatar_data = $avatar->get_data($user_row, $ignore_config);
+			}
+			else
 			{
-				return $avatar->get_custom_html($ignore_config);
+				$avatar_data['src'] = '';
 			}
 
-			$avatar_data = $avatar->get_data($ignore_config);
-
 			break;
 	}
 
@@ -1401,7 +1382,7 @@ function get_user_avatar(&$user_row, $alt = 'USER_AVATAR', $ignore_config = fals
 *
 * @return string Avatar html
 */
-function get_group_avatar(&$group_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
+function get_group_avatar($group_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
 {
 	// Kind of abusing this functionality...
 	$avatar_row = array(
-- 
cgit v1.2.1


From 16bb0f00b79102aed7da984cbca8a4b1741c62af Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Sun, 17 Apr 2011 19:29:48 -0700
Subject: [feature/avatars] Add drivers for standard avatar types

Adding drivers for gallery, uploaded, and remote avatars. These may
be used as examples for others to develop their own avatar drivers.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/gallery.php | 50 ++++++++++++++++++++++++++++++++
 phpBB/includes/avatar/driver/remote.php  | 50 ++++++++++++++++++++++++++++++++
 phpBB/includes/avatar/driver/upload.php  | 50 ++++++++++++++++++++++++++++++++
 3 files changed, 150 insertions(+)
 create mode 100644 phpBB/includes/avatar/driver/gallery.php
 create mode 100644 phpBB/includes/avatar/driver/remote.php
 create mode 100644 phpBB/includes/avatar/driver/upload.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/gallery.php b/phpBB/includes/avatar/driver/gallery.php
new file mode 100644
index 0000000000..b937332b2d
--- /dev/null
+++ b/phpBB/includes/avatar/driver/gallery.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2005, 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars selected from the board gallery
+* @package avatars
+*/
+class phpbb_avatar_driver_gallery extends phpbb_avatar_driver
+{
+	/**
+	* Get the avatar url and dimensions
+	*
+	* @param $ignore_config Whether $user or global avatar visibility settings
+	*        should be ignored
+	* @return array Avatar data
+	*/
+	public function get_data($user_row, $ignore_config = false)
+	{
+		if ($ignore_config || $this->config['allow_avatar_local'])
+		{
+			return array(
+				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $user_row['user_avatar'],
+				'width' => $user_row['user_avatar_width'],
+				'height' => $user_row['user_avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+}
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
new file mode 100644
index 0000000000..dbd567124d
--- /dev/null
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2005, 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars hosted remotely
+* @package avatars
+*/
+class phpbb_avatar_driver_remote extends phpbb_avatar_driver
+{
+	/**
+	* Get the avatar url and dimensions
+	*
+	* @param $ignore_config Whether $user or global avatar visibility settings
+	*        should be ignored
+	* @return array Avatar data
+	*/
+	public function get_data($user_row, $ignore_config = false)
+	{
+		if ($ignore_config || $this->config['allow_avatar_remote'])
+		{
+			return array(
+				'src' => $user_row['user_avatar'],
+				'width' => $user_row['user_avatar_width'],
+				'height' => $user_row['user_avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+}
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
new file mode 100644
index 0000000000..777c9c2060
--- /dev/null
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2005, 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars uploaded to the board
+* @package avatars
+*/
+class phpbb_avatar_driver_upload extends phpbb_avatar_driver
+{
+	/**
+	* Get the avatar url and dimensions
+	*
+	* @param $ignore_config Whether $user or global avatar visibility settings
+	*        should be ignored
+	* @return array Avatar data
+	*/
+	public function get_data($user_row, $ignore_config = false)
+	{
+		if (ignore_config || $this->config['allow_avatar_upload'])
+		{
+			return array(
+				'src' => $this->phpbb_root_path . 'download/file.' . $this->php_ext . '?avatar=' . $user_row['user_avatar'],
+				'width' => $user_row['user_avatar_width'],
+				'height' => $user_row['user_avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+}
-- 
cgit v1.2.1


From 24379f1297d092141f04ccb55013e85e9b494a83 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Sun, 17 Apr 2011 20:11:36 -0700
Subject: [feature/avatars] Rename gallery avatar driver

Renaming gallery avatar driver to better work with existing config options.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/gallery.php | 50 --------------------------------
 phpBB/includes/avatar/driver/local.php   | 50 ++++++++++++++++++++++++++++++++
 phpBB/includes/avatar/driver/upload.php  |  2 +-
 3 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 phpBB/includes/avatar/driver/gallery.php
 create mode 100644 phpBB/includes/avatar/driver/local.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/gallery.php b/phpBB/includes/avatar/driver/gallery.php
deleted file mode 100644
index b937332b2d..0000000000
--- a/phpBB/includes/avatar/driver/gallery.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
-*
-* @package avatar
-* @copyright (c) 2005, 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars selected from the board gallery
-* @package avatars
-*/
-class phpbb_avatar_driver_gallery extends phpbb_avatar_driver
-{
-	/**
-	* Get the avatar url and dimensions
-	*
-	* @param $ignore_config Whether $user or global avatar visibility settings
-	*        should be ignored
-	* @return array Avatar data
-	*/
-	public function get_data($user_row, $ignore_config = false)
-	{
-		if ($ignore_config || $this->config['allow_avatar_local'])
-		{
-			return array(
-				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $user_row['user_avatar'],
-				'width' => $user_row['user_avatar_width'],
-				'height' => $user_row['user_avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
-	}
-}
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
new file mode 100644
index 0000000000..4014f29cbe
--- /dev/null
+++ b/phpBB/includes/avatar/driver/local.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2005, 2009 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars selected from the board gallery
+* @package avatars
+*/
+class phpbb_avatar_driver_local extends phpbb_avatar_driver
+{
+	/**
+	* Get the avatar url and dimensions
+	*
+	* @param $ignore_config Whether $user or global avatar visibility settings
+	*        should be ignored
+	* @return array Avatar data
+	*/
+	public function get_data($user_row, $ignore_config = false)
+	{
+		if ($ignore_config || $this->config['allow_avatar_local'])
+		{
+			return array(
+				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $user_row['user_avatar'],
+				'width' => $user_row['user_avatar_width'],
+				'height' => $user_row['user_avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+}
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 777c9c2060..da12d52d40 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -30,7 +30,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	*/
 	public function get_data($user_row, $ignore_config = false)
 	{
-		if (ignore_config || $this->config['allow_avatar_upload'])
+		if ($ignore_config || $this->config['allow_avatar_upload'])
 		{
 			return array(
 				'src' => $this->phpbb_root_path . 'download/file.' . $this->php_ext . '?avatar=' . $user_row['user_avatar'],
-- 
cgit v1.2.1


From 7abded081d5ae3d231148b0485c8605b44973229 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Sun, 17 Apr 2011 21:58:51 -0700
Subject: [feature/avatars] UCP Avatar Interface

This stubs out the avatar form fields and how form processing will
occur. Form processing is not yet implemented, but shouldn't be too
hard. After this I will refactor/duplicate some of the logic for the
ACP.

PHPBB3-10018
---
 phpBB/includes/avatar/driver.php        |   8 +++
 phpBB/includes/avatar/driver/local.php  |  73 ++++++++++++++++++++++
 phpBB/includes/avatar/driver/remote.php |  15 +++++
 phpBB/includes/avatar/driver/upload.php |  27 ++++++++
 phpBB/includes/avatar/manager.php       |  21 +++++++
 phpBB/includes/ucp/ucp_profile.php      | 107 ++++++++++++++++++++------------
 6 files changed, 212 insertions(+), 39 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver.php b/phpBB/includes/avatar/driver.php
index 777b225e84..016f9e94a8 100644
--- a/phpBB/includes/avatar/driver.php
+++ b/phpBB/includes/avatar/driver.php
@@ -86,4 +86,12 @@ abstract class phpbb_avatar_driver
 	{
 		return '';
 	}
+
+	/**
+	* @TODO
+	**/
+	public function handle_form($template, &$error = array(), $submitted = false)
+	{
+		return false;
+	}
 }
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 4014f29cbe..0a3ae51a48 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -47,4 +47,77 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 			);
 		}
 	}
+	
+	/**
+	* @TODO
+	**/
+	public function handle_form($template, &$error = array(), $submitted = false)
+	{
+		if ($submitted) {
+			$error[] = 'TODO';
+			return '';
+		}
+
+		$avatar_list = array();
+		$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
+
+		$dh = @opendir($path);
+
+		if (!$dh)
+		{
+			return $avatar_list;
+		}
+
+		while (($cat = readdir($dh)) !== false) {
+			if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
+			{
+				if ($ch = @opendir("$path/$cat"))
+				{
+					while (($image = readdir($ch)) !== false)
+					{
+						if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
+						{
+							$avatar_list[$cat][] = array(
+								'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
+								'filename'  => rawurlencode($image),
+								'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
+							);
+						}
+					}
+					@closedir($ch);
+				}
+			}
+		}
+		@closedir($dh);
+
+		@ksort($avatar_list);
+
+		$category = request_var('av_local_cat', '');
+		$categories = array_keys($avatar_list);
+
+		foreach ($categories as $cat)
+		{
+			if (!empty($avatar_list[$cat]))
+			{
+				$template->assign_block_vars('av_local_cats', array(
+					'NAME' => $cat,
+					'SELECTED' => ($cat == $category),
+				));
+			}
+		}
+
+		if (!empty($avatar_list[$category]))
+		{
+			foreach ($avatar_list[$category] as $img => $data)
+			{
+				$template->assign_block_vars('av_local_imgs', array(
+					'AVATAR_IMAGE'  => $path . '/' . $data['file'],
+					'AVATAR_NAME' => $data['name'],
+					'AVATAR_FILE' => $data['filename'],
+				));
+			}
+		}
+
+		return true;
+	}
 }
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index dbd567124d..c60102e787 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -47,4 +47,19 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 			);
 		}
 	}
+
+	/**
+	* @TODO
+	**/
+	public function handle_form($template, &$error = array(), $submitted = false)
+	{
+		if ($submitted) {
+			$error[] = 'TODO';
+			return '';
+		}
+		else
+		{
+			return true;
+		}
+	}
 }
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index da12d52d40..fbfd5dcc89 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -47,4 +47,31 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 			);
 		}
 	}
+
+	/**
+	* @TODO
+	**/
+	public function handle_form($template, &$error = array(), $submitted = false)
+	{
+		if ($submitted) {
+			$error[] = 'TODO';
+			return '';
+		}
+		else
+		{
+			$can_upload = (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
+			if ($can_upload)
+			{
+				$template->assign_vars(array(
+					'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
+				));
+
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
 }
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 04a4d8f425..11b7e75017 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -26,6 +26,9 @@ class phpbb_avatar_manager
 	private $cache;
 	private static $valid_drivers = false;
 
+	/**
+	* @TODO
+	**/
 	public function __construct($phpbb_root_path, $php_ext = '.php', phpbb_config $config, phpbb_cache_driver_interface $cache = null)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
@@ -34,6 +37,9 @@ class phpbb_avatar_manager
 		$this->cache = $cache;
 	}
 
+	/**
+	* @TODO
+	**/
 	public function get_singleton($avatar_type)
 	{
 		if (self::$valid_drivers === false)
@@ -57,6 +63,9 @@ class phpbb_avatar_manager
 		}
 	}
 
+	/**
+	* @TODO
+	**/
 	private function load_valid_drivers()
 	{
 		require_once($this->phpbb_root_path . 'includes/avatar/driver.' . $this->php_ext);
@@ -88,4 +97,16 @@ class phpbb_avatar_manager
 			}
 		}
 	}
+
+	/**
+	* @TODO
+	**/
+	public function get_valid_drivers() {
+		if (self::$valid_drivers === false)
+		{
+			$this->load_valid_drivers();
+		}
+
+		return array_keys(self::$valid_drivers);
+	}
 }
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index f61e692f32..0a2440d77d 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -28,7 +28,7 @@ class ucp_profile
 
 	function main($id, $mode)
 	{
-		global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
+		global $cache, $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
 		global $request;
 
 		$user->add_lang('posting');
@@ -544,55 +544,89 @@ class ucp_profile
 			break;
 
 			case 'avatar':
-
 				include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
-
+				
 				$display_gallery = request_var('display_gallery', '0');
 				$avatar_select = basename(request_var('avatar_select', ''));
 				$category = basename(request_var('category', ''));
-
-				$can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_is_writable($phpbb_root_path . $config['avatar_path']) && $auth->acl_get('u_chgavatar') && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
-
+				
 				add_form_key('ucp_avatar');
 
-				if ($submit)
+				$avatars_enabled = false;
+
+				if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
 				{
-					if (check_form_key('ucp_avatar'))
-					{
-						if (avatar_process_user($error, false, $can_upload))
-						{
-							meta_refresh(3, $this->u_action);
-							$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-							trigger_error($message);
+					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
+					$avatar_drivers = $avatar_manager->get_valid_drivers();
+					sort($avatar_drivers);
+
+					foreach ($avatar_drivers as $driver) {
+						if ($config["allow_avatar_$driver"]) {
+							$avatars_enabled = true;
+							$template->set_filenames(array(
+								'avatar' => "ucp_avatar_options_$driver.html",
+							));
+
+							$avatar = $avatar_manager->get_singleton($driver);
+							if (isset($_POST["submit_av_$driver"]))
+							{
+								if (check_form_key('ucp_avatar'))
+								{
+									$result = $avatar->handle_form($template, $error, true);
+								
+									if (empty($error))
+									{
+										// Success! Lets save the result in the database
+										$sql_ary = array(
+											'user_avatar_type' => $driver,
+											'user_avatar' => (string) $result,
+										);
+
+										$sql = 'UPDATE ' . USERS_TABLE . '
+											SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+											WHERE user_id = ' . $user->data['user_id'];
+
+										$db->sql_query($sql);
+									
+										meta_refresh(3, $this->u_action);
+										$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+										trigger_error($message);
+									}
+								}
+								else
+								{
+									$error[] = 'FORM_INVALID';
+								}
+							}
+
+							if ($avatar->handle_form($template, $error)) {
+								$driver_u = strtoupper($driver);
+
+								$template->assign_block_vars('avatar_drivers', array(
+									'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values
+									'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
+
+									'DRIVER' => $driver,
+									'OUTPUT' => $template->assign_display('avatar'),
+								));
+							}
 						}
 					}
-					else
-					{
-						$error[] = 'FORM_INVALID';
-					}
-					// Replace "error" strings with their real, localised form
-					$error = array_map(array($user, 'lang'), $error);
 				}
+				
+				// Replace "error" strings with their real, localised form
+				$error = array_map(array($user, 'lang'), $error);
 
-				if (!$config['allow_avatar'] && $user->data['user_avatar_type'])
-				{
-					$error[] = $user->lang['AVATAR_NOT_ALLOWED'];
-				}
-				else if ((($user->data['user_avatar_type'] == AVATAR_UPLOAD) && !$config['allow_avatar_upload']) ||
-				 (($user->data['user_avatar_type'] == AVATAR_REMOTE) && !$config['allow_avatar_remote']) ||
-				 (($user->data['user_avatar_type'] == AVATAR_GALLERY) && !$config['allow_avatar_local']))
-				{
-					$error[] = $user->lang['AVATAR_TYPE_NOT_ALLOWED'];
-				}
+				$avatar = get_user_avatar($user->data, 'USER_AVATAR', true);
 
 				$template->assign_vars(array(
 					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-					'AVATAR'		=> get_user_avatar($user->data, 'USER_AVATAR', true),
+					'AVATAR'		=> $avatar,
 					'AVATAR_SIZE'	=> $config['avatar_filesize'],
 
 					'U_GALLERY'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=profile&amp;mode=avatar&amp;display_gallery=1'),
 
-					'S_FORM_ENCTYPE'	=> ($can_upload && ($config['allow_avatar_upload'] || $config['allow_avatar_remote_upload'])) ? ' enctype="multipart/form-data"' : '',
+					'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
 
 					'L_AVATAR_EXPLAIN'	=> phpbb_avatar_explanation_string(),
 				));
@@ -603,16 +637,11 @@ class ucp_profile
 				}
 				else if ($config['allow_avatar'])
 				{
-					$avatars_enabled = (($can_upload && ($config['allow_avatar_upload'] || $config['allow_avatar_remote_upload'])) || ($auth->acl_get('u_chgavatar') && ($config['allow_avatar_local'] || $config['allow_avatar_remote']))) ? true : false;
-
 					$template->assign_vars(array(
-						'AVATAR_WIDTH'	=> request_var('width', $user->data['user_avatar_width']),
-						'AVATAR_HEIGHT'	=> request_var('height', $user->data['user_avatar_height']),
+						'AVATAR_WIDTH'	=> request_var('width', empty($avatar) ? 0 : $user->data['user_avatar_width']),
+						'AVATAR_HEIGHT'	=> request_var('height', empty($avatar) ? 0 : $user->data['user_avatar_height']),
 
 						'S_AVATARS_ENABLED'		=> $avatars_enabled,
-						'S_UPLOAD_AVATAR_FILE'	=> ($can_upload && $config['allow_avatar_upload']) ? true : false,
-						'S_UPLOAD_AVATAR_URL'	=> ($can_upload && $config['allow_avatar_remote_upload']) ? true : false,
-						'S_LINK_AVATAR'			=> ($auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) ? true : false,
 						'S_DISPLAY_GALLERY'		=> ($auth->acl_get('u_chgavatar') && $config['allow_avatar_local']) ? true : false)
 					);
 				}
-- 
cgit v1.2.1


From f102d9a631d6de464abefe2089ff1e6e13ed044d Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Mon, 18 Apr 2011 10:44:29 -0700
Subject: [feature/avatars] Various cosmetic changes

Various small changes based on feedback from nn-
* Renaming $php_ext to $phpEx
* Fixing copyright years
* Explain $ignore_config
* Explain Regex
* Copypasta package error
* rename get_singleton

PHPBB3-10018
---
 phpBB/includes/avatar/driver.php        | 32 +++++++++++-----
 phpBB/includes/avatar/driver/local.php  | 65 ++++++++++++++++++---------------
 phpBB/includes/avatar/driver/remote.php | 12 ++----
 phpBB/includes/avatar/driver/upload.php | 14 +++----
 phpBB/includes/avatar/manager.php       | 21 ++++++-----
 phpBB/includes/functions_display.php    |  2 +-
 phpBB/includes/ucp/ucp_profile.php      |  2 +-
 7 files changed, 80 insertions(+), 68 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver.php b/phpBB/includes/avatar/driver.php
index 016f9e94a8..60ec18670e 100644
--- a/phpBB/includes/avatar/driver.php
+++ b/phpBB/includes/avatar/driver.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package avatar
-* @copyright (c) 2005, 2009 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
@@ -37,7 +37,13 @@ abstract class phpbb_avatar_driver
 	* Current $phpEx
 	* @type string
 	*/
-	protected $php_ext;
+	protected $phpEx;
+	
+	/**
+	* A cache driver
+	* @type phpbb_cache_driver_interface
+	*/
+	protected $cache;
 	
 	/**
 	* This flag should be set to true if the avatar requires a nonstandard image
@@ -47,22 +53,27 @@ abstract class phpbb_avatar_driver
 	public $custom_html = false;
 
 	/**
-	* Construct an avatar object
+	* Construct an driver object
 	*
-	* @param $user_row User data to base the avatar url/html on
+	* @param $config The phpBB configuration
+	* @param $phpbb_root_path The path to the phpBB root
+	* @param $phpEx The php file extension
+	* @param $cache A cache driver
 	*/
-	public function __construct(phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_config $config, $phpbb_root_path, $phpEx, phpbb_cache_driver_interface $cache = null)
 	{
 		$this->config = $config;
 		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
+		$this->phpEx = $phpEx;
+		$this->cache = $cache;
 	}
 
 	/**
 	* Get the avatar url and dimensions
 	*
-	* @param $ignore_config Whether $user or global avatar visibility settings
-	*        should be ignored
+	* @param $ignore_config Whether this function should respect the users/board
+	*        configuration option, or should just render the avatar anyways.
+	*        Useful for the ACP.
 	* @return array Avatar data
 	*/
 	public function get_data($user_row, $ignore_config = false)
@@ -78,8 +89,9 @@ abstract class phpbb_avatar_driver
 	* Returns custom html for displaying this avatar.
 	* Only called if $custom_html is true.
 	*
-	* @param $ignore_config Whether $user or global avatar visibility settings
-	*        should be ignored
+	* @param $ignore_config Whether this function should respect the users/board
+	*        configuration option, or should just render the avatar anyways.
+	*        Useful for the ACP.
 	* @return string HTML
 	*/
 	public function get_custom_html($user_row, $ignore_config = false)
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 0a3ae51a48..65340c92ce 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package avatar
-* @copyright (c) 2005, 2009 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
@@ -22,11 +22,7 @@ if (!defined('IN_PHPBB'))
 class phpbb_avatar_driver_local extends phpbb_avatar_driver
 {
 	/**
-	* Get the avatar url and dimensions
-	*
-	* @param $ignore_config Whether $user or global avatar visibility settings
-	*        should be ignored
-	* @return array Avatar data
+	* @inheritdoc
 	*/
 	public function get_data($user_row, $ignore_config = false)
 	{
@@ -49,8 +45,8 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	}
 	
 	/**
-	* @TODO
-	**/
+	* @inheritdoc
+	*/
 	public function handle_form($template, &$error = array(), $submitted = false)
 	{
 		if ($submitted) {
@@ -58,39 +54,50 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 			return '';
 		}
 
-		$avatar_list = array();
-		$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
-
-		$dh = @opendir($path);
+		$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list');
 
-		if (!$dh)
+		if (!$avatar_list)
 		{
-			return $avatar_list;
-		}
+			$avatar_list = array();
+			$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
 
-		while (($cat = readdir($dh)) !== false) {
-			if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
+			$dh = @opendir($path);
+
+			if (!$dh)
 			{
-				if ($ch = @opendir("$path/$cat"))
+				return $avatar_list;
+			}
+
+			while (($cat = readdir($dh)) !== false) {
+				if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
 				{
-					while (($image = readdir($ch)) !== false)
+					if ($ch = @opendir("$path/$cat"))
 					{
-						if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
+						while (($image = readdir($ch)) !== false)
 						{
-							$avatar_list[$cat][] = array(
-								'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
-								'filename'  => rawurlencode($image),
-								'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
-							);
+							// Match all images in the gallery folder
+							if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
+							{
+								$avatar_list[$cat][] = array(
+									'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
+									'filename'  => rawurlencode($image),
+									'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
+								);
+							}
 						}
+						@closedir($ch);
 					}
-					@closedir($ch);
 				}
 			}
-		}
-		@closedir($dh);
+			@closedir($dh);
+
+			@ksort($avatar_list);
 
-		@ksort($avatar_list);
+			if ($this->cache != null)
+			{
+				$this->cache->put('av_local_list', $avatar_list);
+			}
+		}
 
 		$category = request_var('av_local_cat', '');
 		$categories = array_keys($avatar_list);
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index c60102e787..bfc1be263f 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package avatar
-* @copyright (c) 2005, 2009 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
@@ -22,11 +22,7 @@ if (!defined('IN_PHPBB'))
 class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 {
 	/**
-	* Get the avatar url and dimensions
-	*
-	* @param $ignore_config Whether $user or global avatar visibility settings
-	*        should be ignored
-	* @return array Avatar data
+	* @inheritdoc
 	*/
 	public function get_data($user_row, $ignore_config = false)
 	{
@@ -49,8 +45,8 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	}
 
 	/**
-	* @TODO
-	**/
+	* @inheritdoc
+	*/
 	public function handle_form($template, &$error = array(), $submitted = false)
 	{
 		if ($submitted) {
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index fbfd5dcc89..9705a888b6 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package avatar
-* @copyright (c) 2005, 2009 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
@@ -22,18 +22,14 @@ if (!defined('IN_PHPBB'))
 class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 {
 	/**
-	* Get the avatar url and dimensions
-	*
-	* @param $ignore_config Whether $user or global avatar visibility settings
-	*        should be ignored
-	* @return array Avatar data
+	* @inheritdoc
 	*/
 	public function get_data($user_row, $ignore_config = false)
 	{
 		if ($ignore_config || $this->config['allow_avatar_upload'])
 		{
 			return array(
-				'src' => $this->phpbb_root_path . 'download/file.' . $this->php_ext . '?avatar=' . $user_row['user_avatar'],
+				'src' => $this->phpbb_root_path . 'download/file.' . $this->phpEx . '?avatar=' . $user_row['user_avatar'],
 				'width' => $user_row['user_avatar_width'],
 				'height' => $user_row['user_avatar_height'],
 			);
@@ -49,8 +45,8 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	}
 
 	/**
-	* @TODO
-	**/
+	* @inheritdoc
+	*/
 	public function handle_form($template, &$error = array(), $submitted = false)
 	{
 		if ($submitted) {
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 11b7e75017..6471c4cc9c 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package avatar
-* @copyright (c) 2010 phpBB Group
+* @copyright (c) 2011 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
@@ -16,12 +16,12 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* @package acm
+* @package avatar
 */
 class phpbb_avatar_manager
 {
 	private $phpbb_root_path;
-	private $php_ext;
+	private $phpEx;
 	private $config;
 	private $cache;
 	private static $valid_drivers = false;
@@ -29,10 +29,10 @@ class phpbb_avatar_manager
 	/**
 	* @TODO
 	**/
-	public function __construct($phpbb_root_path, $php_ext = '.php', phpbb_config $config, phpbb_cache_driver_interface $cache = null)
+	public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_cache_driver_interface $cache = null)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
+		$this->phpEx = $phpEx;
 		$this->config = $config;
 		$this->cache = $cache;
 	}
@@ -40,7 +40,7 @@ class phpbb_avatar_manager
 	/**
 	* @TODO
 	**/
-	public function get_singleton($avatar_type)
+	public function get_driver($avatar_type, $new = false)
 	{
 		if (self::$valid_drivers === false)
 		{
@@ -49,10 +49,10 @@ class phpbb_avatar_manager
 
 		if (isset(self::$valid_drivers[$avatar_type]))
 		{
-			if (!is_object(self::$valid_drivers[$avatar_type]))
+			if ($new || !is_object(self::$valid_drivers[$avatar_type]))
 			{
 				$class_name = 'phpbb_avatar_driver_' . $avatar_type;
-				self::$valid_drivers[$avatar_type] = new $class_name($this->config, $this->phpbb_root_path, $this->php_ext);
+				self::$valid_drivers[$avatar_type] = new $class_name($this->config, $this->phpbb_root_path, $this->phpEx, $this->cache);
 			}
 
 			return self::$valid_drivers[$avatar_type];
@@ -68,7 +68,7 @@ class phpbb_avatar_manager
 	**/
 	private function load_valid_drivers()
 	{
-		require_once($this->phpbb_root_path . 'includes/avatar/driver.' . $this->php_ext);
+		require_once($this->phpbb_root_path . 'includes/avatar/driver.' . $this->phpEx);
 
 		if ($this->cache)
 		{
@@ -83,7 +83,8 @@ class phpbb_avatar_manager
 
 			foreach ($iterator as $file)
 			{
-				if (preg_match("/^(.*)\.{$this->php_ext}$/", $file, $match))
+				// Match all files that appear to be php files
+				if (preg_match("/^(.*)\.{$this->phpEx}$/", $file, $match))
 				{
 					self::$valid_drivers[] = $match[1];
 				}
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 3aeee5f704..23900dfd88 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1341,7 +1341,7 @@ function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false
 				$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->get_driver());
 			}
 
-			$avatar = $avatar_manager->get_singleton($user_row['user_avatar_type']);
+			$avatar = $avatar_manager->get_driver($user_row['user_avatar_type']);
 
 			if ($avatar)
 			{
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 0a2440d77d..a93430644c 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -567,7 +567,7 @@ class ucp_profile
 								'avatar' => "ucp_avatar_options_$driver.html",
 							));
 
-							$avatar = $avatar_manager->get_singleton($driver);
+							$avatar = $avatar_manager->get_driver($driver);
 							if (isset($_POST["submit_av_$driver"]))
 							{
 								if (check_form_key('ucp_avatar'))
-- 
cgit v1.2.1


From 00d4b9d431d6772889291f2f4c857a144bce93fb Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Mon, 18 Apr 2011 22:54:35 -0700
Subject: [feature/avatars] Implement UCP remote/local avatars

Implementing selection logic for gallery and remote avatars. Modified
some of the driver interfaces to make things work nicer also. Upload
functionality will be in the next commit.

PHPBB3-10018
---
 phpBB/includes/avatar/driver.php        |   2 +-
 phpBB/includes/avatar/driver/local.php  |  31 +++++++---
 phpBB/includes/avatar/driver/remote.php | 105 ++++++++++++++++++++++++++++++--
 phpBB/includes/avatar/driver/upload.php |   3 +-
 phpBB/includes/ucp/ucp_profile.php      |  58 ++++++++----------
 5 files changed, 151 insertions(+), 48 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver.php b/phpBB/includes/avatar/driver.php
index 60ec18670e..a2ff5d804d 100644
--- a/phpBB/includes/avatar/driver.php
+++ b/phpBB/includes/avatar/driver.php
@@ -102,7 +102,7 @@ abstract class phpbb_avatar_driver
 	/**
 	* @TODO
 	**/
-	public function handle_form($template, &$error = array(), $submitted = false)
+	public function handle_form($template, $user_row, &$error, $submitted = false)
 	{
 		return false;
 	}
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 65340c92ce..c00f65a81d 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -47,13 +47,8 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function handle_form($template, &$error = array(), $submitted = false)
+	public function handle_form($template, $user_row, &$error, $submitted = false)
 	{
-		if ($submitted) {
-			$error[] = 'TODO';
-			return '';
-		}
-
 		$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list');
 
 		if (!$avatar_list)
@@ -78,10 +73,13 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 							// Match all images in the gallery folder
 							if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
 							{
-								$avatar_list[$cat][] = array(
+								$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
+								$avatar_list[$cat][$image] = array(
 									'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
 									'filename'  => rawurlencode($image),
 									'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
+									'width'     => $dims[0],
+									'height'    => $dims[1],
 								);
 							}
 						}
@@ -98,8 +96,25 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 				$this->cache->put('av_local_list', $avatar_list);
 			}
 		}
-
+		
 		$category = request_var('av_local_cat', '');
+		
+		if ($submitted) {
+			$file = request_var('av_local_file', '');
+			if (!isset($avatar_list[$category][urldecode($file)]))
+			{
+				$error[] = 'AVATAR_URL_NOT_FOUND';
+				return false;
+			}
+
+			return array(
+				'user_avatar' => $category . '/' . $file,
+				'user_avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
+				'user_avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
+			);
+		}
+
+
 		$categories = array_keys($avatar_list);
 
 		foreach ($categories as $cat)
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index bfc1be263f..ebaf3cf5c4 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -47,14 +47,111 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function handle_form($template, &$error = array(), $submitted = false)
+	public function handle_form($template, $user_row, &$error, $submitted = false)
 	{
-		if ($submitted) {
-			$error[] = 'TODO';
-			return '';
+		if ($submitted)
+		{
+			$url = request_var('av_remote_url', '');
+			$width = request_var('av_remote_width', 0);
+			$height = request_var('av_remote_height', 0);
+			
+			if (!preg_match('#^(http|https|ftp)://#i', $url))
+			{
+				$url = 'http://' . $url;
+			}
+
+			$error = array_merge($error, validate_data(array(
+				'url' => $url,
+			), array(
+				'url' => array('string', true, 5, 255),
+			)));
+
+			if (!empty($error))
+			{
+				return false;
+			}
+
+			// Check if this url looks alright
+			// This isn't perfect, but it's what phpBB 3.0 did, and might as well make sure everything is compatible
+			if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $url))
+			{
+				$error[] = 'AVATAR_URL_INVALID';
+				return false;
+			}
+
+			// Make sure getimagesize works...
+			if (($image_data = getimagesize($url)) === false && ($width <= 0 || $height <= 0))
+			{
+				$error[] = 'UNABLE_GET_IMAGE_SIZE';
+				return false;
+			}
+
+			if (!empty($image_data) && ($image_data[0] < 2 || $image_data[1] < 2))
+			{
+				$error[] = 'AVATAR_NO_SIZE';
+				return false;
+			}
+
+			$width = ($width && $height) ? $width : $image_data[0];
+			$height = ($width && $height) ? $height : $image_data[1];
+
+			if ($width < 2 || $height < 2)
+			{
+				$error[] = 'AVATAR_NO_SIZE';
+				return false;
+			}
+
+			include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
+			$types = fileupload::image_types();
+			$extension = strtolower(filespec::get_extension($url));
+
+			if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
+			{
+				if (!isset($types[$image_data[2]]))
+				{
+					$error[] = 'UNABLE_GET_IMAGE_SIZE';
+				}
+				else
+				{
+					$error[] = array('IMAGE_FILETYPE_MISMATCH', $types[$image_data[2]][0], $extension);
+				}
+
+				return false;
+			}
+
+			if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
+			{
+				if ($width > $this->config['avatar_max_width'] || $height > $this->config['avatar_max_height'])
+				{
+					$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
+					return false;
+				}
+			}
+
+			if ($this->config['avatar_min_width'] || $this->config['avatar_min_height'])
+			{
+				if ($width < $this->config['avatar_min_width'] || $height < $this->config['avatar_min_height'])
+				{
+					$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
+					return false;
+				}
+			}
+
+			$result = array(
+				'user_avatar' => $url,
+				'user_avatar_width' => $width,
+				'user_avatar_height' => $height,
+			);
+
+			return $result;
 		}
 		else
 		{
+			$template->assign_vars(array(
+				'AV_REMOTE_WIDTH' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar_width']) ? $user_row['user_avatar_width'] : request_var('av_local_width', 0),
+				'AV_REMOTE_HEIGHT' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar_height']) ? $user_row['user_avatar_height'] : request_var('av_local_width', 0),
+				'AV_REMOTE_URL' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar']) ? $user_row['user_avatar'] : '',
+			));
 			return true;
 		}
 	}
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 9705a888b6..84168722ec 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -47,7 +47,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function handle_form($template, &$error = array(), $submitted = false)
+	public function handle_form($template, $user_row, &$error, $submitted = false)
 	{
 		if ($submitted) {
 			$error[] = 'TODO';
@@ -60,6 +60,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 			{
 				$template->assign_vars(array(
 					'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
+					'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
 				));
 
 				return true;
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index a93430644c..5d7dbe12d8 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -544,12 +544,8 @@ class ucp_profile
 			break;
 
 			case 'avatar':
-				include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
-				
-				$display_gallery = request_var('display_gallery', '0');
-				$avatar_select = basename(request_var('avatar_select', ''));
-				$category = basename(request_var('category', ''));
-				
+				include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+
 				add_form_key('ucp_avatar');
 
 				$avatars_enabled = false;
@@ -572,18 +568,15 @@ class ucp_profile
 							{
 								if (check_form_key('ucp_avatar'))
 								{
-									$result = $avatar->handle_form($template, $error, true);
+									$result = $avatar->handle_form($template, $user->data, $error, true);
 								
 									if (empty($error))
 									{
 										// Success! Lets save the result in the database
-										$sql_ary = array(
-											'user_avatar_type' => $driver,
-											'user_avatar' => (string) $result,
-										);
+										$result['user_avatar_type'] = $driver;
 
 										$sql = 'UPDATE ' . USERS_TABLE . '
-											SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+											SET ' . $db->sql_build_array('UPDATE', $result) . '
 											WHERE user_id = ' . $user->data['user_id'];
 
 										$db->sql_query($sql);
@@ -599,7 +592,7 @@ class ucp_profile
 								}
 							}
 
-							if ($avatar->handle_form($template, $error)) {
+							if ($avatar->handle_form($template, $user->data, $error)) {
 								$driver_u = strtoupper($driver);
 
 								$template->assign_block_vars('avatar_drivers', array(
@@ -613,39 +606,36 @@ class ucp_profile
 						}
 					}
 				}
-				
-				// Replace "error" strings with their real, localised form
-				$error = array_map(array($user, 'lang'), $error);
 
+				// Replace "error" strings with their real, localised form
+				$err = $error;
+				$error = array();
+				foreach ($err as $e)
+				{
+					if (is_array($e))
+					{
+						$key = array_shift($e);
+						$error[] = vsprintf($user->lang($key), $e);
+					}
+					else
+					{
+						$error[] = $user->lang((string) $e);
+					}
+				}
+				
 				$avatar = get_user_avatar($user->data, 'USER_AVATAR', true);
 
 				$template->assign_vars(array(
 					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
 					'AVATAR'		=> $avatar,
-					'AVATAR_SIZE'	=> $config['avatar_filesize'],
-
-					'U_GALLERY'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=profile&amp;mode=avatar&amp;display_gallery=1'),
 
 					'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
 
 					'L_AVATAR_EXPLAIN'	=> phpbb_avatar_explanation_string(),
+					
+					'S_AVATARS_ENABLED'		=> ($config['allow_avatar'] && $avatars_enabled),
 				));
 
-				if ($config['allow_avatar'] && $display_gallery && $auth->acl_get('u_chgavatar') && $config['allow_avatar_local'])
-				{
-					avatar_gallery($category, $avatar_select, 4);
-				}
-				else if ($config['allow_avatar'])
-				{
-					$template->assign_vars(array(
-						'AVATAR_WIDTH'	=> request_var('width', empty($avatar) ? 0 : $user->data['user_avatar_width']),
-						'AVATAR_HEIGHT'	=> request_var('height', empty($avatar) ? 0 : $user->data['user_avatar_height']),
-
-						'S_AVATARS_ENABLED'		=> $avatars_enabled,
-						'S_DISPLAY_GALLERY'		=> ($auth->acl_get('u_chgavatar') && $config['allow_avatar_local']) ? true : false)
-					);
-				}
-
 			break;
 		}
 
-- 
cgit v1.2.1


From f02f6216867db63f6ad2659b0b702b81b07a875c Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Mon, 18 Apr 2011 23:34:56 -0700
Subject: [feature/avatars] Fixing remote avatars size checks

Remote avatars size checks were broken. It assumed getimagesize() was
available and used the wrong template values.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/local.php  |  9 ++++++++-
 phpBB/includes/avatar/driver/remote.php | 27 +++++++++++++++------------
 2 files changed, 23 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index c00f65a81d..4c15b5de2e 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -73,7 +73,14 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 							// Match all images in the gallery folder
 							if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
 							{
-								$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
+								if (function_exists('getimagesize'))
+								{
+									$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
+								}
+								else
+								{
+									$dims = array(0, 0);
+								}
 								$avatar_list[$cat][$image] = array(
 									'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
 									'filename'  => rawurlencode($image),
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index ebaf3cf5c4..48f86cac3f 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -80,22 +80,25 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 			}
 
 			// Make sure getimagesize works...
-			if (($image_data = getimagesize($url)) === false && ($width <= 0 || $height <= 0))
+			if (function_exists('getimagesize'))
 			{
-				$error[] = 'UNABLE_GET_IMAGE_SIZE';
-				return false;
-			}
+				if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
+				{
+					$error[] = 'UNABLE_GET_IMAGE_SIZE';
+					return false;
+				}
 
-			if (!empty($image_data) && ($image_data[0] < 2 || $image_data[1] < 2))
-			{
-				$error[] = 'AVATAR_NO_SIZE';
-				return false;
-			}
+				if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
+				{
+					$error[] = 'AVATAR_NO_SIZE';
+					return false;
+				}
 
-			$width = ($width && $height) ? $width : $image_data[0];
-			$height = ($width && $height) ? $height : $image_data[1];
+				$width = ($width && $height) ? $width : $image_data[0];
+				$height = ($width && $height) ? $height : $image_data[1];
+			}
 
-			if ($width < 2 || $height < 2)
+			if ($width <= 0 || $height <= 0)
 			{
 				$error[] = 'AVATAR_NO_SIZE';
 				return false;
-- 
cgit v1.2.1


From 019b9bc0735bb74d46f4e87fe006328970211dad Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Tue, 19 Apr 2011 11:19:47 -0700
Subject: [feature/avatars] Implement avatar uploads for ucp

As above, implement avatar uploads from local and remote sources in
the UCP.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/local.php  | 50 ++++++++++++------------
 phpBB/includes/avatar/driver/upload.php | 67 +++++++++++++++++++++++++++------
 phpBB/includes/ucp/ucp_profile.php      |  2 +-
 3 files changed, 80 insertions(+), 39 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 4c15b5de2e..f9b7662e93 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -58,43 +58,41 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 			$dh = @opendir($path);
 
-			if (!$dh)
+			if ($dh)
 			{
-				return $avatar_list;
-			}
-
-			while (($cat = readdir($dh)) !== false) {
-				if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
-				{
-					if ($ch = @opendir("$path/$cat"))
+				while (($cat = readdir($dh)) !== false) {
+					if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
 					{
-						while (($image = readdir($ch)) !== false)
+						if ($ch = @opendir("$path/$cat"))
 						{
-							// Match all images in the gallery folder
-							if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
+							while (($image = readdir($ch)) !== false)
 							{
-								if (function_exists('getimagesize'))
-								{
-									$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
-								}
-								else
+								// Match all images in the gallery folder
+								if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
 								{
-									$dims = array(0, 0);
+									if (function_exists('getimagesize'))
+									{
+										$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
+									}
+									else
+									{
+										$dims = array(0, 0);
+									}
+									$avatar_list[$cat][$image] = array(
+										'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
+										'filename'  => rawurlencode($image),
+										'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
+										'width'     => $dims[0],
+										'height'    => $dims[1],
+									);
 								}
-								$avatar_list[$cat][$image] = array(
-									'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
-									'filename'  => rawurlencode($image),
-									'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
-									'width'     => $dims[0],
-									'height'    => $dims[1],
-								);
 							}
+							@closedir($ch);
 						}
-						@closedir($ch);
 					}
 				}
+				@closedir($dh);
 			}
-			@closedir($dh);
 
 			@ksort($avatar_list);
 
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 84168722ec..cbc46e0e49 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -49,26 +49,69 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	*/
 	public function handle_form($template, $user_row, &$error, $submitted = false)
 	{
-		if ($submitted) {
-			$error[] = 'TODO';
-			return '';
+		$can_upload = (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
+
+		if ($can_upload == false)
+		{
+			return false;
 		}
-		else
+
+		if ($submitted)
 		{
-			$can_upload = (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
-			if ($can_upload)
-			{
-				$template->assign_vars(array(
-					'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
-					'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
-				));
+			include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
+
+			$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
-				return true;
+			$url = request_var('av_upload_url', '');
+
+			if (!empty($_FILES['av_upload_file']['name']))
+			{
+				$file = $upload->form_upload('av_upload_file');
 			}
 			else
 			{
+				$file = $upload->remote_upload($url);
+			}
+
+			$prefix = $this->config['avatar_salt'] . '_';
+			$file->clean_filename('avatar', $prefix, $user_row['user_id']);
+
+			$destination = $this->config['avatar_path'];
+
+			// Adjust destination path (no trailing slash)
+			if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
+			{
+				$destination = substr($destination, 0, -1);
+			}
+
+			$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
+			if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
+			{
+				$destination = '';
+			}
+
+			// Move file and overwrite any existing image
+			$file->move_file($destination, true);
+
+			if (sizeof($file->error))
+			{
+				$file->remove();
+				$error = array_merge($error, $file->error);
 				return false;
 			}
+
+			return array(
+				'user_avatar' => $user_row['user_id'] . '_' . time() . '.' . $file->get('extension'),
+				'user_avatar_width' => $file->get('width'),
+				'user_avatar_height' => $file->get('height'),
+			);
 		}
+		
+		$template->assign_vars(array(
+			'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
+			'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
+		));
+		
+		return true;
 	}
 }
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 5d7dbe12d8..a815ec7987 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -570,7 +570,7 @@ class ucp_profile
 								{
 									$result = $avatar->handle_form($template, $user->data, $error, true);
 								
-									if (empty($error))
+									if ($result && empty($error))
 									{
 										// Success! Lets save the result in the database
 										$result['user_avatar_type'] = $driver;
-- 
cgit v1.2.1


From 611a1d647a3a63013df472b469bf1f3e6e7bd657 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Wed, 20 Apr 2011 09:46:36 -0700
Subject: [feature/avatars] Refactor avatar's handle_form

Since it was performing two distinct operations, refactor handle_form
to separate functions that prepare and process forms.

PHPBB3-10018
---
 phpBB/includes/avatar/driver.php        |  10 +-
 phpBB/includes/avatar/driver/local.php  | 105 +++++++++++---------
 phpBB/includes/avatar/driver/remote.php | 168 ++++++++++++++++----------------
 phpBB/includes/avatar/driver/upload.php | 112 +++++++++++----------
 phpBB/includes/ucp/ucp_profile.php      |   4 +-
 5 files changed, 218 insertions(+), 181 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver.php b/phpBB/includes/avatar/driver.php
index a2ff5d804d..5d3b734f7b 100644
--- a/phpBB/includes/avatar/driver.php
+++ b/phpBB/includes/avatar/driver.php
@@ -102,7 +102,15 @@ abstract class phpbb_avatar_driver
 	/**
 	* @TODO
 	**/
-	public function handle_form($template, $user_row, &$error, $submitted = false)
+	public function prepare_form($template, $user_row, &$error)
+	{
+		return false;
+	}
+
+	/**
+	* @TODO
+	**/
+	public function process_form($template, $user_row, &$error)
 	{
 		return false;
 	}
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index f9b7662e93..47ae143ec9 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -47,7 +47,65 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function handle_form($template, $user_row, &$error, $submitted = false)
+	public function prepare_form($template, $user_row, &$error)
+	{
+		$avatar_list = $this->get_avatar_list();
+		$category = request_var('av_local_cat', '');
+		
+		$categories = array_keys($avatar_list);
+
+		foreach ($categories as $cat)
+		{
+			if (!empty($avatar_list[$cat]))
+			{
+				$template->assign_block_vars('av_local_cats', array(
+					'NAME' => $cat,
+					'SELECTED' => ($cat == $category),
+				));
+			}
+		}
+
+		if (!empty($avatar_list[$category]))
+		{
+			foreach ($avatar_list[$category] as $img => $data)
+			{
+				$template->assign_block_vars('av_local_imgs', array(
+					'AVATAR_IMAGE'  => $path . '/' . $data['file'],
+					'AVATAR_NAME' => $data['name'],
+					'AVATAR_FILE' => $data['filename'],
+				));
+			}
+		}
+
+		return true;
+	}
+	
+	/**
+	* @inheritdoc
+	*/
+	public function process_form($template, $user_row, &$error)
+	{
+		$avatar_list = $this->get_avatar_list();
+		$category = request_var('av_local_cat', '');
+		
+		$file = request_var('av_local_file', '');
+		if (!isset($avatar_list[$category][urldecode($file)]))
+		{
+			$error[] = 'AVATAR_URL_NOT_FOUND';
+			return false;
+		}
+
+		return array(
+			'user_avatar' => $category . '/' . $file,
+			'user_avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
+			'user_avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
+		);
+	}
+
+	/**
+	* @TODO
+	*/
+	private function get_avatar_list()
 	{
 		$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list');
 
@@ -101,50 +159,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 				$this->cache->put('av_local_list', $avatar_list);
 			}
 		}
-		
-		$category = request_var('av_local_cat', '');
-		
-		if ($submitted) {
-			$file = request_var('av_local_file', '');
-			if (!isset($avatar_list[$category][urldecode($file)]))
-			{
-				$error[] = 'AVATAR_URL_NOT_FOUND';
-				return false;
-			}
-
-			return array(
-				'user_avatar' => $category . '/' . $file,
-				'user_avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
-				'user_avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
-			);
-		}
-
-
-		$categories = array_keys($avatar_list);
-
-		foreach ($categories as $cat)
-		{
-			if (!empty($avatar_list[$cat]))
-			{
-				$template->assign_block_vars('av_local_cats', array(
-					'NAME' => $cat,
-					'SELECTED' => ($cat == $category),
-				));
-			}
-		}
-
-		if (!empty($avatar_list[$category]))
-		{
-			foreach ($avatar_list[$category] as $img => $data)
-			{
-				$template->assign_block_vars('av_local_imgs', array(
-					'AVATAR_IMAGE'  => $path . '/' . $data['file'],
-					'AVATAR_NAME' => $data['name'],
-					'AVATAR_FILE' => $data['filename'],
-				));
-			}
-		}
 
-		return true;
+		return $avatar_list;
 	}
 }
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 48f86cac3f..32f93c7928 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -47,115 +47,115 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function handle_form($template, $user_row, &$error, $submitted = false)
+	public function prepare_form($template, $user_row, &$error)
 	{
-		if ($submitted)
-		{
-			$url = request_var('av_remote_url', '');
-			$width = request_var('av_remote_width', 0);
-			$height = request_var('av_remote_height', 0);
+		$template->assign_vars(array(
+			'AV_REMOTE_WIDTH' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar_width']) ? $user_row['user_avatar_width'] : request_var('av_local_width', 0),
+			'AV_REMOTE_HEIGHT' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar_height']) ? $user_row['user_avatar_height'] : request_var('av_local_width', 0),
+			'AV_REMOTE_URL' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar']) ? $user_row['user_avatar'] : '',
+		));
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function process_form($template, $user_row, &$error)
+	{
+		$url = request_var('av_remote_url', '');
+		$width = request_var('av_remote_width', 0);
+		$height = request_var('av_remote_height', 0);
 			
-			if (!preg_match('#^(http|https|ftp)://#i', $url))
-			{
-				$url = 'http://' . $url;
-			}
+		if (!preg_match('#^(http|https|ftp)://#i', $url))
+		{
+			$url = 'http://' . $url;
+		}
 
-			$error = array_merge($error, validate_data(array(
-				'url' => $url,
-			), array(
-				'url' => array('string', true, 5, 255),
-			)));
+		$error = array_merge($error, validate_data(array(
+			'url' => $url,
+		), array(
+			'url' => array('string', true, 5, 255),
+		)));
 
-			if (!empty($error))
-			{
-				return false;
-			}
+		if (!empty($error))
+		{
+			return false;
+		}
 
-			// Check if this url looks alright
-			// This isn't perfect, but it's what phpBB 3.0 did, and might as well make sure everything is compatible
-			if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $url))
-			{
-				$error[] = 'AVATAR_URL_INVALID';
-				return false;
-			}
+		// Check if this url looks alright
+		// This isn't perfect, but it's what phpBB 3.0 did, and might as well make sure everything is compatible
+		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $url))
+		{
+			$error[] = 'AVATAR_URL_INVALID';
+			return false;
+		}
 
-			// Make sure getimagesize works...
-			if (function_exists('getimagesize'))
+		// Make sure getimagesize works...
+		if (function_exists('getimagesize'))
+		{
+			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
 			{
-				if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
-				{
-					$error[] = 'UNABLE_GET_IMAGE_SIZE';
-					return false;
-				}
-
-				if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
-				{
-					$error[] = 'AVATAR_NO_SIZE';
-					return false;
-				}
-
-				$width = ($width && $height) ? $width : $image_data[0];
-				$height = ($width && $height) ? $height : $image_data[1];
+				$error[] = 'UNABLE_GET_IMAGE_SIZE';
+				return false;
 			}
 
-			if ($width <= 0 || $height <= 0)
+			if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
 			{
 				$error[] = 'AVATAR_NO_SIZE';
 				return false;
 			}
 
-			include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
-			$types = fileupload::image_types();
-			$extension = strtolower(filespec::get_extension($url));
+			$width = ($width && $height) ? $width : $image_data[0];
+			$height = ($width && $height) ? $height : $image_data[1];
+		}
 
-			if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
-			{
-				if (!isset($types[$image_data[2]]))
-				{
-					$error[] = 'UNABLE_GET_IMAGE_SIZE';
-				}
-				else
-				{
-					$error[] = array('IMAGE_FILETYPE_MISMATCH', $types[$image_data[2]][0], $extension);
-				}
+		if ($width <= 0 || $height <= 0)
+		{
+			$error[] = 'AVATAR_NO_SIZE';
+			return false;
+		}
 
-				return false;
-			}
+		include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
+		$types = fileupload::image_types();
+		$extension = strtolower(filespec::get_extension($url));
 
-			if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
+		if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
+		{
+			if (!isset($types[$image_data[2]]))
 			{
-				if ($width > $this->config['avatar_max_width'] || $height > $this->config['avatar_max_height'])
-				{
-					$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
-					return false;
-				}
+				$error[] = 'UNABLE_GET_IMAGE_SIZE';
 			}
-
-			if ($this->config['avatar_min_width'] || $this->config['avatar_min_height'])
+			else
 			{
-				if ($width < $this->config['avatar_min_width'] || $height < $this->config['avatar_min_height'])
-				{
-					$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
-					return false;
-				}
+				$error[] = array('IMAGE_FILETYPE_MISMATCH', $types[$image_data[2]][0], $extension);
 			}
 
-			$result = array(
-				'user_avatar' => $url,
-				'user_avatar_width' => $width,
-				'user_avatar_height' => $height,
-			);
+			return false;
+		}
 
-			return $result;
+		if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
+		{
+			if ($width > $this->config['avatar_max_width'] || $height > $this->config['avatar_max_height'])
+			{
+				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
+				return false;
+			}
 		}
-		else
+
+		if ($this->config['avatar_min_width'] || $this->config['avatar_min_height'])
 		{
-			$template->assign_vars(array(
-				'AV_REMOTE_WIDTH' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar_width']) ? $user_row['user_avatar_width'] : request_var('av_local_width', 0),
-				'AV_REMOTE_HEIGHT' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar_height']) ? $user_row['user_avatar_height'] : request_var('av_local_width', 0),
-				'AV_REMOTE_URL' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar']) ? $user_row['user_avatar'] : '',
-			));
-			return true;
+			if ($width < $this->config['avatar_min_width'] || $height < $this->config['avatar_min_height'])
+			{
+				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
+				return false;
+			}
 		}
+
+		return array(
+			'user_avatar' => $url,
+			'user_avatar_width' => $width,
+			'user_avatar_height' => $height,
+		);
 	}
 }
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index cbc46e0e49..dd1dbfa5a0 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -47,71 +47,85 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function handle_form($template, $user_row, &$error, $submitted = false)
+	public function prepare_form($template, $user_row, &$error)
 	{
-		$can_upload = (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
-
-		if ($can_upload == false)
+		if (!$this->can_upload())
 		{
 			return false;
 		}
 
-		if ($submitted)
+		$template->assign_vars(array(
+			'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
+			'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
+		));
+		
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function process_form($template, $user_row, &$error)
+	{
+		if (!$this->can_upload())
 		{
-			include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
+			return false;
+		}
 
-			$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
+		include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
 
-			$url = request_var('av_upload_url', '');
+		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
-			if (!empty($_FILES['av_upload_file']['name']))
-			{
-				$file = $upload->form_upload('av_upload_file');
-			}
-			else
-			{
-				$file = $upload->remote_upload($url);
-			}
+		$url = request_var('av_upload_url', '');
 
-			$prefix = $this->config['avatar_salt'] . '_';
-			$file->clean_filename('avatar', $prefix, $user_row['user_id']);
+		if (!empty($_FILES['av_upload_file']['name']))
+		{
+			$file = $upload->form_upload('av_upload_file');
+		}
+		else
+		{
+			$file = $upload->remote_upload($url);
+		}
 
-			$destination = $this->config['avatar_path'];
+		$prefix = $this->config['avatar_salt'] . '_';
+		$file->clean_filename('avatar', $prefix, $user_row['user_id']);
 
-			// Adjust destination path (no trailing slash)
-			if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
-			{
-				$destination = substr($destination, 0, -1);
-			}
+		$destination = $this->config['avatar_path'];
 
-			$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
-			if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
-			{
-				$destination = '';
-			}
+		// Adjust destination path (no trailing slash)
+		if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
+		{
+			$destination = substr($destination, 0, -1);
+		}
 
-			// Move file and overwrite any existing image
-			$file->move_file($destination, true);
+		$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
+		if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
+		{
+			$destination = '';
+		}
 
-			if (sizeof($file->error))
-			{
-				$file->remove();
-				$error = array_merge($error, $file->error);
-				return false;
-			}
+		// Move file and overwrite any existing image
+		$file->move_file($destination, true);
 
-			return array(
-				'user_avatar' => $user_row['user_id'] . '_' . time() . '.' . $file->get('extension'),
-				'user_avatar_width' => $file->get('width'),
-				'user_avatar_height' => $file->get('height'),
-			);
+		if (sizeof($file->error))
+		{
+			$file->remove();
+			$error = array_merge($error, $file->error);
+			return false;
 		}
-		
-		$template->assign_vars(array(
-			'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
-			'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
-		));
-		
-		return true;
+
+		return array(
+			'user_avatar' => $user_row['user_id'] . '_' . time() . '.' . $file->get('extension'),
+			'user_avatar_width' => $file->get('width'),
+			'user_avatar_height' => $file->get('height'),
+		);
+	}
+
+	/**
+	* @TODO
+	*/
+	private function can_upload()
+	{
+		return (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on'));
 	}
 }
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index a815ec7987..a712547bd1 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -568,7 +568,7 @@ class ucp_profile
 							{
 								if (check_form_key('ucp_avatar'))
 								{
-									$result = $avatar->handle_form($template, $user->data, $error, true);
+									$result = $avatar->process_form($template, $user->data, $error);
 								
 									if ($result && empty($error))
 									{
@@ -592,7 +592,7 @@ class ucp_profile
 								}
 							}
 
-							if ($avatar->handle_form($template, $user->data, $error)) {
+							if ($avatar->prepare_form($template, $user->data, $error)) {
 								$driver_u = strtoupper($driver);
 
 								$template->assign_block_vars('avatar_drivers', array(
-- 
cgit v1.2.1


From 84099e5bc1f452e1a4643fd78658929875ab1eee Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Wed, 20 Apr 2011 23:14:38 -0700
Subject: [feature/avatars] Support proper avatar deletion, stub ACP

Fixing avatar deletion in the UCP and ACP, and stubbing the ACP
configuration page. I'll admit I kind of got caught carried away, so
this really should be a couple separate commits.

PHPBB3-10018
---
 phpBB/includes/acp/acp_users.php        |  9 +++++----
 phpBB/includes/avatar/driver.php        |  8 ++++++++
 phpBB/includes/avatar/driver/upload.php | 16 ++++++++++++++++
 phpBB/includes/avatar/manager.php       | 14 ++++++++++++++
 phpBB/includes/functions_user.php       |  1 +
 phpBB/includes/ucp/ucp_profile.php      | 33 +++++++++++++++++++++++++++++++++
 6 files changed, 77 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 390e421a51..5dc1829e8b 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -452,10 +452,10 @@ class acp_users
 							{
 								trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
 							}
-
+							
 							$sql_ary = array(
 								'user_avatar'			=> '',
-								'user_avatar_type'		=> 0,
+								'user_avatar_type'		=> '',
 								'user_avatar_width'		=> 0,
 								'user_avatar_height'	=> 0,
 							);
@@ -466,9 +466,10 @@ class acp_users
 							$db->sql_query($sql);
 
 							// Delete old avatar if present
-							if ($user_row['user_avatar'] && $user_row['user_avatar_type'] != AVATAR_GALLERY)
+							$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
+							if ($driver = $avatar_manager->get_driver($user_row['user_avatar_type']))
 							{
-								avatar_delete('user', $user_row);
+								$driver->delete($user_row);
 							}
 
 							add_log('admin', 'LOG_USER_DEL_AVATAR', $user_row['username']);
diff --git a/phpBB/includes/avatar/driver.php b/phpBB/includes/avatar/driver.php
index 5d3b734f7b..5322f73c60 100644
--- a/phpBB/includes/avatar/driver.php
+++ b/phpBB/includes/avatar/driver.php
@@ -114,4 +114,12 @@ abstract class phpbb_avatar_driver
 	{
 		return false;
 	}
+
+	/**
+	* @TODO
+	**/
+	public function delete($user_row)
+	{
+		return true;
+	}
 }
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index dd1dbfa5a0..5b487745b1 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -121,6 +121,22 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 		);
 	}
 
+	/**
+	* @inheritdoc
+	*/
+	public function delete($user_row)
+	{
+		$ext = substr(strrchr($user_row['user_avatar'], '.'), 1);
+		$filename = $this->phpbb_root_path . $this->config['avatar_path'] . '/' . $this->config['avatar_salt'] . '_' . $user_row['user_id'] . '.' . $ext;
+
+		if (file_exists($filename))
+		{
+			@unlink($filename);
+		}
+
+		return true;
+	}
+
 	/**
 	* @TODO
 	*/
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 6471c4cc9c..7137243898 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -47,6 +47,20 @@ class phpbb_avatar_manager
 			$this->load_valid_drivers();
 		}
 
+		// Legacy stuff...
+		switch ($avatar_type)
+		{
+			case AVATAR_LOCAL:
+				$avatar_type = 'local';
+				break;
+			case AVATAR_UPLOAD:
+				$avatar_type = 'upload';
+				break;
+			case AVATAR_REMOTE:
+				$avatar_type = 'remote';
+				break;
+		}
+
 		if (isset(self::$valid_drivers[$avatar_type]))
 		{
 			if ($new || !is_object(self::$valid_drivers[$avatar_type]))
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 509e1a953c..9035cac7be 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1968,6 +1968,7 @@ function avatar_delete($mode, $row, $clean_db = false)
 		avatar_remove_db($row[$mode . '_avatar']);
 	}
 	$filename = get_avatar_filename($row[$mode . '_avatar']);
+
 	if (file_exists($phpbb_root_path . $config['avatar_path'] . '/' . $filename))
 	{
 		@unlink($phpbb_root_path . $config['avatar_path'] . '/' . $filename);
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index a712547bd1..222d9e0af4 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -553,6 +553,39 @@ class ucp_profile
 				if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
 				{
 					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
+					
+					if (isset($_POST['av_delete']))
+					{
+						if (check_form_key('ucp_avatar'))
+						{
+							$result = array(
+								'user_avatar' => '',
+								'user_avatar_type' => '',
+								'user_avatar_width' => 0,
+								'user_avatar_height' => 0,
+							);
+							
+							if ($driver = $avatar_manager->get_driver($user->data['user_avatar_type']))
+							{
+								$driver->delete($user->data);
+							}
+										
+							$sql = 'UPDATE ' . USERS_TABLE . '
+								SET ' . $db->sql_build_array('UPDATE', $result) . '
+								WHERE user_id = ' . $user->data['user_id'];
+
+							$db->sql_query($sql);
+
+							meta_refresh(3, $this->u_action);
+							$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							trigger_error($message);
+						}
+						else
+						{
+							$error[] = 'FORM_INVALID';
+						}
+					}
+
 					$avatar_drivers = $avatar_manager->get_valid_drivers();
 					sort($avatar_drivers);
 
-- 
cgit v1.2.1


From 6d0f2e478800e1e9696701eeff00ac69c1e57dee Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Wed, 15 Jun 2011 12:38:17 -0700
Subject: [feature/avatars] Fixing typos in avatar manager and local avatars

See above

PHPBB3-10018
---
 phpBB/includes/avatar/driver/local.php | 2 +-
 phpBB/includes/avatar/manager.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 47ae143ec9..216ad2ce46 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -70,7 +70,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 			foreach ($avatar_list[$category] as $img => $data)
 			{
 				$template->assign_block_vars('av_local_imgs', array(
-					'AVATAR_IMAGE'  => $path . '/' . $data['file'],
+					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $data['file'],
 					'AVATAR_NAME' => $data['name'],
 					'AVATAR_FILE' => $data['filename'],
 				));
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 7137243898..001fcf2f14 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -50,7 +50,7 @@ class phpbb_avatar_manager
 		// Legacy stuff...
 		switch ($avatar_type)
 		{
-			case AVATAR_LOCAL:
+			case AVATAR_GALLERY:
 				$avatar_type = 'local';
 				break;
 			case AVATAR_UPLOAD:
-- 
cgit v1.2.1


From 22c864cb3a945b52fe9b91765d247abfe00b50bc Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@phpbb.com>
Date: Wed, 15 Jun 2011 12:58:02 -0700
Subject: [feature/avatars] Dynamically list the avatar types in UCP and ACP

List the avatar types more nicely, adding UCP modify user support

PHPBB3-10018
---
 phpBB/includes/acp/acp_users.php   | 136 +++++++++++++++++++++++++------------
 phpBB/includes/ucp/ucp_profile.php |   9 ++-
 2 files changed, 100 insertions(+), 45 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 5dc1829e8b..9c8a1c683e 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1683,65 +1683,117 @@ class acp_users
 			case 'avatar':
 
 				include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
-				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-
-				$can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_is_writable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false;
 
-				if ($submit)
+				$avatars_enabled = false;
+				if ($config['allow_avatar'])
 				{
+					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
 
-					if (!check_form_key($form_name))
+					if (isset($_POST['av_delete']))
 					{
+						if (!check_form_key($form_name))
+						{
 							trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
+						}
+
+						$result = array(
+							'user_avatar' => '',
+							'user_avatar_type' => '',
+							'user_avatar_height' => 0,
+							'user_avatar_width' => 0,
+						);
+
+						if ($driver = $avatar_manager->get_driver($user_row['user_avatar_type']))
+						{
+							$driver->delete($user_row);
+						}
+
+						$sql = 'UPDATE ' . USERS_TABLE . '
+							SET ' . $db->sql_build_array('UPDATE', $result) . '
+							WHERE user_id = ' . $user_id;
+
+						$db->sql_query($sql);
+						trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
 					}
 
-					if (avatar_process_user($error, $user_row, $can_upload))
+					$avatar_drivers = $avatar_manager->get_valid_drivers();
+					sort($avatar_drivers);
+
+					foreach ($avatar_drivers as $driver)
 					{
-						trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_row['user_id']));
-					}
+						if ($config["allow_avatar_$driver"])
+						{
+							$avatars_enabled = true;
+							$template->set_filenames(array(
+								'avatar' => "acp_avatar_options_$driver.html",
+							));
 
-					// Replace "error" strings with their real, localised form
-					$error = array_map(array($user, 'lang'), $error);
-				}
+							$avatar = $avatar_manager->get_driver($driver);
+							if (isset($_POST["submit_av_$driver"]))
+							{
+								if (!check_form_key($form_name))
+								{
+									trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
+								}
 
-				if (!$config['allow_avatar'] && $user_row['user_avatar_type'])
-				{
-					$error[] = $user->lang['USER_AVATAR_NOT_ALLOWED'];
-				}
-				else if ((($user_row['user_avatar_type'] == AVATAR_UPLOAD) && !$config['allow_avatar_upload']) ||
-				 (($user_row['user_avatar_type'] == AVATAR_REMOTE) && !$config['allow_avatar_remote']) ||
-				 (($user_row['user_avatar_type'] == AVATAR_GALLERY) && !$config['allow_avatar_local']))
-				{
-					$error[] = $user->lang['USER_AVATAR_TYPE_NOT_ALLOWED'];
-				}
+								$result = $avatar->process_form($template, $user_row, $error);
 
-				// Generate users avatar
-				$avatar_img = ($user_row['user_avatar']) ? get_user_avatar($user_row, 'USER_AVATAR', true) : '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />';
+								if ($result && empty($error))
+								{
+									// Success! Lets save the result in the database
+									$result['user_avatar_type'] = $driver;
+									$sql = 'UPDATE ' . USERS_TABLE . '
+										SET ' . $db->sql_build_array('UPDATE', $result) . '
+										WHERE user_id = ' . $user_id;
 
-				$display_gallery = (isset($_POST['display_gallery'])) ? true : false;
-				$avatar_select = basename(request_var('avatar_select', ''));
-				$category = basename(request_var('category', ''));
+									$db->sql_query($sql);
+									trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
+								}
+							}
 
-				if ($config['allow_avatar_local'] && $display_gallery)
+							if ($avatar->prepare_form($template, $user_row, $error))
+							{
+								$driver_u = strtoupper($driver);
+								$template->assign_block_vars('avatar_drivers', array(
+									'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values
+									'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
+									'DRIVER' => $driver,
+									'OUTPUT' => $template->assign_display('avatar'),
+								));
+							}
+						}
+					}
+				}
+
+				// Replace "error" strings with their real, localised form
+				$err = $error;
+				$error = array();
+				foreach ($err as $e)
 				{
-					avatar_gallery($category, $avatar_select, 4);
+					if (is_array($e))
+					{
+						$key = array_shift($e);
+						$error[] = vsprintf($user->lang($key), $e);
+					}
+					else
+					{
+						$error[] = $user->lang((string) $e);
+					}
 				}
+				
+				$avatar = get_user_avatar($user_row, 'USER_AVATAR', true);
 
 				$template->assign_vars(array(
-					'S_AVATAR'			=> true,
-					'S_CAN_UPLOAD'		=> $can_upload,
-					'S_UPLOAD_FILE'		=> ($config['allow_avatar'] && $can_upload && $config['allow_avatar_upload']) ? true : false,
-					'S_REMOTE_UPLOAD'	=> ($config['allow_avatar'] && $can_upload && $config['allow_avatar_remote_upload']) ? true : false,
-					'S_ALLOW_REMOTE'	=> ($config['allow_avatar'] && $config['allow_avatar_remote']) ? true : false,
-					'S_DISPLAY_GALLERY'	=> ($config['allow_avatar'] && $config['allow_avatar_local'] && !$display_gallery) ? true : false,
-					'S_IN_GALLERY'		=> ($config['allow_avatar'] && $config['allow_avatar_local'] && $display_gallery) ? true : false,
-
-					'AVATAR_IMAGE'			=> $avatar_img,
-					'AVATAR_MAX_FILESIZE'	=> $config['avatar_filesize'],
-					'USER_AVATAR_WIDTH'		=> $user_row['user_avatar_width'],
-					'USER_AVATAR_HEIGHT'	=> $user_row['user_avatar_height'],
-
-					'L_AVATAR_EXPLAIN'	=> phpbb_avatar_explanation_string(),
+					'S_AVATAR'	=> true,
+					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'AVATAR'		=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar),
+					'AV_SHOW_DELETE' => !empty($avatar),
+
+					'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
+
+					'L_AVATAR_EXPLAIN'	=> sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024),
+					
+					'S_AVATARS_ENABLED'		=> ($config['allow_avatar'] && $avatars_enabled),
 				));
 
 			break;
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 222d9e0af4..bcafd3d636 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -589,8 +589,10 @@ class ucp_profile
 					$avatar_drivers = $avatar_manager->get_valid_drivers();
 					sort($avatar_drivers);
 
-					foreach ($avatar_drivers as $driver) {
-						if ($config["allow_avatar_$driver"]) {
+					foreach ($avatar_drivers as $driver)
+					{
+						if ($config["allow_avatar_$driver"])
+						{
 							$avatars_enabled = true;
 							$template->set_filenames(array(
 								'avatar' => "ucp_avatar_options_$driver.html",
@@ -625,7 +627,8 @@ class ucp_profile
 								}
 							}
 
-							if ($avatar->prepare_form($template, $user->data, $error)) {
+							if ($avatar->prepare_form($template, $user->data, $error))
+							{
 								$driver_u = strtoupper($driver);
 
 								$template->assign_block_vars('avatar_drivers', array(
-- 
cgit v1.2.1


From 6deadc3acf302e9fd15adfd6bff5f0fe525240c7 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@cullenwalsh.com>
Date: Sat, 18 Jun 2011 21:12:29 -0700
Subject: [feature/avatars] Rework UCP to be simpler/more consistent

Redesigning the UCP avatar page to use javascript to make use less
confusing. This design is also more easily transfered to the ACP for
group avatars, which will give better consistency in the long run.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/remote.php |  2 +
 phpBB/includes/ucp/ucp_profile.php      | 69 +++++++++++++++++++++++----------
 2 files changed, 50 insertions(+), 21 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 32f93c7928..c28eed93da 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -72,6 +72,8 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 			$url = 'http://' . $url;
 		}
 
+		require_once($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
+
 		$error = array_merge($error, validate_data(array(
 			'url' => $url,
 		), array(
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index bcafd3d636..d5f3ec4b81 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -554,31 +554,60 @@ class ucp_profile
 				{
 					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
 					
-					if (isset($_POST['av_delete']))
+					$avatar_drivers = $avatar_manager->get_valid_drivers();
+					sort($avatar_drivers);
+
+					if ($submit)
 					{
 						if (check_form_key('ucp_avatar'))
 						{
-							$result = array(
-								'user_avatar' => '',
-								'user_avatar_type' => '',
-								'user_avatar_width' => 0,
-								'user_avatar_height' => 0,
-							);
-							
-							if ($driver = $avatar_manager->get_driver($user->data['user_avatar_type']))
+							$driver = request_var('avatar_driver', '');
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
 							{
-								$driver->delete($user->data);
+								$avatar = $avatar_manager->get_driver($driver);
+								$result = $avatar->process_form($template, $user->data, $error);
+
+								if ($result && empty($error))
+								{
+									// Success! Lets save the result in the database
+									$result['user_avatar_type'] = $driver;
+
+									$sql = 'UPDATE ' . USERS_TABLE . '
+										SET ' . $db->sql_build_array('UPDATE', $result) . '
+										WHERE user_id = ' . $user->data['user_id'];
+
+									$db->sql_query($sql);
+									
+									meta_refresh(3, $this->u_action);
+									$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+									trigger_error($message);
+								}
 							}
-										
-							$sql = 'UPDATE ' . USERS_TABLE . '
-								SET ' . $db->sql_build_array('UPDATE', $result) . '
-								WHERE user_id = ' . $user->data['user_id'];
+							else
+							{
+								// They are removing their avatar or are trying to play games with us
+								if ($avatar = $avatar_manager->get_driver($user->data['user_avatar_type']))
+								{
+									$avatar->delete($user->data);
+								}
 
-							$db->sql_query($sql);
+								$result = array(
+									'user_avatar' => '',
+									'user_avatar_type' => '',
+									'user_avatar_width' => 0,
+									'user_avatar_height' => 0,
+								);
 
-							meta_refresh(3, $this->u_action);
-							$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-							trigger_error($message);
+								$sql = 'UPDATE ' . USERS_TABLE . '
+									SET ' . $db->sql_build_array('UPDATE', $result) . '
+									WHERE user_id = ' . $user->data['user_id'];
+
+								$db->sql_query($sql);
+								
+								meta_refresh(3, $this->u_action);
+								$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+								trigger_error($message);
+							}
 						}
 						else
 						{
@@ -586,9 +615,6 @@ class ucp_profile
 						}
 					}
 
-					$avatar_drivers = $avatar_manager->get_valid_drivers();
-					sort($avatar_drivers);
-
 					foreach ($avatar_drivers as $driver)
 					{
 						if ($config["allow_avatar_$driver"])
@@ -636,6 +662,7 @@ class ucp_profile
 									'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
 
 									'DRIVER' => $driver,
+									'SELECTED' => ($driver == $user->data['user_avatar_type']),
 									'OUTPUT' => $template->assign_display('avatar'),
 								));
 							}
-- 
cgit v1.2.1


From d0bb14ded1960de47eb07d955a483d74fd9e0af2 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@cullenwalsh.com>
Date: Sat, 18 Jun 2011 22:05:54 -0700
Subject: [feature/avatars] Update ACP manage users, fix gallery focus issue

Updated ACP to match UCP with dropdown. Correctly determe which
avatar to focus on by checking if the form was submitted and
avatar_driver is set.

PHPBB3-10018
---
 phpBB/includes/acp/acp_users.php   | 84 +++++++++++++++++++-------------------
 phpBB/includes/avatar/driver.php   |  2 +-
 phpBB/includes/ucp/ucp_profile.php | 31 ++------------
 3 files changed, 47 insertions(+), 70 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 9c8a1c683e..bcce458e20 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1689,53 +1689,17 @@ class acp_users
 				{
 					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
 
-					if (isset($_POST['av_delete']))
-					{
-						if (!check_form_key($form_name))
-						{
-							trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-						}
-
-						$result = array(
-							'user_avatar' => '',
-							'user_avatar_type' => '',
-							'user_avatar_height' => 0,
-							'user_avatar_width' => 0,
-						);
-
-						if ($driver = $avatar_manager->get_driver($user_row['user_avatar_type']))
-						{
-							$driver->delete($user_row);
-						}
-
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET ' . $db->sql_build_array('UPDATE', $result) . '
-							WHERE user_id = ' . $user_id;
-
-						$db->sql_query($sql);
-						trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
-					}
-
 					$avatar_drivers = $avatar_manager->get_valid_drivers();
 					sort($avatar_drivers);
 
-					foreach ($avatar_drivers as $driver)
+					if ($submit)
 					{
-						if ($config["allow_avatar_$driver"])
+						if (check_form_key($form_name))
 						{
-							$avatars_enabled = true;
-							$template->set_filenames(array(
-								'avatar' => "acp_avatar_options_$driver.html",
-							));
-
-							$avatar = $avatar_manager->get_driver($driver);
-							if (isset($_POST["submit_av_$driver"]))
+							$driver = request_var('avatar_driver', '');
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
 							{
-								if (!check_form_key($form_name))
-								{
-									trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
-								}
-
+								$avatar = $avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $user_row, $error);
 
 								if ($result && empty($error))
@@ -1750,6 +1714,42 @@ class acp_users
 									trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
 								}
 							}
+							else
+							{
+								// Removing the avatar
+								$result = array(
+									'user_avatar' => '',
+									'user_avatar_type' => '',
+									'user_avatar_width' => 0,
+									'user_avatar_height' => 0,
+								);
+								
+								$sql = 'UPDATE ' . USERS_TABLE . '
+									SET ' . $db->sql_build_array('UPDATE', $result) . '
+									WHERE user_id = ' . $user_id;
+
+								$db->sql_query($sql);
+								trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
+							}
+						}
+						else
+						{
+							trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
+						}
+					}
+
+					$focused_driver = request_var('avatar_driver', $user_row['user_avatar_type']);
+
+					foreach ($avatar_drivers as $driver)
+					{
+						if ($config["allow_avatar_$driver"])
+						{
+							$avatars_enabled = true;
+							$template->set_filenames(array(
+								'avatar' => "acp_avatar_options_$driver.html",
+							));
+
+							$avatar = $avatar_manager->get_driver($driver);
 
 							if ($avatar->prepare_form($template, $user_row, $error))
 							{
@@ -1757,7 +1757,9 @@ class acp_users
 								$template->assign_block_vars('avatar_drivers', array(
 									'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values
 									'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
+
 									'DRIVER' => $driver,
+									'SELECTED' => ($driver == $focused_driver),
 									'OUTPUT' => $template->assign_display('avatar'),
 								));
 							}
diff --git a/phpBB/includes/avatar/driver.php b/phpBB/includes/avatar/driver.php
index 5322f73c60..1ed5b1a5f7 100644
--- a/phpBB/includes/avatar/driver.php
+++ b/phpBB/includes/avatar/driver.php
@@ -102,7 +102,7 @@ abstract class phpbb_avatar_driver
 	/**
 	* @TODO
 	**/
-	public function prepare_form($template, $user_row, &$error)
+	public function prepare_form($template, $user_row, &$error, &$override_focus)
 	{
 		return false;
 	}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index d5f3ec4b81..186c023798 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -615,6 +615,8 @@ class ucp_profile
 						}
 					}
 
+					$focused_driver = request_var('avatar_driver', $user->data['user_avatar_type']);
+					
 					foreach ($avatar_drivers as $driver)
 					{
 						if ($config["allow_avatar_$driver"])
@@ -625,33 +627,6 @@ class ucp_profile
 							));
 
 							$avatar = $avatar_manager->get_driver($driver);
-							if (isset($_POST["submit_av_$driver"]))
-							{
-								if (check_form_key('ucp_avatar'))
-								{
-									$result = $avatar->process_form($template, $user->data, $error);
-								
-									if ($result && empty($error))
-									{
-										// Success! Lets save the result in the database
-										$result['user_avatar_type'] = $driver;
-
-										$sql = 'UPDATE ' . USERS_TABLE . '
-											SET ' . $db->sql_build_array('UPDATE', $result) . '
-											WHERE user_id = ' . $user->data['user_id'];
-
-										$db->sql_query($sql);
-									
-										meta_refresh(3, $this->u_action);
-										$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-										trigger_error($message);
-									}
-								}
-								else
-								{
-									$error[] = 'FORM_INVALID';
-								}
-							}
 
 							if ($avatar->prepare_form($template, $user->data, $error))
 							{
@@ -662,7 +637,7 @@ class ucp_profile
 									'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
 
 									'DRIVER' => $driver,
-									'SELECTED' => ($driver == $user->data['user_avatar_type']),
+									'SELECTED' => ($driver == $focused_driver),
 									'OUTPUT' => $template->assign_display('avatar'),
 								));
 							}
-- 
cgit v1.2.1


From a06380c69a154659f4f9985238008640670669e0 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@cullenwalsh.com>
Date: Sat, 18 Jun 2011 22:50:52 -0700
Subject: [feature/avatars] Make avatars generic

Adding a cleaning function for data coming from the users/groups
tables so drivers only deal with clean data (ideally). Refactored
get_user_avatar() and get_group_avatar() to use an underlying
get_avatar() function.

PHPBB3-10018
---
 phpBB/includes/avatar/driver.php        | 69 +++++++++++++++++++++++++++------
 phpBB/includes/avatar/driver/local.php  | 18 ++++-----
 phpBB/includes/avatar/driver/remote.php | 24 ++++++------
 phpBB/includes/avatar/driver/upload.php | 26 ++++++-------
 phpBB/includes/functions_display.php    | 66 +++++++++++++++++--------------
 phpBB/includes/ucp/ucp_profile.php      | 16 ++++++--
 6 files changed, 141 insertions(+), 78 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver.php b/phpBB/includes/avatar/driver.php
index 1ed5b1a5f7..d158c419bd 100644
--- a/phpBB/includes/avatar/driver.php
+++ b/phpBB/includes/avatar/driver.php
@@ -44,6 +44,12 @@ abstract class phpbb_avatar_driver
 	* @type phpbb_cache_driver_interface
 	*/
 	protected $cache;
+
+	/**
+	* @TODO
+	*/
+	const FROM_USER = 0;
+	const FROM_GROUP = 1;
 	
 	/**
 	* This flag should be set to true if the avatar requires a nonstandard image
@@ -71,12 +77,12 @@ abstract class phpbb_avatar_driver
 	/**
 	* Get the avatar url and dimensions
 	*
-	* @param $ignore_config Whether this function should respect the users/board
-	*        configuration option, or should just render the avatar anyways.
-	*        Useful for the ACP.
+	* @param $ignore_config Whether this function should respect the users prefs
+	*        and board configuration configuration option, or should just render
+	*        the avatar anyways. Useful for the ACP.
 	* @return array Avatar data
 	*/
-	public function get_data($user_row, $ignore_config = false)
+	public function get_data($row, $ignore_config = false)
 	{
 		return array(
 			'src' => '',
@@ -89,12 +95,12 @@ abstract class phpbb_avatar_driver
 	* Returns custom html for displaying this avatar.
 	* Only called if $custom_html is true.
 	*
-	* @param $ignore_config Whether this function should respect the users/board
-	*        configuration option, or should just render the avatar anyways.
-	*        Useful for the ACP.
+	* @param $ignore_config Whether this function should respect the users prefs
+	*        and board configuration configuration option, or should just render
+	*        the avatar anyways. Useful for the ACP.
 	* @return string HTML
 	*/
-	public function get_custom_html($user_row, $ignore_config = false)
+	public function get_custom_html($row, $ignore_config = false)
 	{
 		return '';
 	}
@@ -102,7 +108,7 @@ abstract class phpbb_avatar_driver
 	/**
 	* @TODO
 	**/
-	public function prepare_form($template, $user_row, &$error, &$override_focus)
+	public function prepare_form($template, $row, &$error, &$override_focus)
 	{
 		return false;
 	}
@@ -110,7 +116,7 @@ abstract class phpbb_avatar_driver
 	/**
 	* @TODO
 	**/
-	public function process_form($template, $user_row, &$error)
+	public function process_form($template, $row, &$error)
 	{
 		return false;
 	}
@@ -118,8 +124,49 @@ abstract class phpbb_avatar_driver
 	/**
 	* @TODO
 	**/
-	public function delete($user_row)
+	public function delete($row)
 	{
 		return true;
 	}
+
+	/**
+	* @TODO
+	**/
+	public static function clean_row($row, $src = phpbb_avatar_driver::FROM_USER)
+	{
+		$return = array();
+		$prefix = false;
+		
+		if ($src == phpbb_avatar_driver::FROM_USER)
+		{
+			$prefix = 'user_';
+		}
+		else if ($src == phpbb_avatar_driver::FROM_GROUP)
+		{
+			$prefix = 'group_';
+		}
+
+		if ($prefix)
+		{
+			$len = strlen($prefix);
+			foreach ($row as $key => $val)
+			{
+				$sub = substr($key, 0, $len);
+				if ($sub == $prefix)
+				{
+					$return[substr($key, $len)] = $val;
+				}
+				else
+				{
+					$return[$key] = $val;
+				}
+			}
+		}
+		else
+		{
+			$return = $row;
+		}
+
+		return $return;
+	}
 }
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 216ad2ce46..edd62696f0 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -24,14 +24,14 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function get_data($user_row, $ignore_config = false)
+	public function get_data($row, $ignore_config = false)
 	{
 		if ($ignore_config || $this->config['allow_avatar_local'])
 		{
 			return array(
-				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $user_row['user_avatar'],
-				'width' => $user_row['user_avatar_width'],
-				'height' => $user_row['user_avatar_height'],
+				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
+				'width' => $row['avatar_width'],
+				'height' => $row['avatar_height'],
 			);
 		}
 		else
@@ -47,7 +47,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form($template, $user_row, &$error)
+	public function prepare_form($template, $row, &$error)
 	{
 		$avatar_list = $this->get_avatar_list();
 		$category = request_var('av_local_cat', '');
@@ -83,7 +83,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function process_form($template, $user_row, &$error)
+	public function process_form($template, $row, &$error)
 	{
 		$avatar_list = $this->get_avatar_list();
 		$category = request_var('av_local_cat', '');
@@ -96,9 +96,9 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 		}
 
 		return array(
-			'user_avatar' => $category . '/' . $file,
-			'user_avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
-			'user_avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
+			'avatar' => $category . '/' . $file,
+			'avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
+			'avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
 		);
 	}
 
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index c28eed93da..cad9850c3f 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -24,14 +24,14 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function get_data($user_row, $ignore_config = false)
+	public function get_data($row, $ignore_config = false)
 	{
 		if ($ignore_config || $this->config['allow_avatar_remote'])
 		{
 			return array(
-				'src' => $user_row['user_avatar'],
-				'width' => $user_row['user_avatar_width'],
-				'height' => $user_row['user_avatar_height'],
+				'src' => $row['avatar'],
+				'width' => $row['avatar_width'],
+				'height' => $row['avatar_height'],
 			);
 		}
 		else
@@ -47,12 +47,12 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form($template, $user_row, &$error)
+	public function prepare_form($template, $row, &$error)
 	{
 		$template->assign_vars(array(
-			'AV_REMOTE_WIDTH' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar_width']) ? $user_row['user_avatar_width'] : request_var('av_local_width', 0),
-			'AV_REMOTE_HEIGHT' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar_height']) ? $user_row['user_avatar_height'] : request_var('av_local_width', 0),
-			'AV_REMOTE_URL' => (($user_row['user_avatar_type'] == AVATAR_REMOTE || $user_row['user_avatar_type'] == 'remote') && $user_row['user_avatar']) ? $user_row['user_avatar'] : '',
+			'AV_REMOTE_WIDTH' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_width']) ? $row['avatar_width'] : request_var('av_local_width', 0),
+			'AV_REMOTE_HEIGHT' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_height']) ? $row['avatar_height'] : request_var('av_local_width', 0),
+			'AV_REMOTE_URL' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar']) ? $row['avatar'] : '',
 		));
 
 		return true;
@@ -61,7 +61,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function process_form($template, $user_row, &$error)
+	public function process_form($template, $row, &$error)
 	{
 		$url = request_var('av_remote_url', '');
 		$width = request_var('av_remote_width', 0);
@@ -155,9 +155,9 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 		}
 
 		return array(
-			'user_avatar' => $url,
-			'user_avatar_width' => $width,
-			'user_avatar_height' => $height,
+			'avatar' => $url,
+			'avatar_width' => $width,
+			'avatar_height' => $height,
 		);
 	}
 }
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 5b487745b1..23521ef435 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -24,14 +24,14 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function get_data($user_row, $ignore_config = false)
+	public function get_data($row, $ignore_config = false)
 	{
 		if ($ignore_config || $this->config['allow_avatar_upload'])
 		{
 			return array(
-				'src' => $this->phpbb_root_path . 'download/file.' . $this->phpEx . '?avatar=' . $user_row['user_avatar'],
-				'width' => $user_row['user_avatar_width'],
-				'height' => $user_row['user_avatar_height'],
+				'src' => $this->phpbb_root_path . 'download/file.' . $this->phpEx . '?avatar=' . $row['avatar'],
+				'width' => $row['avatar_width'],
+				'height' => $row['avatar_height'],
 			);
 		}
 		else
@@ -47,7 +47,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form($template, $user_row, &$error)
+	public function prepare_form($template, $row, &$error)
 	{
 		if (!$this->can_upload())
 		{
@@ -65,7 +65,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function process_form($template, $user_row, &$error)
+	public function process_form($template, $row, &$error)
 	{
 		if (!$this->can_upload())
 		{
@@ -88,7 +88,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 		}
 
 		$prefix = $this->config['avatar_salt'] . '_';
-		$file->clean_filename('avatar', $prefix, $user_row['user_id']);
+		$file->clean_filename('avatar', $prefix, $row['id']);
 
 		$destination = $this->config['avatar_path'];
 
@@ -115,19 +115,19 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 		}
 
 		return array(
-			'user_avatar' => $user_row['user_id'] . '_' . time() . '.' . $file->get('extension'),
-			'user_avatar_width' => $file->get('width'),
-			'user_avatar_height' => $file->get('height'),
+			'avatar' => $row['id'] . '_' . time() . '.' . $file->get('extension'),
+			'avatar_width' => $file->get('width'),
+			'avatar_height' => $file->get('height'),
 		);
 	}
 
 	/**
 	* @inheritdoc
 	*/
-	public function delete($user_row)
+	public function delete($row)
 	{
-		$ext = substr(strrchr($user_row['user_avatar'], '.'), 1);
-		$filename = $this->phpbb_root_path . $this->config['avatar_path'] . '/' . $this->config['avatar_salt'] . '_' . $user_row['user_id'] . '.' . $ext;
+		$ext = substr(strrchr($row['avatar'], '.'), 1);
+		$filename = $this->phpbb_root_path . $this->config['avatar_path'] . '/' . $this->config['avatar_salt'] . '_' . $row['id'] . '.' . $ext;
 
 		if (file_exists($filename))
 		{
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 23900dfd88..b82f004505 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1279,6 +1279,36 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 * @return string Avatar html
 */
 function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
+{
+	$row = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver::FROM_USER);
+	return get_avatar($row, $alt, $ignore_config);
+}
+
+/**
+* Get group avatar
+*
+* @param array $group_row Row from the groups table
+* @param string $alt Optional language string for alt tag within image, can be a language key or text
+* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
+*
+* @return string Avatar html
+*/
+function get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
+{
+	$row = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver::FROM_GROUP);
+	return get_avatar($row, $alt, $ignore_config);
+}
+
+/**
+* Get avatar
+*
+* @param array $row Row cleaned by phpbb_avatar_driver::clean_row
+* @param string $alt Optional language string for alt tag within image, can be a language key or text
+* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
+*
+* @return string Avatar html
+*/
+function get_avatar($row, $alt, $ignore_config = false)
 {
 	global $user, $config, $cache, $phpbb_root_path, $phpEx;
 
@@ -1290,12 +1320,12 @@ function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false
 	}
 
 	$avatar_data = array(
-		'src' => $user_row['user_avatar'],
-		'width' => $user_row['user_avatar_width'],
-		'height' => $user_row['user_avatar_height'],
+		'src' => $row['avatar'],
+		'width' => $row['avatar_width'],
+		'height' => $row['avatar_height'],
 	);
 	
-	switch ($user_row['user_avatar_type'])
+	switch ($row['avatar_type'])
 	{
 		case AVATAR_UPLOAD:
 			// Compatibility with old avatars
@@ -1341,16 +1371,16 @@ function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false
 				$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->get_driver());
 			}
 
-			$avatar = $avatar_manager->get_driver($user_row['user_avatar_type']);
+			$avatar = $avatar_manager->get_driver($row['avatar_type']);
 
 			if ($avatar)
 			{
 				if ($avatar->custom_html)
 				{
-					return $avatar->get_html($user_row, $ignore_config);
+					return $avatar->get_html($row, $ignore_config);
 				}
 
-				$avatar_data = $avatar->get_data($user_row, $ignore_config);
+				$avatar_data = $avatar->get_data($row, $ignore_config);
 			}
 			else
 			{
@@ -1372,25 +1402,3 @@ function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false
 
 	return $html;
 }
-
-/**
-* Get group avatar
-*
-* @param array $group_row Row from the groups table
-* @param string $alt Optional language string for alt tag within image, can be a language key or text
-* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
-*
-* @return string Avatar html
-*/
-function get_group_avatar($group_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
-{
-	// Kind of abusing this functionality...
-	$avatar_row = array(
-		'user_avatar' => $group_row['group_avatar'],
-		'user_avatar_type' => $group_row['group_avatar_type'],
-		'user_avatar_width' => $group_row['group_avatar_width'],
-		'user_avatar_height' => $group_row['group_avatar_height'],
-	);
-
-	return get_user_avatar($group_row, $alt, $ignore_config);
-}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 186c023798..1c469fa290 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -556,6 +556,9 @@ class ucp_profile
 					
 					$avatar_drivers = $avatar_manager->get_valid_drivers();
 					sort($avatar_drivers);
+					
+					// This is normalised data, without the user_ prefix
+					$avatar_data = phpbb_avatar_driver::clean_row($user->data, phpbb_avatar_driver::FROM_USER);
 
 					if ($submit)
 					{
@@ -565,12 +568,17 @@ class ucp_profile
 							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
 							{
 								$avatar = $avatar_manager->get_driver($driver);
-								$result = $avatar->process_form($template, $user->data, $error);
+								$result = $avatar->process_form($template, $avatar_data, $error);
 
 								if ($result && empty($error))
 								{
 									// Success! Lets save the result in the database
-									$result['user_avatar_type'] = $driver;
+									$result = array(
+										'user_avatar_type' => $driver,
+										'user_avatar' => $result['avatar'],
+										'user_avatar_width' => $result['avatar_width'],
+										'user_avatar_height' => $result['avatar_height'],
+									);
 
 									$sql = 'UPDATE ' . USERS_TABLE . '
 										SET ' . $db->sql_build_array('UPDATE', $result) . '
@@ -588,7 +596,7 @@ class ucp_profile
 								// They are removing their avatar or are trying to play games with us
 								if ($avatar = $avatar_manager->get_driver($user->data['user_avatar_type']))
 								{
-									$avatar->delete($user->data);
+									$avatar->delete($avatar_data);
 								}
 
 								$result = array(
@@ -628,7 +636,7 @@ class ucp_profile
 
 							$avatar = $avatar_manager->get_driver($driver);
 
-							if ($avatar->prepare_form($template, $user->data, $error))
+							if ($avatar->prepare_form($template, $avatar_data, $error))
 							{
 								$driver_u = strtoupper($driver);
 
-- 
cgit v1.2.1


From 8416bf3dc9539df19530e3bef85352d40ac795f2 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@cullenwalsh.com>
Date: Sat, 18 Jun 2011 23:49:04 -0700
Subject: [feature/avatars] Made ACP avatar gallery in Manage Users prettier

Added row/column information so avatars can be displayed nicely in
the ACP

PHPBB3-10018
---
 phpBB/includes/acp/acp_users.php       | 14 +++++++++++---
 phpBB/includes/avatar/driver/local.php | 32 ++++++++++++++++++++++++++------
 2 files changed, 37 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index bcce458e20..9b5c52e28e 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1692,6 +1692,9 @@ class acp_users
 					$avatar_drivers = $avatar_manager->get_valid_drivers();
 					sort($avatar_drivers);
 
+					// This is normalised data, without the user_ prefix
+					$avatar_data = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver::FROM_USER);
+
 					if ($submit)
 					{
 						if (check_form_key($form_name))
@@ -1700,12 +1703,17 @@ class acp_users
 							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
 							{
 								$avatar = $avatar_manager->get_driver($driver);
-								$result = $avatar->process_form($template, $user_row, $error);
+								$result = $avatar->process_form($template, $avatar_data, $error);
 
 								if ($result && empty($error))
 								{
 									// Success! Lets save the result in the database
-									$result['user_avatar_type'] = $driver;
+									$result = array(
+										'user_avatar_type' => $driver,
+										'user_avatar' => $result['avatar'],
+										'user_avatar_width' => $result['avatar_width'],
+										'user_avatar_height' => $result['avatar_height'],
+									);
 									$sql = 'UPDATE ' . USERS_TABLE . '
 										SET ' . $db->sql_build_array('UPDATE', $result) . '
 										WHERE user_id = ' . $user_id;
@@ -1751,7 +1759,7 @@ class acp_users
 
 							$avatar = $avatar_manager->get_driver($driver);
 
-							if ($avatar->prepare_form($template, $user_row, $error))
+							if ($avatar->prepare_form($template, $avatar_data, $error))
 							{
 								$driver_u = strtoupper($driver);
 								$template->assign_block_vars('avatar_drivers', array(
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index edd62696f0..85eda96018 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -51,7 +51,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	{
 		$avatar_list = $this->get_avatar_list();
 		$category = request_var('av_local_cat', '');
-		
+
 		$categories = array_keys($avatar_list);
 
 		foreach ($categories as $cat)
@@ -67,13 +67,33 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 		if (!empty($avatar_list[$category]))
 		{
-			foreach ($avatar_list[$category] as $img => $data)
+			$table_cols = isset($row['av_gallery_cols']) ? $row['av_gallery_cols'] : 4;
+			$row_count = $col_count = $av_pos = 0;
+			$av_count = sizeof($avatar_list[$category]);
+
+			reset($avatar_list[$category]);
+
+			while ($av_pos < $av_count)
 			{
-				$template->assign_block_vars('av_local_imgs', array(
-					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $data['file'],
-					'AVATAR_NAME' => $data['name'],
-					'AVATAR_FILE' => $data['filename'],
+				$img = current($avatar_list[$category]);
+				next($avatar_list[$category]);
+
+				if ($col_count == 0)
+				{
+					++$row_count;
+					$template->assign_block_vars('av_local_row', array(
+					));
+				}
+
+				$template->assign_block_vars('av_local_row.av_local_col', array(
+					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
+					'AVATAR_NAME' => $img['name'],
+					'AVATAR_FILE' => $img['filename'],
 				));
+
+				$col_count = ($col_count + 1) % $table_cols;
+
+				++$av_pos;
 			}
 		}
 
-- 
cgit v1.2.1


From 48e61b1b45655b38660740abb0de9704234af849 Mon Sep 17 00:00:00 2001
From: Cullen Walsh <ckwalsh@cullenwalsh.com>
Date: Mon, 4 Jul 2011 16:58:35 -0700
Subject: [feature/avatars] Support editing of group avatars in ACP

Edited templates for group avatars so they can be properly modified in ACP

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php      | 180 +++++++++++++++++----------------
 phpBB/includes/acp/acp_users.php       |   1 -
 phpBB/includes/avatar/driver/local.php |   4 +
 3 files changed, 96 insertions(+), 89 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 9ad157f78a..16ae8670ce 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -54,7 +54,6 @@ class acp_groups
 
 
 		// Clear some vars
-		$can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_is_writable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false;
 		$group_row = array();
 
 		// Grab basic data for group, if group_id is set and exists
@@ -281,8 +280,24 @@ class acp_groups
 				$error = array();
 				$user->add_lang('ucp');
 
-				$avatar_select = basename(request_var('avatar_select', ''));
-				$category = basename(request_var('category', ''));
+				// Setup avatar data for later
+				$avatars_enabled = false;
+				$avatar_manager = null;
+				$avatar_drivers = null;
+				$avatar_data = null;
+				$avatar_error = array();
+
+				if ($config['allow_avatar'])
+				{
+					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
+
+					$avatar_drivers = $avatar_manager->get_valid_drivers();
+					sort($avatar_drivers);
+
+					// This is normalised data, without the group_ prefix
+					$avatar_data = phpbb_avatar_driver::clean_row($group_row, phpbb_avatar_driver::FROM_GROUP);
+				}
+
 
 				// Did we submit?
 				if ($update)
@@ -300,12 +315,6 @@ class acp_groups
 					$allow_desc_urls	= request_var('desc_parse_urls', false);
 					$allow_desc_smilies	= request_var('desc_parse_smilies', false);
 
-					$data['uploadurl']	= request_var('uploadurl', '');
-					$data['remotelink']	= request_var('remotelink', '');
-					$data['width']		= request_var('width', '');
-					$data['height']		= request_var('height', '');
-					$delete				= request_var('delete', '');
-
 					$submit_ary = array(
 						'colour'			=> request_var('group_colour', ''),
 						'rank'				=> request_var('group_rank', 0),
@@ -322,81 +331,38 @@ class acp_groups
 					{
 						$submit_ary['founder_manage'] = isset($_REQUEST['group_founder_manage']) ? 1 : 0;
 					}
-
-					if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink'])
-					{
-						// Avatar stuff
-						$var_ary = array(
-							'uploadurl'		=> array('string', true, 5, 255),
-							'remotelink'	=> array('string', true, 5, 255),
-							'width'			=> array('string', true, 1, 3),
-							'height'		=> array('string', true, 1, 3),
-						);
-
-						if (!($error = validate_data($data, $var_ary)))
+					
+					if ($config['allow_avatar']) {
+						// Handle avatar
+						$driver = request_var('avatar_driver', '');
+						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
 						{
-							$data['user_id'] = "g$group_id";
+							$avatar = $avatar_manager->get_driver($driver);
+							$result = $avatar->process_form($template, $avatar_data, $avatar_error);
 
-							if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload)
+							if ($result && empty($avatar_error))
 							{
-								list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_upload($data, $error);
-							}
-							else if ($data['remotelink'])
-							{
-								list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_remote($data, $error);
+								// Success! Lets save the result
+								
+								/*
+								$result = array(
+									'avatar' => ...,
+									'avatar_width' => ...,
+									'avatar_height' => ...,
+								);
+								*/
+								
+								$submit_ary = array_merge($submit_ary, $result);
+								$submit_ary['avatar_type'] = $driver;
 							}
 						}
-					}
-					else if ($avatar_select && $config['allow_avatar_local'])
-					{
-						// check avatar gallery
-						if (is_dir($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category))
+						else
 						{
-							$submit_ary['avatar_type'] = AVATAR_GALLERY;
-
-							list($submit_ary['avatar_width'], $submit_ary['avatar_height']) = getimagesize($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_select);
-							$submit_ary['avatar'] = $category . '/' . $avatar_select;
-						}
-					}
-					else if ($delete)
-					{
-						$submit_ary['avatar'] = '';
-						$submit_ary['avatar_type'] = $submit_ary['avatar_width'] = $submit_ary['avatar_height'] = 0;
-					}
-					else if ($data['width'] && $data['height'])
-					{
-						// Only update the dimensions?
-						if ($config['avatar_max_width'] || $config['avatar_max_height'])
-						{
-							if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height'])
-							{
-								$error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
-							}
-						}
-
-						if (!sizeof($error))
-						{
-							if ($config['avatar_min_width'] || $config['avatar_min_height'])
-							{
-								if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height'])
-								{
-									$error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
-								}
-							}
-						}
-
-						if (!sizeof($error))
-						{
-							$submit_ary['avatar_width'] = $data['width'];
-							$submit_ary['avatar_height'] = $data['height'];
-						}
-					}
-
-					if ((isset($submit_ary['avatar']) && $submit_ary['avatar'] && (!isset($group_row['group_avatar']))) || $delete)
-					{
-						if (isset($group_row['group_avatar']) && $group_row['group_avatar'])
-						{
-							avatar_delete('group', $group_row, true);
+							// Removing the avatar
+							$submit_ary['avatar_type'] = '';
+							$submit_ary['avatar'] = '';
+							$submit_ary['avatar_width'] = 0;
+							$submit_ary['avatar_height'] = 0;
 						}
 					}
 
@@ -423,7 +389,7 @@ class acp_groups
 							'rank'			=> 'int',
 							'colour'		=> 'string',
 							'avatar'		=> 'string',
-							'avatar_type'	=> 'int',
+							'avatar_type'	=> 'string',
 							'avatar_width'	=> 'int',
 							'avatar_height'	=> 'int',
 							'receive_pm'	=> 'int',
@@ -553,13 +519,54 @@ class acp_groups
 				$type_closed	= ($group_type == GROUP_CLOSED) ? ' checked="checked"' : '';
 				$type_hidden	= ($group_type == GROUP_HIDDEN) ? ' checked="checked"' : '';
 
-				$avatar_img = (!empty($group_row['group_avatar'])) ? get_group_avatar($group_row) : '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />';
+				// Load up stuff for avatars
+				if ($config['allow_avatar'])
+				{
+					$avatars_enabled = false;
+					$focused_driver = request_var('avatar_driver', $avatar_data['avatar_type']);
+
+					foreach ($avatar_drivers as $driver)
+					{
+						if ($config["allow_avatar_$driver"])
+						{
+							$avatars_enabled = true;
+							$template->set_filenames(array(
+								'avatar' => "acp_avatar_options_$driver.html",
+							));
 
-				$display_gallery = (isset($_POST['display_gallery'])) ? true : false;
+							$avatar = $avatar_manager->get_driver($driver);
 
-				if ($config['allow_avatar_local'] && $display_gallery)
+							if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
+							{
+								$driver_u = strtoupper($driver);
+								$template->assign_block_vars('avatar_drivers', array(
+									'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values
+									'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
+
+									'DRIVER' => $driver,
+									'SELECTED' => ($driver == $focused_driver),
+									'OUTPUT' => $template->assign_display('avatar'),
+								));
+							}
+						}
+					}
+				}
+				
+				$avatar = get_group_avatar($group_row, 'GROUP_AVATAR', true);
+				
+				// Merge any avatars errors into the primary error array
+				// Drivers use lang constants, so we need to map to the actual strings
+				foreach ($avatar_error as $e)
 				{
-					avatar_gallery($category, $avatar_select, 4);
+					if (is_array($e))
+					{
+						$key = array_shift($e);
+						$error[] = vsprintf($user->lang($key), $e);
+					}
+					else
+					{
+						$error[] = $user->lang((string) $e);
+					}
 				}
 
 				$back_link = request_var('back_link', '');
@@ -580,12 +587,10 @@ class acp_groups
 					'S_ADD_GROUP'		=> ($action == 'add') ? true : false,
 					'S_GROUP_PERM'		=> ($action == 'add' && $auth->acl_get('a_authgroups') && $auth->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth')) ? true : false,
 					'S_INCLUDE_SWATCH'	=> true,
-					'S_CAN_UPLOAD'		=> $can_upload,
 					'S_ERROR'			=> (sizeof($error)) ? true : false,
 					'S_SPECIAL_GROUP'	=> ($group_type == GROUP_SPECIAL) ? true : false,
-					'S_DISPLAY_GALLERY'	=> ($config['allow_avatar_local'] && !$display_gallery) ? true : false,
-					'S_IN_GALLERY'		=> ($config['allow_avatar_local'] && $display_gallery) ? true : false,
 					'S_USER_FOUNDER'	=> ($user->data['user_type'] == USER_FOUNDER) ? true : false,
+					'S_AVATARS_ENABLED'		=> ($config['allow_avatar'] && $avatars_enabled),
 
 					'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 					'GROUP_NAME'			=> ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name,
@@ -606,8 +611,7 @@ class acp_groups
 
 					'S_RANK_OPTIONS'		=> $rank_options,
 					'S_GROUP_OPTIONS'		=> group_select_options(false, false, (($user->data['user_type'] == USER_FOUNDER) ? false : 0)),
-					'AVATAR'				=> $avatar_img,
-					'AVATAR_IMAGE'			=> $avatar_img,
+					'AVATAR'				=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar),
 					'AVATAR_MAX_FILESIZE'	=> $config['avatar_filesize'],
 					'AVATAR_WIDTH'			=> (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '',
 					'AVATAR_HEIGHT'			=> (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '',
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 9b5c52e28e..ad8e7532c0 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1797,7 +1797,6 @@ class acp_users
 					'S_AVATAR'	=> true,
 					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
 					'AVATAR'		=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar),
-					'AV_SHOW_DELETE' => !empty($avatar),
 
 					'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
 
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 85eda96018..f87854315d 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -67,6 +67,10 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 		if (!empty($avatar_list[$category]))
 		{
+			$template->assign_vars(array(
+				'AV_LOCAL_SHOW' => true,
+			));
+
 			$table_cols = isset($row['av_gallery_cols']) ? $row['av_gallery_cols'] : 4;
 			$row_count = $col_count = $av_pos = 0;
 			$av_count = sizeof($avatar_list[$category]);
-- 
cgit v1.2.1


From c7976279e1c85f921156ed499dee1e587587c693 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 7 Apr 2012 18:59:24 +0200
Subject: [feature/avatars] Fix avatar driver filename for autoloading

PHPBB3-10018
---
 phpBB/includes/avatar/driver.php        | 172 --------------------------------
 phpBB/includes/avatar/driver/driver.php | 172 ++++++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+), 172 deletions(-)
 delete mode 100644 phpBB/includes/avatar/driver.php
 create mode 100644 phpBB/includes/avatar/driver/driver.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver.php b/phpBB/includes/avatar/driver.php
deleted file mode 100644
index d158c419bd..0000000000
--- a/phpBB/includes/avatar/driver.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/**
-*
-* @package avatar
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base class for avatar drivers
-* @package avatars
-*/
-abstract class phpbb_avatar_driver
-{
-	/**
-	* Current board configuration
-	* @type phpbb_config
-	*/
-	protected $config;
-	
-	/**
-	* Current $phpbb_root_path
-	* @type string
-	*/
-	protected $phpbb_root_path;
-	
-	/**
-	* Current $phpEx
-	* @type string
-	*/
-	protected $phpEx;
-	
-	/**
-	* A cache driver
-	* @type phpbb_cache_driver_interface
-	*/
-	protected $cache;
-
-	/**
-	* @TODO
-	*/
-	const FROM_USER = 0;
-	const FROM_GROUP = 1;
-	
-	/**
-	* This flag should be set to true if the avatar requires a nonstandard image
-	* tag, and will generate the html itself.
-	* @type boolean
-	*/
-	public $custom_html = false;
-
-	/**
-	* Construct an driver object
-	*
-	* @param $config The phpBB configuration
-	* @param $phpbb_root_path The path to the phpBB root
-	* @param $phpEx The php file extension
-	* @param $cache A cache driver
-	*/
-	public function __construct(phpbb_config $config, $phpbb_root_path, $phpEx, phpbb_cache_driver_interface $cache = null)
-	{
-		$this->config = $config;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->phpEx = $phpEx;
-		$this->cache = $cache;
-	}
-
-	/**
-	* Get the avatar url and dimensions
-	*
-	* @param $ignore_config Whether this function should respect the users prefs
-	*        and board configuration configuration option, or should just render
-	*        the avatar anyways. Useful for the ACP.
-	* @return array Avatar data
-	*/
-	public function get_data($row, $ignore_config = false)
-	{
-		return array(
-			'src' => '',
-			'width' => 0,
-			'height' => 0,
-		);
-	}
-
-	/**
-	* Returns custom html for displaying this avatar.
-	* Only called if $custom_html is true.
-	*
-	* @param $ignore_config Whether this function should respect the users prefs
-	*        and board configuration configuration option, or should just render
-	*        the avatar anyways. Useful for the ACP.
-	* @return string HTML
-	*/
-	public function get_custom_html($row, $ignore_config = false)
-	{
-		return '';
-	}
-
-	/**
-	* @TODO
-	**/
-	public function prepare_form($template, $row, &$error, &$override_focus)
-	{
-		return false;
-	}
-
-	/**
-	* @TODO
-	**/
-	public function process_form($template, $row, &$error)
-	{
-		return false;
-	}
-
-	/**
-	* @TODO
-	**/
-	public function delete($row)
-	{
-		return true;
-	}
-
-	/**
-	* @TODO
-	**/
-	public static function clean_row($row, $src = phpbb_avatar_driver::FROM_USER)
-	{
-		$return = array();
-		$prefix = false;
-		
-		if ($src == phpbb_avatar_driver::FROM_USER)
-		{
-			$prefix = 'user_';
-		}
-		else if ($src == phpbb_avatar_driver::FROM_GROUP)
-		{
-			$prefix = 'group_';
-		}
-
-		if ($prefix)
-		{
-			$len = strlen($prefix);
-			foreach ($row as $key => $val)
-			{
-				$sub = substr($key, 0, $len);
-				if ($sub == $prefix)
-				{
-					$return[substr($key, $len)] = $val;
-				}
-				else
-				{
-					$return[$key] = $val;
-				}
-			}
-		}
-		else
-		{
-			$return = $row;
-		}
-
-		return $return;
-	}
-}
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
new file mode 100644
index 0000000000..d158c419bd
--- /dev/null
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -0,0 +1,172 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base class for avatar drivers
+* @package avatars
+*/
+abstract class phpbb_avatar_driver
+{
+	/**
+	* Current board configuration
+	* @type phpbb_config
+	*/
+	protected $config;
+	
+	/**
+	* Current $phpbb_root_path
+	* @type string
+	*/
+	protected $phpbb_root_path;
+	
+	/**
+	* Current $phpEx
+	* @type string
+	*/
+	protected $phpEx;
+	
+	/**
+	* A cache driver
+	* @type phpbb_cache_driver_interface
+	*/
+	protected $cache;
+
+	/**
+	* @TODO
+	*/
+	const FROM_USER = 0;
+	const FROM_GROUP = 1;
+	
+	/**
+	* This flag should be set to true if the avatar requires a nonstandard image
+	* tag, and will generate the html itself.
+	* @type boolean
+	*/
+	public $custom_html = false;
+
+	/**
+	* Construct an driver object
+	*
+	* @param $config The phpBB configuration
+	* @param $phpbb_root_path The path to the phpBB root
+	* @param $phpEx The php file extension
+	* @param $cache A cache driver
+	*/
+	public function __construct(phpbb_config $config, $phpbb_root_path, $phpEx, phpbb_cache_driver_interface $cache = null)
+	{
+		$this->config = $config;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->phpEx = $phpEx;
+		$this->cache = $cache;
+	}
+
+	/**
+	* Get the avatar url and dimensions
+	*
+	* @param $ignore_config Whether this function should respect the users prefs
+	*        and board configuration configuration option, or should just render
+	*        the avatar anyways. Useful for the ACP.
+	* @return array Avatar data
+	*/
+	public function get_data($row, $ignore_config = false)
+	{
+		return array(
+			'src' => '',
+			'width' => 0,
+			'height' => 0,
+		);
+	}
+
+	/**
+	* Returns custom html for displaying this avatar.
+	* Only called if $custom_html is true.
+	*
+	* @param $ignore_config Whether this function should respect the users prefs
+	*        and board configuration configuration option, or should just render
+	*        the avatar anyways. Useful for the ACP.
+	* @return string HTML
+	*/
+	public function get_custom_html($row, $ignore_config = false)
+	{
+		return '';
+	}
+
+	/**
+	* @TODO
+	**/
+	public function prepare_form($template, $row, &$error, &$override_focus)
+	{
+		return false;
+	}
+
+	/**
+	* @TODO
+	**/
+	public function process_form($template, $row, &$error)
+	{
+		return false;
+	}
+
+	/**
+	* @TODO
+	**/
+	public function delete($row)
+	{
+		return true;
+	}
+
+	/**
+	* @TODO
+	**/
+	public static function clean_row($row, $src = phpbb_avatar_driver::FROM_USER)
+	{
+		$return = array();
+		$prefix = false;
+		
+		if ($src == phpbb_avatar_driver::FROM_USER)
+		{
+			$prefix = 'user_';
+		}
+		else if ($src == phpbb_avatar_driver::FROM_GROUP)
+		{
+			$prefix = 'group_';
+		}
+
+		if ($prefix)
+		{
+			$len = strlen($prefix);
+			foreach ($row as $key => $val)
+			{
+				$sub = substr($key, 0, $len);
+				if ($sub == $prefix)
+				{
+					$return[substr($key, $len)] = $val;
+				}
+				else
+				{
+					$return[$key] = $val;
+				}
+			}
+		}
+		else
+		{
+			$return = $row;
+		}
+
+		return $return;
+	}
+}
-- 
cgit v1.2.1


From 3b0e0dba3279a78cab2336d32ee8ff63a7077c5c Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 7 Apr 2012 19:08:54 +0200
Subject: [feature/avatars] Remove unneeded require (class is now autoloaded)

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 001fcf2f14..a81b0d1e51 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -82,8 +82,6 @@ class phpbb_avatar_manager
 	**/
 	private function load_valid_drivers()
 	{
-		require_once($this->phpbb_root_path . 'includes/avatar/driver.' . $this->phpEx);
-
 		if ($this->cache)
 		{
 			self::$valid_drivers = $this->cache->get('avatar_drivers');
-- 
cgit v1.2.1


From e861bb0e04c08b03366ec7c58473b630acc91181 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 7 Apr 2012 19:19:13 +0200
Subject: [feature/avatars] Use request object in avatar drivers

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php       |  2 +-
 phpBB/includes/acp/acp_users.php        |  5 +++--
 phpBB/includes/avatar/driver/driver.php | 12 ++++++++++--
 phpBB/includes/avatar/driver/local.php  |  8 ++++----
 phpBB/includes/avatar/driver/remote.php | 12 ++++++------
 phpBB/includes/avatar/driver/upload.php |  2 +-
 phpBB/includes/avatar/manager.php       |  6 ++++--
 phpBB/includes/functions_display.php    |  3 ++-
 phpBB/includes/ucp/ucp_profile.php      |  4 ++--
 9 files changed, 33 insertions(+), 21 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 16ae8670ce..0a22c216c7 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -289,7 +289,7 @@ class acp_groups
 
 				if ($config['allow_avatar'])
 				{
-					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
+					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->getDriver());
 
 					$avatar_drivers = $avatar_manager->get_valid_drivers();
 					sort($avatar_drivers);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index c0da9b8ce0..12da482dbe 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -32,6 +32,7 @@ class acp_users
 	{
 		global $config, $db, $user, $auth, $template, $cache;
 		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads;
+		global $request;
 
 		$user->add_lang(array('posting', 'ucp', 'acp/users'));
 		$this->tpl_name = 'acp_users';
@@ -466,7 +467,7 @@ class acp_users
 							$db->sql_query($sql);
 
 							// Delete old avatar if present
-							$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
+							$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->getDriver());
 							if ($driver = $avatar_manager->get_driver($user_row['user_avatar_type']))
 							{
 								$driver->delete($user_row);
@@ -1687,7 +1688,7 @@ class acp_users
 				$avatars_enabled = false;
 				if ($config['allow_avatar'])
 				{
-					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
+					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->getDriver());
 
 					$avatar_drivers = $avatar_manager->get_valid_drivers();
 					sort($avatar_drivers);
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index d158c419bd..8fb80693fb 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -26,7 +26,13 @@ abstract class phpbb_avatar_driver
 	* @type phpbb_config
 	*/
 	protected $config;
-	
+
+	/**
+	* Current board configuration
+	* @type phpbb_config
+	*/
+	protected $request;
+
 	/**
 	* Current $phpbb_root_path
 	* @type string
@@ -62,13 +68,15 @@ abstract class phpbb_avatar_driver
 	* Construct an driver object
 	*
 	* @param $config The phpBB configuration
+	* @param $request The request object
 	* @param $phpbb_root_path The path to the phpBB root
 	* @param $phpEx The php file extension
 	* @param $cache A cache driver
 	*/
-	public function __construct(phpbb_config $config, $phpbb_root_path, $phpEx, phpbb_cache_driver_interface $cache = null)
+	public function __construct(phpbb_config $config, phpbb_request $request, $phpbb_root_path, $phpEx, phpbb_cache_driver_interface $cache = null)
 	{
 		$this->config = $config;
+		$this->request = $request;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->phpEx = $phpEx;
 		$this->cache = $cache;
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index f87854315d..27e451c099 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -50,7 +50,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	public function prepare_form($template, $row, &$error)
 	{
 		$avatar_list = $this->get_avatar_list();
-		$category = request_var('av_local_cat', '');
+		$category = $this->request->variable('av_local_cat', '');
 
 		$categories = array_keys($avatar_list);
 
@@ -110,9 +110,9 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	public function process_form($template, $row, &$error)
 	{
 		$avatar_list = $this->get_avatar_list();
-		$category = request_var('av_local_cat', '');
-		
-		$file = request_var('av_local_file', '');
+		$category = $this->request->variable('av_local_cat', '');
+
+		$file = $this->request->variable('av_local_file', '');
 		if (!isset($avatar_list[$category][urldecode($file)]))
 		{
 			$error[] = 'AVATAR_URL_NOT_FOUND';
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index cad9850c3f..cd0a756428 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -50,8 +50,8 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	public function prepare_form($template, $row, &$error)
 	{
 		$template->assign_vars(array(
-			'AV_REMOTE_WIDTH' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_width']) ? $row['avatar_width'] : request_var('av_local_width', 0),
-			'AV_REMOTE_HEIGHT' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_height']) ? $row['avatar_height'] : request_var('av_local_width', 0),
+			'AV_REMOTE_WIDTH' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
+			'AV_REMOTE_HEIGHT' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
 			'AV_REMOTE_URL' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar']) ? $row['avatar'] : '',
 		));
 
@@ -63,10 +63,10 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	*/
 	public function process_form($template, $row, &$error)
 	{
-		$url = request_var('av_remote_url', '');
-		$width = request_var('av_remote_width', 0);
-		$height = request_var('av_remote_height', 0);
-			
+		$url = $this->request->variable('av_remote_url', '');
+		$width = $this->request->variable('av_remote_width', 0);
+		$height = $this->request->variable('av_remote_height', 0);
+
 		if (!preg_match('#^(http|https|ftp)://#i', $url))
 		{
 			$url = 'http://' . $url;
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 23521ef435..c7d2b870c1 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -76,7 +76,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 
 		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
-		$url = request_var('av_upload_url', '');
+		$url = $this->request->variable('av_upload_url', '');
 
 		if (!empty($_FILES['av_upload_file']['name']))
 		{
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index a81b0d1e51..f9a262b92f 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -23,17 +23,19 @@ class phpbb_avatar_manager
 	private $phpbb_root_path;
 	private $phpEx;
 	private $config;
+	private $request;
 	private $cache;
 	private static $valid_drivers = false;
 
 	/**
 	* @TODO
 	**/
-	public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_cache_driver_interface $cache = null)
+	public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_request $request, phpbb_cache_driver_interface $cache = null)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->phpEx = $phpEx;
 		$this->config = $config;
+		$this->request = $request;
 		$this->cache = $cache;
 	}
 
@@ -66,7 +68,7 @@ class phpbb_avatar_manager
 			if ($new || !is_object(self::$valid_drivers[$avatar_type]))
 			{
 				$class_name = 'phpbb_avatar_driver_' . $avatar_type;
-				self::$valid_drivers[$avatar_type] = new $class_name($this->config, $this->phpbb_root_path, $this->phpEx, $this->cache);
+				self::$valid_drivers[$avatar_type] = new $class_name($this->config, $this->request, $this->phpbb_root_path, $this->phpEx, $this->cache);
 			}
 
 			return self::$valid_drivers[$avatar_type];
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 1c1663f2cc..c59805dacd 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1312,6 +1312,7 @@ function get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = fal
 function get_avatar($row, $alt, $ignore_config = false)
 {
 	global $user, $config, $cache, $phpbb_root_path, $phpEx;
+	global $request;
 
 	static $avatar_manager = null;
 
@@ -1369,7 +1370,7 @@ function get_avatar($row, $alt, $ignore_config = false)
 		default:
 			if (empty($avatar_manager))
 			{
-				$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->get_driver());
+				$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->get_driver());
 			}
 
 			$avatar = $avatar_manager->get_driver($row['avatar_type']);
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 1c469fa290..ffc6ebf556 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -552,8 +552,8 @@ class ucp_profile
 
 				if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
 				{
-					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $cache->getDriver());
-					
+					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->getDriver());
+
 					$avatar_drivers = $avatar_manager->get_valid_drivers();
 					sort($avatar_drivers);
 					
-- 
cgit v1.2.1


From 0898d114574e88eb5eda819b8921a27739be74ca Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 7 Apr 2012 20:27:11 +0200
Subject: [feature/avatars] Fix CS

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index f9a262b92f..41429f3a06 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -116,7 +116,8 @@ class phpbb_avatar_manager
 	/**
 	* @TODO
 	**/
-	public function get_valid_drivers() {
+	public function get_valid_drivers()
+	{
 		if (self::$valid_drivers === false)
 		{
 			$this->load_valid_drivers();
-- 
cgit v1.2.1


From eea2ec50521e274b928d23f710108f37797cb22c Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 8 Apr 2012 16:27:09 +0200
Subject: [feature/avatars] Introduce global phpbb_avatar_manager

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php    | 10 ++++------
 phpBB/includes/acp/acp_users.php     | 12 +++++-------
 phpBB/includes/functions_display.php | 10 ++--------
 phpBB/includes/ucp/ucp_profile.php   | 13 ++++++-------
 4 files changed, 17 insertions(+), 28 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 0a22c216c7..34c233604a 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -26,6 +26,7 @@ class acp_groups
 	{
 		global $config, $db, $user, $auth, $template, $cache;
 		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads;
+		global $phpbb_avatar_manager;
 
 		$user->add_lang('acp/groups');
 		$this->tpl_name = 'acp_groups';
@@ -282,16 +283,13 @@ class acp_groups
 
 				// Setup avatar data for later
 				$avatars_enabled = false;
-				$avatar_manager = null;
 				$avatar_drivers = null;
 				$avatar_data = null;
 				$avatar_error = array();
 
 				if ($config['allow_avatar'])
 				{
-					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->getDriver());
-
-					$avatar_drivers = $avatar_manager->get_valid_drivers();
+					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
 					sort($avatar_drivers);
 
 					// This is normalised data, without the group_ prefix
@@ -337,7 +335,7 @@ class acp_groups
 						$driver = request_var('avatar_driver', '');
 						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
 						{
-							$avatar = $avatar_manager->get_driver($driver);
+							$avatar = $phpbb_avatar_manager->get_driver($driver);
 							$result = $avatar->process_form($template, $avatar_data, $avatar_error);
 
 							if ($result && empty($avatar_error))
@@ -534,7 +532,7 @@ class acp_groups
 								'avatar' => "acp_avatar_options_$driver.html",
 							));
 
-							$avatar = $avatar_manager->get_driver($driver);
+							$avatar = $phpbb_avatar_manager->get_driver($driver);
 
 							if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
 							{
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 12da482dbe..fac84ba40a 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -33,6 +33,7 @@ class acp_users
 		global $config, $db, $user, $auth, $template, $cache;
 		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads;
 		global $request;
+		global $phpbb_avatar_manager;
 
 		$user->add_lang(array('posting', 'ucp', 'acp/users'));
 		$this->tpl_name = 'acp_users';
@@ -467,8 +468,7 @@ class acp_users
 							$db->sql_query($sql);
 
 							// Delete old avatar if present
-							$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->getDriver());
-							if ($driver = $avatar_manager->get_driver($user_row['user_avatar_type']))
+							if ($driver = $phpbb_avatar_manager->get_driver($user_row['user_avatar_type']))
 							{
 								$driver->delete($user_row);
 							}
@@ -1688,9 +1688,7 @@ class acp_users
 				$avatars_enabled = false;
 				if ($config['allow_avatar'])
 				{
-					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->getDriver());
-
-					$avatar_drivers = $avatar_manager->get_valid_drivers();
+					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
 					sort($avatar_drivers);
 
 					// This is normalised data, without the user_ prefix
@@ -1703,7 +1701,7 @@ class acp_users
 							$driver = request_var('avatar_driver', '');
 							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
 							{
-								$avatar = $avatar_manager->get_driver($driver);
+								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);
 
 								if ($result && empty($error))
@@ -1758,7 +1756,7 @@ class acp_users
 								'avatar' => "acp_avatar_options_$driver.html",
 							));
 
-							$avatar = $avatar_manager->get_driver($driver);
+							$avatar = $phpbb_avatar_manager->get_driver($driver);
 
 							if ($avatar->prepare_form($template, $avatar_data, $error))
 							{
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index c59805dacd..e1dd67aeaf 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1313,8 +1313,7 @@ function get_avatar($row, $alt, $ignore_config = false)
 {
 	global $user, $config, $cache, $phpbb_root_path, $phpEx;
 	global $request;
-
-	static $avatar_manager = null;
+	global $phpbb_avatar_manager;
 
 	if (!$config['allow_avatar'] && !$ignore_config)
 	{
@@ -1368,12 +1367,7 @@ function get_avatar($row, $alt, $ignore_config = false)
 		break;
 
 		default:
-			if (empty($avatar_manager))
-			{
-				$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->get_driver());
-			}
-
-			$avatar = $avatar_manager->get_driver($row['avatar_type']);
+			$avatar = $phpbb_avatar_manager->get_driver($row['avatar_type']);
 
 			if ($avatar)
 			{
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index ffc6ebf556..58e5254d4b 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -30,6 +30,7 @@ class ucp_profile
 	{
 		global $cache, $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
 		global $request;
+		global $phpbb_avatar_manager;
 
 		$user->add_lang('posting');
 
@@ -552,11 +553,9 @@ class ucp_profile
 
 				if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
 				{
-					$avatar_manager = new phpbb_avatar_manager($phpbb_root_path, $phpEx, $config, $request, $cache->getDriver());
-
-					$avatar_drivers = $avatar_manager->get_valid_drivers();
+					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
 					sort($avatar_drivers);
-					
+
 					// This is normalised data, without the user_ prefix
 					$avatar_data = phpbb_avatar_driver::clean_row($user->data, phpbb_avatar_driver::FROM_USER);
 
@@ -567,7 +566,7 @@ class ucp_profile
 							$driver = request_var('avatar_driver', '');
 							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
 							{
-								$avatar = $avatar_manager->get_driver($driver);
+								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);
 
 								if ($result && empty($error))
@@ -594,7 +593,7 @@ class ucp_profile
 							else
 							{
 								// They are removing their avatar or are trying to play games with us
-								if ($avatar = $avatar_manager->get_driver($user->data['user_avatar_type']))
+								if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
 								{
 									$avatar->delete($avatar_data);
 								}
@@ -634,7 +633,7 @@ class ucp_profile
 								'avatar' => "ucp_avatar_options_$driver.html",
 							));
 
-							$avatar = $avatar_manager->get_driver($driver);
+							$avatar = $phpbb_avatar_manager->get_driver($driver);
 
 							if ($avatar->prepare_form($template, $avatar_data, $error))
 							{
-- 
cgit v1.2.1


From 81fb4268cd141259fe5b3bc9ad51adf2e29e0772 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 8 Apr 2012 16:40:19 +0200
Subject: [feature/avatars] Introduce an avatar driver interface

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php          |  2 +-
 phpBB/includes/acp/acp_users.php           |  2 +-
 phpBB/includes/avatar/driver/driver.php    | 39 +++++-----------
 phpBB/includes/avatar/driver/interface.php | 71 ++++++++++++++++++++++++++++++
 phpBB/includes/functions_display.php       |  4 +-
 phpBB/includes/ucp/ucp_profile.php         |  2 +-
 6 files changed, 87 insertions(+), 33 deletions(-)
 create mode 100644 phpBB/includes/avatar/driver/interface.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 34c233604a..5a45b3b572 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -293,7 +293,7 @@ class acp_groups
 					sort($avatar_drivers);
 
 					// This is normalised data, without the group_ prefix
-					$avatar_data = phpbb_avatar_driver::clean_row($group_row, phpbb_avatar_driver::FROM_GROUP);
+					$avatar_data = phpbb_avatar_driver::clean_row($group_row, phpbb_avatar_driver_interface::FROM_GROUP);
 				}
 
 
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index fac84ba40a..9c12116062 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1692,7 +1692,7 @@ class acp_users
 					sort($avatar_drivers);
 
 					// This is normalised data, without the user_ prefix
-					$avatar_data = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver::FROM_USER);
+					$avatar_data = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver_interface::FROM_USER);
 
 					if ($submit)
 					{
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 8fb80693fb..277130e819 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Base class for avatar drivers
 * @package avatars
 */
-abstract class phpbb_avatar_driver
+abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 {
 	/**
 	* Current board configuration
@@ -51,12 +51,6 @@ abstract class phpbb_avatar_driver
 	*/
 	protected $cache;
 
-	/**
-	* @TODO
-	*/
-	const FROM_USER = 0;
-	const FROM_GROUP = 1;
-	
 	/**
 	* This flag should be set to true if the avatar requires a nonstandard image
 	* tag, and will generate the html itself.
@@ -83,12 +77,7 @@ abstract class phpbb_avatar_driver
 	}
 
 	/**
-	* Get the avatar url and dimensions
-	*
-	* @param $ignore_config Whether this function should respect the users prefs
-	*        and board configuration configuration option, or should just render
-	*        the avatar anyways. Useful for the ACP.
-	* @return array Avatar data
+	* @inheritdoc
 	*/
 	public function get_data($row, $ignore_config = false)
 	{
@@ -100,13 +89,7 @@ abstract class phpbb_avatar_driver
 	}
 
 	/**
-	* Returns custom html for displaying this avatar.
-	* Only called if $custom_html is true.
-	*
-	* @param $ignore_config Whether this function should respect the users prefs
-	*        and board configuration configuration option, or should just render
-	*        the avatar anyways. Useful for the ACP.
-	* @return string HTML
+	* @inheritdoc
 	*/
 	public function get_custom_html($row, $ignore_config = false)
 	{
@@ -114,7 +97,7 @@ abstract class phpbb_avatar_driver
 	}
 
 	/**
-	* @TODO
+	* @inheritdoc
 	**/
 	public function prepare_form($template, $row, &$error, &$override_focus)
 	{
@@ -122,7 +105,7 @@ abstract class phpbb_avatar_driver
 	}
 
 	/**
-	* @TODO
+	* @inheritdoc
 	**/
 	public function process_form($template, $row, &$error)
 	{
@@ -130,7 +113,7 @@ abstract class phpbb_avatar_driver
 	}
 
 	/**
-	* @TODO
+	* @inheritdoc
 	**/
 	public function delete($row)
 	{
@@ -138,18 +121,18 @@ abstract class phpbb_avatar_driver
 	}
 
 	/**
-	* @TODO
+	* @inheritdoc
 	**/
-	public static function clean_row($row, $src = phpbb_avatar_driver::FROM_USER)
+	public static function clean_row($row, $src = phpbb_avatar_driver_interface::FROM_USER)
 	{
 		$return = array();
 		$prefix = false;
-		
-		if ($src == phpbb_avatar_driver::FROM_USER)
+
+		if ($src == phpbb_avatar_driver_interface::FROM_USER)
 		{
 			$prefix = 'user_';
 		}
-		else if ($src == phpbb_avatar_driver::FROM_GROUP)
+		else if ($src == phpbb_avatar_driver_interface::FROM_GROUP)
 		{
 			$prefix = 'group_';
 		}
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
new file mode 100644
index 0000000000..dcec5811bb
--- /dev/null
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -0,0 +1,71 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Interface for avatar drivers
+* @package avatars
+*/
+interface phpbb_avatar_driver_interface
+{
+	/**
+	* @TODO
+	*/
+	const FROM_USER = 0;
+	const FROM_GROUP = 1;
+
+	/**
+	* Get the avatar url and dimensions
+	*
+	* @param $ignore_config Whether this function should respect the users prefs
+	*        and board configuration configuration option, or should just render
+	*        the avatar anyways. Useful for the ACP.
+	* @return array Avatar data, must have keys src, width and height, e.g.
+	*         ['src' => '', 'width' => 0, 'height' => 0]
+	*/
+	public function get_data($row, $ignore_config = false);
+
+	/**
+	* Returns custom html for displaying this avatar.
+	* Only called if $custom_html is true.
+	*
+	* @param $ignore_config Whether this function should respect the users prefs
+	*        and board configuration configuration option, or should just render
+	*        the avatar anyways. Useful for the ACP.
+	* @return string HTML
+	*/
+	public function get_custom_html($row, $ignore_config = false);
+
+	/**
+	* @TODO
+	**/
+	public function prepare_form($template, $row, &$error, &$override_focus);
+
+	/**
+	* @TODO
+	**/
+	public function process_form($template, $row, &$error);
+
+	/**
+	* @TODO
+	**/
+	public function delete($row);
+
+	/**
+	* @TODO
+	**/
+	public static function clean_row($row, $src = phpbb_avatar_driver_interface::FROM_USER);
+}
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index e1dd67aeaf..82638b7f2b 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1281,7 +1281,7 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 */
 function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
 {
-	$row = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver::FROM_USER);
+	$row = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver_interface::FROM_USER);
 	return get_avatar($row, $alt, $ignore_config);
 }
 
@@ -1296,7 +1296,7 @@ function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false
 */
 function get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
 {
-	$row = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver::FROM_GROUP);
+	$row = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver_interface::FROM_GROUP);
 	return get_avatar($row, $alt, $ignore_config);
 }
 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 58e5254d4b..9d22fd4dba 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -557,7 +557,7 @@ class ucp_profile
 					sort($avatar_drivers);
 
 					// This is normalised data, without the user_ prefix
-					$avatar_data = phpbb_avatar_driver::clean_row($user->data, phpbb_avatar_driver::FROM_USER);
+					$avatar_data = phpbb_avatar_driver::clean_row($user->data, phpbb_avatar_driver_interface::FROM_USER);
 
 					if ($submit)
 					{
-- 
cgit v1.2.1


From 3b71e81cfba726043063b05cb793e18186143252 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 8 Apr 2012 21:29:52 +0200
Subject: [feature/avatars] Simplify clean_row, move it to avatar manager

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php          |  2 +-
 phpBB/includes/acp/acp_users.php           |  2 +-
 phpBB/includes/avatar/driver/driver.php    | 41 ------------------------------
 phpBB/includes/avatar/driver/interface.php | 11 --------
 phpBB/includes/avatar/manager.php          | 19 ++++++++++++++
 phpBB/includes/functions_display.php       |  4 +--
 phpBB/includes/ucp/ucp_profile.php         |  2 +-
 7 files changed, 24 insertions(+), 57 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 5a45b3b572..d4a3e40d93 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -293,7 +293,7 @@ class acp_groups
 					sort($avatar_drivers);
 
 					// This is normalised data, without the group_ prefix
-					$avatar_data = phpbb_avatar_driver::clean_row($group_row, phpbb_avatar_driver_interface::FROM_GROUP);
+					$avatar_data = phpbb_avatar_manager::clean_row($group_row);
 				}
 
 
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 9c12116062..cd50b02ca1 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1692,7 +1692,7 @@ class acp_users
 					sort($avatar_drivers);
 
 					// This is normalised data, without the user_ prefix
-					$avatar_data = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver_interface::FROM_USER);
+					$avatar_data = phpbb_avatar_manager::clean_row($user_row);
 
 					if ($submit)
 					{
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 277130e819..7028df4b64 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -119,45 +119,4 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	{
 		return true;
 	}
-
-	/**
-	* @inheritdoc
-	**/
-	public static function clean_row($row, $src = phpbb_avatar_driver_interface::FROM_USER)
-	{
-		$return = array();
-		$prefix = false;
-
-		if ($src == phpbb_avatar_driver_interface::FROM_USER)
-		{
-			$prefix = 'user_';
-		}
-		else if ($src == phpbb_avatar_driver_interface::FROM_GROUP)
-		{
-			$prefix = 'group_';
-		}
-
-		if ($prefix)
-		{
-			$len = strlen($prefix);
-			foreach ($row as $key => $val)
-			{
-				$sub = substr($key, 0, $len);
-				if ($sub == $prefix)
-				{
-					$return[substr($key, $len)] = $val;
-				}
-				else
-				{
-					$return[$key] = $val;
-				}
-			}
-		}
-		else
-		{
-			$return = $row;
-		}
-
-		return $return;
-	}
 }
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index dcec5811bb..8c8a067d13 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -21,12 +21,6 @@ if (!defined('IN_PHPBB'))
 */
 interface phpbb_avatar_driver_interface
 {
-	/**
-	* @TODO
-	*/
-	const FROM_USER = 0;
-	const FROM_GROUP = 1;
-
 	/**
 	* Get the avatar url and dimensions
 	*
@@ -63,9 +57,4 @@ interface phpbb_avatar_driver_interface
 	* @TODO
 	**/
 	public function delete($row);
-
-	/**
-	* @TODO
-	**/
-	public static function clean_row($row, $src = phpbb_avatar_driver_interface::FROM_USER);
 }
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 41429f3a06..054bb0cee9 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -125,4 +125,23 @@ class phpbb_avatar_manager
 
 		return array_keys(self::$valid_drivers);
 	}
+
+	/**
+	* Strip out user_ and group_ prefixes from keys
+	**/
+	public static function clean_row($row)
+	{
+		$keys = array_keys($row);
+		$values = array_values($row);
+
+		$keys = array_map(
+			function ($key)
+			{
+				return preg_replace('(user_|group_)', '', $key);
+			},
+			$row
+		);
+
+		return array_combine($keys, $values);
+	}
 }
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 82638b7f2b..619c30ada5 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1281,7 +1281,7 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 */
 function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
 {
-	$row = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver_interface::FROM_USER);
+	$row = phpbb_avatar_manager::clean_row($user_row);
 	return get_avatar($row, $alt, $ignore_config);
 }
 
@@ -1296,7 +1296,7 @@ function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false
 */
 function get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
 {
-	$row = phpbb_avatar_driver::clean_row($user_row, phpbb_avatar_driver_interface::FROM_GROUP);
+	$row = phpbb_avatar_manager::clean_row($user_row);
 	return get_avatar($row, $alt, $ignore_config);
 }
 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 9d22fd4dba..44dc57cfd7 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -557,7 +557,7 @@ class ucp_profile
 					sort($avatar_drivers);
 
 					// This is normalised data, without the user_ prefix
-					$avatar_data = phpbb_avatar_driver::clean_row($user->data, phpbb_avatar_driver_interface::FROM_USER);
+					$avatar_data = phpbb_avatar_manager::clean_row($user->data);
 
 					if ($submit)
 					{
-- 
cgit v1.2.1


From a1132fc5c7e990d73cbc8ac7abf4502a1bbe7216 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 8 Apr 2012 21:45:51 +0200
Subject: [feature/avatars] Update avatars in database_update

PHPBB3-10018
---
 phpBB/includes/functions_display.php | 70 +++++++-----------------------------
 1 file changed, 13 insertions(+), 57 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 619c30ada5..291d92387f 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1325,72 +1325,28 @@ function get_avatar($row, $alt, $ignore_config = false)
 		'width' => $row['avatar_width'],
 		'height' => $row['avatar_height'],
 	);
-	
-	switch ($row['avatar_type'])
-	{
-		case AVATAR_UPLOAD:
-			// Compatibility with old avatars
-			if (!$config['allow_avatar_upload'] && !$ignore_config)
-			{
-				$avatar_data['src'] = '';
-			}
-			else
-			{
-				$avatar_data['src'] = $phpbb_root_path . "download/file.$phpEx?avatar=" . $avatar_data['src'];
-				$avatar_data['src'] = str_replace(' ', '%20', $avatar_data['src']);
-			}
-		break;
 
-		case AVATAR_GALLERY:
-			// Compatibility with old avatars
-			if (!$config['allow_avatar_local'] && !$ignore_config)
-			{
-				$avatar_data['src'] = '';
-			}
-			else
-			{
-				$avatar_data['src'] = $phpbb_root_path . $config['avatar_gallery_path'] . '/' . $avatar_data['src'];
-				$avatar_data['src'] = str_replace(' ', '%20', $avatar_data['src']);
-			}
-		break;
-
-		case AVATAR_REMOTE:
-			// Compatibility with old avatars
-			if (!$config['allow_avatar_remote'] && !$ignore_config)
-			{
-				$avatar_data['src'] = '';
-			}
-			else
-			{
-				$avatar_data['src'] = str_replace(' ', '%20', $avatar_data['src']);
-			}
-		break;
+	$avatar = $phpbb_avatar_manager->get_driver($row['avatar_type']);
 
-		default:
-			$avatar = $phpbb_avatar_manager->get_driver($row['avatar_type']);
-
-			if ($avatar)
-			{
-				if ($avatar->custom_html)
-				{
-					return $avatar->get_html($row, $ignore_config);
-				}
-
-				$avatar_data = $avatar->get_data($row, $ignore_config);
-			}
-			else
-			{
-				$avatar_data['src'] = '';
-			}
+	if ($avatar)
+	{
+		if ($avatar->custom_html)
+		{
+			return $avatar->get_html($row, $ignore_config);
+		}
 
-			break;
+		$avatar_data = $avatar->get_data($row, $ignore_config);
+	}
+	else
+	{
+		$avatar_data['src'] = '';
 	}
 
 	$html = '';
 
 	if (!empty($avatar_data['src']))
 	{
-		$html = '<img src="' . $avatar_data['src'] . '" ' . 
+		$html = '<img src="' . $avatar_data['src'] . '" ' .
 			($avatar_data['width'] ? ('width="' . $avatar_data['width'] . '" ') : '') .
 			($avatar_data['height'] ? ('height="' . $avatar_data['height'] . '" ') : '') .
 			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
-- 
cgit v1.2.1


From b2b812f1714fc924a7c9e595ccb8fbb35f20f203 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 8 Apr 2012 22:13:10 +0200
Subject: [feature/avatars] Do not assign in an if statement

PHPBB3-10018
---
 phpBB/includes/acp/acp_users.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index cd50b02ca1..33a173b74d 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -468,7 +468,8 @@ class acp_users
 							$db->sql_query($sql);
 
 							// Delete old avatar if present
-							if ($driver = $phpbb_avatar_manager->get_driver($user_row['user_avatar_type']))
+							$driver = $phpbb_avatar_manager->get_driver($user_row['user_avatar_type']);
+							if ($driver)
 							{
 								$driver->delete($user_row);
 							}
-- 
cgit v1.2.1


From f273ab16ae68d15832832e2b2c98a3b99c966c97 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 8 Apr 2012 22:28:40 +0200
Subject: [feature/avatars] Fix clean_row regex, thanks to chris

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 054bb0cee9..f4e5a6d7f8 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -137,7 +137,7 @@ class phpbb_avatar_manager
 		$keys = array_map(
 			function ($key)
 			{
-				return preg_replace('(user_|group_)', '', $key);
+				return preg_replace('#^(?:user_|group_)#', '', $key);
 			},
 			$row
 		);
-- 
cgit v1.2.1


From a9cf558af7fc08539e15ceca1e889e087c815c8d Mon Sep 17 00:00:00 2001
From: Sajaki <sajaki9@gmail.com>
Date: Sat, 28 Apr 2012 10:43:43 +0200
Subject: [ticket/10854] sql server drop default constraint when dropping
 column

drops default columns with T-SQL before attempting drop column to
avoids sql exception.  This is a huge annoyance in UMIL scripts running
under sql server.
---
 phpBB/includes/db/db_tools.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index c6dd23e6bd..f63ff18cbe 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -1819,6 +1819,22 @@ class phpbb_db_tools
 
 			case 'mssql':
 			case 'mssqlnative':
+				// remove default cosntraints first
+				// http://msdn.microsoft.com/en-us/library/aa175912%28v=sql.80%29.aspx
+				$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000)
+					SET @drop_default_name =
+						(SELECT so.name FROM sysobjects so
+						JOIN sysconstraints sc ON so.id = sc.constid
+						WHERE object_name(so.parent_obj) = '{$table_name}'
+							AND so.xtype = 'D'
+							AND sc.colid = (SELECT colid FROM syscolumns
+								WHERE id = object_id('{$table_name}')
+									AND name = '{$column_name}'))
+					IF @drop_default_name <> ''
+					BEGIN
+						SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']'
+						EXEC(@cmd)
+					END";
 				$statements[] = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']';
 			break;
 
-- 
cgit v1.2.1


From 6d994380d76accba5485b0a04d3028f1c153ebd8 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 14:48:51 +0200
Subject: [feature/avatars] Fix error in avatar_manager::clean_row

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index f4e5a6d7f8..839216b61e 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -139,7 +139,7 @@ class phpbb_avatar_manager
 			{
 				return preg_replace('#^(?:user_|group_)#', '', $key);
 			},
-			$row
+			$keys
 		);
 
 		return array_combine($keys, $values);
-- 
cgit v1.2.1


From d10486699273b896fffe86f05f66a6d542843f5b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 16:59:06 +0200
Subject: [feature/avatars] Remove unneeded argument for driver prepare_form()

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php    | 6 +++---
 phpBB/includes/avatar/driver/interface.php | 2 +-
 phpBB/includes/avatar/driver/local.php     | 4 ++--
 phpBB/includes/avatar/driver/upload.php    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 7028df4b64..4ac6762140 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -38,13 +38,13 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	* @type string
 	*/
 	protected $phpbb_root_path;
-	
+
 	/**
 	* Current $phpEx
 	* @type string
 	*/
 	protected $phpEx;
-	
+
 	/**
 	* A cache driver
 	* @type phpbb_cache_driver_interface
@@ -99,7 +99,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	/**
 	* @inheritdoc
 	**/
-	public function prepare_form($template, $row, &$error, &$override_focus)
+	public function prepare_form($template, $row, &$error)
 	{
 		return false;
 	}
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 8c8a067d13..d3b764e275 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -46,7 +46,7 @@ interface phpbb_avatar_driver_interface
 	/**
 	* @TODO
 	**/
-	public function prepare_form($template, $row, &$error, &$override_focus);
+	public function prepare_form($template, $row, &$error);
 
 	/**
 	* @TODO
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 27e451c099..a0ef912eae 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -43,7 +43,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 			);
 		}
 	}
-	
+
 	/**
 	* @inheritdoc
 	*/
@@ -103,7 +103,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 		return true;
 	}
-	
+
 	/**
 	* @inheritdoc
 	*/
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index c7d2b870c1..d9504c04a0 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -58,7 +58,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 			'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
 			'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
 		));
-		
+
 		return true;
 	}
 
-- 
cgit v1.2.1


From df16bd1c49e6e970b147f15e752825dd3186fb87 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 27 Jun 2012 21:02:07 +0200
Subject: [feature/avatars] Rewrite drivers to use full class name

* Use full driver class name as avatar_type value
* Move avatar drivers to core namespace
* Make avatars installable through extensions

PHPBB3-10018
---
 phpBB/includes/avatar/driver/core/local.php  | 189 +++++++++++++++++++++++++++
 phpBB/includes/avatar/driver/core/remote.php | 163 +++++++++++++++++++++++
 phpBB/includes/avatar/driver/core/upload.php | 147 +++++++++++++++++++++
 phpBB/includes/avatar/driver/driver.php      |  21 +++
 phpBB/includes/avatar/driver/interface.php   |  10 ++
 phpBB/includes/avatar/driver/local.php       | 189 ---------------------------
 phpBB/includes/avatar/driver/remote.php      | 163 -----------------------
 phpBB/includes/avatar/driver/upload.php      | 147 ---------------------
 phpBB/includes/avatar/manager.php            |  55 ++++----
 phpBB/includes/ucp/ucp_profile.php           |  10 +-
 10 files changed, 562 insertions(+), 532 deletions(-)
 create mode 100644 phpBB/includes/avatar/driver/core/local.php
 create mode 100644 phpBB/includes/avatar/driver/core/remote.php
 create mode 100644 phpBB/includes/avatar/driver/core/upload.php
 delete mode 100644 phpBB/includes/avatar/driver/local.php
 delete mode 100644 phpBB/includes/avatar/driver/remote.php
 delete mode 100644 phpBB/includes/avatar/driver/upload.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/core/local.php b/phpBB/includes/avatar/driver/core/local.php
new file mode 100644
index 0000000000..ca82b9c175
--- /dev/null
+++ b/phpBB/includes/avatar/driver/core/local.php
@@ -0,0 +1,189 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars selected from the board gallery
+* @package avatars
+*/
+class phpbb_avatar_driver_core_local extends phpbb_avatar_driver
+{
+	/**
+	* @inheritdoc
+	*/
+	public function get_data($row, $ignore_config = false)
+	{
+		if ($ignore_config || $this->config['allow_avatar_local'])
+		{
+			return array(
+				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
+				'width' => $row['avatar_width'],
+				'height' => $row['avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function prepare_form($template, $row, &$error)
+	{
+		$avatar_list = $this->get_avatar_list();
+		$category = $this->request->variable('av_local_cat', '');
+
+		$categories = array_keys($avatar_list);
+
+		foreach ($categories as $cat)
+		{
+			if (!empty($avatar_list[$cat]))
+			{
+				$template->assign_block_vars('av_local_cats', array(
+					'NAME' => $cat,
+					'SELECTED' => ($cat == $category),
+				));
+			}
+		}
+
+		if (!empty($avatar_list[$category]))
+		{
+			$template->assign_vars(array(
+				'AV_LOCAL_SHOW' => true,
+			));
+
+			$table_cols = isset($row['av_gallery_cols']) ? $row['av_gallery_cols'] : 4;
+			$row_count = $col_count = $av_pos = 0;
+			$av_count = sizeof($avatar_list[$category]);
+
+			reset($avatar_list[$category]);
+
+			while ($av_pos < $av_count)
+			{
+				$img = current($avatar_list[$category]);
+				next($avatar_list[$category]);
+
+				if ($col_count == 0)
+				{
+					++$row_count;
+					$template->assign_block_vars('av_local_row', array(
+					));
+				}
+
+				$template->assign_block_vars('av_local_row.av_local_col', array(
+					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
+					'AVATAR_NAME' => $img['name'],
+					'AVATAR_FILE' => $img['filename'],
+				));
+
+				$col_count = ($col_count + 1) % $table_cols;
+
+				++$av_pos;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function process_form($template, $row, &$error)
+	{
+		$avatar_list = $this->get_avatar_list();
+		$category = $this->request->variable('av_local_cat', '');
+
+		$file = $this->request->variable('av_local_file', '');
+		if (!isset($avatar_list[$category][urldecode($file)]))
+		{
+			$error[] = 'AVATAR_URL_NOT_FOUND';
+			return false;
+		}
+
+		return array(
+			'avatar' => $category . '/' . $file,
+			'avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
+			'avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
+		);
+	}
+
+	/**
+	* @TODO
+	*/
+	private function get_avatar_list()
+	{
+		$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list');
+
+		if (!$avatar_list)
+		{
+			$avatar_list = array();
+			$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
+
+			$dh = @opendir($path);
+
+			if ($dh)
+			{
+				while (($cat = readdir($dh)) !== false) {
+					if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
+					{
+						if ($ch = @opendir("$path/$cat"))
+						{
+							while (($image = readdir($ch)) !== false)
+							{
+								// Match all images in the gallery folder
+								if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
+								{
+									if (function_exists('getimagesize'))
+									{
+										$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
+									}
+									else
+									{
+										$dims = array(0, 0);
+									}
+									$avatar_list[$cat][$image] = array(
+										'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
+										'filename'  => rawurlencode($image),
+										'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
+										'width'     => $dims[0],
+										'height'    => $dims[1],
+									);
+								}
+							}
+							@closedir($ch);
+						}
+					}
+				}
+				@closedir($dh);
+			}
+
+			@ksort($avatar_list);
+
+			if ($this->cache != null)
+			{
+				$this->cache->put('av_local_list', $avatar_list);
+			}
+		}
+
+		return $avatar_list;
+	}
+}
diff --git a/phpBB/includes/avatar/driver/core/remote.php b/phpBB/includes/avatar/driver/core/remote.php
new file mode 100644
index 0000000000..9f5a58e75a
--- /dev/null
+++ b/phpBB/includes/avatar/driver/core/remote.php
@@ -0,0 +1,163 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars hosted remotely
+* @package avatars
+*/
+class phpbb_avatar_driver_core_remote extends phpbb_avatar_driver
+{
+	/**
+	* @inheritdoc
+	*/
+	public function get_data($row, $ignore_config = false)
+	{
+		if ($ignore_config || $this->config['allow_avatar_remote'])
+		{
+			return array(
+				'src' => $row['avatar'],
+				'width' => $row['avatar_width'],
+				'height' => $row['avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function prepare_form($template, $row, &$error)
+	{
+		$template->assign_vars(array(
+			'AV_REMOTE_WIDTH' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
+			'AV_REMOTE_HEIGHT' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
+			'AV_REMOTE_URL' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar']) ? $row['avatar'] : '',
+		));
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function process_form($template, $row, &$error)
+	{
+		$url = $this->request->variable('av_remote_url', '');
+		$width = $this->request->variable('av_remote_width', 0);
+		$height = $this->request->variable('av_remote_height', 0);
+
+		if (!preg_match('#^(http|https|ftp)://#i', $url))
+		{
+			$url = 'http://' . $url;
+		}
+
+		require_once($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
+
+		$error = array_merge($error, validate_data(array(
+			'url' => $url,
+		), array(
+			'url' => array('string', true, 5, 255),
+		)));
+
+		if (!empty($error))
+		{
+			return false;
+		}
+
+		// Check if this url looks alright
+		// This isn't perfect, but it's what phpBB 3.0 did, and might as well make sure everything is compatible
+		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $url))
+		{
+			$error[] = 'AVATAR_URL_INVALID';
+			return false;
+		}
+
+		// Make sure getimagesize works...
+		if (function_exists('getimagesize'))
+		{
+			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
+			{
+				$error[] = 'UNABLE_GET_IMAGE_SIZE';
+				return false;
+			}
+
+			if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
+			{
+				$error[] = 'AVATAR_NO_SIZE';
+				return false;
+			}
+
+			$width = ($width && $height) ? $width : $image_data[0];
+			$height = ($width && $height) ? $height : $image_data[1];
+		}
+
+		if ($width <= 0 || $height <= 0)
+		{
+			$error[] = 'AVATAR_NO_SIZE';
+			return false;
+		}
+
+		include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
+		$types = fileupload::image_types();
+		$extension = strtolower(filespec::get_extension($url));
+
+		if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
+		{
+			if (!isset($types[$image_data[2]]))
+			{
+				$error[] = 'UNABLE_GET_IMAGE_SIZE';
+			}
+			else
+			{
+				$error[] = array('IMAGE_FILETYPE_MISMATCH', $types[$image_data[2]][0], $extension);
+			}
+
+			return false;
+		}
+
+		if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
+		{
+			if ($width > $this->config['avatar_max_width'] || $height > $this->config['avatar_max_height'])
+			{
+				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
+				return false;
+			}
+		}
+
+		if ($this->config['avatar_min_width'] || $this->config['avatar_min_height'])
+		{
+			if ($width < $this->config['avatar_min_width'] || $height < $this->config['avatar_min_height'])
+			{
+				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
+				return false;
+			}
+		}
+
+		return array(
+			'avatar' => $url,
+			'avatar_width' => $width,
+			'avatar_height' => $height,
+		);
+	}
+}
diff --git a/phpBB/includes/avatar/driver/core/upload.php b/phpBB/includes/avatar/driver/core/upload.php
new file mode 100644
index 0000000000..d0ce856dbe
--- /dev/null
+++ b/phpBB/includes/avatar/driver/core/upload.php
@@ -0,0 +1,147 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars uploaded to the board
+* @package avatars
+*/
+class phpbb_avatar_driver_core_upload extends phpbb_avatar_driver
+{
+	/**
+	* @inheritdoc
+	*/
+	public function get_data($row, $ignore_config = false)
+	{
+		if ($ignore_config || $this->config['allow_avatar_upload'])
+		{
+			return array(
+				'src' => $this->phpbb_root_path . 'download/file.' . $this->phpEx . '?avatar=' . $row['avatar'],
+				'width' => $row['avatar_width'],
+				'height' => $row['avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function prepare_form($template, $row, &$error)
+	{
+		if (!$this->can_upload())
+		{
+			return false;
+		}
+
+		$template->assign_vars(array(
+			'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
+			'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
+		));
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function process_form($template, $row, &$error)
+	{
+		if (!$this->can_upload())
+		{
+			return false;
+		}
+
+		include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
+
+		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
+
+		$url = $this->request->variable('av_upload_url', '');
+
+		if (!empty($_FILES['av_upload_file']['name']))
+		{
+			$file = $upload->form_upload('av_upload_file');
+		}
+		else
+		{
+			$file = $upload->remote_upload($url);
+		}
+
+		$prefix = $this->config['avatar_salt'] . '_';
+		$file->clean_filename('avatar', $prefix, $row['id']);
+
+		$destination = $this->config['avatar_path'];
+
+		// Adjust destination path (no trailing slash)
+		if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
+		{
+			$destination = substr($destination, 0, -1);
+		}
+
+		$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
+		if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
+		{
+			$destination = '';
+		}
+
+		// Move file and overwrite any existing image
+		$file->move_file($destination, true);
+
+		if (sizeof($file->error))
+		{
+			$file->remove();
+			$error = array_merge($error, $file->error);
+			return false;
+		}
+
+		return array(
+			'avatar' => $row['id'] . '_' . time() . '.' . $file->get('extension'),
+			'avatar_width' => $file->get('width'),
+			'avatar_height' => $file->get('height'),
+		);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function delete($row)
+	{
+		$ext = substr(strrchr($row['avatar'], '.'), 1);
+		$filename = $this->phpbb_root_path . $this->config['avatar_path'] . '/' . $this->config['avatar_salt'] . '_' . $row['id'] . '.' . $ext;
+
+		if (file_exists($filename))
+		{
+			@unlink($filename);
+		}
+
+		return true;
+	}
+
+	/**
+	* @TODO
+	*/
+	private function can_upload()
+	{
+		return (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on'));
+	}
+}
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 4ac6762140..5cebd1533d 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -119,4 +119,25 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	{
 		return true;
 	}
+
+	/**
+	* @inheritdoc
+	**/
+	public function is_enabled()
+	{
+		$driver = preg_replace('#^phpbb_avatar_driver_core_#', '', get_class($this));
+
+		return $this->config["allow_avatar_$driver"];
+	}
+
+	/**
+	* @inheritdoc
+	**/
+	public function get_template_name()
+	{
+		$driver = preg_replace('#^phpbb_avatar_driver_core_#', '', get_class($this));
+		$template = "ucp_avatar_options_$driver.html";
+
+		return $template;
+	}
 }
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index d3b764e275..4f1c1f73cf 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -57,4 +57,14 @@ interface phpbb_avatar_driver_interface
 	* @TODO
 	**/
 	public function delete($row);
+
+	/**
+	* @TODO
+	**/
+	public function is_enabled();
+
+	/**
+	* @TODO
+	**/
+	public function get_template_name();
 }
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
deleted file mode 100644
index a0ef912eae..0000000000
--- a/phpBB/includes/avatar/driver/local.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
-*
-* @package avatar
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars selected from the board gallery
-* @package avatars
-*/
-class phpbb_avatar_driver_local extends phpbb_avatar_driver
-{
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row, $ignore_config = false)
-	{
-		if ($ignore_config || $this->config['allow_avatar_local'])
-		{
-			return array(
-				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
-				'width' => $row['avatar_width'],
-				'height' => $row['avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($template, $row, &$error)
-	{
-		$avatar_list = $this->get_avatar_list();
-		$category = $this->request->variable('av_local_cat', '');
-
-		$categories = array_keys($avatar_list);
-
-		foreach ($categories as $cat)
-		{
-			if (!empty($avatar_list[$cat]))
-			{
-				$template->assign_block_vars('av_local_cats', array(
-					'NAME' => $cat,
-					'SELECTED' => ($cat == $category),
-				));
-			}
-		}
-
-		if (!empty($avatar_list[$category]))
-		{
-			$template->assign_vars(array(
-				'AV_LOCAL_SHOW' => true,
-			));
-
-			$table_cols = isset($row['av_gallery_cols']) ? $row['av_gallery_cols'] : 4;
-			$row_count = $col_count = $av_pos = 0;
-			$av_count = sizeof($avatar_list[$category]);
-
-			reset($avatar_list[$category]);
-
-			while ($av_pos < $av_count)
-			{
-				$img = current($avatar_list[$category]);
-				next($avatar_list[$category]);
-
-				if ($col_count == 0)
-				{
-					++$row_count;
-					$template->assign_block_vars('av_local_row', array(
-					));
-				}
-
-				$template->assign_block_vars('av_local_row.av_local_col', array(
-					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
-					'AVATAR_NAME' => $img['name'],
-					'AVATAR_FILE' => $img['filename'],
-				));
-
-				$col_count = ($col_count + 1) % $table_cols;
-
-				++$av_pos;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($template, $row, &$error)
-	{
-		$avatar_list = $this->get_avatar_list();
-		$category = $this->request->variable('av_local_cat', '');
-
-		$file = $this->request->variable('av_local_file', '');
-		if (!isset($avatar_list[$category][urldecode($file)]))
-		{
-			$error[] = 'AVATAR_URL_NOT_FOUND';
-			return false;
-		}
-
-		return array(
-			'avatar' => $category . '/' . $file,
-			'avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
-			'avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
-		);
-	}
-
-	/**
-	* @TODO
-	*/
-	private function get_avatar_list()
-	{
-		$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list');
-
-		if (!$avatar_list)
-		{
-			$avatar_list = array();
-			$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
-
-			$dh = @opendir($path);
-
-			if ($dh)
-			{
-				while (($cat = readdir($dh)) !== false) {
-					if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
-					{
-						if ($ch = @opendir("$path/$cat"))
-						{
-							while (($image = readdir($ch)) !== false)
-							{
-								// Match all images in the gallery folder
-								if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
-								{
-									if (function_exists('getimagesize'))
-									{
-										$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
-									}
-									else
-									{
-										$dims = array(0, 0);
-									}
-									$avatar_list[$cat][$image] = array(
-										'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
-										'filename'  => rawurlencode($image),
-										'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
-										'width'     => $dims[0],
-										'height'    => $dims[1],
-									);
-								}
-							}
-							@closedir($ch);
-						}
-					}
-				}
-				@closedir($dh);
-			}
-
-			@ksort($avatar_list);
-
-			if ($this->cache != null)
-			{
-				$this->cache->put('av_local_list', $avatar_list);
-			}
-		}
-
-		return $avatar_list;
-	}
-}
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
deleted file mode 100644
index cd0a756428..0000000000
--- a/phpBB/includes/avatar/driver/remote.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
-*
-* @package avatar
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars hosted remotely
-* @package avatars
-*/
-class phpbb_avatar_driver_remote extends phpbb_avatar_driver
-{
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row, $ignore_config = false)
-	{
-		if ($ignore_config || $this->config['allow_avatar_remote'])
-		{
-			return array(
-				'src' => $row['avatar'],
-				'width' => $row['avatar_width'],
-				'height' => $row['avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($template, $row, &$error)
-	{
-		$template->assign_vars(array(
-			'AV_REMOTE_WIDTH' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
-			'AV_REMOTE_HEIGHT' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
-			'AV_REMOTE_URL' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar']) ? $row['avatar'] : '',
-		));
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($template, $row, &$error)
-	{
-		$url = $this->request->variable('av_remote_url', '');
-		$width = $this->request->variable('av_remote_width', 0);
-		$height = $this->request->variable('av_remote_height', 0);
-
-		if (!preg_match('#^(http|https|ftp)://#i', $url))
-		{
-			$url = 'http://' . $url;
-		}
-
-		require_once($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
-
-		$error = array_merge($error, validate_data(array(
-			'url' => $url,
-		), array(
-			'url' => array('string', true, 5, 255),
-		)));
-
-		if (!empty($error))
-		{
-			return false;
-		}
-
-		// Check if this url looks alright
-		// This isn't perfect, but it's what phpBB 3.0 did, and might as well make sure everything is compatible
-		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $url))
-		{
-			$error[] = 'AVATAR_URL_INVALID';
-			return false;
-		}
-
-		// Make sure getimagesize works...
-		if (function_exists('getimagesize'))
-		{
-			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
-			{
-				$error[] = 'UNABLE_GET_IMAGE_SIZE';
-				return false;
-			}
-
-			if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
-			{
-				$error[] = 'AVATAR_NO_SIZE';
-				return false;
-			}
-
-			$width = ($width && $height) ? $width : $image_data[0];
-			$height = ($width && $height) ? $height : $image_data[1];
-		}
-
-		if ($width <= 0 || $height <= 0)
-		{
-			$error[] = 'AVATAR_NO_SIZE';
-			return false;
-		}
-
-		include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
-		$types = fileupload::image_types();
-		$extension = strtolower(filespec::get_extension($url));
-
-		if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
-		{
-			if (!isset($types[$image_data[2]]))
-			{
-				$error[] = 'UNABLE_GET_IMAGE_SIZE';
-			}
-			else
-			{
-				$error[] = array('IMAGE_FILETYPE_MISMATCH', $types[$image_data[2]][0], $extension);
-			}
-
-			return false;
-		}
-
-		if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
-		{
-			if ($width > $this->config['avatar_max_width'] || $height > $this->config['avatar_max_height'])
-			{
-				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
-				return false;
-			}
-		}
-
-		if ($this->config['avatar_min_width'] || $this->config['avatar_min_height'])
-		{
-			if ($width < $this->config['avatar_min_width'] || $height < $this->config['avatar_min_height'])
-			{
-				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
-				return false;
-			}
-		}
-
-		return array(
-			'avatar' => $url,
-			'avatar_width' => $width,
-			'avatar_height' => $height,
-		);
-	}
-}
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
deleted file mode 100644
index d9504c04a0..0000000000
--- a/phpBB/includes/avatar/driver/upload.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
-*
-* @package avatar
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars uploaded to the board
-* @package avatars
-*/
-class phpbb_avatar_driver_upload extends phpbb_avatar_driver
-{
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row, $ignore_config = false)
-	{
-		if ($ignore_config || $this->config['allow_avatar_upload'])
-		{
-			return array(
-				'src' => $this->phpbb_root_path . 'download/file.' . $this->phpEx . '?avatar=' . $row['avatar'],
-				'width' => $row['avatar_width'],
-				'height' => $row['avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($template, $row, &$error)
-	{
-		if (!$this->can_upload())
-		{
-			return false;
-		}
-
-		$template->assign_vars(array(
-			'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
-			'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
-		));
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($template, $row, &$error)
-	{
-		if (!$this->can_upload())
-		{
-			return false;
-		}
-
-		include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
-
-		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
-
-		$url = $this->request->variable('av_upload_url', '');
-
-		if (!empty($_FILES['av_upload_file']['name']))
-		{
-			$file = $upload->form_upload('av_upload_file');
-		}
-		else
-		{
-			$file = $upload->remote_upload($url);
-		}
-
-		$prefix = $this->config['avatar_salt'] . '_';
-		$file->clean_filename('avatar', $prefix, $row['id']);
-
-		$destination = $this->config['avatar_path'];
-
-		// Adjust destination path (no trailing slash)
-		if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
-		{
-			$destination = substr($destination, 0, -1);
-		}
-
-		$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
-		if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
-		{
-			$destination = '';
-		}
-
-		// Move file and overwrite any existing image
-		$file->move_file($destination, true);
-
-		if (sizeof($file->error))
-		{
-			$file->remove();
-			$error = array_merge($error, $file->error);
-			return false;
-		}
-
-		return array(
-			'avatar' => $row['id'] . '_' . time() . '.' . $file->get('extension'),
-			'avatar_width' => $file->get('width'),
-			'avatar_height' => $file->get('height'),
-		);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function delete($row)
-	{
-		$ext = substr(strrchr($row['avatar'], '.'), 1);
-		$filename = $this->phpbb_root_path . $this->config['avatar_path'] . '/' . $this->config['avatar_salt'] . '_' . $row['id'] . '.' . $ext;
-
-		if (file_exists($filename))
-		{
-			@unlink($filename);
-		}
-
-		return true;
-	}
-
-	/**
-	* @TODO
-	*/
-	private function can_upload()
-	{
-		return (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on'));
-	}
-}
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 839216b61e..c2c3dbbbca 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -24,25 +24,27 @@ class phpbb_avatar_manager
 	private $phpEx;
 	private $config;
 	private $request;
+	private $extension_manager;
 	private $cache;
 	private static $valid_drivers = false;
 
 	/**
 	* @TODO
 	**/
-	public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_request $request, phpbb_cache_driver_interface $cache = null)
+	public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_request $request, phpbb_extension_manager $extension_manager, phpbb_cache_driver_interface $cache = null)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->phpEx = $phpEx;
 		$this->config = $config;
 		$this->request = $request;
+		$this->extension_manager = $extension_manager;
 		$this->cache = $cache;
 	}
 
 	/**
 	* @TODO
 	**/
-	public function get_driver($avatar_type, $new = false)
+	public function get_driver($avatar_type)
 	{
 		if (self::$valid_drivers === false)
 		{
@@ -53,30 +55,33 @@ class phpbb_avatar_manager
 		switch ($avatar_type)
 		{
 			case AVATAR_GALLERY:
-				$avatar_type = 'local';
+				$avatar_type = 'phpbb_avatar_driver_local';
 				break;
 			case AVATAR_UPLOAD:
-				$avatar_type = 'upload';
+				$avatar_type = 'phpbb_avatar_driver_upload';
 				break;
 			case AVATAR_REMOTE:
-				$avatar_type = 'remote';
+				$avatar_type = 'phpbb_avatar_driver_remote';
 				break;
 		}
 
-		if (isset(self::$valid_drivers[$avatar_type]))
-		{
-			if ($new || !is_object(self::$valid_drivers[$avatar_type]))
-			{
-				$class_name = 'phpbb_avatar_driver_' . $avatar_type;
-				self::$valid_drivers[$avatar_type] = new $class_name($this->config, $this->request, $this->phpbb_root_path, $this->phpEx, $this->cache);
-			}
-
-			return self::$valid_drivers[$avatar_type];
-		}
-		else
+		if (false === array_search($avatar_type, self::$valid_drivers))
 		{
 			return null;
 		}
+
+		$r = new ReflectionClass($avatar_type);
+
+		if ($r->isSubClassOf('phpbb_avatar_driver')) {
+			$driver = new $avatar_type($this->config, $this->request, $this->phpbb_root_path, $this->phpEx, $this->cache);
+		} else if ($r->implementsInterface('phpbb_avatar_driver')) {
+			$driver = new $avatar_type();
+		} else {
+			$message = "Invalid avatar driver class name '%s' provided. It must implement phpbb_avatar_driver_interface.";
+			trigger_error(sprintf($message, $avatar_type));
+		}
+
+		return $driver;
 	}
 
 	/**
@@ -93,18 +98,12 @@ class phpbb_avatar_manager
 		{
 			self::$valid_drivers = array();
 
-			$iterator = new DirectoryIterator($this->phpbb_root_path . 'includes/avatar/driver');
-
-			foreach ($iterator as $file)
-			{
-				// Match all files that appear to be php files
-				if (preg_match("/^(.*)\.{$this->phpEx}$/", $file, $match))
-				{
-					self::$valid_drivers[] = $match[1];
-				}
-			}
+			$finder = $this->extension_manager->get_finder();
 
-			self::$valid_drivers = array_flip(self::$valid_drivers);
+			self::$valid_drivers = $finder
+				->extension_directory('/avatar/driver/')
+				->core_path('includes/avatar/driver/core/')
+				->get_classes();
 
 			if ($this->cache)
 			{
@@ -123,7 +122,7 @@ class phpbb_avatar_manager
 			$this->load_valid_drivers();
 		}
 
-		return array_keys(self::$valid_drivers);
+		return self::$valid_drivers;
 	}
 
 	/**
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 6b2133796d..f406e9dc5b 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -623,18 +623,18 @@ class ucp_profile
 					}
 
 					$focused_driver = request_var('avatar_driver', $user->data['user_avatar_type']);
-					
+
 					foreach ($avatar_drivers as $driver)
 					{
-						if ($config["allow_avatar_$driver"])
+						$avatar = $phpbb_avatar_manager->get_driver($driver);
+
+						if ($avatar->is_enabled())
 						{
 							$avatars_enabled = true;
 							$template->set_filenames(array(
-								'avatar' => "ucp_avatar_options_$driver.html",
+								'avatar' => $avatar->get_template_name(),
 							));
 
-							$avatar = $phpbb_avatar_manager->get_driver($driver);
-
 							if ($avatar->prepare_form($template, $avatar_data, $error))
 							{
 								$driver_u = strtoupper($driver);
-- 
cgit v1.2.1


From 90a957ad26f52e26c3979464c5ac15b1fd0fcc28 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 17:43:43 +0200
Subject: [ticket/11015] Make DBAL classes autoloadable

PHPBB3-11015

This allows us to just create the object without having to include the
driver first. However, it also means that users must specify the full
class name in config.php
---
 phpBB/includes/config/db.php             |    2 +-
 phpBB/includes/db/dbal.php               | 1049 ------------------------------
 phpBB/includes/db/driver/driver.php      | 1044 +++++++++++++++++++++++++++++
 phpBB/includes/db/driver/firebird.php    |  538 +++++++++++++++
 phpBB/includes/db/driver/mssql.php       |  454 +++++++++++++
 phpBB/includes/db/driver/mssql_odbc.php  |  395 +++++++++++
 phpBB/includes/db/driver/mssqlnative.php |  642 ++++++++++++++++++
 phpBB/includes/db/driver/mysql.php       |  565 ++++++++++++++++
 phpBB/includes/db/driver/mysqli.php      |  566 ++++++++++++++++
 phpBB/includes/db/driver/oracle.php      |  766 ++++++++++++++++++++++
 phpBB/includes/db/driver/postgres.php    |  491 ++++++++++++++
 phpBB/includes/db/driver/sqlite.php      |  334 ++++++++++
 phpBB/includes/db/firebird.php           |  540 ---------------
 phpBB/includes/db/mssql.php              |  456 -------------
 phpBB/includes/db/mssql_odbc.php         |  397 -----------
 phpBB/includes/db/mssqlnative.php        |  644 ------------------
 phpBB/includes/db/mysql.php              |  567 ----------------
 phpBB/includes/db/mysqli.php             |  568 ----------------
 phpBB/includes/db/oracle.php             |  768 ----------------------
 phpBB/includes/db/postgres.php           |  498 --------------
 phpBB/includes/db/sqlite.php             |  336 ----------
 phpBB/includes/extension/manager.php     |    4 +-
 phpBB/includes/functions_install.php     |   59 +-
 23 files changed, 5824 insertions(+), 5859 deletions(-)
 delete mode 100644 phpBB/includes/db/dbal.php
 create mode 100644 phpBB/includes/db/driver/driver.php
 create mode 100644 phpBB/includes/db/driver/firebird.php
 create mode 100644 phpBB/includes/db/driver/mssql.php
 create mode 100644 phpBB/includes/db/driver/mssql_odbc.php
 create mode 100644 phpBB/includes/db/driver/mssqlnative.php
 create mode 100644 phpBB/includes/db/driver/mysql.php
 create mode 100644 phpBB/includes/db/driver/mysqli.php
 create mode 100644 phpBB/includes/db/driver/oracle.php
 create mode 100644 phpBB/includes/db/driver/postgres.php
 create mode 100644 phpBB/includes/db/driver/sqlite.php
 delete mode 100644 phpBB/includes/db/firebird.php
 delete mode 100644 phpBB/includes/db/mssql.php
 delete mode 100644 phpBB/includes/db/mssql_odbc.php
 delete mode 100644 phpBB/includes/db/mssqlnative.php
 delete mode 100644 phpBB/includes/db/mysql.php
 delete mode 100644 phpBB/includes/db/mysqli.php
 delete mode 100644 phpBB/includes/db/oracle.php
 delete mode 100644 phpBB/includes/db/postgres.php
 delete mode 100644 phpBB/includes/db/sqlite.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/config/db.php b/phpBB/includes/config/db.php
index 993a764a7f..4293498d97 100644
--- a/phpBB/includes/config/db.php
+++ b/phpBB/includes/config/db.php
@@ -46,7 +46,7 @@ class phpbb_config_db extends phpbb_config
 	* @param phpbb_cache_driver_interface $cache Cache instance
 	* @param string                       $table Configuration table name
 	*/
-	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, $table)
+	public function __construct(phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $table)
 	{
 		$this->db = $db;
 		$this->cache = $cache;
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
deleted file mode 100644
index 159703d3be..0000000000
--- a/phpBB/includes/db/dbal.php
+++ /dev/null
@@ -1,1049 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Database Abstraction Layer
-* @package dbal
-*/
-class dbal
-{
-	var $db_connect_id;
-	var $query_result;
-	var $return_on_error = false;
-	var $transaction = false;
-	var $sql_time = 0;
-	var $num_queries = array();
-	var $open_queries = array();
-
-	var $curtime = 0;
-	var $query_hold = '';
-	var $html_hold = '';
-	var $sql_report = '';
-
-	var $persistency = false;
-	var $user = '';
-	var $server = '';
-	var $dbname = '';
-
-	// Set to true if error triggered
-	var $sql_error_triggered = false;
-
-	// Holding the last sql query on sql error
-	var $sql_error_sql = '';
-	// Holding the error information - only populated if sql_error_triggered is set
-	var $sql_error_returned = array();
-
-	// Holding transaction count
-	var $transactions = 0;
-
-	// Supports multi inserts?
-	var $multi_insert = false;
-
-	/**
-	* Current sql layer
-	*/
-	var $sql_layer = '';
-
-	/**
-	* Wildcards for matching any (%) or exactly one (_) character within LIKE expressions
-	*/
-	var $any_char;
-	var $one_char;
-
-	/**
-	* Exact version of the DBAL, directly queried
-	*/
-	var $sql_server_version = false;
-
-	/**
-	* Constructor
-	*/
-	function dbal()
-	{
-		$this->num_queries = array(
-			'cached'		=> 0,
-			'normal'		=> 0,
-			'total'			=> 0,
-		);
-
-		// Fill default sql layer based on the class being called.
-		// This can be changed by the specified layer itself later if needed.
-		$this->sql_layer = substr(get_class($this), 5);
-
-		// Do not change this please! This variable is used to easy the use of it - and is hardcoded.
-		$this->any_char = chr(0) . '%';
-		$this->one_char = chr(0) . '_';
-	}
-
-	/**
-	* return on error or display error message
-	*/
-	function sql_return_on_error($fail = false)
-	{
-		$this->sql_error_triggered = false;
-		$this->sql_error_sql = '';
-
-		$this->return_on_error = $fail;
-	}
-
-	/**
-	* Return number of sql queries and cached sql queries used
-	*/
-	function sql_num_queries($cached = false)
-	{
-		return ($cached) ? $this->num_queries['cached'] : $this->num_queries['normal'];
-	}
-
-	/**
-	* Add to query count
-	*/
-	function sql_add_num_queries($cached = false)
-	{
-		$this->num_queries['cached'] += ($cached !== false) ? 1 : 0;
-		$this->num_queries['normal'] += ($cached !== false) ? 0 : 1;
-		$this->num_queries['total'] += 1;
-	}
-
-	/**
-	* DBAL garbage collection, close sql connection
-	*/
-	function sql_close()
-	{
-		if (!$this->db_connect_id)
-		{
-			return false;
-		}
-
-		if ($this->transaction)
-		{
-			do
-			{
-				$this->sql_transaction('commit');
-			}
-			while ($this->transaction);
-		}
-
-		foreach ($this->open_queries as $query_id)
-		{
-			$this->sql_freeresult($query_id);
-		}
-
-		// Connection closed correctly. Set db_connect_id to false to prevent errors
-		if ($result = $this->_sql_close())
-		{
-			$this->db_connect_id = false;
-		}
-
-		return $result;
-	}
-
-	/**
-	* Build LIMIT query
-	* Doing some validation here.
-	*/
-	function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		if (empty($query))
-		{
-			return false;
-		}
-
-		// Never use a negative total or offset
-		$total = ($total < 0) ? 0 : $total;
-		$offset = ($offset < 0) ? 0 : $offset;
-
-		return $this->_sql_query_limit($query, $total, $offset, $cache_ttl);
-	}
-
-	/**
-	* Fetch all rows
-	*/
-	function sql_fetchrowset($query_id = false)
-	{
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($query_id !== false)
-		{
-			$result = array();
-			while ($row = $this->sql_fetchrow($query_id))
-			{
-				$result[] = $row;
-			}
-
-			return $result;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$this->sql_freeresult($query_id);
-		$query_id = $this->sql_query($this->last_query_text);
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
-		for ($i = 0; $i < $rownum; $i++)
-		{
-			if (!$this->sql_fetchrow($query_id))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Fetch field
-	* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
-	*/
-	function sql_fetchfield($field, $rownum = false, $query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($query_id !== false)
-		{
-			if ($rownum !== false)
-			{
-				$this->sql_rowseek($rownum, $query_id);
-			}
-
-			if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
-			{
-				return $cache->sql_fetchfield($query_id, $field);
-			}
-
-			$row = $this->sql_fetchrow($query_id);
-			return (isset($row[$field])) ? $row[$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters
-	* Some DBMS are handling them in a different way
-	*
-	* @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char
-	* @return string LIKE expression including the keyword!
-	*/
-	function sql_like_expression($expression)
-	{
-		$expression = utf8_str_replace(array('_', '%'), array("\_", "\%"), $expression);
-		$expression = utf8_str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression);
-
-		return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
-	}
-
-	/**
-	* Build a case expression
-	*
-	* Note: The two statements action_true and action_false must have the same data type (int, vchar, ...) in the database!
-	*
-	* @param	string	$condition		The condition which must be true, to use action_true rather then action_else
-	* @param	string	$action_true	SQL expression that is used, if the condition is true
-	* @param	string	$action_else	SQL expression that is used, if the condition is false, optional
-	* @return	string			CASE expression including the condition and statements
-	*/
-	public function sql_case($condition, $action_true, $action_false = false)
-	{
-		$sql_case = 'CASE WHEN ' . $condition;
-		$sql_case .= ' THEN ' . $action_true;
-		$sql_case .= ($action_false !== false) ? ' ELSE ' . $action_false : '';
-		$sql_case .= ' END';
-		return $sql_case;
-	}
-
-	/**
-	* Build a concatenated expression
-	*
-	* @param	string	$expr1		Base SQL expression where we append the second one
-	* @param	string	$expr2		SQL expression that is appended to the first expression
-	* @return	string		Concatenated string
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return $expr1 . ' || ' . $expr2;
-	}
-
-	/**
-	* Returns whether results of a query need to be buffered to run a transaction while iterating over them.
-	*
-	* @return bool Whether buffering is required.
-	*/
-	function sql_buffer_nested_transactions()
-	{
-		return false;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				// If we are within a transaction we will not open another one, but enclose the current one to not loose data (prevening auto commit)
-				if ($this->transaction)
-				{
-					$this->transactions++;
-					return true;
-				}
-
-				$result = $this->_sql_transaction('begin');
-
-				if (!$result)
-				{
-					$this->sql_error();
-				}
-
-				$this->transaction = true;
-			break;
-
-			case 'commit':
-				// If there was a previously opened transaction we do not commit yet... but count back the number of inner transactions
-				if ($this->transaction && $this->transactions)
-				{
-					$this->transactions--;
-					return true;
-				}
-
-				// Check if there is a transaction (no transaction can happen if there was an error, with a combined rollback and error returning enabled)
-				// This implies we have transaction always set for autocommit db's
-				if (!$this->transaction)
-				{
-					return false;
-				}
-
-				$result = $this->_sql_transaction('commit');
-
-				if (!$result)
-				{
-					$this->sql_error();
-				}
-
-				$this->transaction = false;
-				$this->transactions = 0;
-			break;
-
-			case 'rollback':
-				$result = $this->_sql_transaction('rollback');
-				$this->transaction = false;
-				$this->transactions = 0;
-			break;
-
-			default:
-				$result = $this->_sql_transaction($status);
-			break;
-		}
-
-		return $result;
-	}
-
-	/**
-	* Build sql statement from array for insert/update/select statements
-	*
-	* Idea for this from Ikonboard
-	* Possible query values: INSERT, INSERT_SELECT, UPDATE, SELECT
-	*
-	*/
-	function sql_build_array($query, $assoc_ary = false)
-	{
-		if (!is_array($assoc_ary))
-		{
-			return false;
-		}
-
-		$fields = $values = array();
-
-		if ($query == 'INSERT' || $query == 'INSERT_SELECT')
-		{
-			foreach ($assoc_ary as $key => $var)
-			{
-				$fields[] = $key;
-
-				if (is_array($var) && is_string($var[0]))
-				{
-					// This is used for INSERT_SELECT(s)
-					$values[] = $var[0];
-				}
-				else
-				{
-					$values[] = $this->_sql_validate_value($var);
-				}
-			}
-
-			$query = ($query == 'INSERT') ? ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')' : ' (' . implode(', ', $fields) . ') SELECT ' . implode(', ', $values) . ' ';
-		}
-		else if ($query == 'MULTI_INSERT')
-		{
-			trigger_error('The MULTI_INSERT query value is no longer supported. Please use sql_multi_insert() instead.', E_USER_ERROR);
-		}
-		else if ($query == 'UPDATE' || $query == 'SELECT')
-		{
-			$values = array();
-			foreach ($assoc_ary as $key => $var)
-			{
-				$values[] = "$key = " . $this->_sql_validate_value($var);
-			}
-			$query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values);
-		}
-
-		return $query;
-	}
-
-	/**
-	* Build IN or NOT IN sql comparison string, uses <> or = on single element
-	* arrays to improve comparison speed
-	*
-	* @access public
-	* @param	string	$field				name of the sql column that shall be compared
-	* @param	array	$array				array of values that are allowed (IN) or not allowed (NOT IN)
-	* @param	bool	$negate				true for NOT IN (), false for IN () (default)
-	* @param	bool	$allow_empty_set	If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
-	*/
-	function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
-	{
-		if (!sizeof($array))
-		{
-			if (!$allow_empty_set)
-			{
-				// Print the backtrace to help identifying the location of the problematic code
-				$this->sql_error('No values specified for SQL IN comparison');
-			}
-			else
-			{
-				// NOT IN () actually means everything so use a tautology
-				if ($negate)
-				{
-					return '1=1';
-				}
-				// IN () actually means nothing so use a contradiction
-				else
-				{
-					return '1=0';
-				}
-			}
-		}
-
-		if (!is_array($array))
-		{
-			$array = array($array);
-		}
-
-		if (sizeof($array) == 1)
-		{
-			@reset($array);
-			$var = current($array);
-
-			return $field . ($negate ? ' <> ' : ' = ') . $this->_sql_validate_value($var);
-		}
-		else
-		{
-			return $field . ($negate ? ' NOT IN ' : ' IN ') . '(' . implode(', ', array_map(array($this, '_sql_validate_value'), $array)) . ')';
-		}
-	}
-
-	/**
-	* Run binary AND operator on DB column.
-	* Results in sql statement: "{$column_name} & (1 << {$bit}) {$compare}"
-	*
-	* @param string $column_name The column name to use
-	* @param int $bit The value to use for the AND operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
-	* @param string $compare Any custom SQL code after the check (for example "= 0")
-	*/
-	function sql_bit_and($column_name, $bit, $compare = '')
-	{
-		if (method_exists($this, '_sql_bit_and'))
-		{
-			return $this->_sql_bit_and($column_name, $bit, $compare);
-		}
-
-		return $column_name . ' & ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
-	}
-
-	/**
-	* Run binary OR operator on DB column.
-	* Results in sql statement: "{$column_name} | (1 << {$bit}) {$compare}"
-	*
-	* @param string $column_name The column name to use
-	* @param int $bit The value to use for the OR operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
-	* @param string $compare Any custom SQL code after the check (for example "= 0")
-	*/
-	function sql_bit_or($column_name, $bit, $compare = '')
-	{
-		if (method_exists($this, '_sql_bit_or'))
-		{
-			return $this->_sql_bit_or($column_name, $bit, $compare);
-		}
-
-		return $column_name . ' | ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
-	}
-
-	/**
-	* Returns SQL string to cast a string expression to an int.
-	*
-	* @param  string $expression An expression evaluating to string
-	* @return string             Expression returning an int
-	*/
-	function cast_expr_to_bigint($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Returns SQL string to cast an integer expression to a string.
-	*
-	* @param  string $expression An expression evaluating to int
-	* @return string             Expression returning a string
-	*/
-	function cast_expr_to_string($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Run LOWER() on DB column of type text (i.e. neither varchar nor char).
-	*
-	* @param string $column_name	The column name to use
-	*
-	* @return string				A SQL statement like "LOWER($column_name)"
-	*/
-	function sql_lower_text($column_name)
-	{
-		return "LOWER($column_name)";
-	}
-
-	/**
-	* Run more than one insert statement.
-	*
-	* @param string $table table name to run the statements on
-	* @param array &$sql_ary multi-dimensional array holding the statement data.
-	*
-	* @return bool false if no statements were executed.
-	* @access public
-	*/
-	function sql_multi_insert($table, &$sql_ary)
-	{
-		if (!sizeof($sql_ary))
-		{
-			return false;
-		}
-
-		if ($this->multi_insert)
-		{
-			$ary = array();
-			foreach ($sql_ary as $id => $_sql_ary)
-			{
-				// If by accident the sql array is only one-dimensional we build a normal insert statement
-				if (!is_array($_sql_ary))
-				{
-					return $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $sql_ary));
-				}
-
-				$values = array();
-				foreach ($_sql_ary as $key => $var)
-				{
-					$values[] = $this->_sql_validate_value($var);
-				}
-				$ary[] = '(' . implode(', ', $values) . ')';
-			}
-
-			return $this->sql_query('INSERT INTO ' . $table . ' ' . ' (' . implode(', ', array_keys($sql_ary[0])) . ') VALUES ' . implode(', ', $ary));
-		}
-		else
-		{
-			foreach ($sql_ary as $ary)
-			{
-				if (!is_array($ary))
-				{
-					return false;
-				}
-
-				$result = $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $ary));
-
-				if (!$result)
-				{
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Function for validating values
-	* @access private
-	*/
-	function _sql_validate_value($var)
-	{
-		if (is_null($var))
-		{
-			return 'NULL';
-		}
-		else if (is_string($var))
-		{
-			return "'" . $this->sql_escape($var) . "'";
-		}
-		else
-		{
-			return (is_bool($var)) ? intval($var) : $var;
-		}
-	}
-
-	/**
-	* Build sql statement from array for select and select distinct statements
-	*
-	* Possible query values: SELECT, SELECT_DISTINCT
-	*/
-	function sql_build_query($query, $array)
-	{
-		$sql = '';
-		switch ($query)
-		{
-			case 'SELECT':
-			case 'SELECT_DISTINCT';
-
-				$sql = str_replace('_', ' ', $query) . ' ' . $array['SELECT'] . ' FROM ';
-
-				// Build table array. We also build an alias array for later checks.
-				$table_array = $aliases = array();
-				$used_multi_alias = false;
-
-				foreach ($array['FROM'] as $table_name => $alias)
-				{
-					if (is_array($alias))
-					{
-						$used_multi_alias = true;
-
-						foreach ($alias as $multi_alias)
-						{
-							$table_array[] = $table_name . ' ' . $multi_alias;
-							$aliases[] = $multi_alias;
-						}
-					}
-					else
-					{
-						$table_array[] = $table_name . ' ' . $alias;
-						$aliases[] = $alias;
-					}
-				}
-
-				// We run the following code to determine if we need to re-order the table array. ;)
-				// The reason for this is that for multi-aliased tables (two equal tables) in the FROM statement the last table need to match the first comparison.
-				// DBMS who rely on this: Oracle, PostgreSQL and MSSQL. For all other DBMS it makes absolutely no difference in which order the table is.
-				if (!empty($array['LEFT_JOIN']) && sizeof($array['FROM']) > 1 && $used_multi_alias !== false)
-				{
-					// Take first LEFT JOIN
-					$join = current($array['LEFT_JOIN']);
-
-					// Determine the table used there (even if there are more than one used, we only want to have one
-					preg_match('/(' . implode('|', $aliases) . ')\.[^\s]+/U', str_replace(array('(', ')', 'AND', 'OR', ' '), '', $join['ON']), $matches);
-
-					// If there is a first join match, we need to make sure the table order is correct
-					if (!empty($matches[1]))
-					{
-						$first_join_match = trim($matches[1]);
-						$table_array = $last = array();
-
-						foreach ($array['FROM'] as $table_name => $alias)
-						{
-							if (is_array($alias))
-							{
-								foreach ($alias as $multi_alias)
-								{
-									($multi_alias === $first_join_match) ? $last[] = $table_name . ' ' . $multi_alias : $table_array[] = $table_name . ' ' . $multi_alias;
-								}
-							}
-							else
-							{
-								($alias === $first_join_match) ? $last[] = $table_name . ' ' . $alias : $table_array[] = $table_name . ' ' . $alias;
-							}
-						}
-
-						$table_array = array_merge($table_array, $last);
-					}
-				}
-
-				$sql .= $this->_sql_custom_build('FROM', implode(' CROSS JOIN ', $table_array));
-
-				if (!empty($array['LEFT_JOIN']))
-				{
-					foreach ($array['LEFT_JOIN'] as $join)
-					{
-						$sql .= ' LEFT JOIN ' . key($join['FROM']) . ' ' . current($join['FROM']) . ' ON (' . $join['ON'] . ')';
-					}
-				}
-
-				if (!empty($array['WHERE']))
-				{
-					$sql .= ' WHERE ' . $this->_sql_custom_build('WHERE', $array['WHERE']);
-				}
-
-				if (!empty($array['GROUP_BY']))
-				{
-					$sql .= ' GROUP BY ' . $array['GROUP_BY'];
-				}
-
-				if (!empty($array['ORDER_BY']))
-				{
-					$sql .= ' ORDER BY ' . $array['ORDER_BY'];
-				}
-
-			break;
-		}
-
-		return $sql;
-	}
-
-	/**
-	* display sql error page
-	*/
-	function sql_error($sql = '')
-	{
-		global $auth, $user, $config;
-
-		// Set var to retrieve errored status
-		$this->sql_error_triggered = true;
-		$this->sql_error_sql = $sql;
-
-		$this->sql_error_returned = $this->_sql_error();
-
-		if (!$this->return_on_error)
-		{
-			$message = 'SQL ERROR [ ' . $this->sql_layer . ' ]<br /><br />' . $this->sql_error_returned['message'] . ' [' . $this->sql_error_returned['code'] . ']';
-
-			// Show complete SQL error and path to administrators only
-			// Additionally show complete error on installation or if extended debug mode is enabled
-			// The DEBUG_EXTRA constant is for development only!
-			if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG_EXTRA'))
-			{
-				$message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
-			}
-			else
-			{
-				// If error occurs in initiating the session we need to use a pre-defined language string
-				// This could happen if the connection could not be established for example (then we are not able to grab the default language)
-				if (!isset($user->lang['SQL_ERROR_OCCURRED']))
-				{
-					$message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.';
-				}
-				else
-				{
-					if (!empty($config['board_contact']))
-					{
-						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
-					}
-					else
-					{
-						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', '');
-					}
-				}
-			}
-
-			if ($this->transaction)
-			{
-				$this->sql_transaction('rollback');
-			}
-
-			if (strlen($message) > 1024)
-			{
-				// We need to define $msg_long_text here to circumvent text stripping.
-				global $msg_long_text;
-				$msg_long_text = $message;
-
-				trigger_error(false, E_USER_ERROR);
-			}
-
-			trigger_error($message, E_USER_ERROR);
-		}
-
-		if ($this->transaction)
-		{
-			$this->sql_transaction('rollback');
-		}
-
-		return $this->sql_error_returned;
-	}
-
-	/**
-	* Explain queries
-	*/
-	function sql_report($mode, $query = '')
-	{
-		global $cache, $starttime, $phpbb_root_path, $user;
-		global $request;
-
-		if (is_object($request) && !$request->variable('explain', false))
-		{
-			return false;
-		}
-
-		if (!$query && $this->query_hold != '')
-		{
-			$query = $this->query_hold;
-		}
-
-		switch ($mode)
-		{
-			case 'display':
-				if (!empty($cache))
-				{
-					$cache->unload();
-				}
-				$this->sql_close();
-
-				$mtime = explode(' ', microtime());
-				$totaltime = $mtime[0] + $mtime[1] - $starttime;
-
-				echo '<!DOCTYPE html>
-					<html dir="ltr">
-					<head>
-						<meta charset="utf-8">
-						<title>SQL Report</title>
-						<link href="' . $phpbb_root_path . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-					</head>
-					<body id="errorpage">
-					<div id="wrap">
-						<div id="page-header">
-							<a href="' . build_url('explain') . '">Return to previous page</a>
-						</div>
-						<div id="page-body">
-							<div id="acp">
-							<div class="panel">
-								<span class="corners-top"><span></span></span>
-								<div id="content">
-									<h1>SQL Report</h1>
-									<br />
-									<p><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries['normal']} queries" . (($this->num_queries['cached']) ? " + {$this->num_queries['cached']} " . (($this->num_queries['cached'] == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></p>
-
-									<p>Time spent on ' . $this->sql_layer . ' queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></p>
-
-									<br /><br />
-									' . $this->sql_report . '
-								</div>
-								<span class="corners-bottom"><span></span></span>
-							</div>
-							</div>
-						</div>
-						<div id="page-footer">
-							Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
-						</div>
-					</div>
-					</body>
-					</html>';
-
-				exit_handler();
-
-			break;
-
-			case 'stop':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$this->sql_report .= '
-
-					<table cellspacing="1">
-					<thead>
-					<tr>
-						<th>Query #' . $this->num_queries['total'] . '</th>
-					</tr>
-					</thead>
-					<tbody>
-					<tr>
-						<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td>
-					</tr>
-					</tbody>
-					</table>
-
-					' . $this->html_hold . '
-
-					<p style="text-align: center;">
-				';
-
-				if ($this->query_result)
-				{
-					if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query))
-					{
-						$this->sql_report .= 'Affected rows: <b>' . $this->sql_affectedrows($this->query_result) . '</b> | ';
-					}
-					$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $this->curtime) . 's</b>';
-				}
-				else
-				{
-					$error = $this->sql_error();
-					$this->sql_report .= '<b style="color: red">FAILED</b> - ' . $this->sql_layer . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
-				}
-
-				$this->sql_report .= '</p><br /><br />';
-
-				$this->sql_time += $endtime - $this->curtime;
-			break;
-
-			case 'start':
-				$this->query_hold = $query;
-				$this->html_hold = '';
-
-				$this->_sql_report($mode, $query);
-
-				$this->curtime = explode(' ', microtime());
-				$this->curtime = $this->curtime[0] + $this->curtime[1];
-
-			break;
-
-			case 'add_select_row':
-
-				$html_table = func_get_arg(2);
-				$row = func_get_arg(3);
-
-				if (!$html_table && sizeof($row))
-				{
-					$html_table = true;
-					$this->html_hold .= '<table cellspacing="1"><tr>';
-
-					foreach (array_keys($row) as $val)
-					{
-						$this->html_hold .= '<th>' . (($val) ? ucwords(str_replace('_', ' ', $val)) : '&nbsp;') . '</th>';
-					}
-					$this->html_hold .= '</tr>';
-				}
-				$this->html_hold .= '<tr>';
-
-				$class = 'row1';
-				foreach (array_values($row) as $val)
-				{
-					$class = ($class == 'row1') ? 'row2' : 'row1';
-					$this->html_hold .= '<td class="' . $class . '">' . (($val) ? $val : '&nbsp;') . '</td>';
-				}
-				$this->html_hold .= '</tr>';
-
-				return $html_table;
-
-			break;
-
-			case 'fromcache':
-
-				$this->_sql_report($mode, $query);
-
-			break;
-
-			case 'record_fromcache':
-
-				$endtime = func_get_arg(2);
-				$splittime = func_get_arg(3);
-
-				$time_cache = $endtime - $this->curtime;
-				$time_db = $splittime - $endtime;
-				$color = ($time_db > $time_cache) ? 'green' : 'red';
-
-				$this->sql_report .= '<table cellspacing="1"><thead><tr><th>Query results obtained from the cache</th></tr></thead><tbody><tr>';
-				$this->sql_report .= '<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></tbody></table>';
-				$this->sql_report .= '<p style="text-align: center;">';
-				$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br /><br />';
-
-				// Pad the start time to not interfere with page timing
-				$starttime += $time_db;
-
-			break;
-
-			default:
-
-				$this->_sql_report($mode, $query);
-
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Gets the estimated number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Number of rows in $table_name.
-	*								Prefixed with ~ if estimated (otherwise exact).
-	*
-	* @access public
-	*/
-	function get_estimated_row_count($table_name)
-	{
-		return $this->get_row_count($table_name);
-	}
-
-	/**
-	* Gets the exact number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Exact number of rows in $table_name.
-	*
-	* @access public
-	*/
-	function get_row_count($table_name)
-	{
-		$sql = 'SELECT COUNT(*) AS rows_total
-			FROM ' . $this->sql_escape($table_name);
-		$result = $this->sql_query($sql);
-		$rows_total = $this->sql_fetchfield('rows_total');
-		$this->sql_freeresult($result);
-
-		return $rows_total;
-	}
-}
-
-/**
-* This variable holds the class name to use later
-*/
-$sql_db = (!empty($dbms)) ? 'dbal_' . basename($dbms) : 'dbal';
diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php
new file mode 100644
index 0000000000..39211a5af4
--- /dev/null
+++ b/phpBB/includes/db/driver/driver.php
@@ -0,0 +1,1044 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+    exit;
+}
+
+/**
+* Database Abstraction Layer
+* @package dbal
+*/
+class phpbb_db_driver
+{
+    var $db_connect_id;
+    var $query_result;
+    var $return_on_error = false;
+    var $transaction = false;
+    var $sql_time = 0;
+    var $num_queries = array();
+    var $open_queries = array();
+
+    var $curtime = 0;
+    var $query_hold = '';
+    var $html_hold = '';
+    var $sql_report = '';
+
+    var $persistency = false;
+    var $user = '';
+    var $server = '';
+    var $dbname = '';
+
+    // Set to true if error triggered
+    var $sql_error_triggered = false;
+
+    // Holding the last sql query on sql error
+    var $sql_error_sql = '';
+    // Holding the error information - only populated if sql_error_triggered is set
+    var $sql_error_returned = array();
+
+    // Holding transaction count
+    var $transactions = 0;
+
+    // Supports multi inserts?
+    var $multi_insert = false;
+
+    /**
+    * Current sql layer
+    */
+    var $sql_layer = '';
+
+    /**
+    * Wildcards for matching any (%) or exactly one (_) character within LIKE expressions
+    */
+    var $any_char;
+    var $one_char;
+
+    /**
+    * Exact version of the DBAL, directly queried
+    */
+    var $sql_server_version = false;
+
+    /**
+    * Constructor
+    */
+    function __construct()
+    {
+        $this->num_queries = array(
+            'cached'        => 0,
+            'normal'        => 0,
+            'total'         => 0,
+        );
+
+        // Fill default sql layer based on the class being called.
+        // This can be changed by the specified layer itself later if needed.
+        $this->sql_layer = substr(get_class($this), 5);
+
+        // Do not change this please! This variable is used to easy the use of it - and is hardcoded.
+        $this->any_char = chr(0) . '%';
+        $this->one_char = chr(0) . '_';
+    }
+
+    /**
+    * return on error or display error message
+    */
+    function sql_return_on_error($fail = false)
+    {
+        $this->sql_error_triggered = false;
+        $this->sql_error_sql = '';
+
+        $this->return_on_error = $fail;
+    }
+
+    /**
+    * Return number of sql queries and cached sql queries used
+    */
+    function sql_num_queries($cached = false)
+    {
+        return ($cached) ? $this->num_queries['cached'] : $this->num_queries['normal'];
+    }
+
+    /**
+    * Add to query count
+    */
+    function sql_add_num_queries($cached = false)
+    {
+        $this->num_queries['cached'] += ($cached !== false) ? 1 : 0;
+        $this->num_queries['normal'] += ($cached !== false) ? 0 : 1;
+        $this->num_queries['total'] += 1;
+    }
+
+    /**
+    * DBAL garbage collection, close sql connection
+    */
+    function sql_close()
+    {
+        if (!$this->db_connect_id)
+        {
+            return false;
+        }
+
+        if ($this->transaction)
+        {
+            do
+            {
+                $this->sql_transaction('commit');
+            }
+            while ($this->transaction);
+        }
+
+        foreach ($this->open_queries as $query_id)
+        {
+            $this->sql_freeresult($query_id);
+        }
+
+        // Connection closed correctly. Set db_connect_id to false to prevent errors
+        if ($result = $this->_sql_close())
+        {
+            $this->db_connect_id = false;
+        }
+
+        return $result;
+    }
+
+    /**
+    * Build LIMIT query
+    * Doing some validation here.
+    */
+    function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+    {
+        if (empty($query))
+        {
+            return false;
+        }
+
+        // Never use a negative total or offset
+        $total = ($total < 0) ? 0 : $total;
+        $offset = ($offset < 0) ? 0 : $offset;
+
+        return $this->_sql_query_limit($query, $total, $offset, $cache_ttl);
+    }
+
+    /**
+    * Fetch all rows
+    */
+    function sql_fetchrowset($query_id = false)
+    {
+        if ($query_id === false)
+        {
+            $query_id = $this->query_result;
+        }
+
+        if ($query_id !== false)
+        {
+            $result = array();
+            while ($row = $this->sql_fetchrow($query_id))
+            {
+                $result[] = $row;
+            }
+
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+    * Seek to given row number
+    * rownum is zero-based
+    */
+    function sql_rowseek($rownum, &$query_id)
+    {
+        global $cache;
+
+        if ($query_id === false)
+        {
+            $query_id = $this->query_result;
+        }
+
+        if (isset($cache->sql_rowset[$query_id]))
+        {
+            return $cache->sql_rowseek($rownum, $query_id);
+        }
+
+        if ($query_id === false)
+        {
+            return false;
+        }
+
+        $this->sql_freeresult($query_id);
+        $query_id = $this->sql_query($this->last_query_text);
+
+        if ($query_id === false)
+        {
+            return false;
+        }
+
+        // We do not fetch the row for rownum == 0 because then the next resultset would be the second row
+        for ($i = 0; $i < $rownum; $i++)
+        {
+            if (!$this->sql_fetchrow($query_id))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+    * Fetch field
+    * if rownum is false, the current row is used, else it is pointing to the row (zero-based)
+    */
+    function sql_fetchfield($field, $rownum = false, $query_id = false)
+    {
+        global $cache;
+
+        if ($query_id === false)
+        {
+            $query_id = $this->query_result;
+        }
+
+        if ($query_id !== false)
+        {
+            if ($rownum !== false)
+            {
+                $this->sql_rowseek($rownum, $query_id);
+            }
+
+            if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
+            {
+                return $cache->sql_fetchfield($query_id, $field);
+            }
+
+            $row = $this->sql_fetchrow($query_id);
+            return (isset($row[$field])) ? $row[$field] : false;
+        }
+
+        return false;
+    }
+
+    /**
+    * Correctly adjust LIKE expression for special characters
+    * Some DBMS are handling them in a different way
+    *
+    * @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char
+    * @return string LIKE expression including the keyword!
+    */
+    function sql_like_expression($expression)
+    {
+        $expression = utf8_str_replace(array('_', '%'), array("\_", "\%"), $expression);
+        $expression = utf8_str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression);
+
+        return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
+    }
+
+    /**
+    * Build a case expression
+    *
+    * Note: The two statements action_true and action_false must have the same data type (int, vchar, ...) in the database!
+    *
+    * @param    string  $condition      The condition which must be true, to use action_true rather then action_else
+    * @param    string  $action_true    SQL expression that is used, if the condition is true
+    * @param    string  $action_else    SQL expression that is used, if the condition is false, optional
+    * @return   string          CASE expression including the condition and statements
+    */
+    public function sql_case($condition, $action_true, $action_false = false)
+    {
+        $sql_case = 'CASE WHEN ' . $condition;
+        $sql_case .= ' THEN ' . $action_true;
+        $sql_case .= ($action_false !== false) ? ' ELSE ' . $action_false : '';
+        $sql_case .= ' END';
+        return $sql_case;
+    }
+
+    /**
+    * Build a concatenated expression
+    *
+    * @param    string  $expr1      Base SQL expression where we append the second one
+    * @param    string  $expr2      SQL expression that is appended to the first expression
+    * @return   string      Concatenated string
+    */
+    public function sql_concatenate($expr1, $expr2)
+    {
+        return $expr1 . ' || ' . $expr2;
+    }
+
+    /**
+    * Returns whether results of a query need to be buffered to run a transaction while iterating over them.
+    *
+    * @return bool Whether buffering is required.
+    */
+    function sql_buffer_nested_transactions()
+    {
+        return false;
+    }
+
+    /**
+    * SQL Transaction
+    * @access private
+    */
+    function sql_transaction($status = 'begin')
+    {
+        switch ($status)
+        {
+            case 'begin':
+                // If we are within a transaction we will not open another one, but enclose the current one to not loose data (prevening auto commit)
+                if ($this->transaction)
+                {
+                    $this->transactions++;
+                    return true;
+                }
+
+                $result = $this->_sql_transaction('begin');
+
+                if (!$result)
+                {
+                    $this->sql_error();
+                }
+
+                $this->transaction = true;
+            break;
+
+            case 'commit':
+                // If there was a previously opened transaction we do not commit yet... but count back the number of inner transactions
+                if ($this->transaction && $this->transactions)
+                {
+                    $this->transactions--;
+                    return true;
+                }
+
+                // Check if there is a transaction (no transaction can happen if there was an error, with a combined rollback and error returning enabled)
+                // This implies we have transaction always set for autocommit db's
+                if (!$this->transaction)
+                {
+                    return false;
+                }
+
+                $result = $this->_sql_transaction('commit');
+
+                if (!$result)
+                {
+                    $this->sql_error();
+                }
+
+                $this->transaction = false;
+                $this->transactions = 0;
+            break;
+
+            case 'rollback':
+                $result = $this->_sql_transaction('rollback');
+                $this->transaction = false;
+                $this->transactions = 0;
+            break;
+
+            default:
+                $result = $this->_sql_transaction($status);
+            break;
+        }
+
+        return $result;
+    }
+
+    /**
+    * Build sql statement from array for insert/update/select statements
+    *
+    * Idea for this from Ikonboard
+    * Possible query values: INSERT, INSERT_SELECT, UPDATE, SELECT
+    *
+    */
+    function sql_build_array($query, $assoc_ary = false)
+    {
+        if (!is_array($assoc_ary))
+        {
+            return false;
+        }
+
+        $fields = $values = array();
+
+        if ($query == 'INSERT' || $query == 'INSERT_SELECT')
+        {
+            foreach ($assoc_ary as $key => $var)
+            {
+                $fields[] = $key;
+
+                if (is_array($var) && is_string($var[0]))
+                {
+                    // This is used for INSERT_SELECT(s)
+                    $values[] = $var[0];
+                }
+                else
+                {
+                    $values[] = $this->_sql_validate_value($var);
+                }
+            }
+
+            $query = ($query == 'INSERT') ? ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')' : ' (' . implode(', ', $fields) . ') SELECT ' . implode(', ', $values) . ' ';
+        }
+        else if ($query == 'MULTI_INSERT')
+        {
+            trigger_error('The MULTI_INSERT query value is no longer supported. Please use sql_multi_insert() instead.', E_USER_ERROR);
+        }
+        else if ($query == 'UPDATE' || $query == 'SELECT')
+        {
+            $values = array();
+            foreach ($assoc_ary as $key => $var)
+            {
+                $values[] = "$key = " . $this->_sql_validate_value($var);
+            }
+            $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values);
+        }
+
+        return $query;
+    }
+
+    /**
+    * Build IN or NOT IN sql comparison string, uses <> or = on single element
+    * arrays to improve comparison speed
+    *
+    * @access public
+    * @param    string  $field              name of the sql column that shall be compared
+    * @param    array   $array              array of values that are allowed (IN) or not allowed (NOT IN)
+    * @param    bool    $negate             true for NOT IN (), false for IN () (default)
+    * @param    bool    $allow_empty_set    If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
+    */
+    function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
+    {
+        if (!sizeof($array))
+        {
+            if (!$allow_empty_set)
+            {
+                // Print the backtrace to help identifying the location of the problematic code
+                $this->sql_error('No values specified for SQL IN comparison');
+            }
+            else
+            {
+                // NOT IN () actually means everything so use a tautology
+                if ($negate)
+                {
+                    return '1=1';
+                }
+                // IN () actually means nothing so use a contradiction
+                else
+                {
+                    return '1=0';
+                }
+            }
+        }
+
+        if (!is_array($array))
+        {
+            $array = array($array);
+        }
+
+        if (sizeof($array) == 1)
+        {
+            @reset($array);
+            $var = current($array);
+
+            return $field . ($negate ? ' <> ' : ' = ') . $this->_sql_validate_value($var);
+        }
+        else
+        {
+            return $field . ($negate ? ' NOT IN ' : ' IN ') . '(' . implode(', ', array_map(array($this, '_sql_validate_value'), $array)) . ')';
+        }
+    }
+
+    /**
+    * Run binary AND operator on DB column.
+    * Results in sql statement: "{$column_name} & (1 << {$bit}) {$compare}"
+    *
+    * @param string $column_name The column name to use
+    * @param int $bit The value to use for the AND operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
+    * @param string $compare Any custom SQL code after the check (for example "= 0")
+    */
+    function sql_bit_and($column_name, $bit, $compare = '')
+    {
+        if (method_exists($this, '_sql_bit_and'))
+        {
+            return $this->_sql_bit_and($column_name, $bit, $compare);
+        }
+
+        return $column_name . ' & ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
+    }
+
+    /**
+    * Run binary OR operator on DB column.
+    * Results in sql statement: "{$column_name} | (1 << {$bit}) {$compare}"
+    *
+    * @param string $column_name The column name to use
+    * @param int $bit The value to use for the OR operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
+    * @param string $compare Any custom SQL code after the check (for example "= 0")
+    */
+    function sql_bit_or($column_name, $bit, $compare = '')
+    {
+        if (method_exists($this, '_sql_bit_or'))
+        {
+            return $this->_sql_bit_or($column_name, $bit, $compare);
+        }
+
+        return $column_name . ' | ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
+    }
+
+    /**
+    * Returns SQL string to cast a string expression to an int.
+    *
+    * @param  string $expression An expression evaluating to string
+    * @return string             Expression returning an int
+    */
+    function cast_expr_to_bigint($expression)
+    {
+        return $expression;
+    }
+
+    /**
+    * Returns SQL string to cast an integer expression to a string.
+    *
+    * @param  string $expression An expression evaluating to int
+    * @return string             Expression returning a string
+    */
+    function cast_expr_to_string($expression)
+    {
+        return $expression;
+    }
+
+    /**
+    * Run LOWER() on DB column of type text (i.e. neither varchar nor char).
+    *
+    * @param string $column_name    The column name to use
+    *
+    * @return string                A SQL statement like "LOWER($column_name)"
+    */
+    function sql_lower_text($column_name)
+    {
+        return "LOWER($column_name)";
+    }
+
+    /**
+    * Run more than one insert statement.
+    *
+    * @param string $table table name to run the statements on
+    * @param array &$sql_ary multi-dimensional array holding the statement data.
+    *
+    * @return bool false if no statements were executed.
+    * @access public
+    */
+    function sql_multi_insert($table, &$sql_ary)
+    {
+        if (!sizeof($sql_ary))
+        {
+            return false;
+        }
+
+        if ($this->multi_insert)
+        {
+            $ary = array();
+            foreach ($sql_ary as $id => $_sql_ary)
+            {
+                // If by accident the sql array is only one-dimensional we build a normal insert statement
+                if (!is_array($_sql_ary))
+                {
+                    return $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $sql_ary));
+                }
+
+                $values = array();
+                foreach ($_sql_ary as $key => $var)
+                {
+                    $values[] = $this->_sql_validate_value($var);
+                }
+                $ary[] = '(' . implode(', ', $values) . ')';
+            }
+
+            return $this->sql_query('INSERT INTO ' . $table . ' ' . ' (' . implode(', ', array_keys($sql_ary[0])) . ') VALUES ' . implode(', ', $ary));
+        }
+        else
+        {
+            foreach ($sql_ary as $ary)
+            {
+                if (!is_array($ary))
+                {
+                    return false;
+                }
+
+                $result = $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $ary));
+
+                if (!$result)
+                {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+    * Function for validating values
+    * @access private
+    */
+    function _sql_validate_value($var)
+    {
+        if (is_null($var))
+        {
+            return 'NULL';
+        }
+        else if (is_string($var))
+        {
+            return "'" . $this->sql_escape($var) . "'";
+        }
+        else
+        {
+            return (is_bool($var)) ? intval($var) : $var;
+        }
+    }
+
+    /**
+    * Build sql statement from array for select and select distinct statements
+    *
+    * Possible query values: SELECT, SELECT_DISTINCT
+    */
+    function sql_build_query($query, $array)
+    {
+        $sql = '';
+        switch ($query)
+        {
+            case 'SELECT':
+            case 'SELECT_DISTINCT';
+
+                $sql = str_replace('_', ' ', $query) . ' ' . $array['SELECT'] . ' FROM ';
+
+                // Build table array. We also build an alias array for later checks.
+                $table_array = $aliases = array();
+                $used_multi_alias = false;
+
+                foreach ($array['FROM'] as $table_name => $alias)
+                {
+                    if (is_array($alias))
+                    {
+                        $used_multi_alias = true;
+
+                        foreach ($alias as $multi_alias)
+                        {
+                            $table_array[] = $table_name . ' ' . $multi_alias;
+                            $aliases[] = $multi_alias;
+                        }
+                    }
+                    else
+                    {
+                        $table_array[] = $table_name . ' ' . $alias;
+                        $aliases[] = $alias;
+                    }
+                }
+
+                // We run the following code to determine if we need to re-order the table array. ;)
+                // The reason for this is that for multi-aliased tables (two equal tables) in the FROM statement the last table need to match the first comparison.
+                // DBMS who rely on this: Oracle, PostgreSQL and MSSQL. For all other DBMS it makes absolutely no difference in which order the table is.
+                if (!empty($array['LEFT_JOIN']) && sizeof($array['FROM']) > 1 && $used_multi_alias !== false)
+                {
+                    // Take first LEFT JOIN
+                    $join = current($array['LEFT_JOIN']);
+
+                    // Determine the table used there (even if there are more than one used, we only want to have one
+                    preg_match('/(' . implode('|', $aliases) . ')\.[^\s]+/U', str_replace(array('(', ')', 'AND', 'OR', ' '), '', $join['ON']), $matches);
+
+                    // If there is a first join match, we need to make sure the table order is correct
+                    if (!empty($matches[1]))
+                    {
+                        $first_join_match = trim($matches[1]);
+                        $table_array = $last = array();
+
+                        foreach ($array['FROM'] as $table_name => $alias)
+                        {
+                            if (is_array($alias))
+                            {
+                                foreach ($alias as $multi_alias)
+                                {
+                                    ($multi_alias === $first_join_match) ? $last[] = $table_name . ' ' . $multi_alias : $table_array[] = $table_name . ' ' . $multi_alias;
+                                }
+                            }
+                            else
+                            {
+                                ($alias === $first_join_match) ? $last[] = $table_name . ' ' . $alias : $table_array[] = $table_name . ' ' . $alias;
+                            }
+                        }
+
+                        $table_array = array_merge($table_array, $last);
+                    }
+                }
+
+                $sql .= $this->_sql_custom_build('FROM', implode(' CROSS JOIN ', $table_array));
+
+                if (!empty($array['LEFT_JOIN']))
+                {
+                    foreach ($array['LEFT_JOIN'] as $join)
+                    {
+                        $sql .= ' LEFT JOIN ' . key($join['FROM']) . ' ' . current($join['FROM']) . ' ON (' . $join['ON'] . ')';
+                    }
+                }
+
+                if (!empty($array['WHERE']))
+                {
+                    $sql .= ' WHERE ' . $this->_sql_custom_build('WHERE', $array['WHERE']);
+                }
+
+                if (!empty($array['GROUP_BY']))
+                {
+                    $sql .= ' GROUP BY ' . $array['GROUP_BY'];
+                }
+
+                if (!empty($array['ORDER_BY']))
+                {
+                    $sql .= ' ORDER BY ' . $array['ORDER_BY'];
+                }
+
+            break;
+        }
+
+        return $sql;
+    }
+
+    /**
+    * display sql error page
+    */
+    function sql_error($sql = '')
+    {
+        global $auth, $user, $config;
+
+        // Set var to retrieve errored status
+        $this->sql_error_triggered = true;
+        $this->sql_error_sql = $sql;
+
+        $this->sql_error_returned = $this->_sql_error();
+
+        if (!$this->return_on_error)
+        {
+            $message = 'SQL ERROR [ ' . $this->sql_layer . ' ]<br /><br />' . $this->sql_error_returned['message'] . ' [' . $this->sql_error_returned['code'] . ']';
+
+            // Show complete SQL error and path to administrators only
+            // Additionally show complete error on installation or if extended debug mode is enabled
+            // The DEBUG_EXTRA constant is for development only!
+            if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG_EXTRA'))
+            {
+                $message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
+            }
+            else
+            {
+                // If error occurs in initiating the session we need to use a pre-defined language string
+                // This could happen if the connection could not be established for example (then we are not able to grab the default language)
+                if (!isset($user->lang['SQL_ERROR_OCCURRED']))
+                {
+                    $message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.';
+                }
+                else
+                {
+                    if (!empty($config['board_contact']))
+                    {
+                        $message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
+                    }
+                    else
+                    {
+                        $message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', '');
+                    }
+                }
+            }
+
+            if ($this->transaction)
+            {
+                $this->sql_transaction('rollback');
+            }
+
+            if (strlen($message) > 1024)
+            {
+                // We need to define $msg_long_text here to circumvent text stripping.
+                global $msg_long_text;
+                $msg_long_text = $message;
+
+                trigger_error(false, E_USER_ERROR);
+            }
+
+            trigger_error($message, E_USER_ERROR);
+        }
+
+        if ($this->transaction)
+        {
+            $this->sql_transaction('rollback');
+        }
+
+        return $this->sql_error_returned;
+    }
+
+    /**
+    * Explain queries
+    */
+    function sql_report($mode, $query = '')
+    {
+        global $cache, $starttime, $phpbb_root_path, $user;
+        global $request;
+
+        if (is_object($request) && !$request->variable('explain', false))
+        {
+            return false;
+        }
+
+        if (!$query && $this->query_hold != '')
+        {
+            $query = $this->query_hold;
+        }
+
+        switch ($mode)
+        {
+            case 'display':
+                if (!empty($cache))
+                {
+                    $cache->unload();
+                }
+                $this->sql_close();
+
+                $mtime = explode(' ', microtime());
+                $totaltime = $mtime[0] + $mtime[1] - $starttime;
+
+                echo '<!DOCTYPE html>
+                    <html dir="ltr">
+                    <head>
+                        <meta charset="utf-8">
+                        <title>SQL Report</title>
+                        <link href="' . $phpbb_root_path . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+                    </head>
+                    <body id="errorpage">
+                    <div id="wrap">
+                        <div id="page-header">
+                            <a href="' . build_url('explain') . '">Return to previous page</a>
+                        </div>
+                        <div id="page-body">
+                            <div id="acp">
+                            <div class="panel">
+                                <span class="corners-top"><span></span></span>
+                                <div id="content">
+                                    <h1>SQL Report</h1>
+                                    <br />
+                                    <p><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries['normal']} queries" . (($this->num_queries['cached']) ? " + {$this->num_queries['cached']} " . (($this->num_queries['cached'] == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></p>
+
+                                    <p>Time spent on ' . $this->sql_layer . ' queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></p>
+
+                                    <br /><br />
+                                    ' . $this->sql_report . '
+                                </div>
+                                <span class="corners-bottom"><span></span></span>
+                            </div>
+                            </div>
+                        </div>
+                        <div id="page-footer">
+                            Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+                        </div>
+                    </div>
+                    </body>
+                    </html>';
+
+                exit_handler();
+
+            break;
+
+            case 'stop':
+                $endtime = explode(' ', microtime());
+                $endtime = $endtime[0] + $endtime[1];
+
+                $this->sql_report .= '
+
+                    <table cellspacing="1">
+                    <thead>
+                    <tr>
+                        <th>Query #' . $this->num_queries['total'] . '</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td>
+                    </tr>
+                    </tbody>
+                    </table>
+
+                    ' . $this->html_hold . '
+
+                    <p style="text-align: center;">
+                ';
+
+                if ($this->query_result)
+                {
+                    if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query))
+                    {
+                        $this->sql_report .= 'Affected rows: <b>' . $this->sql_affectedrows($this->query_result) . '</b> | ';
+                    }
+                    $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $this->curtime) . 's</b>';
+                }
+                else
+                {
+                    $error = $this->sql_error();
+                    $this->sql_report .= '<b style="color: red">FAILED</b> - ' . $this->sql_layer . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
+                }
+
+                $this->sql_report .= '</p><br /><br />';
+
+                $this->sql_time += $endtime - $this->curtime;
+            break;
+
+            case 'start':
+                $this->query_hold = $query;
+                $this->html_hold = '';
+
+                $this->_sql_report($mode, $query);
+
+                $this->curtime = explode(' ', microtime());
+                $this->curtime = $this->curtime[0] + $this->curtime[1];
+
+            break;
+
+            case 'add_select_row':
+
+                $html_table = func_get_arg(2);
+                $row = func_get_arg(3);
+
+                if (!$html_table && sizeof($row))
+                {
+                    $html_table = true;
+                    $this->html_hold .= '<table cellspacing="1"><tr>';
+
+                    foreach (array_keys($row) as $val)
+                    {
+                        $this->html_hold .= '<th>' . (($val) ? ucwords(str_replace('_', ' ', $val)) : '&nbsp;') . '</th>';
+                    }
+                    $this->html_hold .= '</tr>';
+                }
+                $this->html_hold .= '<tr>';
+
+                $class = 'row1';
+                foreach (array_values($row) as $val)
+                {
+                    $class = ($class == 'row1') ? 'row2' : 'row1';
+                    $this->html_hold .= '<td class="' . $class . '">' . (($val) ? $val : '&nbsp;') . '</td>';
+                }
+                $this->html_hold .= '</tr>';
+
+                return $html_table;
+
+            break;
+
+            case 'fromcache':
+
+                $this->_sql_report($mode, $query);
+
+            break;
+
+            case 'record_fromcache':
+
+                $endtime = func_get_arg(2);
+                $splittime = func_get_arg(3);
+
+                $time_cache = $endtime - $this->curtime;
+                $time_db = $splittime - $endtime;
+                $color = ($time_db > $time_cache) ? 'green' : 'red';
+
+                $this->sql_report .= '<table cellspacing="1"><thead><tr><th>Query results obtained from the cache</th></tr></thead><tbody><tr>';
+                $this->sql_report .= '<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></tbody></table>';
+                $this->sql_report .= '<p style="text-align: center;">';
+                $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br /><br />';
+
+                // Pad the start time to not interfere with page timing
+                $starttime += $time_db;
+
+            break;
+
+            default:
+
+                $this->_sql_report($mode, $query);
+
+            break;
+        }
+
+        return true;
+    }
+
+    /**
+    * Gets the estimated number of rows in a specified table.
+    *
+    * @param string $table_name     Table name
+    *
+    * @return string                Number of rows in $table_name.
+    *                               Prefixed with ~ if estimated (otherwise exact).
+    *
+    * @access public
+    */
+    function get_estimated_row_count($table_name)
+    {
+        return $this->get_row_count($table_name);
+    }
+
+    /**
+    * Gets the exact number of rows in a specified table.
+    *
+    * @param string $table_name     Table name
+    *
+    * @return string                Exact number of rows in $table_name.
+    *
+    * @access public
+    */
+    function get_row_count($table_name)
+    {
+        $sql = 'SELECT COUNT(*) AS rows_total
+            FROM ' . $this->sql_escape($table_name);
+        $result = $this->sql_query($sql);
+        $rows_total = $this->sql_fetchfield('rows_total');
+        $this->sql_freeresult($result);
+
+        return $rows_total;
+    }
+}
diff --git a/phpBB/includes/db/driver/firebird.php b/phpBB/includes/db/driver/firebird.php
new file mode 100644
index 0000000000..c793e0a51f
--- /dev/null
+++ b/phpBB/includes/db/driver/firebird.php
@@ -0,0 +1,538 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Firebird/Interbase Database Abstraction Layer
+* Minimum Requirement is Firebird 2.1
+* @package dbal
+*/
+class phpbb_db_driver_firebird extends phpbb_db_driver
+{
+	var $last_query_text = '';
+	var $service_handle = false;
+	var $affected_rows = 0;
+	var $connect_error = '';
+
+	/**
+	* Connect to server
+	*/
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
+	{
+		$this->persistency = $persistency;
+		$this->user = $sqluser;
+		$this->server = $sqlserver . (($port) ? ':' . $port : '');
+		$this->dbname = str_replace('\\', '/', $database);
+
+		// There are three possibilities to connect to an interbase db
+		if (!$this->server)
+		{
+			$use_database = $this->dbname;
+		}
+		else if (strpos($this->server, '//') === 0)
+		{
+			$use_database = $this->server . $this->dbname;
+		}
+		else
+		{
+			$use_database = $this->server . ':' . $this->dbname;
+		}
+
+		if ($this->persistency)
+		{
+			if (!function_exists('ibase_pconnect'))
+			{
+				$this->connect_error = 'ibase_pconnect function does not exist, is interbase extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @ibase_pconnect($use_database, $this->user, $sqlpassword, false, false, 3);
+		}
+		else
+		{
+			if (!function_exists('ibase_connect'))
+			{
+				$this->connect_error = 'ibase_connect function does not exist, is interbase extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3);
+		}
+
+		// Do not call ibase_service_attach if connection failed,
+		// otherwise error message from ibase_(p)connect call will be clobbered.
+		if ($this->db_connect_id && function_exists('ibase_service_attach') && $this->server)
+		{
+			$this->service_handle = @ibase_service_attach($this->server, $this->user, $sqlpassword);
+		}
+		else
+		{
+			$this->service_handle = false;
+		}
+
+		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
+	}
+
+	/**
+	* Version information about used database
+	* @param bool $raw if true, only return the fetched sql_server_version
+	* @param bool $use_cache forced to false for Interbase
+	* @return string sql server version
+	*/
+	function sql_server_info($raw = false, $use_cache = true)
+	{
+		/**
+		* force $use_cache false.  I didn't research why the caching code there is no caching code
+		* but I assume its because the IB extension provides a direct method to access it
+		* without a query.
+		*/
+
+		$use_cache = false;
+
+		if ($this->service_handle !== false && function_exists('ibase_server_info'))
+		{
+			return @ibase_server_info($this->service_handle, IBASE_SVC_SERVER_VERSION);
+		}
+
+		return ($raw) ? '2.1' : 'Firebird/Interbase';
+	}
+
+	/**
+	* SQL Transaction
+	* @access private
+	*/
+	function _sql_transaction($status = 'begin')
+	{
+		switch ($status)
+		{
+			case 'begin':
+				return true;
+			break;
+
+			case 'commit':
+				return @ibase_commit();
+			break;
+
+			case 'rollback':
+				return @ibase_rollback();
+			break;
+		}
+
+		return true;
+	}
+
+	/**
+	* Base query method
+	*
+	* @param	string	$query		Contains the SQL query which shall be executed
+	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
+	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
+	*
+	* @access	public
+	*/
+	function sql_query($query = '', $cache_ttl = 0)
+	{
+		if ($query != '')
+		{
+			global $cache;
+
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('start', $query);
+			}
+
+			$this->last_query_text = $query;
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->sql_add_num_queries($this->query_result);
+
+			if ($this->query_result === false)
+			{
+				$array = array();
+				// We overcome Firebird's 32767 char limit by binding vars
+				if (strlen($query) > 32767)
+				{
+					if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/s', $query, $regs))
+					{
+						if (strlen($regs[3]) > 32767)
+						{
+							preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
+
+							$inserts = $vals[0];
+							unset($vals);
+
+							foreach ($inserts as $key => $value)
+							{
+								if (!empty($value) && $value[0] === "'" && strlen($value) > 32769) // check to see if this thing is greater than the max + 'x2
+								{
+									$inserts[$key] = '?';
+									$array[] = str_replace("''", "'", substr($value, 1, -1));
+								}
+							}
+
+							$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
+						}
+					}
+					else if (preg_match('/^(UPDATE ([\\w_]++)\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|\\d+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data))
+					{
+						if (strlen($data[3]) > 32767)
+						{
+							$update = $data[1];
+							$where = $data[4];
+							preg_match_all('/(\\w++)\\s*=\\s*(\'(?:[^\']++|\'\')*+\'|[\d-.]++)/', $data[3], $temp, PREG_SET_ORDER);
+							unset($data);
+
+							$cols = array();
+							foreach ($temp as $value)
+							{
+								if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 32769) // check to see if this thing is greater than the max + 'x2
+								{
+									$array[] = str_replace("''", "'", substr($value[2], 1, -1));
+									$cols[] = $value[1] . '=?';
+								}
+								else
+								{
+									$cols[] = $value[1] . '=' . $value[2];
+								}
+							}
+
+							$query = $update . implode(', ', $cols) . ' ' . $where;
+							unset($cols);
+						}
+					}
+				}
+
+				if (!function_exists('ibase_affected_rows') && (preg_match('/^UPDATE ([\w_]++)\s+SET [\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\s*[\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+\s+(WHERE.*)?$/s', $query, $regs) || preg_match('/^DELETE FROM ([\w_]++)\s*(WHERE\s*.*)?$/s', $query, $regs)))
+				{
+					$affected_sql = 'SELECT COUNT(*) as num_rows_affected FROM ' . $regs[1];
+					if (!empty($regs[2]))
+					{
+						$affected_sql .= ' ' . $regs[2];
+					}
+
+					if (!($temp_q_id = @ibase_query($this->db_connect_id, $affected_sql)))
+					{
+						return false;
+					}
+
+					$temp_result = @ibase_fetch_assoc($temp_q_id);
+					@ibase_free_result($temp_q_id);
+
+					$this->affected_rows = ($temp_result) ? $temp_result['NUM_ROWS_AFFECTED'] : false;
+				}
+
+				if (sizeof($array))
+				{
+					$p_query = @ibase_prepare($this->db_connect_id, $query);
+					array_unshift($array, $p_query);
+					$this->query_result = call_user_func_array('ibase_execute', $array);
+					unset($array);
+
+					if ($this->query_result === false)
+					{
+						$this->sql_error($query);
+					}
+				}
+				else if (($this->query_result = @ibase_query($this->db_connect_id, $query)) === false)
+				{
+					$this->sql_error($query);
+				}
+
+				if (defined('DEBUG_EXTRA'))
+				{
+					$this->sql_report('stop', $query);
+				}
+
+				if (!$this->transaction)
+				{
+					if (function_exists('ibase_commit_ret'))
+					{
+						@ibase_commit_ret();
+					}
+					else
+					{
+						// way cooler than ibase_commit_ret :D
+						@ibase_query('COMMIT RETAIN;');
+					}
+				}
+
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
+				}
+				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+				}
+			}
+			else if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('fromcache', $query);
+			}
+		}
+		else
+		{
+			return false;
+		}
+
+		return $this->query_result;
+	}
+
+	/**
+	* Build LIMIT query
+	*/
+	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		$this->query_result = false;
+
+		$query = 'SELECT FIRST ' . $total . ((!empty($offset)) ? ' SKIP ' . $offset : '') . substr($query, 6);
+
+		return $this->sql_query($query, $cache_ttl);
+	}
+
+	/**
+	* Return number of affected rows
+	*/
+	function sql_affectedrows()
+	{
+		// PHP 5+ function
+		if (function_exists('ibase_affected_rows'))
+		{
+			return ($this->db_connect_id) ? @ibase_affected_rows($this->db_connect_id) : false;
+		}
+		else
+		{
+			return $this->affected_rows;
+		}
+	}
+
+	/**
+	* Fetch current row
+	*/
+	function sql_fetchrow($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_fetchrow($query_id);
+		}
+
+		if ($query_id === false)
+		{
+			return false;
+		}
+
+		$row = array();
+		$cur_row = @ibase_fetch_object($query_id, IBASE_TEXT);
+
+		if (!$cur_row)
+		{
+			return false;
+		}
+
+		foreach (get_object_vars($cur_row) as $key => $value)
+		{
+			$row[strtolower($key)] = (is_string($value)) ? trim(str_replace(array("\\0", "\\n"), array("\0", "\n"), $value)) : $value;
+		}
+
+		return (sizeof($row)) ? $row : false;
+	}
+
+	/**
+	* Get last inserted id after insert statement
+	*/
+	function sql_nextid()
+	{
+		$query_id = $this->query_result;
+
+		if ($query_id !== false && $this->last_query_text != '')
+		{
+			if ($this->query_result && preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#i', $this->last_query_text, $tablename))
+			{
+				$sql = 'SELECT GEN_ID(' . $tablename[1] . '_gen, 0) AS new_id FROM RDB$DATABASE';
+
+				if (!($temp_q_id = @ibase_query($this->db_connect_id, $sql)))
+				{
+					return false;
+				}
+
+				$temp_result = @ibase_fetch_assoc($temp_q_id);
+				@ibase_free_result($temp_q_id);
+
+				return ($temp_result) ? $temp_result['NEW_ID'] : false;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	* Free sql result
+	*/
+	function sql_freeresult($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_freeresult($query_id);
+		}
+
+		if (isset($this->open_queries[(int) $query_id]))
+		{
+			unset($this->open_queries[(int) $query_id]);
+			return @ibase_free_result($query_id);
+		}
+
+		return false;
+	}
+
+	/**
+	* Escape string used in sql query
+	*/
+	function sql_escape($msg)
+	{
+		return str_replace(array("'", "\0"), array("''", ''), $msg);
+	}
+
+	/**
+	* Build LIKE expression
+	* @access private
+	*/
+	function _sql_like_expression($expression)
+	{
+		return $expression . " ESCAPE '\\'";
+	}
+
+	/**
+	* Build db-specific query data
+	* @access private
+	*/
+	function _sql_custom_build($stage, $data)
+	{
+		return $data;
+	}
+
+	function _sql_bit_and($column_name, $bit, $compare = '')
+	{
+		return 'BIN_AND(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
+	}
+
+	function _sql_bit_or($column_name, $bit, $compare = '')
+	{
+		return 'BIN_OR(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	function cast_expr_to_bigint($expression)
+	{
+		// Precision must be from 1 to 18
+		return 'CAST(' . $expression . ' as DECIMAL(18, 0))';
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	function cast_expr_to_string($expression)
+	{
+		return 'CAST(' . $expression . ' as VARCHAR(255))';
+	}
+
+	/**
+	* return sql error array
+	* @access private
+	*/
+	function _sql_error()
+	{
+		// Need special handling here because ibase_errmsg returns
+		// connection errors, however if the interbase extension
+		// is not installed then ibase_errmsg does not exist and
+		// we cannot call it.
+		if (function_exists('ibase_errmsg'))
+		{
+			$msg = @ibase_errmsg();
+			if (!$msg)
+			{
+				$msg = $this->connect_error;
+			}
+		}
+		else
+		{
+			$msg = $this->connect_error;
+		}
+		return array(
+			'message'	=> $msg,
+			'code'		=> (@function_exists('ibase_errcode') ? @ibase_errcode() : '')
+		);
+	}
+
+	/**
+	* Close sql connection
+	* @access private
+	*/
+	function _sql_close()
+	{
+		if ($this->service_handle !== false)
+		{
+			@ibase_service_detach($this->service_handle);
+		}
+
+		return @ibase_close($this->db_connect_id);
+	}
+
+	/**
+	* Build db-specific report
+	* @access private
+	*/
+	function _sql_report($mode, $query = '')
+	{
+		switch ($mode)
+		{
+			case 'start':
+			break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @ibase_query($this->db_connect_id, $query);
+				while ($void = @ibase_fetch_object($result, IBASE_TEXT))
+				{
+					// Take the time spent on parsing rows into account
+				}
+				@ibase_free_result($result);
+
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
+
+			break;
+		}
+	}
+}
diff --git a/phpBB/includes/db/driver/mssql.php b/phpBB/includes/db/driver/mssql.php
new file mode 100644
index 0000000000..e68738f918
--- /dev/null
+++ b/phpBB/includes/db/driver/mssql.php
@@ -0,0 +1,454 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* MSSQL Database Abstraction Layer
+* Minimum Requirement is MSSQL 2000+
+* @package dbal
+*/
+class phpbb_db_driver_mssql extends phpbb_db_driver
+{
+	/**
+	* Connect to server
+	*/
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
+	{
+		$this->persistency = $persistency;
+		$this->user = $sqluser;
+		$this->dbname = $database;
+
+		$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
+		$this->server = $sqlserver . (($port) ? $port_delimiter . $port : '');
+
+		@ini_set('mssql.charset', 'UTF-8');
+		@ini_set('mssql.textlimit', 2147483647);
+		@ini_set('mssql.textsize', 2147483647);
+
+		$this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mssql_connect($this->server, $this->user, $sqlpassword, $new_link);
+
+		if ($this->db_connect_id && $this->dbname != '')
+		{
+			if (!@mssql_select_db($this->dbname, $this->db_connect_id))
+			{
+				@mssql_close($this->db_connect_id);
+				return false;
+			}
+		}
+
+		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
+	}
+
+	/**
+	* Version information about used database
+	* @param bool $raw if true, only return the fetched sql_server_version
+	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
+	* @return string sql server version
+	*/
+	function sql_server_info($raw = false, $use_cache = true)
+	{
+		global $cache;
+
+		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mssql_version')) === false)
+		{
+			$result_id = @mssql_query("SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')", $this->db_connect_id);
+
+			$row = false;
+			if ($result_id)
+			{
+				$row = @mssql_fetch_assoc($result_id);
+				@mssql_free_result($result_id);
+			}
+
+			$this->sql_server_version = ($row) ? trim(implode(' ', $row)) : 0;
+
+			if (!empty($cache) && $use_cache)
+			{
+				$cache->put('mssql_version', $this->sql_server_version);
+			}
+		}
+
+		if ($raw)
+		{
+			return $this->sql_server_version;
+		}
+
+		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_concatenate($expr1, $expr2)
+	{
+		return $expr1 . ' + ' . $expr2;
+	}
+
+	/**
+	* SQL Transaction
+	* @access private
+	*/
+	function _sql_transaction($status = 'begin')
+	{
+		switch ($status)
+		{
+			case 'begin':
+				return @mssql_query('BEGIN TRANSACTION', $this->db_connect_id);
+			break;
+
+			case 'commit':
+				return @mssql_query('COMMIT TRANSACTION', $this->db_connect_id);
+			break;
+
+			case 'rollback':
+				return @mssql_query('ROLLBACK TRANSACTION', $this->db_connect_id);
+			break;
+		}
+
+		return true;
+	}
+
+	/**
+	* Base query method
+	*
+	* @param	string	$query		Contains the SQL query which shall be executed
+	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
+	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
+	*
+	* @access	public
+	*/
+	function sql_query($query = '', $cache_ttl = 0)
+	{
+		if ($query != '')
+		{
+			global $cache;
+
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('start', $query);
+			}
+
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->sql_add_num_queries($this->query_result);
+
+			if ($this->query_result === false)
+			{
+				if (($this->query_result = @mssql_query($query, $this->db_connect_id)) === false)
+				{
+					$this->sql_error($query);
+				}
+
+				if (defined('DEBUG_EXTRA'))
+				{
+					$this->sql_report('stop', $query);
+				}
+
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
+				}
+				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+				}
+			}
+			else if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('fromcache', $query);
+			}
+		}
+		else
+		{
+			return false;
+		}
+
+		return $this->query_result;
+	}
+
+	/**
+	* Build LIMIT query
+	*/
+	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		$this->query_result = false;
+
+		// Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows)
+		if ($total)
+		{
+			// We need to grab the total number of rows + the offset number of rows to get the correct result
+			if (strpos($query, 'SELECT DISTINCT') === 0)
+			{
+				$query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15);
+			}
+			else
+			{
+				$query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6);
+			}
+		}
+
+		$result = $this->sql_query($query, $cache_ttl);
+
+		// Seek by $offset rows
+		if ($offset)
+		{
+			$this->sql_rowseek($offset, $result);
+		}
+
+		return $result;
+	}
+
+	/**
+	* Return number of affected rows
+	*/
+	function sql_affectedrows()
+	{
+		return ($this->db_connect_id) ? @mssql_rows_affected($this->db_connect_id) : false;
+	}
+
+	/**
+	* Fetch current row
+	*/
+	function sql_fetchrow($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_fetchrow($query_id);
+		}
+
+		if ($query_id === false)
+		{
+			return false;
+		}
+
+		$row = @mssql_fetch_assoc($query_id);
+
+		// I hope i am able to remove this later... hopefully only a PHP or MSSQL bug
+		if ($row)
+		{
+			foreach ($row as $key => $value)
+			{
+				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
+			}
+		}
+
+		return $row;
+	}
+
+	/**
+	* Seek to given row number
+	* rownum is zero-based
+	*/
+	function sql_rowseek($rownum, &$query_id)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_rowseek($rownum, $query_id);
+		}
+
+		return ($query_id !== false) ? @mssql_data_seek($query_id, $rownum) : false;
+	}
+
+	/**
+	* Get last inserted id after insert statement
+	*/
+	function sql_nextid()
+	{
+		$result_id = @mssql_query('SELECT SCOPE_IDENTITY()', $this->db_connect_id);
+		if ($result_id)
+		{
+			if ($row = @mssql_fetch_assoc($result_id))
+			{
+				@mssql_free_result($result_id);
+				return $row['computed'];
+			}
+			@mssql_free_result($result_id);
+		}
+
+		return false;
+	}
+
+	/**
+	* Free sql result
+	*/
+	function sql_freeresult($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_freeresult($query_id);
+		}
+
+		if (isset($this->open_queries[$query_id]))
+		{
+			unset($this->open_queries[$query_id]);
+			return @mssql_free_result($query_id);
+		}
+
+		return false;
+	}
+
+	/**
+	* Escape string used in sql query
+	*/
+	function sql_escape($msg)
+	{
+		return str_replace(array("'", "\0"), array("''", ''), $msg);
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_lower_text($column_name)
+	{
+		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
+	}
+
+	/**
+	* Build LIKE expression
+	* @access private
+	*/
+	function _sql_like_expression($expression)
+	{
+		return $expression . " ESCAPE '\\'";
+	}
+
+	/**
+	* return sql error array
+	* @access private
+	*/
+	function _sql_error()
+	{
+		$error = array(
+			'message'	=> @mssql_get_last_message(),
+			'code'		=> ''
+		);
+
+		// Get error code number
+		$result_id = @mssql_query('SELECT @@ERROR as code', $this->db_connect_id);
+		if ($result_id)
+		{
+			$row = @mssql_fetch_assoc($result_id);
+			$error['code'] = $row['code'];
+			@mssql_free_result($result_id);
+		}
+
+		// Get full error message if possible
+		$sql = 'SELECT CAST(description as varchar(255)) as message
+			FROM master.dbo.sysmessages
+			WHERE error = ' . $error['code'];
+		$result_id = @mssql_query($sql);
+
+		if ($result_id)
+		{
+			$row = @mssql_fetch_assoc($result_id);
+			if (!empty($row['message']))
+			{
+				$error['message'] .= '<br />' . $row['message'];
+			}
+			@mssql_free_result($result_id);
+		}
+
+		return $error;
+	}
+
+	/**
+	* Build db-specific query data
+	* @access private
+	*/
+	function _sql_custom_build($stage, $data)
+	{
+		return $data;
+	}
+
+	/**
+	* Close sql connection
+	* @access private
+	*/
+	function _sql_close()
+	{
+		return @mssql_close($this->db_connect_id);
+	}
+
+	/**
+	* Build db-specific report
+	* @access private
+	*/
+	function _sql_report($mode, $query = '')
+	{
+		switch ($mode)
+		{
+			case 'start':
+				$html_table = false;
+				@mssql_query('SET SHOWPLAN_TEXT ON;', $this->db_connect_id);
+				if ($result = @mssql_query($query, $this->db_connect_id))
+				{
+					@mssql_next_result($result);
+					while ($row = @mssql_fetch_row($result))
+					{
+						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
+					}
+				}
+				@mssql_query('SET SHOWPLAN_TEXT OFF;', $this->db_connect_id);
+				@mssql_free_result($result);
+
+				if ($html_table)
+				{
+					$this->html_hold .= '</table>';
+				}
+			break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @mssql_query($query, $this->db_connect_id);
+				while ($void = @mssql_fetch_assoc($result))
+				{
+					// Take the time spent on parsing rows into account
+				}
+				@mssql_free_result($result);
+
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
+
+			break;
+		}
+	}
+}
diff --git a/phpBB/includes/db/driver/mssql_odbc.php b/phpBB/includes/db/driver/mssql_odbc.php
new file mode 100644
index 0000000000..7b35ce3d11
--- /dev/null
+++ b/phpBB/includes/db/driver/mssql_odbc.php
@@ -0,0 +1,395 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Unified ODBC functions
+* Unified ODBC functions support any database having ODBC driver, for example Adabas D, IBM DB2, iODBC, Solid, Sybase SQL Anywhere...
+* Here we only support MSSQL Server 2000+ because of the provided schema
+*
+* @note number of bytes returned for returning data depends on odbc.defaultlrl php.ini setting.
+* If it is limited to 4K for example only 4K of data is returned max, resulting in incomplete theme data for example.
+* @note odbc.defaultbinmode may affect UTF8 characters
+*
+* @package dbal
+*/
+class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
+{
+	var $last_query_text = '';
+
+	/**
+	* Connect to server
+	*/
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
+	{
+		$this->persistency = $persistency;
+		$this->user = $sqluser;
+		$this->dbname = $database;
+
+		$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
+		$this->server = $sqlserver . (($port) ? $port_delimiter . $port : '');
+
+		$max_size = @ini_get('odbc.defaultlrl');
+		if (!empty($max_size))
+		{
+			$unit = strtolower(substr($max_size, -1, 1));
+			$max_size = (int) $max_size;
+
+			if ($unit == 'k')
+			{
+				$max_size = floor($max_size / 1024);
+			}
+			else if ($unit == 'g')
+			{
+				$max_size *= 1024;
+			}
+			else if (is_numeric($unit))
+			{
+				$max_size = floor((int) ($max_size . $unit) / 1048576);
+			}
+			$max_size = max(8, $max_size) . 'M';
+
+			@ini_set('odbc.defaultlrl', $max_size);
+		}
+
+		$this->db_connect_id = ($this->persistency) ? @odbc_pconnect($this->server, $this->user, $sqlpassword) : @odbc_connect($this->server, $this->user, $sqlpassword);
+
+		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
+	}
+
+	/**
+	* Version information about used database
+	* @param bool $raw if true, only return the fetched sql_server_version
+	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
+	* @return string sql server version
+	*/
+	function sql_server_info($raw = false, $use_cache = true)
+	{
+		global $cache;
+
+		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mssqlodbc_version')) === false)
+		{
+			$result_id = @odbc_exec($this->db_connect_id, "SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')");
+
+			$row = false;
+			if ($result_id)
+			{
+				$row = @odbc_fetch_array($result_id);
+				@odbc_free_result($result_id);
+			}
+
+			$this->sql_server_version = ($row) ? trim(implode(' ', $row)) : 0;
+
+			if (!empty($cache) && $use_cache)
+			{
+				$cache->put('mssqlodbc_version', $this->sql_server_version);
+			}
+		}
+
+		if ($raw)
+		{
+			return $this->sql_server_version;
+		}
+
+		return ($this->sql_server_version) ? 'MSSQL (ODBC)<br />' . $this->sql_server_version : 'MSSQL (ODBC)';
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_concatenate($expr1, $expr2)
+	{
+		return $expr1 . ' + ' . $expr2;
+	}
+
+	/**
+	* SQL Transaction
+	* @access private
+	*/
+	function _sql_transaction($status = 'begin')
+	{
+		switch ($status)
+		{
+			case 'begin':
+				return @odbc_exec($this->db_connect_id, 'BEGIN TRANSACTION');
+			break;
+
+			case 'commit':
+				return @odbc_exec($this->db_connect_id, 'COMMIT TRANSACTION');
+			break;
+
+			case 'rollback':
+				return @odbc_exec($this->db_connect_id, 'ROLLBACK TRANSACTION');
+			break;
+		}
+
+		return true;
+	}
+
+	/**
+	* Base query method
+	*
+	* @param	string	$query		Contains the SQL query which shall be executed
+	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
+	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
+	*
+	* @access	public
+	*/
+	function sql_query($query = '', $cache_ttl = 0)
+	{
+		if ($query != '')
+		{
+			global $cache;
+
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('start', $query);
+			}
+
+			$this->last_query_text = $query;
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->sql_add_num_queries($this->query_result);
+
+			if ($this->query_result === false)
+			{
+				if (($this->query_result = @odbc_exec($this->db_connect_id, $query)) === false)
+				{
+					$this->sql_error($query);
+				}
+
+				if (defined('DEBUG_EXTRA'))
+				{
+					$this->sql_report('stop', $query);
+				}
+
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
+				}
+				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+				}
+			}
+			else if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('fromcache', $query);
+			}
+		}
+		else
+		{
+			return false;
+		}
+
+		return $this->query_result;
+	}
+
+	/**
+	* Build LIMIT query
+	*/
+	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		$this->query_result = false;
+
+		// Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows)
+		if ($total)
+		{
+			// We need to grab the total number of rows + the offset number of rows to get the correct result
+			if (strpos($query, 'SELECT DISTINCT') === 0)
+			{
+				$query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15);
+			}
+			else
+			{
+				$query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6);
+			}
+		}
+
+		$result = $this->sql_query($query, $cache_ttl);
+
+		// Seek by $offset rows
+		if ($offset)
+		{
+			$this->sql_rowseek($offset, $result);
+		}
+
+		return $result;
+	}
+
+	/**
+	* Return number of affected rows
+	*/
+	function sql_affectedrows()
+	{
+		return ($this->db_connect_id) ? @odbc_num_rows($this->query_result) : false;
+	}
+
+	/**
+	* Fetch current row
+	* @note number of bytes returned depends on odbc.defaultlrl php.ini setting. If it is limited to 4K for example only 4K of data is returned max.
+	*/
+	function sql_fetchrow($query_id = false, $debug = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_fetchrow($query_id);
+		}
+
+		return ($query_id !== false) ? @odbc_fetch_array($query_id) : false;
+	}
+
+	/**
+	* Get last inserted id after insert statement
+	*/
+	function sql_nextid()
+	{
+		$result_id = @odbc_exec($this->db_connect_id, 'SELECT @@IDENTITY');
+
+		if ($result_id)
+		{
+			if (@odbc_fetch_array($result_id))
+			{
+				$id = @odbc_result($result_id, 1);
+				@odbc_free_result($result_id);
+				return $id;
+			}
+			@odbc_free_result($result_id);
+		}
+
+		return false;
+	}
+
+	/**
+	* Free sql result
+	*/
+	function sql_freeresult($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_freeresult($query_id);
+		}
+
+		if (isset($this->open_queries[(int) $query_id]))
+		{
+			unset($this->open_queries[(int) $query_id]);
+			return @odbc_free_result($query_id);
+		}
+
+		return false;
+	}
+
+	/**
+	* Escape string used in sql query
+	*/
+	function sql_escape($msg)
+	{
+		return str_replace(array("'", "\0"), array("''", ''), $msg);
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_lower_text($column_name)
+	{
+		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
+	}
+
+	/**
+	* Build LIKE expression
+	* @access private
+	*/
+	function _sql_like_expression($expression)
+	{
+		return $expression . " ESCAPE '\\'";
+	}
+
+	/**
+	* Build db-specific query data
+	* @access private
+	*/
+	function _sql_custom_build($stage, $data)
+	{
+		return $data;
+	}
+
+	/**
+	* return sql error array
+	* @access private
+	*/
+	function _sql_error()
+	{
+		return array(
+			'message'	=> @odbc_errormsg(),
+			'code'		=> @odbc_error()
+		);
+	}
+
+	/**
+	* Close sql connection
+	* @access private
+	*/
+	function _sql_close()
+	{
+		return @odbc_close($this->db_connect_id);
+	}
+
+	/**
+	* Build db-specific report
+	* @access private
+	*/
+	function _sql_report($mode, $query = '')
+	{
+		switch ($mode)
+		{
+			case 'start':
+			break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @odbc_exec($this->db_connect_id, $query);
+				while ($void = @odbc_fetch_array($result))
+				{
+					// Take the time spent on parsing rows into account
+				}
+				@odbc_free_result($result);
+
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
+
+			break;
+		}
+	}
+}
diff --git a/phpBB/includes/db/driver/mssqlnative.php b/phpBB/includes/db/driver/mssqlnative.php
new file mode 100644
index 0000000000..99b9d7975a
--- /dev/null
+++ b/phpBB/includes/db/driver/mssqlnative.php
@@ -0,0 +1,642 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+* This is the MS SQL Server Native database abstraction layer.
+* PHP mssql native driver required.
+* @author Chris Pucci
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+ * Prior to version 1.1 the SQL Server Native PHP driver didn't support sqlsrv_num_rows, or cursor based seeking so we recall all rows into an array
+ * and maintain our own cursor index into that array.
+ */
+class result_mssqlnative
+{
+	public function result_mssqlnative($queryresult = false)
+	{
+		$this->m_cursor = 0;
+		$this->m_rows = array();
+		$this->m_num_fields = sqlsrv_num_fields($queryresult);
+		$this->m_field_meta = sqlsrv_field_metadata($queryresult);
+
+		while ($row = sqlsrv_fetch_array($queryresult, SQLSRV_FETCH_ASSOC))
+		{
+			if ($row !== null)
+			{
+				foreach($row as $k => $v)
+				{
+					if (is_object($v) && method_exists($v, 'format'))
+					{
+						$row[$k] = $v->format("Y-m-d\TH:i:s\Z");
+					}
+				}
+				$this->m_rows[] = $row;//read results into memory, cursors are not supported
+			}
+		}
+
+		$this->m_row_count = sizeof($this->m_rows);
+	}
+
+	private function array_to_obj($array, &$obj)
+	{
+		foreach ($array as $key => $value)
+		{
+			if (is_array($value))
+			{
+				$obj->$key = new stdClass();
+				array_to_obj($value, $obj->$key);
+			}
+			else
+			{
+				$obj->$key = $value;
+			}
+		}
+		return $obj;
+	}
+
+	public function fetch($mode = SQLSRV_FETCH_BOTH, $object_class = 'stdClass')
+	{
+		if ($this->m_cursor >= $this->m_row_count || $this->m_row_count == 0)
+		{
+			return false;
+		}
+
+		$ret = false;
+		$arr_num = array();
+
+		if ($mode == SQLSRV_FETCH_NUMERIC || $mode == SQLSRV_FETCH_BOTH)
+		{
+			foreach($this->m_rows[$this->m_cursor] as $key => $value)
+			{
+				$arr_num[] = $value;
+			}
+		}
+
+		switch ($mode)
+		{
+			case SQLSRV_FETCH_ASSOC:
+				$ret = $this->m_rows[$this->m_cursor];
+			break;
+			case SQLSRV_FETCH_NUMERIC:
+				$ret = $arr_num;
+			break;
+			case 'OBJECT':
+				$ret = $this->array_to_obj($this->m_rows[$this->m_cursor], $o = new $object_class);
+			break;
+			case SQLSRV_FETCH_BOTH:
+			default:
+				$ret = $this->m_rows[$this->m_cursor] + $arr_num;
+			break;
+		}
+		$this->m_cursor++;
+		return $ret;
+	}
+
+	public function get($pos, $fld)
+	{
+		return $this->m_rows[$pos][$fld];
+	}
+
+	public function num_rows()
+	{
+		return $this->m_row_count;
+	}
+
+	public function seek($iRow)
+	{
+		$this->m_cursor = min($iRow, $this->m_row_count);
+	}
+
+	public function num_fields()
+	{
+		return $this->m_num_fields;
+	}
+
+	public function field_name($nr)
+	{
+		$arr_keys = array_keys($this->m_rows[0]);
+		return $arr_keys[$nr];
+	}
+
+	public function field_type($nr)
+	{
+		$i = 0;
+		$int_type = -1;
+		$str_type = '';
+
+		foreach ($this->m_field_meta as $meta)
+		{
+			if ($nr == $i)
+			{
+				$int_type = $meta['Type'];
+				break;
+			}
+			$i++;
+		}
+
+		//http://msdn.microsoft.com/en-us/library/cc296183.aspx contains type table
+		switch ($int_type)
+		{
+			case SQLSRV_SQLTYPE_BIGINT: 		$str_type = 'bigint'; break;
+			case SQLSRV_SQLTYPE_BINARY: 		$str_type = 'binary'; break;
+			case SQLSRV_SQLTYPE_BIT: 			$str_type = 'bit'; break;
+			case SQLSRV_SQLTYPE_CHAR: 			$str_type = 'char'; break;
+			case SQLSRV_SQLTYPE_DATETIME: 		$str_type = 'datetime'; break;
+			case SQLSRV_SQLTYPE_DECIMAL/*($precision, $scale)*/: $str_type = 'decimal'; break;
+			case SQLSRV_SQLTYPE_FLOAT: 			$str_type = 'float'; break;
+			case SQLSRV_SQLTYPE_IMAGE: 			$str_type = 'image'; break;
+			case SQLSRV_SQLTYPE_INT: 			$str_type = 'int'; break;
+			case SQLSRV_SQLTYPE_MONEY: 			$str_type = 'money'; break;
+			case SQLSRV_SQLTYPE_NCHAR/*($charCount)*/: $str_type = 'nchar'; break;
+			case SQLSRV_SQLTYPE_NUMERIC/*($precision, $scale)*/: $str_type = 'numeric'; break;
+			case SQLSRV_SQLTYPE_NVARCHAR/*($charCount)*/: $str_type = 'nvarchar'; break;
+			case SQLSRV_SQLTYPE_NTEXT: 			$str_type = 'ntext'; break;
+			case SQLSRV_SQLTYPE_REAL: 			$str_type = 'real'; break;
+			case SQLSRV_SQLTYPE_SMALLDATETIME: 	$str_type = 'smalldatetime'; break;
+			case SQLSRV_SQLTYPE_SMALLINT: 		$str_type = 'smallint'; break;
+			case SQLSRV_SQLTYPE_SMALLMONEY: 	$str_type = 'smallmoney'; break;
+			case SQLSRV_SQLTYPE_TEXT: 			$str_type = 'text'; break;
+			case SQLSRV_SQLTYPE_TIMESTAMP: 		$str_type = 'timestamp'; break;
+			case SQLSRV_SQLTYPE_TINYINT: 		$str_type = 'tinyint'; break;
+			case SQLSRV_SQLTYPE_UNIQUEIDENTIFIER: $str_type = 'uniqueidentifier'; break;
+			case SQLSRV_SQLTYPE_UDT: 			$str_type = 'UDT'; break;
+			case SQLSRV_SQLTYPE_VARBINARY/*($byteCount)*/: $str_type = 'varbinary'; break;
+			case SQLSRV_SQLTYPE_VARCHAR/*($charCount)*/: $str_type = 'varchar'; break;
+			case SQLSRV_SQLTYPE_XML: 			$str_type = 'xml'; break;
+			default: $str_type = $int_type;
+		}
+		return $str_type;
+	}
+
+	public function free()
+	{
+		unset($this->m_rows);
+		return;
+	}
+}
+
+/**
+* @package dbal
+*/
+class phpbb_db_driver_mssqlnative extends phpbb_db_driver
+{
+	var $m_insert_id = NULL;
+	var $last_query_text = '';
+	var $query_options = array();
+
+	/**
+	* Connect to server
+	*/
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
+	{
+		# Test for driver support, to avoid suppressed fatal error
+		if (!function_exists('sqlsrv_connect'))
+		{
+			trigger_error('Native MS SQL Server driver for PHP is missing or needs to be updated. Version 1.1 or later is required to install phpBB3. You can download the driver from: http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx\n', E_USER_ERROR);
+		}
+
+		//set up connection variables
+		$this->persistency = $persistency;
+		$this->user = $sqluser;
+		$this->dbname = $database;
+		$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
+		$this->server = $sqlserver . (($port) ? $port_delimiter . $port : '');
+
+		//connect to database
+		error_reporting(E_ALL);
+		$this->db_connect_id = sqlsrv_connect($this->server, array(
+			'Database' => $this->dbname,
+			'UID' => $this->user,
+			'PWD' => $sqlpassword
+		));
+
+		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
+	}
+
+	/**
+	* Version information about used database
+	* @param bool $raw if true, only return the fetched sql_server_version
+	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
+	* @return string sql server version
+	*/
+	function sql_server_info($raw = false, $use_cache = true)
+	{
+		global $cache;
+
+		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mssql_version')) === false)
+		{
+			$arr_server_info = sqlsrv_server_info($this->db_connect_id);
+			$this->sql_server_version = $arr_server_info['SQLServerVersion'];
+
+			if (!empty($cache) && $use_cache)
+			{
+				$cache->put('mssql_version', $this->sql_server_version);
+			}
+		}
+
+		if ($raw)
+		{
+			return $this->sql_server_version;
+		}
+
+		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_concatenate($expr1, $expr2)
+	{
+		return $expr1 . ' + ' . $expr2;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_buffer_nested_transactions()
+	{
+		return true;
+	}
+
+	/**
+	* SQL Transaction
+	* @access private
+	*/
+	function _sql_transaction($status = 'begin')
+	{
+		switch ($status)
+		{
+			case 'begin':
+				return sqlsrv_begin_transaction($this->db_connect_id);
+			break;
+
+			case 'commit':
+				return sqlsrv_commit($this->db_connect_id);
+			break;
+
+			case 'rollback':
+				return sqlsrv_rollback($this->db_connect_id);
+			break;
+		}
+		return true;
+	}
+
+	/**
+	* Base query method
+	*
+	* @param	string	$query		Contains the SQL query which shall be executed
+	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
+	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
+	*
+	* @access	public
+	*/
+	function sql_query($query = '', $cache_ttl = 0)
+	{
+		if ($query != '')
+		{
+			global $cache;
+
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('start', $query);
+			}
+
+			$this->last_query_text = $query;
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->sql_add_num_queries($this->query_result);
+
+			if ($this->query_result === false)
+			{
+				if (($this->query_result = @sqlsrv_query($this->db_connect_id, $query, array(), $this->query_options)) === false)
+				{
+					$this->sql_error($query);
+				}
+				// reset options for next query
+				$this->query_options = array();
+
+				if (defined('DEBUG_EXTRA'))
+				{
+					$this->sql_report('stop', $query);
+				}
+
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
+				}
+				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+				}
+			}
+			else if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('fromcache', $query);
+			}
+		}
+		else
+		{
+			return false;
+		}
+		return $this->query_result;
+	}
+
+	/**
+	* Build LIMIT query
+	*/
+	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		$this->query_result = false;
+
+		// total == 0 means all results - not zero results
+		if ($offset == 0 && $total !== 0)
+		{
+			if (strpos($query, "SELECT") === false)
+			{
+				$query = "TOP {$total} " . $query;
+			}
+			else
+			{
+				$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP '.$total, $query);
+			}
+		}
+		else if ($offset > 0)
+		{
+			$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP(10000000) ', $query);
+			$query = 'SELECT *
+					FROM (SELECT sub2.*, ROW_NUMBER() OVER(ORDER BY sub2.line2) AS line3
+					FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3';
+
+			if ($total > 0)
+			{
+				$query .= ' WHERE line3 BETWEEN ' . ($offset+1) . ' AND ' . ($offset + $total);
+			}
+			else
+			{
+				$query .= ' WHERE line3 > ' . $offset;
+			}
+		}
+
+		$result = $this->sql_query($query, $cache_ttl);
+
+		return $result;
+	}
+
+	/**
+	* Return number of affected rows
+	*/
+	function sql_affectedrows()
+	{
+		return (!empty($this->query_result)) ? @sqlsrv_rows_affected($this->query_result) : false;
+	}
+
+	/**
+	* Fetch current row
+	*/
+	function sql_fetchrow($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_fetchrow($query_id);
+		}
+
+		if ($query_id === false)
+		{
+			return false;
+		}
+
+		$row = @sqlsrv_fetch_array($query_id, SQLSRV_FETCH_ASSOC);
+
+		if ($row)
+		{
+			foreach ($row as $key => $value)
+			{
+				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
+			}
+
+			// remove helper values from LIMIT queries
+			if (isset($row['line2']))
+			{
+				unset($row['line2'], $row['line3']);
+			}
+		}
+		return (sizeof($row)) ? $row : false;
+	}
+
+	/**
+	* Get last inserted id after insert statement
+	*/
+	function sql_nextid()
+	{
+		$result_id = @sqlsrv_query($this->db_connect_id, 'SELECT @@IDENTITY');
+
+		if ($result_id !== false)
+		{
+			$row = @sqlsrv_fetch_array($result_id);
+			$id = $row[0];
+			@sqlsrv_free_stmt($result_id);
+			return $id;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	* Free sql result
+	*/
+	function sql_freeresult($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_freeresult($query_id);
+		}
+
+		if (isset($this->open_queries[$query_id]))
+		{
+			unset($this->open_queries[$query_id]);
+			return @sqlsrv_free_stmt($query_id);
+		}
+		return false;
+	}
+
+	/**
+	* Escape string used in sql query
+	*/
+	function sql_escape($msg)
+	{
+		return str_replace(array("'", "\0"), array("''", ''), $msg);
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_lower_text($column_name)
+	{
+		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
+	}
+
+	/**
+	* Build LIKE expression
+	* @access private
+	*/
+	function _sql_like_expression($expression)
+	{
+		return $expression . " ESCAPE '\\'";
+	}
+
+	/**
+	* return sql error array
+	* @access private
+	*/
+	function _sql_error()
+	{
+		$errors = @sqlsrv_errors(SQLSRV_ERR_ERRORS);
+		$error_message = '';
+		$code = 0;
+
+		if ($errors != null)
+		{
+			foreach ($errors as $error)
+			{
+				$error_message .= "SQLSTATE: ".$error[ 'SQLSTATE']."\n";
+				$error_message .= "code: ".$error[ 'code']."\n";
+				$code = $error['code'];
+				$error_message .= "message: ".$error[ 'message']."\n";
+			}
+			$this->last_error_result = $error_message;
+			$error = $this->last_error_result;
+		}
+		else
+		{
+			$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
+		}
+
+		return array(
+			'message'	=> $error,
+			'code'		=> $code,
+		);
+	}
+
+	/**
+	* Build db-specific query data
+	* @access private
+	*/
+	function _sql_custom_build($stage, $data)
+	{
+		return $data;
+	}
+
+	/**
+	* Close sql connection
+	* @access private
+	*/
+	function _sql_close()
+	{
+		return @sqlsrv_close($this->db_connect_id);
+	}
+
+	/**
+	* Build db-specific report
+	* @access private
+	*/
+	function _sql_report($mode, $query = '')
+	{
+		switch ($mode)
+		{
+			case 'start':
+				$html_table = false;
+				@sqlsrv_query($this->db_connect_id, 'SET SHOWPLAN_TEXT ON;');
+				if ($result = @sqlsrv_query($this->db_connect_id, $query))
+				{
+					@sqlsrv_next_result($result);
+					while ($row = @sqlsrv_fetch_array($result))
+					{
+						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
+					}
+				}
+				@sqlsrv_query($this->db_connect_id, 'SET SHOWPLAN_TEXT OFF;');
+				@sqlsrv_free_stmt($result);
+
+				if ($html_table)
+				{
+					$this->html_hold .= '</table>';
+				}
+			break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @sqlsrv_query($this->db_connect_id, $query);
+				while ($void = @sqlsrv_fetch_array($result))
+				{
+					// Take the time spent on parsing rows into account
+				}
+				@sqlsrv_free_stmt($result);
+
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
+
+			break;
+		}
+	}
+
+	/**
+	* Utility method used to retrieve number of rows
+	* Emulates mysql_num_rows
+	* Used in acp_database.php -> write_data_mssqlnative()
+	* Requires a static or keyset cursor to be definde via
+	* mssqlnative_set_query_options()
+	*/
+	function mssqlnative_num_rows($res)
+	{
+		if ($res !== false)
+		{
+			return sqlsrv_num_rows($res);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	* Allows setting mssqlnative specific query options passed to sqlsrv_query as 4th parameter.
+	*/
+	function mssqlnative_set_query_options($options)
+	{
+		$this->query_options = $options;
+	}
+}
diff --git a/phpBB/includes/db/driver/mysql.php b/phpBB/includes/db/driver/mysql.php
new file mode 100644
index 0000000000..987691341a
--- /dev/null
+++ b/phpBB/includes/db/driver/mysql.php
@@ -0,0 +1,565 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* MySQL4 Database Abstraction Layer
+* Compatible with:
+* MySQL 3.23+
+* MySQL 4.0+
+* MySQL 4.1+
+* MySQL 5.0+
+* @package dbal
+*/
+class phpbb_db_driver_mysql extends phpbb_db_driver
+{
+	var $multi_insert = true;
+
+	/**
+	* Connect to server
+	* @access public
+	*/
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
+	{
+		$this->persistency = $persistency;
+		$this->user = $sqluser;
+		$this->server = $sqlserver . (($port) ? ':' . $port : '');
+		$this->dbname = $database;
+
+		$this->sql_layer = 'mysql4';
+
+		$this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link);
+
+		if ($this->db_connect_id && $this->dbname != '')
+		{
+			if (@mysql_select_db($this->dbname, $this->db_connect_id))
+			{
+				// Determine what version we are using and if it natively supports UNICODE
+				if (version_compare($this->sql_server_info(true), '4.1.0', '>='))
+				{
+					@mysql_query("SET NAMES 'utf8'", $this->db_connect_id);
+
+					// enforce strict mode on databases that support it
+					if (version_compare($this->sql_server_info(true), '5.0.2', '>='))
+					{
+						$result = @mysql_query('SELECT @@session.sql_mode AS sql_mode', $this->db_connect_id);
+						$row = @mysql_fetch_assoc($result);
+						@mysql_free_result($result);
+						$modes = array_map('trim', explode(',', $row['sql_mode']));
+
+						// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
+						if (!in_array('TRADITIONAL', $modes))
+						{
+							if (!in_array('STRICT_ALL_TABLES', $modes))
+							{
+								$modes[] = 'STRICT_ALL_TABLES';
+							}
+
+							if (!in_array('STRICT_TRANS_TABLES', $modes))
+							{
+								$modes[] = 'STRICT_TRANS_TABLES';
+							}
+						}
+
+						$mode = implode(',', $modes);
+						@mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id);
+					}
+				}
+				else if (version_compare($this->sql_server_info(true), '4.0.0', '<'))
+				{
+					$this->sql_layer = 'mysql';
+				}
+
+				return $this->db_connect_id;
+			}
+		}
+
+		return $this->sql_error('');
+	}
+
+	/**
+	* Version information about used database
+	* @param bool $raw if true, only return the fetched sql_server_version
+	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
+	* @return string sql server version
+	*/
+	function sql_server_info($raw = false, $use_cache = true)
+	{
+		global $cache;
+
+		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mysql_version')) === false)
+		{
+			$result = @mysql_query('SELECT VERSION() AS version', $this->db_connect_id);
+			$row = @mysql_fetch_assoc($result);
+			@mysql_free_result($result);
+
+			$this->sql_server_version = $row['version'];
+
+			if (!empty($cache) && $use_cache)
+			{
+				$cache->put('mysql_version', $this->sql_server_version);
+			}
+		}
+
+		return ($raw) ? $this->sql_server_version : 'MySQL ' . $this->sql_server_version;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_concatenate($expr1, $expr2)
+	{
+		return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
+	}
+
+	/**
+	* SQL Transaction
+	* @access private
+	*/
+	function _sql_transaction($status = 'begin')
+	{
+		switch ($status)
+		{
+			case 'begin':
+				return @mysql_query('BEGIN', $this->db_connect_id);
+			break;
+
+			case 'commit':
+				return @mysql_query('COMMIT', $this->db_connect_id);
+			break;
+
+			case 'rollback':
+				return @mysql_query('ROLLBACK', $this->db_connect_id);
+			break;
+		}
+
+		return true;
+	}
+
+	/**
+	* Base query method
+	*
+	* @param	string	$query		Contains the SQL query which shall be executed
+	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
+	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
+	*
+	* @access	public
+	*/
+	function sql_query($query = '', $cache_ttl = 0)
+	{
+		if ($query != '')
+		{
+			global $cache;
+
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('start', $query);
+			}
+
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->sql_add_num_queries($this->query_result);
+
+			if ($this->query_result === false)
+			{
+				if (($this->query_result = @mysql_query($query, $this->db_connect_id)) === false)
+				{
+					$this->sql_error($query);
+				}
+
+				if (defined('DEBUG_EXTRA'))
+				{
+					$this->sql_report('stop', $query);
+				}
+
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
+				}
+				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+				}
+			}
+			else if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('fromcache', $query);
+			}
+		}
+		else
+		{
+			return false;
+		}
+
+		return $this->query_result;
+	}
+
+	/**
+	* Build LIMIT query
+	*/
+	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		$this->query_result = false;
+
+		// if $total is set to 0 we do not want to limit the number of rows
+		if ($total == 0)
+		{
+			// Having a value of -1 was always a bug
+			$total = '18446744073709551615';
+		}
+
+		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
+
+		return $this->sql_query($query, $cache_ttl);
+	}
+
+	/**
+	* Return number of affected rows
+	*/
+	function sql_affectedrows()
+	{
+		return ($this->db_connect_id) ? @mysql_affected_rows($this->db_connect_id) : false;
+	}
+
+	/**
+	* Fetch current row
+	*/
+	function sql_fetchrow($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_fetchrow($query_id);
+		}
+
+		return ($query_id !== false) ? @mysql_fetch_assoc($query_id) : false;
+	}
+
+	/**
+	* Seek to given row number
+	* rownum is zero-based
+	*/
+	function sql_rowseek($rownum, &$query_id)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_rowseek($rownum, $query_id);
+		}
+
+		return ($query_id !== false) ? @mysql_data_seek($query_id, $rownum) : false;
+	}
+
+	/**
+	* Get last inserted id after insert statement
+	*/
+	function sql_nextid()
+	{
+		return ($this->db_connect_id) ? @mysql_insert_id($this->db_connect_id) : false;
+	}
+
+	/**
+	* Free sql result
+	*/
+	function sql_freeresult($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_freeresult($query_id);
+		}
+
+		if (isset($this->open_queries[(int) $query_id]))
+		{
+			unset($this->open_queries[(int) $query_id]);
+			return @mysql_free_result($query_id);
+		}
+
+		return false;
+	}
+
+	/**
+	* Escape string used in sql query
+	*/
+	function sql_escape($msg)
+	{
+		if (!$this->db_connect_id)
+		{
+			return @mysql_real_escape_string($msg);
+		}
+
+		return @mysql_real_escape_string($msg, $this->db_connect_id);
+	}
+
+	/**
+	* Gets the estimated number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Number of rows in $table_name.
+	*								Prefixed with ~ if estimated (otherwise exact).
+	*
+	* @access public
+	*/
+	function get_estimated_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']))
+		{
+			if ($table_status['Engine'] === 'MyISAM')
+			{
+				return $table_status['Rows'];
+			}
+			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
+			{
+				return '~' . $table_status['Rows'];
+			}
+		}
+
+		return parent::get_row_count($table_name);
+	}
+
+	/**
+	* Gets the exact number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Exact number of rows in $table_name.
+	*
+	* @access public
+	*/
+	function get_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
+		{
+			return $table_status['Rows'];
+		}
+
+		return parent::get_row_count($table_name);
+	}
+
+	/**
+	* Gets some information about the specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return array
+	*
+	* @access protected
+	*/
+	function get_table_status($table_name)
+	{
+		$sql = "SHOW TABLE STATUS
+			LIKE '" . $this->sql_escape($table_name) . "'";
+		$result = $this->sql_query($sql);
+		$table_status = $this->sql_fetchrow($result);
+		$this->sql_freeresult($result);
+
+		return $table_status;
+	}
+
+	/**
+	* Build LIKE expression
+	* @access private
+	*/
+	function _sql_like_expression($expression)
+	{
+		return $expression;
+	}
+
+	/**
+	* Build db-specific query data
+	* @access private
+	*/
+	function _sql_custom_build($stage, $data)
+	{
+		switch ($stage)
+		{
+			case 'FROM':
+				$data = '(' . $data . ')';
+			break;
+		}
+
+		return $data;
+	}
+
+	/**
+	* return sql error array
+	* @access private
+	*/
+	function _sql_error()
+	{
+		if (!$this->db_connect_id)
+		{
+			return array(
+				'message'	=> @mysql_error(),
+				'code'		=> @mysql_errno()
+			);
+		}
+
+		return array(
+			'message'	=> @mysql_error($this->db_connect_id),
+			'code'		=> @mysql_errno($this->db_connect_id)
+		);
+	}
+
+	/**
+	* Close sql connection
+	* @access private
+	*/
+	function _sql_close()
+	{
+		return @mysql_close($this->db_connect_id);
+	}
+
+	/**
+	* Build db-specific report
+	* @access private
+	*/
+	function _sql_report($mode, $query = '')
+	{
+		static $test_prof;
+
+		// current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING
+		if ($test_prof === null)
+		{
+			$test_prof = false;
+			if (version_compare($this->sql_server_info(true), '5.0.37', '>=') && version_compare($this->sql_server_info(true), '5.1', '<'))
+			{
+				$test_prof = true;
+			}
+		}
+
+		switch ($mode)
+		{
+			case 'start':
+
+				$explain_query = $query;
+				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
+				{
+					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
+				}
+				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
+				{
+					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
+				}
+
+				if (preg_match('/^SELECT/', $explain_query))
+				{
+					$html_table = false;
+
+					// begin profiling
+					if ($test_prof)
+					{
+						@mysql_query('SET profiling = 1;', $this->db_connect_id);
+					}
+
+					if ($result = @mysql_query("EXPLAIN $explain_query", $this->db_connect_id))
+					{
+						while ($row = @mysql_fetch_assoc($result))
+						{
+							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
+						}
+					}
+					@mysql_free_result($result);
+
+					if ($html_table)
+					{
+						$this->html_hold .= '</table>';
+					}
+
+					if ($test_prof)
+					{
+						$html_table = false;
+
+						// get the last profile
+						if ($result = @mysql_query('SHOW PROFILE ALL;', $this->db_connect_id))
+						{
+							$this->html_hold .= '<br />';
+							while ($row = @mysql_fetch_assoc($result))
+							{
+								// make <unknown> HTML safe
+								if (!empty($row['Source_function']))
+								{
+									$row['Source_function'] = str_replace(array('<', '>'), array('&lt;', '&gt;'), $row['Source_function']);
+								}
+
+								// remove unsupported features
+								foreach ($row as $key => $val)
+								{
+									if ($val === null)
+									{
+										unset($row[$key]);
+									}
+								}
+								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
+							}
+						}
+						@mysql_free_result($result);
+
+						if ($html_table)
+						{
+							$this->html_hold .= '</table>';
+						}
+
+						@mysql_query('SET profiling = 0;', $this->db_connect_id);
+					}
+				}
+
+			break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @mysql_query($query, $this->db_connect_id);
+				while ($void = @mysql_fetch_assoc($result))
+				{
+					// Take the time spent on parsing rows into account
+				}
+				@mysql_free_result($result);
+
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
+
+			break;
+		}
+	}
+}
diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/includes/db/driver/mysqli.php
new file mode 100644
index 0000000000..c473c7fe99
--- /dev/null
+++ b/phpBB/includes/db/driver/mysqli.php
@@ -0,0 +1,566 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* MySQLi Database Abstraction Layer
+* mysqli-extension has to be compiled with:
+* MySQL 4.1+ or MySQL 5.0+
+* @package dbal
+*/
+class phpbb_db_driver_mysqli extends phpbb_db_driver
+{
+	var $multi_insert = true;
+
+	/**
+	* Connect to server
+	*/
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false)
+	{
+		// Mysqli extension supports persistent connection since PHP 5.3.0
+		$this->persistency = (version_compare(PHP_VERSION, '5.3.0', '>=')) ? $persistency : false;
+		$this->user = $sqluser;
+
+		// If persistent connection, set dbhost to localhost when empty and prepend it with 'p:' prefix
+		$this->server = ($this->persistency) ? 'p:' . (($sqlserver) ? $sqlserver : 'localhost') : $sqlserver;
+
+		$this->dbname = $database;
+		$port = (!$port) ? NULL : $port;
+
+		// If port is set and it is not numeric, most likely mysqli socket is set.
+		// Try to map it to the $socket parameter.
+		$socket = NULL;
+		if ($port)
+		{
+			if (is_numeric($port))
+			{
+				$port = (int) $port;
+			}
+			else
+			{
+				$socket = $port;
+				$port = NULL;
+			}
+		}
+
+		$this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket);
+
+		if ($this->db_connect_id && $this->dbname != '')
+		{
+			@mysqli_query($this->db_connect_id, "SET NAMES 'utf8'");
+
+			// enforce strict mode on databases that support it
+			if (version_compare($this->sql_server_info(true), '5.0.2', '>='))
+			{
+				$result = @mysqli_query($this->db_connect_id, 'SELECT @@session.sql_mode AS sql_mode');
+				$row = @mysqli_fetch_assoc($result);
+				@mysqli_free_result($result);
+
+				$modes = array_map('trim', explode(',', $row['sql_mode']));
+
+				// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
+				if (!in_array('TRADITIONAL', $modes))
+				{
+					if (!in_array('STRICT_ALL_TABLES', $modes))
+					{
+						$modes[] = 'STRICT_ALL_TABLES';
+					}
+
+					if (!in_array('STRICT_TRANS_TABLES', $modes))
+					{
+						$modes[] = 'STRICT_TRANS_TABLES';
+					}
+				}
+
+				$mode = implode(',', $modes);
+				@mysqli_query($this->db_connect_id, "SET SESSION sql_mode='{$mode}'");
+			}
+			return $this->db_connect_id;
+		}
+
+		return $this->sql_error('');
+	}
+
+	/**
+	* Version information about used database
+	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
+	* @return string sql server version
+	*/
+	function sql_server_info($raw = false, $use_cache = true)
+	{
+		global $cache;
+
+		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mysqli_version')) === false)
+		{
+			$result = @mysqli_query($this->db_connect_id, 'SELECT VERSION() AS version');
+			$row = @mysqli_fetch_assoc($result);
+			@mysqli_free_result($result);
+
+			$this->sql_server_version = $row['version'];
+
+			if (!empty($cache) && $use_cache)
+			{
+				$cache->put('mysqli_version', $this->sql_server_version);
+			}
+		}
+
+		return ($raw) ? $this->sql_server_version : 'MySQL(i) ' . $this->sql_server_version;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_concatenate($expr1, $expr2)
+	{
+		return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
+	}
+
+	/**
+	* SQL Transaction
+	* @access private
+	*/
+	function _sql_transaction($status = 'begin')
+	{
+		switch ($status)
+		{
+			case 'begin':
+				return @mysqli_autocommit($this->db_connect_id, false);
+			break;
+
+			case 'commit':
+				$result = @mysqli_commit($this->db_connect_id);
+				@mysqli_autocommit($this->db_connect_id, true);
+				return $result;
+			break;
+
+			case 'rollback':
+				$result = @mysqli_rollback($this->db_connect_id);
+				@mysqli_autocommit($this->db_connect_id, true);
+				return $result;
+			break;
+		}
+
+		return true;
+	}
+
+	/**
+	* Base query method
+	*
+	* @param	string	$query		Contains the SQL query which shall be executed
+	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
+	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
+	*
+	* @access	public
+	*/
+	function sql_query($query = '', $cache_ttl = 0)
+	{
+		if ($query != '')
+		{
+			global $cache;
+
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('start', $query);
+			}
+
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->sql_add_num_queries($this->query_result);
+
+			if ($this->query_result === false)
+			{
+				if (($this->query_result = @mysqli_query($this->db_connect_id, $query)) === false)
+				{
+					$this->sql_error($query);
+				}
+
+				if (defined('DEBUG_EXTRA'))
+				{
+					$this->sql_report('stop', $query);
+				}
+
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				{
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
+				}
+			}
+			else if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('fromcache', $query);
+			}
+		}
+		else
+		{
+			return false;
+		}
+
+		return $this->query_result;
+	}
+
+	/**
+	* Build LIMIT query
+	*/
+	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		$this->query_result = false;
+
+		// if $total is set to 0 we do not want to limit the number of rows
+		if ($total == 0)
+		{
+			// MySQL 4.1+ no longer supports -1 in limit queries
+			$total = '18446744073709551615';
+		}
+
+		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
+
+		return $this->sql_query($query, $cache_ttl);
+	}
+
+	/**
+	* Return number of affected rows
+	*/
+	function sql_affectedrows()
+	{
+		return ($this->db_connect_id) ? @mysqli_affected_rows($this->db_connect_id) : false;
+	}
+
+	/**
+	* Fetch current row
+	*/
+	function sql_fetchrow($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_fetchrow($query_id);
+		}
+
+		if ($query_id !== false)
+		{
+			$result = @mysqli_fetch_assoc($query_id);
+			return $result !== null ? $result : false;
+		}
+
+		return false;
+	}
+
+	/**
+	* Seek to given row number
+	* rownum is zero-based
+	*/
+	function sql_rowseek($rownum, &$query_id)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_rowseek($rownum, $query_id);
+		}
+
+		return ($query_id !== false) ? @mysqli_data_seek($query_id, $rownum) : false;
+	}
+
+	/**
+	* Get last inserted id after insert statement
+	*/
+	function sql_nextid()
+	{
+		return ($this->db_connect_id) ? @mysqli_insert_id($this->db_connect_id) : false;
+	}
+
+	/**
+	* Free sql result
+	*/
+	function sql_freeresult($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_freeresult($query_id);
+		}
+
+		return @mysqli_free_result($query_id);
+	}
+
+	/**
+	* Escape string used in sql query
+	*/
+	function sql_escape($msg)
+	{
+		return @mysqli_real_escape_string($this->db_connect_id, $msg);
+	}
+
+	/**
+	* Gets the estimated number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Number of rows in $table_name.
+	*								Prefixed with ~ if estimated (otherwise exact).
+	*
+	* @access public
+	*/
+	function get_estimated_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']))
+		{
+			if ($table_status['Engine'] === 'MyISAM')
+			{
+				return $table_status['Rows'];
+			}
+			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
+			{
+				return '~' . $table_status['Rows'];
+			}
+		}
+
+		return parent::get_row_count($table_name);
+	}
+
+	/**
+	* Gets the exact number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Exact number of rows in $table_name.
+	*
+	* @access public
+	*/
+	function get_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
+		{
+			return $table_status['Rows'];
+		}
+
+		return parent::get_row_count($table_name);
+	}
+
+	/**
+	* Gets some information about the specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return array
+	*
+	* @access protected
+	*/
+	function get_table_status($table_name)
+	{
+		$sql = "SHOW TABLE STATUS
+			LIKE '" . $this->sql_escape($table_name) . "'";
+		$result = $this->sql_query($sql);
+		$table_status = $this->sql_fetchrow($result);
+		$this->sql_freeresult($result);
+
+		return $table_status;
+	}
+
+	/**
+	* Build LIKE expression
+	* @access private
+	*/
+	function _sql_like_expression($expression)
+	{
+		return $expression;
+	}
+
+	/**
+	* Build db-specific query data
+	* @access private
+	*/
+	function _sql_custom_build($stage, $data)
+	{
+		switch ($stage)
+		{
+			case 'FROM':
+				$data = '(' . $data . ')';
+			break;
+		}
+
+		return $data;
+	}
+
+	/**
+	* return sql error array
+	* @access private
+	*/
+	function _sql_error()
+	{
+		if (!$this->db_connect_id)
+		{
+			return array(
+				'message'	=> @mysqli_connect_error(),
+				'code'		=> @mysqli_connect_errno()
+			);
+		}
+
+		return array(
+			'message'	=> @mysqli_error($this->db_connect_id),
+			'code'		=> @mysqli_errno($this->db_connect_id)
+		);
+	}
+
+	/**
+	* Close sql connection
+	* @access private
+	*/
+	function _sql_close()
+	{
+		return @mysqli_close($this->db_connect_id);
+	}
+
+	/**
+	* Build db-specific report
+	* @access private
+	*/
+	function _sql_report($mode, $query = '')
+	{
+		static $test_prof;
+
+		// current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING
+		if ($test_prof === null)
+		{
+			$test_prof = false;
+			if (strpos(mysqli_get_server_info($this->db_connect_id), 'community') !== false)
+			{
+				$ver = mysqli_get_server_version($this->db_connect_id);
+				if ($ver >= 50037 && $ver < 50100)
+				{
+					$test_prof = true;
+				}
+			}
+		}
+
+		switch ($mode)
+		{
+			case 'start':
+
+				$explain_query = $query;
+				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
+				{
+					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
+				}
+				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
+				{
+					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
+				}
+
+				if (preg_match('/^SELECT/', $explain_query))
+				{
+					$html_table = false;
+
+					// begin profiling
+					if ($test_prof)
+					{
+						@mysqli_query($this->db_connect_id, 'SET profiling = 1;');
+					}
+
+					if ($result = @mysqli_query($this->db_connect_id, "EXPLAIN $explain_query"))
+					{
+						while ($row = @mysqli_fetch_assoc($result))
+						{
+							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
+						}
+					}
+					@mysqli_free_result($result);
+
+					if ($html_table)
+					{
+						$this->html_hold .= '</table>';
+					}
+
+					if ($test_prof)
+					{
+						$html_table = false;
+
+						// get the last profile
+						if ($result = @mysqli_query($this->db_connect_id, 'SHOW PROFILE ALL;'))
+						{
+							$this->html_hold .= '<br />';
+							while ($row = @mysqli_fetch_assoc($result))
+							{
+								// make <unknown> HTML safe
+								if (!empty($row['Source_function']))
+								{
+									$row['Source_function'] = str_replace(array('<', '>'), array('&lt;', '&gt;'), $row['Source_function']);
+								}
+
+								// remove unsupported features
+								foreach ($row as $key => $val)
+								{
+									if ($val === null)
+									{
+										unset($row[$key]);
+									}
+								}
+								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
+							}
+						}
+						@mysqli_free_result($result);
+
+						if ($html_table)
+						{
+							$this->html_hold .= '</table>';
+						}
+
+						@mysqli_query($this->db_connect_id, 'SET profiling = 0;');
+					}
+				}
+
+			break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @mysqli_query($this->db_connect_id, $query);
+				while ($void = @mysqli_fetch_assoc($result))
+				{
+					// Take the time spent on parsing rows into account
+				}
+				@mysqli_free_result($result);
+
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
+
+			break;
+		}
+	}
+}
diff --git a/phpBB/includes/db/driver/oracle.php b/phpBB/includes/db/driver/oracle.php
new file mode 100644
index 0000000000..25803e57bd
--- /dev/null
+++ b/phpBB/includes/db/driver/oracle.php
@@ -0,0 +1,766 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Oracle Database Abstraction Layer
+* @package dbal
+*/
+class phpbb_db_driver_oracle extends phpbb_db_driver
+{
+	var $last_query_text = '';
+
+	/**
+	* Connect to server
+	*/
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
+	{
+		$this->persistency = $persistency;
+		$this->user = $sqluser;
+		$this->server = $sqlserver . (($port) ? ':' . $port : '');
+		$this->dbname = $database;
+
+		$connect = $database;
+
+		// support for "easy connect naming"
+		if ($sqlserver !== '' && $sqlserver !== '/')
+		{
+			if (substr($sqlserver, -1, 1) == '/')
+			{
+				$sqlserver == substr($sqlserver, 0, -1);
+			}
+			$connect = $sqlserver . (($port) ? ':' . $port : '') . '/' . $database;
+		}
+
+		$this->db_connect_id = ($new_link) ? @ocinlogon($this->user, $sqlpassword, $connect, 'UTF8') : (($this->persistency) ? @ociplogon($this->user, $sqlpassword, $connect, 'UTF8') : @ocilogon($this->user, $sqlpassword, $connect, 'UTF8'));
+
+		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
+	}
+
+	/**
+	* Version information about used database
+	* @param bool $raw if true, only return the fetched sql_server_version
+	* @param bool $use_cache forced to false for Oracle
+	* @return string sql server version
+	*/
+	function sql_server_info($raw = false, $use_cache = true)
+	{
+		/**
+		* force $use_cache false.  I didn't research why the caching code below is commented out
+		* but I assume its because the Oracle extension provides a direct method to access it
+		* without a query.
+		*/
+
+		$use_cache = false;
+/*
+		global $cache;
+
+		if (empty($cache) || ($this->sql_server_version = $cache->get('oracle_version')) === false)
+		{
+			$result = @ociparse($this->db_connect_id, 'SELECT * FROM v$version WHERE banner LIKE \'Oracle%\'');
+			@ociexecute($result, OCI_DEFAULT);
+			@ocicommit($this->db_connect_id);
+
+			$row = array();
+			@ocifetchinto($result, $row, OCI_ASSOC + OCI_RETURN_NULLS);
+			@ocifreestatement($result);
+			$this->sql_server_version = trim($row['BANNER']);
+
+			$cache->put('oracle_version', $this->sql_server_version);
+		}
+*/
+		$this->sql_server_version = @ociserverversion($this->db_connect_id);
+
+		return $this->sql_server_version;
+	}
+
+	/**
+	* SQL Transaction
+	* @access private
+	*/
+	function _sql_transaction($status = 'begin')
+	{
+		switch ($status)
+		{
+			case 'begin':
+				return true;
+			break;
+
+			case 'commit':
+				return @ocicommit($this->db_connect_id);
+			break;
+
+			case 'rollback':
+				return @ocirollback($this->db_connect_id);
+			break;
+		}
+
+		return true;
+	}
+
+	/**
+	* Oracle specific code to handle the fact that it does not compare columns properly
+	* @access private
+	*/
+	function _rewrite_col_compare($args)
+	{
+		if (sizeof($args) == 4)
+		{
+			if ($args[2] == '=')
+			{
+				return '(' . $args[0] . ' OR (' . $args[1] . ' is NULL AND ' . $args[3] . ' is NULL))';
+			}
+			else if ($args[2] == '<>')
+			{
+				// really just a fancy way of saying foo <> bar or (foo is NULL XOR bar is NULL) but SQL has no XOR :P
+				return '(' . $args[0] . ' OR ((' . $args[1] . ' is NULL AND ' . $args[3] . ' is NOT NULL) OR (' . $args[1] . ' is NOT NULL AND ' . $args[3] . ' is NULL)))';
+			}
+		}
+		else
+		{
+			return $this->_rewrite_where($args[0]);
+		}
+	}
+
+	/**
+	* Oracle specific code to handle it's lack of sanity
+	* @access private
+	*/
+	function _rewrite_where($where_clause)
+	{
+		preg_match_all('/\s*(AND|OR)?\s*([\w_.()]++)\s*(?:(=|<[=>]?|>=?|LIKE)\s*((?>\'(?>[^\']++|\'\')*+\'|[\d-.()]+))|((NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))/', $where_clause, $result, PREG_SET_ORDER);
+		$out = '';
+		foreach ($result as $val)
+		{
+			if (!isset($val[5]))
+			{
+				if ($val[4] !== "''")
+				{
+					$out .= $val[0];
+				}
+				else
+				{
+					$out .= ' ' . $val[1] . ' ' . $val[2];
+					if ($val[3] == '=')
+					{
+						$out .= ' is NULL';
+					}
+					else if ($val[3] == '<>')
+					{
+						$out .= ' is NOT NULL';
+					}
+				}
+			}
+			else
+			{
+				$in_clause = array();
+				$sub_exp = substr($val[5], strpos($val[5], '(') + 1, -1);
+				$extra = false;
+				preg_match_all('/\'(?>[^\']++|\'\')*+\'|[\d-.]++/', $sub_exp, $sub_vals, PREG_PATTERN_ORDER);
+				$i = 0;
+				foreach ($sub_vals[0] as $sub_val)
+				{
+					// two things:
+					// 1) This determines if an empty string was in the IN clausing, making us turn it into a NULL comparison
+					// 2) This fixes the 1000 list limit that Oracle has (ORA-01795)
+					if ($sub_val !== "''")
+					{
+						$in_clause[(int) $i++/1000][] = $sub_val;
+					}
+					else
+					{
+						$extra = true;
+					}
+				}
+				if (!$extra && $i < 1000)
+				{
+					$out .= $val[0];
+				}
+				else
+				{
+					$out .= ' ' . $val[1] . '(';
+					$in_array = array();
+
+					// constuct each IN() clause
+					foreach ($in_clause as $in_values)
+					{
+						$in_array[] = $val[2] . ' ' . (isset($val[6]) ? $val[6] : '') . 'IN(' . implode(', ', $in_values) . ')';
+					}
+
+					// Join the IN() clauses against a few ORs (IN is just a nicer OR anyway)
+					$out .= implode(' OR ', $in_array);
+
+					// handle the empty string case
+					if ($extra)
+					{
+						$out .= ' OR ' . $val[2] . ' is ' . (isset($val[6]) ? $val[6] : '') . 'NULL';
+					}
+					$out .= ')';
+
+					unset($in_array, $in_clause);
+				}
+			}
+		}
+
+		return $out;
+	}
+
+	/**
+	* Base query method
+	*
+	* @param	string	$query		Contains the SQL query which shall be executed
+	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
+	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
+	*
+	* @access	public
+	*/
+	function sql_query($query = '', $cache_ttl = 0)
+	{
+		if ($query != '')
+		{
+			global $cache;
+
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('start', $query);
+			}
+
+			$this->last_query_text = $query;
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->sql_add_num_queries($this->query_result);
+
+			if ($this->query_result === false)
+			{
+				$in_transaction = false;
+				if (!$this->transaction)
+				{
+					$this->sql_transaction('begin');
+				}
+				else
+				{
+					$in_transaction = true;
+				}
+
+				$array = array();
+
+				// We overcome Oracle's 4000 char limit by binding vars
+				if (strlen($query) > 4000)
+				{
+					if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/sU', $query, $regs))
+					{
+						if (strlen($regs[3]) > 4000)
+						{
+							$cols = explode(', ', $regs[2]);
+
+							preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
+
+/*						The code inside this comment block breaks clob handling, but does allow the
+						database restore script to work.  If you want to allow no posts longer than 4KB
+						and/or need the db restore script, uncomment this.
+
+
+							if (sizeof($cols) !== sizeof($vals))
+							{
+								// Try to replace some common data we know is from our restore script or from other sources
+								$regs[3] = str_replace("'||chr(47)||'", '/', $regs[3]);
+								$_vals = explode(', ', $regs[3]);
+
+								$vals = array();
+								$is_in_val = false;
+								$i = 0;
+								$string = '';
+
+								foreach ($_vals as $value)
+								{
+									if (strpos($value, "'") === false && !$is_in_val)
+									{
+										$vals[$i++] = $value;
+										continue;
+									}
+
+									if (substr($value, -1) === "'")
+									{
+										$vals[$i] = $string . (($is_in_val) ? ', ' : '') . $value;
+										$string = '';
+										$is_in_val = false;
+
+										if ($vals[$i][0] !== "'")
+										{
+											$vals[$i] = "''" . $vals[$i];
+										}
+										$i++;
+										continue;
+									}
+									else
+									{
+										$string .= (($is_in_val) ? ', ' : '') . $value;
+										$is_in_val = true;
+									}
+								}
+
+								if ($string)
+								{
+									// New value if cols != value
+									$vals[(sizeof($cols) !== sizeof($vals)) ? $i : $i - 1] .= $string;
+								}
+
+								$vals = array(0 => $vals);
+							}
+*/
+
+							$inserts = $vals[0];
+							unset($vals);
+
+							foreach ($inserts as $key => $value)
+							{
+								if (!empty($value) && $value[0] === "'" && strlen($value) > 4002) // check to see if this thing is greater than the max + 'x2
+								{
+									$inserts[$key] = ':' . strtoupper($cols[$key]);
+									$array[$inserts[$key]] = str_replace("''", "'", substr($value, 1, -1));
+								}
+							}
+
+							$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
+						}
+					}
+					else if (preg_match_all('/^(UPDATE [\\w_]++\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data, PREG_SET_ORDER))
+					{
+						if (strlen($data[0][2]) > 4000)
+						{
+							$update = $data[0][1];
+							$where = $data[0][3];
+							preg_match_all('/([\\w_]++)\\s*=\\s*(\'(?:[^\']++|\'\')*+\'|[\d-.]++)/', $data[0][2], $temp, PREG_SET_ORDER);
+							unset($data);
+
+							$cols = array();
+							foreach ($temp as $value)
+							{
+								if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 4002) // check to see if this thing is greater than the max + 'x2
+								{
+									$cols[] = $value[1] . '=:' . strtoupper($value[1]);
+									$array[$value[1]] = str_replace("''", "'", substr($value[2], 1, -1));
+								}
+								else
+								{
+									$cols[] = $value[1] . '=' . $value[2];
+								}
+							}
+
+							$query = $update . implode(', ', $cols) . ' ' . $where;
+							unset($cols);
+						}
+					}
+				}
+
+				switch (substr($query, 0, 6))
+				{
+					case 'DELETE':
+						if (preg_match('/^(DELETE FROM [\w_]++ WHERE)((?:\s*(?:AND|OR)?\s*[\w_]+\s*(?:(?:=|<>)\s*(?>\'(?>[^\']++|\'\')*+\'|[\d-.]+)|(?:NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))*+)$/', $query, $regs))
+						{
+							$query = $regs[1] . $this->_rewrite_where($regs[2]);
+							unset($regs);
+						}
+					break;
+
+					case 'UPDATE':
+						if (preg_match('/^(UPDATE [\\w_]++\\s+SET [\\w_]+\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]++|:\w++)(?:, [\\w_]+\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]++|:\w++))*+\\s+WHERE)(.*)$/s',  $query, $regs))
+						{
+							$query = $regs[1] . $this->_rewrite_where($regs[2]);
+							unset($regs);
+						}
+					break;
+
+					case 'SELECT':
+						$query = preg_replace_callback('/([\w_.]++)\s*(?:(=|<>)\s*(?>\'(?>[^\']++|\'\')*+\'|[\d-.]++|([\w_.]++))|(?:NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]++,? ?)*+\))/', array($this, '_rewrite_col_compare'), $query);
+					break;
+				}
+
+				$this->query_result = @ociparse($this->db_connect_id, $query);
+
+				foreach ($array as $key => $value)
+				{
+					@ocibindbyname($this->query_result, $key, $array[$key], -1);
+				}
+
+				$success = @ociexecute($this->query_result, OCI_DEFAULT);
+
+				if (!$success)
+				{
+					$this->sql_error($query);
+					$this->query_result = false;
+				}
+				else
+				{
+					if (!$in_transaction)
+					{
+						$this->sql_transaction('commit');
+					}
+				}
+
+				if (defined('DEBUG_EXTRA'))
+				{
+					$this->sql_report('stop', $query);
+				}
+
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
+				}
+				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+				}
+			}
+			else if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('fromcache', $query);
+			}
+		}
+		else
+		{
+			return false;
+		}
+
+		return $this->query_result;
+	}
+
+	/**
+	* Build LIMIT query
+	*/
+	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		$this->query_result = false;
+
+		$query = 'SELECT * FROM (SELECT /*+ FIRST_ROWS */ rownum AS xrownum, a.* FROM (' . $query . ') a WHERE rownum <= ' . ($offset + $total) . ') WHERE xrownum >= ' . $offset;
+
+		return $this->sql_query($query, $cache_ttl);
+	}
+
+	/**
+	* Return number of affected rows
+	*/
+	function sql_affectedrows()
+	{
+		return ($this->query_result) ? @ocirowcount($this->query_result) : false;
+	}
+
+	/**
+	* Fetch current row
+	*/
+	function sql_fetchrow($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_fetchrow($query_id);
+		}
+
+		if ($query_id !== false)
+		{
+			$row = array();
+			$result = @ocifetchinto($query_id, $row, OCI_ASSOC + OCI_RETURN_NULLS);
+
+			if (!$result || !$row)
+			{
+				return false;
+			}
+
+			$result_row = array();
+			foreach ($row as $key => $value)
+			{
+				// Oracle treats empty strings as null
+				if (is_null($value))
+				{
+					$value = '';
+				}
+
+				// OCI->CLOB?
+				if (is_object($value))
+				{
+					$value = $value->load();
+				}
+
+				$result_row[strtolower($key)] = $value;
+			}
+
+			return $result_row;
+		}
+
+		return false;
+	}
+
+	/**
+	* Seek to given row number
+	* rownum is zero-based
+	*/
+	function sql_rowseek($rownum, &$query_id)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_rowseek($rownum, $query_id);
+		}
+
+		if ($query_id === false)
+		{
+			return false;
+		}
+
+		// Reset internal pointer
+		@ociexecute($query_id, OCI_DEFAULT);
+
+		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
+		for ($i = 0; $i < $rownum; $i++)
+		{
+			if (!$this->sql_fetchrow($query_id))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	* Get last inserted id after insert statement
+	*/
+	function sql_nextid()
+	{
+		$query_id = $this->query_result;
+
+		if ($query_id !== false && $this->last_query_text != '')
+		{
+			if (preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename))
+			{
+				$query = 'SELECT ' . $tablename[1] . '_seq.currval FROM DUAL';
+				$stmt = @ociparse($this->db_connect_id, $query);
+				@ociexecute($stmt, OCI_DEFAULT);
+
+				$temp_result = @ocifetchinto($stmt, $temp_array, OCI_ASSOC + OCI_RETURN_NULLS);
+				@ocifreestatement($stmt);
+
+				if ($temp_result)
+				{
+					return $temp_array['CURRVAL'];
+				}
+				else
+				{
+					return false;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	* Free sql result
+	*/
+	function sql_freeresult($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_freeresult($query_id);
+		}
+
+		if (isset($this->open_queries[(int) $query_id]))
+		{
+			unset($this->open_queries[(int) $query_id]);
+			return @ocifreestatement($query_id);
+		}
+
+		return false;
+	}
+
+	/**
+	* Escape string used in sql query
+	*/
+	function sql_escape($msg)
+	{
+		return str_replace(array("'", "\0"), array("''", ''), $msg);
+	}
+
+	/**
+	* Build LIKE expression
+	* @access private
+	*/
+	function _sql_like_expression($expression)
+	{
+		return $expression . " ESCAPE '\\'";
+	}
+
+	function _sql_custom_build($stage, $data)
+	{
+		return $data;
+	}
+
+	function _sql_bit_and($column_name, $bit, $compare = '')
+	{
+		return 'BITAND(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
+	}
+
+	function _sql_bit_or($column_name, $bit, $compare = '')
+	{
+		return 'BITOR(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
+	}
+
+	/**
+	* return sql error array
+	* @access private
+	*/
+	function _sql_error()
+	{
+		$error = @ocierror();
+		$error = (!$error) ? @ocierror($this->query_result) : $error;
+		$error = (!$error) ? @ocierror($this->db_connect_id) : $error;
+
+		if ($error)
+		{
+			$this->last_error_result = $error;
+		}
+		else
+		{
+			$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
+		}
+
+		return $error;
+	}
+
+	/**
+	* Close sql connection
+	* @access private
+	*/
+	function _sql_close()
+	{
+		return @ocilogoff($this->db_connect_id);
+	}
+
+	/**
+	* Build db-specific report
+	* @access private
+	*/
+	function _sql_report($mode, $query = '')
+	{
+		switch ($mode)
+		{
+			case 'start':
+
+				$html_table = false;
+
+				// Grab a plan table, any will do
+				$sql = "SELECT table_name
+					FROM USER_TABLES
+					WHERE table_name LIKE '%PLAN_TABLE%'";
+				$stmt = ociparse($this->db_connect_id, $sql);
+				ociexecute($stmt);
+				$result = array();
+
+				if (ocifetchinto($stmt, $result, OCI_ASSOC + OCI_RETURN_NULLS))
+				{
+					$table = $result['TABLE_NAME'];
+
+					// This is the statement_id that will allow us to track the plan
+					$statement_id = substr(md5($query), 0, 30);
+
+					// Remove any stale plans
+					$stmt2 = ociparse($this->db_connect_id, "DELETE FROM $table WHERE statement_id='$statement_id'");
+					ociexecute($stmt2);
+					ocifreestatement($stmt2);
+
+					// Explain the plan
+					$sql = "EXPLAIN PLAN
+						SET STATEMENT_ID = '$statement_id'
+						FOR $query";
+					$stmt2 = ociparse($this->db_connect_id, $sql);
+					ociexecute($stmt2);
+					ocifreestatement($stmt2);
+
+					// Get the data from the plan
+					$sql = "SELECT operation, options, object_name, object_type, cardinality, cost
+						FROM plan_table
+						START WITH id = 0 AND statement_id = '$statement_id'
+						CONNECT BY PRIOR id = parent_id
+							AND statement_id = '$statement_id'";
+					$stmt2 = ociparse($this->db_connect_id, $sql);
+					ociexecute($stmt2);
+
+					$row = array();
+					while (ocifetchinto($stmt2, $row, OCI_ASSOC + OCI_RETURN_NULLS))
+					{
+						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
+					}
+
+					ocifreestatement($stmt2);
+
+					// Remove the plan we just made, we delete them on request anyway
+					$stmt2 = ociparse($this->db_connect_id, "DELETE FROM $table WHERE statement_id='$statement_id'");
+					ociexecute($stmt2);
+					ocifreestatement($stmt2);
+				}
+
+				ocifreestatement($stmt);
+
+				if ($html_table)
+				{
+					$this->html_hold .= '</table>';
+				}
+
+			break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @ociparse($this->db_connect_id, $query);
+				$success = @ociexecute($result, OCI_DEFAULT);
+				$row = array();
+
+				while (@ocifetchinto($result, $row, OCI_ASSOC + OCI_RETURN_NULLS))
+				{
+					// Take the time spent on parsing rows into account
+				}
+				@ocifreestatement($result);
+
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
+
+			break;
+		}
+	}
+}
diff --git a/phpBB/includes/db/driver/postgres.php b/phpBB/includes/db/driver/postgres.php
new file mode 100644
index 0000000000..3f54936d23
--- /dev/null
+++ b/phpBB/includes/db/driver/postgres.php
@@ -0,0 +1,491 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* PostgreSQL Database Abstraction Layer
+* Minimum Requirement is Version 7.3+
+* @package dbal
+*/
+class phpbb_db_driver_postgres extends phpbb_db_driver
+{
+	var $last_query_text = '';
+	var $connect_error = '';
+
+	/**
+	* Connect to server
+	*/
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
+	{
+		$connect_string = '';
+
+		if ($sqluser)
+		{
+			$connect_string .= "user=$sqluser ";
+		}
+
+		if ($sqlpassword)
+		{
+			$connect_string .= "password=$sqlpassword ";
+		}
+
+		if ($sqlserver)
+		{
+			// $sqlserver can carry a port separated by : for compatibility reasons
+			// If $sqlserver has more than one : it's probably an IPv6 address.
+			// In this case we only allow passing a port via the $port variable.
+			if (substr_count($sqlserver, ':') === 1)
+			{
+				list($sqlserver, $port) = explode(':', $sqlserver);
+			}
+
+			if ($sqlserver !== 'localhost')
+			{
+				$connect_string .= "host=$sqlserver ";
+			}
+
+			if ($port)
+			{
+				$connect_string .= "port=$port ";
+			}
+		}
+
+		$schema = '';
+
+		if ($database)
+		{
+			$this->dbname = $database;
+			if (strpos($database, '.') !== false)
+			{
+				list($database, $schema) = explode('.', $database);
+			}
+			$connect_string .= "dbname=$database";
+		}
+
+		$this->persistency = $persistency;
+
+		if ($this->persistency)
+		{
+			if (!function_exists('pg_pconnect'))
+			{
+				$this->connect_error = 'pg_pconnect function does not exist, is pgsql extension installed?';
+				return $this->sql_error('');
+			}
+			$collector = new phpbb_error_collector;
+			$collector->install();
+			$this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW);
+		}
+		else
+		{
+			if (!function_exists('pg_connect'))
+			{
+				$this->connect_error = 'pg_connect function does not exist, is pgsql extension installed?';
+				return $this->sql_error('');
+			}
+			$collector = new phpbb_error_collector;
+			$collector->install();
+			$this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW);
+		}
+
+		$collector->uninstall();
+
+		if ($this->db_connect_id)
+		{
+			if (version_compare($this->sql_server_info(true), '8.2', '>='))
+			{
+				$this->multi_insert = true;
+			}
+
+			if ($schema !== '')
+			{
+				@pg_query($this->db_connect_id, 'SET search_path TO ' . $schema);
+			}
+			return $this->db_connect_id;
+		}
+
+		$this->connect_error = $collector->format_errors();
+		return $this->sql_error('');
+	}
+
+	/**
+	* Version information about used database
+	* @param bool $raw if true, only return the fetched sql_server_version
+	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
+	* @return string sql server version
+	*/
+	function sql_server_info($raw = false, $use_cache = true)
+	{
+		global $cache;
+
+		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('pgsql_version')) === false)
+		{
+			$query_id = @pg_query($this->db_connect_id, 'SELECT VERSION() AS version');
+			$row = @pg_fetch_assoc($query_id, null);
+			@pg_free_result($query_id);
+
+			$this->sql_server_version = (!empty($row['version'])) ? trim(substr($row['version'], 10)) : 0;
+
+			if (!empty($cache) && $use_cache)
+			{
+				$cache->put('pgsql_version', $this->sql_server_version);
+			}
+		}
+
+		return ($raw) ? $this->sql_server_version : 'PostgreSQL ' . $this->sql_server_version;
+	}
+
+	/**
+	* SQL Transaction
+	* @access private
+	*/
+	function _sql_transaction($status = 'begin')
+	{
+		switch ($status)
+		{
+			case 'begin':
+				return @pg_query($this->db_connect_id, 'BEGIN');
+			break;
+
+			case 'commit':
+				return @pg_query($this->db_connect_id, 'COMMIT');
+			break;
+
+			case 'rollback':
+				return @pg_query($this->db_connect_id, 'ROLLBACK');
+			break;
+		}
+
+		return true;
+	}
+
+	/**
+	* Base query method
+	*
+	* @param	string	$query		Contains the SQL query which shall be executed
+	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
+	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
+	*
+	* @access	public
+	*/
+	function sql_query($query = '', $cache_ttl = 0)
+	{
+		if ($query != '')
+		{
+			global $cache;
+
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('start', $query);
+			}
+
+			$this->last_query_text = $query;
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->sql_add_num_queries($this->query_result);
+
+			if ($this->query_result === false)
+			{
+				if (($this->query_result = @pg_query($this->db_connect_id, $query)) === false)
+				{
+					$this->sql_error($query);
+				}
+
+				if (defined('DEBUG_EXTRA'))
+				{
+					$this->sql_report('stop', $query);
+				}
+
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
+				}
+				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+				}
+			}
+			else if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('fromcache', $query);
+			}
+		}
+		else
+		{
+			return false;
+		}
+
+		return $this->query_result;
+	}
+
+	/**
+	* Build db-specific query data
+	* @access private
+	*/
+	function _sql_custom_build($stage, $data)
+	{
+		return $data;
+	}
+
+	/**
+	* Build LIMIT query
+	*/
+	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		$this->query_result = false;
+
+		// if $total is set to 0 we do not want to limit the number of rows
+		if ($total == 0)
+		{
+			$total = 'ALL';
+		}
+
+		$query .= "\n LIMIT $total OFFSET $offset";
+
+		return $this->sql_query($query, $cache_ttl);
+	}
+
+	/**
+	* Return number of affected rows
+	*/
+	function sql_affectedrows()
+	{
+		return ($this->query_result) ? @pg_affected_rows($this->query_result) : false;
+	}
+
+	/**
+	* Fetch current row
+	*/
+	function sql_fetchrow($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_fetchrow($query_id);
+		}
+
+		return ($query_id !== false) ? @pg_fetch_assoc($query_id, null) : false;
+	}
+
+	/**
+	* Seek to given row number
+	* rownum is zero-based
+	*/
+	function sql_rowseek($rownum, &$query_id)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_rowseek($rownum, $query_id);
+		}
+
+		return ($query_id !== false) ? @pg_result_seek($query_id, $rownum) : false;
+	}
+
+	/**
+	* Get last inserted id after insert statement
+	*/
+	function sql_nextid()
+	{
+		$query_id = $this->query_result;
+
+		if ($query_id !== false && $this->last_query_text != '')
+		{
+			if (preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text, $tablename))
+			{
+				$query = "SELECT currval('" . $tablename[1] . "_seq') AS last_value";
+				$temp_q_id = @pg_query($this->db_connect_id, $query);
+
+				if (!$temp_q_id)
+				{
+					return false;
+				}
+
+				$temp_result = @pg_fetch_assoc($temp_q_id, NULL);
+				@pg_free_result($query_id);
+
+				return ($temp_result) ? $temp_result['last_value'] : false;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	* Free sql result
+	*/
+	function sql_freeresult($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_freeresult($query_id);
+		}
+
+		if (isset($this->open_queries[(int) $query_id]))
+		{
+			unset($this->open_queries[(int) $query_id]);
+			return @pg_free_result($query_id);
+		}
+
+		return false;
+	}
+
+	/**
+	* Escape string used in sql query
+	* Note: Do not use for bytea values if we may use them at a later stage
+	*/
+	function sql_escape($msg)
+	{
+		return @pg_escape_string($msg);
+	}
+
+	/**
+	* Build LIKE expression
+	* @access private
+	*/
+	function _sql_like_expression($expression)
+	{
+		return $expression;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	function cast_expr_to_bigint($expression)
+	{
+		return 'CAST(' . $expression . ' as DECIMAL(255, 0))';
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	function cast_expr_to_string($expression)
+	{
+		return 'CAST(' . $expression . ' as VARCHAR(255))';
+	}
+
+	/**
+	* return sql error array
+	* @access private
+	*/
+	function _sql_error()
+	{
+		// pg_last_error only works when there is an established connection.
+		// Connection errors have to be tracked by us manually.
+		if ($this->db_connect_id)
+		{
+			$message = @pg_last_error($this->db_connect_id);
+		}
+		else
+		{
+			$message = $this->connect_error;
+		}
+
+		return array(
+			'message'	=> $message,
+			'code'		=> ''
+		);
+	}
+
+	/**
+	* Close sql connection
+	* @access private
+	*/
+	function _sql_close()
+	{
+		return @pg_close($this->db_connect_id);
+	}
+
+	/**
+	* Build db-specific report
+	* @access private
+	*/
+	function _sql_report($mode, $query = '')
+	{
+		switch ($mode)
+		{
+			case 'start':
+
+				$explain_query = $query;
+				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
+				{
+					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
+				}
+				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
+				{
+					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
+				}
+
+				if (preg_match('/^SELECT/', $explain_query))
+				{
+					$html_table = false;
+
+					if ($result = @pg_query($this->db_connect_id, "EXPLAIN $explain_query"))
+					{
+						while ($row = @pg_fetch_assoc($result, NULL))
+						{
+							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
+						}
+					}
+					@pg_free_result($result);
+
+					if ($html_table)
+					{
+						$this->html_hold .= '</table>';
+					}
+				}
+
+			break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @pg_query($this->db_connect_id, $query);
+				while ($void = @pg_fetch_assoc($result, NULL))
+				{
+					// Take the time spent on parsing rows into account
+				}
+				@pg_free_result($result);
+
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
+
+			break;
+		}
+	}
+}
diff --git a/phpBB/includes/db/driver/sqlite.php b/phpBB/includes/db/driver/sqlite.php
new file mode 100644
index 0000000000..363f26da2b
--- /dev/null
+++ b/phpBB/includes/db/driver/sqlite.php
@@ -0,0 +1,334 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Sqlite Database Abstraction Layer
+* Minimum Requirement: 2.8.2+
+* @package dbal
+*/
+class phpbb_db_driver_sqlite extends phpbb_db_driver
+{
+	/**
+	* Connect to server
+	*/
+	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
+	{
+		$this->persistency = $persistency;
+		$this->user = $sqluser;
+		$this->server = $sqlserver . (($port) ? ':' . $port : '');
+		$this->dbname = $database;
+
+		$error = '';
+		$this->db_connect_id = ($this->persistency) ? @sqlite_popen($this->server, 0666, $error) : @sqlite_open($this->server, 0666, $error);
+
+		if ($this->db_connect_id)
+		{
+			@sqlite_query('PRAGMA short_column_names = 1', $this->db_connect_id);
+//			@sqlite_query('PRAGMA encoding = "UTF-8"', $this->db_connect_id);
+		}
+
+		return ($this->db_connect_id) ? true : array('message' => $error);
+	}
+
+	/**
+	* Version information about used database
+	* @param bool $raw if true, only return the fetched sql_server_version
+	* @param bool $use_cache if true, it is safe to retrieve the stored value from the cache
+	* @return string sql server version
+	*/
+	function sql_server_info($raw = false, $use_cache = true)
+	{
+		global $cache;
+
+		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('sqlite_version')) === false)
+		{
+			$result = @sqlite_query('SELECT sqlite_version() AS version', $this->db_connect_id);
+			$row = @sqlite_fetch_array($result, SQLITE_ASSOC);
+
+			$this->sql_server_version = (!empty($row['version'])) ? $row['version'] : 0;
+
+			if (!empty($cache) && $use_cache)
+			{
+				$cache->put('sqlite_version', $this->sql_server_version);
+			}
+		}
+
+		return ($raw) ? $this->sql_server_version : 'SQLite ' . $this->sql_server_version;
+	}
+
+	/**
+	* SQL Transaction
+	* @access private
+	*/
+	function _sql_transaction($status = 'begin')
+	{
+		switch ($status)
+		{
+			case 'begin':
+				return @sqlite_query('BEGIN', $this->db_connect_id);
+			break;
+
+			case 'commit':
+				return @sqlite_query('COMMIT', $this->db_connect_id);
+			break;
+
+			case 'rollback':
+				return @sqlite_query('ROLLBACK', $this->db_connect_id);
+			break;
+		}
+
+		return true;
+	}
+
+	/**
+	* Base query method
+	*
+	* @param	string	$query		Contains the SQL query which shall be executed
+	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
+	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
+	*
+	* @access	public
+	*/
+	function sql_query($query = '', $cache_ttl = 0)
+	{
+		if ($query != '')
+		{
+			global $cache;
+
+			// EXPLAIN only in extra debug mode
+			if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('start', $query);
+			}
+
+			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->sql_add_num_queries($this->query_result);
+
+			if ($this->query_result === false)
+			{
+				if (($this->query_result = @sqlite_query($query, $this->db_connect_id)) === false)
+				{
+					$this->sql_error($query);
+				}
+
+				if (defined('DEBUG_EXTRA'))
+				{
+					$this->sql_report('stop', $query);
+				}
+
+				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+					$cache->sql_save($query, $this->query_result, $cache_ttl);
+				}
+				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
+				{
+					$this->open_queries[(int) $this->query_result] = $this->query_result;
+				}
+			}
+			else if (defined('DEBUG_EXTRA'))
+			{
+				$this->sql_report('fromcache', $query);
+			}
+		}
+		else
+		{
+			return false;
+		}
+
+		return $this->query_result;
+	}
+
+	/**
+	* Build LIMIT query
+	*/
+	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		$this->query_result = false;
+
+		// if $total is set to 0 we do not want to limit the number of rows
+		if ($total == 0)
+		{
+			$total = -1;
+		}
+
+		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
+
+		return $this->sql_query($query, $cache_ttl);
+	}
+
+	/**
+	* Return number of affected rows
+	*/
+	function sql_affectedrows()
+	{
+		return ($this->db_connect_id) ? @sqlite_changes($this->db_connect_id) : false;
+	}
+
+	/**
+	* Fetch current row
+	*/
+	function sql_fetchrow($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_fetchrow($query_id);
+		}
+
+		return ($query_id !== false) ? @sqlite_fetch_array($query_id, SQLITE_ASSOC) : false;
+	}
+
+	/**
+	* Seek to given row number
+	* rownum is zero-based
+	*/
+	function sql_rowseek($rownum, &$query_id)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_rowseek($rownum, $query_id);
+		}
+
+		return ($query_id !== false) ? @sqlite_seek($query_id, $rownum) : false;
+	}
+
+	/**
+	* Get last inserted id after insert statement
+	*/
+	function sql_nextid()
+	{
+		return ($this->db_connect_id) ? @sqlite_last_insert_rowid($this->db_connect_id) : false;
+	}
+
+	/**
+	* Free sql result
+	*/
+	function sql_freeresult($query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if (isset($cache->sql_rowset[$query_id]))
+		{
+			return $cache->sql_freeresult($query_id);
+		}
+
+		return true;
+	}
+
+	/**
+	* Escape string used in sql query
+	*/
+	function sql_escape($msg)
+	{
+		return @sqlite_escape_string($msg);
+	}
+
+	/**
+	* Correctly adjust LIKE expression for special characters
+	* For SQLite an underscore is a not-known character... this may change with SQLite3
+	*/
+	function sql_like_expression($expression)
+	{
+		// Unlike LIKE, GLOB is case sensitive (unfortunatly). SQLite users need to live with it!
+		// We only catch * and ? here, not the character map possible on file globbing.
+		$expression = str_replace(array(chr(0) . '_', chr(0) . '%'), array(chr(0) . '?', chr(0) . '*'), $expression);
+
+		$expression = str_replace(array('?', '*'), array("\?", "\*"), $expression);
+		$expression = str_replace(array(chr(0) . "\?", chr(0) . "\*"), array('?', '*'), $expression);
+
+		return 'GLOB \'' . $this->sql_escape($expression) . '\'';
+	}
+
+	/**
+	* return sql error array
+	* @access private
+	*/
+	function _sql_error()
+	{
+		return array(
+			'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
+			'code'		=> @sqlite_last_error($this->db_connect_id)
+		);
+	}
+
+	/**
+	* Build db-specific query data
+	* @access private
+	*/
+	function _sql_custom_build($stage, $data)
+	{
+		return $data;
+	}
+
+	/**
+	* Close sql connection
+	* @access private
+	*/
+	function _sql_close()
+	{
+		return @sqlite_close($this->db_connect_id);
+	}
+
+	/**
+	* Build db-specific report
+	* @access private
+	*/
+	function _sql_report($mode, $query = '')
+	{
+		switch ($mode)
+		{
+			case 'start':
+			break;
+
+			case 'fromcache':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$result = @sqlite_query($query, $this->db_connect_id);
+				while ($void = @sqlite_fetch_array($result, SQLITE_ASSOC))
+				{
+					// Take the time spent on parsing rows into account
+				}
+
+				$splittime = explode(' ', microtime());
+				$splittime = $splittime[0] + $splittime[1];
+
+				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
+
+			break;
+		}
+	}
+}
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
deleted file mode 100644
index 7709e8fdf5..0000000000
--- a/phpBB/includes/db/firebird.php
+++ /dev/null
@@ -1,540 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
-
-/**
-* Firebird/Interbase Database Abstraction Layer
-* Minimum Requirement is Firebird 2.1
-* @package dbal
-*/
-class dbal_firebird extends dbal
-{
-	var $last_query_text = '';
-	var $service_handle = false;
-	var $affected_rows = 0;
-	var $connect_error = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->server = $sqlserver . (($port) ? ':' . $port : '');
-		$this->dbname = str_replace('\\', '/', $database);
-
-		// There are three possibilities to connect to an interbase db
-		if (!$this->server)
-		{
-			$use_database = $this->dbname;
-		}
-		else if (strpos($this->server, '//') === 0)
-		{
-			$use_database = $this->server . $this->dbname;
-		}
-		else
-		{
-			$use_database = $this->server . ':' . $this->dbname;
-		}
-
-		if ($this->persistency)
-		{
-			if (!function_exists('ibase_pconnect'))
-			{
-				$this->connect_error = 'ibase_pconnect function does not exist, is interbase extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @ibase_pconnect($use_database, $this->user, $sqlpassword, false, false, 3);
-		}
-		else
-		{
-			if (!function_exists('ibase_connect'))
-			{
-				$this->connect_error = 'ibase_connect function does not exist, is interbase extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3);
-		}
-
-		// Do not call ibase_service_attach if connection failed,
-		// otherwise error message from ibase_(p)connect call will be clobbered.
-		if ($this->db_connect_id && function_exists('ibase_service_attach') && $this->server)
-		{
-			$this->service_handle = @ibase_service_attach($this->server, $this->user, $sqlpassword);
-		}
-		else
-		{
-			$this->service_handle = false;
-		}
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache forced to false for Interbase
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		/**
-		* force $use_cache false.  I didn't research why the caching code there is no caching code
-		* but I assume its because the IB extension provides a direct method to access it
-		* without a query.
-		*/
-
-		$use_cache = false;
-
-		if ($this->service_handle !== false && function_exists('ibase_server_info'))
-		{
-			return @ibase_server_info($this->service_handle, IBASE_SVC_SERVER_VERSION);
-		}
-
-		return ($raw) ? '2.1' : 'Firebird/Interbase';
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return true;
-			break;
-
-			case 'commit':
-				return @ibase_commit();
-			break;
-
-			case 'rollback':
-				return @ibase_rollback();
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				$array = array();
-				// We overcome Firebird's 32767 char limit by binding vars
-				if (strlen($query) > 32767)
-				{
-					if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/s', $query, $regs))
-					{
-						if (strlen($regs[3]) > 32767)
-						{
-							preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
-
-							$inserts = $vals[0];
-							unset($vals);
-
-							foreach ($inserts as $key => $value)
-							{
-								if (!empty($value) && $value[0] === "'" && strlen($value) > 32769) // check to see if this thing is greater than the max + 'x2
-								{
-									$inserts[$key] = '?';
-									$array[] = str_replace("''", "'", substr($value, 1, -1));
-								}
-							}
-
-							$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
-						}
-					}
-					else if (preg_match('/^(UPDATE ([\\w_]++)\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|\\d+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data))
-					{
-						if (strlen($data[3]) > 32767)
-						{
-							$update = $data[1];
-							$where = $data[4];
-							preg_match_all('/(\\w++)\\s*=\\s*(\'(?:[^\']++|\'\')*+\'|[\d-.]++)/', $data[3], $temp, PREG_SET_ORDER);
-							unset($data);
-
-							$cols = array();
-							foreach ($temp as $value)
-							{
-								if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 32769) // check to see if this thing is greater than the max + 'x2
-								{
-									$array[] = str_replace("''", "'", substr($value[2], 1, -1));
-									$cols[] = $value[1] . '=?';
-								}
-								else
-								{
-									$cols[] = $value[1] . '=' . $value[2];
-								}
-							}
-
-							$query = $update . implode(', ', $cols) . ' ' . $where;
-							unset($cols);
-						}
-					}
-				}
-
-				if (!function_exists('ibase_affected_rows') && (preg_match('/^UPDATE ([\w_]++)\s+SET [\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\s*[\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+\s+(WHERE.*)?$/s', $query, $regs) || preg_match('/^DELETE FROM ([\w_]++)\s*(WHERE\s*.*)?$/s', $query, $regs)))
-				{
-					$affected_sql = 'SELECT COUNT(*) as num_rows_affected FROM ' . $regs[1];
-					if (!empty($regs[2]))
-					{
-						$affected_sql .= ' ' . $regs[2];
-					}
-
-					if (!($temp_q_id = @ibase_query($this->db_connect_id, $affected_sql)))
-					{
-						return false;
-					}
-
-					$temp_result = @ibase_fetch_assoc($temp_q_id);
-					@ibase_free_result($temp_q_id);
-
-					$this->affected_rows = ($temp_result) ? $temp_result['NUM_ROWS_AFFECTED'] : false;
-				}
-
-				if (sizeof($array))
-				{
-					$p_query = @ibase_prepare($this->db_connect_id, $query);
-					array_unshift($array, $p_query);
-					$this->query_result = call_user_func_array('ibase_execute', $array);
-					unset($array);
-
-					if ($this->query_result === false)
-					{
-						$this->sql_error($query);
-					}
-				}
-				else if (($this->query_result = @ibase_query($this->db_connect_id, $query)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG_EXTRA'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if (!$this->transaction)
-				{
-					if (function_exists('ibase_commit_ret'))
-					{
-						@ibase_commit_ret();
-					}
-					else
-					{
-						// way cooler than ibase_commit_ret :D
-						@ibase_query('COMMIT RETAIN;');
-					}
-				}
-
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		$query = 'SELECT FIRST ' . $total . ((!empty($offset)) ? ' SKIP ' . $offset : '') . substr($query, 6);
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		// PHP 5+ function
-		if (function_exists('ibase_affected_rows'))
-		{
-			return ($this->db_connect_id) ? @ibase_affected_rows($this->db_connect_id) : false;
-		}
-		else
-		{
-			return $this->affected_rows;
-		}
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$row = array();
-		$cur_row = @ibase_fetch_object($query_id, IBASE_TEXT);
-
-		if (!$cur_row)
-		{
-			return false;
-		}
-
-		foreach (get_object_vars($cur_row) as $key => $value)
-		{
-			$row[strtolower($key)] = (is_string($value)) ? trim(str_replace(array("\\0", "\\n"), array("\0", "\n"), $value)) : $value;
-		}
-
-		return (sizeof($row)) ? $row : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$query_id = $this->query_result;
-
-		if ($query_id !== false && $this->last_query_text != '')
-		{
-			if ($this->query_result && preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#i', $this->last_query_text, $tablename))
-			{
-				$sql = 'SELECT GEN_ID(' . $tablename[1] . '_gen, 0) AS new_id FROM RDB$DATABASE';
-
-				if (!($temp_q_id = @ibase_query($this->db_connect_id, $sql)))
-				{
-					return false;
-				}
-
-				$temp_result = @ibase_fetch_assoc($temp_q_id);
-				@ibase_free_result($temp_q_id);
-
-				return ($temp_result) ? $temp_result['NEW_ID'] : false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @ibase_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	function _sql_bit_and($column_name, $bit, $compare = '')
-	{
-		return 'BIN_AND(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
-	}
-
-	function _sql_bit_or($column_name, $bit, $compare = '')
-	{
-		return 'BIN_OR(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	function cast_expr_to_bigint($expression)
-	{
-		// Precision must be from 1 to 18
-		return 'CAST(' . $expression . ' as DECIMAL(18, 0))';
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	function cast_expr_to_string($expression)
-	{
-		return 'CAST(' . $expression . ' as VARCHAR(255))';
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		// Need special handling here because ibase_errmsg returns
-		// connection errors, however if the interbase extension
-		// is not installed then ibase_errmsg does not exist and
-		// we cannot call it.
-		if (function_exists('ibase_errmsg'))
-		{
-			$msg = @ibase_errmsg();
-			if (!$msg)
-			{
-				$msg = $this->connect_error;
-			}
-		}
-		else
-		{
-			$msg = $this->connect_error;
-		}
-		return array(
-			'message'	=> $msg,
-			'code'		=> (@function_exists('ibase_errcode') ? @ibase_errcode() : '')
-		);
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		if ($this->service_handle !== false)
-		{
-			@ibase_service_detach($this->service_handle);
-		}
-
-		return @ibase_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @ibase_query($this->db_connect_id, $query);
-				while ($void = @ibase_fetch_object($result, IBASE_TEXT))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@ibase_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
deleted file mode 100644
index fb044b492f..0000000000
--- a/phpBB/includes/db/mssql.php
+++ /dev/null
@@ -1,456 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
-
-/**
-* MSSQL Database Abstraction Layer
-* Minimum Requirement is MSSQL 2000+
-* @package dbal
-*/
-class dbal_mssql extends dbal
-{
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->dbname = $database;
-
-		$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
-		$this->server = $sqlserver . (($port) ? $port_delimiter . $port : '');
-
-		@ini_set('mssql.charset', 'UTF-8');
-		@ini_set('mssql.textlimit', 2147483647);
-		@ini_set('mssql.textsize', 2147483647);
-
-		$this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mssql_connect($this->server, $this->user, $sqlpassword, $new_link);
-
-		if ($this->db_connect_id && $this->dbname != '')
-		{
-			if (!@mssql_select_db($this->dbname, $this->db_connect_id))
-			{
-				@mssql_close($this->db_connect_id);
-				return false;
-			}
-		}
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mssql_version')) === false)
-		{
-			$result_id = @mssql_query("SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')", $this->db_connect_id);
-
-			$row = false;
-			if ($result_id)
-			{
-				$row = @mssql_fetch_assoc($result_id);
-				@mssql_free_result($result_id);
-			}
-
-			$this->sql_server_version = ($row) ? trim(implode(' ', $row)) : 0;
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('mssql_version', $this->sql_server_version);
-			}
-		}
-
-		if ($raw)
-		{
-			return $this->sql_server_version;
-		}
-
-		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return $expr1 . ' + ' . $expr2;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @mssql_query('BEGIN TRANSACTION', $this->db_connect_id);
-			break;
-
-			case 'commit':
-				return @mssql_query('COMMIT TRANSACTION', $this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @mssql_query('ROLLBACK TRANSACTION', $this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @mssql_query($query, $this->db_connect_id)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG_EXTRA'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows)
-		if ($total)
-		{
-			// We need to grab the total number of rows + the offset number of rows to get the correct result
-			if (strpos($query, 'SELECT DISTINCT') === 0)
-			{
-				$query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15);
-			}
-			else
-			{
-				$query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6);
-			}
-		}
-
-		$result = $this->sql_query($query, $cache_ttl);
-
-		// Seek by $offset rows
-		if ($offset)
-		{
-			$this->sql_rowseek($offset, $result);
-		}
-
-		return $result;
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @mssql_rows_affected($this->db_connect_id) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$row = @mssql_fetch_assoc($query_id);
-
-		// I hope i am able to remove this later... hopefully only a PHP or MSSQL bug
-		if ($row)
-		{
-			foreach ($row as $key => $value)
-			{
-				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
-			}
-		}
-
-		return $row;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @mssql_data_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$result_id = @mssql_query('SELECT SCOPE_IDENTITY()', $this->db_connect_id);
-		if ($result_id)
-		{
-			if ($row = @mssql_fetch_assoc($result_id))
-			{
-				@mssql_free_result($result_id);
-				return $row['computed'];
-			}
-			@mssql_free_result($result_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[$query_id]))
-		{
-			unset($this->open_queries[$query_id]);
-			return @mssql_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_lower_text($column_name)
-	{
-		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		$error = array(
-			'message'	=> @mssql_get_last_message(),
-			'code'		=> ''
-		);
-
-		// Get error code number
-		$result_id = @mssql_query('SELECT @@ERROR as code', $this->db_connect_id);
-		if ($result_id)
-		{
-			$row = @mssql_fetch_assoc($result_id);
-			$error['code'] = $row['code'];
-			@mssql_free_result($result_id);
-		}
-
-		// Get full error message if possible
-		$sql = 'SELECT CAST(description as varchar(255)) as message
-			FROM master.dbo.sysmessages
-			WHERE error = ' . $error['code'];
-		$result_id = @mssql_query($sql);
-		
-		if ($result_id)
-		{
-			$row = @mssql_fetch_assoc($result_id);
-			if (!empty($row['message']))
-			{
-				$error['message'] .= '<br />' . $row['message'];
-			}
-			@mssql_free_result($result_id);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @mssql_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-				$html_table = false;
-				@mssql_query('SET SHOWPLAN_TEXT ON;', $this->db_connect_id);
-				if ($result = @mssql_query($query, $this->db_connect_id))
-				{
-					@mssql_next_result($result);
-					while ($row = @mssql_fetch_row($result))
-					{
-						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-					}
-				}
-				@mssql_query('SET SHOWPLAN_TEXT OFF;', $this->db_connect_id);
-				@mssql_free_result($result);
-
-				if ($html_table)
-				{
-					$this->html_hold .= '</table>';
-				}
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @mssql_query($query, $this->db_connect_id);
-				while ($void = @mssql_fetch_assoc($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@mssql_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
deleted file mode 100644
index 64fa9634d1..0000000000
--- a/phpBB/includes/db/mssql_odbc.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
-
-/**
-* Unified ODBC functions
-* Unified ODBC functions support any database having ODBC driver, for example Adabas D, IBM DB2, iODBC, Solid, Sybase SQL Anywhere...
-* Here we only support MSSQL Server 2000+ because of the provided schema
-*
-* @note number of bytes returned for returning data depends on odbc.defaultlrl php.ini setting.
-* If it is limited to 4K for example only 4K of data is returned max, resulting in incomplete theme data for example.
-* @note odbc.defaultbinmode may affect UTF8 characters
-*
-* @package dbal
-*/
-class dbal_mssql_odbc extends dbal
-{
-	var $last_query_text = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->dbname = $database;
-
-		$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
-		$this->server = $sqlserver . (($port) ? $port_delimiter . $port : '');
-
-		$max_size = @ini_get('odbc.defaultlrl');
-		if (!empty($max_size))
-		{
-			$unit = strtolower(substr($max_size, -1, 1));
-			$max_size = (int) $max_size;
-
-			if ($unit == 'k')
-			{
-				$max_size = floor($max_size / 1024);
-			}
-			else if ($unit == 'g')
-			{
-				$max_size *= 1024;
-			}
-			else if (is_numeric($unit))
-			{
-				$max_size = floor((int) ($max_size . $unit) / 1048576);
-			}
-			$max_size = max(8, $max_size) . 'M';
-
-			@ini_set('odbc.defaultlrl', $max_size);
-		}
-
-		$this->db_connect_id = ($this->persistency) ? @odbc_pconnect($this->server, $this->user, $sqlpassword) : @odbc_connect($this->server, $this->user, $sqlpassword);
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mssqlodbc_version')) === false)
-		{
-			$result_id = @odbc_exec($this->db_connect_id, "SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')");
-
-			$row = false;
-			if ($result_id)
-			{
-				$row = @odbc_fetch_array($result_id);
-				@odbc_free_result($result_id);
-			}
-
-			$this->sql_server_version = ($row) ? trim(implode(' ', $row)) : 0;
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('mssqlodbc_version', $this->sql_server_version);
-			}
-		}
-
-		if ($raw)
-		{
-			return $this->sql_server_version;
-		}
-
-		return ($this->sql_server_version) ? 'MSSQL (ODBC)<br />' . $this->sql_server_version : 'MSSQL (ODBC)';
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return $expr1 . ' + ' . $expr2;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @odbc_exec($this->db_connect_id, 'BEGIN TRANSACTION');
-			break;
-
-			case 'commit':
-				return @odbc_exec($this->db_connect_id, 'COMMIT TRANSACTION');
-			break;
-
-			case 'rollback':
-				return @odbc_exec($this->db_connect_id, 'ROLLBACK TRANSACTION');
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @odbc_exec($this->db_connect_id, $query)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG_EXTRA'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows)
-		if ($total)
-		{
-			// We need to grab the total number of rows + the offset number of rows to get the correct result
-			if (strpos($query, 'SELECT DISTINCT') === 0)
-			{
-				$query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15);
-			}
-			else
-			{
-				$query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6);
-			}
-		}
-
-		$result = $this->sql_query($query, $cache_ttl);
-
-		// Seek by $offset rows
-		if ($offset)
-		{
-			$this->sql_rowseek($offset, $result);
-		}
-
-		return $result;
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @odbc_num_rows($this->query_result) : false;
-	}
-
-	/**
-	* Fetch current row
-	* @note number of bytes returned depends on odbc.defaultlrl php.ini setting. If it is limited to 4K for example only 4K of data is returned max.
-	*/
-	function sql_fetchrow($query_id = false, $debug = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		return ($query_id !== false) ? @odbc_fetch_array($query_id) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$result_id = @odbc_exec($this->db_connect_id, 'SELECT @@IDENTITY');
-
-		if ($result_id)
-		{
-			if (@odbc_fetch_array($result_id))
-			{
-				$id = @odbc_result($result_id, 1);
-				@odbc_free_result($result_id);
-				return $id;
-			}
-			@odbc_free_result($result_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @odbc_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_lower_text($column_name)
-	{
-		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		return array(
-			'message'	=> @odbc_errormsg(),
-			'code'		=> @odbc_error()
-		);
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @odbc_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @odbc_exec($this->db_connect_id, $query);
-				while ($void = @odbc_fetch_array($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@odbc_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
deleted file mode 100644
index 1f37d54ecb..0000000000
--- a/phpBB/includes/db/mssqlnative.php
+++ /dev/null
@@ -1,644 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-* This is the MS SQL Server Native database abstraction layer.
-* PHP mssql native driver required.
-* @author Chris Pucci
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
-
-/**
- * Prior to version 1.1 the SQL Server Native PHP driver didn't support sqlsrv_num_rows, or cursor based seeking so we recall all rows into an array
- * and maintain our own cursor index into that array.
- */
-class result_mssqlnative
-{
-	public function result_mssqlnative($queryresult = false)
-	{
-		$this->m_cursor = 0;
-		$this->m_rows = array();
-		$this->m_num_fields = sqlsrv_num_fields($queryresult);
-		$this->m_field_meta = sqlsrv_field_metadata($queryresult);
-
-		while ($row = sqlsrv_fetch_array($queryresult, SQLSRV_FETCH_ASSOC))
-		{
-			if ($row !== null)
-			{
-				foreach($row as $k => $v)
-				{
-					if (is_object($v) && method_exists($v, 'format'))
-					{
-						$row[$k] = $v->format("Y-m-d\TH:i:s\Z");
-					}
-				}
-				$this->m_rows[] = $row;//read results into memory, cursors are not supported
-			}
-		}
-
-		$this->m_row_count = sizeof($this->m_rows);
-	}
-
-	private function array_to_obj($array, &$obj)
-	{
-		foreach ($array as $key => $value)
-		{
-			if (is_array($value))
-			{
-				$obj->$key = new stdClass();
-				array_to_obj($value, $obj->$key);
-			}
-			else
-			{
-				$obj->$key = $value;
-			}
-		}
-		return $obj;
-	}
-
-	public function fetch($mode = SQLSRV_FETCH_BOTH, $object_class = 'stdClass')
-	{
-		if ($this->m_cursor >= $this->m_row_count || $this->m_row_count == 0)
-		{
-			return false;
-		}
-
-		$ret = false;
-		$arr_num = array();
-
-		if ($mode == SQLSRV_FETCH_NUMERIC || $mode == SQLSRV_FETCH_BOTH)
-		{
-			foreach($this->m_rows[$this->m_cursor] as $key => $value)
-			{
-				$arr_num[] = $value;
-			}
-		}
-
-		switch ($mode)
-		{
-			case SQLSRV_FETCH_ASSOC:
-				$ret = $this->m_rows[$this->m_cursor];
-			break;
-			case SQLSRV_FETCH_NUMERIC:
-				$ret = $arr_num;
-			break;
-			case 'OBJECT':
-				$ret = $this->array_to_obj($this->m_rows[$this->m_cursor], $o = new $object_class);
-			break;
-			case SQLSRV_FETCH_BOTH:
-			default:
-				$ret = $this->m_rows[$this->m_cursor] + $arr_num;
-			break;
-		}
-		$this->m_cursor++;
-		return $ret;
-	}
-
-	public function get($pos, $fld)
-	{
-		return $this->m_rows[$pos][$fld];
-	}
-
-	public function num_rows()
-	{
-		return $this->m_row_count;
-	}
-
-	public function seek($iRow)
-	{
-		$this->m_cursor = min($iRow, $this->m_row_count);
-	}
-
-	public function num_fields()
-	{
-		return $this->m_num_fields;
-	}
-
-	public function field_name($nr)
-	{
-		$arr_keys = array_keys($this->m_rows[0]);
-		return $arr_keys[$nr];
-	}
-
-	public function field_type($nr)
-	{
-		$i = 0;
-		$int_type = -1;
-		$str_type = '';
-
-		foreach ($this->m_field_meta as $meta)
-		{
-			if ($nr == $i)
-			{
-				$int_type = $meta['Type'];
-				break;
-			}
-			$i++;
-		}
-
-		//http://msdn.microsoft.com/en-us/library/cc296183.aspx contains type table
-		switch ($int_type)
-		{
-			case SQLSRV_SQLTYPE_BIGINT: 		$str_type = 'bigint'; break;
-			case SQLSRV_SQLTYPE_BINARY: 		$str_type = 'binary'; break;
-			case SQLSRV_SQLTYPE_BIT: 			$str_type = 'bit'; break;
-			case SQLSRV_SQLTYPE_CHAR: 			$str_type = 'char'; break;
-			case SQLSRV_SQLTYPE_DATETIME: 		$str_type = 'datetime'; break;
-			case SQLSRV_SQLTYPE_DECIMAL/*($precision, $scale)*/: $str_type = 'decimal'; break;
-			case SQLSRV_SQLTYPE_FLOAT: 			$str_type = 'float'; break;
-			case SQLSRV_SQLTYPE_IMAGE: 			$str_type = 'image'; break;
-			case SQLSRV_SQLTYPE_INT: 			$str_type = 'int'; break;
-			case SQLSRV_SQLTYPE_MONEY: 			$str_type = 'money'; break;
-			case SQLSRV_SQLTYPE_NCHAR/*($charCount)*/: $str_type = 'nchar'; break;
-			case SQLSRV_SQLTYPE_NUMERIC/*($precision, $scale)*/: $str_type = 'numeric'; break;
-			case SQLSRV_SQLTYPE_NVARCHAR/*($charCount)*/: $str_type = 'nvarchar'; break;
-			case SQLSRV_SQLTYPE_NTEXT: 			$str_type = 'ntext'; break;
-			case SQLSRV_SQLTYPE_REAL: 			$str_type = 'real'; break;
-			case SQLSRV_SQLTYPE_SMALLDATETIME: 	$str_type = 'smalldatetime'; break;
-			case SQLSRV_SQLTYPE_SMALLINT: 		$str_type = 'smallint'; break;
-			case SQLSRV_SQLTYPE_SMALLMONEY: 	$str_type = 'smallmoney'; break;
-			case SQLSRV_SQLTYPE_TEXT: 			$str_type = 'text'; break;
-			case SQLSRV_SQLTYPE_TIMESTAMP: 		$str_type = 'timestamp'; break;
-			case SQLSRV_SQLTYPE_TINYINT: 		$str_type = 'tinyint'; break;
-			case SQLSRV_SQLTYPE_UNIQUEIDENTIFIER: $str_type = 'uniqueidentifier'; break;
-			case SQLSRV_SQLTYPE_UDT: 			$str_type = 'UDT'; break;
-			case SQLSRV_SQLTYPE_VARBINARY/*($byteCount)*/: $str_type = 'varbinary'; break;
-			case SQLSRV_SQLTYPE_VARCHAR/*($charCount)*/: $str_type = 'varchar'; break;
-			case SQLSRV_SQLTYPE_XML: 			$str_type = 'xml'; break;
-			default: $str_type = $int_type;
-		}
-		return $str_type;
-	}
-
-	public function free()
-	{
-		unset($this->m_rows);
-		return;
-	}
-}
-
-/**
-* @package dbal
-*/
-class dbal_mssqlnative extends dbal
-{
-	var $m_insert_id = NULL;
-	var $last_query_text = '';
-	var $query_options = array();
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		# Test for driver support, to avoid suppressed fatal error
-		if (!function_exists('sqlsrv_connect'))
-		{
-			trigger_error('Native MS SQL Server driver for PHP is missing or needs to be updated. Version 1.1 or later is required to install phpBB3. You can download the driver from: http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx\n', E_USER_ERROR);
-		}
-
-		//set up connection variables
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->dbname = $database;
-		$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
-		$this->server = $sqlserver . (($port) ? $port_delimiter . $port : '');
-
-		//connect to database
-		error_reporting(E_ALL);
-		$this->db_connect_id = sqlsrv_connect($this->server, array(
-			'Database' => $this->dbname,
-			'UID' => $this->user,
-			'PWD' => $sqlpassword
-		));
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mssql_version')) === false)
-		{
-			$arr_server_info = sqlsrv_server_info($this->db_connect_id);
-			$this->sql_server_version = $arr_server_info['SQLServerVersion'];
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('mssql_version', $this->sql_server_version);
-			}
-		}
-
-		if ($raw)
-		{
-			return $this->sql_server_version;
-		}
-
-		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return $expr1 . ' + ' . $expr2;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_buffer_nested_transactions()
-	{
-		return true;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return sqlsrv_begin_transaction($this->db_connect_id);
-			break;
-
-			case 'commit':
-				return sqlsrv_commit($this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return sqlsrv_rollback($this->db_connect_id);
-			break;
-		}
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @sqlsrv_query($this->db_connect_id, $query, array(), $this->query_options)) === false)
-				{
-					$this->sql_error($query);
-				}
-				// reset options for next query
-				$this->query_options = array();
-
-				if (defined('DEBUG_EXTRA'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// total == 0 means all results - not zero results
-		if ($offset == 0 && $total !== 0)
-		{
-			if (strpos($query, "SELECT") === false)
-			{
-				$query = "TOP {$total} " . $query;
-			}
-			else
-			{
-				$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP '.$total, $query);
-			}
-		}
-		else if ($offset > 0)
-		{
-			$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP(10000000) ', $query);
-			$query = 'SELECT *
-					FROM (SELECT sub2.*, ROW_NUMBER() OVER(ORDER BY sub2.line2) AS line3
-					FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3';
-
-			if ($total > 0)
-			{
-				$query .= ' WHERE line3 BETWEEN ' . ($offset+1) . ' AND ' . ($offset + $total);
-			}
-			else
-			{
-				$query .= ' WHERE line3 > ' . $offset;
-			}
-		}
-
-		$result = $this->sql_query($query, $cache_ttl);
-
-		return $result;
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return (!empty($this->query_result)) ? @sqlsrv_rows_affected($this->query_result) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$row = @sqlsrv_fetch_array($query_id, SQLSRV_FETCH_ASSOC);
-
-		if ($row)
-		{
-			foreach ($row as $key => $value)
-			{
-				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
-			}
-
-			// remove helper values from LIMIT queries
-			if (isset($row['line2']))
-			{
-				unset($row['line2'], $row['line3']);
-			}
-		}
-		return (sizeof($row)) ? $row : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$result_id = @sqlsrv_query($this->db_connect_id, 'SELECT @@IDENTITY');
-
-		if ($result_id !== false)
-		{
-			$row = @sqlsrv_fetch_array($result_id);
-			$id = $row[0];
-			@sqlsrv_free_stmt($result_id);
-			return $id;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[$query_id]))
-		{
-			unset($this->open_queries[$query_id]);
-			return @sqlsrv_free_stmt($query_id);
-		}
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_lower_text($column_name)
-	{
-		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		$errors = @sqlsrv_errors(SQLSRV_ERR_ERRORS);
-		$error_message = '';
-		$code = 0;
-
-		if ($errors != null)
-		{
-			foreach ($errors as $error)
-			{
-				$error_message .= "SQLSTATE: ".$error[ 'SQLSTATE']."\n";
-				$error_message .= "code: ".$error[ 'code']."\n";
-				$code = $error['code'];
-				$error_message .= "message: ".$error[ 'message']."\n";
-			}
-			$this->last_error_result = $error_message;
-			$error = $this->last_error_result;
-		}
-		else
-		{
-			$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
-		}
-
-		return array(
-			'message'	=> $error,
-			'code'		=> $code,
-		);
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @sqlsrv_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-				$html_table = false;
-				@sqlsrv_query($this->db_connect_id, 'SET SHOWPLAN_TEXT ON;');
-				if ($result = @sqlsrv_query($this->db_connect_id, $query))
-				{
-					@sqlsrv_next_result($result);
-					while ($row = @sqlsrv_fetch_array($result))
-					{
-						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-					}
-				}
-				@sqlsrv_query($this->db_connect_id, 'SET SHOWPLAN_TEXT OFF;');
-				@sqlsrv_free_stmt($result);
-
-				if ($html_table)
-				{
-					$this->html_hold .= '</table>';
-				}
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @sqlsrv_query($this->db_connect_id, $query);
-				while ($void = @sqlsrv_fetch_array($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@sqlsrv_free_stmt($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-
-	/**
-	* Utility method used to retrieve number of rows
-	* Emulates mysql_num_rows
-	* Used in acp_database.php -> write_data_mssqlnative()
-	* Requires a static or keyset cursor to be definde via
-	* mssqlnative_set_query_options()
-	*/
-	function mssqlnative_num_rows($res)
-	{
-		if ($res !== false)
-		{
-			return sqlsrv_num_rows($res);
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	* Allows setting mssqlnative specific query options passed to sqlsrv_query as 4th parameter.
-	*/
-	function mssqlnative_set_query_options($options)
-	{
-		$this->query_options = $options;
-	}
-}
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
deleted file mode 100644
index 8d1f805870..0000000000
--- a/phpBB/includes/db/mysql.php
+++ /dev/null
@@ -1,567 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
-
-/**
-* MySQL4 Database Abstraction Layer
-* Compatible with:
-* MySQL 3.23+
-* MySQL 4.0+
-* MySQL 4.1+
-* MySQL 5.0+
-* @package dbal
-*/
-class dbal_mysql extends dbal
-{
-	var $multi_insert = true;
-
-	/**
-	* Connect to server
-	* @access public
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->server = $sqlserver . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-
-		$this->sql_layer = 'mysql4';
-
-		$this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link);
-
-		if ($this->db_connect_id && $this->dbname != '')
-		{
-			if (@mysql_select_db($this->dbname, $this->db_connect_id))
-			{
-				// Determine what version we are using and if it natively supports UNICODE
-				if (version_compare($this->sql_server_info(true), '4.1.0', '>='))
-				{
-					@mysql_query("SET NAMES 'utf8'", $this->db_connect_id);
-
-					// enforce strict mode on databases that support it
-					if (version_compare($this->sql_server_info(true), '5.0.2', '>='))
-					{
-						$result = @mysql_query('SELECT @@session.sql_mode AS sql_mode', $this->db_connect_id);
-						$row = @mysql_fetch_assoc($result);
-						@mysql_free_result($result);
-						$modes = array_map('trim', explode(',', $row['sql_mode']));
-
-						// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
-						if (!in_array('TRADITIONAL', $modes))
-						{
-							if (!in_array('STRICT_ALL_TABLES', $modes))
-							{
-								$modes[] = 'STRICT_ALL_TABLES';
-							}
-
-							if (!in_array('STRICT_TRANS_TABLES', $modes))
-							{
-								$modes[] = 'STRICT_TRANS_TABLES';
-							}
-						}
-
-						$mode = implode(',', $modes);
-						@mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id);
-					}
-				}
-				else if (version_compare($this->sql_server_info(true), '4.0.0', '<'))
-				{
-					$this->sql_layer = 'mysql';
-				}
-
-				return $this->db_connect_id;
-			}
-		}
-
-		return $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mysql_version')) === false)
-		{
-			$result = @mysql_query('SELECT VERSION() AS version', $this->db_connect_id);
-			$row = @mysql_fetch_assoc($result);
-			@mysql_free_result($result);
-
-			$this->sql_server_version = $row['version'];
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('mysql_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'MySQL ' . $this->sql_server_version;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @mysql_query('BEGIN', $this->db_connect_id);
-			break;
-
-			case 'commit':
-				return @mysql_query('COMMIT', $this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @mysql_query('ROLLBACK', $this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @mysql_query($query, $this->db_connect_id)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG_EXTRA'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			// Having a value of -1 was always a bug
-			$total = '18446744073709551615';
-		}
-
-		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @mysql_affected_rows($this->db_connect_id) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		return ($query_id !== false) ? @mysql_fetch_assoc($query_id) : false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @mysql_data_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		return ($this->db_connect_id) ? @mysql_insert_id($this->db_connect_id) : false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @mysql_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		if (!$this->db_connect_id)
-		{
-			return @mysql_real_escape_string($msg);
-		}
-
-		return @mysql_real_escape_string($msg, $this->db_connect_id);
-	}
-
-	/**
-	* Gets the estimated number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Number of rows in $table_name.
-	*								Prefixed with ~ if estimated (otherwise exact).
-	*
-	* @access public
-	*/
-	function get_estimated_row_count($table_name)
-	{
-		$table_status = $this->get_table_status($table_name);
-
-		if (isset($table_status['Engine']))
-		{
-			if ($table_status['Engine'] === 'MyISAM')
-			{
-				return $table_status['Rows'];
-			}
-			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
-			{
-				return '~' . $table_status['Rows'];
-			}
-		}
-
-		return parent::get_row_count($table_name);
-	}
-
-	/**
-	* Gets the exact number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Exact number of rows in $table_name.
-	*
-	* @access public
-	*/
-	function get_row_count($table_name)
-	{
-		$table_status = $this->get_table_status($table_name);
-
-		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
-		{
-			return $table_status['Rows'];
-		}
-
-		return parent::get_row_count($table_name);
-	}
-
-	/**
-	* Gets some information about the specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return array
-	*
-	* @access protected
-	*/
-	function get_table_status($table_name)
-	{
-		$sql = "SHOW TABLE STATUS
-			LIKE '" . $this->sql_escape($table_name) . "'";
-		$result = $this->sql_query($sql);
-		$table_status = $this->sql_fetchrow($result);
-		$this->sql_freeresult($result);
-
-		return $table_status;
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		switch ($stage)
-		{
-			case 'FROM':
-				$data = '(' . $data . ')';
-			break;
-		}
-
-		return $data;
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		if (!$this->db_connect_id)
-		{
-			return array(
-				'message'	=> @mysql_error(),
-				'code'		=> @mysql_errno()
-			);
-		}
-
-		return array(
-			'message'	=> @mysql_error($this->db_connect_id),
-			'code'		=> @mysql_errno($this->db_connect_id)
-		);
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @mysql_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		static $test_prof;
-
-		// current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING
-		if ($test_prof === null)
-		{
-			$test_prof = false;
-			if (version_compare($this->sql_server_info(true), '5.0.37', '>=') && version_compare($this->sql_server_info(true), '5.1', '<'))
-			{
-				$test_prof = true;
-			}
-		}
-
-		switch ($mode)
-		{
-			case 'start':
-
-				$explain_query = $query;
-				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-
-				if (preg_match('/^SELECT/', $explain_query))
-				{
-					$html_table = false;
-
-					// begin profiling
-					if ($test_prof)
-					{
-						@mysql_query('SET profiling = 1;', $this->db_connect_id);
-					}
-
-					if ($result = @mysql_query("EXPLAIN $explain_query", $this->db_connect_id))
-					{
-						while ($row = @mysql_fetch_assoc($result))
-						{
-							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-						}
-					}
-					@mysql_free_result($result);
-
-					if ($html_table)
-					{
-						$this->html_hold .= '</table>';
-					}
-
-					if ($test_prof)
-					{
-						$html_table = false;
-
-						// get the last profile
-						if ($result = @mysql_query('SHOW PROFILE ALL;', $this->db_connect_id))
-						{
-							$this->html_hold .= '<br />';
-							while ($row = @mysql_fetch_assoc($result))
-							{
-								// make <unknown> HTML safe
-								if (!empty($row['Source_function']))
-								{
-									$row['Source_function'] = str_replace(array('<', '>'), array('&lt;', '&gt;'), $row['Source_function']);
-								}
-
-								// remove unsupported features
-								foreach ($row as $key => $val)
-								{
-									if ($val === null)
-									{
-										unset($row[$key]);
-									}
-								}
-								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-							}
-						}
-						@mysql_free_result($result);
-
-						if ($html_table)
-						{
-							$this->html_hold .= '</table>';
-						}
-
-						@mysql_query('SET profiling = 0;', $this->db_connect_id);
-					}
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @mysql_query($query, $this->db_connect_id);
-				while ($void = @mysql_fetch_assoc($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@mysql_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
deleted file mode 100644
index e07cd35e24..0000000000
--- a/phpBB/includes/db/mysqli.php
+++ /dev/null
@@ -1,568 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
-
-/**
-* MySQLi Database Abstraction Layer
-* mysqli-extension has to be compiled with:
-* MySQL 4.1+ or MySQL 5.0+
-* @package dbal
-*/
-class dbal_mysqli extends dbal
-{
-	var $multi_insert = true;
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		// Mysqli extension supports persistent connection since PHP 5.3.0
-		$this->persistency = (version_compare(PHP_VERSION, '5.3.0', '>=')) ? $persistency : false;
-		$this->user = $sqluser;
-
-		// If persistent connection, set dbhost to localhost when empty and prepend it with 'p:' prefix
-		$this->server = ($this->persistency) ? 'p:' . (($sqlserver) ? $sqlserver : 'localhost') : $sqlserver;
-
-		$this->dbname = $database;
-		$port = (!$port) ? NULL : $port;
-
-		// If port is set and it is not numeric, most likely mysqli socket is set.
-		// Try to map it to the $socket parameter.
-		$socket = NULL;
-		if ($port)
-		{
-			if (is_numeric($port))
-			{
-				$port = (int) $port;
-			}
-			else
-			{
-				$socket = $port;
-				$port = NULL;
-			}
-		}
-
-		$this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket);
-
-		if ($this->db_connect_id && $this->dbname != '')
-		{
-			@mysqli_query($this->db_connect_id, "SET NAMES 'utf8'");
-
-			// enforce strict mode on databases that support it
-			if (version_compare($this->sql_server_info(true), '5.0.2', '>='))
-			{
-				$result = @mysqli_query($this->db_connect_id, 'SELECT @@session.sql_mode AS sql_mode');
-				$row = @mysqli_fetch_assoc($result);
-				@mysqli_free_result($result);
-
-				$modes = array_map('trim', explode(',', $row['sql_mode']));
-
-				// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
-				if (!in_array('TRADITIONAL', $modes))
-				{
-					if (!in_array('STRICT_ALL_TABLES', $modes))
-					{
-						$modes[] = 'STRICT_ALL_TABLES';
-					}
-
-					if (!in_array('STRICT_TRANS_TABLES', $modes))
-					{
-						$modes[] = 'STRICT_TRANS_TABLES';
-					}
-				}
-
-				$mode = implode(',', $modes);
-				@mysqli_query($this->db_connect_id, "SET SESSION sql_mode='{$mode}'");
-			}
-			return $this->db_connect_id;
-		}
-
-		return $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mysqli_version')) === false)
-		{
-			$result = @mysqli_query($this->db_connect_id, 'SELECT VERSION() AS version');
-			$row = @mysqli_fetch_assoc($result);
-			@mysqli_free_result($result);
-
-			$this->sql_server_version = $row['version'];
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('mysqli_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'MySQL(i) ' . $this->sql_server_version;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @mysqli_autocommit($this->db_connect_id, false);
-			break;
-
-			case 'commit':
-				$result = @mysqli_commit($this->db_connect_id);
-				@mysqli_autocommit($this->db_connect_id, true);
-				return $result;
-			break;
-
-			case 'rollback':
-				$result = @mysqli_rollback($this->db_connect_id);
-				@mysqli_autocommit($this->db_connect_id, true);
-				return $result;
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @mysqli_query($this->db_connect_id, $query)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG_EXTRA'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
-				{
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
-				}
-			}
-			else if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			// MySQL 4.1+ no longer supports -1 in limit queries
-			$total = '18446744073709551615';
-		}
-
-		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @mysqli_affected_rows($this->db_connect_id) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		if ($query_id !== false)
-		{
-			$result = @mysqli_fetch_assoc($query_id);
-			return $result !== null ? $result : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @mysqli_data_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		return ($this->db_connect_id) ? @mysqli_insert_id($this->db_connect_id) : false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		return @mysqli_free_result($query_id);
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return @mysqli_real_escape_string($this->db_connect_id, $msg);
-	}
-
-	/**
-	* Gets the estimated number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Number of rows in $table_name.
-	*								Prefixed with ~ if estimated (otherwise exact).
-	*
-	* @access public
-	*/
-	function get_estimated_row_count($table_name)
-	{
-		$table_status = $this->get_table_status($table_name);
-
-		if (isset($table_status['Engine']))
-		{
-			if ($table_status['Engine'] === 'MyISAM')
-			{
-				return $table_status['Rows'];
-			}
-			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
-			{
-				return '~' . $table_status['Rows'];
-			}
-		}
-
-		return parent::get_row_count($table_name);
-	}
-
-	/**
-	* Gets the exact number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Exact number of rows in $table_name.
-	*
-	* @access public
-	*/
-	function get_row_count($table_name)
-	{
-		$table_status = $this->get_table_status($table_name);
-
-		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
-		{
-			return $table_status['Rows'];
-		}
-
-		return parent::get_row_count($table_name);
-	}
-
-	/**
-	* Gets some information about the specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return array
-	*
-	* @access protected
-	*/
-	function get_table_status($table_name)
-	{
-		$sql = "SHOW TABLE STATUS
-			LIKE '" . $this->sql_escape($table_name) . "'";
-		$result = $this->sql_query($sql);
-		$table_status = $this->sql_fetchrow($result);
-		$this->sql_freeresult($result);
-
-		return $table_status;
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		switch ($stage)
-		{
-			case 'FROM':
-				$data = '(' . $data . ')';
-			break;
-		}
-
-		return $data;
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		if (!$this->db_connect_id)
-		{
-			return array(
-				'message'	=> @mysqli_connect_error(),
-				'code'		=> @mysqli_connect_errno()
-			);
-		}
-
-		return array(
-			'message'	=> @mysqli_error($this->db_connect_id),
-			'code'		=> @mysqli_errno($this->db_connect_id)
-		);
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @mysqli_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		static $test_prof;
-
-		// current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING
-		if ($test_prof === null)
-		{
-			$test_prof = false;
-			if (strpos(mysqli_get_server_info($this->db_connect_id), 'community') !== false)
-			{
-				$ver = mysqli_get_server_version($this->db_connect_id);
-				if ($ver >= 50037 && $ver < 50100)
-				{
-					$test_prof = true;
-				}
-			}
-		}
-
-		switch ($mode)
-		{
-			case 'start':
-
-				$explain_query = $query;
-				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-
-				if (preg_match('/^SELECT/', $explain_query))
-				{
-					$html_table = false;
-
-					// begin profiling
-					if ($test_prof)
-					{
-						@mysqli_query($this->db_connect_id, 'SET profiling = 1;');
-					}
-
-					if ($result = @mysqli_query($this->db_connect_id, "EXPLAIN $explain_query"))
-					{
-						while ($row = @mysqli_fetch_assoc($result))
-						{
-							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-						}
-					}
-					@mysqli_free_result($result);
-
-					if ($html_table)
-					{
-						$this->html_hold .= '</table>';
-					}
-
-					if ($test_prof)
-					{
-						$html_table = false;
-
-						// get the last profile
-						if ($result = @mysqli_query($this->db_connect_id, 'SHOW PROFILE ALL;'))
-						{
-							$this->html_hold .= '<br />';
-							while ($row = @mysqli_fetch_assoc($result))
-							{
-								// make <unknown> HTML safe
-								if (!empty($row['Source_function']))
-								{
-									$row['Source_function'] = str_replace(array('<', '>'), array('&lt;', '&gt;'), $row['Source_function']);
-								}
-
-								// remove unsupported features
-								foreach ($row as $key => $val)
-								{
-									if ($val === null)
-									{
-										unset($row[$key]);
-									}
-								}
-								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-							}
-						}
-						@mysqli_free_result($result);
-
-						if ($html_table)
-						{
-							$this->html_hold .= '</table>';
-						}
-
-						@mysqli_query($this->db_connect_id, 'SET profiling = 0;');
-					}
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @mysqli_query($this->db_connect_id, $query);
-				while ($void = @mysqli_fetch_assoc($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@mysqli_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
deleted file mode 100644
index 2e801532f0..0000000000
--- a/phpBB/includes/db/oracle.php
+++ /dev/null
@@ -1,768 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
-
-/**
-* Oracle Database Abstraction Layer
-* @package dbal
-*/
-class dbal_oracle extends dbal
-{
-	var $last_query_text = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->server = $sqlserver . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-
-		$connect = $database;
-
-		// support for "easy connect naming"
-		if ($sqlserver !== '' && $sqlserver !== '/')
-		{
-			if (substr($sqlserver, -1, 1) == '/')
-			{
-				$sqlserver == substr($sqlserver, 0, -1);
-			}
-			$connect = $sqlserver . (($port) ? ':' . $port : '') . '/' . $database;
-		}
-
-		$this->db_connect_id = ($new_link) ? @ocinlogon($this->user, $sqlpassword, $connect, 'UTF8') : (($this->persistency) ? @ociplogon($this->user, $sqlpassword, $connect, 'UTF8') : @ocilogon($this->user, $sqlpassword, $connect, 'UTF8'));
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache forced to false for Oracle
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		/**
-		* force $use_cache false.  I didn't research why the caching code below is commented out
-		* but I assume its because the Oracle extension provides a direct method to access it
-		* without a query.
-		*/
-
-		$use_cache = false;
-/*
-		global $cache;
-
-		if (empty($cache) || ($this->sql_server_version = $cache->get('oracle_version')) === false)
-		{
-			$result = @ociparse($this->db_connect_id, 'SELECT * FROM v$version WHERE banner LIKE \'Oracle%\'');
-			@ociexecute($result, OCI_DEFAULT);
-			@ocicommit($this->db_connect_id);
-
-			$row = array();
-			@ocifetchinto($result, $row, OCI_ASSOC + OCI_RETURN_NULLS);
-			@ocifreestatement($result);
-			$this->sql_server_version = trim($row['BANNER']);
-
-			$cache->put('oracle_version', $this->sql_server_version);
-		}
-*/
-		$this->sql_server_version = @ociserverversion($this->db_connect_id);
-
-		return $this->sql_server_version;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return true;
-			break;
-
-			case 'commit':
-				return @ocicommit($this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @ocirollback($this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Oracle specific code to handle the fact that it does not compare columns properly
-	* @access private
-	*/
-	function _rewrite_col_compare($args)
-	{
-		if (sizeof($args) == 4)
-		{
-			if ($args[2] == '=')
-			{
-				return '(' . $args[0] . ' OR (' . $args[1] . ' is NULL AND ' . $args[3] . ' is NULL))';
-			}
-			else if ($args[2] == '<>')
-			{
-				// really just a fancy way of saying foo <> bar or (foo is NULL XOR bar is NULL) but SQL has no XOR :P
-				return '(' . $args[0] . ' OR ((' . $args[1] . ' is NULL AND ' . $args[3] . ' is NOT NULL) OR (' . $args[1] . ' is NOT NULL AND ' . $args[3] . ' is NULL)))';
-			}
-		}
-		else
-		{
-			return $this->_rewrite_where($args[0]);
-		}
-	}
-
-	/**
-	* Oracle specific code to handle it's lack of sanity
-	* @access private
-	*/
-	function _rewrite_where($where_clause)
-	{
-		preg_match_all('/\s*(AND|OR)?\s*([\w_.()]++)\s*(?:(=|<[=>]?|>=?|LIKE)\s*((?>\'(?>[^\']++|\'\')*+\'|[\d-.()]+))|((NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))/', $where_clause, $result, PREG_SET_ORDER);
-		$out = '';
-		foreach ($result as $val)
-		{
-			if (!isset($val[5]))
-			{
-				if ($val[4] !== "''")
-				{
-					$out .= $val[0];
-				}
-				else
-				{
-					$out .= ' ' . $val[1] . ' ' . $val[2];
-					if ($val[3] == '=')
-					{
-						$out .= ' is NULL';
-					}
-					else if ($val[3] == '<>')
-					{
-						$out .= ' is NOT NULL';
-					}
-				}
-			}
-			else
-			{
-				$in_clause = array();
-				$sub_exp = substr($val[5], strpos($val[5], '(') + 1, -1);
-				$extra = false;
-				preg_match_all('/\'(?>[^\']++|\'\')*+\'|[\d-.]++/', $sub_exp, $sub_vals, PREG_PATTERN_ORDER);
-				$i = 0;
-				foreach ($sub_vals[0] as $sub_val)
-				{
-					// two things:
-					// 1) This determines if an empty string was in the IN clausing, making us turn it into a NULL comparison
-					// 2) This fixes the 1000 list limit that Oracle has (ORA-01795)
-					if ($sub_val !== "''")
-					{
-						$in_clause[(int) $i++/1000][] = $sub_val;
-					}
-					else
-					{
-						$extra = true;
-					}
-				}
-				if (!$extra && $i < 1000)
-				{
-					$out .= $val[0];
-				}
-				else
-				{
-					$out .= ' ' . $val[1] . '(';
-					$in_array = array();
-
-					// constuct each IN() clause
-					foreach ($in_clause as $in_values)
-					{
-						$in_array[] = $val[2] . ' ' . (isset($val[6]) ? $val[6] : '') . 'IN(' . implode(', ', $in_values) . ')';
-					}
-
-					// Join the IN() clauses against a few ORs (IN is just a nicer OR anyway)
-					$out .= implode(' OR ', $in_array);
-
-					// handle the empty string case
-					if ($extra)
-					{
-						$out .= ' OR ' . $val[2] . ' is ' . (isset($val[6]) ? $val[6] : '') . 'NULL';
-					}
-					$out .= ')';
-
-					unset($in_array, $in_clause);
-				}
-			}
-		}
-
-		return $out;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				$in_transaction = false;
-				if (!$this->transaction)
-				{
-					$this->sql_transaction('begin');
-				}
-				else
-				{
-					$in_transaction = true;
-				}
-
-				$array = array();
-
-				// We overcome Oracle's 4000 char limit by binding vars
-				if (strlen($query) > 4000)
-				{
-					if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/sU', $query, $regs))
-					{
-						if (strlen($regs[3]) > 4000)
-						{
-							$cols = explode(', ', $regs[2]);
-
-							preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
-
-/*						The code inside this comment block breaks clob handling, but does allow the
-						database restore script to work.  If you want to allow no posts longer than 4KB
-						and/or need the db restore script, uncomment this.
-
-
-							if (sizeof($cols) !== sizeof($vals))
-							{
-								// Try to replace some common data we know is from our restore script or from other sources
-								$regs[3] = str_replace("'||chr(47)||'", '/', $regs[3]);
-								$_vals = explode(', ', $regs[3]);
-
-								$vals = array();
-								$is_in_val = false;
-								$i = 0;
-								$string = '';
-
-								foreach ($_vals as $value)
-								{
-									if (strpos($value, "'") === false && !$is_in_val)
-									{
-										$vals[$i++] = $value;
-										continue;
-									}
-
-									if (substr($value, -1) === "'")
-									{
-										$vals[$i] = $string . (($is_in_val) ? ', ' : '') . $value;
-										$string = '';
-										$is_in_val = false;
-
-										if ($vals[$i][0] !== "'")
-										{
-											$vals[$i] = "''" . $vals[$i];
-										}
-										$i++;
-										continue;
-									}
-									else
-									{
-										$string .= (($is_in_val) ? ', ' : '') . $value;
-										$is_in_val = true;
-									}
-								}
-
-								if ($string)
-								{
-									// New value if cols != value
-									$vals[(sizeof($cols) !== sizeof($vals)) ? $i : $i - 1] .= $string;
-								}
-
-								$vals = array(0 => $vals);
-							}
-*/
-
-							$inserts = $vals[0];
-							unset($vals);
-
-							foreach ($inserts as $key => $value)
-							{
-								if (!empty($value) && $value[0] === "'" && strlen($value) > 4002) // check to see if this thing is greater than the max + 'x2
-								{
-									$inserts[$key] = ':' . strtoupper($cols[$key]);
-									$array[$inserts[$key]] = str_replace("''", "'", substr($value, 1, -1));
-								}
-							}
-
-							$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
-						}
-					}
-					else if (preg_match_all('/^(UPDATE [\\w_]++\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data, PREG_SET_ORDER))
-					{
-						if (strlen($data[0][2]) > 4000)
-						{
-							$update = $data[0][1];
-							$where = $data[0][3];
-							preg_match_all('/([\\w_]++)\\s*=\\s*(\'(?:[^\']++|\'\')*+\'|[\d-.]++)/', $data[0][2], $temp, PREG_SET_ORDER);
-							unset($data);
-
-							$cols = array();
-							foreach ($temp as $value)
-							{
-								if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 4002) // check to see if this thing is greater than the max + 'x2
-								{
-									$cols[] = $value[1] . '=:' . strtoupper($value[1]);
-									$array[$value[1]] = str_replace("''", "'", substr($value[2], 1, -1));
-								}
-								else
-								{
-									$cols[] = $value[1] . '=' . $value[2];
-								}
-							}
-
-							$query = $update . implode(', ', $cols) . ' ' . $where;
-							unset($cols);
-						}
-					}
-				}
-
-				switch (substr($query, 0, 6))
-				{
-					case 'DELETE':
-						if (preg_match('/^(DELETE FROM [\w_]++ WHERE)((?:\s*(?:AND|OR)?\s*[\w_]+\s*(?:(?:=|<>)\s*(?>\'(?>[^\']++|\'\')*+\'|[\d-.]+)|(?:NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))*+)$/', $query, $regs))
-						{
-							$query = $regs[1] . $this->_rewrite_where($regs[2]);
-							unset($regs);
-						}
-					break;
-
-					case 'UPDATE':
-						if (preg_match('/^(UPDATE [\\w_]++\\s+SET [\\w_]+\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]++|:\w++)(?:, [\\w_]+\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]++|:\w++))*+\\s+WHERE)(.*)$/s',  $query, $regs))
-						{
-							$query = $regs[1] . $this->_rewrite_where($regs[2]);
-							unset($regs);
-						}
-					break;
-
-					case 'SELECT':
-						$query = preg_replace_callback('/([\w_.]++)\s*(?:(=|<>)\s*(?>\'(?>[^\']++|\'\')*+\'|[\d-.]++|([\w_.]++))|(?:NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]++,? ?)*+\))/', array($this, '_rewrite_col_compare'), $query);
-					break;
-				}
-
-				$this->query_result = @ociparse($this->db_connect_id, $query);
-
-				foreach ($array as $key => $value)
-				{
-					@ocibindbyname($this->query_result, $key, $array[$key], -1);
-				}
-
-				$success = @ociexecute($this->query_result, OCI_DEFAULT);
-
-				if (!$success)
-				{
-					$this->sql_error($query);
-					$this->query_result = false;
-				}
-				else
-				{
-					if (!$in_transaction)
-					{
-						$this->sql_transaction('commit');
-					}
-				}
-
-				if (defined('DEBUG_EXTRA'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		$query = 'SELECT * FROM (SELECT /*+ FIRST_ROWS */ rownum AS xrownum, a.* FROM (' . $query . ') a WHERE rownum <= ' . ($offset + $total) . ') WHERE xrownum >= ' . $offset;
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->query_result) ? @ocirowcount($this->query_result) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		if ($query_id !== false)
-		{
-			$row = array();
-			$result = @ocifetchinto($query_id, $row, OCI_ASSOC + OCI_RETURN_NULLS);
-
-			if (!$result || !$row)
-			{
-				return false;
-			}
-
-			$result_row = array();
-			foreach ($row as $key => $value)
-			{
-				// Oracle treats empty strings as null
-				if (is_null($value))
-				{
-					$value = '';
-				}
-
-				// OCI->CLOB?
-				if (is_object($value))
-				{
-					$value = $value->load();
-				}
-
-				$result_row[strtolower($key)] = $value;
-			}
-
-			return $result_row;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		// Reset internal pointer
-		@ociexecute($query_id, OCI_DEFAULT);
-
-		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
-		for ($i = 0; $i < $rownum; $i++)
-		{
-			if (!$this->sql_fetchrow($query_id))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$query_id = $this->query_result;
-
-		if ($query_id !== false && $this->last_query_text != '')
-		{
-			if (preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename))
-			{
-				$query = 'SELECT ' . $tablename[1] . '_seq.currval FROM DUAL';
-				$stmt = @ociparse($this->db_connect_id, $query);
-				@ociexecute($stmt, OCI_DEFAULT);
-
-				$temp_result = @ocifetchinto($stmt, $temp_array, OCI_ASSOC + OCI_RETURN_NULLS);
-				@ocifreestatement($stmt);
-
-				if ($temp_result)
-				{
-					return $temp_array['CURRVAL'];
-				}
-				else
-				{
-					return false;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @ocifreestatement($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	function _sql_bit_and($column_name, $bit, $compare = '')
-	{
-		return 'BITAND(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
-	}
-
-	function _sql_bit_or($column_name, $bit, $compare = '')
-	{
-		return 'BITOR(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		$error = @ocierror();
-		$error = (!$error) ? @ocierror($this->query_result) : $error;
-		$error = (!$error) ? @ocierror($this->db_connect_id) : $error;
-
-		if ($error)
-		{
-			$this->last_error_result = $error;
-		}
-		else
-		{
-			$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
-		}
-
-		return $error;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @ocilogoff($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-
-				$html_table = false;
-
-				// Grab a plan table, any will do
-				$sql = "SELECT table_name
-					FROM USER_TABLES
-					WHERE table_name LIKE '%PLAN_TABLE%'";
-				$stmt = ociparse($this->db_connect_id, $sql);
-				ociexecute($stmt);
-				$result = array();
-
-				if (ocifetchinto($stmt, $result, OCI_ASSOC + OCI_RETURN_NULLS))
-				{
-					$table = $result['TABLE_NAME'];
-
-					// This is the statement_id that will allow us to track the plan
-					$statement_id = substr(md5($query), 0, 30);
-
-					// Remove any stale plans
-					$stmt2 = ociparse($this->db_connect_id, "DELETE FROM $table WHERE statement_id='$statement_id'");
-					ociexecute($stmt2);
-					ocifreestatement($stmt2);
-
-					// Explain the plan
-					$sql = "EXPLAIN PLAN
-						SET STATEMENT_ID = '$statement_id'
-						FOR $query";
-					$stmt2 = ociparse($this->db_connect_id, $sql);
-					ociexecute($stmt2);
-					ocifreestatement($stmt2);
-
-					// Get the data from the plan
-					$sql = "SELECT operation, options, object_name, object_type, cardinality, cost
-						FROM plan_table
-						START WITH id = 0 AND statement_id = '$statement_id'
-						CONNECT BY PRIOR id = parent_id
-							AND statement_id = '$statement_id'";
-					$stmt2 = ociparse($this->db_connect_id, $sql);
-					ociexecute($stmt2);
-
-					$row = array();
-					while (ocifetchinto($stmt2, $row, OCI_ASSOC + OCI_RETURN_NULLS))
-					{
-						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-					}
-
-					ocifreestatement($stmt2);
-
-					// Remove the plan we just made, we delete them on request anyway
-					$stmt2 = ociparse($this->db_connect_id, "DELETE FROM $table WHERE statement_id='$statement_id'");
-					ociexecute($stmt2);
-					ocifreestatement($stmt2);
-				}
-
-				ocifreestatement($stmt);
-
-				if ($html_table)
-				{
-					$this->html_hold .= '</table>';
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @ociparse($this->db_connect_id, $query);
-				$success = @ociexecute($result, OCI_DEFAULT);
-				$row = array();
-
-				while (@ocifetchinto($result, $row, OCI_ASSOC + OCI_RETURN_NULLS))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@ocifreestatement($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
deleted file mode 100644
index bf22cffafa..0000000000
--- a/phpBB/includes/db/postgres.php
+++ /dev/null
@@ -1,498 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
-
-if (!class_exists('phpbb_error_collector'))
-{
-	include($phpbb_root_path . 'includes/error_collector.' . $phpEx);
-}
-
-/**
-* PostgreSQL Database Abstraction Layer
-* Minimum Requirement is Version 7.3+
-* @package dbal
-*/
-class dbal_postgres extends dbal
-{
-	var $last_query_text = '';
-	var $connect_error = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$connect_string = '';
-
-		if ($sqluser)
-		{
-			$connect_string .= "user=$sqluser ";
-		}
-
-		if ($sqlpassword)
-		{
-			$connect_string .= "password=$sqlpassword ";
-		}
-
-		if ($sqlserver)
-		{
-			// $sqlserver can carry a port separated by : for compatibility reasons
-			// If $sqlserver has more than one : it's probably an IPv6 address.
-			// In this case we only allow passing a port via the $port variable.
-			if (substr_count($sqlserver, ':') === 1)
-			{
-				list($sqlserver, $port) = explode(':', $sqlserver);
-			}
-
-			if ($sqlserver !== 'localhost')
-			{
-				$connect_string .= "host=$sqlserver ";
-			}
-
-			if ($port)
-			{
-				$connect_string .= "port=$port ";
-			}
-		}
-
-		$schema = '';
-
-		if ($database)
-		{
-			$this->dbname = $database;
-			if (strpos($database, '.') !== false)
-			{
-				list($database, $schema) = explode('.', $database);
-			}
-			$connect_string .= "dbname=$database";
-		}
-
-		$this->persistency = $persistency;
-
-		if ($this->persistency)
-		{
-			if (!function_exists('pg_pconnect'))
-			{
-				$this->connect_error = 'pg_pconnect function does not exist, is pgsql extension installed?';
-				return $this->sql_error('');
-			}
-			$collector = new phpbb_error_collector;
-			$collector->install();
-			$this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW);
-		}
-		else
-		{
-			if (!function_exists('pg_connect'))
-			{
-				$this->connect_error = 'pg_connect function does not exist, is pgsql extension installed?';
-				return $this->sql_error('');
-			}
-			$collector = new phpbb_error_collector;
-			$collector->install();
-			$this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW);
-		}
-
-		$collector->uninstall();
-
-		if ($this->db_connect_id)
-		{
-			if (version_compare($this->sql_server_info(true), '8.2', '>='))
-			{
-				$this->multi_insert = true;
-			}
-
-			if ($schema !== '')
-			{
-				@pg_query($this->db_connect_id, 'SET search_path TO ' . $schema);
-			}
-			return $this->db_connect_id;
-		}
-
-		$this->connect_error = $collector->format_errors();
-		return $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('pgsql_version')) === false)
-		{
-			$query_id = @pg_query($this->db_connect_id, 'SELECT VERSION() AS version');
-			$row = @pg_fetch_assoc($query_id, null);
-			@pg_free_result($query_id);
-
-			$this->sql_server_version = (!empty($row['version'])) ? trim(substr($row['version'], 10)) : 0;
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('pgsql_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'PostgreSQL ' . $this->sql_server_version;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @pg_query($this->db_connect_id, 'BEGIN');
-			break;
-
-			case 'commit':
-				return @pg_query($this->db_connect_id, 'COMMIT');
-			break;
-
-			case 'rollback':
-				return @pg_query($this->db_connect_id, 'ROLLBACK');
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @pg_query($this->db_connect_id, $query)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG_EXTRA'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			$total = 'ALL';
-		}
-
-		$query .= "\n LIMIT $total OFFSET $offset";
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->query_result) ? @pg_affected_rows($this->query_result) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		return ($query_id !== false) ? @pg_fetch_assoc($query_id, null) : false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @pg_result_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$query_id = $this->query_result;
-
-		if ($query_id !== false && $this->last_query_text != '')
-		{
-			if (preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text, $tablename))
-			{
-				$query = "SELECT currval('" . $tablename[1] . "_seq') AS last_value";
-				$temp_q_id = @pg_query($this->db_connect_id, $query);
-
-				if (!$temp_q_id)
-				{
-					return false;
-				}
-
-				$temp_result = @pg_fetch_assoc($temp_q_id, NULL);
-				@pg_free_result($query_id);
-
-				return ($temp_result) ? $temp_result['last_value'] : false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @pg_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	* Note: Do not use for bytea values if we may use them at a later stage
-	*/
-	function sql_escape($msg)
-	{
-		return @pg_escape_string($msg);
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	function cast_expr_to_bigint($expression)
-	{
-		return 'CAST(' . $expression . ' as DECIMAL(255, 0))';
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	function cast_expr_to_string($expression)
-	{
-		return 'CAST(' . $expression . ' as VARCHAR(255))';
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		// pg_last_error only works when there is an established connection.
-		// Connection errors have to be tracked by us manually.
-		if ($this->db_connect_id)
-		{
-			$message = @pg_last_error($this->db_connect_id);
-		}
-		else
-		{
-			$message = $this->connect_error;
-		}
-
-		return array(
-			'message'	=> $message,
-			'code'		=> ''
-		);
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @pg_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-
-				$explain_query = $query;
-				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-
-				if (preg_match('/^SELECT/', $explain_query))
-				{
-					$html_table = false;
-
-					if ($result = @pg_query($this->db_connect_id, "EXPLAIN $explain_query"))
-					{
-						while ($row = @pg_fetch_assoc($result, NULL))
-						{
-							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-						}
-					}
-					@pg_free_result($result);
-
-					if ($html_table)
-					{
-						$this->html_hold .= '</table>';
-					}
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @pg_query($this->db_connect_id, $query);
-				while ($void = @pg_fetch_assoc($result, NULL))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@pg_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
deleted file mode 100644
index 86bfa75a13..0000000000
--- a/phpBB/includes/db/sqlite.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
-
-/**
-* Sqlite Database Abstraction Layer
-* Minimum Requirement: 2.8.2+
-* @package dbal
-*/
-class dbal_sqlite extends dbal
-{
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->server = $sqlserver . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-
-		$error = '';
-		$this->db_connect_id = ($this->persistency) ? @sqlite_popen($this->server, 0666, $error) : @sqlite_open($this->server, 0666, $error);
-
-		if ($this->db_connect_id)
-		{
-			@sqlite_query('PRAGMA short_column_names = 1', $this->db_connect_id);
-//			@sqlite_query('PRAGMA encoding = "UTF-8"', $this->db_connect_id);
-		}
-
-		return ($this->db_connect_id) ? true : array('message' => $error);
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache if true, it is safe to retrieve the stored value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('sqlite_version')) === false)
-		{
-			$result = @sqlite_query('SELECT sqlite_version() AS version', $this->db_connect_id);
-			$row = @sqlite_fetch_array($result, SQLITE_ASSOC);
-
-			$this->sql_server_version = (!empty($row['version'])) ? $row['version'] : 0;
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('sqlite_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'SQLite ' . $this->sql_server_version;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @sqlite_query('BEGIN', $this->db_connect_id);
-			break;
-
-			case 'commit':
-				return @sqlite_query('COMMIT', $this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @sqlite_query('ROLLBACK', $this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @sqlite_query($query, $this->db_connect_id)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG_EXTRA'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG_EXTRA'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			$total = -1;
-		}
-
-		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @sqlite_changes($this->db_connect_id) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		return ($query_id !== false) ? @sqlite_fetch_array($query_id, SQLITE_ASSOC) : false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @sqlite_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		return ($this->db_connect_id) ? @sqlite_last_insert_rowid($this->db_connect_id) : false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if (isset($cache->sql_rowset[$query_id]))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		return true;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return @sqlite_escape_string($msg);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters
-	* For SQLite an underscore is a not-known character... this may change with SQLite3
-	*/
-	function sql_like_expression($expression)
-	{
-		// Unlike LIKE, GLOB is case sensitive (unfortunatly). SQLite users need to live with it!
-		// We only catch * and ? here, not the character map possible on file globbing.
-		$expression = str_replace(array(chr(0) . '_', chr(0) . '%'), array(chr(0) . '?', chr(0) . '*'), $expression);
-
-		$expression = str_replace(array('?', '*'), array("\?", "\*"), $expression);
-		$expression = str_replace(array(chr(0) . "\?", chr(0) . "\*"), array('?', '*'), $expression);
-
-		return 'GLOB \'' . $this->sql_escape($expression) . '\'';
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		return array(
-			'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
-			'code'		=> @sqlite_last_error($this->db_connect_id)
-		);
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @sqlite_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @sqlite_query($query, $this->db_connect_id);
-				while ($void = @sqlite_fetch_array($result, SQLITE_ASSOC))
-				{
-					// Take the time spent on parsing rows into account
-				}
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 537c19aff8..c3d1f58893 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -39,7 +39,7 @@ class phpbb_extension_manager
 	* @param phpbb_cache_driver_interface $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(dbal $db, $extension_table, $phpbb_root_path, $phpEx = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
+	public function __construct(phpbb_db_driver $db, $extension_table, $phpbb_root_path, $phpEx = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->db = $db;
@@ -432,7 +432,7 @@ class phpbb_extension_manager
 		}
 		return $disabled;
 	}
-	
+
 	/**
 	* Check to see if a given extension is available on the filesystem
 	*
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 46541acd44..413d8481b0 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -49,7 +49,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'firebird',
 			'MODULE'		=> 'interbase',
 			'DELIM'			=> ';;',
-			'DRIVER'		=> 'firebird',
+			'DRIVER'		=> 'phpbb_db_driver_firebird',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
 		),
@@ -58,7 +58,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mysql_41',
 			'MODULE'		=> 'mysqli',
 			'DELIM'			=> ';',
-			'DRIVER'		=> 'mysqli',
+			'DRIVER'		=> 'phpbb_db_driver_mysqli',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
 		),
@@ -67,7 +67,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mysql',
 			'MODULE'		=> 'mysql',
 			'DELIM'			=> ';',
-			'DRIVER'		=> 'mysql',
+			'DRIVER'		=> 'phpbb_db_driver_mysql',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
 		),
@@ -76,7 +76,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mssql',
 			'MODULE'		=> 'mssql',
 			'DELIM'			=> 'GO',
-			'DRIVER'		=> 'mssql',
+			'DRIVER'		=> 'phpbb_db_driver_mssql',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
 		),
@@ -85,7 +85,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mssql',
 			'MODULE'		=> 'odbc',
 			'DELIM'			=> 'GO',
-			'DRIVER'		=> 'mssql_odbc',
+			'DRIVER'		=> 'phpbb_db_driver_mssql_odbc',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
 		),
@@ -94,7 +94,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'mssql',
 			'MODULE'		=> 'sqlsrv',
 			'DELIM'			=> 'GO',
-			'DRIVER'		=> 'mssqlnative',
+			'DRIVER'		=> 'phpbb_db_driver_mssqlnative',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
 		),
@@ -103,7 +103,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'oracle',
 			'MODULE'		=> 'oci8',
 			'DELIM'			=> '/',
-			'DRIVER'		=> 'oracle',
+			'DRIVER'		=> 'phpbb_db_driver_oracle',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
 		),
@@ -112,7 +112,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'postgres',
 			'MODULE'		=> 'pgsql',
 			'DELIM'			=> ';',
-			'DRIVER'		=> 'postgres',
+			'DRIVER'		=> 'phpbb_db_driver_postgres',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> true,
 		),
@@ -121,7 +121,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'SCHEMA'		=> 'sqlite',
 			'MODULE'		=> 'sqlite',
 			'DELIM'			=> ';',
-			'DRIVER'		=> 'sqlite',
+			'DRIVER'		=> 'phpbb_db_driver_sqlite',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
 		),
@@ -229,26 +229,19 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
 
 	$dbms = $dbms_details['DRIVER'];
 
-	if ($load_dbal)
-	{
-		// Include the DB layer
-		include($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
-	}
-
 	// Instantiate it and set return on error true
-	$sql_db = 'dbal_' . $dbms;
-	$db = new $sql_db();
+	$db = new $dbms();
 	$db->sql_return_on_error(true);
 
 	// Check that we actually have a database name before going any further.....
-	if ($dbms_details['DRIVER'] != 'sqlite' && $dbms_details['DRIVER'] != 'oracle' && $dbname === '')
+	if ($dbms_details['DRIVER'] != 'phpbb_db_driver_sqlite' && $dbms_details['DRIVER'] != 'phpbb_db_driver_oracle' && $dbname === '')
 	{
 		$error[] = $lang['INST_ERR_DB_NO_NAME'];
 		return false;
 	}
 
 	// Make sure we don't have a daft user who thinks having the SQLite database in the forum directory is a good idea
-	if ($dbms_details['DRIVER'] == 'sqlite' && stripos(phpbb_realpath($dbhost), phpbb_realpath('../')) === 0)
+	if ($dbms_details['DRIVER'] == 'phpbb_db_driver_sqlite' && stripos(phpbb_realpath($dbhost), phpbb_realpath('../')) === 0)
 	{
 		$error[] = $lang['INST_ERR_DB_FORUM_PATH'];
 		return false;
@@ -257,8 +250,8 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
 	// Check the prefix length to ensure that index names are not too long and does not contain invalid characters
 	switch ($dbms_details['DRIVER'])
 	{
-		case 'mysql':
-		case 'mysqli':
+		case 'phpbb_db_driver_mysql':
+		case 'phpbb_db_driver_mysqli':
 			if (strspn($table_prefix, '-./\\') !== 0)
 			{
 				$error[] = $lang['INST_ERR_PREFIX_INVALID'];
@@ -267,22 +260,22 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
 
 		// no break;
 
-		case 'postgres':
+		case 'phpbb_db_driver_postgres':
 			$prefix_length = 36;
 		break;
 
-		case 'mssql':
-		case 'mssql_odbc':
-		case 'mssqlnative':
+		case 'phpbb_db_driver_mssql':
+		case 'phpbb_db_driver_mssql_odbc':
+		case 'phpbb_db_driver_mssqlnative':
 			$prefix_length = 90;
 		break;
 
-		case 'sqlite':
+		case 'phpbb_db_driver_sqlite':
 			$prefix_length = 200;
 		break;
 
-		case 'firebird':
-		case 'oracle':
+		case 'phpbb_db_driver_firebird':
+		case 'phpbb_db_driver_oracle':
 			$prefix_length = 6;
 		break;
 	}
@@ -320,21 +313,21 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
 		// Make sure that the user has selected a sensible DBAL for the DBMS actually installed
 		switch ($dbms_details['DRIVER'])
 		{
-			case 'mysqli':
+			case 'phpbb_db_driver_mysqli':
 				if (version_compare(mysqli_get_server_info($db->db_connect_id), '4.1.3', '<'))
 				{
 					$error[] = $lang['INST_ERR_DB_NO_MYSQLI'];
 				}
 			break;
 
-			case 'sqlite':
+			case 'phpbb_db_driver_sqlite':
 				if (version_compare(sqlite_libversion(), '2.8.2', '<'))
 				{
 					$error[] = $lang['INST_ERR_DB_NO_SQLITE'];
 				}
 			break;
 
-			case 'firebird':
+			case 'phpbb_db_driver_firebird':
 				// check the version of FB, use some hackery if we can't get access to the server info
 				if ($db->service_handle !== false && function_exists('ibase_server_info'))
 				{
@@ -415,7 +408,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
 				}
 			break;
 
-			case 'oracle':
+			case 'phpbb_db_driver_oracle':
 				if ($unicode_check)
 				{
 					$sql = "SELECT *
@@ -437,7 +430,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
 				}
 			break;
 
-			case 'postgres':
+			case 'phpbb_db_driver_postgres':
 				if ($unicode_check)
 				{
 					$sql = "SHOW server_encoding;";
-- 
cgit v1.2.1


From 65bafb22810038fd51e22fd8168775afd86c2e74 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 18:08:40 +0200
Subject: [ticket/11015] Add BC files for the drivers

PHPBB3-11015
---
 phpBB/includes/db/firebird.php    | 19 +++++++++++++++++++
 phpBB/includes/db/mssql.php       | 19 +++++++++++++++++++
 phpBB/includes/db/mssql_odbc.php  | 19 +++++++++++++++++++
 phpBB/includes/db/mssqlnative.php | 19 +++++++++++++++++++
 phpBB/includes/db/mysql.php       | 19 +++++++++++++++++++
 phpBB/includes/db/mysqli.php      | 19 +++++++++++++++++++
 phpBB/includes/db/oracle.php      | 19 +++++++++++++++++++
 phpBB/includes/db/postgres.php    | 19 +++++++++++++++++++
 phpBB/includes/db/sqlite.php      | 19 +++++++++++++++++++
 9 files changed, 171 insertions(+)
 create mode 100644 phpBB/includes/db/firebird.php
 create mode 100644 phpBB/includes/db/mssql.php
 create mode 100644 phpBB/includes/db/mssql_odbc.php
 create mode 100644 phpBB/includes/db/mssqlnative.php
 create mode 100644 phpBB/includes/db/mysql.php
 create mode 100644 phpBB/includes/db/mysqli.php
 create mode 100644 phpBB/includes/db/oracle.php
 create mode 100644 phpBB/includes/db/postgres.php
 create mode 100644 phpBB/includes/db/sqlite.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
new file mode 100644
index 0000000000..33f4e2ea48
--- /dev/null
+++ b/phpBB/includes/db/firebird.php
@@ -0,0 +1,19 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class dbal_firebird extends phpbb_db_driver_firebird {
+}
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
new file mode 100644
index 0000000000..a0c3917fcb
--- /dev/null
+++ b/phpBB/includes/db/mssql.php
@@ -0,0 +1,19 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class dbal_mssql extends phpbb_db_driver_mssql {
+}
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
new file mode 100644
index 0000000000..2a642b30f5
--- /dev/null
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -0,0 +1,19 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+    exit;
+}
+
+class dbal_mssql_odbc extends phpbb_db_driver_mssql_odbc {
+}
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
new file mode 100644
index 0000000000..cfbdba66fe
--- /dev/null
+++ b/phpBB/includes/db/mssqlnative.php
@@ -0,0 +1,19 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+    exit;
+}
+
+class dbal_mssqlnative extends phpbb_db_driver_mssqlnative {
+}
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
new file mode 100644
index 0000000000..dcd69cf51a
--- /dev/null
+++ b/phpBB/includes/db/mysql.php
@@ -0,0 +1,19 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class dbal_mysql extends phpbb_db_driver_mysql {
+}
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
new file mode 100644
index 0000000000..040f5adf43
--- /dev/null
+++ b/phpBB/includes/db/mysqli.php
@@ -0,0 +1,19 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+    exit;
+}
+
+class dbal_mysqli extends phpbb_db_driver_mysqli {
+}
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
new file mode 100644
index 0000000000..fb1484aeb0
--- /dev/null
+++ b/phpBB/includes/db/oracle.php
@@ -0,0 +1,19 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+    exit;
+}
+
+class dbal_oracle extends phpbb_db_driver_oracle {
+}
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
new file mode 100644
index 0000000000..dc5e95ac57
--- /dev/null
+++ b/phpBB/includes/db/postgres.php
@@ -0,0 +1,19 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+    exit;
+}
+
+class dbal_postgres extends phpbb_db_driver_postgres {
+}
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
new file mode 100644
index 0000000000..e4396bc97f
--- /dev/null
+++ b/phpBB/includes/db/sqlite.php
@@ -0,0 +1,19 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+    exit;
+}
+
+class dbal_sqlite extends phpbb_db_driver_sqlite {
+}
-- 
cgit v1.2.1


From cb102c695408a3ef82146aa834b441adc8564f51 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 18:24:24 +0200
Subject: [ticket/11015] Correctly set sql_layer in driver base class

PHPBB3-11015
---
 phpBB/includes/db/driver/driver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php
index 39211a5af4..9692ee71b9 100644
--- a/phpBB/includes/db/driver/driver.php
+++ b/phpBB/includes/db/driver/driver.php
@@ -82,7 +82,7 @@ class phpbb_db_driver
 
         // Fill default sql layer based on the class being called.
         // This can be changed by the specified layer itself later if needed.
-        $this->sql_layer = substr(get_class($this), 5);
+        $this->sql_layer = substr(get_class($this), strlen('phpbb_db_driver_'));
 
         // Do not change this please! This variable is used to easy the use of it - and is hardcoded.
         $this->any_char = chr(0) . '%';
-- 
cgit v1.2.1


From c34ca32795f29c944c840f8282c025e4b322c891 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 19:35:45 +0200
Subject: [ticket/11015] Fix db connection type hint in lock_db

PHPBB3-11015
---
 phpBB/includes/lock/db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/lock/db.php b/phpBB/includes/lock/db.php
index fa559d6887..40690144b1 100644
--- a/phpBB/includes/lock/db.php
+++ b/phpBB/includes/lock/db.php
@@ -61,7 +61,7 @@ class phpbb_lock_db
 	* @param	array	$config			The phpBB configuration
 	* @param	dbal	$db				A database connection
 	*/
-	public function __construct($config_name, phpbb_config $config, dbal $db)
+	public function __construct($config_name, phpbb_config $config, phpbb_db_driver $db)
 	{
 		$this->config_name = $config_name;
 		$this->config = $config;
-- 
cgit v1.2.1


From cf651ef81d611865a06d93c9db7c4dfcd680405c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 17 Mar 2012 23:50:28 +0100
Subject: [ticket/10714] Implement a class to add logs to the database.

PHPBB3-10714
---
 phpBB/includes/log/interface.php |  55 ++++++++++++
 phpBB/includes/log/log.php       | 177 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 232 insertions(+)
 create mode 100644 phpBB/includes/log/interface.php
 create mode 100644 phpBB/includes/log/log.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/interface.php b/phpBB/includes/log/interface.php
new file mode 100644
index 0000000000..897b8a8211
--- /dev/null
+++ b/phpBB/includes/log/interface.php
@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* @package phpbb_log
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* The interface for the log-system.
+*
+* @package phpbb_log
+*/
+interface phpbb_log_interface
+{
+	/**
+	* This function returns the state of the log-system.
+	*
+	* @return	bool	True if log is enabled
+	*/
+	public function is_enabled();
+
+	/**
+	* This function allows disable the log-system. When add_log is called, the log will not be added to the database.
+	*/
+	public function disable();
+
+	/**
+	* This function allows re-enable the log-system.
+	*/
+	public function enable();
+
+	/**
+	* Adds a log to the database
+	*
+	* @param	string	$mode				The mode defines which log_type is used and in which log the entry is displayed.
+	* @param	int		$user_id			User ID of the user
+	* @param	string	$log_ip				IP address of the user
+	* @param	string	$log_operation		Name of the operation
+	* @param	int		$log_time			Timestamp when the log was added.
+	* @param	array	$additional_data	More arguments can be added, depending on the log_type
+	*
+	* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
+	*/
+	public function add($mode, $user_id, $log_ip, $log_operation, $log_time, $additional_data);
+}
diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
new file mode 100644
index 0000000000..89dc22593e
--- /dev/null
+++ b/phpBB/includes/log/log.php
@@ -0,0 +1,177 @@
+<?php
+/**
+*
+* @package phpbb_log
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* This class is used to add entries into the log table.
+*
+* @package phpbb_log
+*/
+class phpbb_log implements phpbb_log_interface
+{
+	/**
+	* Keeps the status of the log-system. Is the log enabled or disabled?
+	*/
+	private $enabled;
+
+	/**
+	* The table we use to store our logs.
+	*/
+	private $log_table;
+
+	/**
+	* Constructor
+	*/
+	public function __construct($log_table)
+	{
+		$this->log_table = $log_table;
+		$this->enable();
+	}
+
+	/**
+	* This function returns the state of the log-system.
+	*
+	* @return	bool	True if log is enabled
+	*/
+	public function is_enabled()
+	{
+		return $this->enabled;
+	}
+
+	/**
+	* This function allows disable the log-system. When add_log is called, the log will not be added to the database.
+	*/
+	public function disable()
+	{
+		$this->enabled = false;
+	}
+
+	/**
+	* This function allows re-enable the log-system.
+	*/
+	public function enable()
+	{
+		$this->enabled = true;
+	}
+
+	/**
+	* Adds a log to the database
+	*
+	* @param	string	$mode				The mode defines which log_type is used and in which log the entry is displayed.
+	* @param	int		$user_id			User ID of the user
+	* @param	string	$log_ip				IP address of the user
+	* @param	string	$log_operation		Name of the operation
+	* @param	int		$log_time			Timestamp when the log was added.
+	* @param	array	$additional_data	More arguments can be added, depending on the log_type
+	*
+	* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
+	*/
+	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array())
+	{
+		if (!$this->is_enabled())
+		{
+			return false;
+		}
+
+		global $db;
+		/**
+		* @todo: enable when events are merged
+		*
+		global $db, $phpbb_dispatcher;
+		*/
+
+		if ($log_time == false)
+		{
+			$log_time = time();
+		}
+
+		$sql_ary = array(
+			'user_id'		=> $user_id,
+			'log_ip'		=> $log_ip,
+			'log_time'		=> $log_time,
+			'log_operation'	=> $log_operation,
+		);
+
+		switch ($mode)
+		{
+			case 'admin':
+				$sql_ary += array(
+					'log_type'		=> LOG_ADMIN,
+					'log_data'		=> (!sizeof($additional_data)) ? '' : serialize($additional_data),
+				);
+			break;
+
+			case 'mod':
+				$sql_ary += array(
+					'log_type'		=> LOG_MOD,
+					'forum_id'		=> intval(array_shift($additional_data)),
+					'topic_id'		=> intval(array_shift($additional_data)),
+					'log_data'		=> (!sizeof($additional_data)) ? '' : serialize($additional_data),
+				);
+			break;
+
+			case 'user':
+				$sql_ary += array(
+					'log_type'		=> LOG_USERS,
+					'reportee_id'	=> intval(array_shift($additional_data)),
+					'log_data'		=> (!sizeof($additional_data)) ? '' : serialize($additional_data),
+				);
+			break;
+
+			case 'critical':
+				$sql_ary += array(
+					'log_type'		=> LOG_CRITICAL,
+					'log_data'		=> (!sizeof($additional_data)) ? '' : serialize($additional_data),
+				);
+			break;
+
+			default:
+				/**
+				* @todo: enable when events are merged
+				*
+				if ($phpbb_dispatcher != null)
+				{
+					$vars = array('mode', 'user_id', 'log_ip', 'log_time', 'additional_data', 'sql_ary');
+					$event = new phpbb_event_data(compact($vars));
+					$phpbb_dispatcher->dispatch('core.add_log_case', $event);
+					extract($event->get_data_filtered($vars));
+				}
+				*/
+
+				// We didn't find a log_type, so we don't save it in the database.
+				if (!isset($sql_ary['log_type']))
+				{
+					return false;
+				}
+		}
+
+		/**
+		* @todo: enable when events are merged
+		*
+		if ($phpbb_dispatcher != null)
+		{
+			$vars = array('mode', 'user_id', 'log_ip', 'log_time', 'additional_data', 'sql_ary');
+			$event = new phpbb_event_data(compact($vars));
+			$phpbb_dispatcher->dispatch('core.add_log', $event);
+			extract($event->get_data_filtered($vars));
+		}
+		*/
+
+		$db->sql_query('INSERT INTO ' . $this->log_table . ' ' . $db->sql_build_array('INSERT', $sql_ary));
+
+		return $db->sql_nextid();
+	}
+}
-- 
cgit v1.2.1


From 3fbac076ceb4773aa3c985d24eeaf306aa0b6a42 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 17 Mar 2012 23:52:01 +0100
Subject: [ticket/10714] Use new phpbb_log class in add_log function

PHPBB3-10714
---
 phpBB/includes/functions.php | 89 ++++++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 40 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index ecec1e5e4a..9a1485f37a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3357,65 +3357,74 @@ function parse_cfg_file($filename, $lines = false)
 */
 function add_log()
 {
-	global $db, $user;
+	// This is all just an ugly hack to add "Dependency Injection" to a function
+	// the only real code is the function call which maps this function to a method.
+	static $static_log = null;
+
+	$args = func_get_args();
+	$log = (isset($args[0])) ? $args[0] : false;
 
-	// In phpBB 3.1.x i want to have logging in a class to be able to control it
-	// For now, we need a quite hakish approach to circumvent logging for some actions
-	// @todo implement cleanly
-	if (!empty($GLOBALS['skip_add_log']))
+	if ($log instanceof phpbb_log_interface)
+	{
+		$static_log = $log;
+		return true;
+	}
+	else if ($log === false)
 	{
 		return false;
 	}
 
-	$args = func_get_args();
+	$tmp_log = $static_log;
 
-	$mode			= array_shift($args);
-	$reportee_id	= ($mode == 'user') ? intval(array_shift($args)) : '';
-	$forum_id		= ($mode == 'mod') ? intval(array_shift($args)) : '';
-	$topic_id		= ($mode == 'mod') ? intval(array_shift($args)) : '';
-	$action			= array_shift($args);
-	$data			= (!sizeof($args)) ? '' : serialize($args);
-
-	$sql_ary = array(
-		'user_id'		=> (empty($user->data)) ? ANONYMOUS : $user->data['user_id'],
-		'log_ip'		=> $user->ip,
-		'log_time'		=> time(),
-		'log_operation'	=> $action,
-		'log_data'		=> $data,
-	);
+	// no log class set, create a temporary one ourselves to keep backwards compatability
+	if ($tmp_log === null)
+	{
+		$tmp_log = new phpbb_log(LOG_TABLE);
+	}
+
+	$mode = array_shift($args);
 
+	// This looks kind of dirty, but add_log has some additional data before the log_operation
+	$additional_data = array();
 	switch ($mode)
 	{
 		case 'admin':
-			$sql_ary['log_type'] = LOG_ADMIN;
+		case 'critical':
 		break;
-
 		case 'mod':
-			$sql_ary += array(
-				'log_type'	=> LOG_MOD,
-				'forum_id'	=> $forum_id,
-				'topic_id'	=> $topic_id
-			);
+			// forum_id
+			$additional_data[] = array_shift($args);
+			// topic_id
+			$additional_data[] = array_shift($args);
 		break;
-
 		case 'user':
-			$sql_ary += array(
-				'log_type'		=> LOG_USERS,
-				'reportee_id'	=> $reportee_id
-			);
+			// reportee_id
+			$additional_data[] = array_shift($args);
 		break;
-
-		case 'critical':
-			$sql_ary['log_type'] = LOG_CRITICAL;
-		break;
-
 		default:
-			return false;
+			/**
+			* @todo: enable when events are merged
+			*
+			global $phpbb_dispatcher;
+
+			if ($phpbb_dispatcher != null)
+			{
+				$vars = array('mode', 'args', 'additional_data');
+				$event = new phpbb_event_data(compact($vars));
+				$phpbb_dispatcher->dispatch('core.function_add_log', $event);
+				extract($event->get_data_filtered($vars));
+			}
+			*/
 	}
+	$log_operation = array_shift($args);
+	$additional_data = array_merge($additional_data, $args);
+
+	global $user;
 
-	$db->sql_query('INSERT INTO ' . LOG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
+	$user_id = (empty($user->data)) ? ANONYMOUS : $user->data['user_id'];
+	$user_ip = (empty($user->ip)) ? '' : $user->ip;
 
-	return $db->sql_nextid();
+	return $tmp_log->add($mode, $user_id, $user_ip, $log_operation, time(), $additional_data);
 }
 
 /**
-- 
cgit v1.2.1


From 34ce2561a0242c9066702e5fa9c92d0a6c77c2d2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 17 Mar 2012 23:52:47 +0100
Subject: [ticket/10714] Remove the dirty global hack to disable the log.

PHPBB3-10714
---
 phpBB/includes/functions_user.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 9e33a5122e..4074eaa2f2 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -299,8 +299,10 @@ function user_add($user_row, $cp_data = false)
 
 		if ($add_group_id)
 		{
-			// Because these actions only fill the log unneccessarily we skip the add_log() entry with a little hack. :/
-			$GLOBALS['skip_add_log'] = true;
+			global $phpbb_log;
+
+			// Because these actions only fill the log unneccessarily we skip the add_log() entry.
+			$phpbb_log->disable();
 
 			// Add user to "newly registered users" group and set to default group if admin specified so.
 			if ($config['new_member_group_default'])
@@ -313,7 +315,7 @@ function user_add($user_row, $cp_data = false)
 				group_user_add($add_group_id, $user_id);
 			}
 
-			unset($GLOBALS['skip_add_log']);
+			$phpbb_log->enable();
 		}
 	}
 
-- 
cgit v1.2.1


From 1539ad7ebe1493e4c486181f65976c93dbb95c29 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 18 Mar 2012 13:42:08 +0100
Subject: [ticket/10714] Add @return null to doc blocks

PHPBB3-10714
---
 phpBB/includes/log/interface.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/interface.php b/phpBB/includes/log/interface.php
index 897b8a8211..7eda4b9710 100644
--- a/phpBB/includes/log/interface.php
+++ b/phpBB/includes/log/interface.php
@@ -31,11 +31,15 @@ interface phpbb_log_interface
 
 	/**
 	* This function allows disable the log-system. When add_log is called, the log will not be added to the database.
+	*
+	* @return	null
 	*/
 	public function disable();
 
 	/**
 	* This function allows re-enable the log-system.
+	*
+	* @return	null
 	*/
 	public function enable();
 
-- 
cgit v1.2.1


From cff15ec307d76b004b6a825fb51b5dd3c8da58f2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 18 Mar 2012 13:47:24 +0100
Subject: [ticket/10714] Use keys for the log data instead of requiring a
 special order

PHPBB3-10714
---
 phpBB/includes/functions.php |  9 +++------
 phpBB/includes/log/log.php   | 13 ++++++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9a1485f37a..3e3d796ba2 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3392,14 +3392,11 @@ function add_log()
 		case 'critical':
 		break;
 		case 'mod':
-			// forum_id
-			$additional_data[] = array_shift($args);
-			// topic_id
-			$additional_data[] = array_shift($args);
+			$additional_data['forum_id'] = array_shift($args);
+			$additional_data['topic_id'] = array_shift($args);
 		break;
 		case 'user':
-			// reportee_id
-			$additional_data[] = array_shift($args);
+			$additional_data['reportee_id'] = array_shift($args);
 		break;
 		default:
 			/**
diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 89dc22593e..2523b97dbe 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -115,18 +115,25 @@ class phpbb_log implements phpbb_log_interface
 			break;
 
 			case 'mod':
+				$forum_id = (int) $additional_data['forum_id'];
+				unset($additional_data['forum_id']);
+				$topic_id = (int) $additional_data['topic_id'];
+				unset($additional_data['topic_id']);
 				$sql_ary += array(
 					'log_type'		=> LOG_MOD,
-					'forum_id'		=> intval(array_shift($additional_data)),
-					'topic_id'		=> intval(array_shift($additional_data)),
+					'forum_id'		=> $forum_id,
+					'topic_id'		=> $topic_id,
 					'log_data'		=> (!sizeof($additional_data)) ? '' : serialize($additional_data),
 				);
 			break;
 
 			case 'user':
+				$reportee_id = (int) $additional_data['reportee_id'];
+				unset($additional_data['reportee_id']);
+
 				$sql_ary += array(
 					'log_type'		=> LOG_USERS,
-					'reportee_id'	=> intval(array_shift($additional_data)),
+					'reportee_id'	=> $reportee_id,
 					'log_data'		=> (!sizeof($additional_data)) ? '' : serialize($additional_data),
 				);
 			break;
-- 
cgit v1.2.1


From b9b08cf765d7feb2865477bb82ab58e8cfb0c156 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 18 Mar 2012 13:54:33 +0100
Subject: [ticket/10714] Add return null to phpbb_log and add param to
 constructor

PHPBB3-10714
---
 phpBB/includes/log/log.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 2523b97dbe..67336d232a 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -34,6 +34,8 @@ class phpbb_log implements phpbb_log_interface
 
 	/**
 	* Constructor
+	*
+	* @param	string	$log_table		The table we use to store our logs
 	*/
 	public function __construct($log_table)
 	{
@@ -53,6 +55,8 @@ class phpbb_log implements phpbb_log_interface
 
 	/**
 	* This function allows disable the log-system. When add_log is called, the log will not be added to the database.
+	*
+	* @return	null
 	*/
 	public function disable()
 	{
@@ -61,6 +65,8 @@ class phpbb_log implements phpbb_log_interface
 
 	/**
 	* This function allows re-enable the log-system.
+	*
+	* @return	null
 	*/
 	public function enable()
 	{
-- 
cgit v1.2.1


From 61cbabb120dfca6d924fbb08645f6dfbbcc5c1ec Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 18 Mar 2012 13:59:32 +0100
Subject: [ticket/10714] Add missing log_operation to events in phpbb_log

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 67336d232a..db774e48d5 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -157,7 +157,7 @@ class phpbb_log implements phpbb_log_interface
 				*
 				if ($phpbb_dispatcher != null)
 				{
-					$vars = array('mode', 'user_id', 'log_ip', 'log_time', 'additional_data', 'sql_ary');
+					$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
 					$event = new phpbb_event_data(compact($vars));
 					$phpbb_dispatcher->dispatch('core.add_log_case', $event);
 					extract($event->get_data_filtered($vars));
@@ -176,7 +176,7 @@ class phpbb_log implements phpbb_log_interface
 		*
 		if ($phpbb_dispatcher != null)
 		{
-			$vars = array('mode', 'user_id', 'log_ip', 'log_time', 'additional_data', 'sql_ary');
+			$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
 			$event = new phpbb_event_data(compact($vars));
 			$phpbb_dispatcher->dispatch('core.add_log', $event);
 			extract($event->get_data_filtered($vars));
-- 
cgit v1.2.1


From a0b35f8e4e94d1301421670cf35406b974510ed0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 18 Mar 2012 21:56:15 +0100
Subject: [ticket/10714] Use {@inheritDoc} instead of repeating the doc-block

PHPBB3-10714
---
 phpBB/includes/log/log.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index db774e48d5..aa60c453e4 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -76,14 +76,7 @@ class phpbb_log implements phpbb_log_interface
 	/**
 	* Adds a log to the database
 	*
-	* @param	string	$mode				The mode defines which log_type is used and in which log the entry is displayed.
-	* @param	int		$user_id			User ID of the user
-	* @param	string	$log_ip				IP address of the user
-	* @param	string	$log_operation		Name of the operation
-	* @param	int		$log_time			Timestamp when the log was added.
-	* @param	array	$additional_data	More arguments can be added, depending on the log_type
-	*
-	* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
+	* {@inheritDoc}
 	*/
 	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array())
 	{
-- 
cgit v1.2.1


From 91384d8395166ec21995103410e35f7ba28ac830 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 24 Mar 2012 15:05:02 +0100
Subject: [ticket/10714] Add casts to integer values.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 5e2ee8c8f6..e05ed3cdde 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2603,6 +2603,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 	$log = array();
 	while ($row = $db->sql_fetchrow($result))
 	{
+		$row['forum_id'] = (int) $row['forum_id'];
 		if ($row['topic_id'])
 		{
 			$topic_id_list[] = $row['topic_id'];
@@ -2614,20 +2615,20 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 		}
 
 		$log[$i] = array(
-			'id'				=> $row['log_id'],
+			'id'				=> (int) $row['log_id'],
 
-			'reportee_id'			=> $row['reportee_id'],
+			'reportee_id'			=> (int) $row['reportee_id'],
 			'reportee_username'		=> '',
 			'reportee_username_full'=> '',
 
-			'user_id'			=> $row['user_id'],
+			'user_id'			=> (int) $row['user_id'],
 			'username'			=> $row['username'],
 			'username_full'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, $profile_url),
 
 			'ip'				=> $row['log_ip'],
-			'time'				=> $row['log_time'],
-			'forum_id'			=> $row['forum_id'],
-			'topic_id'			=> $row['topic_id'],
+			'time'				=> (int) $row['log_time'],
+			'forum_id'			=> (int) $row['forum_id'],
+			'topic_id'			=> (int) $row['topic_id'],
 
 			'viewforum'			=> ($row['forum_id'] && $auth->acl_get('f_read', $row['forum_id'])) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : false,
 			'action'			=> (isset($user->lang[$row['log_operation']])) ? $user->lang[$row['log_operation']] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}',
@@ -2689,6 +2690,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 
 		while ($row = $db->sql_fetchrow($result))
 		{
+			$row['forum_id'] = (int) $row['forum_id'];
 			if ($auth->acl_get('f_read', $row['forum_id']))
 			{
 				$is_auth[$row['topic_id']] = $row['forum_id'];
-- 
cgit v1.2.1


From f5063a6eda49d2a35b2aed486f86cde76e0f04a8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 24 Mar 2012 15:06:13 +0100
Subject: [ticket/10714] Add incorrect offset calculation in view_log function

PHPBB3-10714
---
 phpBB/includes/functions_admin.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index e05ed3cdde..fd1f5568ab 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2584,9 +2584,13 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 		return 0;
 	}
 
-	if ($offset >= $log_count)
+	if ($log_count)
 	{
-		$offset = ($offset - $limit < 0) ? 0 : $offset - $limit;
+		// Return the user to the last page that is valid
+		while ($offset >= $log_count)
+		{
+			$offset = ($offset - $limit < 0) ? 0 : $offset - $limit;
+		}
 	}
 
 	$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
-- 
cgit v1.2.1


From 9248b9b25fdc3c05cc9fb1e99f607817f8ec7bcb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 24 Mar 2012 15:06:32 +0100
Subject: [ticket/10714] Add doc block for view_log function

PHPBB3-10714
---
 phpBB/includes/functions_admin.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index fd1f5568ab..49c34f7fff 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2470,7 +2470,21 @@ function cache_moderators()
 
 /**
 * View log
-* If $log_count is set to false, we will skip counting all entries in the database.
+*
+* @param	string	$mode			The mode defines which log_type is used and in which log the entry is displayed.
+* @param	array	&$log			The result array with the logs
+* @param	mixed	&$log_count		If $log_count is set to false, we will skip counting all entries in the database.
+*									Otherwise an integer with the number of total matching entries is returned.
+* @param	int		$limit			Limit the number of entries that are returned
+* @param	int		$offset			Offset when fetching the log entries, f.e. on paginations
+* @param	mixed	$forum_id		Restrict the log entries to the given forum_id (can also be an array of forum_ids)
+* @param	int		$topic_id		Restrict the log entries to the given topic_id
+* @param	int		$user_id		Restrict the log entries to the given user_id
+* @param	int		$log_time		Only get log entries newer than the given timestamp
+* @param	string	$sort_by		SQL order option, e.g. 'l.log_time DESC'
+* @param	string	$keywords		Will only return log entries that have the keywords in log_operation or log_data
+*
+* @return	int				Returns the offset of the last valid page, if the specified offset was invalid (too high)
 */
 function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC', $keywords = '')
 {
-- 
cgit v1.2.1


From 55b94af82ecb7e73535bfbed6c278f1d992efecb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 24 Mar 2012 16:27:52 +0100
Subject: [ticket/10714] Implement get_logs() based on view_log()

I moved some stuff into its own function to make the code a bit clearer.

PHPBB3-10714
---
 phpBB/includes/log/interface.php |  64 ++++++
 phpBB/includes/log/log.php       | 406 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 470 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/interface.php b/phpBB/includes/log/interface.php
index 7eda4b9710..fde718b71a 100644
--- a/phpBB/includes/log/interface.php
+++ b/phpBB/includes/log/interface.php
@@ -56,4 +56,68 @@ interface phpbb_log_interface
 	* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
 	*/
 	public function add($mode, $user_id, $log_ip, $log_operation, $log_time, $additional_data);
+
+	/**
+	* Grab the logs from the database
+	*
+	* @param	string	$mode			The mode defines which log_type is used and in which log the entry is displayed.
+	* @param	bool	$count_logs		Shall we count all matching log entries?
+	* @param	int		$limit			Limit the number of entries that are returned
+	* @param	int		$offset			Offset when fetching the log entries, f.e. on paginations
+	* @param	mixed	$forum_id		Restrict the log entries to the given forum_id (can also be an array of forum_ids)
+	* @param	int		$topic_id		Restrict the log entries to the given topic_id
+	* @param	int		$user_id		Restrict the log entries to the given user_id
+	* @param	int		$log_time		Only get log entries newer than the given timestamp
+	* @param	string	$sort_by		SQL order option, e.g. 'l.log_time DESC'
+	* @param	string	$keywords		Will only return log entries that have the keywords in log_operation or log_data
+	*
+	* @return	array			The result array with the logs
+	*/
+	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '');
+
+	/**
+	* Generates a sql condition out of the specified keywords
+	*
+	* @param	string	$keywords	The keywords the user specified to search for
+	*
+	* @return	string		Returns the SQL condition searching for the keywords
+	*/
+	static public function generate_sql_keyword($keywords);
+
+	/**
+	* Determinate whether the user is allowed to read and/or moderate the forum of the topic
+	*
+	* @param	array	$topic_ids	Array with the topic ids
+	*
+	* @return	array		Returns an array with two keys 'm_' and 'read_f' which are also an array of topic_id => forum_id sets when the permissions are given. Sample:
+	*						array(
+	*							'permission' => array(
+	*								topic_id => forum_id
+	*							),
+	*						),
+	*/
+	static public function get_topic_auth($topic_ids);
+
+	/**
+	* Get the data for all reportee form the database
+	*
+	* @param	array	$reportee_ids	Array with the user ids of the reportees
+	*
+	* @return	array		Returns an array with the reportee data
+	*/
+	static public function get_reportee_data($reportee_ids);
+
+	/**
+	* Get total log count
+	*
+	* @return	int			Returns the number of matching logs from the last call to get_logs()
+	*/
+	public function get_log_count();
+
+	/**
+	* Get offset of the last valid page
+	*
+	* @return	int			Returns the offset of the last valid page from the last call to get_logs()
+	*/
+	public function get_valid_offset();
 }
diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index aa60c453e4..14f8bfd534 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -27,6 +27,16 @@ class phpbb_log implements phpbb_log_interface
 	*/
 	private $enabled;
 
+	/**
+	* Keeps the total log count of the last call to get_logs()
+	*/
+	private $logs_total;
+
+	/**
+	* Keeps the offset of the last valid page of the last call to get_logs()
+	*/
+	private $logs_offset;
+
 	/**
 	* The table we use to store our logs.
 	*/
@@ -180,4 +190,400 @@ class phpbb_log implements phpbb_log_interface
 
 		return $db->sql_nextid();
 	}
+
+	/**
+	* Grab the logs from the database
+	*
+	* {@inheritDoc}
+	*/
+	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '')
+	{
+		global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path;
+
+		$this->logs_total = 0;
+		$this->logs_offset = $offset;
+
+		$topic_id_list = $reportee_id_list = array();
+
+		$profile_url = (defined('IN_ADMIN')) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&amp;mode=overview') : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile');
+
+		switch ($mode)
+		{
+			case 'admin':
+				$log_type = LOG_ADMIN;
+				$sql_additional = '';
+			break;
+
+			case 'mod':
+				$log_type = LOG_MOD;
+				$sql_additional = '';
+
+				if ($topic_id)
+				{
+					$sql_additional = 'AND l.topic_id = ' . (int) $topic_id;
+				}
+				else if (is_array($forum_id))
+				{
+					$sql_additional = 'AND ' . $db->sql_in_set('l.forum_id', array_map('intval', $forum_id));
+				}
+				else if ($forum_id)
+				{
+					$sql_additional = 'AND l.forum_id = ' . (int) $forum_id;
+				}
+			break;
+
+			case 'user':
+				$log_type = LOG_USERS;
+				$sql_additional = 'AND l.reportee_id = ' . (int) $user_id;
+			break;
+
+			case 'users':
+				$log_type = LOG_USERS;
+				$sql_additional = '';
+			break;
+
+			case 'critical':
+				$log_type = LOG_CRITICAL;
+				$sql_additional = '';
+			break;
+
+			default:
+				$log_type = null;
+				$sql_additional = '';
+				/**
+				* @todo: enable when events are merged
+				*
+				if ($phpbb_dispatcher != null)
+				{
+					$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
+					$event = new phpbb_event_data(compact($vars));
+					$phpbb_dispatcher->dispatch('core.get_logs_switch_mode', $event);
+					extract($event->get_data_filtered($vars));
+				}
+				*/
+
+				if (!isset($log_type))
+				{
+					$this->logs_offset = 0;
+					return array();
+				}
+		}
+
+		/**
+		* @todo: enable when events are merged
+		*
+		if ($phpbb_dispatcher != null)
+		{
+			$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
+			$event = new phpbb_event_data(compact($vars));
+			$phpbb_dispatcher->dispatch('core.get_logs_after_get_type', $event);
+			extract($event->get_data_filtered($vars));
+		}
+		*/
+
+		$sql_keywords = '';
+		if (!empty($keywords))
+		{
+			// Get the SQL condition for our keywords
+			$sql_keywords = self::generate_sql_keyword($keywords);
+		}
+
+		if ($count_logs)
+		{
+			$sql = 'SELECT COUNT(l.log_id) AS total_entries
+				FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . " u
+				WHERE l.log_type = $log_type
+					AND l.user_id = u.user_id
+					AND l.log_time >= $log_time
+					$sql_keywords
+					$sql_additional";
+			$result = $db->sql_query($sql);
+			$this->logs_total = (int) $db->sql_fetchfield('total_entries');
+			$db->sql_freeresult($result);
+
+			if ($this->logs_total == 0)
+			{
+				// Save the queries, because there are no logs to display
+				$this->logs_offset = 0;
+				return array();
+			}
+
+			// Return the user to the last page that is valid
+			while ($this->logs_offset >= $this->logs_total)
+			{
+				$this->logs_offset = ($this->logs_offset - $limit < 0) ? 0 : $this->logs_offset - $limit;
+			}
+		}
+
+		$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
+			FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
+			WHERE l.log_type = $log_type
+				AND u.user_id = l.user_id
+				" . (($log_time) ? "AND l.log_time >= $log_time" : '') . "
+				$sql_keywords
+				$sql_additional
+			ORDER BY $sort_by";
+		$result = $db->sql_query_limit($sql, $limit, $this->logs_offset);
+
+		$i = 0;
+		$log = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$row['forum_id'] = (int) $row['forum_id'];
+			if ($row['topic_id'])
+			{
+				$topic_id_list[] = (int) $row['topic_id'];
+			}
+
+			if ($row['reportee_id'])
+			{
+				$reportee_id_list[] = (int) $row['reportee_id'];
+			}
+
+			$log_entry_data = array(
+				'id'				=> (int) $row['log_id'],
+
+				'reportee_id'			=> (int) $row['reportee_id'],
+				'reportee_username'		=> '',
+				'reportee_username_full'=> '',
+
+				'user_id'			=> (int) $row['user_id'],
+				'username'			=> $row['username'],
+				'username_full'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, $profile_url),
+
+				'ip'				=> $row['log_ip'],
+				'time'				=> (int) $row['log_time'],
+				'forum_id'			=> (int) $row['forum_id'],
+				'topic_id'			=> (int) $row['topic_id'],
+
+				'viewforum'			=> ($row['forum_id'] && $auth->acl_get('f_read', $row['forum_id'])) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : false,
+				'action'			=> (isset($user->lang[$row['log_operation']])) ? $user->lang[$row['log_operation']] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}',
+			);
+
+			/**
+			* @todo: enable when events are merged
+			*
+			if ($phpbb_dispatcher != null)
+			{
+				$vars = array('log_entry_data', 'row');
+				$event = new phpbb_event_data(compact($vars));
+				$phpbb_dispatcher->dispatch('core.get_logs_entry_data', $event);
+				extract($event->get_data_filtered($vars));
+			}
+			*/
+
+			$log[$i] = $log_entry_data;
+
+			if (!empty($row['log_data']))
+			{
+				$log_data_ary = @unserialize($row['log_data']);
+				$log_data_ary = ($log_data_ary === false) ? array() : $log_data_ary;
+
+				if (isset($user->lang[$row['log_operation']]))
+				{
+					// Check if there are more occurrences of % than arguments, if there are we fill out the arguments array
+					// It doesn't matter if we add more arguments than placeholders
+					if ((substr_count($log[$i]['action'], '%') - sizeof($log_data_ary)) > 0)
+					{
+						$log_data_ary = array_merge($log_data_ary, array_fill(0, substr_count($log[$i]['action'], '%') - sizeof($log_data_ary), ''));
+					}
+
+					$log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary);
+
+					// If within the admin panel we do not censor text out
+					if (defined('IN_ADMIN'))
+					{
+						$log[$i]['action'] = bbcode_nl2br($log[$i]['action']);
+					}
+					else
+					{
+						$log[$i]['action'] = bbcode_nl2br(censor_text($log[$i]['action']));
+					}
+				}
+				else if (!empty($log_data_ary))
+				{
+					$log[$i]['action'] .= '<br />' . implode('', $log_data_ary);
+				}
+
+				/* Apply make_clickable... has to be seen if it is for good. :/
+				// Seems to be not for the moment, reconsider later...
+				$log[$i]['action'] = make_clickable($log[$i]['action']);
+				*/
+			}
+
+			$i++;
+		}
+		$db->sql_freeresult($result);
+
+		/**
+		* @todo: enable when events are merged
+		*
+		if ($phpbb_dispatcher != null)
+		{
+			$vars = array('log', 'topic_id_list', 'reportee_id_list');
+			$event = new phpbb_event_data(compact($vars));
+			$phpbb_dispatcher->dispatch('core.get_logs_additional_data', $event);
+			extract($event->get_data_filtered($vars));
+		}
+		*/
+
+		if (sizeof($topic_id_list))
+		{
+			$topic_auth = self::get_topic_auth($topic_id_list);
+
+			foreach ($log as $key => $row)
+			{
+				$log[$key]['viewtopic'] = (isset($topic_auth['f_read'][$row['topic_id']])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_auth['f_read'][$row['topic_id']] . '&amp;t=' . $row['topic_id']) : false;
+				$log[$key]['viewlogs'] = (isset($topic_auth['m_'][$row['topic_id']])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=logs&amp;mode=topic_logs&amp;t=' . $row['topic_id'], true, $user->session_id) : false;
+			}
+		}
+
+		if (sizeof($reportee_id_list))
+		{
+			$reportee_data_list = self::get_reportee_data($reportee_id_list);
+
+			foreach ($log as $key => $row)
+			{
+				if (!isset($reportee_data_list[$row['reportee_id']]))
+				{
+					continue;
+				}
+
+				$log[$key]['reportee_username'] = $reportee_data_list[$row['reportee_id']]['username'];
+				$log[$key]['reportee_username_full'] = get_username_string('full', $row['reportee_id'], $reportee_data_list[$row['reportee_id']]['username'], $reportee_data_list[$row['reportee_id']]['user_colour'], false, $profile_url);
+			}
+		}
+
+		return $log;
+	}
+
+	/**
+	* Generates a sql condition out of the specified keywords
+	*
+	* {@inheritDoc}
+	*/
+	static public function generate_sql_keyword($keywords)
+	{
+		global $db, $user;
+
+		// Use no preg_quote for $keywords because this would lead to sole backslashes being added
+		// We also use an OR connection here for spaces and the | string. Currently, regex is not supported for searching (but may come later).
+		$keywords = preg_split('#[\s|]+#u', utf8_strtolower($keywords), 0, PREG_SPLIT_NO_EMPTY);
+		$sql_keywords = '';
+
+		if (!empty($keywords))
+		{
+			$keywords_pattern = array();
+
+			// Build pattern and keywords...
+			for ($i = 0, $num_keywords = sizeof($keywords); $i < $num_keywords; $i++)
+			{
+				$keywords_pattern[] = preg_quote($keywords[$i], '#');
+				$keywords[$i] = $db->sql_like_expression($db->any_char . $keywords[$i] . $db->any_char);
+			}
+
+			$keywords_pattern = '#' . implode('|', $keywords_pattern) . '#ui';
+
+			$operations = array();
+			foreach ($user->lang as $key => $value)
+			{
+				if (substr($key, 0, 4) == 'LOG_' && preg_match($keywords_pattern, $value))
+				{
+					$operations[] = $key;
+				}
+			}
+
+			$sql_keywords = 'AND (';
+			if (!empty($operations))
+			{
+				$sql_keywords .= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
+			}
+			$sql_keywords .= 'LOWER(l.log_data) ' . implode(' OR LOWER(l.log_data) ', $keywords) . ')';
+		}
+
+		return $sql_keywords;
+	}
+
+	/**
+	* Determinate whether the user is allowed to read and/or moderate the forum of the topic
+	*
+	* {@inheritDoc}
+	*/
+	static public function get_topic_auth($topic_ids)
+	{
+		global $auth, $db;
+
+		$forum_auth = array('f_read' => array(), 'm_' => array());
+		$topic_ids = array_unique($topic_ids);
+
+		$sql = 'SELECT topic_id, forum_id
+			FROM ' . TOPICS_TABLE . '
+			WHERE ' . $db->sql_in_set('topic_id', array_map('intval', $topic_ids));
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$row['topic_id'] = (int) $row['topic_id'];
+			$row['forum_id'] = (int) $row['forum_id'];
+
+			if ($auth->acl_get('f_read', $row['forum_id']))
+			{
+				$forum_auth['f_read'][$row['topic_id']] = $row['forum_id'];
+			}
+
+			if ($auth->acl_gets('a_', 'm_', $row['forum_id']))
+			{
+				$forum_auth['m_'][$row['topic_id']] = $row['forum_id'];
+			}
+		}
+		$db->sql_freeresult($result);
+
+		return $forum_auth;
+	}
+
+	/**
+	* Get the data for all reportee form the database
+	*
+	* {@inheritDoc}
+	*/
+	static public function get_reportee_data($reportee_ids)
+	{
+		global $db;
+
+		$reportee_ids = array_unique($reportee_ids);
+		$reportee_data_list = array();
+
+		$sql = 'SELECT user_id, username, user_colour
+			FROM ' . USERS_TABLE . '
+			WHERE ' . $db->sql_in_set('user_id', $reportee_ids);
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$reportee_data_list[$row['user_id']] = $row;
+		}
+		$db->sql_freeresult($result);
+
+		return $reportee_data_list;
+	}
+
+	/**
+	* Get total log count
+	*
+	* @return	int			Returns the number of matching logs from the last call to get_logs()
+	*/
+	public function get_log_count()
+	{
+		return ($this->logs_total) ? $this->logs_total : 0;
+	}
+
+	/**
+	* Get offset of the last valid log page
+	*
+	* @return	int			Returns the offset of the last valid page from the last call to get_logs()
+	*/
+	public function get_valid_offset()
+	{
+		return ($this->logs_offset) ? $this->logs_offset : 0;
+	}
 }
-- 
cgit v1.2.1


From 97290647fae683ecce842541a682e3403b7717ee Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 24 Mar 2012 16:39:03 +0100
Subject: [ticket/10714] Use phpbb_log class in view_log()

PHPBB3-10714
---
 phpBB/includes/functions_admin.php | 273 +++----------------------------------
 phpBB/includes/log/log.php         | 105 +++++++++-----
 2 files changed, 85 insertions(+), 293 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 49c34f7fff..e7aed85e15 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2488,275 +2488,34 @@ function cache_moderators()
 */
 function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC', $keywords = '')
 {
-	global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path;
+	// This is all just an ugly hack to add "Dependency Injection" to a function
+	// the only real code is the function call which maps this function to a method.
+	static $static_log = null;
 
-	$topic_id_list = $reportee_id_list = $is_auth = $is_mod = array();
-
-	$profile_url = (defined('IN_ADMIN')) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&amp;mode=overview') : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile');
-
-	switch ($mode)
+	if ($mode instanceof phpbb_log_interface)
 	{
-		case 'admin':
-			$log_type = LOG_ADMIN;
-			$sql_forum = '';
-		break;
-
-		case 'mod':
-			$log_type = LOG_MOD;
-			$sql_forum = '';
-
-			if ($topic_id)
-			{
-				$sql_forum = 'AND l.topic_id = ' . (int) $topic_id;
-			}
-			else if (is_array($forum_id))
-			{
-				$sql_forum = 'AND ' . $db->sql_in_set('l.forum_id', array_map('intval', $forum_id));
-			}
-			else if ($forum_id)
-			{
-				$sql_forum = 'AND l.forum_id = ' . (int) $forum_id;
-			}
-		break;
-
-		case 'user':
-			$log_type = LOG_USERS;
-			$sql_forum = 'AND l.reportee_id = ' . (int) $user_id;
-		break;
-
-		case 'users':
-			$log_type = LOG_USERS;
-			$sql_forum = '';
-		break;
-
-		case 'critical':
-			$log_type = LOG_CRITICAL;
-			$sql_forum = '';
-		break;
-
-		default:
-			return;
-	}
-
-	// Use no preg_quote for $keywords because this would lead to sole backslashes being added
-	// We also use an OR connection here for spaces and the | string. Currently, regex is not supported for searching (but may come later).
-	$keywords = preg_split('#[\s|]+#u', utf8_strtolower($keywords), 0, PREG_SPLIT_NO_EMPTY);
-	$sql_keywords = '';
-
-	if (!empty($keywords))
-	{
-		$keywords_pattern = array();
-
-		// Build pattern and keywords...
-		for ($i = 0, $num_keywords = sizeof($keywords); $i < $num_keywords; $i++)
-		{
-			$keywords_pattern[] = preg_quote($keywords[$i], '#');
-			$keywords[$i] = $db->sql_like_expression($db->any_char . $keywords[$i] . $db->any_char);
-		}
-
-		$keywords_pattern = '#' . implode('|', $keywords_pattern) . '#ui';
-
-		$operations = array();
-		foreach ($user->lang as $key => $value)
-		{
-			if (substr($key, 0, 4) == 'LOG_' && preg_match($keywords_pattern, $value))
-			{
-				$operations[] = $key;
-			}
-		}
-
-		$sql_keywords = 'AND (';
-		if (!empty($operations))
-		{
-			$sql_keywords .= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
-		}
-		$sql_lower = $db->sql_lower_text('l.log_data');
-		$sql_keywords .= "$sql_lower " . implode(" OR $sql_lower ", $keywords) . ')';
+		$static_log = $mode;
+		return true;
 	}
-
-	if ($log_count !== false)
+	else if ($mode === false)
 	{
-		$sql = 'SELECT COUNT(l.log_id) AS total_entries
-			FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . " u
-			WHERE l.log_type = $log_type
-				AND l.user_id = u.user_id
-				AND l.log_time >= $limit_days
-				$sql_keywords
-				$sql_forum";
-		$result = $db->sql_query($sql);
-		$log_count = (int) $db->sql_fetchfield('total_entries');
-		$db->sql_freeresult($result);
+		return false;
 	}
 
-	// $log_count may be false here if false was passed in for it,
-	// because in this case we did not run the COUNT() query above.
-	// If we ran the COUNT() query and it returned zero rows, return;
-	// otherwise query for logs below.
-	if ($log_count === 0)
-	{
-		// Save the queries, because there are no logs to display
-		return 0;
-	}
+	$tmp_log = $static_log;
 
-	if ($log_count)
+	// no log class set, create a temporary one ourselves to keep backwards compatability
+	if ($tmp_log === null)
 	{
-		// Return the user to the last page that is valid
-		while ($offset >= $log_count)
-		{
-			$offset = ($offset - $limit < 0) ? 0 : $offset - $limit;
-		}
+		$tmp_log = new phpbb_log(LOG_TABLE);
 	}
 
-	$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
-		FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
-		WHERE l.log_type = $log_type
-			AND u.user_id = l.user_id
-			" . (($limit_days) ? "AND l.log_time >= $limit_days" : '') . "
-			$sql_keywords
-			$sql_forum
-		ORDER BY $sort_by";
-	$result = $db->sql_query_limit($sql, $limit, $offset);
-
-	$i = 0;
-	$log = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$row['forum_id'] = (int) $row['forum_id'];
-		if ($row['topic_id'])
-		{
-			$topic_id_list[] = $row['topic_id'];
-		}
-
-		if ($row['reportee_id'])
-		{
-			$reportee_id_list[] = $row['reportee_id'];
-		}
-
-		$log[$i] = array(
-			'id'				=> (int) $row['log_id'],
-
-			'reportee_id'			=> (int) $row['reportee_id'],
-			'reportee_username'		=> '',
-			'reportee_username_full'=> '',
-
-			'user_id'			=> (int) $row['user_id'],
-			'username'			=> $row['username'],
-			'username_full'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, $profile_url),
+	$count_logs = ($log_count !== false);
 
-			'ip'				=> $row['log_ip'],
-			'time'				=> (int) $row['log_time'],
-			'forum_id'			=> (int) $row['forum_id'],
-			'topic_id'			=> (int) $row['topic_id'],
+	$log = $tmp_log->get_logs($mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $limit_days, $sort_by, $keywords);
+	$log_count = $tmp_log->get_log_count();
 
-			'viewforum'			=> ($row['forum_id'] && $auth->acl_get('f_read', $row['forum_id'])) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : false,
-			'action'			=> (isset($user->lang[$row['log_operation']])) ? $user->lang[$row['log_operation']] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}',
-		);
-
-		if (!empty($row['log_data']))
-		{
-			$log_data_ary = @unserialize($row['log_data']);
-			$log_data_ary = ($log_data_ary === false) ? array() : $log_data_ary;
-
-			if (isset($user->lang[$row['log_operation']]))
-			{
-				// Check if there are more occurrences of % than arguments, if there are we fill out the arguments array
-				// It doesn't matter if we add more arguments than placeholders
-				if ((substr_count($log[$i]['action'], '%') - sizeof($log_data_ary)) > 0)
-				{
-					$log_data_ary = array_merge($log_data_ary, array_fill(0, substr_count($log[$i]['action'], '%') - sizeof($log_data_ary), ''));
-				}
-
-				$log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary);
-
-				// If within the admin panel we do not censor text out
-				if (defined('IN_ADMIN'))
-				{
-					$log[$i]['action'] = bbcode_nl2br($log[$i]['action']);
-				}
-				else
-				{
-					$log[$i]['action'] = bbcode_nl2br(censor_text($log[$i]['action']));
-				}
-			}
-			else if (!empty($log_data_ary))
-			{
-				$log[$i]['action'] .= '<br />' . implode('', $log_data_ary);
-			}
-
-			/* Apply make_clickable... has to be seen if it is for good. :/
-			// Seems to be not for the moment, reconsider later...
-			$log[$i]['action'] = make_clickable($log[$i]['action']);
-			*/
-		}
-
-		$i++;
-	}
-	$db->sql_freeresult($result);
-
-	if (sizeof($topic_id_list))
-	{
-		$topic_id_list = array_unique($topic_id_list);
-
-		// This query is not really needed if move_topics() updates the forum_id field,
-		// although it's also used to determine if the topic still exists in the database
-		$sql = 'SELECT topic_id, forum_id
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . $db->sql_in_set('topic_id', array_map('intval', $topic_id_list));
-		$result = $db->sql_query($sql);
-
-		$default_forum_id = 0;
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$row['forum_id'] = (int) $row['forum_id'];
-			if ($auth->acl_get('f_read', $row['forum_id']))
-			{
-				$is_auth[$row['topic_id']] = $row['forum_id'];
-			}
-
-			if ($auth->acl_gets('a_', 'm_', $row['forum_id']))
-			{
-				$is_mod[$row['topic_id']] = $row['forum_id'];
-			}
-		}
-		$db->sql_freeresult($result);
-
-		foreach ($log as $key => $row)
-		{
-			$log[$key]['viewtopic'] = (isset($is_auth[$row['topic_id']])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $is_auth[$row['topic_id']] . '&amp;t=' . $row['topic_id']) : false;
-			$log[$key]['viewlogs'] = (isset($is_mod[$row['topic_id']])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=logs&amp;mode=topic_logs&amp;t=' . $row['topic_id'], true, $user->session_id) : false;
-		}
-	}
-
-	if (sizeof($reportee_id_list))
-	{
-		$reportee_id_list = array_unique($reportee_id_list);
-		$reportee_names_list = array();
-
-		$sql = 'SELECT user_id, username, user_colour
-			FROM ' . USERS_TABLE . '
-			WHERE ' . $db->sql_in_set('user_id', $reportee_id_list);
-		$result = $db->sql_query($sql);
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$reportee_names_list[$row['user_id']] = $row;
-		}
-		$db->sql_freeresult($result);
-
-		foreach ($log as $key => $row)
-		{
-			if (!isset($reportee_names_list[$row['reportee_id']]))
-			{
-				continue;
-			}
-
-			$log[$key]['reportee_username'] = $reportee_names_list[$row['reportee_id']]['username'];
-			$log[$key]['reportee_username_full'] = get_username_string('full', $row['reportee_id'], $reportee_names_list[$row['reportee_id']]['username'], $reportee_names_list[$row['reportee_id']]['user_colour'], false, $profile_url);
-		}
-	}
-
-	return $offset;
+	return $tmp_log->get_valid_offset();
 }
 
 /**
diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 14f8bfd534..5d81dd8495 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -25,7 +25,7 @@ class phpbb_log implements phpbb_log_interface
 	/**
 	* Keeps the status of the log-system. Is the log enabled or disabled?
 	*/
-	private $enabled;
+	private $disabled_logs;
 
 	/**
 	* Keeps the total log count of the last call to get_logs()
@@ -56,31 +56,70 @@ class phpbb_log implements phpbb_log_interface
 	/**
 	* This function returns the state of the log-system.
 	*
-	* @return	bool	True if log is enabled
+	* @param	string	$type	The log type we want to check. Empty to get global log status.
+	*
+	* @return	bool	True if log for the type is enabled
 	*/
-	public function is_enabled()
+	public function is_enabled($type = '')
 	{
-		return $this->enabled;
+		if ($type == '' || $type == 'all')
+		{
+			return !isset($this->disabled_logs['all']);
+		}
+		return !isset($this->disabled_logs[$type]) && !isset($this->disabled_logs['all']);
 	}
 
 	/**
 	* This function allows disable the log-system. When add_log is called, the log will not be added to the database.
 	*
+	* @param	mixed	$type	The log type we want to enable. Empty to disable all logs.
+	*							Can also be an array of types
+	*
 	* @return	null
 	*/
-	public function disable()
+	public function disable($type = '')
 	{
-		$this->enabled = false;
+		if (is_array($type))
+		{
+			foreach ($type as $disable_type)
+			{
+				$this->disable($disable_type);
+			}
+			return;
+		}
+
+		if ($type == '' || $type == 'all')
+		{
+			$this->disabled_logs['all'] = true;
+			return;
+		}
+		$this->disabled_logs[$type] = true;
 	}
 
 	/**
 	* This function allows re-enable the log-system.
 	*
+	* @param	mixed	$type	The log type we want to enable. Empty to enable all logs.
+	*
 	* @return	null
 	*/
-	public function enable()
+	public function enable($type = '')
 	{
-		$this->enabled = true;
+		if (is_array($type))
+		{
+			foreach ($type as $enable_type)
+			{
+				$this->enable($enable_type);
+			}
+			return;
+		}
+
+		if ($type == '' || $type == 'all')
+		{
+			$this->disabled_logs = array();
+			return;
+		}
+		unset($this->disabled_logs[$type]);
 	}
 
 	/**
@@ -90,7 +129,7 @@ class phpbb_log implements phpbb_log_interface
 	*/
 	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array())
 	{
-		if (!$this->is_enabled())
+		if (!$this->is_enabled($mode))
 		{
 			return false;
 		}
@@ -119,7 +158,7 @@ class phpbb_log implements phpbb_log_interface
 			case 'admin':
 				$sql_ary += array(
 					'log_type'		=> LOG_ADMIN,
-					'log_data'		=> (!sizeof($additional_data)) ? '' : serialize($additional_data),
+					'log_data'		=> (!empty($additional_data)) ? serialize($additional_data) : '',
 				);
 			break;
 
@@ -132,7 +171,7 @@ class phpbb_log implements phpbb_log_interface
 					'log_type'		=> LOG_MOD,
 					'forum_id'		=> $forum_id,
 					'topic_id'		=> $topic_id,
-					'log_data'		=> (!sizeof($additional_data)) ? '' : serialize($additional_data),
+					'log_data'		=> (!empty($additional_data)) ? serialize($additional_data) : '',
 				);
 			break;
 
@@ -143,14 +182,14 @@ class phpbb_log implements phpbb_log_interface
 				$sql_ary += array(
 					'log_type'		=> LOG_USERS,
 					'reportee_id'	=> $reportee_id,
-					'log_data'		=> (!sizeof($additional_data)) ? '' : serialize($additional_data),
+					'log_data'		=> (!empty($additional_data)) ? serialize($additional_data) : '',
 				);
 			break;
 
 			case 'critical':
 				$sql_ary += array(
 					'log_type'		=> LOG_CRITICAL,
-					'log_data'		=> (!sizeof($additional_data)) ? '' : serialize($additional_data),
+					'log_data'		=> (!empty($additional_data)) ? serialize($additional_data) : '',
 				);
 			break;
 
@@ -161,9 +200,7 @@ class phpbb_log implements phpbb_log_interface
 				if ($phpbb_dispatcher != null)
 				{
 					$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
-					$event = new phpbb_event_data(compact($vars));
-					$phpbb_dispatcher->dispatch('core.add_log_case', $event);
-					extract($event->get_data_filtered($vars));
+					extract($phpbb_dispatcher->trigger_event('core.add_log_case', $vars, $vars));
 				}
 				*/
 
@@ -180,9 +217,7 @@ class phpbb_log implements phpbb_log_interface
 		if ($phpbb_dispatcher != null)
 		{
 			$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
-			$event = new phpbb_event_data(compact($vars));
-			$phpbb_dispatcher->dispatch('core.add_log', $event);
-			extract($event->get_data_filtered($vars));
+			extract($phpbb_dispatcher->trigger_event('core.add_log', $vars, $vars));
 		}
 		*/
 
@@ -199,6 +234,11 @@ class phpbb_log implements phpbb_log_interface
 	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '')
 	{
 		global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path;
+		/**
+		* @todo: enable when events are merged
+		*
+		global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path, $phpbb_dispatcher;
+		*/
 
 		$this->logs_total = 0;
 		$this->logs_offset = $offset;
@@ -256,9 +296,7 @@ class phpbb_log implements phpbb_log_interface
 				if ($phpbb_dispatcher != null)
 				{
 					$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
-					$event = new phpbb_event_data(compact($vars));
-					$phpbb_dispatcher->dispatch('core.get_logs_switch_mode', $event);
-					extract($event->get_data_filtered($vars));
+					extract($phpbb_dispatcher->trigger_event('core.get_logs_switch_mode', $vars, $vars));
 				}
 				*/
 
@@ -275,9 +313,7 @@ class phpbb_log implements phpbb_log_interface
 		if ($phpbb_dispatcher != null)
 		{
 			$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
-			$event = new phpbb_event_data(compact($vars));
-			$phpbb_dispatcher->dispatch('core.get_logs_after_get_type', $event);
-			extract($event->get_data_filtered($vars));
+			extract($phpbb_dispatcher->trigger_event('core.get_logs_after_get_type', $vars, $vars));
 		}
 		*/
 
@@ -311,12 +347,12 @@ class phpbb_log implements phpbb_log_interface
 			// Return the user to the last page that is valid
 			while ($this->logs_offset >= $this->logs_total)
 			{
-				$this->logs_offset = ($this->logs_offset - $limit < 0) ? 0 : $this->logs_offset - $limit;
+				$this->logs_offset = max(0, $this->logs_offset - $limit);
 			}
 		}
 
-		$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
-			FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u
+		$sql = 'SELECT l.*, u.username, u.username_clean, u.user_colour
+			FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . " u
 			WHERE l.log_type = $log_type
 				AND u.user_id = l.user_id
 				" . (($log_time) ? "AND l.log_time >= $log_time" : '') . "
@@ -366,9 +402,7 @@ class phpbb_log implements phpbb_log_interface
 			if ($phpbb_dispatcher != null)
 			{
 				$vars = array('log_entry_data', 'row');
-				$event = new phpbb_event_data(compact($vars));
-				$phpbb_dispatcher->dispatch('core.get_logs_entry_data', $event);
-				extract($event->get_data_filtered($vars));
+				extract($phpbb_dispatcher->trigger_event('core.get_logs_entry_data', $vars, $vars));
 			}
 			*/
 
@@ -377,7 +411,7 @@ class phpbb_log implements phpbb_log_interface
 			if (!empty($row['log_data']))
 			{
 				$log_data_ary = @unserialize($row['log_data']);
-				$log_data_ary = ($log_data_ary === false) ? array() : $log_data_ary;
+				$log_data_ary = ($log_data_ary !== false) ? $log_data_ary : array();
 
 				if (isset($user->lang[$row['log_operation']]))
 				{
@@ -421,9 +455,7 @@ class phpbb_log implements phpbb_log_interface
 		if ($phpbb_dispatcher != null)
 		{
 			$vars = array('log', 'topic_id_list', 'reportee_id_list');
-			$event = new phpbb_event_data(compact($vars));
-			$phpbb_dispatcher->dispatch('core.get_logs_additional_data', $event);
-			extract($event->get_data_filtered($vars));
+			extract($phpbb_dispatcher->trigger_event('core.get_logs_additional_data', $vars, $vars));
 		}
 		*/
 
@@ -498,7 +530,8 @@ class phpbb_log implements phpbb_log_interface
 			{
 				$sql_keywords .= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
 			}
-			$sql_keywords .= 'LOWER(l.log_data) ' . implode(' OR LOWER(l.log_data) ', $keywords) . ')';
+			$sql_lower = $db->sql_lower_text('l.log_data');
+			$sql_keywords .= " $sql_lower " . implode(" OR $sql_lower ", $keywords) . ')';
 		}
 
 		return $sql_keywords;
-- 
cgit v1.2.1


From 2c7f498c1b43cfb96f868e9b0f9b80ad5ec626a8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 24 Mar 2012 17:13:17 +0100
Subject: [ticket/10714] Change $phpbb_dispatcher calls to the new layout

PHPBB3-10714
---
 phpBB/includes/functions.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 3e3d796ba2..c5a1543277 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3407,9 +3407,7 @@ function add_log()
 			if ($phpbb_dispatcher != null)
 			{
 				$vars = array('mode', 'args', 'additional_data');
-				$event = new phpbb_event_data(compact($vars));
-				$phpbb_dispatcher->dispatch('core.function_add_log', $event);
-				extract($event->get_data_filtered($vars));
+				extract($phpbb_dispatcher->trigger_event('core.function_add_log', $vars, $vars));
 			}
 			*/
 	}
-- 
cgit v1.2.1


From 3170845a5011ea76af7f4f8359acafb43ad7e19e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 28 Mar 2012 15:48:45 +0200
Subject: [ticket/10714] Refactor disable mechanism to only disable certain
 types

Only disable admin log when adding multiple users, so critical errors are still
logged.

PHPBB3-10714
---
 phpBB/includes/functions_user.php |  4 ++--
 phpBB/includes/log/interface.php  | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 4074eaa2f2..d1f1544fcd 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -302,7 +302,7 @@ function user_add($user_row, $cp_data = false)
 			global $phpbb_log;
 
 			// Because these actions only fill the log unneccessarily we skip the add_log() entry.
-			$phpbb_log->disable();
+			$phpbb_log->disable('admin');
 
 			// Add user to "newly registered users" group and set to default group if admin specified so.
 			if ($config['new_member_group_default'])
@@ -315,7 +315,7 @@ function user_add($user_row, $cp_data = false)
 				group_user_add($add_group_id, $user_id);
 			}
 
-			$phpbb_log->enable();
+			$phpbb_log->enable('admin');
 		}
 	}
 
diff --git a/phpBB/includes/log/interface.php b/phpBB/includes/log/interface.php
index fde718b71a..feeab585bf 100644
--- a/phpBB/includes/log/interface.php
+++ b/phpBB/includes/log/interface.php
@@ -25,23 +25,31 @@ interface phpbb_log_interface
 	/**
 	* This function returns the state of the log-system.
 	*
-	* @return	bool	True if log is enabled
+	* @param	string	$type	The log type we want to check. Empty to get global log status.
+	*
+	* @return	bool	True if log for the type is enabled
 	*/
-	public function is_enabled();
+	public function is_enabled($type = '');
 
 	/**
 	* This function allows disable the log-system. When add_log is called, the log will not be added to the database.
 	*
+	* @param	mixed	$type	The log type we want to disable. Empty to disable all logs.
+	*							Can also be an array of types
+	*
 	* @return	null
 	*/
-	public function disable();
+	public function disable($type = '');
 
 	/**
 	* This function allows re-enable the log-system.
 	*
+	* @param	mixed	$type	The log type we want to enable. Empty to enable all logs.
+	*							Can also be an array of types
+	*
 	* @return	null
 	*/
-	public function enable();
+	public function enable($type = '');
 
 	/**
 	* Adds a log to the database
-- 
cgit v1.2.1


From 0fcbb40a0e1affcfa07a6d51ce273b73b3a95359 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Aug 2012 12:40:55 +0200
Subject: [ticket/10714] Enable core.add_log event and remove superseded
 add_log_case

PHPBB3-10714
---
 phpBB/includes/log/log.php | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 5d81dd8495..752ed21955 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -134,12 +134,7 @@ class phpbb_log implements phpbb_log_interface
 			return false;
 		}
 
-		global $db;
-		/**
-		* @todo: enable when events are merged
-		*
 		global $db, $phpbb_dispatcher;
-		*/
 
 		if ($log_time == false)
 		{
@@ -192,34 +187,37 @@ class phpbb_log implements phpbb_log_interface
 					'log_data'		=> (!empty($additional_data)) ? serialize($additional_data) : '',
 				);
 			break;
-
-			default:
-				/**
-				* @todo: enable when events are merged
-				*
-				if ($phpbb_dispatcher != null)
-				{
-					$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
-					extract($phpbb_dispatcher->trigger_event('core.add_log_case', $vars, $vars));
-				}
-				*/
-
-				// We didn't find a log_type, so we don't save it in the database.
-				if (!isset($sql_ary['log_type']))
-				{
-					return false;
-				}
 		}
 
 		/**
-		* @todo: enable when events are merged
+		* Allow to modify log data before we add them to the database
+		*
+		* NOTE: if sql_ary does not contain a log_type value, the entry will
+		* not be stored in the database. So ensure to set it, if needed.
 		*
+		* @event core.add_log
+		* @var	string	mode			Mode of the entry we log
+		* @var	int		user_id			ID of the user who triggered the log
+		* @var	string	log_ip			IP of the user who triggered the log
+		* @var	string	log_operation	Language key of the log operation
+		* @var	int		log_time		Timestamp, when the log was added
+		* @var	array	additional_data	Array with additional log data
+		* @var	array	sql_ary			Array with log data we insert into the
+		*							database. If sql_ary[log_type] is not set,
+		*							we won't add the entry to the database.
+		* @since 3.1-A1
+		*/
 		if ($phpbb_dispatcher != null)
 		{
 			$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
 			extract($phpbb_dispatcher->trigger_event('core.add_log', $vars, $vars));
 		}
-		*/
+
+		// We didn't find a log_type, so we don't save it in the database.
+		if (!isset($sql_ary['log_type']))
+		{
+			return false;
+		}
 
 		$db->sql_query('INSERT INTO ' . $this->log_table . ' ' . $db->sql_build_array('INSERT', $sql_ary));
 
-- 
cgit v1.2.1


From bd6dfee23e0d3f11ff028d4376e73c9c1e770f2a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Aug 2012 13:06:43 +0200
Subject: [ticket/10714] Add event core.get_logs_modify_type

core.get_logs_switch_mode is superseded by this one and therefor removed

PHPBB3-10714
---
 phpBB/includes/log/log.php | 53 ++++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 752ed21955..97d0aac623 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -231,12 +231,7 @@ class phpbb_log implements phpbb_log_interface
 	*/
 	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '')
 	{
-		global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path;
-		/**
-		* @todo: enable when events are merged
-		*
 		global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path, $phpbb_dispatcher;
-		*/
 
 		$this->logs_total = 0;
 		$this->logs_offset = $offset;
@@ -288,32 +283,44 @@ class phpbb_log implements phpbb_log_interface
 			default:
 				$log_type = null;
 				$sql_additional = '';
-				/**
-				* @todo: enable when events are merged
-				*
-				if ($phpbb_dispatcher != null)
-				{
-					$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
-					extract($phpbb_dispatcher->trigger_event('core.get_logs_switch_mode', $vars, $vars));
-				}
-				*/
-
-				if (!isset($log_type))
-				{
-					$this->logs_offset = 0;
-					return array();
-				}
 		}
 
 		/**
-		* @todo: enable when events are merged
+		* Overwrite log type and limitations before we count and get the logs
+		*
+		* NOTE: if log_type is not set, no entries will be returned.
 		*
+		* @event core.get_logs_modify_type
+		* @var	string	mode		Mode of the entries we display
+		* @var	bool	count_logs	Do we count all matching entries?
+		* @var	int		limit		Limit the number of entries
+		* @var	int		offset		Offset when fetching the entries
+		* @var	mixed	forum_id	Limit entries to the forum_id,
+		*							can also be an array of forum_ids
+		* @var	int		topic_id	Limit entries to the topic_id
+		* @var	int		user_id		Limit entries to the user_id
+		* @var	int		log_time	Limit maximum age of log entries
+		* @var	string	sort_by		SQL order option
+		* @var	string	keywords	Will only return entries that have the
+		*							keywords in log_operation or log_data
+		* @var	string	profile_url	URL to the users profile
+		* @var	int		log_type	Limit logs to a certain type. If log_type
+		*							is not set, no entries will be returned.
+		* @var	string	sql_additional	Additional conditions for the entries,
+		*								e.g.: 'AND l.forum_id = 1'
+		* @since 3.1-A1
+		*/
 		if ($phpbb_dispatcher != null)
 		{
 			$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
-			extract($phpbb_dispatcher->trigger_event('core.get_logs_after_get_type', $vars, $vars));
+			extract($phpbb_dispatcher->trigger_event('core.get_logs_modify_type', $vars));
+		}
+
+		if (!isset($log_type))
+		{
+			$this->logs_offset = 0;
+			return array();
 		}
-		*/
 
 		$sql_keywords = '';
 		if (!empty($keywords))
-- 
cgit v1.2.1


From 0bb4af90a4d9a1fedb254a1b6e9702726cfcf091 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Aug 2012 13:07:11 +0200
Subject: [ticket/10714] Fix core.add_log event

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 97d0aac623..92730aa7da 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -210,7 +210,7 @@ class phpbb_log implements phpbb_log_interface
 		if ($phpbb_dispatcher != null)
 		{
 			$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
-			extract($phpbb_dispatcher->trigger_event('core.add_log', $vars, $vars));
+			extract($phpbb_dispatcher->trigger_event('core.add_log', $vars));
 		}
 
 		// We didn't find a log_type, so we don't save it in the database.
-- 
cgit v1.2.1


From cf095dd393a6540d092c6308bc03aab824376562 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Aug 2012 13:12:50 +0200
Subject: [ticket/10714] Enable event core.get_logs_modify_entry_data

PHPBB3-10714
---
 phpBB/includes/log/log.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 92730aa7da..c95b334cad 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -402,14 +402,18 @@ class phpbb_log implements phpbb_log_interface
 			);
 
 			/**
-			* @todo: enable when events are merged
+			* Modify the entry's data before it is returned
 			*
+			* @event core.get_logs_modify_entry_data
+			* @var	array	row			Entry data from the database
+			* @var	array	log_entry_data	Entry's data which is returned
+			* @since 3.1-A1
+			*/
 			if ($phpbb_dispatcher != null)
 			{
-				$vars = array('log_entry_data', 'row');
-				extract($phpbb_dispatcher->trigger_event('core.get_logs_entry_data', $vars, $vars));
+				$vars = array('row', 'log_entry_data');
+				extract($phpbb_dispatcher->trigger_event('core.get_logs_modify_entry_data', $vars));
 			}
-			*/
 
 			$log[$i] = $log_entry_data;
 
-- 
cgit v1.2.1


From 701052481542cad1ab46fb5e48cf5bbd139030b8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Aug 2012 13:19:13 +0200
Subject: [ticket/10714] Enable event core.get_logs_get_additional_data

PHPBB3-10714
---
 phpBB/includes/log/log.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index c95b334cad..ef74f6aaf4 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -459,14 +459,21 @@ class phpbb_log implements phpbb_log_interface
 		$db->sql_freeresult($result);
 
 		/**
-		* @todo: enable when events are merged
+		* Get some additional data after we got all log entries
 		*
+		* @event core.get_logs_get_additional_data
+		* @var	array	log			Array with all our log entries
+		* @var	array	topic_id_list		Array of topic ids, for which we
+		*									get the permission data
+		* @var	array	reportee_id_list	Array of additional user IDs we
+		*									get the username strings for
+		* @since 3.1-A1
+		*/
 		if ($phpbb_dispatcher != null)
 		{
 			$vars = array('log', 'topic_id_list', 'reportee_id_list');
-			extract($phpbb_dispatcher->trigger_event('core.get_logs_additional_data', $vars, $vars));
+			extract($phpbb_dispatcher->trigger_event('core.get_logs_get_additional_data', $vars));
 		}
-		*/
 
 		if (sizeof($topic_id_list))
 		{
-- 
cgit v1.2.1


From 151346c6e053e925b5cfcf2845eca532509bbc80 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Aug 2012 13:25:26 +0200
Subject: [ticket/10714] Remove event core.function_add_log, add_log should be
 used instead

PHPBB3-10714
---
 phpBB/includes/functions.php | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c5a1543277..b5d0c4d62f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3398,18 +3398,6 @@ function add_log()
 		case 'user':
 			$additional_data['reportee_id'] = array_shift($args);
 		break;
-		default:
-			/**
-			* @todo: enable when events are merged
-			*
-			global $phpbb_dispatcher;
-
-			if ($phpbb_dispatcher != null)
-			{
-				$vars = array('mode', 'args', 'additional_data');
-				extract($phpbb_dispatcher->trigger_event('core.function_add_log', $vars, $vars));
-			}
-			*/
 	}
 	$log_operation = array_shift($args);
 	$additional_data = array_merge($additional_data, $args);
-- 
cgit v1.2.1


From 2afbec5ac425b8913c2d3e3193b195190b7185db Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Aug 2012 15:50:46 +0200
Subject: [ticket/10714] Always try to trigger events on phpbb_dispatcher

We may add the if () later again, if we decide to do that.

PHPBB3-10714
---
 phpBB/includes/log/log.php | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index ef74f6aaf4..780881ae13 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -207,11 +207,8 @@ class phpbb_log implements phpbb_log_interface
 		*							we won't add the entry to the database.
 		* @since 3.1-A1
 		*/
-		if ($phpbb_dispatcher != null)
-		{
-			$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
-			extract($phpbb_dispatcher->trigger_event('core.add_log', $vars));
-		}
+		$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
+		extract($phpbb_dispatcher->trigger_event('core.add_log', $vars));
 
 		// We didn't find a log_type, so we don't save it in the database.
 		if (!isset($sql_ary['log_type']))
@@ -310,11 +307,8 @@ class phpbb_log implements phpbb_log_interface
 		*								e.g.: 'AND l.forum_id = 1'
 		* @since 3.1-A1
 		*/
-		if ($phpbb_dispatcher != null)
-		{
-			$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
-			extract($phpbb_dispatcher->trigger_event('core.get_logs_modify_type', $vars));
-		}
+		$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
+		extract($phpbb_dispatcher->trigger_event('core.get_logs_modify_type', $vars));
 
 		if (!isset($log_type))
 		{
@@ -409,11 +403,8 @@ class phpbb_log implements phpbb_log_interface
 			* @var	array	log_entry_data	Entry's data which is returned
 			* @since 3.1-A1
 			*/
-			if ($phpbb_dispatcher != null)
-			{
-				$vars = array('row', 'log_entry_data');
-				extract($phpbb_dispatcher->trigger_event('core.get_logs_modify_entry_data', $vars));
-			}
+			$vars = array('row', 'log_entry_data');
+			extract($phpbb_dispatcher->trigger_event('core.get_logs_modify_entry_data', $vars));
 
 			$log[$i] = $log_entry_data;
 
@@ -469,11 +460,8 @@ class phpbb_log implements phpbb_log_interface
 		*									get the username strings for
 		* @since 3.1-A1
 		*/
-		if ($phpbb_dispatcher != null)
-		{
-			$vars = array('log', 'topic_id_list', 'reportee_id_list');
-			extract($phpbb_dispatcher->trigger_event('core.get_logs_get_additional_data', $vars));
-		}
+		$vars = array('log', 'topic_id_list', 'reportee_id_list');
+		extract($phpbb_dispatcher->trigger_event('core.get_logs_get_additional_data', $vars));
 
 		if (sizeof($topic_id_list))
 		{
-- 
cgit v1.2.1


From d289bc13acc0ab0329cac25742ae22560a80c607 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 21 Aug 2012 16:49:08 +0200
Subject: [ticket/10714] Remove dependency injection and use global instead

This avoids loading functions_admin.php globally and was suggested by naderman

PHPBB3-10714
---
 phpBB/includes/functions.php       | 19 +++++--------------
 phpBB/includes/functions_admin.php | 26 ++++++--------------------
 2 files changed, 11 insertions(+), 34 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b5d0c4d62f..e202273204 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3357,29 +3357,20 @@ function parse_cfg_file($filename, $lines = false)
 */
 function add_log()
 {
-	// This is all just an ugly hack to add "Dependency Injection" to a function
-	// the only real code is the function call which maps this function to a method.
-	static $static_log = null;
+	global $phpbb_log;
 
 	$args = func_get_args();
 	$log = (isset($args[0])) ? $args[0] : false;
 
-	if ($log instanceof phpbb_log_interface)
-	{
-		$static_log = $log;
-		return true;
-	}
-	else if ($log === false)
+	if ($log === false)
 	{
 		return false;
 	}
 
-	$tmp_log = $static_log;
-
 	// no log class set, create a temporary one ourselves to keep backwards compatability
-	if ($tmp_log === null)
+	if ($phpbb_log === null)
 	{
-		$tmp_log = new phpbb_log(LOG_TABLE);
+		$phpbb_log = new phpbb_log(LOG_TABLE);
 	}
 
 	$mode = array_shift($args);
@@ -3407,7 +3398,7 @@ function add_log()
 	$user_id = (empty($user->data)) ? ANONYMOUS : $user->data['user_id'];
 	$user_ip = (empty($user->ip)) ? '' : $user->ip;
 
-	return $tmp_log->add($mode, $user_id, $user_ip, $log_operation, time(), $additional_data);
+	return $phpbb_log->add($mode, $user_id, $user_ip, $log_operation, time(), $additional_data);
 }
 
 /**
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index e7aed85e15..2a87feed51 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2488,34 +2488,20 @@ function cache_moderators()
 */
 function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC', $keywords = '')
 {
-	// This is all just an ugly hack to add "Dependency Injection" to a function
-	// the only real code is the function call which maps this function to a method.
-	static $static_log = null;
-
-	if ($mode instanceof phpbb_log_interface)
-	{
-		$static_log = $mode;
-		return true;
-	}
-	else if ($mode === false)
-	{
-		return false;
-	}
-
-	$tmp_log = $static_log;
+	global $phpbb_log;
 
 	// no log class set, create a temporary one ourselves to keep backwards compatability
-	if ($tmp_log === null)
+	if ($phpbb_log === null)
 	{
-		$tmp_log = new phpbb_log(LOG_TABLE);
+		$phpbb_log = new phpbb_log(LOG_TABLE);
 	}
 
 	$count_logs = ($log_count !== false);
 
-	$log = $tmp_log->get_logs($mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $limit_days, $sort_by, $keywords);
-	$log_count = $tmp_log->get_log_count();
+	$log = $phpbb_log->get_logs($mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $limit_days, $sort_by, $keywords);
+	$log_count = $phpbb_log->get_log_count();
 
-	return $tmp_log->get_valid_offset();
+	return $phpbb_log->get_valid_offset();
 }
 
 /**
-- 
cgit v1.2.1


From b8c55291ed7ed86565be2bc651bf20eb1a9ed4dd Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Thu, 17 Jun 2010 23:58:18 -0500
Subject: [feature/soft-delete] Lay the groundwork for a soft-delete feature

So far, I've added no new functionality.  The biggest change here is adjusting the DB column names to "visibility" rather than "approved".  Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :)

PHPBB3-9657
---
 phpBB/includes/acp/acp_forums.php         |  8 ++--
 phpBB/includes/acp/acp_main.php           |  6 +--
 phpBB/includes/acp/acp_users.php          |  4 +-
 phpBB/includes/constants.php              |  4 ++
 phpBB/includes/functions_admin.php        | 77 +++++++++++++++++--------------
 phpBB/includes/functions_convert.php      |  6 +--
 phpBB/includes/functions_posting.php      | 64 ++++++++++++-------------
 phpBB/includes/mcp/mcp_forum.php          | 10 ++--
 phpBB/includes/mcp/mcp_front.php          |  4 +-
 phpBB/includes/mcp/mcp_main.php           | 12 ++---
 phpBB/includes/mcp/mcp_post.php           |  4 +-
 phpBB/includes/mcp/mcp_queue.php          | 12 ++---
 phpBB/includes/mcp/mcp_reports.php        |  2 +-
 phpBB/includes/mcp/mcp_topic.php          | 22 ++++-----
 phpBB/includes/search/fulltext_mysql.php  | 14 +++---
 phpBB/includes/search/fulltext_native.php | 15 +++---
 16 files changed, 142 insertions(+), 122 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index c6dbf5eb9c..622d84d15e 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -314,7 +314,7 @@ class acp_forums
 					$end = $start + $batch_size;
 
 					// Sync all topics in batch mode...
-					sync('topic_approved', 'range', 'topic_id BETWEEN ' . $start . ' AND ' . $end, true, false);
+					sync('topic_visibility', 'range', 'topic_id BETWEEN ' . $start . ' AND ' . $end, true, false);
 					sync('topic', 'range', 'topic_id BETWEEN ' . $start . ' AND ' . $end, true, true);
 
 					if ($end < $row2['max_topic_id'])
@@ -1793,7 +1793,7 @@ class acp_forums
 			FROM ' . POSTS_TABLE . '
 			WHERE forum_id = ' . $forum_id . '
 				AND post_postcount = 1
-				AND post_approved = 1';
+				AND post_visibility = ' . ITEM_APPROVED;
 		$result = $db->sql_query($sql);
 
 		$post_counts = array();
@@ -1931,7 +1931,7 @@ class acp_forums
 		// Make sure the overall post/topic count is correct...
 		$sql = 'SELECT COUNT(post_id) AS stat
 			FROM ' . POSTS_TABLE . '
-			WHERE post_approved = 1';
+			WHERE post_visibility = ' . ITEM_APPROVED;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
@@ -1940,7 +1940,7 @@ class acp_forums
 
 		$sql = 'SELECT COUNT(topic_id) AS stat
 			FROM ' . TOPICS_TABLE . '
-			WHERE topic_approved = 1';
+			WHERE topic_visibility = ' . ITEM_APPROVED;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index eb613535bf..0584bb510e 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -144,14 +144,14 @@ class acp_main
 
 						$sql = 'SELECT COUNT(post_id) AS stat
 							FROM ' . POSTS_TABLE . '
-							WHERE post_approved = 1';
+							WHERE post_visibility = ' . ITEM_APPROVED;
 						$result = $db->sql_query($sql);
 						set_config('num_posts', (int) $db->sql_fetchfield('stat'), true);
 						$db->sql_freeresult($result);
 
 						$sql = 'SELECT COUNT(topic_id) AS stat
 							FROM ' . TOPICS_TABLE . '
-							WHERE topic_approved = 1';
+							WHERE topic_visibility = ' . ITEM_APPROVED;
 						$result = $db->sql_query($sql);
 						set_config('num_topics', (int) $db->sql_fetchfield('stat'), true);
 						$db->sql_freeresult($result);
@@ -232,7 +232,7 @@ class acp_main
 							$sql = 'SELECT COUNT(post_id) AS num_posts, poster_id
 								FROM ' . POSTS_TABLE . '
 								WHERE post_id BETWEEN ' . ($start + 1) . ' AND ' . ($start + $step) . '
-									AND post_postcount = 1 AND post_approved = 1
+									AND post_postcount = 1 AND post_visibility = ' . ITEM_APPROVED . '
 								GROUP BY poster_id';
 							$result = $db->sql_query($sql);
 
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index b54257b04a..304027df45 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -676,7 +676,7 @@ class acp_users
 										'topic_time'				=> time(),
 										'forum_id' 					=> $new_forum_id,
 										'icon_id'					=> 0,
-										'topic_approved'			=> 1,
+										'topic_visibility'			=> ITEM_APPROVED,
 										'topic_title' 				=> $post_ary['title'],
 										'topic_first_poster_name'	=> $user_row['username'],
 										'topic_type'				=> POST_NORMAL,
@@ -1033,7 +1033,7 @@ class acp_users
 				$sql = 'SELECT COUNT(post_id) as posts_in_queue
 					FROM ' . POSTS_TABLE . '
 					WHERE poster_id = ' . $user_id . '
-						AND post_approved = 0';
+						AND post_visibility = ' . ITEM_UNAPPROVED;
 				$result = $db->sql_query($sql);
 				$user_row['posts_in_queue'] = (int) $db->sql_fetchfield('posts_in_queue');
 				$db->sql_freeresult($result);
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 68af41ab20..62c06dc1d0 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -87,6 +87,10 @@ define('ITEM_UNLOCKED', 0);
 define('ITEM_LOCKED', 1);
 define('ITEM_MOVED', 2);
 
+define('ITEM_UNAPPROVED', 0); // => has not yet been approved
+define('ITEM_APPROVED', 1); // => has been approved, and has not been soft deleted
+define('ITEM_DELETED', 2); // => has been soft deleted
+
 // Forum Flags
 define('FORUM_FLAG_LINK_TRACK', 1);
 define('FORUM_FLAG_PRUNE_POLL', 2);
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 5e2ee8c8f6..328c8e9778 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -644,7 +644,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 		'posts' => ($call_delete_posts) ? delete_posts($where_type, $where_ids, false, true, $post_count_sync, false) : 0,
 	);
 
-	$sql = 'SELECT topic_id, forum_id, topic_approved, topic_moved_id
+	$sql = 'SELECT topic_id, forum_id, topic_visibility, topic_moved_id
 		FROM ' . TOPICS_TABLE . '
 		WHERE ' . $where_clause;
 	$result = $db->sql_query($sql);
@@ -654,7 +654,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 		$forum_ids[] = $row['forum_id'];
 		$topic_ids[] = $row['topic_id'];
 
-		if ($row['topic_approved'] && !$row['topic_moved_id'])
+		if ($row['topic_visibility'] == ITEM_APPROVED && !$row['topic_moved_id'])
 		{
 			$approved_topics++;
 		}
@@ -767,7 +767,7 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 	$approved_posts = 0;
 	$post_ids = $topic_ids = $forum_ids = $post_counts = $remove_topics = array();
 
-	$sql = 'SELECT post_id, poster_id, post_approved, post_postcount, topic_id, forum_id
+	$sql = 'SELECT post_id, poster_id, post_visibility, post_postcount, topic_id, forum_id
 		FROM ' . POSTS_TABLE . '
 		WHERE ' . $where_clause;
 	$result = $db->sql_query($sql);
@@ -779,12 +779,12 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 		$topic_ids[] = (int) $row['topic_id'];
 		$forum_ids[] = (int) $row['forum_id'];
 
-		if ($row['post_postcount'] && $post_count_sync && $row['post_approved'])
+		if ($row['post_postcount'] && $post_count_sync && $row['post_visibility'] == ITEM_APPROVED)
 		{
 			$post_counts[$row['poster_id']] = (!empty($post_counts[$row['poster_id']])) ? $post_counts[$row['poster_id']] + 1 : 1;
 		}
 
-		if ($row['post_approved'])
+		if ($row['post_visibility'] == ITEM_APPROVED)
 		{
 			$approved_posts++;
 		}
@@ -1274,7 +1274,7 @@ function phpbb_unlink($filename, $mode = 'file', $entry_removed = false)
 * - forum				Resync complete forum
 * - topic				Resync topics
 * - topic_moved			Removes topic shadows that would be in the same forum as the topic they link to
-* - topic_approved		Resyncs the topic_approved flag according to the status of the first post
+* - topic_visibility	Resyncs the topic_visibility flag according to the status of the first post
 * - post_reported		Resyncs the post_reported flag, relying on actual reports
 * - topic_reported		Resyncs the topic_reported flag, relying on post_reported flags
 * - post_attachement	Same as post_reported, but with attachment flags
@@ -1294,7 +1294,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 		$where_ids = ($where_ids) ? array((int) $where_ids) : array();
 	}
 
-	if ($mode == 'forum' || $mode == 'topic' || $mode == 'topic_approved' || $mode == 'topic_reported' || $mode == 'post_reported')
+	if ($mode == 'forum' || $mode == 'topic' || $mode == 'topic_visibility' || $mode == 'topic_reported' || $mode == 'post_reported')
 	{
 		if (!$where_type)
 		{
@@ -1380,7 +1380,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			$db->sql_transaction('commit');
 			break;
 
-		case 'topic_approved':
+		case 'topic_visibility':
 
 			$db->sql_transaction('begin');
 			switch ($db->sql_layer)
@@ -1388,22 +1388,22 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				case 'mysql4':
 				case 'mysqli':
 					$sql = 'UPDATE ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-						SET t.topic_approved = p.post_approved
+						SET t.topic_visibility = p.post_visibility
 						$where_sql_and t.topic_first_post_id = p.post_id";
 					$db->sql_query($sql);
 				break;
 
 				default:
-					$sql = 'SELECT t.topic_id, p.post_approved
+					$sql = 'SELECT t.topic_id, p.post_visibility
 						FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
 						$where_sql_and p.post_id = t.topic_first_post_id
-							AND p.post_approved <> t.topic_approved";
+							AND p.post_visibility <> t.topic_visibility";
 					$result = $db->sql_query($sql);
 
 					$topic_ids = array();
 					while ($row = $db->sql_fetchrow($result))
 					{
-						$topic_ids[] = $row['topic_id'];
+						$topic_ids[$row['topic_id']] = $row['post_visibility'];
 					}
 					$db->sql_freeresult($result);
 
@@ -1412,10 +1412,13 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 						return;
 					}
 
-					$sql = 'UPDATE ' . TOPICS_TABLE . '
-						SET topic_approved = 1 - topic_approved
-						WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
-					$db->sql_query($sql);
+					foreach ($topic_ids as $topic_id => $visibility)
+					{
+						$sql = 'UPDATE ' . TOPICS_TABLE . '
+							SET topic_visibility = ' . $visibility . '
+							WHERE topic_id' . $topic_id;
+						$db->sql_query($sql);
+					}
 				break;
 			}
 
@@ -1680,10 +1683,10 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			// 2: Get topic counts for each forum (optional)
 			if ($sync_extra)
 			{
-				$sql = 'SELECT forum_id, topic_approved, COUNT(topic_id) AS forum_topics
+				$sql = 'SELECT forum_id, topic_visibility, COUNT(topic_id) AS forum_topics
 					FROM ' . TOPICS_TABLE . '
 					WHERE ' . $db->sql_in_set('forum_id', $forum_ids) . '
-					GROUP BY forum_id, topic_approved';
+					GROUP BY forum_id, topic_visibility';
 				$result = $db->sql_query($sql);
 
 				while ($row = $db->sql_fetchrow($result))
@@ -1691,7 +1694,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 					$forum_id = (int) $row['forum_id'];
 					$forum_data[$forum_id]['topics_real'] += $row['forum_topics'];
 
-					if ($row['topic_approved'])
+					if ($row['topic_visibility'] == ITEM_APPROVED)
 					{
 						$forum_data[$forum_id]['topics'] = $row['forum_topics'];
 					}
@@ -1707,7 +1710,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 					$sql = 'SELECT SUM(t.topic_replies + 1) AS forum_posts
 						FROM ' . TOPICS_TABLE . ' t
 						WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
-							AND t.topic_approved = 1
+							AND t.topic_visibility = ' . ITEM_APPROVED . '
 							AND t.topic_status <> ' . ITEM_MOVED;
 				}
 				else
@@ -1715,7 +1718,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 					$sql = 'SELECT t.forum_id, SUM(t.topic_replies + 1) AS forum_posts
 						FROM ' . TOPICS_TABLE . ' t
 						WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
-							AND t.topic_approved = 1
+							AND t.topic_visibility = ' . ITEM_APPROVED . '
 							AND t.topic_status <> ' . ITEM_MOVED . '
 						GROUP BY t.forum_id';
 				}
@@ -1737,14 +1740,14 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				$sql = 'SELECT MAX(t.topic_last_post_id) as last_post_id
 					FROM ' . TOPICS_TABLE . ' t
 					WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
-						AND t.topic_approved = 1';
+						AND t.topic_visibility = ' . ITEM_APPROVED;
 			}
 			else
 			{
 				$sql = 'SELECT t.forum_id, MAX(t.topic_last_post_id) as last_post_id
 					FROM ' . TOPICS_TABLE . ' t
 					WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
-						AND t.topic_approved = 1
+						AND t.topic_visibility = ' . ITEM_APPROVED . '
 					GROUP BY t.forum_id';
 			}
 
@@ -1846,7 +1849,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 			$db->sql_transaction('begin');
 
-			$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_approved, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_replies, t.topic_replies_real, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
+			$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_visibility, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_replies, t.topic_replies_real, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
 				FROM ' . TOPICS_TABLE . " t
 				$where_sql";
 			$result = $db->sql_query($sql);
@@ -1880,10 +1883,10 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 			// Use "t" as table alias because of the $where_sql clause
 			// NOTE: 't.post_approved' in the GROUP BY is causing a major slowdown.
-			$sql = 'SELECT t.topic_id, t.post_approved, COUNT(t.post_id) AS total_posts, MIN(t.post_id) AS first_post_id, MAX(t.post_id) AS last_post_id
+			$sql = 'SELECT t.topic_id, t.post_visibility, COUNT(t.post_id) AS total_posts, MIN(t.post_id) AS first_post_id, MAX(t.post_id) AS last_post_id
 				FROM ' . POSTS_TABLE . " t
 				$where_sql
-				GROUP BY t.topic_id, t.post_approved";
+				GROUP BY t.topic_id, t.post_visibility";
 			$result = $db->sql_query($sql);
 
 			while ($row = $db->sql_fetchrow($result))
@@ -1907,7 +1910,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 					$topic_data[$topic_id]['replies_real'] += $row['total_posts'];
 					$topic_data[$topic_id]['first_post_id'] = (!$topic_data[$topic_id]['first_post_id']) ? $row['first_post_id'] : min($topic_data[$topic_id]['first_post_id'], $row['first_post_id']);
 
-					if ($row['post_approved'] || !$topic_data[$topic_id]['last_post_id'])
+					if ($row['post_visibility'] || !$topic_data[$topic_id]['last_post_id'])
 					{
 						$topic_data[$topic_id]['replies'] = $row['total_posts'] - 1;
 						$topic_data[$topic_id]['last_post_id'] = $row['last_post_id'];
@@ -1952,7 +1955,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				unset($delete_topics, $delete_topic_ids);
 			}
 
-			$sql = 'SELECT p.post_id, p.topic_id, p.post_approved, p.poster_id, p.post_subject, p.post_username, p.post_time, u.username, u.user_colour
+			$sql = 'SELECT p.post_id, p.topic_id, p.post_visibility, p.poster_id, p.post_subject, p.post_username, p.post_time, u.username, u.user_colour
 				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
 				WHERE ' . $db->sql_in_set('p.post_id', $post_ids) . '
 					AND u.user_id = p.poster_id';
@@ -1965,9 +1968,9 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 				if ($row['post_id'] == $topic_data[$topic_id]['first_post_id'])
 				{
-					if ($topic_data[$topic_id]['topic_approved'] != $row['post_approved'])
+					if ($topic_data[$topic_id]['topic_visibility'] != $row['post_visibility'])
 					{
-						$approved_unapproved_ids[] = $topic_id;
+						$approved_unapproved_ids[$topic_id] = $row['post_visibility'];
 					}
 					$topic_data[$topic_id]['time'] = $row['post_time'];
 					$topic_data[$topic_id]['poster'] = $row['poster_id'];
@@ -2029,7 +2032,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				$sync_shadow_topics = array();
 				if (sizeof($post_ids))
 				{
-					$sql = 'SELECT p.post_id, p.topic_id, p.post_approved, p.poster_id, p.post_subject, p.post_username, p.post_time, u.username, u.user_colour
+					$sql = 'SELECT p.post_id, p.topic_id, p.post_visibility, p.poster_id, p.post_subject, p.post_username, p.post_time, u.username, u.user_colour
 						FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
 						WHERE ' . $db->sql_in_set('p.post_id', $post_ids) . '
 							AND u.user_id = p.poster_id';
@@ -2099,10 +2102,14 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			// approved becomes unapproved, and vice-versa
 			if (sizeof($approved_unapproved_ids))
 			{
-				$sql = 'UPDATE ' . TOPICS_TABLE . '
-					SET topic_approved = 1 - topic_approved
-					WHERE ' . $db->sql_in_set('topic_id', $approved_unapproved_ids);
-				$db->sql_query($sql);
+				foreach ($approved_unapproved_ids as $update_topic_id => $status)
+				{
+					// @TODO: Consider grouping by $status and only running 3 queries
+    				$sql = 'UPDATE ' . TOPICS_TABLE . '
+						SET topic_visibility = ' . $status . '
+						WHERE topic_id = ' . $update_topic_id;
+					$db->sql_query($sql);
+				}
 			}
 			unset($approved_unapproved_ids);
 
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index ac791e0d9b..a34a193f60 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -1768,7 +1768,7 @@ function sync_post_count($offset, $limit)
 	$sql = 'SELECT COUNT(post_id) AS num_posts, poster_id
 			FROM ' . POSTS_TABLE . '
 			WHERE post_postcount = 1
-				AND post_approved = 1
+				AND post_visibility = ' . ITEM_APPROVED . '
 			GROUP BY poster_id
 			ORDER BY poster_id';
 	$result = $db->sql_query_limit($sql, $limit, $offset);
@@ -1941,7 +1941,7 @@ function update_dynamic_config()
 
 	$sql = 'SELECT COUNT(post_id) AS stat
 		FROM ' . POSTS_TABLE . '
-		WHERE post_approved = 1';
+		WHERE post_visibility = ' . ITEM_APPROVED;
 	$result = $db->sql_query($sql);
 	$row = $db->sql_fetchrow($result);
 	$db->sql_freeresult($result);
@@ -1950,7 +1950,7 @@ function update_dynamic_config()
 
 	$sql = 'SELECT COUNT(topic_id) AS stat
 		FROM ' . TOPICS_TABLE . '
-		WHERE topic_approved = 1';
+		WHERE topic_visibility = ' . ITEM_APPROVED;
 	$result = $db->sql_query($sql);
 	$row = $db->sql_fetchrow($result);
 	$db->sql_freeresult($result);
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index c50395a5df..2f51200b48 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -176,7 +176,7 @@ function update_post_information($type, $ids, $return_update_sql = false)
 	if ($type != 'topic')
 	{
 		$topic_join = ', ' . TOPICS_TABLE . ' t';
-		$topic_condition = 'AND t.topic_id = p.topic_id AND t.topic_approved = 1';
+		$topic_condition = 'AND t.topic_id = p.topic_id AND t.topic_visibility = ' . ITEM_APPROVED;
 	}
 	else
 	{
@@ -190,7 +190,7 @@ function update_post_information($type, $ids, $return_update_sql = false)
 			FROM ' . POSTS_TABLE . " p $topic_join
 			WHERE " . $db->sql_in_set('p.' . $type . '_id', $ids) . "
 				$topic_condition
-				AND p.post_approved = 1";
+				AND p.post_visibility = " . ITEM_APPROVED;
 	}
 	else
 	{
@@ -198,7 +198,7 @@ function update_post_information($type, $ids, $return_update_sql = false)
 			FROM ' . POSTS_TABLE . " p $topic_join
 			WHERE " . $db->sql_in_set('p.' . $type . '_id', $ids) . "
 				$topic_condition
-				AND p.post_approved = 1
+				AND p.post_visibility = " . ITEM_APPROVED . "
 			GROUP BY p.{$type}_id";
 	}
 	$result = $db->sql_query($sql);
@@ -993,7 +993,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 	$sql = 'SELECT p.post_id
 		FROM ' . POSTS_TABLE . ' p' . "
 		WHERE p.topic_id = $topic_id
-			" . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . '
+			AND " . topic_visibility::get_visibility_sql('post', $forum_id, 'p.') . '
 			' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . '
 			' . (($mode == 'post_review_edit') ? " AND p.post_id = $cur_post_id" : '') . '
 		ORDER BY p.post_time ';
@@ -1489,7 +1489,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 			delete_topics('topic_id', array($topic_id), false);
 
 			$sql_data[FORUMS_TABLE] .= 'forum_topics_real = forum_topics_real - 1';
-			$sql_data[FORUMS_TABLE] .= ($data['topic_approved']) ? ', forum_posts = forum_posts - 1, forum_topics = forum_topics - 1' : '';
+			$sql_data[FORUMS_TABLE] .= ($data['topic_visibility'] == ITEM_APPROVED) ? ', forum_posts = forum_posts - 1, forum_topics = forum_topics - 1' : '';
 
 			$update_sql = update_post_information('forum', $forum_id, true);
 			if (sizeof($update_sql))
@@ -1509,18 +1509,18 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 			$row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
 
-			$sql_data[FORUMS_TABLE] = ($data['post_approved']) ? 'forum_posts = forum_posts - 1' : '';
+			$sql_data[FORUMS_TABLE] = ($data['post_visibility'] == ITEM_APPROVED) ? 'forum_posts = forum_posts - 1' : '';
 
 			$sql_data[TOPICS_TABLE] = 'topic_poster = ' . intval($row['poster_id']) . ', topic_first_post_id = ' . intval($row['post_id']) . ", topic_first_poster_colour = '" . $db->sql_escape($row['user_colour']) . "', topic_first_poster_name = '" . (($row['poster_id'] == ANONYMOUS) ? $db->sql_escape($row['post_username']) : $db->sql_escape($row['username'])) . "', topic_time = " . (int) $row['post_time'];
 
 			// Decrementing topic_replies here is fine because this case only happens if there is more than one post within the topic - basically removing one "reply"
-			$sql_data[TOPICS_TABLE] .= ', topic_replies_real = topic_replies_real - 1' . (($data['post_approved']) ? ', topic_replies = topic_replies - 1' : '');
+			$sql_data[TOPICS_TABLE] .= ', topic_replies_real = topic_replies_real - 1' . (($data['post_visibility'] == ITEM_APPROVED) ? ', topic_replies = topic_replies - 1' : '');
 
 			$next_post_id = (int) $row['post_id'];
 		break;
 
 		case 'delete_last_post':
-			$sql_data[FORUMS_TABLE] = ($data['post_approved']) ? 'forum_posts = forum_posts - 1' : '';
+			$sql_data[FORUMS_TABLE] = ($data['post_visibility'] == ITEM_APPROVED) ? 'forum_posts = forum_posts - 1' : '';
 
 			$update_sql = update_post_information('forum', $forum_id, true);
 			if (sizeof($update_sql))
@@ -1529,7 +1529,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 				$sql_data[FORUMS_TABLE] .= implode(', ', $update_sql[$forum_id]);
 			}
 
-			$sql_data[TOPICS_TABLE] = 'topic_bumped = 0, topic_bumper = 0, topic_replies_real = topic_replies_real - 1' . (($data['post_approved']) ? ', topic_replies = topic_replies - 1' : '');
+			$sql_data[TOPICS_TABLE] = 'topic_bumped = 0, topic_bumper = 0, topic_replies_real = topic_replies_real - 1' . (($data['post_visibility'] == ITEM_APPROVED) ? ', topic_replies = topic_replies - 1' : '');
 
 			$update_sql = update_post_information('topic', $topic_id, true);
 			if (sizeof($update_sql))
@@ -1541,8 +1541,8 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 			{
 				$sql = 'SELECT MAX(post_id) as last_post_id
 					FROM ' . POSTS_TABLE . "
-					WHERE topic_id = $topic_id " .
-						((!$auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : '');
+					WHERE topic_id = $topic_id
+						AND " . topic_visibility::get_visibility_sql('post', $forum_id);
 				$result = $db->sql_query($sql);
 				$row = $db->sql_fetchrow($result);
 				$db->sql_freeresult($result);
@@ -1554,17 +1554,17 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 		case 'delete':
 			$sql = 'SELECT post_id
 				FROM ' . POSTS_TABLE . "
-				WHERE topic_id = $topic_id " .
-					((!$auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : '') . '
+				WHERE topic_id = $topic_id
+					AND " . topic_visibility::get_visibility_sql('post', $forum_id) . '
 					AND post_time > ' . $data['post_time'] . '
 				ORDER BY post_time ASC';
 			$result = $db->sql_query_limit($sql, 1);
 			$row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
 
-			$sql_data[FORUMS_TABLE] = ($data['post_approved']) ? 'forum_posts = forum_posts - 1' : '';
+			$sql_data[FORUMS_TABLE] = ($data['post_visibility'] == ITEM_APPROVED) ? 'forum_posts = forum_posts - 1' : '';
 
-			$sql_data[TOPICS_TABLE] = 'topic_replies_real = topic_replies_real - 1' . (($data['post_approved']) ? ', topic_replies = topic_replies - 1' : '');
+			$sql_data[TOPICS_TABLE] = 'topic_replies_real = topic_replies_real - 1' . (($data['post_visibility'] == ITEM_APPROVED) ? ', topic_replies = topic_replies - 1' : '');
 			$next_post_id = (int) $row['post_id'];
 		break;
 	}
@@ -1674,9 +1674,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	$poster_id = ($mode == 'edit') ? $data['poster_id'] : (int) $user->data['user_id'];
 
 	// Retrieve some additional information if not present
-	if ($mode == 'edit' && (!isset($data['post_approved']) || !isset($data['topic_approved']) || $data['post_approved'] === false || $data['topic_approved'] === false))
+	if ($mode == 'edit' && (!isset($data['post_visibility']) || !isset($data['topic_visibility']) || $data['post_visibility'] === false || $data['topic_visibility'] === false))
 	{
-		$sql = 'SELECT p.post_approved, t.topic_type, t.topic_replies, t.topic_replies_real, t.topic_approved
+		$sql = 'SELECT p.post_visibility, t.topic_type, t.topic_replies, t.topic_replies_real, t.topic_visibility
 			FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p
 			WHERE t.topic_id = p.topic_id
 				AND p.post_id = ' . $data['post_id'];
@@ -1684,8 +1684,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		$topic_row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
 
-		$data['topic_approved'] = $topic_row['topic_approved'];
-		$data['post_approved'] = $topic_row['post_approved'];
+		$data['topic_visibility'] = $topic_row['topic_visibility'];
+		$data['post_visibility'] = $topic_row['post_visibility'];
 	}
 
 	// This variable indicates if the user is able to post or put into the queue - it is used later for all code decisions regarding approval
@@ -1719,7 +1719,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				'icon_id'			=> $data['icon_id'],
 				'poster_ip'			=> $user->ip,
 				'post_time'			=> $current_time,
-				'post_approved'		=> $post_approval,
+				'post_visibility'	=> $post_approval,
 				'enable_bbcode'		=> $data['enable_bbcode'],
 				'enable_smilies'	=> $data['enable_smilies'],
 				'enable_magic_url'	=> $data['enable_urls'],
@@ -1785,7 +1785,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				'forum_id'			=> $data['forum_id'],
 				'poster_id'			=> $data['poster_id'],
 				'icon_id'			=> $data['icon_id'],
-				'post_approved'		=> (!$post_approval) ? 0 : $data['post_approved'],
+				'post_visibility'	=> (!$post_approval) ? 0 : $data['post_visibility'],
 				'enable_bbcode'		=> $data['enable_bbcode'],
 				'enable_smilies'	=> $data['enable_smilies'],
 				'enable_magic_url'	=> $data['enable_urls'],
@@ -1807,7 +1807,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		break;
 	}
 
-	$post_approved = $sql_data[POSTS_TABLE]['sql']['post_approved'];
+	$post_approved = $sql_data[POSTS_TABLE]['sql']['post_visibility'];
 	$topic_row = array();
 
 	// And the topic ladies and gentlemen
@@ -1820,7 +1820,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				'topic_last_view_time'		=> $current_time,
 				'forum_id'					=> $data['forum_id'],
 				'icon_id'					=> $data['icon_id'],
-				'topic_approved'			=> $post_approval,
+				'topic_visibility'			=> $post_approval,
 				'topic_title'				=> $subject,
 				'topic_first_poster_name'	=> (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''),
 				'topic_first_poster_colour'	=> $user->data['user_colour'],
@@ -1897,7 +1897,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			$sql_data[TOPICS_TABLE]['sql'] = array(
 				'forum_id'					=> $data['forum_id'],
 				'icon_id'					=> $data['icon_id'],
-				'topic_approved'			=> (!$post_approval) ? 0 : $data['topic_approved'],
+				'topic_visibility'			=> (!$post_approval) ? 0 : $data['topic_visibility'],
 				'topic_title'				=> $subject,
 				'topic_first_poster_name'	=> $username,
 				'topic_type'				=> $topic_type,
@@ -1913,12 +1913,12 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			);
 
 			// Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved
-			if (!$post_approval && $data['topic_approved'])
+			if (!$post_approval && $data['topic_visibility'] == ITEM_APPROVED)
 			{
 				// Do we need to grab some topic informations?
 				if (!sizeof($topic_row))
 				{
-					$sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_approved
+					$sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_visibility
 						FROM ' . TOPICS_TABLE . '
 						WHERE topic_id = ' . $data['topic_id'];
 					$result = $db->sql_query($sql);
@@ -1949,7 +1949,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		case 'edit_last_post':
 
 			// Correctly set back the topic replies and forum posts... but only if the post was approved before.
-			if (!$post_approval && $data['post_approved'])
+			if (!$post_approval && $data['post_visibility'] == ITEM_APPROVED)
 			{
 				$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1';
@@ -2173,7 +2173,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 
 	// we need to update the last forum information
 	// only applicable if the topic is approved
-	if ($post_approved || !$data['post_approved'])
+	if ($post_approved || $data['post_visibility'] != ITEM_APPROVED)
 	{
 		// the last post makes us update the forum table. This can happen if...
 		// We make a new topic
@@ -2219,13 +2219,13 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape($username) . "'";
 					}
 				}
-				else if ($data['post_approved'] !== $post_approved)
+				else if ($data['post_visibility'] !== $post_approved)
 				{
 					// we need a fresh change of socks, everything has become invalidated
 					$sql = 'SELECT MAX(topic_last_post_id) as last_post_id
 						FROM ' . TOPICS_TABLE . '
 						WHERE forum_id = ' . (int) $data['forum_id'] . '
-							AND topic_approved = 1';
+							AND topic_visibility = ' . ITEM_APPROVED;
 					$result = $db->sql_query($sql);
 					$row = $db->sql_fetchrow($result);
 					$db->sql_freeresult($result);
@@ -2290,13 +2290,13 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			}
 		}
 	}
-	else if (!$data['post_approved'] && ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies'])))
+	else if (!$data['post_visibility'] == ITEM_APPROVED && ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies'])))
 	{
 		// like having the rug pulled from under us
 		$sql = 'SELECT MAX(post_id) as last_post_id
 			FROM ' . POSTS_TABLE . '
 			WHERE topic_id = ' . (int) $data['topic_id'] . '
-				AND post_approved = 1';
+				AND post_visibility = ' . ITEM_APPROVED;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 7b3bc82093..48b9c7c2d3 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -154,7 +154,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 	$sql = 'SELECT t.topic_id
 		FROM ' . TOPICS_TABLE . ' t
 		WHERE t.forum_id = ' . $forum_id . '
-			' . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . "
+			' . topic_visibility::get_visibility_sql('topic', $forum_id, 't.') . "
 			$limit_time_sql
 		ORDER BY t.topic_type DESC, $sort_order_sql";
 	$result = $db->sql_query_limit($sql, $topics_per_page, $start);
@@ -220,9 +220,10 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 		$topic_title = censor_text($row['topic_title']);
 
-		$topic_unapproved = (!$row['topic_approved'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
-		$posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
+		$topic_unapproved = ($row['topic_visibility'] == ITEM_UNAPPROVED  && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
+		$posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
 		$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? $url . '&amp;i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . '&amp;t=' . $row['topic_id'] : '';
+		$topic_deleted = ($row['topic_visibility'] == ITEM_DELETED) ? true : false;
 
 		$topic_row = array(
 			'ATTACH_ICON_IMG'		=> ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
@@ -232,6 +233,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 			'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
 			'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
 			'UNAPPROVED_IMG'		=> ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
+			'DELETED_IMG'           => ($topic_deleted) ? $user->img(/*TODO*/) : '',
 
 			'TOPIC_AUTHOR'				=> get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
 			'TOPIC_AUTHOR_COLOUR'		=> get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
@@ -254,7 +256,9 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 			'S_TOPIC_REPORTED'		=> (!empty($row['topic_reported']) && empty($row['topic_moved_id']) && $auth->acl_get('m_report', $row['forum_id'])) ? true : false,
 			'S_TOPIC_UNAPPROVED'	=> $topic_unapproved,
 			'S_POSTS_UNAPPROVED'	=> $posts_unapproved,
+			'S_TOPIC_DELETED'       => $topic_deleted,
 			'S_UNREAD_TOPIC'		=> $unread_topic,
+
 		);
 
 		if ($row['topic_status'] == ITEM_MOVED)
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index 13398e62bc..1b9521674d 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -39,7 +39,7 @@ function mcp_front_view($id, $mode, $action)
 			$sql = 'SELECT COUNT(post_id) AS total
 				FROM ' . POSTS_TABLE . '
 				WHERE ' . $db->sql_in_set('forum_id', $forum_list) . '
-					AND post_approved = 0';
+					AND post_visibility = ' . ITEM_UNAPPROVED;
 			$result = $db->sql_query($sql);
 			$total = (int) $db->sql_fetchfield('total');
 			$db->sql_freeresult($result);
@@ -60,7 +60,7 @@ function mcp_front_view($id, $mode, $action)
 				$sql = 'SELECT post_id
 					FROM ' . POSTS_TABLE . '
 					WHERE ' . $db->sql_in_set('forum_id', $forum_list) . '
-						AND post_approved = 0
+						AND post_visibility = ' . ITEM_UNAPPROVED . '
 					ORDER BY post_time DESC';
 				$result = $db->sql_query_limit($sql, 5);
 
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 95ca7c2e1b..db9872e04e 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -475,7 +475,7 @@ function mcp_move_topic($topic_ids)
 
 		foreach ($topic_data as $topic_id => $topic_info)
 		{
-			if ($topic_info['topic_approved'])
+			if ($topic_info['topic_visibility'] == ITEM_APPROVED)
 			{
 				$topics_authed_moved++;
 				$topic_posts_added++;
@@ -486,7 +486,7 @@ function mcp_move_topic($topic_ids)
 			$topics_removed++;
 			$topic_posts_removed += $topic_info['topic_replies'];
 
-			if ($topic_info['topic_approved'])
+			if ($topic_info['topic_visibility'] == ITEM_APPROVED)
 			{
 				$topics_authed_removed++;
 				$topic_posts_removed++;
@@ -528,13 +528,13 @@ function mcp_move_topic($topic_ids)
 			add_log('mod', $to_forum_id, $topic_id, 'LOG_MOVE', $row['forum_name'], $forum_data['forum_name']);
 
 			// Leave a redirection if required and only if the topic is visible to users
-			if ($leave_shadow && $row['topic_approved'] && $row['topic_type'] != POST_GLOBAL)
+			if ($leave_shadow && $row['topic_visibility'] == ITEM_APPROVED && $row['topic_type'] != POST_GLOBAL)
 			{
 				$shadow = array(
 					'forum_id'				=>	(int) $row['forum_id'],
 					'icon_id'				=>	(int) $row['icon_id'],
 					'topic_attachment'		=>	(int) $row['topic_attachment'],
-					'topic_approved'		=>	1, // a shadow topic is always approved
+					'topic_visibliity'		=>	ITEM_APPROVED, // a shadow topic is always approved
 					'topic_reported'		=>	0, // a shadow topic is never reported
 					'topic_title'			=>	(string) $row['topic_title'],
 					'topic_poster'			=>	(int) $row['topic_poster'],
@@ -932,7 +932,7 @@ function mcp_fork_topic($topic_ids)
 				'forum_id'					=> (int) $to_forum_id,
 				'icon_id'					=> (int) $topic_row['icon_id'],
 				'topic_attachment'			=> (int) $topic_row['topic_attachment'],
-				'topic_approved'			=> 1,
+				'topic_visibility'			=> ITEM_APPROVED,
 				'topic_reported'			=> 0,
 				'topic_title'				=> (string) $topic_row['topic_title'],
 				'topic_poster'				=> (int) $topic_row['topic_poster'],
@@ -1009,7 +1009,7 @@ function mcp_fork_topic($topic_ids)
 					'icon_id'			=> (int) $row['icon_id'],
 					'poster_ip'			=> (string) $row['poster_ip'],
 					'post_time'			=> (int) $row['post_time'],
-					'post_approved'		=> 1,
+					'post_visibility'	=> ITEM_APPROVED,
 					'post_reported'		=> 0,
 					'enable_bbcode'		=> (int) $row['enable_bbcode'],
 					'enable_smilies'	=> (int) $row['enable_smilies'],
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 520c964228..90ce18de4e 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -185,7 +185,7 @@ function mcp_post_details($id, $mode, $action)
 		'S_CAN_DELETE_POST'		=> $auth->acl_get('m_delete', $post_info['forum_id']),
 
 		'S_POST_REPORTED'		=> ($post_info['post_reported']) ? true : false,
-		'S_POST_UNAPPROVED'		=> (!$post_info['post_approved']) ? true : false,
+		'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED) ? true : false,
 		'S_POST_LOCKED'			=> ($post_info['post_edit_locked']) ? true : false,
 		'S_USER_NOTES'			=> true,
 		'S_CLEAR_ALLOWED'		=> ($auth->acl_get('a_clearlogs')) ? true : false,
@@ -415,7 +415,7 @@ function change_poster(&$post_info, $userdata)
 	}
 
 	// Adjust post counts... only if the post is approved (else, it was not added the users post count anyway)
-	if ($post_info['post_postcount'] && $post_info['post_approved'])
+	if ($post_info['post_postcount'] && $post_info['post_visibility'] == ITEM_APPROVED)
 	{
 		$sql = 'UPDATE ' . USERS_TABLE . '
 			SET user_posts = user_posts - 1
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index b44685b8a3..833f924efc 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -183,7 +183,7 @@ class mcp_queue
 					'U_APPROVE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&amp;p=$post_id&amp;f=$forum_id"),
 					'S_CAN_VIEWIP'			=> $auth->acl_get('m_info', $post_info['forum_id']),
 					'S_POST_REPORTED'		=> $post_info['post_reported'],
-					'S_POST_UNAPPROVED'		=> !$post_info['post_approved'],
+					'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED) ,
 					'S_POST_LOCKED'			=> $post_info['post_edit_locked'],
 					'S_USER_NOTES'			=> true,
 
@@ -309,7 +309,7 @@ class mcp_queue
 					$sql = 'SELECT p.post_id
 						FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . '
 						WHERE ' . $db->sql_in_set('p.forum_id', $forum_list) . '
-							AND p.post_approved = 0
+							AND p.post_visibility = ' . ITEM_UNAPPROVED . '
 							' . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . '
 							' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . "
 							AND t.topic_id = p.topic_id
@@ -361,7 +361,7 @@ class mcp_queue
 					$sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, t.topic_title AS post_subject, t.topic_time AS post_time, t.topic_poster AS poster_id, t.topic_first_post_id AS post_id, t.topic_attachment AS post_attachment, t.topic_first_poster_name AS username, t.topic_first_poster_colour AS user_colour
 						FROM ' . TOPICS_TABLE . " t
 						WHERE " . $db->sql_in_set('forum_id', $forum_list) . "
-							AND topic_approved = 0
+							AND topic_visibility = " . ITEM_UNAPPROVED . "
 							$limit_time_sql
 						ORDER BY $sort_order_sql";
 					$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
@@ -484,7 +484,7 @@ function approve_post($post_id_list, $id, $mode)
 
 		foreach ($post_info as $post_id => $post_data)
 		{
-			if ($post_data['post_approved'])
+			if ($post_data['post_visibility'] == ITEM_APPROVED)
 			{
 				$post_approved_list[] = $post_id;
 				continue;
@@ -544,7 +544,7 @@ function approve_post($post_id_list, $id, $mode)
 		if (sizeof($topic_approve_sql))
 		{
 			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET topic_approved = 1
+				SET topic_visibility = ' . ITEM_APPROVED . '
 				WHERE ' . $db->sql_in_set('topic_id', $topic_approve_sql);
 			$db->sql_query($sql);
 		}
@@ -552,7 +552,7 @@ function approve_post($post_id_list, $id, $mode)
 		if (sizeof($post_approve_sql))
 		{
 			$sql = 'UPDATE ' . POSTS_TABLE . '
-				SET post_approved = 1
+				SET post_visibility = ' . ITEM_APPROVED . '
 				WHERE ' . $db->sql_in_set('post_id', $post_approve_sql);
 			$db->sql_query($sql);
 		}
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 2890cd56e2..dc917a25e0 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -190,7 +190,7 @@ class mcp_reports
 					'S_CLOSE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&amp;mode=report_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
 					'S_CAN_VIEWIP'			=> $auth->acl_get('m_info', $post_info['forum_id']),
 					'S_POST_REPORTED'		=> $post_info['post_reported'],
-					'S_POST_UNAPPROVED'		=> !$post_info['post_approved'],
+					'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == POST_UNAPPROVED),
 					'S_POST_LOCKED'			=> $post_info['post_edit_locked'],
 					'S_USER_NOTES'			=> true,
 
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index e39e553ab6..f6fd12f0c4 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -145,8 +145,8 @@ function mcp_topic_view($id, $mode, $action)
 	$sql = 'SELECT u.username, u.username_clean, u.user_colour, p.*
 		FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
 		WHERE ' . (($action == 'reports') ? 'p.post_reported = 1 AND ' : '') . '
-			p.topic_id = ' . $topic_id . ' ' .
-			((!$auth->acl_get('m_approve', $topic_info['forum_id'])) ? ' AND p.post_approved = 1 ' : '') . '
+			p.topic_id = ' . $topic_id . '
+			AND ' .	topic_visibility::get_visibility_sql('post', $topic_info['forum_id'], 'p.') . '
 			AND p.poster_id = u.user_id ' .
 			$limit_time_sql . '
 		ORDER BY ' . $sort_order_sql;
@@ -227,7 +227,7 @@ function mcp_topic_view($id, $mode, $action)
 			parse_attachments($topic_info['forum_id'], $message, $attachments[$row['post_id']], $update_count);
 		}
 
-		if (!$row['post_approved'])
+		if ($row['post_visibility'] == ITEM_UNAPPROVED)
 		{
 			$has_unapproved_posts = true;
 		}
@@ -249,7 +249,7 @@ function mcp_topic_view($id, $mode, $action)
 			'MINI_POST_IMG'			=> ($post_unread) ? $user->img('icon_post_target_unread', 'UNREAD_POST') : $user->img('icon_post_target', 'POST'),
 
 			'S_POST_REPORTED'	=> ($row['post_reported'] && $auth->acl_get('m_report', $topic_info['forum_id'])),
-			'S_POST_UNAPPROVED'	=> (!$row['post_approved'] && $auth->acl_get('m_approve', $topic_info['forum_id'])),
+			'S_POST_UNAPPROVED'	=> ($row['post_visibility'] != ITEM_APPROVED && $auth->acl_get('m_approve', $topic_info['forum_id'])),
 			'S_CHECKED'			=> (($submitted_id_list && !in_array(intval($row['post_id']), $submitted_id_list)) || in_array(intval($row['post_id']), $checked_ids)) ? true : false,
 			'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
 
@@ -448,7 +448,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 
 			if ($sort_order_sql[0] == 'u')
 			{
-				$sql = 'SELECT p.post_id, p.forum_id, p.post_approved
+				$sql = 'SELECT p.post_id, p.forum_id, p.post_visibility
 					FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
 					WHERE p.topic_id = $topic_id
 						AND p.poster_id = u.user_id
@@ -457,7 +457,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 			}
 			else
 			{
-				$sql = 'SELECT p.post_id, p.forum_id, p.post_approved
+				$sql = 'SELECT p.post_id, p.forum_id, p.post_visibility
 					FROM ' . POSTS_TABLE . " p
 					WHERE p.topic_id = $topic_id
 						$limit_time_sql
@@ -470,7 +470,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 			while ($row = $db->sql_fetchrow($result))
 			{
 				// If split from selected post (split_beyond), we split the unapproved items too.
-				if (!$row['post_approved'] && !$auth->acl_get('m_approve', $row['forum_id']))
+				if ($row['post_visibility'] == ITEM_UNAPPROVED && !$auth->acl_get('m_approve', $row['forum_id']))
 				{
 //					continue;
 				}
@@ -497,10 +497,10 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 		$icon_id = request_var('icon', 0);
 
 		$sql_ary = array(
-			'forum_id'		=> $to_forum_id,
-			'topic_title'	=> $subject,
-			'icon_id'		=> $icon_id,
-			'topic_approved'=> 1
+			'forum_id'			=> $to_forum_id,
+			'topic_title'		=> $subject,
+			'icon_id'			=> $icon_id,
+			'topic_visibility'	=> 1
 		);
 
 		$sql = 'INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index cf89ab1c24..73bf5c52f2 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -265,7 +265,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
+	* @param	array		$m_approve_fid_sql	specifies which types of posts a user may view, based on permissions
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
@@ -292,7 +292,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			$sort_key,
 			$topic_id,
 			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
+// @TODO			implode(',', $m_approve_fid_ary),
 			implode(',', $author_ary)
 		)));
 
@@ -354,7 +354,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			break;
 		}
 
-		if (!sizeof($m_approve_fid_ary))
+/*		if (!sizeof($m_approve_fid_ary))
 		{
 			$m_approve_fid_sql = ' AND p.post_approved = 1';
 		}
@@ -366,6 +366,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 		{
 			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $this->db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
 		}
+*/
 
 		$sql_select			= (!$result_count) ? 'SQL_CALC_FOUND_ROWS ' : '';
 		$sql_select			= ($type == 'posts') ? $sql_select . 'p.post_id' : 'DISTINCT ' . $sql_select . 't.topic_id';
@@ -445,7 +446,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
+	* @param	array		$m_approve_fid_sql	specifies which types of posts a user may view, based on permissions
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
@@ -473,7 +474,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			$sort_key,
 			$topic_id,
 			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
+// @TODO			implode(',', $m_approve_fid_ary),
 			implode(',', $author_ary),
 			$author_name,
 		)));
@@ -523,7 +524,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			break;
 		}
 
-		if (!sizeof($m_approve_fid_ary))
+/*		if (!sizeof($m_approve_fid_ary))
 		{
 			$m_approve_fid_sql = ' AND p.post_approved = 1';
 		}
@@ -535,6 +536,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 		{
 			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $this->db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
 		}
+*/
 
 		// If the cache was completely empty count the results
 		$calc_results = ($result_count) ? '' : 'SQL_CALC_FOUND_ROWS ';
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 96b3f02ec6..c7e7a451e4 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -414,7 +414,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
+	* @param	array		$m_approve_fid_sql	specifies which types of posts the user can view
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
@@ -451,7 +451,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			$sort_key,
 			$topic_id,
 			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
+// @TODO			implode(',', $m_approve_fid_ary),
 			implode(',', $author_ary),
 			$author_name,
 		)));
@@ -628,7 +628,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			$sql_where[] = '(' . implode(' OR ', $is_null_joins) . ')';
 		}
 
-		if (!sizeof($m_approve_fid_ary))
+/*		if (!sizeof($m_approve_fid_ary))
 		{
 			$sql_where[] = 'p.post_approved = 1';
 		}
@@ -636,6 +636,8 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 		{
 			$sql_where[] = '(p.post_approved = 1 OR ' . $this->db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
 		}
+*/
+		$sql_where[] = $m_approve_fid_sql;
 
 		if ($topic_id)
 		{
@@ -808,7 +810,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
+	* @param	array		$m_approve_fid_sql	specifies which posts a user can view, based on permissions
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
@@ -836,7 +838,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			$sort_key,
 			$topic_id,
 			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
+// @TODO			implode(',', $m_approve_fid_ary),
 			implode(',', $author_ary),
 			$author_name,
 		)));
@@ -886,7 +888,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			break;
 		}
 
-		if (!sizeof($m_approve_fid_ary))
+/*		if (!sizeof($m_approve_fid_ary))
 		{
 			$m_approve_fid_sql = ' AND p.post_approved = 1';
 		}
@@ -898,6 +900,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 		{
 			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $this->db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
 		}
+*/
 
 		$select = ($type == 'posts') ? 'p.post_id' : 't.topic_id';
 		$is_mysql = false;
-- 
cgit v1.2.1


From 244f6e2ddc7818125edc273be1d83a5298ce6589 Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Fri, 18 Jun 2010 08:29:53 -0500
Subject: [feature/soft-delete] Correct some mistakes in e8d47

Notably: Uncomment the die() in create_schema_files, and add the class that makes everything tick.

PHPBB3-9657
---
 phpBB/includes/class_visibility.php | 137 ++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 phpBB/includes/class_visibility.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/class_visibility.php b/phpBB/includes/class_visibility.php
new file mode 100644
index 0000000000..28fc584b76
--- /dev/null
+++ b/phpBB/includes/class_visibility.php
@@ -0,0 +1,137 @@
+<?php
+
+class topic_visibility
+{
+	public function get_visibility_sql($mode, $forum_id, $table_alias = '')
+	{
+		global $auth, $db, $user;
+
+		$status_ary = array(ITEM_APPROVED);
+		if ($auth->acl_get('m_approve', $forum_id))
+		{
+			$status_ary[] = ITEM_UNAPPROVED;
+		}
+
+		if ($auth->acl_get('m_restore', $forum_id))
+		{
+			$status_ary[] = ITEM_DELETED;
+		}
+
+		$clause = $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
+
+		// only allow the user to view deleted posts he himself made
+		if ($auth->acl_get('f_restore', $forum_id))
+		{
+			$clause = 'AND (' . $clause . "
+				OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . "
+					AND {$table_alias}poster_id = " . $user->data['user_id'] . '))';
+
+		}
+
+		return $clause;
+	}
+
+	public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
+	{
+		global $auth, $db, $user;
+
+		// users can always see approved posts
+		$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
+
+		// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
+		$approve_forums = array_diff(array_keys($auth->acl_getf('m_approve', true)), $exclude_forum_ids);
+		if (sizeof($approve_forums))
+		{
+			// users can view unapproved topics in certain forums. specify them.
+			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_UNAPPROVED . '
+				AND ' . $db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ')';
+		}
+
+		// this is exactly the same logic as for approve forums, above
+		$restore_forums = array_diff(array_keys($auth->acl_getf('m_restore', true)), $exclude_forum_ids);
+		if (sizeof($restore_forums))
+		{
+			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . '
+				AND ' . $db->sql_in_set($table_alias . 'forum_id', $restore_forums) . ')';
+		}
+
+		// we also allow the user to view deleted posts he himself made
+		$user_restore_forums = array_diff(array_keys($auth->acl_getf('f_restore', true)), $exclude_forum_ids);
+		if (sizeof($user_restore_forums))
+		{
+			// specify the poster ID, the visibility type, and the forums we're interested in
+			$where_sql .= " OR ($table_alias{$mode}poster_id = " . $user->data['user_id'] . "
+				AND $table_alias{$mode}_visibility = " . ITEM_DELETED . "
+				AND " . $db->sql_in_set($table_alias . 'forum_id', $user_restore_forums) . ')';
+		}
+
+		$where_sql .= ')';
+
+		return $where_sql;
+	}
+
+	public function set_topic_visibility($visibility, $topic_id, $forum_id)
+	{
+		global $db;
+
+		$sql = 'UPDATE ' . TOPICS_TABLE . ' SET topic_visibility = ' . (int) $visibility . '
+			WHERE topic_id = ' . (int) $topic_id;
+		$db->sql_query($sql);
+
+		if ($visibility != ITEM_APPROVED)
+		{
+			$sql = 'SELECT post_id FROM ' . POSTS_TABLE . '
+				WHERE topic_id = ' . (int) $topic_id;
+			$result = $db->sql_query($sql);
+
+			$status = true;
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$status = min($status, self::set_post_visibility($visibility, false, $topic_id, $forum_id, true, true));
+			}
+		}
+		else
+		{
+			// TOOD: figure out which posts we actually care about
+			$status = self::set_post_visibility($visibility, 0, false, $forum_id, true, true);
+		}
+
+		return $status;
+	}
+
+	public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $is_starter, $is_latest)
+	{
+		global $db;
+
+		if ($post_id)
+		{
+			$where_sql = 'post_id = ' . (int) $post_id;
+		}
+		else if ($topic_id)
+		{
+			$where_sql = 'topic_id = ' . (int) $topic_id;
+		}
+		else
+		{
+			// throw new MissingArgumentsException(); <-- a nice idea
+			return false;
+		}
+
+		$sql = 'UPDATE ' . POSTS_TABLE . ' SET post_visibility = ' . (int) $visibility . '
+			WHERE ' . $where_sql;
+		$db->sql_query($sql);
+
+		if ($is_starter || $is_latest)
+		{
+			update_post_information('topic', $topic_id, false);
+			update_post_information('forum', $forum_id, false);
+		}
+
+		// if we're changing the starter, we need to change the rest of the topic
+		if ($is_starter && !$is_latest)
+		{
+			self::set_topic_visibility($visibility, $topic_id, $forum_id);
+		}
+	}
+}
+?>
-- 
cgit v1.2.1


From c32d76080605f843bb23e9a608c368d4b5dc55d8 Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Sun, 20 Jun 2010 15:01:26 -0500
Subject: [feature/soft-delete] I told you I was going to rename the class!

Rename topic_visibility class to phpbb_visibility. Also a bit of work to the class itself, mostly cleanup and adding the comments that I'd previously written.

PHPBB3-9657
---
 phpBB/includes/class_visibility.php  | 87 ++++++++++++++++++++++++++----------
 phpBB/includes/functions_posting.php |  6 +--
 phpBB/includes/mcp/mcp_forum.php     |  2 +-
 phpBB/includes/mcp/mcp_topic.php     |  2 +-
 4 files changed, 68 insertions(+), 29 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/class_visibility.php b/phpBB/includes/class_visibility.php
index 28fc584b76..46f188d833 100644
--- a/phpBB/includes/class_visibility.php
+++ b/phpBB/includes/class_visibility.php
@@ -1,7 +1,35 @@
 <?php
+/**
+*
+* @package phpbb
+* @version $Id$
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
 
-class topic_visibility
+/**
+* phpbb_visibility
+* Handle fetching and setting the visibility for topics and posts
+* @package phpbb
+*/
+class phpbb_visibility
 {
+	/**
+	* Create topic/post visibility SQL for a given forum ID
+	* @param $mode string - either "topic" or "post"
+	* @param $forum_id int - current forum ID
+	* @param $table_alias string - Table alias to prefix in SQL queries
+	* @return string with the appropriate combination SQL logic for topic/post_visibility
+	*/
 	public function get_visibility_sql($mode, $forum_id, $table_alias = '')
 	{
 		global $auth, $db, $user;
@@ -31,6 +59,13 @@ class topic_visibility
 		return $clause;
 	}
 
+	/**
+	* Fetch visibility SQL for all forums on the board.
+	* @param $mode string - either "topic" or "post"
+	* @param $exclude_forum_ids - int array - 
+	* @param $table_alias string - Table alias to prefix in SQL queries
+	* @return string with the appropriate combination SQL logic for topic/post_visibility
+	*/
 	public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
 	{
 		global $auth, $db, $user;
@@ -70,6 +105,14 @@ class topic_visibility
 		return $where_sql;
 	}
 
+	/**
+	* Description: Allows approving (which is akin to undeleting), unapproving (!) or soft deleting an entire topic.
+	* Calls set_post_visibility as needed.
+	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
+	* @param $topic_id - int - topic ID to act on
+	* @param $forum_id - int - forum ID where $topic_id resides
+	* @return bool true = success, false = fail
+	*/
 	public function set_topic_visibility($visibility, $topic_id, $forum_id)
 	{
 		global $db;
@@ -78,31 +121,32 @@ class topic_visibility
 			WHERE topic_id = ' . (int) $topic_id;
 		$db->sql_query($sql);
 
-		if ($visibility != ITEM_APPROVED)
-		{
-			$sql = 'SELECT post_id FROM ' . POSTS_TABLE . '
-				WHERE topic_id = ' . (int) $topic_id;
-			$result = $db->sql_query($sql);
-
-			$status = true;
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$status = min($status, self::set_post_visibility($visibility, false, $topic_id, $forum_id, true, true));
-			}
-		}
-		else
-		{
-			// TOOD: figure out which posts we actually care about
-			$status = self::set_post_visibility($visibility, 0, false, $forum_id, true, true);
-		}
+		// if we're approving, disapproving, or deleteing a topic, assume that
+		// we are adjusting _all_ posts in that topic.
+		$status = self::set_post_visibility($visibility, false, $topic_id, $forum_id, true, true);
+
 
 		return $status;
 	}
 
+	/**
+	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
+	* @param $post_id - int - the post ID to act on
+	* @param $topic_id - int - forum where $post_id is found
+	* @param $forum_id - int - forum ID where $topic_id resides
+	* @param $is_starter - bool - is this the first post of the topic
+	* @param $is_latest - bool - is this the last post of the topic
+	*/
 	public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $is_starter, $is_latest)
 	{
 		global $db;
 
+		// if we're changing the starter, we need to change the rest of the topic
+		if ($is_starter && !$is_latest)
+		{
+			return self::set_topic_visibility($visibility, $topic_id, $forum_id);
+		}
+
 		if ($post_id)
 		{
 			$where_sql = 'post_id = ' . (int) $post_id;
@@ -121,17 +165,12 @@ class topic_visibility
 			WHERE ' . $where_sql;
 		$db->sql_query($sql);
 
+		// Sync the first/last topic information if needed
 		if ($is_starter || $is_latest)
 		{
 			update_post_information('topic', $topic_id, false);
 			update_post_information('forum', $forum_id, false);
 		}
-
-		// if we're changing the starter, we need to change the rest of the topic
-		if ($is_starter && !$is_latest)
-		{
-			self::set_topic_visibility($visibility, $topic_id, $forum_id);
-		}
 	}
 }
 ?>
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 2f51200b48..12448ea0ce 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -993,7 +993,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 	$sql = 'SELECT p.post_id
 		FROM ' . POSTS_TABLE . ' p' . "
 		WHERE p.topic_id = $topic_id
-			AND " . topic_visibility::get_visibility_sql('post', $forum_id, 'p.') . '
+			AND " . phpbb_visibility::get_visibility_sql('post', $forum_id, 'p.') . '
 			' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . '
 			' . (($mode == 'post_review_edit') ? " AND p.post_id = $cur_post_id" : '') . '
 		ORDER BY p.post_time ';
@@ -1542,7 +1542,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 				$sql = 'SELECT MAX(post_id) as last_post_id
 					FROM ' . POSTS_TABLE . "
 					WHERE topic_id = $topic_id
-						AND " . topic_visibility::get_visibility_sql('post', $forum_id);
+						AND " . phpbb_visibility::get_visibility_sql('post', $forum_id);
 				$result = $db->sql_query($sql);
 				$row = $db->sql_fetchrow($result);
 				$db->sql_freeresult($result);
@@ -1555,7 +1555,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 			$sql = 'SELECT post_id
 				FROM ' . POSTS_TABLE . "
 				WHERE topic_id = $topic_id
-					AND " . topic_visibility::get_visibility_sql('post', $forum_id) . '
+					AND " . phpbb_visibility::get_visibility_sql('post', $forum_id) . '
 					AND post_time > ' . $data['post_time'] . '
 				ORDER BY post_time ASC';
 			$result = $db->sql_query_limit($sql, 1);
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 48b9c7c2d3..90c0224b40 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -154,7 +154,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 	$sql = 'SELECT t.topic_id
 		FROM ' . TOPICS_TABLE . ' t
 		WHERE t.forum_id = ' . $forum_id . '
-			' . topic_visibility::get_visibility_sql('topic', $forum_id, 't.') . "
+			' . phpbb_visibility::get_visibility_sql('topic', $forum_id, 't.') . "
 			$limit_time_sql
 		ORDER BY t.topic_type DESC, $sort_order_sql";
 	$result = $db->sql_query_limit($sql, $topics_per_page, $start);
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index f6fd12f0c4..5c25da7a9d 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -146,7 +146,7 @@ function mcp_topic_view($id, $mode, $action)
 		FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
 		WHERE ' . (($action == 'reports') ? 'p.post_reported = 1 AND ' : '') . '
 			p.topic_id = ' . $topic_id . '
-			AND ' .	topic_visibility::get_visibility_sql('post', $topic_info['forum_id'], 'p.') . '
+			AND ' .	phpbb_visibility::get_visibility_sql('post', $topic_info['forum_id'], 'p.') . '
 			AND p.poster_id = u.user_id ' .
 			$limit_time_sql . '
 		ORDER BY ' . $sort_order_sql;
-- 
cgit v1.2.1


From fb13ab83e476d2afbc7bb181f7ab90df98f996da Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Sun, 27 Jun 2010 14:22:36 -0500
Subject: [feature/soft-delete] Implement the ability to soft-delete and
 restore posts

The soft delete feature seems to work.  Tests are pending.  A real icon is pending.  Add the permissions and the interface to soft-delete posts.  Also able to restore posts via the MCP queue

PHPBB3-9657
---
 phpBB/includes/class_visibility.php   | 265 +++++++++++++++++++++++++++++++++-
 phpBB/includes/functions_posting.php  | 112 +++++++-------
 phpBB/includes/mcp/info/mcp_queue.php |   1 +
 phpBB/includes/mcp/mcp_queue.php      | 152 ++++---------------
 4 files changed, 351 insertions(+), 179 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/class_visibility.php b/phpBB/includes/class_visibility.php
index 46f188d833..9798e938b1 100644
--- a/phpBB/includes/class_visibility.php
+++ b/phpBB/includes/class_visibility.php
@@ -125,7 +125,6 @@ class phpbb_visibility
 		// we are adjusting _all_ posts in that topic.
 		$status = self::set_post_visibility($visibility, false, $topic_id, $forum_id, true, true);
 
-
 		return $status;
 	}
 
@@ -172,5 +171,267 @@ class phpbb_visibility
 			update_post_information('forum', $forum_id, false);
 		}
 	}
+
+	/**
+	* Can the current logged-in user soft-delete posts?
+	* @param $forum_id - int - the forum ID whose permissions to check
+	* @param $poster_id - int - the poster ID of the post in question
+	* @param $post_locked - bool - is the post locked?
+	* @return bool
+	*/
+	public function can_soft_delete($forum_id, $poster_id, $post_locked)
+	{
+		global $auth, $user;
+
+		if ($auth->acl_get('m_softdelete', $forum_id))
+		{
+			return true;
+		}
+		else if ($auth->acl_get('f_softdelete', $forum_id) && $poster_id == $user->data['poster_id'] && !$post_locked)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	* Can the current logged-in user restore soft-deleted posts?
+	* @param $forum_id - int - the forum ID whose permissions to check
+	* @param $poster_id - int - the poster ID of the post in question
+	* @param $post_locked - bool - is the post locked?
+	* @return bool
+	*/
+	public function can_restore($forum_id, $poster_id, $post_locked)
+	{
+		global $auth, $user;
+
+		if ($auth->acl_get('m_restore', $forum_id))
+		{
+			return true;
+		}
+		else if ($auth->acl_get('f_restore', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	* Do the required math to hide a complete topic (going from approved to
+	* unapproved or from approved to deleted)
+	* @param $topic_id - int - the topic to act on
+	* @param $forum_id - int - the forum where the topic resides
+	* @param $topic_row - array - data about the topic, may be empty at call time
+	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
+	* @return void
+	*/
+	public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data)
+	{
+		global $auth, $config, $db;
+
+		// Do we need to grab some topic informations?
+		if (!sizeof($topic_row))
+		{
+			$sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_visibility
+				FROM ' . TOPICS_TABLE . '
+				WHERE topic_id = ' . $topic_id;
+			$result = $db->sql_query($sql);
+			$topic_row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+		}
+
+		// If this is the only post remaining we do not need to decrement topic_replies.
+		// Also do not decrement if first post - then the topic_replies will not be adjusted if approving the topic again.
+
+		// If this is an edited topic or the first post the topic gets completely disapproved later on...
+		$sql_data[FORUMS_TABLE] = 'forum_topics = forum_topics - 1';
+		$sql_data[FORUMS_TABLE] = 'forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
+
+		set_config_count('num_topics', -1, true);
+		set_config_count('num_posts', ($topic_row['topic_replies'] + 1) * (-1), true);
+
+		// Only decrement this post, since this is the one non-approved now
+		if ($auth->acl_get('f_postcount', $forum_id))
+		{
+			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
+		}
+	}
+
+	/**
+	* Do the required math to hide a single post (going from approved to
+	* unapproved or from approved to deleted)
+	* Notably, we do _not_ need the post ID to do this operation. We're only changing statistic caches
+	* @param $forum_id - int - the forum where the topic resides
+	* @param $current_time - int - passed for consistency instead of calling time() internally
+	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
+	* @return void
+	*/
+	public function hide_post($forum_id, $current_time, &$sql_data)
+	{
+		global $auth, $config, $db;
+
+		$sql_data[TOPICS_TABLE] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
+		$sql_data[FORUMS_TABLE] = 'forum_posts = forum_posts - 1';
+
+		set_config_count('num_posts', -1, true);
+
+		if ($auth->acl_get('f_postcount', $forum_id))
+		{
+			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
+		}
+	}
+
+	/**
+	* One function to rule them all ... and unhide posts and topics.  This could
+	* reasonably be broken up, I straight copied this code from the mcp_queue.php
+	* file here for global access.
+	* @param $mode - string - member of the set {'approve', 'restore'}
+	* @param $post_info - array - Contains info from post U topics table about
+	* 	the posts/topics in question
+	* @param $post_id_list - array of ints - the set of posts being worked on
+	*/
+	public function unhide_posts_topics($mode, $post_info, $post_id_list)
+	{
+		global $db, $config;
+
+		// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
+		// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
+
+		$total_topics = $total_posts = 0;
+		$topic_approve_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array();
+		$user_posts_sql = $post_approved_list = array();
+
+		foreach ($post_info as $post_id => $post_data)
+		{
+			if ($post_data['post_visibility'] == ITEM_APPROVED)
+			{
+				$post_approved_list[] = $post_id;
+				continue;
+			}
+
+			$topic_id_list[$post_data['topic_id']] = 1;
+
+			if ($post_data['forum_id'])
+			{
+				$forum_id_list[$post_data['forum_id']] = 1;
+			}
+
+			// User post update (we do not care about topic or post, since user posts are strictly connected to posts)
+			// But we care about forums where post counts get not increased. ;)
+			if ($post_data['post_postcount'])
+			{
+				$user_posts_sql[$post_data['poster_id']] = (empty($user_posts_sql[$post_data['poster_id']])) ? 1 : $user_posts_sql[$post_data['poster_id']] + 1;
+			}
+
+			// Topic or Post. ;)
+			if ($post_data['topic_first_post_id'] == $post_id)
+			{
+				if ($post_data['forum_id'])
+				{
+					$total_topics++;
+				}
+				$topic_approve_sql[] = $post_data['topic_id'];
+
+				$approve_log[] = array(
+					'type'			=> 'topic',
+					'post_subject'	=> $post_data['post_subject'],
+					'forum_id'		=> $post_data['forum_id'],
+					'topic_id'		=> $post_data['topic_id'],
+				);
+			}
+			else
+			{
+				$approve_log[] = array(
+					'type'			=> 'post',
+					'post_subject'	=> $post_data['post_subject'],
+					'forum_id'		=> $post_data['forum_id'],
+					'topic_id'		=> $post_data['topic_id'],
+				);
+			}
+
+			if ($post_data['forum_id'])
+			{
+				$total_posts++;
+
+				// Increment by topic_replies if we approve a topic...
+				// This works because we do not adjust the topic_replies when re-approving a topic after an edit.
+				if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_replies'])
+				{
+					$total_posts += $post_data['topic_replies'];
+				}
+			}
+
+			$post_approve_sql[] = $post_id;
+		}
+
+		$post_id_list = array_values(array_diff($post_id_list, $post_approved_list));
+		for ($i = 0, $size = sizeof($post_approved_list); $i < $size; $i++)
+		{
+			unset($post_info[$post_approved_list[$i]]);
+		}
+
+		if (sizeof($topic_approve_sql))
+		{
+			$sql = 'UPDATE ' . TOPICS_TABLE . '
+				SET topic_visibility = ' . ITEM_APPROVED . '
+				WHERE ' . $db->sql_in_set('topic_id', $topic_approve_sql);
+			$db->sql_query($sql);
+		}
+
+		if (sizeof($post_approve_sql))
+		{
+			$sql = 'UPDATE ' . POSTS_TABLE . '
+				SET post_visibility = ' . ITEM_APPROVED . '
+				WHERE ' . $db->sql_in_set('post_id', $post_approve_sql);
+			$db->sql_query($sql);
+		}
+
+		unset($topic_approve_sql, $post_approve_sql);
+
+		foreach ($approve_log as $log_data)
+		{
+			add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_' . strtoupper($mode) . 'D' : 'LOG_POST_' . strtoupper($mode) . 'D', $log_data['post_subject']);
+		}
+
+		if (sizeof($user_posts_sql))
+		{
+			// Try to minimize the query count by merging users with the same post count additions
+			$user_posts_update = array();
+
+			foreach ($user_posts_sql as $user_id => $user_posts)
+			{
+				$user_posts_update[$user_posts][] = $user_id;
+			}
+
+			foreach ($user_posts_update as $user_posts => $user_id_ary)
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_posts = user_posts + ' . $user_posts . '
+					WHERE ' . $db->sql_in_set('user_id', $user_id_ary);
+				$db->sql_query($sql);
+			}
+		}
+
+		if ($total_topics)
+		{
+			set_config_count('num_topics', $total_topics, true);
+		}
+
+		if ($total_posts)
+		{
+			set_config_count('num_posts', $total_posts, true);
+		}
+
+		if (!function_exists('sync'))
+		{
+			global $phpbb_root_path, $phpEx;
+			include ($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
+		}
+
+		sync('topic', 'topic_id', array_keys($topic_id_list), true);
+		sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
+		unset($topic_id_list, $forum_id_list);
+
+		return true;
+	}
 }
-?>
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 12448ea0ce..b264e35a93 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1411,7 +1411,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 /**
 * Delete Post
 */
-function delete_post($forum_id, $topic_id, $post_id, &$data)
+function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 {
 	global $db, $user, $auth;
 	global $config, $phpEx, $phpbb_root_path;
@@ -1422,10 +1422,14 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 	{
 		$post_mode = 'delete_topic';
 	}
-	else if ($data['topic_first_post_id'] == $post_id)
+	else if ($data['topic_first_post_id'] == $post_id && !$is_soft)
 	{
 		$post_mode = 'delete_first_post';
 	}
+	else if ($data['topic_first_post_id'] == $post_id && $is_soft)
+	{
+		$post_mode = 'delete_topic';
+	}
 	else if ($data['topic_last_post_id'] == $post_id)
 	{
 		$post_mode = 'delete_last_post';
@@ -1460,14 +1464,22 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 		$db->sql_freeresult($result);
 	}
 
-	if (!delete_posts('post_id', array($post_id), false, false))
+	if ($is_soft)
+	{
+		phpbb_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
+		phpbb_visibility::hide_post($forum_id, time(), $sql_data);
+	}
+	else
 	{
-		// Try to delete topic, we may had an previous error causing inconsistency
-		if ($post_mode == 'delete_topic')
+		if (!delete_posts('post_id', array($post_id), false, false))
 		{
-			delete_topics('topic_id', array($topic_id), false);
+			// Try to delete topic, we may had an previous error causing inconsistency
+			if ($post_mode == 'delete_topic')
+			{
+				delete_topics('topic_id', array($topic_id), false);
+			}
+			trigger_error('ALREADY_DELETED');
 		}
-		trigger_error('ALREADY_DELETED');
 	}
 
 	$db->sql_transaction('commit');
@@ -1486,17 +1498,31 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 				update_post_information('forum', $updated_forum);
 			}
 
-			delete_topics('topic_id', array($topic_id), false);
+			if ($is_soft)
+			{
+				$topic_row = array();
+				phpbb_visibility::set_topic_visibility(POST_DELETED, $topic_id, $forum_id);
+				phpbb_visibility::hide_topic($topic_id, $forum_id, $topic_row, $sql_data);
+			}
+			else
+			{
+				delete_topics('topic_id', array($topic_id), false);
 
-			$sql_data[FORUMS_TABLE] .= 'forum_topics_real = forum_topics_real - 1';
-			$sql_data[FORUMS_TABLE] .= ($data['topic_visibility'] == ITEM_APPROVED) ? ', forum_posts = forum_posts - 1, forum_topics = forum_topics - 1' : '';
 
-			$update_sql = update_post_information('forum', $forum_id, true);
-			if (sizeof($update_sql))
-			{
-				$sql_data[FORUMS_TABLE] .= ($sql_data[FORUMS_TABLE]) ? ', ' : '';
-				$sql_data[FORUMS_TABLE] .= implode(', ', $update_sql[$forum_id]);
+				if ($data['topic_type'] != POST_GLOBAL)
+				{
+					$sql_data[FORUMS_TABLE] .= 'forum_topics_real = forum_topics_real - 1';
+					$sql_data[FORUMS_TABLE] .= ($data['topic_visibility'] == ITEM_APPROVED) ? ', forum_posts = forum_posts - 1, forum_topics = forum_topics - 1' : '';
+				}
+
+				$update_sql = update_post_information('forum', $forum_id, true);
+				if (sizeof($update_sql))
+				{
+					$sql_data[FORUMS_TABLE] .= ($sql_data[FORUMS_TABLE]) ? ', ' : '';
+					$sql_data[FORUMS_TABLE] .= implode(', ', $update_sql[$forum_id]);
+				}
 			}
+
 		break;
 
 		case 'delete_first_post':
@@ -1520,19 +1546,27 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 		break;
 
 		case 'delete_last_post':
-			$sql_data[FORUMS_TABLE] = ($data['post_visibility'] == ITEM_APPROVED) ? 'forum_posts = forum_posts - 1' : '';
-
-			$update_sql = update_post_information('forum', $forum_id, true);
-			if (sizeof($update_sql))
+			if ($is_soft)
 			{
-				$sql_data[FORUMS_TABLE] .= ($sql_data[FORUMS_TABLE]) ? ', ' : '';
-				$sql_data[FORUMS_TABLE] .= implode(', ', $update_sql[$forum_id]);
+				phpbb_visibility::hide_post($forum_id, time(), $sql_data);
+				phpbb_visibility::set_post_visibility($post_id, $topic_id, $forum_id, false, true);
 			}
+			else
+			{
+				$sql_data[FORUMS_TABLE] = ($data['post_visibility'] == ITEM_APPROVED) ? 'forum_posts = forum_posts - 1' : '';
+
+				$update_sql = update_post_information('forum', $forum_id, true);
+				if (sizeof($update_sql))
+				{
+					$sql_data[FORUMS_TABLE] .= ($sql_data[FORUMS_TABLE]) ? ', ' : '';
+					$sql_data[FORUMS_TABLE] .= implode(', ', $update_sql[$forum_id]);
+				}
 
-			$sql_data[TOPICS_TABLE] = 'topic_bumped = 0, topic_bumper = 0, topic_replies_real = topic_replies_real - 1' . (($data['post_visibility'] == ITEM_APPROVED) ? ', topic_replies = topic_replies - 1' : '');
+				$sql_data[TOPICS_TABLE] = 'topic_bumped = 0, topic_bumper = 0, topic_replies_real = topic_replies_real - 1' . (($data['post_visibility'] == ITEM_APPROVED) ? ', topic_replies = topic_replies - 1' : '');
+			}
 
 			$update_sql = update_post_information('topic', $topic_id, true);
-			if (sizeof($update_sql))
+			if (sizeof($update_sql) && !$is_soft)
 			{
 				$sql_data[TOPICS_TABLE] .= ', ' . implode(', ', $update_sql[$topic_id]);
 				$next_post_id = (int) str_replace('topic_last_post_id = ', '', $update_sql[$topic_id][0]);
@@ -1702,7 +1736,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	// Mods are able to force approved/unapproved posts. True means the post is approved, false the post is unapproved
 	if (isset($data['force_approved_state']))
 	{
-		$post_approval = ($data['force_approved_state']) ? 1 : 0;
+		$post_approval = ($data['force_approved_state']) ? ITEM_APPROVED : ITEM_UNAPPROVED;
 	}
 
 	// Start the transaction here
@@ -1915,32 +1949,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			// Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved
 			if (!$post_approval && $data['topic_visibility'] == ITEM_APPROVED)
 			{
-				// Do we need to grab some topic informations?
-				if (!sizeof($topic_row))
-				{
-					$sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_visibility
-						FROM ' . TOPICS_TABLE . '
-						WHERE topic_id = ' . $data['topic_id'];
-					$result = $db->sql_query($sql);
-					$topic_row = $db->sql_fetchrow($result);
-					$db->sql_freeresult($result);
-				}
-
-				// If this is the only post remaining we do not need to decrement topic_replies.
-				// Also do not decrement if first post - then the topic_replies will not be adjusted if approving the topic again.
-
-				// If this is an edited topic or the first post the topic gets completely disapproved later on...
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics = forum_topics - 1';
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
-
-				set_config_count('num_topics', -1, true);
-				set_config_count('num_posts', ($topic_row['topic_replies'] + 1) * (-1), true);
-
-				// Only decrement this post, since this is the one non-approved now
-				if ($auth->acl_get('f_postcount', $data['forum_id']))
-				{
-					$sql_data[USERS_TABLE]['stat'][] = 'user_posts = user_posts - 1';
-				}
+				phpbb_visibility::hide_topic($data['topic_id'], $data['forum_id'], $topic_row, $sql_data);
 			}
 
 		break;
@@ -1951,6 +1960,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			// Correctly set back the topic replies and forum posts... but only if the post was approved before.
 			if (!$post_approval && $data['post_visibility'] == ITEM_APPROVED)
 			{
+				//phpbb_visibility::hide_post($forum_id, $current_time, $sql_data);
+				// ^^ hide_post SQL is identical, except that it does not include the ['stat'] sub-array
 				$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1';
 
@@ -1960,6 +1971,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				{
 					$sql_data[USERS_TABLE]['stat'][] = 'user_posts = user_posts - 1';
 				}
+
 			}
 
 		break;
diff --git a/phpBB/includes/mcp/info/mcp_queue.php b/phpBB/includes/mcp/info/mcp_queue.php
index 7ad79f9781..31e9cc9af6 100644
--- a/phpBB/includes/mcp/info/mcp_queue.php
+++ b/phpBB/includes/mcp/info/mcp_queue.php
@@ -21,6 +21,7 @@ class mcp_queue_info
 			'modes'		=> array(
 				'unapproved_topics'	=> array('title' => 'MCP_QUEUE_UNAPPROVED_TOPICS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')),
 				'unapproved_posts'	=> array('title' => 'MCP_QUEUE_UNAPPROVED_POSTS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')),
+				'deleted_posts'		=> array('title' => 'MCP_QUEUE_DELETED_POSTS', 'auth' => 'aclf_m_restore', 'cat' => array('MCP_QUEUE')),
 				'approve_details'	=> array('title' => 'MCP_QUEUE_APPROVE_DETAILS', 'auth' => 'acl_m_approve,$id || (!$id && aclf_m_approve)', 'cat' => array('MCP_QUEUE')),
 			),
 		);
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 833f924efc..c19fb9b2b6 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -46,6 +46,7 @@ class mcp_queue
 		{
 			case 'approve':
 			case 'disapprove':
+			case 'restore':
 				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 
 				$post_id_list = request_var('post_id_list', array(0));
@@ -59,6 +60,10 @@ class mcp_queue
 				{
 					approve_post($post_id_list, 'queue', $mode);
 				}
+				else if ($action == 'restore')
+				{
+// do something
+				}
 				else
 				{
 					disapprove_post($post_id_list, 'queue', $mode);
@@ -224,6 +229,16 @@ class mcp_queue
 
 			case 'unapproved_topics':
 			case 'unapproved_posts':
+			case 'deleted_posts':
+				if ($mode == 'deleted_posts')
+				{
+					$m_perm = 'm_restore';
+				}
+				else
+				{
+					$m_perm = 'm_approve';
+				}
+
 				$user->add_lang(array('viewtopic', 'viewforum'));
 
 				$topic_id = request_var('t', 0);
@@ -242,7 +257,7 @@ class mcp_queue
 					$forum_id = $topic_info['forum_id'];
 				}
 
-				$forum_list_approve = get_forum_list('m_approve', false, true);
+				$forum_list_approve = get_forum_list($m_perm, false, true);
 				$forum_list_read = array_flip(get_forum_list('f_read', true, true)); // Flipped so we can isset() the forum IDs
 
 				// Remove forums we cannot read
@@ -277,7 +292,7 @@ class mcp_queue
 				}
 				else
 				{
-					$forum_info = get_forum_data(array($forum_id), 'm_approve');
+					$forum_info = get_forum_data(array($forum_id), $m_perm);
 
 					if (!sizeof($forum_info))
 					{
@@ -304,8 +319,10 @@ class mcp_queue
 
 				$forum_names = array();
 
-				if ($mode == 'unapproved_posts')
+				if ($mode == 'unapproved_posts' || $mode == 'deleted_posts')
 				{
+					$visibility_const = ($mode == 'unapproved_posts') ? ITEM_UNAPPROVED : ITEM_DELETED;
+
 					$sql = 'SELECT p.post_id
 						FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . '
 						WHERE ' . $db->sql_in_set('p.forum_id', $forum_list) . '
@@ -425,13 +442,14 @@ class mcp_queue
 				// Now display the page
 				$template->assign_vars(array(
 					'L_DISPLAY_ITEMS'		=> ($mode == 'unapproved_posts') ? $user->lang['DISPLAY_POSTS'] : $user->lang['DISPLAY_TOPICS'],
-					'L_EXPLAIN'				=> ($mode == 'unapproved_posts') ? $user->lang['MCP_QUEUE_UNAPPROVED_POSTS_EXPLAIN'] : $user->lang['MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'],
-					'L_TITLE'				=> ($mode == 'unapproved_posts') ? $user->lang['MCP_QUEUE_UNAPPROVED_POSTS'] : $user->lang['MCP_QUEUE_UNAPPROVED_TOPICS'],
+					'L_EXPLAIN'				=> $user->lang['MCP_QUEUE_' . strtoupper($mode) . '_EXPLAIN'],
+					'L_TITLE'				=> $user->lang['MCP_QUEUE_' . strtoupper($mode)],
 					'L_ONLY_TOPIC'			=> ($topic_id) ? sprintf($user->lang['ONLY_TOPIC'], $topic_info['topic_title']) : '',
 
 					'S_FORUM_OPTIONS'		=> $forum_options,
 					'S_MCP_ACTION'			=> build_url(array('t', 'f', 'sd', 'st', 'sk')),
-					'S_TOPICS'				=> ($mode == 'unapproved_posts') ? false : true,
+					'S_TOPICS'				=> ($mode == 'unapproved_topics') ? true : false,
+					'S_RESTORE'             => ($mode == 'deleted_posts') ? true : false,
 
 					'PAGE_NUMBER'			=> phpbb_on_page($template, $user, $base_url, $total, $config['topics_per_page'], $start),
 					'TOPIC_ID'				=> $topic_id,
@@ -475,127 +493,7 @@ function approve_post($post_id_list, $id, $mode)
 	{
 		$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
 
-		// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
-		// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
-
-		$total_topics = $total_posts = 0;
-		$topic_approve_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array();
-		$user_posts_sql = $post_approved_list = array();
-
-		foreach ($post_info as $post_id => $post_data)
-		{
-			if ($post_data['post_visibility'] == ITEM_APPROVED)
-			{
-				$post_approved_list[] = $post_id;
-				continue;
-			}
-
-			$topic_id_list[$post_data['topic_id']] = 1;
-			$forum_id_list[$post_data['forum_id']] = 1;
-
-			// User post update (we do not care about topic or post, since user posts are strictly connected to posts)
-			// But we care about forums where post counts get not increased. ;)
-			if ($post_data['post_postcount'])
-			{
-				$user_posts_sql[$post_data['poster_id']] = (empty($user_posts_sql[$post_data['poster_id']])) ? 1 : $user_posts_sql[$post_data['poster_id']] + 1;
-			}
-
-			// Topic or Post. ;)
-			if ($post_data['topic_first_post_id'] == $post_id)
-			{
-				$total_topics++;
-				$topic_approve_sql[] = $post_data['topic_id'];
-
-				$approve_log[] = array(
-					'type'			=> 'topic',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> $post_data['topic_id'],
-				);
-			}
-			else
-			{
-				$approve_log[] = array(
-					'type'			=> 'post',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> $post_data['topic_id'],
-				);
-			}
-
-			$total_posts++;
-
-			// Increment by topic_replies if we approve a topic...
-			// This works because we do not adjust the topic_replies when re-approving a topic after an edit.
-			if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_replies'])
-			{
-				$total_posts += $post_data['topic_replies'];
-			}
-
-			$post_approve_sql[] = $post_id;
-		}
-
-		$post_id_list = array_values(array_diff($post_id_list, $post_approved_list));
-		for ($i = 0, $size = sizeof($post_approved_list); $i < $size; $i++)
-		{
-			unset($post_info[$post_approved_list[$i]]);
-		}
-
-		if (sizeof($topic_approve_sql))
-		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET topic_visibility = ' . ITEM_APPROVED . '
-				WHERE ' . $db->sql_in_set('topic_id', $topic_approve_sql);
-			$db->sql_query($sql);
-		}
-
-		if (sizeof($post_approve_sql))
-		{
-			$sql = 'UPDATE ' . POSTS_TABLE . '
-				SET post_visibility = ' . ITEM_APPROVED . '
-				WHERE ' . $db->sql_in_set('post_id', $post_approve_sql);
-			$db->sql_query($sql);
-		}
-
-		unset($topic_approve_sql, $post_approve_sql);
-
-		foreach ($approve_log as $log_data)
-		{
-			add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_APPROVED' : 'LOG_POST_APPROVED', $log_data['post_subject']);
-		}
-
-		if (sizeof($user_posts_sql))
-		{
-			// Try to minimize the query count by merging users with the same post count additions
-			$user_posts_update = array();
-
-			foreach ($user_posts_sql as $user_id => $user_posts)
-			{
-				$user_posts_update[$user_posts][] = $user_id;
-			}
-
-			foreach ($user_posts_update as $user_posts => $user_id_ary)
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_posts = user_posts + ' . $user_posts . '
-					WHERE ' . $db->sql_in_set('user_id', $user_id_ary);
-				$db->sql_query($sql);
-			}
-		}
-
-		if ($total_topics)
-		{
-			set_config_count('num_topics', $total_topics, true);
-		}
-
-		if ($total_posts)
-		{
-			set_config_count('num_posts', $total_posts, true);
-		}
-
-		sync('topic', 'topic_id', array_keys($topic_id_list), true);
-		sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
-		unset($topic_id_list, $forum_id_list);
+	    phpbb_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
 
 		$messenger = new messenger();
 
-- 
cgit v1.2.1


From 67393751356e9f02f7c1ab0a2f7a3a508403edc3 Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Tue, 29 Jun 2010 21:47:18 -0500
Subject: [feature/soft-delete] Add unit tests for the phpbb_visibility class

Add unit tests for the phpbb_visibility class.  Adjust the phpbb_visibility class to pass those unit tests.  The changes are pretty small, actually.

PHPBB3-9657
---
 phpBB/includes/class_visibility.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/class_visibility.php b/phpBB/includes/class_visibility.php
index 9798e938b1..869f1078c1 100644
--- a/phpBB/includes/class_visibility.php
+++ b/phpBB/includes/class_visibility.php
@@ -48,11 +48,12 @@ class phpbb_visibility
 		$clause = $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
 
 		// only allow the user to view deleted posts he himself made
-		if ($auth->acl_get('f_restore', $forum_id))
+		if ($auth->acl_get('f_restore', $forum_id) && !$auth->acl_get('m_restore', $forum_id))
 		{
-			$clause = 'AND (' . $clause . "
+			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
+			$clause = '(' . $clause . "
 				OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . "
-					AND {$table_alias}poster_id = " . $user->data['user_id'] . '))';
+					AND $table_alias$poster_column = " . $user->data['user_id'] . '))';
 
 		}
 
@@ -92,10 +93,12 @@ class phpbb_visibility
 
 		// we also allow the user to view deleted posts he himself made
 		$user_restore_forums = array_diff(array_keys($auth->acl_getf('f_restore', true)), $exclude_forum_ids);
-		if (sizeof($user_restore_forums))
+		if (sizeof($user_restore_forums) && !sizeof($restore_forums))
 		{
+			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
+
 			// specify the poster ID, the visibility type, and the forums we're interested in
-			$where_sql .= " OR ($table_alias{$mode}poster_id = " . $user->data['user_id'] . "
+			$where_sql .= " OR ($table_alias$poster_column = " . $user->data['user_id'] . "
 				AND $table_alias{$mode}_visibility = " . ITEM_DELETED . "
 				AND " . $db->sql_in_set($table_alias . 'forum_id', $user_restore_forums) . ')';
 		}
@@ -187,7 +190,7 @@ class phpbb_visibility
 		{
 			return true;
 		}
-		else if ($auth->acl_get('f_softdelete', $forum_id) && $poster_id == $user->data['poster_id'] && !$post_locked)
+		else if ($auth->acl_get('f_softdelete', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
 		{
 			return true;
 		}
@@ -245,7 +248,7 @@ class phpbb_visibility
 
 		// If this is an edited topic or the first post the topic gets completely disapproved later on...
 		$sql_data[FORUMS_TABLE] = 'forum_topics = forum_topics - 1';
-		$sql_data[FORUMS_TABLE] = 'forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
+		$sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
 
 		set_config_count('num_topics', -1, true);
 		set_config_count('num_posts', ($topic_row['topic_replies'] + 1) * (-1), true);
-- 
cgit v1.2.1


From a80cfafdd91a384ba810a8ee0d43406bba955faa Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Wed, 30 Jun 2010 13:38:49 -0500
Subject: [feature/soft-delete] Rename phpbb_visibility class to
 phpbb_content_visibility

Rename the class to more accurately reflect what it does.

PHPBB3-9657
---
 phpBB/includes/class_content_visibility.php | 440 ++++++++++++++++++++++++++++
 phpBB/includes/class_visibility.php         | 440 ----------------------------
 phpBB/includes/functions_posting.php        |  22 +-
 phpBB/includes/mcp/mcp_forum.php            |   2 +-
 phpBB/includes/mcp/mcp_queue.php            |   2 +-
 phpBB/includes/mcp/mcp_topic.php            |   2 +-
 6 files changed, 454 insertions(+), 454 deletions(-)
 create mode 100644 phpBB/includes/class_content_visibility.php
 delete mode 100644 phpBB/includes/class_visibility.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/class_content_visibility.php b/phpBB/includes/class_content_visibility.php
new file mode 100644
index 0000000000..c7c9586e50
--- /dev/null
+++ b/phpBB/includes/class_content_visibility.php
@@ -0,0 +1,440 @@
+<?php
+/**
+*
+* @package phpbb
+* @version $Id$
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* phpbb_visibility
+* Handle fetching and setting the visibility for topics and posts
+* @package phpbb
+*/
+class phpbb_content_visibility
+{
+	/**
+	* Create topic/post visibility SQL for a given forum ID
+	* @param $mode string - either "topic" or "post"
+	* @param $forum_id int - current forum ID
+	* @param $table_alias string - Table alias to prefix in SQL queries
+	* @return string with the appropriate combination SQL logic for topic/post_visibility
+	*/
+	public function get_visibility_sql($mode, $forum_id, $table_alias = '')
+	{
+		global $auth, $db, $user;
+
+		$status_ary = array(ITEM_APPROVED);
+		if ($auth->acl_get('m_approve', $forum_id))
+		{
+			$status_ary[] = ITEM_UNAPPROVED;
+		}
+
+		if ($auth->acl_get('m_restore', $forum_id))
+		{
+			$status_ary[] = ITEM_DELETED;
+		}
+
+		$clause = $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
+
+		// only allow the user to view deleted posts he himself made
+		if ($auth->acl_get('f_restore', $forum_id) && !$auth->acl_get('m_restore', $forum_id))
+		{
+			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
+			$clause = '(' . $clause . "
+				OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . "
+					AND $table_alias$poster_column = " . $user->data['user_id'] . '))';
+
+		}
+
+		return $clause;
+	}
+
+	/**
+	* Fetch visibility SQL for all forums on the board.
+	* @param $mode string - either "topic" or "post"
+	* @param $exclude_forum_ids - int array - 
+	* @param $table_alias string - Table alias to prefix in SQL queries
+	* @return string with the appropriate combination SQL logic for topic/post_visibility
+	*/
+	public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
+	{
+		global $auth, $db, $user;
+
+		// users can always see approved posts
+		$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
+
+		// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
+		$approve_forums = array_diff(array_keys($auth->acl_getf('m_approve', true)), $exclude_forum_ids);
+		if (sizeof($approve_forums))
+		{
+			// users can view unapproved topics in certain forums. specify them.
+			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_UNAPPROVED . '
+				AND ' . $db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ')';
+		}
+
+		// this is exactly the same logic as for approve forums, above
+		$restore_forums = array_diff(array_keys($auth->acl_getf('m_restore', true)), $exclude_forum_ids);
+		if (sizeof($restore_forums))
+		{
+			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . '
+				AND ' . $db->sql_in_set($table_alias . 'forum_id', $restore_forums) . ')';
+		}
+
+		// we also allow the user to view deleted posts he himself made
+		$user_restore_forums = array_diff(array_keys($auth->acl_getf('f_restore', true)), $exclude_forum_ids);
+		if (sizeof($user_restore_forums) && !sizeof($restore_forums))
+		{
+			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
+
+			// specify the poster ID, the visibility type, and the forums we're interested in
+			$where_sql .= " OR ($table_alias$poster_column = " . $user->data['user_id'] . "
+				AND $table_alias{$mode}_visibility = " . ITEM_DELETED . "
+				AND " . $db->sql_in_set($table_alias . 'forum_id', $user_restore_forums) . ')';
+		}
+
+		$where_sql .= ')';
+
+		return $where_sql;
+	}
+
+	/**
+	* Description: Allows approving (which is akin to undeleting), unapproving (!) or soft deleting an entire topic.
+	* Calls set_post_visibility as needed.
+	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
+	* @param $topic_id - int - topic ID to act on
+	* @param $forum_id - int - forum ID where $topic_id resides
+	* @return bool true = success, false = fail
+	*/
+	public function set_topic_visibility($visibility, $topic_id, $forum_id)
+	{
+		global $db;
+
+		$sql = 'UPDATE ' . TOPICS_TABLE . ' SET topic_visibility = ' . (int) $visibility . '
+			WHERE topic_id = ' . (int) $topic_id;
+		$db->sql_query($sql);
+
+		// if we're approving, disapproving, or deleteing a topic, assume that
+		// we are adjusting _all_ posts in that topic.
+		$status = self::set_post_visibility($visibility, false, $topic_id, $forum_id, true, true);
+
+		return $status;
+	}
+
+	/**
+	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
+	* @param $post_id - int - the post ID to act on
+	* @param $topic_id - int - forum where $post_id is found
+	* @param $forum_id - int - forum ID where $topic_id resides
+	* @param $is_starter - bool - is this the first post of the topic
+	* @param $is_latest - bool - is this the last post of the topic
+	*/
+	public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $is_starter, $is_latest)
+	{
+		global $db;
+
+		// if we're changing the starter, we need to change the rest of the topic
+		if ($is_starter && !$is_latest)
+		{
+			return self::set_topic_visibility($visibility, $topic_id, $forum_id);
+		}
+
+		if ($post_id)
+		{
+			$where_sql = 'post_id = ' . (int) $post_id;
+		}
+		else if ($topic_id)
+		{
+			$where_sql = 'topic_id = ' . (int) $topic_id;
+		}
+		else
+		{
+			// throw new MissingArgumentsException(); <-- a nice idea
+			return false;
+		}
+
+		$sql = 'UPDATE ' . POSTS_TABLE . ' SET post_visibility = ' . (int) $visibility . '
+			WHERE ' . $where_sql;
+		$db->sql_query($sql);
+
+		// Sync the first/last topic information if needed
+		if ($is_starter || $is_latest)
+		{
+			update_post_information('topic', $topic_id, false);
+			update_post_information('forum', $forum_id, false);
+		}
+	}
+
+	/**
+	* Can the current logged-in user soft-delete posts?
+	* @param $forum_id - int - the forum ID whose permissions to check
+	* @param $poster_id - int - the poster ID of the post in question
+	* @param $post_locked - bool - is the post locked?
+	* @return bool
+	*/
+	public function can_soft_delete($forum_id, $poster_id, $post_locked)
+	{
+		global $auth, $user;
+
+		if ($auth->acl_get('m_softdelete', $forum_id))
+		{
+			return true;
+		}
+		else if ($auth->acl_get('f_softdelete', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	* Can the current logged-in user restore soft-deleted posts?
+	* @param $forum_id - int - the forum ID whose permissions to check
+	* @param $poster_id - int - the poster ID of the post in question
+	* @param $post_locked - bool - is the post locked?
+	* @return bool
+	*/
+	public function can_restore($forum_id, $poster_id, $post_locked)
+	{
+		global $auth, $user;
+
+		if ($auth->acl_get('m_restore', $forum_id))
+		{
+			return true;
+		}
+		else if ($auth->acl_get('f_restore', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	* Do the required math to hide a complete topic (going from approved to
+	* unapproved or from approved to deleted)
+	* @param $topic_id - int - the topic to act on
+	* @param $forum_id - int - the forum where the topic resides
+	* @param $topic_row - array - data about the topic, may be empty at call time
+	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
+	* @return void
+	*/
+	public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data)
+	{
+		global $auth, $config, $db;
+
+		// Do we need to grab some topic informations?
+		if (!sizeof($topic_row))
+		{
+			$sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_visibility
+				FROM ' . TOPICS_TABLE . '
+				WHERE topic_id = ' . $topic_id;
+			$result = $db->sql_query($sql);
+			$topic_row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+		}
+
+		// If this is the only post remaining we do not need to decrement topic_replies.
+		// Also do not decrement if first post - then the topic_replies will not be adjusted if approving the topic again.
+
+		// If this is an edited topic or the first post the topic gets completely disapproved later on...
+		$sql_data[FORUMS_TABLE] = 'forum_topics = forum_topics - 1';
+		$sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
+
+		set_config_count('num_topics', -1, true);
+		set_config_count('num_posts', ($topic_row['topic_replies'] + 1) * (-1), true);
+
+		// Only decrement this post, since this is the one non-approved now
+		if ($auth->acl_get('f_postcount', $forum_id))
+		{
+			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
+		}
+	}
+
+	/**
+	* Do the required math to hide a single post (going from approved to
+	* unapproved or from approved to deleted)
+	* Notably, we do _not_ need the post ID to do this operation. We're only changing statistic caches
+	* @param $forum_id - int - the forum where the topic resides
+	* @param $current_time - int - passed for consistency instead of calling time() internally
+	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
+	* @return void
+	*/
+	public function hide_post($forum_id, $current_time, &$sql_data)
+	{
+		global $auth, $config, $db;
+
+		$sql_data[TOPICS_TABLE] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
+		$sql_data[FORUMS_TABLE] = 'forum_posts = forum_posts - 1';
+
+		set_config_count('num_posts', -1, true);
+
+		if ($auth->acl_get('f_postcount', $forum_id))
+		{
+			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
+		}
+	}
+
+	/**
+	* One function to rule them all ... and unhide posts and topics.  This could
+	* reasonably be broken up, I straight copied this code from the mcp_queue.php
+	* file here for global access.
+	* @param $mode - string - member of the set {'approve', 'restore'}
+	* @param $post_info - array - Contains info from post U topics table about
+	* 	the posts/topics in question
+	* @param $post_id_list - array of ints - the set of posts being worked on
+	*/
+	public function unhide_posts_topics($mode, $post_info, $post_id_list)
+	{
+		global $db, $config;
+
+		// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
+		// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
+
+		$total_topics = $total_posts = 0;
+		$topic_approve_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array();
+		$user_posts_sql = $post_approved_list = array();
+
+		foreach ($post_info as $post_id => $post_data)
+		{
+			if ($post_data['post_visibility'] == ITEM_APPROVED)
+			{
+				$post_approved_list[] = $post_id;
+				continue;
+			}
+
+			$topic_id_list[$post_data['topic_id']] = 1;
+
+			if ($post_data['forum_id'])
+			{
+				$forum_id_list[$post_data['forum_id']] = 1;
+			}
+
+			// User post update (we do not care about topic or post, since user posts are strictly connected to posts)
+			// But we care about forums where post counts get not increased. ;)
+			if ($post_data['post_postcount'])
+			{
+				$user_posts_sql[$post_data['poster_id']] = (empty($user_posts_sql[$post_data['poster_id']])) ? 1 : $user_posts_sql[$post_data['poster_id']] + 1;
+			}
+
+			// Topic or Post. ;)
+			if ($post_data['topic_first_post_id'] == $post_id)
+			{
+				if ($post_data['forum_id'])
+				{
+					$total_topics++;
+				}
+				$topic_approve_sql[] = $post_data['topic_id'];
+
+				$approve_log[] = array(
+					'type'			=> 'topic',
+					'post_subject'	=> $post_data['post_subject'],
+					'forum_id'		=> $post_data['forum_id'],
+					'topic_id'		=> $post_data['topic_id'],
+				);
+			}
+			else
+			{
+				$approve_log[] = array(
+					'type'			=> 'post',
+					'post_subject'	=> $post_data['post_subject'],
+					'forum_id'		=> $post_data['forum_id'],
+					'topic_id'		=> $post_data['topic_id'],
+				);
+			}
+
+			if ($post_data['forum_id'])
+			{
+				$total_posts++;
+
+				// Increment by topic_replies if we approve a topic...
+				// This works because we do not adjust the topic_replies when re-approving a topic after an edit.
+				if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_replies'])
+				{
+					$total_posts += $post_data['topic_replies'];
+				}
+			}
+
+			$post_approve_sql[] = $post_id;
+		}
+
+		$post_id_list = array_values(array_diff($post_id_list, $post_approved_list));
+		for ($i = 0, $size = sizeof($post_approved_list); $i < $size; $i++)
+		{
+			unset($post_info[$post_approved_list[$i]]);
+		}
+
+		if (sizeof($topic_approve_sql))
+		{
+			$sql = 'UPDATE ' . TOPICS_TABLE . '
+				SET topic_visibility = ' . ITEM_APPROVED . '
+				WHERE ' . $db->sql_in_set('topic_id', $topic_approve_sql);
+			$db->sql_query($sql);
+		}
+
+		if (sizeof($post_approve_sql))
+		{
+			$sql = 'UPDATE ' . POSTS_TABLE . '
+				SET post_visibility = ' . ITEM_APPROVED . '
+				WHERE ' . $db->sql_in_set('post_id', $post_approve_sql);
+			$db->sql_query($sql);
+		}
+
+		unset($topic_approve_sql, $post_approve_sql);
+
+		foreach ($approve_log as $log_data)
+		{
+			add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_' . strtoupper($mode) . 'D' : 'LOG_POST_' . strtoupper($mode) . 'D', $log_data['post_subject']);
+		}
+
+		if (sizeof($user_posts_sql))
+		{
+			// Try to minimize the query count by merging users with the same post count additions
+			$user_posts_update = array();
+
+			foreach ($user_posts_sql as $user_id => $user_posts)
+			{
+				$user_posts_update[$user_posts][] = $user_id;
+			}
+
+			foreach ($user_posts_update as $user_posts => $user_id_ary)
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_posts = user_posts + ' . $user_posts . '
+					WHERE ' . $db->sql_in_set('user_id', $user_id_ary);
+				$db->sql_query($sql);
+			}
+		}
+
+		if ($total_topics)
+		{
+			set_config_count('num_topics', $total_topics, true);
+		}
+
+		if ($total_posts)
+		{
+			set_config_count('num_posts', $total_posts, true);
+		}
+
+		if (!function_exists('sync'))
+		{
+			global $phpbb_root_path, $phpEx;
+			include ($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
+		}
+
+		sync('topic', 'topic_id', array_keys($topic_id_list), true);
+		sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
+		unset($topic_id_list, $forum_id_list);
+
+		return true;
+	}
+}
diff --git a/phpBB/includes/class_visibility.php b/phpBB/includes/class_visibility.php
deleted file mode 100644
index 869f1078c1..0000000000
--- a/phpBB/includes/class_visibility.php
+++ /dev/null
@@ -1,440 +0,0 @@
-<?php
-/**
-*
-* @package phpbb
-* @version $Id$
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* phpbb_visibility
-* Handle fetching and setting the visibility for topics and posts
-* @package phpbb
-*/
-class phpbb_visibility
-{
-	/**
-	* Create topic/post visibility SQL for a given forum ID
-	* @param $mode string - either "topic" or "post"
-	* @param $forum_id int - current forum ID
-	* @param $table_alias string - Table alias to prefix in SQL queries
-	* @return string with the appropriate combination SQL logic for topic/post_visibility
-	*/
-	public function get_visibility_sql($mode, $forum_id, $table_alias = '')
-	{
-		global $auth, $db, $user;
-
-		$status_ary = array(ITEM_APPROVED);
-		if ($auth->acl_get('m_approve', $forum_id))
-		{
-			$status_ary[] = ITEM_UNAPPROVED;
-		}
-
-		if ($auth->acl_get('m_restore', $forum_id))
-		{
-			$status_ary[] = ITEM_DELETED;
-		}
-
-		$clause = $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
-
-		// only allow the user to view deleted posts he himself made
-		if ($auth->acl_get('f_restore', $forum_id) && !$auth->acl_get('m_restore', $forum_id))
-		{
-			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
-			$clause = '(' . $clause . "
-				OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . "
-					AND $table_alias$poster_column = " . $user->data['user_id'] . '))';
-
-		}
-
-		return $clause;
-	}
-
-	/**
-	* Fetch visibility SQL for all forums on the board.
-	* @param $mode string - either "topic" or "post"
-	* @param $exclude_forum_ids - int array - 
-	* @param $table_alias string - Table alias to prefix in SQL queries
-	* @return string with the appropriate combination SQL logic for topic/post_visibility
-	*/
-	public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
-	{
-		global $auth, $db, $user;
-
-		// users can always see approved posts
-		$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
-
-		// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
-		$approve_forums = array_diff(array_keys($auth->acl_getf('m_approve', true)), $exclude_forum_ids);
-		if (sizeof($approve_forums))
-		{
-			// users can view unapproved topics in certain forums. specify them.
-			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_UNAPPROVED . '
-				AND ' . $db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ')';
-		}
-
-		// this is exactly the same logic as for approve forums, above
-		$restore_forums = array_diff(array_keys($auth->acl_getf('m_restore', true)), $exclude_forum_ids);
-		if (sizeof($restore_forums))
-		{
-			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . '
-				AND ' . $db->sql_in_set($table_alias . 'forum_id', $restore_forums) . ')';
-		}
-
-		// we also allow the user to view deleted posts he himself made
-		$user_restore_forums = array_diff(array_keys($auth->acl_getf('f_restore', true)), $exclude_forum_ids);
-		if (sizeof($user_restore_forums) && !sizeof($restore_forums))
-		{
-			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
-
-			// specify the poster ID, the visibility type, and the forums we're interested in
-			$where_sql .= " OR ($table_alias$poster_column = " . $user->data['user_id'] . "
-				AND $table_alias{$mode}_visibility = " . ITEM_DELETED . "
-				AND " . $db->sql_in_set($table_alias . 'forum_id', $user_restore_forums) . ')';
-		}
-
-		$where_sql .= ')';
-
-		return $where_sql;
-	}
-
-	/**
-	* Description: Allows approving (which is akin to undeleting), unapproving (!) or soft deleting an entire topic.
-	* Calls set_post_visibility as needed.
-	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
-	* @param $topic_id - int - topic ID to act on
-	* @param $forum_id - int - forum ID where $topic_id resides
-	* @return bool true = success, false = fail
-	*/
-	public function set_topic_visibility($visibility, $topic_id, $forum_id)
-	{
-		global $db;
-
-		$sql = 'UPDATE ' . TOPICS_TABLE . ' SET topic_visibility = ' . (int) $visibility . '
-			WHERE topic_id = ' . (int) $topic_id;
-		$db->sql_query($sql);
-
-		// if we're approving, disapproving, or deleteing a topic, assume that
-		// we are adjusting _all_ posts in that topic.
-		$status = self::set_post_visibility($visibility, false, $topic_id, $forum_id, true, true);
-
-		return $status;
-	}
-
-	/**
-	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
-	* @param $post_id - int - the post ID to act on
-	* @param $topic_id - int - forum where $post_id is found
-	* @param $forum_id - int - forum ID where $topic_id resides
-	* @param $is_starter - bool - is this the first post of the topic
-	* @param $is_latest - bool - is this the last post of the topic
-	*/
-	public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $is_starter, $is_latest)
-	{
-		global $db;
-
-		// if we're changing the starter, we need to change the rest of the topic
-		if ($is_starter && !$is_latest)
-		{
-			return self::set_topic_visibility($visibility, $topic_id, $forum_id);
-		}
-
-		if ($post_id)
-		{
-			$where_sql = 'post_id = ' . (int) $post_id;
-		}
-		else if ($topic_id)
-		{
-			$where_sql = 'topic_id = ' . (int) $topic_id;
-		}
-		else
-		{
-			// throw new MissingArgumentsException(); <-- a nice idea
-			return false;
-		}
-
-		$sql = 'UPDATE ' . POSTS_TABLE . ' SET post_visibility = ' . (int) $visibility . '
-			WHERE ' . $where_sql;
-		$db->sql_query($sql);
-
-		// Sync the first/last topic information if needed
-		if ($is_starter || $is_latest)
-		{
-			update_post_information('topic', $topic_id, false);
-			update_post_information('forum', $forum_id, false);
-		}
-	}
-
-	/**
-	* Can the current logged-in user soft-delete posts?
-	* @param $forum_id - int - the forum ID whose permissions to check
-	* @param $poster_id - int - the poster ID of the post in question
-	* @param $post_locked - bool - is the post locked?
-	* @return bool
-	*/
-	public function can_soft_delete($forum_id, $poster_id, $post_locked)
-	{
-		global $auth, $user;
-
-		if ($auth->acl_get('m_softdelete', $forum_id))
-		{
-			return true;
-		}
-		else if ($auth->acl_get('f_softdelete', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
-		{
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Can the current logged-in user restore soft-deleted posts?
-	* @param $forum_id - int - the forum ID whose permissions to check
-	* @param $poster_id - int - the poster ID of the post in question
-	* @param $post_locked - bool - is the post locked?
-	* @return bool
-	*/
-	public function can_restore($forum_id, $poster_id, $post_locked)
-	{
-		global $auth, $user;
-
-		if ($auth->acl_get('m_restore', $forum_id))
-		{
-			return true;
-		}
-		else if ($auth->acl_get('f_restore', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
-		{
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Do the required math to hide a complete topic (going from approved to
-	* unapproved or from approved to deleted)
-	* @param $topic_id - int - the topic to act on
-	* @param $forum_id - int - the forum where the topic resides
-	* @param $topic_row - array - data about the topic, may be empty at call time
-	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
-	* @return void
-	*/
-	public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data)
-	{
-		global $auth, $config, $db;
-
-		// Do we need to grab some topic informations?
-		if (!sizeof($topic_row))
-		{
-			$sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_visibility
-				FROM ' . TOPICS_TABLE . '
-				WHERE topic_id = ' . $topic_id;
-			$result = $db->sql_query($sql);
-			$topic_row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-		}
-
-		// If this is the only post remaining we do not need to decrement topic_replies.
-		// Also do not decrement if first post - then the topic_replies will not be adjusted if approving the topic again.
-
-		// If this is an edited topic or the first post the topic gets completely disapproved later on...
-		$sql_data[FORUMS_TABLE] = 'forum_topics = forum_topics - 1';
-		$sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
-
-		set_config_count('num_topics', -1, true);
-		set_config_count('num_posts', ($topic_row['topic_replies'] + 1) * (-1), true);
-
-		// Only decrement this post, since this is the one non-approved now
-		if ($auth->acl_get('f_postcount', $forum_id))
-		{
-			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
-		}
-	}
-
-	/**
-	* Do the required math to hide a single post (going from approved to
-	* unapproved or from approved to deleted)
-	* Notably, we do _not_ need the post ID to do this operation. We're only changing statistic caches
-	* @param $forum_id - int - the forum where the topic resides
-	* @param $current_time - int - passed for consistency instead of calling time() internally
-	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
-	* @return void
-	*/
-	public function hide_post($forum_id, $current_time, &$sql_data)
-	{
-		global $auth, $config, $db;
-
-		$sql_data[TOPICS_TABLE] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
-		$sql_data[FORUMS_TABLE] = 'forum_posts = forum_posts - 1';
-
-		set_config_count('num_posts', -1, true);
-
-		if ($auth->acl_get('f_postcount', $forum_id))
-		{
-			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
-		}
-	}
-
-	/**
-	* One function to rule them all ... and unhide posts and topics.  This could
-	* reasonably be broken up, I straight copied this code from the mcp_queue.php
-	* file here for global access.
-	* @param $mode - string - member of the set {'approve', 'restore'}
-	* @param $post_info - array - Contains info from post U topics table about
-	* 	the posts/topics in question
-	* @param $post_id_list - array of ints - the set of posts being worked on
-	*/
-	public function unhide_posts_topics($mode, $post_info, $post_id_list)
-	{
-		global $db, $config;
-
-		// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
-		// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
-
-		$total_topics = $total_posts = 0;
-		$topic_approve_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array();
-		$user_posts_sql = $post_approved_list = array();
-
-		foreach ($post_info as $post_id => $post_data)
-		{
-			if ($post_data['post_visibility'] == ITEM_APPROVED)
-			{
-				$post_approved_list[] = $post_id;
-				continue;
-			}
-
-			$topic_id_list[$post_data['topic_id']] = 1;
-
-			if ($post_data['forum_id'])
-			{
-				$forum_id_list[$post_data['forum_id']] = 1;
-			}
-
-			// User post update (we do not care about topic or post, since user posts are strictly connected to posts)
-			// But we care about forums where post counts get not increased. ;)
-			if ($post_data['post_postcount'])
-			{
-				$user_posts_sql[$post_data['poster_id']] = (empty($user_posts_sql[$post_data['poster_id']])) ? 1 : $user_posts_sql[$post_data['poster_id']] + 1;
-			}
-
-			// Topic or Post. ;)
-			if ($post_data['topic_first_post_id'] == $post_id)
-			{
-				if ($post_data['forum_id'])
-				{
-					$total_topics++;
-				}
-				$topic_approve_sql[] = $post_data['topic_id'];
-
-				$approve_log[] = array(
-					'type'			=> 'topic',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> $post_data['topic_id'],
-				);
-			}
-			else
-			{
-				$approve_log[] = array(
-					'type'			=> 'post',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> $post_data['topic_id'],
-				);
-			}
-
-			if ($post_data['forum_id'])
-			{
-				$total_posts++;
-
-				// Increment by topic_replies if we approve a topic...
-				// This works because we do not adjust the topic_replies when re-approving a topic after an edit.
-				if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_replies'])
-				{
-					$total_posts += $post_data['topic_replies'];
-				}
-			}
-
-			$post_approve_sql[] = $post_id;
-		}
-
-		$post_id_list = array_values(array_diff($post_id_list, $post_approved_list));
-		for ($i = 0, $size = sizeof($post_approved_list); $i < $size; $i++)
-		{
-			unset($post_info[$post_approved_list[$i]]);
-		}
-
-		if (sizeof($topic_approve_sql))
-		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET topic_visibility = ' . ITEM_APPROVED . '
-				WHERE ' . $db->sql_in_set('topic_id', $topic_approve_sql);
-			$db->sql_query($sql);
-		}
-
-		if (sizeof($post_approve_sql))
-		{
-			$sql = 'UPDATE ' . POSTS_TABLE . '
-				SET post_visibility = ' . ITEM_APPROVED . '
-				WHERE ' . $db->sql_in_set('post_id', $post_approve_sql);
-			$db->sql_query($sql);
-		}
-
-		unset($topic_approve_sql, $post_approve_sql);
-
-		foreach ($approve_log as $log_data)
-		{
-			add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_' . strtoupper($mode) . 'D' : 'LOG_POST_' . strtoupper($mode) . 'D', $log_data['post_subject']);
-		}
-
-		if (sizeof($user_posts_sql))
-		{
-			// Try to minimize the query count by merging users with the same post count additions
-			$user_posts_update = array();
-
-			foreach ($user_posts_sql as $user_id => $user_posts)
-			{
-				$user_posts_update[$user_posts][] = $user_id;
-			}
-
-			foreach ($user_posts_update as $user_posts => $user_id_ary)
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_posts = user_posts + ' . $user_posts . '
-					WHERE ' . $db->sql_in_set('user_id', $user_id_ary);
-				$db->sql_query($sql);
-			}
-		}
-
-		if ($total_topics)
-		{
-			set_config_count('num_topics', $total_topics, true);
-		}
-
-		if ($total_posts)
-		{
-			set_config_count('num_posts', $total_posts, true);
-		}
-
-		if (!function_exists('sync'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include ($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
-		}
-
-		sync('topic', 'topic_id', array_keys($topic_id_list), true);
-		sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
-		unset($topic_id_list, $forum_id_list);
-
-		return true;
-	}
-}
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index b264e35a93..364a3e7fe2 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -993,7 +993,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 	$sql = 'SELECT p.post_id
 		FROM ' . POSTS_TABLE . ' p' . "
 		WHERE p.topic_id = $topic_id
-			AND " . phpbb_visibility::get_visibility_sql('post', $forum_id, 'p.') . '
+			AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id, 'p.') . '
 			' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . '
 			' . (($mode == 'post_review_edit') ? " AND p.post_id = $cur_post_id" : '') . '
 		ORDER BY p.post_time ';
@@ -1466,8 +1466,8 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 
 	if ($is_soft)
 	{
-		phpbb_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
-		phpbb_visibility::hide_post($forum_id, time(), $sql_data);
+		phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
+		phpbb_content_visibility::hide_post($forum_id, time(), $sql_data);
 	}
 	else
 	{
@@ -1501,8 +1501,8 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 			if ($is_soft)
 			{
 				$topic_row = array();
-				phpbb_visibility::set_topic_visibility(POST_DELETED, $topic_id, $forum_id);
-				phpbb_visibility::hide_topic($topic_id, $forum_id, $topic_row, $sql_data);
+				phpbb_content_visibility::set_topic_visibility(POST_DELETED, $topic_id, $forum_id);
+				phpbb_content_visibility::hide_topic($topic_id, $forum_id, $topic_row, $sql_data);
 			}
 			else
 			{
@@ -1548,8 +1548,8 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 		case 'delete_last_post':
 			if ($is_soft)
 			{
-				phpbb_visibility::hide_post($forum_id, time(), $sql_data);
-				phpbb_visibility::set_post_visibility($post_id, $topic_id, $forum_id, false, true);
+				phpbb_content_visibility::hide_post($forum_id, time(), $sql_data);
+				phpbb_content_visibility::set_post_visibility($post_id, $topic_id, $forum_id, false, true);
 			}
 			else
 			{
@@ -1576,7 +1576,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 				$sql = 'SELECT MAX(post_id) as last_post_id
 					FROM ' . POSTS_TABLE . "
 					WHERE topic_id = $topic_id
-						AND " . phpbb_visibility::get_visibility_sql('post', $forum_id);
+						AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id);
 				$result = $db->sql_query($sql);
 				$row = $db->sql_fetchrow($result);
 				$db->sql_freeresult($result);
@@ -1589,7 +1589,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 			$sql = 'SELECT post_id
 				FROM ' . POSTS_TABLE . "
 				WHERE topic_id = $topic_id
-					AND " . phpbb_visibility::get_visibility_sql('post', $forum_id) . '
+					AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id) . '
 					AND post_time > ' . $data['post_time'] . '
 				ORDER BY post_time ASC';
 			$result = $db->sql_query_limit($sql, 1);
@@ -1949,7 +1949,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			// Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved
 			if (!$post_approval && $data['topic_visibility'] == ITEM_APPROVED)
 			{
-				phpbb_visibility::hide_topic($data['topic_id'], $data['forum_id'], $topic_row, $sql_data);
+				phpbb_content_visibility::hide_topic($data['topic_id'], $data['forum_id'], $topic_row, $sql_data);
 			}
 
 		break;
@@ -1960,7 +1960,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			// Correctly set back the topic replies and forum posts... but only if the post was approved before.
 			if (!$post_approval && $data['post_visibility'] == ITEM_APPROVED)
 			{
-				//phpbb_visibility::hide_post($forum_id, $current_time, $sql_data);
+				//phpbb_content_visibility::hide_post($forum_id, $current_time, $sql_data);
 				// ^^ hide_post SQL is identical, except that it does not include the ['stat'] sub-array
 				$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1';
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 90c0224b40..ff079baeb8 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -154,7 +154,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 	$sql = 'SELECT t.topic_id
 		FROM ' . TOPICS_TABLE . ' t
 		WHERE t.forum_id = ' . $forum_id . '
-			' . phpbb_visibility::get_visibility_sql('topic', $forum_id, 't.') . "
+			' . phpbb_content_visibility::get_visibility_sql('topic', $forum_id, 't.') . "
 			$limit_time_sql
 		ORDER BY t.topic_type DESC, $sort_order_sql";
 	$result = $db->sql_query_limit($sql, $topics_per_page, $start);
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index c19fb9b2b6..221dfffebc 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -493,7 +493,7 @@ function approve_post($post_id_list, $id, $mode)
 	{
 		$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
 
-	    phpbb_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
+	    phpbb_content_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
 
 		$messenger = new messenger();
 
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 5c25da7a9d..8320699a8c 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -146,7 +146,7 @@ function mcp_topic_view($id, $mode, $action)
 		FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
 		WHERE ' . (($action == 'reports') ? 'p.post_reported = 1 AND ' : '') . '
 			p.topic_id = ' . $topic_id . '
-			AND ' .	phpbb_visibility::get_visibility_sql('post', $topic_info['forum_id'], 'p.') . '
+			AND ' .	phpbb_content_visibility::get_visibility_sql('post', $topic_info['forum_id'], 'p.') . '
 			AND p.poster_id = u.user_id ' .
 			$limit_time_sql . '
 		ORDER BY ' . $sort_order_sql;
-- 
cgit v1.2.1


From f570558a8da65596b0ca2700e2e7829548d2393a Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Mon, 5 Jul 2010 21:58:20 -0500
Subject: [feature/soft-delete] Add a processor for action == restore in
 mcp_queue.php

Restoring a post within mcp_queue.php didn't do anything before this commit.  Now it does, by way of a function which is very similar to approve_post.

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 45 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 221dfffebc..597be855b7 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -62,7 +62,7 @@ class mcp_queue
 				}
 				else if ($action == 'restore')
 				{
-// do something
+					restore_post($post_id_list, 'queue', $mode);
 				}
 				else
 				{
@@ -462,6 +462,47 @@ class mcp_queue
 	}
 }
 
+
+/**
+* Approve Post/Topic
+*/
+function restore_post($post_id_list, $id, $mode)
+{
+	global $db, $template, $user, $config;
+	global $phpEx, $phpbb_root_path;
+
+	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_restore')))
+	{
+		trigger_error('NOT_AUTHORISED');
+	}
+
+	$redirect = request_var('redirect', build_url(array('quickmod')));
+	$redirect = reapply_sid($redirect);
+	$success_msg = '';
+
+	$post_info = get_post_data($post_id_list, 'm_restore');
+
+	phpbb_content_visibility::unhide_posts_topics('restore', $post_info, $post_id_list);
+
+	if (!$success_msg)
+	{
+		redirect($redirect);
+	}
+	else
+	{
+		meta_refresh(3, $redirect);
+
+		// If approving one post, also give links back to post...
+		$add_message = '';
+		if (sizeof($post_id_list) == 1 && !empty($post_url))
+		{
+			$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');
+		}
+
+		trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message);
+	}
+}
+
 /**
 * Approve Post/Topic
 */
@@ -493,7 +534,7 @@ function approve_post($post_id_list, $id, $mode)
 	{
 		$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
 
-	    phpbb_content_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
+		phpbb_content_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
 
 		$messenger = new messenger();
 
-- 
cgit v1.2.1


From 1ab41f8dc6ec81f2aaf152229d5f0275de796c85 Mon Sep 17 00:00:00 2001
From: Josh Woody <a_jelly_doughnut@phpbb.com>
Date: Sat, 17 Jul 2010 14:34:36 -0500
Subject: [feature/soft-delete] Fix some small bugs

To wit: using non-existing constant POST_DELETED in posting.php; first test
post was initially unapproved; soft delete checkbox appeared at post time
Links pointing to the wrong place.

PHPBB3-9657
---
 phpBB/includes/class_content_visibility.php | 42 ++++++++++++++++++++++-------
 phpBB/includes/functions_posting.php        |  8 +++---
 phpBB/includes/mcp/mcp_queue.php            |  3 ++-
 3 files changed, 38 insertions(+), 15 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/class_content_visibility.php b/phpBB/includes/class_content_visibility.php
index c7c9586e50..93643773d9 100644
--- a/phpBB/includes/class_content_visibility.php
+++ b/phpBB/includes/class_content_visibility.php
@@ -30,7 +30,7 @@ class phpbb_content_visibility
 	* @param $table_alias string - Table alias to prefix in SQL queries
 	* @return string with the appropriate combination SQL logic for topic/post_visibility
 	*/
-	public function get_visibility_sql($mode, $forum_id, $table_alias = '')
+	static public function get_visibility_sql($mode, $forum_id, $table_alias = '')
 	{
 		global $auth, $db, $user;
 
@@ -67,7 +67,7 @@ class phpbb_content_visibility
 	* @param $table_alias string - Table alias to prefix in SQL queries
 	* @return string with the appropriate combination SQL logic for topic/post_visibility
 	*/
-	public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
+	static public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
 	{
 		global $auth, $db, $user;
 
@@ -116,7 +116,7 @@ class phpbb_content_visibility
 	* @param $forum_id - int - forum ID where $topic_id resides
 	* @return bool true = success, false = fail
 	*/
-	public function set_topic_visibility($visibility, $topic_id, $forum_id)
+	static public function set_topic_visibility($visibility, $topic_id, $forum_id)
 	{
 		global $db;
 
@@ -139,7 +139,7 @@ class phpbb_content_visibility
 	* @param $is_starter - bool - is this the first post of the topic
 	* @param $is_latest - bool - is this the last post of the topic
 	*/
-	public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $is_starter, $is_latest)
+	static public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $is_starter, $is_latest)
 	{
 		global $db;
 
@@ -182,7 +182,7 @@ class phpbb_content_visibility
 	* @param $post_locked - bool - is the post locked?
 	* @return bool
 	*/
-	public function can_soft_delete($forum_id, $poster_id, $post_locked)
+	static function can_soft_delete($forum_id, $poster_id, $post_locked)
 	{
 		global $auth, $user;
 
@@ -228,7 +228,7 @@ class phpbb_content_visibility
 	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
 	* @return void
 	*/
-	public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data)
+	static public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data)
 	{
 		global $auth, $config, $db;
 
@@ -266,14 +266,27 @@ class phpbb_content_visibility
 	* Notably, we do _not_ need the post ID to do this operation. We're only changing statistic caches
 	* @param $forum_id - int - the forum where the topic resides
 	* @param $current_time - int - passed for consistency instead of calling time() internally
+	* @param $topic_row - array - contains information from the topics table about given topic
 	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
 	* @return void
 	*/
-	public function hide_post($forum_id, $current_time, &$sql_data)
+	static public function hide_post($forum_id, $current_time, $topic_row, &$sql_data)
 	{
 		global $auth, $config, $db;
 
-		$sql_data[TOPICS_TABLE] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
+		// initialize the array if needed (php throws E_NOTICE when .= is used
+		// on a non-existing array element)
+		if (empty($sql_data[TOPICS_TABLE]))
+		{
+			$sql_data[TOPICS_TABLE] = '';
+		}
+
+		if ($topic_row['topic_replies'] > 0)
+		{
+			$sql_data[TOPICS_TABLE] = 'topic_replies = topic_replies - 1,';
+		}
+		$sql_data[TOPICS_TABLE] .= ' topic_last_view_time = ' . $current_time;
+
 		$sql_data[FORUMS_TABLE] = 'forum_posts = forum_posts - 1';
 
 		set_config_count('num_posts', -1, true);
@@ -293,7 +306,7 @@ class phpbb_content_visibility
 	* 	the posts/topics in question
 	* @param $post_id_list - array of ints - the set of posts being worked on
 	*/
-	public function unhide_posts_topics($mode, $post_info, $post_id_list)
+	static public function unhide_posts_topics($mode, $post_info, $post_id_list)
 	{
 		global $db, $config;
 
@@ -435,6 +448,15 @@ class phpbb_content_visibility
 		sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
 		unset($topic_id_list, $forum_id_list);
 
-		return true;
+		if ($total_topics)
+		{
+			$success_msg = ($total_topics == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS';
+		}
+		else
+		{
+			$success_msg = (sizeof($post_id_list) + sizeof($post_approved_list) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS';
+		}
+
+		return $success_msg;
 	}
 }
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 364a3e7fe2..b63a41df7d 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1467,7 +1467,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 	if ($is_soft)
 	{
 		phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
-		phpbb_content_visibility::hide_post($forum_id, time(), $sql_data);
+		phpbb_content_visibility::hide_post($forum_id, time(), $data, $sql_data);
 	}
 	else
 	{
@@ -1501,7 +1501,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 			if ($is_soft)
 			{
 				$topic_row = array();
-				phpbb_content_visibility::set_topic_visibility(POST_DELETED, $topic_id, $forum_id);
+				phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id);
 				phpbb_content_visibility::hide_topic($topic_id, $forum_id, $topic_row, $sql_data);
 			}
 			else
@@ -1548,8 +1548,8 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 		case 'delete_last_post':
 			if ($is_soft)
 			{
-				phpbb_content_visibility::hide_post($forum_id, time(), $sql_data);
-				phpbb_content_visibility::set_post_visibility($post_id, $topic_id, $forum_id, false, true);
+				phpbb_content_visibility::hide_post($forum_id, time(), $data, $sql_data);
+				phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, false, true);
 			}
 			else
 			{
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 597be855b7..6c36084e68 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -322,6 +322,7 @@ class mcp_queue
 				if ($mode == 'unapproved_posts' || $mode == 'deleted_posts')
 				{
 					$visibility_const = ($mode == 'unapproved_posts') ? ITEM_UNAPPROVED : ITEM_DELETED;
+					$starter_sql = ($mode == 'unapproved_posts') ? 'AND t.topic_first_post_id <> p.post_id' : '';
 
 					$sql = 'SELECT p.post_id
 						FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . '
@@ -330,7 +331,7 @@ class mcp_queue
 							' . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . '
 							' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . "
 							AND t.topic_id = p.topic_id
-							AND t.topic_first_post_id <> p.post_id
+							$starter_sql
 							$limit_time_sql
 						ORDER BY $sort_order_sql";
 					$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
-- 
cgit v1.2.1


From 5ff35ccf72042cadc7f0bddc540eb26f1d99e11b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 28 Aug 2012 21:54:33 +0200
Subject: [feature/soft-delete] Use autoloading for content_visibility class
 PHPBB3-9657

---
 phpBB/includes/class_content_visibility.php | 462 ----------------------------
 phpBB/includes/content_visibility.php       | 461 +++++++++++++++++++++++++++
 2 files changed, 461 insertions(+), 462 deletions(-)
 delete mode 100644 phpBB/includes/class_content_visibility.php
 create mode 100644 phpBB/includes/content_visibility.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/class_content_visibility.php b/phpBB/includes/class_content_visibility.php
deleted file mode 100644
index 93643773d9..0000000000
--- a/phpBB/includes/class_content_visibility.php
+++ /dev/null
@@ -1,462 +0,0 @@
-<?php
-/**
-*
-* @package phpbb
-* @version $Id$
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* phpbb_visibility
-* Handle fetching and setting the visibility for topics and posts
-* @package phpbb
-*/
-class phpbb_content_visibility
-{
-	/**
-	* Create topic/post visibility SQL for a given forum ID
-	* @param $mode string - either "topic" or "post"
-	* @param $forum_id int - current forum ID
-	* @param $table_alias string - Table alias to prefix in SQL queries
-	* @return string with the appropriate combination SQL logic for topic/post_visibility
-	*/
-	static public function get_visibility_sql($mode, $forum_id, $table_alias = '')
-	{
-		global $auth, $db, $user;
-
-		$status_ary = array(ITEM_APPROVED);
-		if ($auth->acl_get('m_approve', $forum_id))
-		{
-			$status_ary[] = ITEM_UNAPPROVED;
-		}
-
-		if ($auth->acl_get('m_restore', $forum_id))
-		{
-			$status_ary[] = ITEM_DELETED;
-		}
-
-		$clause = $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
-
-		// only allow the user to view deleted posts he himself made
-		if ($auth->acl_get('f_restore', $forum_id) && !$auth->acl_get('m_restore', $forum_id))
-		{
-			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
-			$clause = '(' . $clause . "
-				OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . "
-					AND $table_alias$poster_column = " . $user->data['user_id'] . '))';
-
-		}
-
-		return $clause;
-	}
-
-	/**
-	* Fetch visibility SQL for all forums on the board.
-	* @param $mode string - either "topic" or "post"
-	* @param $exclude_forum_ids - int array - 
-	* @param $table_alias string - Table alias to prefix in SQL queries
-	* @return string with the appropriate combination SQL logic for topic/post_visibility
-	*/
-	static public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
-	{
-		global $auth, $db, $user;
-
-		// users can always see approved posts
-		$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
-
-		// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
-		$approve_forums = array_diff(array_keys($auth->acl_getf('m_approve', true)), $exclude_forum_ids);
-		if (sizeof($approve_forums))
-		{
-			// users can view unapproved topics in certain forums. specify them.
-			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_UNAPPROVED . '
-				AND ' . $db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ')';
-		}
-
-		// this is exactly the same logic as for approve forums, above
-		$restore_forums = array_diff(array_keys($auth->acl_getf('m_restore', true)), $exclude_forum_ids);
-		if (sizeof($restore_forums))
-		{
-			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . '
-				AND ' . $db->sql_in_set($table_alias . 'forum_id', $restore_forums) . ')';
-		}
-
-		// we also allow the user to view deleted posts he himself made
-		$user_restore_forums = array_diff(array_keys($auth->acl_getf('f_restore', true)), $exclude_forum_ids);
-		if (sizeof($user_restore_forums) && !sizeof($restore_forums))
-		{
-			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
-
-			// specify the poster ID, the visibility type, and the forums we're interested in
-			$where_sql .= " OR ($table_alias$poster_column = " . $user->data['user_id'] . "
-				AND $table_alias{$mode}_visibility = " . ITEM_DELETED . "
-				AND " . $db->sql_in_set($table_alias . 'forum_id', $user_restore_forums) . ')';
-		}
-
-		$where_sql .= ')';
-
-		return $where_sql;
-	}
-
-	/**
-	* Description: Allows approving (which is akin to undeleting), unapproving (!) or soft deleting an entire topic.
-	* Calls set_post_visibility as needed.
-	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
-	* @param $topic_id - int - topic ID to act on
-	* @param $forum_id - int - forum ID where $topic_id resides
-	* @return bool true = success, false = fail
-	*/
-	static public function set_topic_visibility($visibility, $topic_id, $forum_id)
-	{
-		global $db;
-
-		$sql = 'UPDATE ' . TOPICS_TABLE . ' SET topic_visibility = ' . (int) $visibility . '
-			WHERE topic_id = ' . (int) $topic_id;
-		$db->sql_query($sql);
-
-		// if we're approving, disapproving, or deleteing a topic, assume that
-		// we are adjusting _all_ posts in that topic.
-		$status = self::set_post_visibility($visibility, false, $topic_id, $forum_id, true, true);
-
-		return $status;
-	}
-
-	/**
-	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
-	* @param $post_id - int - the post ID to act on
-	* @param $topic_id - int - forum where $post_id is found
-	* @param $forum_id - int - forum ID where $topic_id resides
-	* @param $is_starter - bool - is this the first post of the topic
-	* @param $is_latest - bool - is this the last post of the topic
-	*/
-	static public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $is_starter, $is_latest)
-	{
-		global $db;
-
-		// if we're changing the starter, we need to change the rest of the topic
-		if ($is_starter && !$is_latest)
-		{
-			return self::set_topic_visibility($visibility, $topic_id, $forum_id);
-		}
-
-		if ($post_id)
-		{
-			$where_sql = 'post_id = ' . (int) $post_id;
-		}
-		else if ($topic_id)
-		{
-			$where_sql = 'topic_id = ' . (int) $topic_id;
-		}
-		else
-		{
-			// throw new MissingArgumentsException(); <-- a nice idea
-			return false;
-		}
-
-		$sql = 'UPDATE ' . POSTS_TABLE . ' SET post_visibility = ' . (int) $visibility . '
-			WHERE ' . $where_sql;
-		$db->sql_query($sql);
-
-		// Sync the first/last topic information if needed
-		if ($is_starter || $is_latest)
-		{
-			update_post_information('topic', $topic_id, false);
-			update_post_information('forum', $forum_id, false);
-		}
-	}
-
-	/**
-	* Can the current logged-in user soft-delete posts?
-	* @param $forum_id - int - the forum ID whose permissions to check
-	* @param $poster_id - int - the poster ID of the post in question
-	* @param $post_locked - bool - is the post locked?
-	* @return bool
-	*/
-	static function can_soft_delete($forum_id, $poster_id, $post_locked)
-	{
-		global $auth, $user;
-
-		if ($auth->acl_get('m_softdelete', $forum_id))
-		{
-			return true;
-		}
-		else if ($auth->acl_get('f_softdelete', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
-		{
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Can the current logged-in user restore soft-deleted posts?
-	* @param $forum_id - int - the forum ID whose permissions to check
-	* @param $poster_id - int - the poster ID of the post in question
-	* @param $post_locked - bool - is the post locked?
-	* @return bool
-	*/
-	public function can_restore($forum_id, $poster_id, $post_locked)
-	{
-		global $auth, $user;
-
-		if ($auth->acl_get('m_restore', $forum_id))
-		{
-			return true;
-		}
-		else if ($auth->acl_get('f_restore', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
-		{
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Do the required math to hide a complete topic (going from approved to
-	* unapproved or from approved to deleted)
-	* @param $topic_id - int - the topic to act on
-	* @param $forum_id - int - the forum where the topic resides
-	* @param $topic_row - array - data about the topic, may be empty at call time
-	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
-	* @return void
-	*/
-	static public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data)
-	{
-		global $auth, $config, $db;
-
-		// Do we need to grab some topic informations?
-		if (!sizeof($topic_row))
-		{
-			$sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_visibility
-				FROM ' . TOPICS_TABLE . '
-				WHERE topic_id = ' . $topic_id;
-			$result = $db->sql_query($sql);
-			$topic_row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-		}
-
-		// If this is the only post remaining we do not need to decrement topic_replies.
-		// Also do not decrement if first post - then the topic_replies will not be adjusted if approving the topic again.
-
-		// If this is an edited topic or the first post the topic gets completely disapproved later on...
-		$sql_data[FORUMS_TABLE] = 'forum_topics = forum_topics - 1';
-		$sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
-
-		set_config_count('num_topics', -1, true);
-		set_config_count('num_posts', ($topic_row['topic_replies'] + 1) * (-1), true);
-
-		// Only decrement this post, since this is the one non-approved now
-		if ($auth->acl_get('f_postcount', $forum_id))
-		{
-			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
-		}
-	}
-
-	/**
-	* Do the required math to hide a single post (going from approved to
-	* unapproved or from approved to deleted)
-	* Notably, we do _not_ need the post ID to do this operation. We're only changing statistic caches
-	* @param $forum_id - int - the forum where the topic resides
-	* @param $current_time - int - passed for consistency instead of calling time() internally
-	* @param $topic_row - array - contains information from the topics table about given topic
-	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
-	* @return void
-	*/
-	static public function hide_post($forum_id, $current_time, $topic_row, &$sql_data)
-	{
-		global $auth, $config, $db;
-
-		// initialize the array if needed (php throws E_NOTICE when .= is used
-		// on a non-existing array element)
-		if (empty($sql_data[TOPICS_TABLE]))
-		{
-			$sql_data[TOPICS_TABLE] = '';
-		}
-
-		if ($topic_row['topic_replies'] > 0)
-		{
-			$sql_data[TOPICS_TABLE] = 'topic_replies = topic_replies - 1,';
-		}
-		$sql_data[TOPICS_TABLE] .= ' topic_last_view_time = ' . $current_time;
-
-		$sql_data[FORUMS_TABLE] = 'forum_posts = forum_posts - 1';
-
-		set_config_count('num_posts', -1, true);
-
-		if ($auth->acl_get('f_postcount', $forum_id))
-		{
-			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
-		}
-	}
-
-	/**
-	* One function to rule them all ... and unhide posts and topics.  This could
-	* reasonably be broken up, I straight copied this code from the mcp_queue.php
-	* file here for global access.
-	* @param $mode - string - member of the set {'approve', 'restore'}
-	* @param $post_info - array - Contains info from post U topics table about
-	* 	the posts/topics in question
-	* @param $post_id_list - array of ints - the set of posts being worked on
-	*/
-	static public function unhide_posts_topics($mode, $post_info, $post_id_list)
-	{
-		global $db, $config;
-
-		// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
-		// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
-
-		$total_topics = $total_posts = 0;
-		$topic_approve_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array();
-		$user_posts_sql = $post_approved_list = array();
-
-		foreach ($post_info as $post_id => $post_data)
-		{
-			if ($post_data['post_visibility'] == ITEM_APPROVED)
-			{
-				$post_approved_list[] = $post_id;
-				continue;
-			}
-
-			$topic_id_list[$post_data['topic_id']] = 1;
-
-			if ($post_data['forum_id'])
-			{
-				$forum_id_list[$post_data['forum_id']] = 1;
-			}
-
-			// User post update (we do not care about topic or post, since user posts are strictly connected to posts)
-			// But we care about forums where post counts get not increased. ;)
-			if ($post_data['post_postcount'])
-			{
-				$user_posts_sql[$post_data['poster_id']] = (empty($user_posts_sql[$post_data['poster_id']])) ? 1 : $user_posts_sql[$post_data['poster_id']] + 1;
-			}
-
-			// Topic or Post. ;)
-			if ($post_data['topic_first_post_id'] == $post_id)
-			{
-				if ($post_data['forum_id'])
-				{
-					$total_topics++;
-				}
-				$topic_approve_sql[] = $post_data['topic_id'];
-
-				$approve_log[] = array(
-					'type'			=> 'topic',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> $post_data['topic_id'],
-				);
-			}
-			else
-			{
-				$approve_log[] = array(
-					'type'			=> 'post',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> $post_data['topic_id'],
-				);
-			}
-
-			if ($post_data['forum_id'])
-			{
-				$total_posts++;
-
-				// Increment by topic_replies if we approve a topic...
-				// This works because we do not adjust the topic_replies when re-approving a topic after an edit.
-				if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_replies'])
-				{
-					$total_posts += $post_data['topic_replies'];
-				}
-			}
-
-			$post_approve_sql[] = $post_id;
-		}
-
-		$post_id_list = array_values(array_diff($post_id_list, $post_approved_list));
-		for ($i = 0, $size = sizeof($post_approved_list); $i < $size; $i++)
-		{
-			unset($post_info[$post_approved_list[$i]]);
-		}
-
-		if (sizeof($topic_approve_sql))
-		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET topic_visibility = ' . ITEM_APPROVED . '
-				WHERE ' . $db->sql_in_set('topic_id', $topic_approve_sql);
-			$db->sql_query($sql);
-		}
-
-		if (sizeof($post_approve_sql))
-		{
-			$sql = 'UPDATE ' . POSTS_TABLE . '
-				SET post_visibility = ' . ITEM_APPROVED . '
-				WHERE ' . $db->sql_in_set('post_id', $post_approve_sql);
-			$db->sql_query($sql);
-		}
-
-		unset($topic_approve_sql, $post_approve_sql);
-
-		foreach ($approve_log as $log_data)
-		{
-			add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_' . strtoupper($mode) . 'D' : 'LOG_POST_' . strtoupper($mode) . 'D', $log_data['post_subject']);
-		}
-
-		if (sizeof($user_posts_sql))
-		{
-			// Try to minimize the query count by merging users with the same post count additions
-			$user_posts_update = array();
-
-			foreach ($user_posts_sql as $user_id => $user_posts)
-			{
-				$user_posts_update[$user_posts][] = $user_id;
-			}
-
-			foreach ($user_posts_update as $user_posts => $user_id_ary)
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_posts = user_posts + ' . $user_posts . '
-					WHERE ' . $db->sql_in_set('user_id', $user_id_ary);
-				$db->sql_query($sql);
-			}
-		}
-
-		if ($total_topics)
-		{
-			set_config_count('num_topics', $total_topics, true);
-		}
-
-		if ($total_posts)
-		{
-			set_config_count('num_posts', $total_posts, true);
-		}
-
-		if (!function_exists('sync'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include ($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
-		}
-
-		sync('topic', 'topic_id', array_keys($topic_id_list), true);
-		sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
-		unset($topic_id_list, $forum_id_list);
-
-		if ($total_topics)
-		{
-			$success_msg = ($total_topics == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS';
-		}
-		else
-		{
-			$success_msg = (sizeof($post_id_list) + sizeof($post_approved_list) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS';
-		}
-
-		return $success_msg;
-	}
-}
diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
new file mode 100644
index 0000000000..12b51df3bb
--- /dev/null
+++ b/phpBB/includes/content_visibility.php
@@ -0,0 +1,461 @@
+<?php
+/**
+*
+* @package phpbb
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* phpbb_visibility
+* Handle fetching and setting the visibility for topics and posts
+* @package phpbb
+*/
+class phpbb_content_visibility
+{
+	/**
+	* Create topic/post visibility SQL for a given forum ID
+	* @param $mode string - either "topic" or "post"
+	* @param $forum_id int - current forum ID
+	* @param $table_alias string - Table alias to prefix in SQL queries
+	* @return string with the appropriate combination SQL logic for topic/post_visibility
+	*/
+	static public function get_visibility_sql($mode, $forum_id, $table_alias = '')
+	{
+		global $auth, $db, $user;
+
+		$status_ary = array(ITEM_APPROVED);
+		if ($auth->acl_get('m_approve', $forum_id))
+		{
+			$status_ary[] = ITEM_UNAPPROVED;
+		}
+
+		if ($auth->acl_get('m_restore', $forum_id))
+		{
+			$status_ary[] = ITEM_DELETED;
+		}
+
+		$clause = $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
+
+		// only allow the user to view deleted posts he himself made
+		if ($auth->acl_get('f_restore', $forum_id) && !$auth->acl_get('m_restore', $forum_id))
+		{
+			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
+			$clause = '(' . $clause . "
+				OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . "
+					AND $table_alias$poster_column = " . $user->data['user_id'] . '))';
+
+		}
+
+		return $clause;
+	}
+
+	/**
+	* Fetch visibility SQL for all forums on the board.
+	* @param $mode string - either "topic" or "post"
+	* @param $exclude_forum_ids - int array - 
+	* @param $table_alias string - Table alias to prefix in SQL queries
+	* @return string with the appropriate combination SQL logic for topic/post_visibility
+	*/
+	static public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
+	{
+		global $auth, $db, $user;
+
+		// users can always see approved posts
+		$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
+
+		// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
+		$approve_forums = array_diff(array_keys($auth->acl_getf('m_approve', true)), $exclude_forum_ids);
+		if (sizeof($approve_forums))
+		{
+			// users can view unapproved topics in certain forums. specify them.
+			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_UNAPPROVED . '
+				AND ' . $db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ')';
+		}
+
+		// this is exactly the same logic as for approve forums, above
+		$restore_forums = array_diff(array_keys($auth->acl_getf('m_restore', true)), $exclude_forum_ids);
+		if (sizeof($restore_forums))
+		{
+			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . '
+				AND ' . $db->sql_in_set($table_alias . 'forum_id', $restore_forums) . ')';
+		}
+
+		// we also allow the user to view deleted posts he himself made
+		$user_restore_forums = array_diff(array_keys($auth->acl_getf('f_restore', true)), $exclude_forum_ids);
+		if (sizeof($user_restore_forums) && !sizeof($restore_forums))
+		{
+			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
+
+			// specify the poster ID, the visibility type, and the forums we're interested in
+			$where_sql .= " OR ($table_alias$poster_column = " . $user->data['user_id'] . "
+				AND $table_alias{$mode}_visibility = " . ITEM_DELETED . "
+				AND " . $db->sql_in_set($table_alias . 'forum_id', $user_restore_forums) . ')';
+		}
+
+		$where_sql .= ')';
+
+		return $where_sql;
+	}
+
+	/**
+	* Description: Allows approving (which is akin to undeleting), unapproving (!) or soft deleting an entire topic.
+	* Calls set_post_visibility as needed.
+	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
+	* @param $topic_id - int - topic ID to act on
+	* @param $forum_id - int - forum ID where $topic_id resides
+	* @return bool true = success, false = fail
+	*/
+	static public function set_topic_visibility($visibility, $topic_id, $forum_id)
+	{
+		global $db;
+
+		$sql = 'UPDATE ' . TOPICS_TABLE . ' SET topic_visibility = ' . (int) $visibility . '
+			WHERE topic_id = ' . (int) $topic_id;
+		$db->sql_query($sql);
+
+		// if we're approving, disapproving, or deleteing a topic, assume that
+		// we are adjusting _all_ posts in that topic.
+		$status = self::set_post_visibility($visibility, false, $topic_id, $forum_id, true, true);
+
+		return $status;
+	}
+
+	/**
+	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
+	* @param $post_id - int - the post ID to act on
+	* @param $topic_id - int - forum where $post_id is found
+	* @param $forum_id - int - forum ID where $topic_id resides
+	* @param $is_starter - bool - is this the first post of the topic
+	* @param $is_latest - bool - is this the last post of the topic
+	*/
+	static public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $is_starter, $is_latest)
+	{
+		global $db;
+
+		// if we're changing the starter, we need to change the rest of the topic
+		if ($is_starter && !$is_latest)
+		{
+			return self::set_topic_visibility($visibility, $topic_id, $forum_id);
+		}
+
+		if ($post_id)
+		{
+			$where_sql = 'post_id = ' . (int) $post_id;
+		}
+		else if ($topic_id)
+		{
+			$where_sql = 'topic_id = ' . (int) $topic_id;
+		}
+		else
+		{
+			// throw new MissingArgumentsException(); <-- a nice idea
+			return false;
+		}
+
+		$sql = 'UPDATE ' . POSTS_TABLE . ' SET post_visibility = ' . (int) $visibility . '
+			WHERE ' . $where_sql;
+		$db->sql_query($sql);
+
+		// Sync the first/last topic information if needed
+		if ($is_starter || $is_latest)
+		{
+			update_post_information('topic', $topic_id, false);
+			update_post_information('forum', $forum_id, false);
+		}
+	}
+
+	/**
+	* Can the current logged-in user soft-delete posts?
+	* @param $forum_id - int - the forum ID whose permissions to check
+	* @param $poster_id - int - the poster ID of the post in question
+	* @param $post_locked - bool - is the post locked?
+	* @return bool
+	*/
+	static function can_soft_delete($forum_id, $poster_id, $post_locked)
+	{
+		global $auth, $user;
+
+		if ($auth->acl_get('m_softdelete', $forum_id))
+		{
+			return true;
+		}
+		else if ($auth->acl_get('f_softdelete', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	* Can the current logged-in user restore soft-deleted posts?
+	* @param $forum_id - int - the forum ID whose permissions to check
+	* @param $poster_id - int - the poster ID of the post in question
+	* @param $post_locked - bool - is the post locked?
+	* @return bool
+	*/
+	public function can_restore($forum_id, $poster_id, $post_locked)
+	{
+		global $auth, $user;
+
+		if ($auth->acl_get('m_restore', $forum_id))
+		{
+			return true;
+		}
+		else if ($auth->acl_get('f_restore', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	* Do the required math to hide a complete topic (going from approved to
+	* unapproved or from approved to deleted)
+	* @param $topic_id - int - the topic to act on
+	* @param $forum_id - int - the forum where the topic resides
+	* @param $topic_row - array - data about the topic, may be empty at call time
+	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
+	* @return void
+	*/
+	static public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data)
+	{
+		global $auth, $config, $db;
+
+		// Do we need to grab some topic informations?
+		if (!sizeof($topic_row))
+		{
+			$sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_visibility
+				FROM ' . TOPICS_TABLE . '
+				WHERE topic_id = ' . $topic_id;
+			$result = $db->sql_query($sql);
+			$topic_row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+		}
+
+		// If this is the only post remaining we do not need to decrement topic_replies.
+		// Also do not decrement if first post - then the topic_replies will not be adjusted if approving the topic again.
+
+		// If this is an edited topic or the first post the topic gets completely disapproved later on...
+		$sql_data[FORUMS_TABLE] = 'forum_topics = forum_topics - 1';
+		$sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
+
+		set_config_count('num_topics', -1, true);
+		set_config_count('num_posts', ($topic_row['topic_replies'] + 1) * (-1), true);
+
+		// Only decrement this post, since this is the one non-approved now
+		if ($auth->acl_get('f_postcount', $forum_id))
+		{
+			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
+		}
+	}
+
+	/**
+	* Do the required math to hide a single post (going from approved to
+	* unapproved or from approved to deleted)
+	* Notably, we do _not_ need the post ID to do this operation. We're only changing statistic caches
+	* @param $forum_id - int - the forum where the topic resides
+	* @param $current_time - int - passed for consistency instead of calling time() internally
+	* @param $topic_row - array - contains information from the topics table about given topic
+	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
+	* @return void
+	*/
+	static public function hide_post($forum_id, $current_time, $topic_row, &$sql_data)
+	{
+		global $auth, $config, $db;
+
+		// initialize the array if needed (php throws E_NOTICE when .= is used
+		// on a non-existing array element)
+		if (empty($sql_data[TOPICS_TABLE]))
+		{
+			$sql_data[TOPICS_TABLE] = '';
+		}
+
+		if ($topic_row['topic_replies'] > 0)
+		{
+			$sql_data[TOPICS_TABLE] = 'topic_replies = topic_replies - 1,';
+		}
+		$sql_data[TOPICS_TABLE] .= ' topic_last_view_time = ' . $current_time;
+
+		$sql_data[FORUMS_TABLE] = 'forum_posts = forum_posts - 1';
+
+		set_config_count('num_posts', -1, true);
+
+		if ($auth->acl_get('f_postcount', $forum_id))
+		{
+			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
+		}
+	}
+
+	/**
+	* One function to rule them all ... and unhide posts and topics.  This could
+	* reasonably be broken up, I straight copied this code from the mcp_queue.php
+	* file here for global access.
+	* @param $mode - string - member of the set {'approve', 'restore'}
+	* @param $post_info - array - Contains info from post U topics table about
+	* 	the posts/topics in question
+	* @param $post_id_list - array of ints - the set of posts being worked on
+	*/
+	static public function unhide_posts_topics($mode, $post_info, $post_id_list)
+	{
+		global $db, $config;
+
+		// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
+		// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
+
+		$total_topics = $total_posts = 0;
+		$topic_approve_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array();
+		$user_posts_sql = $post_approved_list = array();
+
+		foreach ($post_info as $post_id => $post_data)
+		{
+			if ($post_data['post_visibility'] == ITEM_APPROVED)
+			{
+				$post_approved_list[] = $post_id;
+				continue;
+			}
+
+			$topic_id_list[$post_data['topic_id']] = 1;
+
+			if ($post_data['forum_id'])
+			{
+				$forum_id_list[$post_data['forum_id']] = 1;
+			}
+
+			// User post update (we do not care about topic or post, since user posts are strictly connected to posts)
+			// But we care about forums where post counts get not increased. ;)
+			if ($post_data['post_postcount'])
+			{
+				$user_posts_sql[$post_data['poster_id']] = (empty($user_posts_sql[$post_data['poster_id']])) ? 1 : $user_posts_sql[$post_data['poster_id']] + 1;
+			}
+
+			// Topic or Post. ;)
+			if ($post_data['topic_first_post_id'] == $post_id)
+			{
+				if ($post_data['forum_id'])
+				{
+					$total_topics++;
+				}
+				$topic_approve_sql[] = $post_data['topic_id'];
+
+				$approve_log[] = array(
+					'type'			=> 'topic',
+					'post_subject'	=> $post_data['post_subject'],
+					'forum_id'		=> $post_data['forum_id'],
+					'topic_id'		=> $post_data['topic_id'],
+				);
+			}
+			else
+			{
+				$approve_log[] = array(
+					'type'			=> 'post',
+					'post_subject'	=> $post_data['post_subject'],
+					'forum_id'		=> $post_data['forum_id'],
+					'topic_id'		=> $post_data['topic_id'],
+				);
+			}
+
+			if ($post_data['forum_id'])
+			{
+				$total_posts++;
+
+				// Increment by topic_replies if we approve a topic...
+				// This works because we do not adjust the topic_replies when re-approving a topic after an edit.
+				if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_replies'])
+				{
+					$total_posts += $post_data['topic_replies'];
+				}
+			}
+
+			$post_approve_sql[] = $post_id;
+		}
+
+		$post_id_list = array_values(array_diff($post_id_list, $post_approved_list));
+		for ($i = 0, $size = sizeof($post_approved_list); $i < $size; $i++)
+		{
+			unset($post_info[$post_approved_list[$i]]);
+		}
+
+		if (sizeof($topic_approve_sql))
+		{
+			$sql = 'UPDATE ' . TOPICS_TABLE . '
+				SET topic_visibility = ' . ITEM_APPROVED . '
+				WHERE ' . $db->sql_in_set('topic_id', $topic_approve_sql);
+			$db->sql_query($sql);
+		}
+
+		if (sizeof($post_approve_sql))
+		{
+			$sql = 'UPDATE ' . POSTS_TABLE . '
+				SET post_visibility = ' . ITEM_APPROVED . '
+				WHERE ' . $db->sql_in_set('post_id', $post_approve_sql);
+			$db->sql_query($sql);
+		}
+
+		unset($topic_approve_sql, $post_approve_sql);
+
+		foreach ($approve_log as $log_data)
+		{
+			add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_' . strtoupper($mode) . 'D' : 'LOG_POST_' . strtoupper($mode) . 'D', $log_data['post_subject']);
+		}
+
+		if (sizeof($user_posts_sql))
+		{
+			// Try to minimize the query count by merging users with the same post count additions
+			$user_posts_update = array();
+
+			foreach ($user_posts_sql as $user_id => $user_posts)
+			{
+				$user_posts_update[$user_posts][] = $user_id;
+			}
+
+			foreach ($user_posts_update as $user_posts => $user_id_ary)
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_posts = user_posts + ' . $user_posts . '
+					WHERE ' . $db->sql_in_set('user_id', $user_id_ary);
+				$db->sql_query($sql);
+			}
+		}
+
+		if ($total_topics)
+		{
+			set_config_count('num_topics', $total_topics, true);
+		}
+
+		if ($total_posts)
+		{
+			set_config_count('num_posts', $total_posts, true);
+		}
+
+		if (!function_exists('sync'))
+		{
+			global $phpbb_root_path, $phpEx;
+			include ($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
+		}
+
+		sync('topic', 'topic_id', array_keys($topic_id_list), true);
+		sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
+		unset($topic_id_list, $forum_id_list);
+
+		if ($total_topics)
+		{
+			$success_msg = ($total_topics == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS';
+		}
+		else
+		{
+			$success_msg = (sizeof($post_id_list) + sizeof($post_approved_list) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS';
+		}
+
+		return $success_msg;
+	}
+}
-- 
cgit v1.2.1


From 1935568c3ef8f3dc243039973bb37c812be3d447 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 28 Aug 2012 21:57:52 +0200
Subject: [feature/soft-delete] Fix typo in column name topic_visibility

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index db9872e04e..a90fc0891e 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -534,7 +534,7 @@ function mcp_move_topic($topic_ids)
 					'forum_id'				=>	(int) $row['forum_id'],
 					'icon_id'				=>	(int) $row['icon_id'],
 					'topic_attachment'		=>	(int) $row['topic_attachment'],
-					'topic_visibliity'		=>	ITEM_APPROVED, // a shadow topic is always approved
+					'topic_visibility'		=>	ITEM_APPROVED, // a shadow topic is always approved
 					'topic_reported'		=>	0, // a shadow topic is never reported
 					'topic_title'			=>	(string) $row['topic_title'],
 					'topic_poster'			=>	(int) $row['topic_poster'],
-- 
cgit v1.2.1


From b774c09c7f25e3119eeffe7363c91c7b9fd6dbf7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 28 Aug 2012 23:01:38 +0200
Subject: [feature/soft-delete] Use the variable which holds the correct item
 status

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 6c36084e68..a20ce10aa6 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -327,7 +327,7 @@ class mcp_queue
 					$sql = 'SELECT p.post_id
 						FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . '
 						WHERE ' . $db->sql_in_set('p.forum_id', $forum_list) . '
-							AND p.post_visibility = ' . ITEM_UNAPPROVED . '
+							AND p.post_visibility = ' . $visibility_const . '
 							' . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . '
 							' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . "
 							AND t.topic_id = p.topic_id
-- 
cgit v1.2.1


From 8a036fa3e4e1fc51a3eb7fded346ccbd84a291b5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 29 Aug 2012 18:42:14 +0200
Subject: [feature/soft-delete] Update restoring feature to use ajax if
 requested.

Also fixes the mcp as a hole:
- displayes a success message
- gives a link to the post, if only one was restored

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index a20ce10aa6..cbf0ff0089 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -470,7 +470,7 @@ class mcp_queue
 function restore_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
-	global $phpEx, $phpbb_root_path;
+	global $phpEx, $phpbb_root_path, $request;
 
 	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_restore')))
 	{
@@ -483,7 +483,7 @@ function restore_post($post_id_list, $id, $mode)
 
 	$post_info = get_post_data($post_id_list, 'm_restore');
 
-	phpbb_content_visibility::unhide_posts_topics('restore', $post_info, $post_id_list);
+	$success_msg = phpbb_content_visibility::unhide_posts_topics('restore', $post_info, $post_id_list);
 
 	if (!$success_msg)
 	{
@@ -500,7 +500,20 @@ function restore_post($post_id_list, $id, $mode)
 			$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');
 		}
 
-		trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message);
+		$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message;
+
+		if ($request->is_ajax())
+		{
+			$json_response = new phpbb_json_response;
+			$json_response->send(array(
+				'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
+				'MESSAGE_TEXT'		=> $message,
+				'REFRESH_DATA'		=> null,
+				'visible'			=> true,
+			));
+		}
+
+		trigger_error($message);
 	}
 }
 
@@ -659,7 +672,7 @@ function approve_post($post_id_list, $id, $mode)
 				'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
 				'MESSAGE_TEXT'		=> $message,
 				'REFRESH_DATA'		=> null,
-				'approved'				=> true
+				'visible'			=> true,
 			));
 		}
 
@@ -931,7 +944,7 @@ function disapprove_post($post_id_list, $id, $mode)
 				'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
 				'MESSAGE_TEXT'		=> $message,
 				'REFRESH_DATA'		=> null,
-				'approved'				=> false
+				'visible'			=> false,
 			));
 		}
 
-- 
cgit v1.2.1


From 44ed05f5678b36d907555ed040229564b336632f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 29 Aug 2012 19:30:33 +0200
Subject: [feature/soft-delete] Simplify the query output if the user has
 m_restore

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 12b51df3bb..5c3e9d39dd 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -42,6 +42,11 @@ class phpbb_content_visibility
 		if ($auth->acl_get('m_restore', $forum_id))
 		{
 			$status_ary[] = ITEM_DELETED;
+
+			// If the user has m_restore, the rest of the function will not
+			// make more content visible, so we can return the query here.
+			// This avoids one OR in all queries
+			return $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
 		}
 
 		$clause = $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
@@ -52,8 +57,7 @@ class phpbb_content_visibility
 			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
 			$clause = '(' . $clause . "
 				OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . "
-					AND $table_alias$poster_column = " . $user->data['user_id'] . '))';
-
+					AND $table_alias$poster_column = " . (int) $user->data['user_id'] . '))';
 		}
 
 		return $clause;
-- 
cgit v1.2.1


From a1e0690b6b25ffd64f6ae2fc2f7b17a04e931690 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 29 Aug 2012 22:12:33 +0200
Subject: [feature/soft-delete] Simplification part2: user can see all item
 visibilities

If the user can see all visibilities, we can simply leave out the query part,
instead of adding a bunch of ANDs.

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 8 +++++++-
 phpBB/includes/functions.php          | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 5c3e9d39dd..287c46a335 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -43,9 +43,15 @@ class phpbb_content_visibility
 		{
 			$status_ary[] = ITEM_DELETED;
 
+			if (sizeof($status_ary) == 3)
+			{
+				// The user can see all types, so we simplify this to an empty string,
+				// as we don't need to restrict anything on the query.
+				return '';
+			}
+
 			// If the user has m_restore, the rest of the function will not
 			// make more content visible, so we can return the query here.
-			// This avoids one OR in all queries
 			return $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
 		}
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index ecec1e5e4a..4b7b3d5057 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1855,7 +1855,8 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 
 	// Handle update of unapproved topics info.
 	// Only update for moderators having m_approve permission for the forum.
-	$sql_update_unapproved = ($auth->acl_get('m_approve', $forum_id)) ? '': 'AND t.topic_approved = 1';
+	$sql_update_unapproved = phpbb_content_visibility::get_visibility_sql('topic', $forum_id, 't.');
+	$sql_update_unapproved = ($sql_update_unapproved) ? ' AND ' . $sql_update_unapproved : '';
 
 	// Check the forum for any left unread topics.
 	// If there are none, we mark the forum as read.
-- 
cgit v1.2.1


From 1c043254c00023a5fe17b1131fa605ca11d823a0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 30 Aug 2012 18:07:00 +0200
Subject: [feature/soft-delete] Add get_visibility_sql_forums based on global

The resulting query is 4-times faster, as the forum_id IN () arrays are
smaller and we need less AND/OR to build the hole query. The main difference
between those two functions is, that this one takes an array of included ids and
the _global one takes an array of excluded ids.

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 48 +++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 287c46a335..2e91521c78 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -69,6 +69,54 @@ class phpbb_content_visibility
 		return $clause;
 	}
 
+	/**
+	* Fetch visibility SQL for a set of forums
+	* @param $mode string - either "topic" or "post"
+	* @param $forum_ids - int array - 
+	* @param $table_alias string - Table alias to prefix in SQL queries
+	* @return string with the appropriate combination SQL logic for topic/post_visibility
+	*/
+	static public function get_visibility_sql_forums($mode, $forum_ids = array(), $table_alias = '')
+	{
+		global $auth, $db, $user;
+
+		// users can always see approved posts
+		$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
+
+		// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
+		$approve_forums = array_intersect($forum_ids, array_keys($auth->acl_getf('m_approve', true)));
+		if (sizeof($approve_forums))
+		{
+			// users can view unapproved topics in certain forums. specify them.
+			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_UNAPPROVED . '
+				AND ' . $db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ')';
+		}
+
+		// this is exactly the same logic as for approve forums, above
+		$restore_forums = array_intersect($forum_ids, array_keys($auth->acl_getf('m_restore', true)));
+		if (sizeof($restore_forums))
+		{
+			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . '
+				AND ' . $db->sql_in_set($table_alias . 'forum_id', $restore_forums) . ')';
+		}
+
+		// we also allow the user to view deleted posts he himself made
+		$user_restore_forums = array_diff(array_intersect($forum_ids, array_keys($auth->acl_getf('f_restore', true))), $restore_forums);
+		if (sizeof($user_restore_forums) && !sizeof($restore_forums))
+		{
+			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
+
+			// specify the poster ID, the visibility type, and the forums we're interested in
+			$where_sql .= " OR ($table_alias$poster_column = " . $user->data['user_id'] . "
+				AND $table_alias{$mode}_visibility = " . ITEM_DELETED . "
+				AND " . $db->sql_in_set($table_alias . 'forum_id', $user_restore_forums) . ')';
+		}
+
+		$where_sql .= ')';
+
+		return $where_sql;
+	}
+
 	/**
 	* Fetch visibility SQL for all forums on the board.
 	* @param $mode string - either "topic" or "post"
-- 
cgit v1.2.1


From 5b54ec2d64009eae17a7bfc12975caef03f7bec0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 30 Aug 2012 19:47:16 +0200
Subject: [feature/soft-delete] Try to fix search.php

at least it's running now, but the performance is not very good.

PHPBB3-9657
---
 phpBB/includes/search/fulltext_native.php | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index c7e7a451e4..e7fb4bd105 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -819,7 +819,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
 	{
 		// No author? No posts.
 		if (!sizeof($author_ary))
@@ -838,7 +838,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			$sort_key,
 			$topic_id,
 			implode(',', $ex_fid_ary),
-// @TODO			implode(',', $m_approve_fid_ary),
+			$post_visibility,
 			implode(',', $author_ary),
 			$author_name,
 		)));
@@ -888,20 +888,6 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			break;
 		}
 
-/*		if (!sizeof($m_approve_fid_ary))
-		{
-			$m_approve_fid_sql = ' AND p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary == array(-1))
-		{
-			$m_approve_fid_sql = '';
-		}
-		else
-		{
-			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $this->db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-*/
-
 		$select = ($type == 'posts') ? 'p.post_id' : 't.topic_id';
 		$is_mysql = false;
 
@@ -924,7 +910,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 							WHERE $sql_author
 								$sql_topic_id
 								$sql_firstpost
-								$m_approve_fid_sql
+								$post_visibility
 								$sql_fora
 								$sql_time";
 					}
@@ -944,7 +930,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 							WHERE $sql_author
 								$sql_topic_id
 								$sql_firstpost
-								$m_approve_fid_sql
+								$post_visibility
 								$sql_fora
 								AND t.topic_id = p.topic_id
 								$sql_time" . (($this->db->sql_layer == 'sqlite') ? ')' : '');
@@ -970,7 +956,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 				WHERE $sql_author
 					$sql_topic_id
 					$sql_firstpost
-					$m_approve_fid_sql
+					$post_visibility
 					$sql_fora
 					$sql_sort_join
 					$sql_time
@@ -984,7 +970,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 				WHERE $sql_author
 					$sql_topic_id
 					$sql_firstpost
-					$m_approve_fid_sql
+					$post_visibility
 					$sql_fora
 					AND t.topic_id = p.topic_id
 					$sql_sort_join
-- 
cgit v1.2.1


From a6d3432f8bb39f20a93a65f9145eec608ea7fd37 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 30 Aug 2012 22:20:52 +0200
Subject: [feature/soft-delete] Update search to use $post_visibility

Todo: Sphinx currently does not respect this setting at all.

PHPBB3-9657
---
 phpBB/includes/search/fulltext_mysql.php    | 40 +++++------------------------
 phpBB/includes/search/fulltext_native.php   | 19 ++++----------
 phpBB/includes/search/fulltext_postgres.php | 38 +++++----------------------
 phpBB/includes/search/fulltext_sphinx.php   | 12 +++++----
 4 files changed, 26 insertions(+), 83 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 73bf5c52f2..81fb82de93 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -265,7 +265,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_sql	specifies which types of posts a user may view, based on permissions
+	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
@@ -274,7 +274,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
 	{
 		// No keywords? No posts.
 		if (!$this->search_query)
@@ -292,7 +292,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			$sort_key,
 			$topic_id,
 			implode(',', $ex_fid_ary),
-// @TODO			implode(',', $m_approve_fid_ary),
+			$post_visibility,
 			implode(',', $author_ary)
 		)));
 
@@ -354,20 +354,6 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			break;
 		}
 
-/*		if (!sizeof($m_approve_fid_ary))
-		{
-			$m_approve_fid_sql = ' AND p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary === array(-1))
-		{
-			$m_approve_fid_sql = '';
-		}
-		else
-		{
-			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $this->db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-*/
-
 		$sql_select			= (!$result_count) ? 'SQL_CALC_FOUND_ROWS ' : '';
 		$sql_select			= ($type == 'posts') ? $sql_select . 'p.post_id' : 'DISTINCT ' . $sql_select . 't.topic_id';
 		$sql_from			= ($join_topic) ? TOPICS_TABLE . ' t, ' : '';
@@ -390,7 +376,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 		$sql_where_options .= ($topic_id) ? ' AND p.topic_id = ' . $topic_id : '';
 		$sql_where_options .= ($join_topic) ? ' AND t.topic_id = p.topic_id' : '';
 		$sql_where_options .= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_where_options .= $m_approve_fid_sql;
+		$sql_where_options .= ' AND ' . $post_visibility;
 		$sql_where_options .= $sql_author;
 		$sql_where_options .= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
 		$sql_where_options .= $sql_match_where;
@@ -446,7 +432,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_sql	specifies which types of posts a user may view, based on permissions
+	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
@@ -474,7 +460,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			$sort_key,
 			$topic_id,
 			implode(',', $ex_fid_ary),
-// @TODO			implode(',', $m_approve_fid_ary),
+			$post_visibility,
 			implode(',', $author_ary),
 			$author_name,
 		)));
@@ -524,19 +510,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			break;
 		}
 
-/*		if (!sizeof($m_approve_fid_ary))
-		{
-			$m_approve_fid_sql = ' AND p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary == array(-1))
-		{
-			$m_approve_fid_sql = '';
-		}
-		else
-		{
-			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $this->db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-*/
+		$m_approve_fid_sql = ' AND ' . $post_visibility;
 
 		// If the cache was completely empty count the results
 		$calc_results = ($result_count) ? '' : 'SQL_CALC_FOUND_ROWS ';
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index e7fb4bd105..56332e872b 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -414,7 +414,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_sql	specifies which types of posts the user can view
+	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
@@ -423,7 +423,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
 	{
 		// No keywords? No posts.
 		if (empty($this->search_query))
@@ -451,7 +451,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			$sort_key,
 			$topic_id,
 			implode(',', $ex_fid_ary),
-// @TODO			implode(',', $m_approve_fid_ary),
+			$post_visibility,
 			implode(',', $author_ary),
 			$author_name,
 		)));
@@ -628,16 +628,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			$sql_where[] = '(' . implode(' OR ', $is_null_joins) . ')';
 		}
 
-/*		if (!sizeof($m_approve_fid_ary))
-		{
-			$sql_where[] = 'p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary !== array(-1))
-		{
-			$sql_where[] = '(p.post_approved = 1 OR ' . $this->db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-*/
-		$sql_where[] = $m_approve_fid_sql;
+		$sql_where[] = $post_visibility;
 
 		if ($topic_id)
 		{
@@ -810,7 +801,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_sql	specifies which posts a user can view, based on permissions
+	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index 50ed785093..fc2050e76c 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -234,7 +234,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
+	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
@@ -261,7 +261,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			$sort_key,
 			$topic_id,
 			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
+			$post_visibility,
 			implode(',', $author_ary)
 		)));
 
@@ -323,19 +323,6 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			break;
 		}
 
-		if (!sizeof($m_approve_fid_ary))
-		{
-			$m_approve_fid_sql = ' AND p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary === array(-1))
-		{
-			$m_approve_fid_sql = '';
-		}
-		else
-		{
-			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $this->db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-
 		$sql_select			= ($type == 'posts') ? 'p.post_id' : 'DISTINCT t.topic_id';
 		$sql_from			= ($join_topic) ? TOPICS_TABLE . ' t, ' : '';
 		$field				= ($type == 'posts') ? 'post_id' : 'topic_id';
@@ -359,7 +346,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 		$sql_where_options .= ($topic_id) ? ' AND p.topic_id = ' . $topic_id : '';
 		$sql_where_options .= ($join_topic) ? ' AND t.topic_id = p.topic_id' : '';
 		$sql_where_options .= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_where_options .= $m_approve_fid_sql;
+		$sql_where_options .= ' AND ' . $post_visibility;
 		$sql_where_options .= $sql_author;
 		$sql_where_options .= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
 		$sql_where_options .= $sql_match_where;
@@ -418,7 +405,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
+	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
@@ -427,7 +414,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
 	{
 		// No author? No posts.
 		if (!sizeof($author_ary))
@@ -446,7 +433,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			$sort_key,
 			$topic_id,
 			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
+			$post_visibility,
 			implode(',', $author_ary),
 			$author_name,
 		)));
@@ -496,18 +483,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			break;
 		}
 
-		if (!sizeof($m_approve_fid_ary))
-		{
-			$m_approve_fid_sql = ' AND p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary == array(-1))
-		{
-			$m_approve_fid_sql = '';
-		}
-		else
-		{
-			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $this->db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
+		$m_approve_fid_sql = ' AND ' . $post_visibility;
 
 		// Build the query for really selecting the post_ids
 		if ($type == 'posts')
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 288c0b5940..ad9854071d 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -340,7 +340,7 @@ class phpbb_search_fulltext_sphinx
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
+	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
@@ -349,7 +349,7 @@ class phpbb_search_fulltext_sphinx
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
 	{
 		// No keywords? No posts.
 		if (!strlen($this->search_query) && !sizeof($author_ary))
@@ -466,6 +466,8 @@ class phpbb_search_fulltext_sphinx
 
 		if (sizeof($ex_fid_ary))
 		{
+			//@todo: Limit using $post_visibility
+
 			// All forums that a user is allowed to access
 			$fid_ary = array_unique(array_intersect(array_keys($this->auth->acl_getf('f_read', true)), array_keys($this->auth->acl_getf('f_search', true))));
 			// All forums that the user wants to and can search in
@@ -541,7 +543,7 @@ class phpbb_search_fulltext_sphinx
 	* @param	string		$sort_dir			is either a or d representing ASC and DESC
 	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
 	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	array		$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
+	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
 	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
 	* @param	array		$author_ary			an array of author ids
 	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
@@ -550,14 +552,14 @@ class phpbb_search_fulltext_sphinx
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
 	{
 		$this->search_query = '';
 
 		$this->sphinx->SetMatchMode(SPH_MATCH_FULLSCAN);
 		$fields = ($firstpost_only) ? 'firstpost' : 'all';
 		$terms = 'all';
-		return $this->keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, $id_ary, $start, $per_page);
+		return $this->keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, $id_ary, $start, $per_page);
 	}
 
 	/**
-- 
cgit v1.2.1


From c03d692a98fafa921a832e063c76a3d844632ca7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 30 Aug 2012 22:57:00 +0200
Subject: [feature/soft-delete] Fix some more usages of _approved column names

PHPBB3-9657
---
 phpBB/includes/functions_admin.php   |  2 +-
 phpBB/includes/functions_display.php | 30 ++++++++++--------------------
 phpBB/includes/mcp/mcp_queue.php     | 11 +----------
 3 files changed, 12 insertions(+), 31 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 328c8e9778..54130df935 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1882,7 +1882,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			$db->sql_freeresult($result);
 
 			// Use "t" as table alias because of the $where_sql clause
-			// NOTE: 't.post_approved' in the GROUP BY is causing a major slowdown.
+			// NOTE: 't.post_visibility' in the GROUP BY is causing a major slowdown.
 			$sql = 'SELECT t.topic_id, t.post_visibility, COUNT(t.post_id) AS total_posts, MIN(t.post_id) AS first_post_id, MAX(t.post_id) AS last_post_id
 				FROM ' . POSTS_TABLE . " t
 				$where_sql
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 881c95907b..2781f1a7bb 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -987,33 +987,25 @@ function display_user_activity(&$userdata)
 
 	$forum_ary = array();
 
-	// Do not include those forums the user is not having read access to...
-	$forum_read_ary = $auth->acl_getf('!f_read');
-
-	foreach ($forum_read_ary as $forum_id => $not_allowed)
+	$forum_read_ary = $auth->acl_getf('f_read');
+	foreach ($forum_read_ary as $forum_id => $allowed)
 	{
-		if ($not_allowed['f_read'])
+		if ($allowed['f_read'])
 		{
 			$forum_ary[] = (int) $forum_id;
 		}
 	}
 
-	$forum_ary = array_unique($forum_ary);
-	$forum_sql = (sizeof($forum_ary)) ? 'AND ' . $db->sql_in_set('forum_id', $forum_ary, true) : '';
-
-	$fid_m_approve = $auth->acl_getf('m_approve', true);
-	$sql_m_approve = (!empty($fid_m_approve)) ? 'OR ' . $db->sql_in_set('forum_id', array_keys($fid_m_approve)) : '';
+	$forum_ary = array_diff($forum_ary, $user->get_passworded_forums());;
 
 	// Obtain active forum
 	$sql = 'SELECT forum_id, COUNT(post_id) AS num_posts
 		FROM ' . POSTS_TABLE . '
-		WHERE poster_id = ' . $userdata['user_id'] . "
+		WHERE poster_id = ' . $userdata['user_id'] . '
 			AND post_postcount = 1
-			AND (post_approved = 1
-				$sql_m_approve)
-			$forum_sql
+			AND ' . phpbb_content_visibility::get_visibility_sql_forums('post', $forum_ary) . '
 		GROUP BY forum_id
-		ORDER BY num_posts DESC";
+		ORDER BY num_posts DESC';
 	$result = $db->sql_query_limit($sql, 1);
 	$active_f_row = $db->sql_fetchrow($result);
 	$db->sql_freeresult($result);
@@ -1035,13 +1027,11 @@ function display_user_activity(&$userdata)
 
 	$sql = 'SELECT topic_id, COUNT(post_id) AS num_posts
 		FROM ' . POSTS_TABLE . '
-		WHERE poster_id = ' . $userdata['user_id'] . "
+		WHERE poster_id = ' . $userdata['user_id'] . '
 			AND post_postcount = 1
-			AND (post_approved = 1
-				$sql_m_approve)
-			$forum_sql_topic
+			AND ' . phpbb_content_visibility::get_visibility_sql_forums('post', $forum_ary) . '
 		GROUP BY topic_id
-		ORDER BY num_posts DESC";
+		ORDER BY num_posts DESC';
 	$result = $db->sql_query_limit($sql, 1);
 	$active_t_row = $db->sql_fetchrow($result);
 	$db->sql_freeresult($result);
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index cbf0ff0089..3b18b7f0e7 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -548,7 +548,7 @@ function approve_post($post_id_list, $id, $mode)
 	{
 		$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
 
-		phpbb_content_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
+		$success_msg = phpbb_content_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
 
 		$messenger = new messenger();
 
@@ -607,15 +607,6 @@ function approve_post($post_id_list, $id, $mode)
 			$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&amp;t={$post_data['topic_id']}&amp;p={$post_data['post_id']}") . '#p' . $post_data['post_id'];
 		}
 		unset($post_info);
-
-		if ($total_topics)
-		{
-			$success_msg = ($total_topics == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS';
-		}
-		else
-		{
-			$success_msg = (sizeof($post_id_list) + sizeof($post_approved_list) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS';
-		}
 	}
 	else
 	{
-- 
cgit v1.2.1


From b887fcc3d180860e3b7fdcb2a70e2cd8a519bea2 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 10:49:58 -0500
Subject: [ticket/11103] The start of an all-encompassing notifications system

This system will take input from various systems to store notifications
and send notifications to users all in one nice extendable system.

This system should act something like the notifications system on
other social networking sites (in that, there is a single location where
a user can see all of their notifications for various events).

PHPBB3-11103
---
 phpBB/includes/constants.php                      |   1 +
 phpBB/includes/notifications/method/base.php      |  51 ++++++
 phpBB/includes/notifications/method/email.php     |  28 +++
 phpBB/includes/notifications/method/interface.php |  24 +++
 phpBB/includes/notifications/service.php          | 197 ++++++++++++++++++++++
 phpBB/includes/notifications/type/base.php        | 128 ++++++++++++++
 phpBB/includes/notifications/type/interface.php   |  31 ++++
 phpBB/includes/notifications/type/post.php        |  65 +++++++
 8 files changed, 525 insertions(+)
 create mode 100644 phpBB/includes/notifications/method/base.php
 create mode 100644 phpBB/includes/notifications/method/email.php
 create mode 100644 phpBB/includes/notifications/method/interface.php
 create mode 100644 phpBB/includes/notifications/service.php
 create mode 100644 phpBB/includes/notifications/type/base.php
 create mode 100644 phpBB/includes/notifications/type/interface.php
 create mode 100644 phpBB/includes/notifications/type/post.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 68af41ab20..de289c73dc 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -239,6 +239,7 @@ define('LOG_TABLE',					$table_prefix . 'log');
 define('LOGIN_ATTEMPT_TABLE',		$table_prefix . 'login_attempts');
 define('MODERATOR_CACHE_TABLE',		$table_prefix . 'moderator_cache');
 define('MODULES_TABLE',				$table_prefix . 'modules');
+define('NOTIFICATIONS_TABLE',		$table_prefix . 'notifications');
 define('POLL_OPTIONS_TABLE',		$table_prefix . 'poll_options');
 define('POLL_VOTES_TABLE',			$table_prefix . 'poll_votes');
 define('POSTS_TABLE',				$table_prefix . 'posts');
diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notifications/method/base.php
new file mode 100644
index 0000000000..a70f37db95
--- /dev/null
+++ b/phpBB/includes/notifications/method/base.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications method class
+* @package notifications
+*/
+abstract class phpbb_notifications_method_base implements phpbb_notifications_method_interface
+{
+	protected $phpbb_container;
+	protected $db;
+	protected $user;
+
+	/**
+	* notification_id
+	* item_type
+	* item_id
+	*
+	* by_user_id (one who caused the notification)
+	* user_id
+	* time
+	* unread
+	*
+	* data (special serialized field that each notification type can use to store stuff)
+	*/
+	protected $data = array();
+
+	public function __construct(Symfony\Component\DependencyInjection\ContainerBuilder $phpbb_container, $data = array())
+	{
+		// phpBB Container
+		$this->phpbb_container = $phpbb_container;
+
+		// Some common things we're going to use
+		$this->db = $phpbb_container->get('dbal.conn');
+		$this->user = $phpbb_container->get('user');
+	}
+}
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
new file mode 100644
index 0000000000..b06e2c018e
--- /dev/null
+++ b/phpBB/includes/notifications/method/email.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Email notification method class
+* @package notifications
+*/
+class phpbb_notifications_method_email extends phpbb_notifications_method_base
+{
+	function notify()
+	{
+		// email the user
+	}
+}
diff --git a/phpBB/includes/notifications/method/interface.php b/phpBB/includes/notifications/method/interface.php
new file mode 100644
index 0000000000..2d8a8b605e
--- /dev/null
+++ b/phpBB/includes/notifications/method/interface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications method interface
+* @package notifications
+*/
+interface phpbb_notifications_method_interface
+{
+}
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
new file mode 100644
index 0000000000..8f5d559867
--- /dev/null
+++ b/phpBB/includes/notifications/service.php
@@ -0,0 +1,197 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Notifications service class
+* @package notifications
+*/
+class phpbb_notifications_service
+{
+	protected $phpbb_container;
+	protected $db;
+
+	/**
+	* Users loaded from the DB
+	*
+	* @var array Array of user data that we've loaded from the DB
+	*/
+	protected $users;
+
+	/**
+	* Desired notifications
+	* unique by (type, type_id, user_id, method)
+	* if multiple methods are desired, multiple rows will exist.
+	*
+	* method of "none" will over-ride any other options
+	*
+	* type
+	* type_id
+	* user_id
+	* method
+	* 	none (will never receive notifications)
+	* 	standard (listed in notifications window
+	* 	popup?
+	* 	email
+	* 	jabber
+	*	sms?
+	*/
+
+	public function __construct(Symfony\Component\DependencyInjection\ContainerBuilder $phpbb_container)
+	{
+		$this->phpbb_container = $phpbb_container;
+
+		// Some common things we're going to use
+		$this->db = $phpbb_container->get('dbal.conn');
+	}
+
+	private function get_type_class_name(&$type, $safe = false)
+	{
+		if (!$safe)
+		{
+			$type = preg_replace('#[^a-z]#', '', $type);
+		}
+
+		return 'phpbb_notifications_type_' . $type;
+	}
+
+	/**
+	* Load the user's notifications
+	*
+	* @param array $options Optional options to control what notifications are loaded
+	*					user_id		User id to load notifications for (Default: $user->data['user_id'])
+	* 					limit		Number of notifications to load (Default: 5)
+	* 					start		Notifications offset (Default: 0)
+	*/
+	public function load_notifications($options = array())
+	{
+		$user = $this->phpbb_container->get('user');
+
+		// Merge default options
+		$options = array_merge(array(
+			'user_id'		=> $user->data['user_id'],
+			'limit'			=> 5,
+			'start'			=> 0,
+		), $options);
+
+		$notifications = $user_ids = array();
+
+		$sql = 'SELECT * FROM ' . NOTIFICATIONS_TABLE . '
+			WHERE user_id = ' . (int) $options['user_id'];
+		$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$type_class_name = $this->get_type_class_name($row['type'], true);
+
+			$notification = new $type_class_name($this->phpbb_container, $row);
+			$notification->users($this->users);
+
+			$user_ids = array_merge($user_ids, $notification->users_to_query());
+
+			$notifications[] = $notification();
+		}
+		$this->db->sql_freeresult($result);
+
+		// Load the users
+		$user_ids = array_unique($user_ids);
+
+		// @todo do not load users we already have in $this->users
+
+		if (sizeof($user_ids))
+		{
+			// @todo do not select everything
+			$sql = 'SELECT * FROM ' . USERS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$this->users[$row['user_id']] = $row;
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		return $notifications;
+	}
+
+	public function add_notifications($type, $data)
+	{
+		$type_class_name = $this->get_type_class_name($type);
+
+		$notification_objects = array(); // 'user_id'	=> object
+		$methods = $new_rows = array();
+
+		// find out which users want to receive this type of notification
+		$sql = 'SELECT user_id FROM ' . USERS_TABLE . '
+			WHERE ' . $this->db->sql_in_set('user_id', array(2));
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$row['method'] = '';
+
+			$notification = new $type_class_name($this->phpbb_container);
+
+			$notification->user_id = $row['user_id'];
+
+			$new_rows[] = $notification->create_insert_array($data);
+
+			// setup the notification methods and add the notification to the queue
+			if ($row['method'])
+			{
+				if (!isset($methods[$row['method']]))
+				{
+					$method_class_name = 'phpbb_notifications_method_' . $row['method'];
+					$methods[$row['method']] = new $$method_class_name();
+				}
+
+				$methods[$row['method']]->add_to_queue($notification);
+			}
+		}
+
+		// insert into the db
+		$this->db->sql_multi_insert(NOTIFICATIONS_TABLE, $new_rows);
+
+		// run the queue for each method to send notifications
+		foreach ($methods as $method)
+		{
+			$method->run_queue();
+		}
+	}
+
+	public function update_notifications($type, $type_id, $data)
+	{
+		$type_class_name = $this->get_type_class_name($type);
+
+		$object = new $$type_class($this->phpbb_container);
+		$update = $object->update($data);
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+			SET ' . $this->db->sql_build_array('UPDATE', $update) . "
+			WHERE type = '" . $this->db->sql_escape($type) . "'
+				AND type_id = " . (int) $type_id;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$object = new $type_class_name($this->phpbb_container, $row);
+			$object->update($data);
+
+			$update_rows[] = $object->getForUpdate();
+		}
+	}
+}
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
new file mode 100644
index 0000000000..959516fd19
--- /dev/null
+++ b/phpBB/includes/notifications/type/base.php
@@ -0,0 +1,128 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications class
+* @package notifications
+*/
+abstract class phpbb_notifications_type_base implements phpbb_notifications_type_interface
+{
+	protected $phpbb_container;
+	protected $db;
+	protected $phpbb_root_path;
+	protected $php_ext;
+
+	protected $users;
+
+	/**
+	* Indentification data
+	* notification_id
+	* item_type
+	* item_id
+	* user_id
+	* unread
+	*
+	* time
+	* data (special serialized field that each notification type can use to store stuff)
+	*
+	* @var array $data Notification row from the database
+	* 		This must be private, all interaction should use __get(), __set()
+	*/
+	private $data = array();
+
+	public function __construct(Symfony\Component\DependencyInjection\ContainerBuilder $phpbb_container, $data = array())
+	{
+		// phpBB Container
+		$this->phpbb_container = $phpbb_container;
+
+		// Some common things we're going to use
+		$this->db = $phpbb_container->get('dbal.conn');
+		$this->phpbb_root_path = $phpbb_container->getParameter('core.root_path');
+		$this->php_ext = $phpbb_container->getParameter('core.php_ext');
+
+		// The row from the database (unless this is a new notification we're going to add)
+		$this->data = $data;
+		$this->data['data'] = (isset($this->data['data'])) ? unserialize($this->data['data']) : array();
+	}
+
+	public function __get($name)
+	{
+		return $this->data[$name];
+	}
+
+	public function __set($name, $value)
+	{
+		$this->data[$name] = $value;
+	}
+
+	public function get_data($name)
+	{
+		return $this->data['data'][$name];
+	}
+
+	public function set_data($name, $value)
+	{
+		$this->data['data'][$name] = $value;
+	}
+
+	public function users(&$users)
+	{
+		$this->users = $users;
+	}
+
+	/**
+	* Output the notification to the template
+	*
+	* @param array $options Array of options
+	* 				template_block		Template block name to output to (Default: notifications)
+	*/
+	public function display($options = array())
+	{
+		$template = $this->phpbb_container->get('template');
+		$user = $this->phpbb_container->get('user');
+
+		// Merge default options
+		$options = array_merge(array(
+			'template_block'		=> 'notifications',
+		), $options);
+
+		$template->assign_block_vars($options['template_block'], array(
+			'TITLE'		=> $this->get_title(),
+			'URL'		=> $this->get_url(),
+			'TIME'		=> $user->format_date($this->time),
+
+			'ID'		=> $this->notification_id,
+			'UNREAD'	=> $this->unread,
+		));
+	}
+
+	public function create_insert_array($data)
+	{
+		// Defaults
+		$data = array_merge(array(
+			'item_type'		=> $this->get_type(),
+			'time'			=> time(),
+			'unread'		=> true,
+
+			'data'			=> array(),
+		), $this->data);
+
+		$data['data'] = serialize($data['data']);
+
+		return $data;
+	}
+}
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
new file mode 100644
index 0000000000..ace5ca67da
--- /dev/null
+++ b/phpBB/includes/notifications/type/interface.php
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications interface
+* @package notifications
+*/
+interface phpbb_notifications_type_interface
+{
+	public function get_type();
+
+	public function get_title();
+
+	public function get_url();
+
+	public function create_insert_array($data);
+}
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
new file mode 100644
index 0000000000..eb8d92c79c
--- /dev/null
+++ b/phpBB/includes/notifications/type/post.php
@@ -0,0 +1,65 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* @package notifications
+*/
+class phpbb_notifications_type_post extends phpbb_notifications_type_base
+{
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public function get_type()
+	{
+		return 'post';
+	}
+
+	public function get_title()
+	{
+		return $this->data['post_username'] . ' posted in the topic ' . censor_text($this->data['topic_title']);
+	}
+
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "p={$this->item_id}#p{$this->item_id}");
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['poster_id']);
+	}
+
+	public function create_insert_array($post)
+	{
+		$this->item_id = $post['post_id'];
+
+		$this->set_data('poster_id', $post['poster_id']);
+
+		$this->set_data('topic_title', $post['topic_title']);
+
+		$this->set_data('post_username', $post['post_username']);
+
+		return parent::create_insert_array($post);
+	}
+}
-- 
cgit v1.2.1


From 44f07df96fbf933bc20166a516bf0eecee00df4c Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 11:40:02 -0500
Subject: [ticket/11103] Working on the add/update notifications functions

Some cleanup and additional commenting as well

PHPBB3-11103
---
 phpBB/includes/notifications/method/base.php    |  18 +----
 phpBB/includes/notifications/service.php        | 100 +++++++++++++++---------
 phpBB/includes/notifications/type/base.php      |  66 ++++++++++++++--
 phpBB/includes/notifications/type/interface.php |   2 +-
 phpBB/includes/notifications/type/post.php      |  20 +++++
 5 files changed, 146 insertions(+), 60 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notifications/method/base.php
index a70f37db95..1c223df045 100644
--- a/phpBB/includes/notifications/method/base.php
+++ b/phpBB/includes/notifications/method/base.php
@@ -7,6 +7,8 @@
 *
 */
 
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
 /**
 * @ignore
 */
@@ -25,21 +27,7 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 	protected $db;
 	protected $user;
 
-	/**
-	* notification_id
-	* item_type
-	* item_id
-	*
-	* by_user_id (one who caused the notification)
-	* user_id
-	* time
-	* unread
-	*
-	* data (special serialized field that each notification type can use to store stuff)
-	*/
-	protected $data = array();
-
-	public function __construct(Symfony\Component\DependencyInjection\ContainerBuilder $phpbb_container, $data = array())
+	public function __construct(ContainerBuilder $phpbb_container, $data = array())
 	{
 		// phpBB Container
 		$this->phpbb_container = $phpbb_container;
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 8f5d559867..fd2c51a330 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -7,6 +7,8 @@
 *
 */
 
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
 /**
 * @ignore
 */
@@ -50,7 +52,7 @@ class phpbb_notifications_service
 	*	sms?
 	*/
 
-	public function __construct(Symfony\Component\DependencyInjection\ContainerBuilder $phpbb_container)
+	public function __construct(ContainerBuilder $phpbb_container)
 	{
 		$this->phpbb_container = $phpbb_container;
 
@@ -58,23 +60,13 @@ class phpbb_notifications_service
 		$this->db = $phpbb_container->get('dbal.conn');
 	}
 
-	private function get_type_class_name(&$type, $safe = false)
-	{
-		if (!$safe)
-		{
-			$type = preg_replace('#[^a-z]#', '', $type);
-		}
-
-		return 'phpbb_notifications_type_' . $type;
-	}
-
 	/**
 	* Load the user's notifications
 	*
 	* @param array $options Optional options to control what notifications are loaded
-	*					user_id		User id to load notifications for (Default: $user->data['user_id'])
-	* 					limit		Number of notifications to load (Default: 5)
-	* 					start		Notifications offset (Default: 0)
+	*				user_id		User id to load notifications for (Default: $user->data['user_id'])
+	* 				limit		Number of notifications to load (Default: 5)
+	* 				start		Notifications offset (Default: 0)
 	*/
 	public function load_notifications($options = array())
 	{
@@ -128,38 +120,58 @@ class phpbb_notifications_service
 		return $notifications;
 	}
 
+	/**
+	* Add a notification
+	*
+	* @param string $type Type identifier
+	* @param int $type_id Identifier within the type
+	* @param array $data Data specific for this type that will be inserted
+	*/
 	public function add_notifications($type, $data)
 	{
 		$type_class_name = $this->get_type_class_name($type);
 
-		$notification_objects = array(); // 'user_id'	=> object
-		$methods = $new_rows = array();
+		$notify_users = array();
+		$notification_objects = $notification_methods = array();
+		$new_rows = array();
 
 		// find out which users want to receive this type of notification
 		$sql = 'SELECT user_id FROM ' . USERS_TABLE . '
 			WHERE ' . $this->db->sql_in_set('user_id', array(2));
 		$result = $this->db->sql_query($sql);
-
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$row['method'] = '';
+			if (!isset($notify_users[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = '';
+		}
+		$this->db->sql_freeresult($result);
 
+		// Go through each user so we can insert a row in the DB and then notify them by their desired means
+		foreach ($notify_users as $user => $methods)
+		{
 			$notification = new $type_class_name($this->phpbb_container);
 
-			$notification->user_id = $row['user_id'];
+			$notification->user_id = (int) $user;
 
 			$new_rows[] = $notification->create_insert_array($data);
 
-			// setup the notification methods and add the notification to the queue
-			if ($row['method'])
+			foreach ($methods as $method)
 			{
-				if (!isset($methods[$row['method']]))
+				// setup the notification methods and add the notification to the queue
+				if ($row['method'])
 				{
-					$method_class_name = 'phpbb_notifications_method_' . $row['method'];
-					$methods[$row['method']] = new $$method_class_name();
-				}
+					if (!isset($notification_methods[$row['method']]))
+					{
+						$method_class_name = 'phpbb_notifications_method_' . $row['method'];
+						$notification_methods[$row['method']] = new $method_class_name();
+					}
 
-				$methods[$row['method']]->add_to_queue($notification);
+					$notification_methods[$row['method']]->add_to_queue($notification);
+				}
 			}
 		}
 
@@ -167,31 +179,43 @@ class phpbb_notifications_service
 		$this->db->sql_multi_insert(NOTIFICATIONS_TABLE, $new_rows);
 
 		// run the queue for each method to send notifications
-		foreach ($methods as $method)
+		foreach ($notification_methods as $method)
 		{
 			$method->run_queue();
 		}
 	}
 
+	/**
+	* Update a notification
+	*
+	* @param string $type Type identifier
+	* @param int $type_id Identifier within the type
+	* @param array $data Data specific for this type that will be updated
+	*/
 	public function update_notifications($type, $type_id, $data)
 	{
 		$type_class_name = $this->get_type_class_name($type);
 
-		$object = new $$type_class($this->phpbb_container);
-		$update = $object->update($data);
+		$notification = new $type_class_name($this->phpbb_container);
+		$update_array = $notification->create_update_array($data);
 
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
-			SET ' . $this->db->sql_build_array('UPDATE', $update) . "
-			WHERE type = '" . $this->db->sql_escape($type) . "'
-				AND type_id = " . (int) $type_id;
-		$result = $this->db->sql_query($sql);
+			SET ' . $this->db->sql_build_array('UPDATE', $update_array) . "
+			WHERE item_type = '" . $this->db->sql_escape($type) . "'
+				AND item_id = " . (int) $type_id;
+		$this->db->sql_query($sql);
+	}
 
-		while ($row = $this->db->sql_fetchrow($result))
+	/**
+	* Helper to get the notifications type class name and clean it if unsafe
+	*/
+	private function get_type_class_name(&$type, $safe = false)
+	{
+		if (!$safe)
 		{
-			$object = new $type_class_name($this->phpbb_container, $row);
-			$object->update($data);
-
-			$update_rows[] = $object->getForUpdate();
+			$type = preg_replace('#[^a-z]#', '', $type);
 		}
+
+		return 'phpbb_notifications_type_' . $type;
 	}
 }
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 959516fd19..2b194557e3 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -7,6 +7,8 @@
 *
 */
 
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
 /**
 * @ignore
 */
@@ -26,7 +28,12 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	protected $phpbb_root_path;
 	protected $php_ext;
 
-	protected $users;
+	/**
+	* Array of user data containing information needed to output the notifications to the template
+	*
+	* @var array
+	*/
+	protected $users = array();
 
 	/**
 	* Indentification data
@@ -40,11 +47,11 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	* data (special serialized field that each notification type can use to store stuff)
 	*
 	* @var array $data Notification row from the database
-	* 		This must be private, all interaction should use __get(), __set()
+	* 		This must be private, all interaction should use __get(), __set(), get_data(), set_data()
 	*/
 	private $data = array();
 
-	public function __construct(Symfony\Component\DependencyInjection\ContainerBuilder $phpbb_container, $data = array())
+	public function __construct(ContainerBuilder $phpbb_container, $data = array())
 	{
 		// phpBB Container
 		$this->phpbb_container = $phpbb_container;
@@ -69,16 +76,33 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		$this->data[$name] = $value;
 	}
 
-	public function get_data($name)
+	/**
+	* Get special data (only important for the classes that extend this)
+	*
+	* @param string $name Name of the variable to get
+	*
+	* @return mixed
+	*/
+	protected function get_data($name)
 	{
 		return $this->data['data'][$name];
 	}
 
-	public function set_data($name, $value)
+	/**
+	* Set special data (only important for the classes that extend this)
+	*
+	* @param string $name Name of the variable to set
+	* @param mixed $value Value to set to the variable
+	*/
+	protected function set_data($name, $value)
 	{
 		$this->data['data'][$name] = $value;
 	}
 
+	/**
+	* Function to store the users loaded from the database (for output to the template)
+	* (The service handles this)
+	*/
 	public function users(&$users)
 	{
 		$this->users = $users;
@@ -110,7 +134,15 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		));
 	}
 
-	public function create_insert_array($data)
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $special_data Data unique to this notification type
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($special_data)
 	{
 		// Defaults
 		$data = array_merge(array(
@@ -125,4 +157,26 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 
 		return $data;
 	}
+
+	/**
+	* Function for preparing the data for update in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $special_data Data unique to this notification type
+	*
+	* @return array Array of data ready to be updated in the database
+	*/
+	public function create_update_array($special_data)
+	{
+		$data = $this->create_insert_array($special_data);
+
+		// Unset data unique to each row
+		unset(
+			$data['notification_id'],
+			$data['unread'],
+			$data['user_id']
+		);
+
+		return $data;
+	}
 }
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index ace5ca67da..57de755c82 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -27,5 +27,5 @@ interface phpbb_notifications_type_interface
 
 	public function get_url();
 
-	public function create_insert_array($data);
+	public function create_insert_array($special_data);
 }
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index eb8d92c79c..08da7a77cb 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -30,11 +30,21 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		return 'post';
 	}
 
+	/**
+	* Get the title of this notification
+	*
+	* @return string
+	*/
 	public function get_title()
 	{
 		return $this->data['post_username'] . ' posted in the topic ' . censor_text($this->data['topic_title']);
 	}
 
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
 	public function get_url()
 	{
 		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "p={$this->item_id}#p{$this->item_id}");
@@ -50,6 +60,14 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		return array($this->data['poster_id']);
 	}
 
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
 	public function create_insert_array($post)
 	{
 		$this->item_id = $post['post_id'];
@@ -60,6 +78,8 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$this->set_data('post_username', $post['post_username']);
 
+		$this->time = $post['post_time'];
+
 		return parent::create_insert_array($post);
 	}
 }
-- 
cgit v1.2.1


From e45fb0025ec8c27147caee7e3c14902f2e3f02c5 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 12:05:55 -0500
Subject: [ticket/11103] Output the notifications to the template

For now, just dumping the notifications in the header.

PHPBB3-11103
---
 phpBB/includes/functions.php               |  9 ++++++++-
 phpBB/includes/notifications/service.php   |  4 ++--
 phpBB/includes/notifications/type/base.php | 15 +++++++++++++--
 phpBB/includes/notifications/type/post.php | 13 ++++++++++++-
 4 files changed, 35 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 834f57a38b..7632ea1fcb 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4778,7 +4778,7 @@ function phpbb_http_login($param)
 function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum')
 {
 	global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path;
-	global $phpbb_dispatcher;
+	global $phpbb_dispatcher, $phpbb_container;
 
 	if (defined('HEADER_INC'))
 	{
@@ -5092,6 +5092,13 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'A_COOKIE_SETTINGS'		=> addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')),
 	));
 
+	// Output the notifications
+	$phpbb_notifications = $phpbb_container->get('notifications');
+	foreach ($phpbb_notifications->load_notifications() as $notification)
+	{
+		$notification->display();
+	}
+
 	// application/xhtml+xml not used because of IE
 	header('Content-type: text/html; charset=UTF-8');
 
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index fd2c51a330..8db414cb16 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -87,14 +87,14 @@ class phpbb_notifications_service
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$type_class_name = $this->get_type_class_name($row['type'], true);
+			$type_class_name = $this->get_type_class_name($row['item_type'], true);
 
 			$notification = new $type_class_name($this->phpbb_container, $row);
 			$notification->users($this->users);
 
 			$user_ids = array_merge($user_ids, $notification->users_to_query());
 
-			$notifications[] = $notification();
+			$notifications[] = $notification;
 		}
 		$this->db->sql_freeresult($result);
 
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 2b194557e3..1b01e1d46c 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -85,7 +85,7 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	*/
 	protected function get_data($name)
 	{
-		return $this->data['data'][$name];
+		return (isset($this->data['data'][$name])) ? $this->data['data'][$name] : null;
 	}
 
 	/**
@@ -105,7 +105,18 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	*/
 	public function users(&$users)
 	{
-		$this->users = $users;
+		$this->users = &$users;
+	}
+
+	/**
+	* Get a user row from our users cache
+	*
+	* @param int $user_id
+	* @return array
+	*/
+	protected function get_user($user_id)
+	{
+		return $this->users[$user_id];
 	}
 
 	/**
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 08da7a77cb..4b343650a1 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -37,7 +37,18 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	*/
 	public function get_title()
 	{
-		return $this->data['post_username'] . ' posted in the topic ' . censor_text($this->data['topic_title']);
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->get_user($this->get_data('poster_id'));
+
+			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		}
+
+		return $username . ' posted in the topic ' . censor_text($this->get_data('topic_title'));
 	}
 
 	/**
-- 
cgit v1.2.1


From 32a966b21da7051def3bd2ae608f3f2457d22476 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 12:28:58 -0500
Subject: [ticket/11103] Private Message type notification

Also cleanup

PHPBB3-11103
---
 phpBB/includes/notifications/service.php        | 68 ++++++++++++-----
 phpBB/includes/notifications/type/base.php      |  2 +-
 phpBB/includes/notifications/type/interface.php |  4 +-
 phpBB/includes/notifications/type/pm.php        | 97 +++++++++++++++++++++++++
 phpBB/includes/notifications/type/post.php      | 12 ++-
 5 files changed, 162 insertions(+), 21 deletions(-)
 create mode 100644 phpBB/includes/notifications/type/pm.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 8db414cb16..059c2b420d 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -87,9 +87,9 @@ class phpbb_notifications_service
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$type_class_name = $this->get_type_class_name($row['item_type'], true);
+			$item_type_class_name = $this->get_item_type_class_name($row['item_type'], true);
 
-			$notification = new $type_class_name($this->phpbb_container, $row);
+			$notification = new $item_type_class_name($this->phpbb_container, $row);
 			$notification->users($this->users);
 
 			$user_ids = array_merge($user_ids, $notification->users_to_query());
@@ -123,13 +123,18 @@ class phpbb_notifications_service
 	/**
 	* Add a notification
 	*
-	* @param string $type Type identifier
-	* @param int $type_id Identifier within the type
+	* @param string $item_type Type identifier
+	* @param int $item_id Identifier within the type
 	* @param array $data Data specific for this type that will be inserted
 	*/
-	public function add_notifications($type, $data)
+	public function add_notifications($item_type, $data)
 	{
-		$type_class_name = $this->get_type_class_name($type);
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
+
+		$item_id = $item_type_class_name::get_item_id($data);
+
+		// Update any existing notifications for this item
+		$this->update_notifications($item_type, $item_id, $data);
 
 		$notify_users = array();
 		$notification_objects = $notification_methods = array();
@@ -150,10 +155,22 @@ class phpbb_notifications_service
 		}
 		$this->db->sql_freeresult($result);
 
+		// Make sure not to send new notifications to users who've already been notified about this item
+		// This may happen when an item was added, but now new users are able to see the item
+		$sql = 'SELECT user_id FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id;
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			unset($notify_users[$row['user_id']]);
+		}
+		$this->db->sql_freeresult($result);
+
 		// Go through each user so we can insert a row in the DB and then notify them by their desired means
 		foreach ($notify_users as $user => $methods)
 		{
-			$notification = new $type_class_name($this->phpbb_container);
+			$notification = new $item_type_class_name($this->phpbb_container);
 
 			$notification->user_id = (int) $user;
 
@@ -188,34 +205,49 @@ class phpbb_notifications_service
 	/**
 	* Update a notification
 	*
-	* @param string $type Type identifier
-	* @param int $type_id Identifier within the type
+	* @param string $item_type Type identifier
+	* @param int $item_id Identifier within the type
 	* @param array $data Data specific for this type that will be updated
 	*/
-	public function update_notifications($type, $type_id, $data)
+	public function update_notifications($item_type, $item_id, $data)
 	{
-		$type_class_name = $this->get_type_class_name($type);
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
 
-		$notification = new $type_class_name($this->phpbb_container);
+		$notification = new $item_type_class_name($this->phpbb_container);
 		$update_array = $notification->create_update_array($data);
 
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
 			SET ' . $this->db->sql_build_array('UPDATE', $update_array) . "
-			WHERE item_type = '" . $this->db->sql_escape($type) . "'
-				AND item_id = " . (int) $type_id;
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id;
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Delete a notification
+	*
+	* @param string $item_type Type identifier
+	* @param int $item_id Identifier within the type
+	* @param array $data Data specific for this type that will be updated
+	*/
+	public function delete_notifications($item_type, $item_id)
+	{
+		$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id;
 		$this->db->sql_query($sql);
 	}
 
 	/**
-	* Helper to get the notifications type class name and clean it if unsafe
+	* Helper to get the notifications item type class name and clean it if unsafe
 	*/
-	private function get_type_class_name(&$type, $safe = false)
+	private function get_item_type_class_name(&$item_type, $safe = false)
 	{
 		if (!$safe)
 		{
-			$type = preg_replace('#[^a-z]#', '', $type);
+			$item_type = preg_replace('#[^a-z]#', '', $item_type);
 		}
 
-		return 'phpbb_notifications_type_' . $type;
+		return 'phpbb_notifications_type_' . $item_type;
 	}
 }
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 1b01e1d46c..89143873a8 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -157,7 +157,7 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	{
 		// Defaults
 		$data = array_merge(array(
-			'item_type'		=> $this->get_type(),
+			'item_type'		=> $this->get_item_type(),
 			'time'			=> time(),
 			'unread'		=> true,
 
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index 57de755c82..b1ee9ae0b6 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -21,7 +21,9 @@ if (!defined('IN_PHPBB'))
 */
 interface phpbb_notifications_type_interface
 {
-	public function get_type();
+	public static function get_item_type();
+
+	public static function get_item_id($post);
 
 	public function get_title();
 
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
new file mode 100644
index 0000000000..f86050486e
--- /dev/null
+++ b/phpBB/includes/notifications/type/pm.php
@@ -0,0 +1,97 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Private message notifications class
+* @package notifications
+*/
+class phpbb_notifications_type_pm extends phpbb_notifications_type_base
+{
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'pm';
+	}
+
+	/**
+	* Get the id of the
+	*
+	* @param array $pm The data from the private message
+	*/
+	public static function get_item_id($pm)
+	{
+		return $pm['msg_id'];
+	}
+
+	/**
+	* Get the title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		$user_data = $this->get_user($this->get_data('author_id'));
+
+		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+
+		return $username . ' sent you a private message titled: ' . $this->get_data('message_subject');
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=pm&amp;mode=view&p={$this->item_id}");
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['author_id']);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->item_id = $post['msg_id'];
+
+		$this->set_data('author_id', $post['author_id']);
+
+		$this->set_data('message_subject', $post['message_subject']);
+
+		$this->time = $post['message_time'];
+
+		return parent::create_insert_array($post);
+	}
+}
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 4b343650a1..9bd343d288 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -25,11 +25,21 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	* Get the type of notification this is
 	* phpbb_notifications_type_
 	*/
-	public function get_type()
+	public static function get_item_type()
 	{
 		return 'post';
 	}
 
+	/**
+	* Get the id of the
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_id($post)
+	{
+		return $post['post_id'];
+	}
+
 	/**
 	* Get the title of this notification
 	*
-- 
cgit v1.2.1


From b59463552644ca4afd9e8ca7edd761ae382fc8ed Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 13:09:34 -0500
Subject: [ticket/11103] Add tables to the database updater and installer

PHPBB3-11103
---
 phpBB/includes/notifications/method/base.php      | 32 +++++++++++++++++++
 phpBB/includes/notifications/method/interface.php |  1 +
 phpBB/includes/notifications/service.php          | 38 +++++++++++------------
 3 files changed, 52 insertions(+), 19 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notifications/method/base.php
index 1c223df045..dbf851a059 100644
--- a/phpBB/includes/notifications/method/base.php
+++ b/phpBB/includes/notifications/method/base.php
@@ -27,6 +27,13 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 	protected $db;
 	protected $user;
 
+	/**
+	* Queue of messages to be sent
+	*
+	* @var array
+	*/
+	protected $queue = array();
+
 	public function __construct(ContainerBuilder $phpbb_container, $data = array())
 	{
 		// phpBB Container
@@ -36,4 +43,29 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 		$this->db = $phpbb_container->get('dbal.conn');
 		$this->user = $phpbb_container->get('user');
 	}
+
+	/**
+	* Add a notification to the queue
+	*
+	* @param phpbb_notifications_type_interface $notification
+	*/
+	public function add_to_queue(phpbb_notifications_type_interface $notification)
+	{
+		$this->queue[] = $notification;
+	}
+
+	/**
+	* Basic run queue function.
+	* Child methods should override this function if there are more efficient methods to mass-notification
+	*/
+	public function run_queue()
+	{
+		foreach ($this->queue as $notification)
+		{
+			$this->notify($notification);
+		}
+
+		// Empty queue
+		$this->queue = array();
+	}
 }
diff --git a/phpBB/includes/notifications/method/interface.php b/phpBB/includes/notifications/method/interface.php
index 2d8a8b605e..f18d005b8b 100644
--- a/phpBB/includes/notifications/method/interface.php
+++ b/phpBB/includes/notifications/method/interface.php
@@ -21,4 +21,5 @@ if (!defined('IN_PHPBB'))
 */
 interface phpbb_notifications_method_interface
 {
+	public function notify($notification);
 }
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 059c2b420d..32211b26cf 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -33,25 +33,6 @@ class phpbb_notifications_service
 	*/
 	protected $users;
 
-	/**
-	* Desired notifications
-	* unique by (type, type_id, user_id, method)
-	* if multiple methods are desired, multiple rows will exist.
-	*
-	* method of "none" will over-ride any other options
-	*
-	* type
-	* type_id
-	* user_id
-	* method
-	* 	none (will never receive notifications)
-	* 	standard (listed in notifications window
-	* 	popup?
-	* 	email
-	* 	jabber
-	*	sms?
-	*/
-
 	public function __construct(ContainerBuilder $phpbb_container)
 	{
 		$this->phpbb_container = $phpbb_container;
@@ -140,6 +121,25 @@ class phpbb_notifications_service
 		$notification_objects = $notification_methods = array();
 		$new_rows = array();
 
+		/**
+		* Desired notifications
+		* unique by (type, type_id, user_id, method)
+		* if multiple methods are desired, multiple rows will exist.
+		*
+		* method of "none" will over-ride any other options
+		*
+		* item_type
+		* item_id
+		* user_id
+		* method
+		* 	none (will never receive notifications)
+		* 	standard (listed in notifications window
+		* 	popup?
+		* 	email
+		* 	jabber
+		*	sms?
+		*/
+
 		// find out which users want to receive this type of notification
 		$sql = 'SELECT user_id FROM ' . USERS_TABLE . '
 			WHERE ' . $this->db->sql_in_set('user_id', array(2));
-- 
cgit v1.2.1


From 7b0b6fc63c2593cafaa84cc38a9b3029af1ed369 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 13:40:05 -0500
Subject: [ticket/11103] Forgot a constant

PHPBB3-11103
---
 phpBB/includes/constants.php                  |  1 +
 phpBB/includes/notifications/method/email.php | 10 +++++++++-
 phpBB/includes/notifications/type/pm.php      |  2 ++
 phpBB/includes/notifications/type/post.php    |  2 ++
 4 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index de289c73dc..7a3c73e987 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -273,6 +273,7 @@ define('TOPICS_POSTED_TABLE',		$table_prefix . 'topics_posted');
 define('TOPICS_TRACK_TABLE',		$table_prefix . 'topics_track');
 define('TOPICS_WATCH_TABLE',		$table_prefix . 'topics_watch');
 define('USER_GROUP_TABLE',			$table_prefix . 'user_group');
+define('USER_NOTIFICATIONS_TABLE',	$table_prefix . 'user_notifications');
 define('USERS_TABLE',				$table_prefix . 'users');
 define('WARNINGS_TABLE',			$table_prefix . 'warnings');
 define('WORDS_TABLE',				$table_prefix . 'words');
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index b06e2c018e..0c3cb4bd85 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -17,11 +17,19 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Email notification method class
+* This class handles sending emails for notifications
+*
 * @package notifications
 */
 class phpbb_notifications_method_email extends phpbb_notifications_method_base
 {
-	function notify()
+	public static function is_available()
+	{
+		// Email is always available
+		return true;
+	}
+
+	public function notify()
 	{
 		// email the user
 	}
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index f86050486e..191c0b7e7f 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -17,6 +17,8 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Private message notifications class
+* This class handles notifications for private messages
+*
 * @package notifications
 */
 class phpbb_notifications_type_pm extends phpbb_notifications_type_base
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 9bd343d288..addaa30ea6 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -17,6 +17,8 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Post notifications class
+* This class handles notifications for replies to a topic
+*
 * @package notifications
 */
 class phpbb_notifications_type_post extends phpbb_notifications_type_base
-- 
cgit v1.2.1


From 7fee0cfdf60c9aeebcd498d2f41696bb7fed2dd0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 15:48:46 -0500
Subject: [ticket/11103] Work on the pm type and email method

PHPBB3-11103
---
 phpBB/includes/functions_privmsgs.php           | 13 +++++
 phpBB/includes/notifications/method/base.php    | 11 +++-
 phpBB/includes/notifications/method/email.php   | 61 ++++++++++++++++++++++
 phpBB/includes/notifications/service.php        | 14 +----
 phpBB/includes/notifications/type/base.php      | 13 ++---
 phpBB/includes/notifications/type/interface.php |  6 ++-
 phpBB/includes/notifications/type/pm.php        | 69 ++++++++++++++++++++++---
 7 files changed, 159 insertions(+), 28 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 9e055a319f..99ad2ad791 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1855,6 +1855,19 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 */
 function pm_notification($mode, $author, $recipients, $subject, $message, $msg_id)
 {
+	global $phpbb_container;
+
+	$phpbb_notifications = $phpbb_container->get('notifications');
+
+	$phpbb_notifications->add_notifications('pm', array(
+		'author_id'				=> $author,
+		'recipients'			=> $recipients,
+		'message_subject'		=> $subject,
+		'msg_id'				=> $msg_id,
+	));
+
+	return;
+
 	global $db, $user, $config, $phpbb_root_path, $phpEx, $auth;
 
 	$subject = censor_text($subject);
diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notifications/method/base.php
index dbf851a059..98c06509c6 100644
--- a/phpBB/includes/notifications/method/base.php
+++ b/phpBB/includes/notifications/method/base.php
@@ -26,6 +26,8 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 	protected $phpbb_container;
 	protected $db;
 	protected $user;
+	protected $phpbb_root_path;
+	protected $php_ext;
 
 	/**
 	* Queue of messages to be sent
@@ -42,6 +44,9 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 		// Some common things we're going to use
 		$this->db = $phpbb_container->get('dbal.conn');
 		$this->user = $phpbb_container->get('user');
+
+		$this->phpbb_root_path = $phpbb_container->getParameter('core.root_path');
+		$this->php_ext = $phpbb_container->getParameter('core.php_ext');
 	}
 
 	/**
@@ -65,7 +70,11 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 			$this->notify($notification);
 		}
 
-		// Empty queue
+		$this->empty_queue();
+	}
+
+	protected function empty_queue()
+	{
 		$this->queue = array();
 	}
 }
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index 0c3cb4bd85..725ede7913 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -33,4 +33,65 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 	{
 		// email the user
 	}
+
+	public function run_queue()
+	{
+		if (!sizeof($this->queue))
+		{
+			return;
+		}
+
+		// Load all users we want to notify (we need their email address)
+		$user_ids = $users = array();
+		foreach ($this->queue as $notification)
+		{
+			$user_ids[] = $notification->user_id;
+		}
+
+		$sql = 'SELECT * FROM ' . USERS_TABLE . '
+			WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$users[$row['user_id']] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		// Load the messenger
+		if (!class_exists('messenger'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
+		}
+		$messenger = new messenger();
+		$board_url = generate_board_url();
+
+		// Time to go through the queue and send emails
+		foreach ($this->queue as $notification)
+		{
+			$notification->users($users);
+
+			$user = $notification->get_user();
+
+			$messenger->template('privmsg_notify', $user['user_lang']);
+
+			$messenger->to($user['user_email'], $user['username']);
+
+			$messenger->assign_vars(array(
+				'SUBJECT'		=> htmlspecialchars_decode($notification->get_title()),
+				'AUTHOR_NAME'	=> '',
+				'USERNAME'		=> htmlspecialchars_decode($user['username']),
+
+				'U_INBOX'			=> $board_url . "/ucp.{$this->php_ext}?i=pm&folder=inbox",
+				'U_VIEW_MESSAGE'	=> $board_url . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$notification->get_item_id()}",
+			));
+
+			$messenger->send($addr['method']);
+		}
+
+		// Save the queue in the messenger class (has to be called or these emails could be lost?)
+		$messenger->save_queue();
+
+		// We're done, empty the queue
+		$this->empty_queue();
+	}
 }
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 32211b26cf..ba57fe9f72 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -141,19 +141,7 @@ class phpbb_notifications_service
 		*/
 
 		// find out which users want to receive this type of notification
-		$sql = 'SELECT user_id FROM ' . USERS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('user_id', array(2));
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (!isset($notify_users[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = '';
-		}
-		$this->db->sql_freeresult($result);
+		$notify_users = $item_type_class_name::find_users_for_notification($data);
 
 		// Make sure not to send new notifications to users who've already been notified about this item
 		// This may happen when an item was added, but now new users are able to see the item
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 89143873a8..f031abae77 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -58,6 +58,7 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 
 		// Some common things we're going to use
 		$this->db = $phpbb_container->get('dbal.conn');
+
 		$this->phpbb_root_path = $phpbb_container->getParameter('core.root_path');
 		$this->php_ext = $phpbb_container->getParameter('core.php_ext');
 
@@ -114,7 +115,7 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	* @param int $user_id
 	* @return array
 	*/
-	protected function get_user($user_id)
+	public function get_user($user_id)
 	{
 		return $this->users[$user_id];
 	}
@@ -149,11 +150,11 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
 	*
-	* @param array $special_data Data unique to this notification type
+	* @param array $type_data Data unique to this notification type
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($special_data)
+	public function create_insert_array($type_data)
 	{
 		// Defaults
 		$data = array_merge(array(
@@ -173,13 +174,13 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	* Function for preparing the data for update in an SQL query
 	* (The service handles insertion)
 	*
-	* @param array $special_data Data unique to this notification type
+	* @param array $type_data Data unique to this notification type
 	*
 	* @return array Array of data ready to be updated in the database
 	*/
-	public function create_update_array($special_data)
+	public function create_update_array($type_data)
 	{
-		$data = $this->create_insert_array($special_data);
+		$data = $this->create_insert_array($type_data);
 
 		// Unset data unique to each row
 		unset(
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index b1ee9ae0b6..b710a75606 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -23,11 +23,13 @@ interface phpbb_notifications_type_interface
 {
 	public static function get_item_type();
 
-	public static function get_item_id($post);
+	public static function get_item_id($type_data);
 
 	public function get_title();
 
 	public function get_url();
 
-	public function create_insert_array($special_data);
+	public function create_insert_array($type_data);
+
+	public function find_users_for_notification($type_data);
 }
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 191c0b7e7f..7685a49614 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -84,16 +84,73 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($pm)
 	{
-		$this->item_id = $post['msg_id'];
+		$this->item_id = $pm['msg_id'];
 
-		$this->set_data('author_id', $post['author_id']);
+		$this->set_data('author_id', $pm['author_id']);
 
-		$this->set_data('message_subject', $post['message_subject']);
+		$this->set_data('message_subject', $pm['message_subject']);
 
-		$this->time = $post['message_time'];
+		return parent::create_insert_array($pm);
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param array $pm Data from
+	* @return array
+	*/
+	public function find_users_for_notification($pm)
+	{
+		$user = $this->phpbb_container->get('user');
+
+		// Exclude guests, current user and banned users from notifications
+		unset($pm['recipients'][ANONYMOUS], $pm['recipients'][$user->data['user_id']]);
+
+		if (!sizeof($pm['recipients']))
+		{
+			return;
+		}
+
+		if (!function_exists('phpbb_get_banned_user_ids'))
+		{
+			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+		}
+		$banned_users = phpbb_get_banned_user_ids(array_keys($pm['recipients']));
+		$pm['recipients'] = array_diff(array_keys($pm['recipients']), $banned_users);
+
+		if (!sizeof($pm['recipients']))
+		{
+			return;
+		}
+
+		$sql = 'SELECT user_id, user_notify_pm, user_notify_type
+			FROM ' . USERS_TABLE . '
+			WHERE ' . $db->sql_in_set('user_id', $pm['recipients']);
+		$result = $db->sql_query($sql);
+
+		$pm['recipients'] = array();
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if ($row['user_notify_pm'])
+			{
+				$pm['recipients'][$row['user_id']] = array();
+
+				if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
+				{
+					$pm['recipients'][$row['user_id']][] = 'email';
+				}
+
+				if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
+				{
+					$pm['recipients'][$row['user_id']][] = 'jabber';
+				}
+			}
+		}
+		$db->sql_freeresult($result);
 
-		return parent::create_insert_array($post);
+		return $pm['recipients'];
 	}
 }
-- 
cgit v1.2.1


From a4eb8bf47a77cb2637bfad5db20ab9f0dc236059 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 15:49:22 -0500
Subject: [ticket/11103] Jabber notification method base

PHPBB3-11103
---
 phpBB/includes/notifications/method/jabber.php | 36 ++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 phpBB/includes/notifications/method/jabber.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/method/jabber.php b/phpBB/includes/notifications/method/jabber.php
new file mode 100644
index 0000000000..15614db96c
--- /dev/null
+++ b/phpBB/includes/notifications/method/jabber.php
@@ -0,0 +1,36 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Jabber notification method class
+* This class handles sending Jabber notifications for notifications
+*
+* @package notifications
+*/
+class phpbb_notifications_method_jabber extends phpbb_notifications_method_base
+{
+	public static function is_available()
+	{
+		// Is jabber enabled & can this user receive jabber messages?
+		return false; // for now
+	}
+
+	public function notify()
+	{
+		// message the user
+	}
+}
-- 
cgit v1.2.1


From 1e53f7df9d430422e7bb827f3449ef744fc1ed6f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 16:02:32 -0500
Subject: [ticket/11103] Fixing some db columns that were of the incorrect type

PHPBB3-11103
---
 phpBB/includes/notifications/service.php        |  7 ++++++-
 phpBB/includes/notifications/type/interface.php |  2 +-
 phpBB/includes/notifications/type/pm.php        | 11 +++++++----
 phpBB/includes/notifications/type/post.php      |  2 ++
 4 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index ba57fe9f72..a689e1c68a 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -141,7 +141,7 @@ class phpbb_notifications_service
 		*/
 
 		// find out which users want to receive this type of notification
-		$notify_users = $item_type_class_name::find_users_for_notification($data);
+		$notify_users = $item_type_class_name::find_users_for_notification($this->phpbb_container, $data);
 
 		// Make sure not to send new notifications to users who've already been notified about this item
 		// This may happen when an item was added, but now new users are able to see the item
@@ -155,6 +155,11 @@ class phpbb_notifications_service
 		}
 		$this->db->sql_freeresult($result);
 
+		if (!sizeof($notify_users))
+		{
+			return;
+		}
+
 		// Go through each user so we can insert a row in the DB and then notify them by their desired means
 		foreach ($notify_users as $user => $methods)
 		{
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index b710a75606..ccd963ba06 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -31,5 +31,5 @@ interface phpbb_notifications_type_interface
 
 	public function create_insert_array($type_data);
 
-	public function find_users_for_notification($type_data);
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $type_data);
 }
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 7685a49614..2b2a835470 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -7,6 +7,8 @@
 *
 */
 
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
 /**
 * @ignore
 */
@@ -101,12 +103,13 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	* @param array $pm Data from
 	* @return array
 	*/
-	public function find_users_for_notification($pm)
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $pm)
 	{
-		$user = $this->phpbb_container->get('user');
+		$db = $phpbb_container->get('dbal.conn');
+		$user = $phpbb_container->get('user');
 
 		// Exclude guests, current user and banned users from notifications
-		unset($pm['recipients'][ANONYMOUS], $pm['recipients'][$user->data['user_id']]);
+		unset($pm['recipients'][ANONYMOUS]);//, $pm['recipients'][$user->data['user_id']]);
 
 		if (!sizeof($pm['recipients']))
 		{
@@ -115,7 +118,7 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 
 		if (!function_exists('phpbb_get_banned_user_ids'))
 		{
-			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+			include($phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $phpbb_container->getParameter('core.php_ext'));
 		}
 		$banned_users = phpbb_get_banned_user_ids(array_keys($pm['recipients']));
 		$pm['recipients'] = array_diff(array_keys($pm['recipients']), $banned_users);
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index addaa30ea6..920a53bcf2 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -7,6 +7,8 @@
 *
 */
 
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
 /**
 * @ignore
 */
-- 
cgit v1.2.1


From 86b801df7304d43f117bea762710149c25385260 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 16:12:20 -0500
Subject: [ticket/11103] Some fixes for the email method

PHPBB3-11103
---
 phpBB/includes/functions_privmsgs.php         | 25 +++++++++++--------------
 phpBB/includes/notifications/method/email.php |  8 ++++----
 phpBB/includes/notifications/service.php      | 11 +++++------
 phpBB/includes/notifications/type/base.php    |  2 --
 4 files changed, 20 insertions(+), 26 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 99ad2ad791..8002765ee2 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1543,6 +1543,7 @@ function get_folder_status($folder_id, $folder)
 function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 {
 	global $db, $auth, $config, $phpEx, $template, $user, $phpbb_root_path;
+	global $phpbb_container;
 
 	// We do not handle erasing pms here
 	if ($mode == 'delete')
@@ -1844,7 +1845,16 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 	// Send Notifications
 	if ($mode != 'edit')
 	{
-		pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message'], $data['msg_id']);
+		$phpbb_notifications = $phpbb_container->get('notifications');
+
+		$phpbb_notifications->add_notifications('pm', array(
+			'author_id'				=> $data['from_user_id'],
+			'recipients'			=> $recipients,
+			'message_subject'		=> $subject,
+			'msg_id'				=> $data['msg_id'],
+		));
+
+		//pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message'], $data['msg_id']);
 	}
 
 	return $data['msg_id'];
@@ -1855,19 +1865,6 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 */
 function pm_notification($mode, $author, $recipients, $subject, $message, $msg_id)
 {
-	global $phpbb_container;
-
-	$phpbb_notifications = $phpbb_container->get('notifications');
-
-	$phpbb_notifications->add_notifications('pm', array(
-		'author_id'				=> $author,
-		'recipients'			=> $recipients,
-		'message_subject'		=> $subject,
-		'msg_id'				=> $msg_id,
-	));
-
-	return;
-
 	global $db, $user, $config, $phpbb_root_path, $phpEx, $auth;
 
 	$subject = censor_text($subject);
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index 725ede7913..0120485cff 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -29,7 +29,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 		return true;
 	}
 
-	public function notify()
+	public function notify($notification)
 	{
 		// email the user
 	}
@@ -70,7 +70,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 		{
 			$notification->users($users);
 
-			$user = $notification->get_user();
+			$user = $notification->get_user($notification->user_id);
 
 			$messenger->template('privmsg_notify', $user['user_lang']);
 
@@ -82,10 +82,10 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 				'USERNAME'		=> htmlspecialchars_decode($user['username']),
 
 				'U_INBOX'			=> $board_url . "/ucp.{$this->php_ext}?i=pm&folder=inbox",
-				'U_VIEW_MESSAGE'	=> $board_url . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$notification->get_item_id()}",
+				'U_VIEW_MESSAGE'	=> $board_url . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$notification->item_id}",
 			));
 
-			$messenger->send($addr['method']);
+			$messenger->send('email');
 		}
 
 		// Save the queue in the messenger class (has to be called or these emails could be lost?)
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index a689e1c68a..74e2e29e1a 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -172,15 +172,14 @@ class phpbb_notifications_service
 			foreach ($methods as $method)
 			{
 				// setup the notification methods and add the notification to the queue
-				if ($row['method'])
+				if ($method)
 				{
-					if (!isset($notification_methods[$row['method']]))
+					if (!isset($notification_methods[$method]))
 					{
-						$method_class_name = 'phpbb_notifications_method_' . $row['method'];
-						$notification_methods[$row['method']] = new $method_class_name();
+						$method_class_name = 'phpbb_notifications_method_' . $method;
+						$notification_methods[$method] = new $method_class_name($this->phpbb_container);
 					}
-
-					$notification_methods[$row['method']]->add_to_queue($notification);
+					$notification_methods[$method]->add_to_queue($notification);
 				}
 			}
 		}
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index f031abae77..32d8f58ff3 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -37,7 +37,6 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 
 	/**
 	* Indentification data
-	* notification_id
 	* item_type
 	* item_id
 	* user_id
@@ -141,7 +140,6 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 			'URL'		=> $this->get_url(),
 			'TIME'		=> $user->format_date($this->time),
 
-			'ID'		=> $this->notification_id,
 			'UNREAD'	=> $this->unread,
 		));
 	}
-- 
cgit v1.2.1


From 16a0757f2a21ad2ca36a9463c822539c9ea14d30 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 17:28:13 -0500
Subject: [ticket/11103] Order notifications properly

PHPBB3-11103
---
 phpBB/includes/notifications/service.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 74e2e29e1a..4794472883 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -46,6 +46,8 @@ class phpbb_notifications_service
 	*
 	* @param array $options Optional options to control what notifications are loaded
 	*				user_id		User id to load notifications for (Default: $user->data['user_id'])
+	*				order_by	Order by (Default: time)
+	*				order_dir	Order direction (Default: DESC)
 	* 				limit		Number of notifications to load (Default: 5)
 	* 				start		Notifications offset (Default: 0)
 	*/
@@ -58,12 +60,15 @@ class phpbb_notifications_service
 			'user_id'		=> $user->data['user_id'],
 			'limit'			=> 5,
 			'start'			=> 0,
+			'order_by'		=> 'time',
+			'order_dir'		=> 'DESC',
 		), $options);
 
 		$notifications = $user_ids = array();
 
 		$sql = 'SELECT * FROM ' . NOTIFICATIONS_TABLE . '
-			WHERE user_id = ' . (int) $options['user_id'];
+			WHERE user_id = ' . (int) $options['user_id'] . '
+				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 		$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
 
 		while ($row = $this->db->sql_fetchrow($result))
-- 
cgit v1.2.1


From 6983f380c55779054b545e4760bf250e8ecace2e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 17:48:13 -0500
Subject: [ticket/11103] Full url function

PHPBB3-11103
---
 phpBB/includes/notifications/method/email.php   | 11 ++++++-----
 phpBB/includes/notifications/type/interface.php |  2 ++
 phpBB/includes/notifications/type/pm.php        | 12 +++++++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index 0120485cff..b1979296b9 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -23,6 +23,10 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notifications_method_email extends phpbb_notifications_method_base
 {
+	/**
+	* Is this method available for the user?
+	* This is checked on the notifications options
+	*/
 	public static function is_available()
 	{
 		// Email is always available
@@ -77,12 +81,9 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 			$messenger->to($user['user_email'], $user['username']);
 
 			$messenger->assign_vars(array(
-				'SUBJECT'		=> htmlspecialchars_decode($notification->get_title()),
-				'AUTHOR_NAME'	=> '',
-				'USERNAME'		=> htmlspecialchars_decode($user['username']),
+				'SUBJECT'			=> htmlspecialchars_decode($notification->get_title()),
 
-				'U_INBOX'			=> $board_url . "/ucp.{$this->php_ext}?i=pm&folder=inbox",
-				'U_VIEW_MESSAGE'	=> $board_url . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$notification->item_id}",
+				'U_VIEW_MESSAGE'	=> $notification->get_full_url(),
 			));
 
 			$messenger->send('email');
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index ccd963ba06..03e24358a9 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -29,6 +29,8 @@ interface phpbb_notifications_type_interface
 
 	public function get_url();
 
+	public function get_full_url();
+
 	public function create_insert_array($type_data);
 
 	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $type_data);
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 2b2a835470..50c67de21a 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -65,7 +65,17 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	*/
 	public function get_url()
 	{
-		return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=pm&amp;mode=view&p={$this->item_id}");
+		return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=pm&amp;mode=view&amp;p={$this->item_id}");
+	}
+
+	/**
+	* Get the full url to this item
+	*
+	* @return string URL
+	*/
+	public function get_full_url()
+	{
+		return generate_board_url() . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$this->item_id}";
 	}
 
 	/**
-- 
cgit v1.2.1


From 98a03090a05b1d7651c05ad23802973cf20dcf6b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Sep 2012 21:05:49 -0500
Subject: [ticket/11103] Move banned user checking to email method

This will make sure banned users are never sent notification emails

PHPBB3-11103
---
 phpBB/includes/notifications/method/email.php | 12 ++++++++++++
 phpBB/includes/notifications/type/pm.php      | 16 ++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index b1979296b9..2b80b5bf3a 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -52,6 +52,13 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 			$user_ids[] = $notification->user_id;
 		}
 
+		// We do not send emails to banned users
+		if (!function_exists('phpbb_get_banned_user_ids'))
+		{
+			include($phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $phpbb_container->getParameter('core.php_ext'));
+		}
+		$banned_users = phpbb_get_banned_user_ids($user_ids);
+
 		$sql = 'SELECT * FROM ' . USERS_TABLE . '
 			WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
 		$result = $this->db->sql_query($sql);
@@ -72,6 +79,11 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 		// Time to go through the queue and send emails
 		foreach ($this->queue as $notification)
 		{
+			if (in_array($notification->user_id, $banned_users))
+			{
+				continue;
+			}
+
 			$notification->users($users);
 
 			$user = $notification->get_user($notification->user_id);
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 50c67de21a..92026c08d7 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -118,20 +118,8 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 		$db = $phpbb_container->get('dbal.conn');
 		$user = $phpbb_container->get('user');
 
-		// Exclude guests, current user and banned users from notifications
-		unset($pm['recipients'][ANONYMOUS]);//, $pm['recipients'][$user->data['user_id']]);
-
-		if (!sizeof($pm['recipients']))
-		{
-			return;
-		}
-
-		if (!function_exists('phpbb_get_banned_user_ids'))
-		{
-			include($phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $phpbb_container->getParameter('core.php_ext'));
-		}
-		$banned_users = phpbb_get_banned_user_ids(array_keys($pm['recipients']));
-		$pm['recipients'] = array_diff(array_keys($pm['recipients']), $banned_users);
+		// Exclude guests and current user from notifications
+		unset($pm['recipients'][ANONYMOUS], $pm['recipients'][$user->data['user_id']]);
 
 		if (!sizeof($pm['recipients']))
 		{
-- 
cgit v1.2.1


From 4b4ea7c5cde7c9f3684ca325c110f81eda593d67 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 10:19:46 -0500
Subject: [ticket/11103] The service now handles all user loading itself

Delete pm notifications when pms are deleted

PHPBB3-11103
---
 phpBB/includes/functions_privmsgs.php           | 106 ++++--------------------
 phpBB/includes/notifications/method/base.php    |  25 +++++-
 phpBB/includes/notifications/method/email.php   |  14 +---
 phpBB/includes/notifications/service.php        | 101 ++++++++++++----------
 phpBB/includes/notifications/type/base.php      |  24 +-----
 phpBB/includes/notifications/type/interface.php |   4 +-
 phpBB/includes/notifications/type/pm.php        |  98 +++++++++++-----------
 7 files changed, 152 insertions(+), 220 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 8002765ee2..88c5bd8e2a 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -982,6 +982,7 @@ function handle_mark_actions($user_id, $mark_action)
 function delete_pm($user_id, $msg_ids, $folder_id)
 {
 	global $db, $user, $phpbb_root_path, $phpEx;
+	global $phpbb_container;
 
 	$user_id	= (int) $user_id;
 	$folder_id	= (int) $folder_id;
@@ -1093,6 +1094,10 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 		$user->data['user_unread_privmsg'] -= $num_unread;
 	}
 
+	// Delete Notifications
+	$phpbb_notifications = $phpbb_container->get('notifications');
+	$phpbb_notifications->delete_notifications('pm', array_keys($delete_rows));
+
 	// Now we have to check which messages we can delete completely
 	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
@@ -1843,104 +1848,23 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 	$db->sql_transaction('commit');
 
 	// Send Notifications
-	if ($mode != 'edit')
-	{
-		$phpbb_notifications = $phpbb_container->get('notifications');
-
-		$phpbb_notifications->add_notifications('pm', array(
-			'author_id'				=> $data['from_user_id'],
-			'recipients'			=> $recipients,
-			'message_subject'		=> $subject,
-			'msg_id'				=> $data['msg_id'],
-		));
-
-		//pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message'], $data['msg_id']);
-	}
-
-	return $data['msg_id'];
-}
-
-/**
-* PM Notification
-*/
-function pm_notification($mode, $author, $recipients, $subject, $message, $msg_id)
-{
-	global $db, $user, $config, $phpbb_root_path, $phpEx, $auth;
-
-	$subject = censor_text($subject);
-
-	// Exclude guests, current user and banned users from notifications
-	unset($recipients[ANONYMOUS], $recipients[$user->data['user_id']]);
-
-	if (!sizeof($recipients))
-	{
-		return;
-	}
-
-	if (!function_exists('phpbb_get_banned_user_ids'))
-	{
-		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-	}
-	$banned_users = phpbb_get_banned_user_ids(array_keys($recipients));
-	$recipients = array_diff(array_keys($recipients), $banned_users);
+	$phpbb_notifications = $phpbb_container->get('notifications');
 
-	if (!sizeof($recipients))
-	{
-		return;
-	}
-
-	$sql = 'SELECT user_id, username, user_email, user_lang, user_notify_pm, user_notify_type, user_jabber
-		FROM ' . USERS_TABLE . '
-		WHERE ' . $db->sql_in_set('user_id', $recipients);
-	$result = $db->sql_query($sql);
-
-	$msg_list_ary = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		if ($row['user_notify_pm'] == 1 && trim($row['user_email']))
-		{
-			$msg_list_ary[] = array(
-				'method'	=> $row['user_notify_type'],
-				'email'		=> $row['user_email'],
-				'jabber'	=> $row['user_jabber'],
-				'name'		=> $row['username'],
-				'lang'		=> $row['user_lang']
-			);
-		}
-	}
-	$db->sql_freeresult($result);
+	$pm_data = array_merge($data, array(
+		'message_subject'		=> $subject,
+		'recipients'			=> $recipients,
+	));
 
-	if (!sizeof($msg_list_ary))
+	if ($mode == 'edit')
 	{
-		return;
+		$phpbb_notifications->update_notifications('pm', $pm_data);
 	}
-
-	include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-	$messenger = new messenger();
-
-	foreach ($msg_list_ary as $pos => $addr)
+	else
 	{
-		$messenger->template('privmsg_notify', $addr['lang']);
-
-		$messenger->to($addr['email'], $addr['name']);
-		$messenger->im($addr['jabber'], $addr['name']);
-
-		$messenger->assign_vars(array(
-			'SUBJECT'		=> htmlspecialchars_decode($subject),
-			'AUTHOR_NAME'	=> htmlspecialchars_decode($author),
-			'USERNAME'		=> htmlspecialchars_decode($addr['name']),
-
-			'U_INBOX'			=> generate_board_url() . "/ucp.$phpEx?i=pm&folder=inbox",
-			'U_VIEW_MESSAGE'	=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id",
-		));
-
-		$messenger->send($addr['method']);
+		$phpbb_notifications->add_notifications('pm', $pm_data);
 	}
-	unset($msg_list_ary);
 
-	$messenger->save_queue();
-
-	unset($messenger);
+	return $data['msg_id'];
 }
 
 /**
diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notifications/method/base.php
index 98c06509c6..3ed9d3f33c 100644
--- a/phpBB/includes/notifications/method/base.php
+++ b/phpBB/includes/notifications/method/base.php
@@ -24,11 +24,31 @@ if (!defined('IN_PHPBB'))
 abstract class phpbb_notifications_method_base implements phpbb_notifications_method_interface
 {
 	protected $phpbb_container;
+	protected $service;
 	protected $db;
 	protected $user;
 	protected $phpbb_root_path;
 	protected $php_ext;
 
+	/**
+	* Desired notifications
+	* unique by (type, type_id, user_id, method)
+	* if multiple methods are desired, multiple rows will exist.
+	*
+	* method of "none" will over-ride any other options
+	*
+	* item_type
+	* item_id
+	* user_id
+	* method
+	* 	none (will never receive notifications)
+	* 	standard (listed in notifications window
+	* 	popup?
+	* 	email
+	* 	jabber
+	*	sms?
+	*/
+
 	/**
 	* Queue of messages to be sent
 	*
@@ -36,11 +56,14 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 	*/
 	protected $queue = array();
 
-	public function __construct(ContainerBuilder $phpbb_container, $data = array())
+	public function __construct(ContainerBuilder $phpbb_container)
 	{
 		// phpBB Container
 		$this->phpbb_container = $phpbb_container;
 
+		// Service
+		$this->service = $phpbb_container->get('notifications');
+
 		// Some common things we're going to use
 		$this->db = $phpbb_container->get('dbal.conn');
 		$this->user = $phpbb_container->get('user');
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index 2b80b5bf3a..50df9a6c56 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -59,14 +59,8 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 		}
 		$banned_users = phpbb_get_banned_user_ids($user_ids);
 
-		$sql = 'SELECT * FROM ' . USERS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$users[$row['user_id']] = $row;
-		}
-		$this->db->sql_freeresult($result);
+		// Load all the users we need
+		$this->service->load_users($user_ids);
 
 		// Load the messenger
 		if (!class_exists('messenger'))
@@ -84,9 +78,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 				continue;
 			}
 
-			$notification->users($users);
-
-			$user = $notification->get_user($notification->user_id);
+			$user = $this->service->get_user($notification->user_id);
 
 			$messenger->template('privmsg_notify', $user['user_lang']);
 
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 4794472883..50ceb1584a 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -31,7 +31,7 @@ class phpbb_notifications_service
 	*
 	* @var array Array of user data that we've loaded from the DB
 	*/
-	protected $users;
+	protected $users = array();
 
 	public function __construct(ContainerBuilder $phpbb_container)
 	{
@@ -76,7 +76,6 @@ class phpbb_notifications_service
 			$item_type_class_name = $this->get_item_type_class_name($row['item_type'], true);
 
 			$notification = new $item_type_class_name($this->phpbb_container, $row);
-			$notification->users($this->users);
 
 			$user_ids = array_merge($user_ids, $notification->users_to_query());
 
@@ -84,24 +83,7 @@ class phpbb_notifications_service
 		}
 		$this->db->sql_freeresult($result);
 
-		// Load the users
-		$user_ids = array_unique($user_ids);
-
-		// @todo do not load users we already have in $this->users
-
-		if (sizeof($user_ids))
-		{
-			// @todo do not select everything
-			$sql = 'SELECT * FROM ' . USERS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$this->users[$row['user_id']] = $row;
-			}
-			$this->db->sql_freeresult($result);
-		}
+		$this->load_users($user_ids);
 
 		return $notifications;
 	}
@@ -122,32 +104,16 @@ class phpbb_notifications_service
 		// Update any existing notifications for this item
 		$this->update_notifications($item_type, $item_id, $data);
 
-		$notify_users = array();
+		$notify_users = $user_ids = array();
 		$notification_objects = $notification_methods = array();
 		$new_rows = array();
 
-		/**
-		* Desired notifications
-		* unique by (type, type_id, user_id, method)
-		* if multiple methods are desired, multiple rows will exist.
-		*
-		* method of "none" will over-ride any other options
-		*
-		* item_type
-		* item_id
-		* user_id
-		* method
-		* 	none (will never receive notifications)
-		* 	standard (listed in notifications window
-		* 	popup?
-		* 	email
-		* 	jabber
-		*	sms?
-		*/
-
 		// find out which users want to receive this type of notification
 		$notify_users = $item_type_class_name::find_users_for_notification($this->phpbb_container, $data);
 
+		// Never send notifications to the anonymous user or the current user!
+		$notify_users = array_diff($notify_users, array(ANONYMOUS, $this->phpbb_container->get('user')->data['user_id']));
+
 		// Make sure not to send new notifications to users who've already been notified about this item
 		// This may happen when an item was added, but now new users are able to see the item
 		$sql = 'SELECT user_id FROM ' . NOTIFICATIONS_TABLE . "
@@ -172,8 +138,12 @@ class phpbb_notifications_service
 
 			$notification->user_id = (int) $user;
 
+			// Store the creation array in our new rows that will be inserted later
 			$new_rows[] = $notification->create_insert_array($data);
 
+			// Users are needed to send notifications
+			$user_ids = array_merge($user_ids, $notification->users_to_query());
+
 			foreach ($methods as $method)
 			{
 				// setup the notification methods and add the notification to the queue
@@ -184,6 +154,7 @@ class phpbb_notifications_service
 						$method_class_name = 'phpbb_notifications_method_' . $method;
 						$notification_methods[$method] = new $method_class_name($this->phpbb_container);
 					}
+
 					$notification_methods[$method]->add_to_queue($notification);
 				}
 			}
@@ -192,6 +163,9 @@ class phpbb_notifications_service
 		// insert into the db
 		$this->db->sql_multi_insert(NOTIFICATIONS_TABLE, $new_rows);
 
+		// We need to load all of the users to send notifications
+		$this->load_users($user_ids);
+
 		// run the queue for each method to send notifications
 		foreach ($notification_methods as $method)
 		{
@@ -203,13 +177,14 @@ class phpbb_notifications_service
 	* Update a notification
 	*
 	* @param string $item_type Type identifier
-	* @param int $item_id Identifier within the type
 	* @param array $data Data specific for this type that will be updated
 	*/
-	public function update_notifications($item_type, $item_id, $data)
+	public function update_notifications($item_type, $data)
 	{
 		$item_type_class_name = $this->get_item_type_class_name($item_type);
 
+		$item_id = $item_type_class_name::get_item_id($data);
+
 		$notification = new $item_type_class_name($this->phpbb_container);
 		$update_array = $notification->create_update_array($data);
 
@@ -224,17 +199,55 @@ class phpbb_notifications_service
 	* Delete a notification
 	*
 	* @param string $item_type Type identifier
-	* @param int $item_id Identifier within the type
+	* @param int|array $item_id Identifier within the type (or array of ids)
 	* @param array $data Data specific for this type that will be updated
 	*/
 	public function delete_notifications($item_type, $item_id)
 	{
 		$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id;
+				AND " . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id);
 		$this->db->sql_query($sql);
 	}
 
+	/**
+	* Load user helper
+	*
+	* @param array $user_ids
+	*/
+	public function load_users($user_ids)
+	{
+		// Load the users
+		$user_ids = array_unique($user_ids);
+
+		// Do not load users we already have in $this->users
+		$user_ids = array_diff($user_ids, array_keys($this->users));
+
+		if (sizeof($user_ids))
+		{
+			$sql = 'SELECT * FROM ' . USERS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$this->users[$row['user_id']] = $row;
+			}
+			$this->db->sql_freeresult($result);
+		}
+	}
+
+	/**
+	* Get a user row from our users cache
+	*
+	* @param int $user_id
+	* @return array
+	*/
+	public function get_user($user_id)
+	{
+		return $this->users[$user_id];
+	}
+
 	/**
 	* Helper to get the notifications item type class name and clean it if unsafe
 	*/
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 32d8f58ff3..b0b8801a7e 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -24,6 +24,7 @@ if (!defined('IN_PHPBB'))
 abstract class phpbb_notifications_type_base implements phpbb_notifications_type_interface
 {
 	protected $phpbb_container;
+	protected $service;
 	protected $db;
 	protected $phpbb_root_path;
 	protected $php_ext;
@@ -55,6 +56,9 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		// phpBB Container
 		$this->phpbb_container = $phpbb_container;
 
+		// Service
+		$this->service = $phpbb_container->get('notifications');
+
 		// Some common things we're going to use
 		$this->db = $phpbb_container->get('dbal.conn');
 
@@ -99,26 +103,6 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		$this->data['data'][$name] = $value;
 	}
 
-	/**
-	* Function to store the users loaded from the database (for output to the template)
-	* (The service handles this)
-	*/
-	public function users(&$users)
-	{
-		$this->users = &$users;
-	}
-
-	/**
-	* Get a user row from our users cache
-	*
-	* @param int $user_id
-	* @return array
-	*/
-	public function get_user($user_id)
-	{
-		return $this->users[$user_id];
-	}
-
 	/**
 	* Output the notification to the template
 	*
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index 03e24358a9..85fe41f6ef 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -25,6 +25,8 @@ interface phpbb_notifications_type_interface
 
 	public static function get_item_id($type_data);
 
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $type_data);
+
 	public function get_title();
 
 	public function get_url();
@@ -32,6 +34,4 @@ interface phpbb_notifications_type_interface
 	public function get_full_url();
 
 	public function create_insert_array($type_data);
-
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $type_data);
 }
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 92026c08d7..8b8f41d1c2 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -44,6 +44,50 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 		return $pm['msg_id'];
 	}
 
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param array $pm Data from
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $pm)
+	{
+		$service = $phpbb_container->get('notifications');
+		$db = $phpbb_container->get('dbal.conn');
+		$user = $phpbb_container->get('user');
+
+		if (!sizeof($pm['recipients']))
+		{
+			return array();
+		}
+
+		$service->load_users(array_keys($pm['recipients']));
+
+		$notify_users = array();
+
+		foreach (array_keys($pm['recipients']) as $user_id)
+		{
+			$recipient = $service->get_user($user_id);
+
+			if ($recipient['user_notify_pm'])
+			{
+				$notify_users[$recipient['user_id']] = array();
+
+				if ($recipient['user_notify_type'] == NOTIFY_EMAIL || $recipient['user_notify_type'] == NOTIFY_BOTH)
+				{
+					$notify_users[$recipient['user_id']][] = 'email';
+				}
+
+				if ($recipient['user_notify_type'] == NOTIFY_IM || $recipient['user_notify_type'] == NOTIFY_BOTH)
+				{
+					$notify_users[$recipient['user_id']][] = 'jabber';
+				}
+			}
+		}
+
+		return $notify_users;
+	}
+
 	/**
 	* Get the title of this notification
 	*
@@ -51,7 +95,7 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	*/
 	public function get_title()
 	{
-		$user_data = $this->get_user($this->get_data('author_id'));
+		$user_data = $this->service->get_user($this->get_data('from_user_id'));
 
 		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 
@@ -85,7 +129,7 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	*/
 	public function users_to_query()
 	{
-		return array($this->data['author_id']);
+		return array($this->data['from_user_id']);
 	}
 
 	/**
@@ -100,58 +144,10 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	{
 		$this->item_id = $pm['msg_id'];
 
-		$this->set_data('author_id', $pm['author_id']);
+		$this->set_data('from_user_id', $pm['from_user_id']);
 
 		$this->set_data('message_subject', $pm['message_subject']);
 
 		return parent::create_insert_array($pm);
 	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $pm Data from
-	* @return array
-	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $pm)
-	{
-		$db = $phpbb_container->get('dbal.conn');
-		$user = $phpbb_container->get('user');
-
-		// Exclude guests and current user from notifications
-		unset($pm['recipients'][ANONYMOUS], $pm['recipients'][$user->data['user_id']]);
-
-		if (!sizeof($pm['recipients']))
-		{
-			return;
-		}
-
-		$sql = 'SELECT user_id, user_notify_pm, user_notify_type
-			FROM ' . USERS_TABLE . '
-			WHERE ' . $db->sql_in_set('user_id', $pm['recipients']);
-		$result = $db->sql_query($sql);
-
-		$pm['recipients'] = array();
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if ($row['user_notify_pm'])
-			{
-				$pm['recipients'][$row['user_id']] = array();
-
-				if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
-				{
-					$pm['recipients'][$row['user_id']][] = 'email';
-				}
-
-				if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
-				{
-					$pm['recipients'][$row['user_id']][] = 'jabber';
-				}
-			}
-		}
-		$db->sql_freeresult($result);
-
-		return $pm['recipients'];
-	}
 }
-- 
cgit v1.2.1


From ff45c9aa7c077fc0a03c64764917d1efcccf48f4 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 10:36:22 -0500
Subject: [ticket/11103] General notification email template.

PHPBB3-11103
---
 phpBB/includes/notifications/method/base.php      | 13 +------------
 phpBB/includes/notifications/method/email.php     | 15 +++++++--------
 phpBB/includes/notifications/method/interface.php |  2 +-
 phpBB/includes/notifications/service.php          |  2 +-
 phpBB/includes/notifications/type/base.php        | 22 +++++++++++++++++++++-
 phpBB/includes/notifications/type/interface.php   |  4 ++++
 phpBB/includes/notifications/type/pm.php          | 16 ++++++++++++++--
 7 files changed, 49 insertions(+), 25 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notifications/method/base.php
index 3ed9d3f33c..b860fcffda 100644
--- a/phpBB/includes/notifications/method/base.php
+++ b/phpBB/includes/notifications/method/base.php
@@ -83,19 +83,8 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 	}
 
 	/**
-	* Basic run queue function.
-	* Child methods should override this function if there are more efficient methods to mass-notification
+	* Empty the queue
 	*/
-	public function run_queue()
-	{
-		foreach ($this->queue as $notification)
-		{
-			$this->notify($notification);
-		}
-
-		$this->empty_queue();
-	}
-
 	protected function empty_queue()
 	{
 		$this->queue = array();
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index 50df9a6c56..69546be73f 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -33,12 +33,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 		return true;
 	}
 
-	public function notify($notification)
-	{
-		// email the user
-	}
-
-	public function run_queue()
+	public function notify()
 	{
 		if (!sizeof($this->queue))
 		{
@@ -80,14 +75,18 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 
 			$user = $this->service->get_user($notification->user_id);
 
-			$messenger->template('privmsg_notify', $user['user_lang']);
+			$messenger->template('notification', $user['user_lang']);
 
 			$messenger->to($user['user_email'], $user['username']);
 
 			$messenger->assign_vars(array(
-				'SUBJECT'			=> htmlspecialchars_decode($notification->get_title()),
+				'USERNAME'			=> $user['username'],
+
+				'MESSAGE'			=> htmlspecialchars_decode($notification->get_title()),
 
 				'U_VIEW_MESSAGE'	=> $notification->get_full_url(),
+
+				'U_UNSUBSCRIBE'		=> $notification->get_unsubscribe_url(),
 			));
 
 			$messenger->send('email');
diff --git a/phpBB/includes/notifications/method/interface.php b/phpBB/includes/notifications/method/interface.php
index f18d005b8b..7d7f3abcd0 100644
--- a/phpBB/includes/notifications/method/interface.php
+++ b/phpBB/includes/notifications/method/interface.php
@@ -21,5 +21,5 @@ if (!defined('IN_PHPBB'))
 */
 interface phpbb_notifications_method_interface
 {
-	public function notify($notification);
+	public function notify();
 }
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 50ceb1584a..463798fa07 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -169,7 +169,7 @@ class phpbb_notifications_service
 		// run the queue for each method to send notifications
 		foreach ($notification_methods as $method)
 		{
-			$method->run_queue();
+			$method->notify();
 		}
 	}
 
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index b0b8801a7e..91cc9f175a 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -120,7 +120,7 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		), $options);
 
 		$template->assign_block_vars($options['template_block'], array(
-			'TITLE'		=> $this->get_title(),
+			'TITLE'		=> $this->get_formatted_title(),
 			'URL'		=> $this->get_url(),
 			'TIME'		=> $user->format_date($this->time),
 
@@ -173,4 +173,24 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 
 		return $data;
 	}
+
+	/**
+	* Get the formatted title of this notification (fall-back)
+	*
+	* @return string
+	*/
+	public function get_formatted_title()
+	{
+		return $this->get_title();
+	}
+
+	/**
+	* URL to unsubscribe to this notification
+	*
+	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
+	*/
+	public function get_unsubscribe_url($method = false)
+	{
+		return false;
+	}
 }
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index 85fe41f6ef..c165815835 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -29,9 +29,13 @@ interface phpbb_notifications_type_interface
 
 	public function get_title();
 
+	public function get_formatted_title();
+
 	public function get_url();
 
 	public function get_full_url();
 
+	public function get_unsubscribe_url($method);
+
 	public function create_insert_array($type_data);
 }
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 8b8f41d1c2..702ec39c16 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -89,11 +89,11 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	}
 
 	/**
-	* Get the title of this notification
+	* Get the HTML formatted title of this notification
 	*
 	* @return string
 	*/
-	public function get_title()
+	public function get_formatted_title()
 	{
 		$user_data = $this->service->get_user($this->get_data('from_user_id'));
 
@@ -102,6 +102,18 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 		return $username . ' sent you a private message titled: ' . $this->get_data('message_subject');
 	}
 
+	/**
+	* Get the plain text title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		$user_data = $this->service->get_user($this->get_data('from_user_id'));
+
+		return $user_data['username'] . ' sent you a private message titled: ' . $this->get_data('message_subject');
+	}
+
 	/**
 	* Get the url to this item
 	*
-- 
cgit v1.2.1


From 74e2a8f893a2e7a69ba129a74dd0b3c31e742e79 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 13:29:47 -0500
Subject: [ticket/11103] Post notifications

PHPBB3-11103
---
 phpBB/includes/functions_posting.php       | 252 +++--------------------------
 phpBB/includes/mcp/mcp_queue.php           |   6 +-
 phpBB/includes/notifications/type/base.php |  32 ++++
 phpBB/includes/notifications/type/pm.php   |   2 +
 phpBB/includes/notifications/type/post.php |  71 +++++++-
 5 files changed, 122 insertions(+), 241 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index c50395a5df..6c5c4535a3 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -61,7 +61,7 @@ function generate_smilies($mode, $forum_id)
 			'body' => 'posting_smilies.html')
 		);
 
-		generate_pagination(append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&amp;f=' . $forum_id), $smiley_count, $config['smilies_per_page'], $start);	
+		generate_pagination(append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&amp;f=' . $forum_id), $smiley_count, $config['smilies_per_page'], $start);
 	}
 
 	$display_link = false;
@@ -1173,237 +1173,6 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 	return true;
 }
 
-/**
-* User Notification
-*/
-function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id)
-{
-	global $db, $user, $config, $phpbb_root_path, $phpEx, $auth;
-
-	$topic_notification = ($mode == 'reply' || $mode == 'quote') ? true : false;
-	$forum_notification = ($mode == 'post') ? true : false;
-
-	if (!$topic_notification && !$forum_notification)
-	{
-		trigger_error('NO_MODE');
-	}
-
-	if (($topic_notification && !$config['allow_topic_notify']) || ($forum_notification && !$config['allow_forum_notify']))
-	{
-		return;
-	}
-
-	$topic_title = ($topic_notification) ? $topic_title : $subject;
-	$topic_title = censor_text($topic_title);
-
-	// Exclude guests, current user and banned users from notifications
-	if (!function_exists('phpbb_get_banned_user_ids'))
-	{
-		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-	}
-	$sql_ignore_users = phpbb_get_banned_user_ids();
-	$sql_ignore_users[ANONYMOUS] = ANONYMOUS;
-	$sql_ignore_users[$user->data['user_id']] = $user->data['user_id'];
-
-	$notify_rows = array();
-
-	// -- get forum_userids	|| topic_userids
-	$sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber
-		FROM ' . (($topic_notification) ? TOPICS_WATCH_TABLE : FORUMS_WATCH_TABLE) . ' w, ' . USERS_TABLE . ' u
-		WHERE w.' . (($topic_notification) ? 'topic_id' : 'forum_id') . ' = ' . (($topic_notification) ? $topic_id : $forum_id) . '
-			AND ' . $db->sql_in_set('w.user_id', $sql_ignore_users, true) . '
-			AND w.notify_status = ' . NOTIFY_YES . '
-			AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
-			AND u.user_id = w.user_id';
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$notify_user_id = (int) $row['user_id'];
-		$notify_rows[$notify_user_id] = array(
-			'user_id'		=> $notify_user_id,
-			'username'		=> $row['username'],
-			'user_email'	=> $row['user_email'],
-			'user_jabber'	=> $row['user_jabber'],
-			'user_lang'		=> $row['user_lang'],
-			'notify_type'	=> ($topic_notification) ? 'topic' : 'forum',
-			'template'		=> ($topic_notification) ? 'topic_notify' : 'newtopic_notify',
-			'method'		=> $row['user_notify_type'],
-			'allowed'		=> false
-		);
-
-		// Add users who have been already notified to ignore list
-		$sql_ignore_users[$notify_user_id] = $notify_user_id;
-	}
-	$db->sql_freeresult($result);
-
-	// forum notification is sent to those not already receiving topic notifications
-	if ($topic_notification)
-	{
-		$sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber
-			FROM ' . FORUMS_WATCH_TABLE . ' fw, ' . USERS_TABLE . " u
-			WHERE fw.forum_id = $forum_id
-				AND " . $db->sql_in_set('fw.user_id', $sql_ignore_users, true) . '
-				AND fw.notify_status = ' . NOTIFY_YES . '
-				AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
-				AND u.user_id = fw.user_id';
-		$result = $db->sql_query($sql);
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$notify_user_id = (int) $row['user_id'];
-			$notify_rows[$notify_user_id] = array(
-				'user_id'		=> $notify_user_id,
-				'username'		=> $row['username'],
-				'user_email'	=> $row['user_email'],
-				'user_jabber'	=> $row['user_jabber'],
-				'user_lang'		=> $row['user_lang'],
-				'notify_type'	=> 'forum',
-				'template'		=> 'forum_notify',
-				'method'		=> $row['user_notify_type'],
-				'allowed'		=> false
-			);
-		}
-		$db->sql_freeresult($result);
-	}
-
-	if (!sizeof($notify_rows))
-	{
-		return;
-	}
-
-	// Make sure users are allowed to read the forum
-	foreach ($auth->acl_get_list(array_keys($notify_rows), 'f_read', $forum_id) as $forum_id => $forum_ary)
-	{
-		foreach ($forum_ary as $auth_option => $user_ary)
-		{
-			foreach ($user_ary as $user_id)
-			{
-				$notify_rows[$user_id]['allowed'] = true;
-			}
-		}
-	}
-
-	// Now, we have to do a little step before really sending, we need to distinguish our users a little bit. ;)
-	$msg_users = $delete_ids = $update_notification = array();
-	foreach ($notify_rows as $user_id => $row)
-	{
-		if (!$row['allowed'] || !trim($row['user_email']))
-		{
-			$delete_ids[$row['notify_type']][] = $row['user_id'];
-		}
-		else
-		{
-			$msg_users[] = $row;
-			$update_notification[$row['notify_type']][] = $row['user_id'];
-
-			/*
-			* We also update the forums watch table for this user when we are
-			* sending out a topic notification to prevent sending out another
-			* notification in case this user is also subscribed to the forum
-			* this topic was posted in.
-			* Since an UPDATE query is used, this has no effect on users only
-			* subscribed to the topic (i.e. no row is created) and should not
-			* be a performance issue.
-			*/
-			if ($row['notify_type'] === 'topic')
-			{
-				$update_notification['forum'][] = $row['user_id'];
-			}
-		}
-	}
-	unset($notify_rows);
-
-	// Now, we are able to really send out notifications
-	if (sizeof($msg_users))
-	{
-		include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-		$messenger = new messenger();
-
-		$msg_list_ary = array();
-		foreach ($msg_users as $row)
-		{
-			$pos = (!isset($msg_list_ary[$row['template']])) ? 0 : sizeof($msg_list_ary[$row['template']]);
-
-			$msg_list_ary[$row['template']][$pos]['method']	= $row['method'];
-			$msg_list_ary[$row['template']][$pos]['email']	= $row['user_email'];
-			$msg_list_ary[$row['template']][$pos]['jabber']	= $row['user_jabber'];
-			$msg_list_ary[$row['template']][$pos]['name']	= $row['username'];
-			$msg_list_ary[$row['template']][$pos]['lang']	= $row['user_lang'];
-			$msg_list_ary[$row['template']][$pos]['user_id']= $row['user_id'];
-		}
-		unset($msg_users);
-
-		foreach ($msg_list_ary as $email_template => $email_list)
-		{
-			foreach ($email_list as $addr)
-			{
-				$messenger->template($email_template, $addr['lang']);
-
-				$messenger->to($addr['email'], $addr['name']);
-				$messenger->im($addr['jabber'], $addr['name']);
-
-				$messenger->assign_vars(array(
-					'USERNAME'		=> htmlspecialchars_decode($addr['name']),
-					'TOPIC_TITLE'	=> htmlspecialchars_decode($topic_title),
-					'FORUM_NAME'	=> htmlspecialchars_decode($forum_name),
-
-					'U_FORUM'				=> generate_board_url() . "/viewforum.$phpEx?f=$forum_id",
-					'U_TOPIC'				=> generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id",
-					'U_NEWEST_POST'			=> generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id&p=$post_id&e=$post_id",
-					'U_STOP_WATCHING_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?uid={$addr['user_id']}&f=$forum_id&t=$topic_id&unwatch=topic",
-					'U_STOP_WATCHING_FORUM'	=> generate_board_url() . "/viewforum.$phpEx?uid={$addr['user_id']}&f=$forum_id&unwatch=forum",
-				));
-
-				$messenger->send($addr['method']);
-			}
-		}
-		unset($msg_list_ary);
-
-		$messenger->save_queue();
-	}
-
-	// Handle the DB updates
-	$db->sql_transaction('begin');
-
-	if (!empty($update_notification['topic']))
-	{
-		$sql = 'UPDATE ' . TOPICS_WATCH_TABLE . '
-			SET notify_status = ' . NOTIFY_NO . "
-			WHERE topic_id = $topic_id
-				AND " . $db->sql_in_set('user_id', $update_notification['topic']);
-		$db->sql_query($sql);
-	}
-
-	if (!empty($update_notification['forum']))
-	{
-		$sql = 'UPDATE ' . FORUMS_WATCH_TABLE . '
-			SET notify_status = ' . NOTIFY_NO . "
-			WHERE forum_id = $forum_id
-				AND " . $db->sql_in_set('user_id', $update_notification['forum']);
-		$db->sql_query($sql);
-	}
-
-	// Now delete the user_ids not authorised to receive notifications on this topic/forum
-	if (!empty($delete_ids['topic']))
-	{
-		$sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . "
-			WHERE topic_id = $topic_id
-				AND " . $db->sql_in_set('user_id', $delete_ids['topic']);
-		$db->sql_query($sql);
-	}
-
-	if (!empty($delete_ids['forum']))
-	{
-		$sql = 'DELETE FROM ' . FORUMS_WATCH_TABLE . "
-			WHERE forum_id = $forum_id
-				AND " . $db->sql_in_set('user_id', $delete_ids['forum']);
-		$db->sql_query($sql);
-	}
-
-	$db->sql_transaction('commit');
-}
-
 //
 // Post handling functions
 //
@@ -1640,6 +1409,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true, $update_search_index = true)
 {
 	global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path;
+	global $phpbb_container;
 
 	// We do not handle erasing posts here
 	if ($mode == 'delete')
@@ -2452,7 +2222,23 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	// Send Notifications
 	if (($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_approval)
 	{
-		user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id']);
+		$notifications = $phpbb_container->get('notifications');
+
+		switch ($mode)
+		{
+			case 'reply' :
+			case 'quote' :
+				$notifications->add_notifications('post', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+			break;
+
+			case 'post' :
+				$notifications->add_notifications('topic', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+			break;
+		}
 	}
 
 	$params = $add_anchor = '';
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index b44685b8a3..d5c431e478 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -421,7 +421,7 @@ class mcp_queue
 
 				$base_url = $this->u_action . "&amp;f=$forum_id&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir";
 				phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total, $config['topics_per_page'], $start);
-				
+
 				// Now display the page
 				$template->assign_vars(array(
 					'L_DISPLAY_ITEMS'		=> ($mode == 'unapproved_posts') ? $user->lang['DISPLAY_POSTS'] : $user->lang['DISPLAY_TOPICS'],
@@ -639,12 +639,12 @@ function approve_post($post_id_list, $id, $mode)
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
 			{
 				// Forum Notifications
-				user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+				$notifications->add_notifications('topic', $post_data);
 			}
 			else
 			{
 				// Topic Notifications
-				user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+				$notifications->add_notifications('post', $post_data);
 			}
 		}
 
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 91cc9f175a..df273f9e81 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -174,6 +174,38 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		return $data;
 	}
 
+	/**
+	* Find the users who want to receive notifications (helper)
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $item_id The item_id to search for
+	*
+	* @return array
+	*/
+	protected static function _find_users_for_notification(ContainerBuilder $phpbb_container, $item_id)
+	{
+		$db = $phpbb_container->get('dbal.conn');
+
+		$rowset = array();
+
+		$sql = 'SELECT * FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . static::get_item_type() . "'
+				AND item_id = " . (int) $item_id;
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$rowset[$row['user_id']] = array();
+			}
+
+			$rowset[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $rowset;
+	}
+
 	/**
 	* Get the formatted title of this notification (fall-back)
 	*
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 702ec39c16..e060b5d658 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -47,7 +47,9 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	/**
 	* Find the users who want to receive notifications
 	*
+	* @param ContainerBuilder $phpbb_container
 	* @param array $pm Data from
+	*
 	* @return array
 	*/
 	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $pm)
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 920a53bcf2..96faa0131c 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -45,11 +45,45 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	}
 
 	/**
-	* Get the title of this notification
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	{
+		$users = parent::_find_users_for_notification($phpbb_container, $post['topic_id']);
+
+		if (!sizeof($users))
+		{
+			return array();
+		}
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		{
+			$notify_users[$user_id] = $users[$user_id];
+		}
+
+		return $notify_users;
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
 	*
 	* @return string
 	*/
-	public function get_title()
+	public function get_formatted_title()
 	{
 		if ($this->get_data('post_username'))
 		{
@@ -57,7 +91,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		}
 		else
 		{
-			$user_data = $this->get_user($this->get_data('poster_id'));
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
 
 			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 		}
@@ -65,6 +99,25 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		return $username . ' posted in the topic ' . censor_text($this->get_data('topic_title'));
 	}
 
+	/**
+	* Get the title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$username = $user_data['username'];
+		}
+
+		return $username . ' posted in the topic ' . censor_text($this->get_data('topic_title'));
+	}
+
 	/**
 	* Get the url to this item
 	*
@@ -75,6 +128,16 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "p={$this->item_id}#p{$this->item_id}");
 	}
 
+	/**
+	* Get the full url to this item
+	*
+	* @return string URL
+	*/
+	public function get_full_url()
+	{
+		return generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}";
+	}
+
 	/**
 	* Users needed to query before this notification can be displayed
 	*
@@ -103,8 +166,6 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$this->set_data('post_username', $post['post_username']);
 
-		$this->time = $post['post_time'];
-
 		return parent::create_insert_array($post);
 	}
 }
-- 
cgit v1.2.1


From 3624d2c50ac1acca767c5642767102b97fd6b832 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 14:20:14 -0500
Subject: [ticket/11103] Use the language system, topic notifications

PHPBB3-11103
---
 phpBB/includes/notifications/method/email.php |   8 +-
 phpBB/includes/notifications/type/pm.php      |   4 +-
 phpBB/includes/notifications/type/post.php    |   8 +-
 phpBB/includes/notifications/type/topic.php   | 185 ++++++++++++++++++++++++++
 4 files changed, 197 insertions(+), 8 deletions(-)
 create mode 100644 phpBB/includes/notifications/type/topic.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index 69546be73f..d6468c9dc3 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -50,7 +50,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 		// We do not send emails to banned users
 		if (!function_exists('phpbb_get_banned_user_ids'))
 		{
-			include($phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $phpbb_container->getParameter('core.php_ext'));
+			include($this->phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $this->phpbb_container->getParameter('core.php_ext'));
 		}
 		$banned_users = phpbb_get_banned_user_ids($user_ids);
 
@@ -68,13 +68,13 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 		// Time to go through the queue and send emails
 		foreach ($this->queue as $notification)
 		{
-			if (in_array($notification->user_id, $banned_users))
+			$user = $this->service->get_user($notification->user_id);
+
+			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
 			{
 				continue;
 			}
 
-			$user = $this->service->get_user($notification->user_id);
-
 			$messenger->template('notification', $user['user_lang']);
 
 			$messenger->to($user['user_email'], $user['username']);
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index e060b5d658..3368b171df 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -101,7 +101,7 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 
 		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 
-		return $username . ' sent you a private message titled: ' . $this->get_data('message_subject');
+		return $this->phpbb_container->get('user')->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
 	}
 
 	/**
@@ -113,7 +113,7 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	{
 		$user_data = $this->service->get_user($this->get_data('from_user_id'));
 
-		return $user_data['username'] . ' sent you a private message titled: ' . $this->get_data('message_subject');
+		return $this->phpbb_container->get('user')->lang('NOTIFICATION_PM', $user_data['username'], $this->get_data('message_subject'));
 	}
 
 	/**
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 96faa0131c..04e269737e 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -96,7 +96,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 		}
 
-		return $username . ' posted in the topic ' . censor_text($this->get_data('topic_title'));
+		return $this->phpbb_container->get('user')->lang('NOTIFICATION_POST', $username, censor_text($this->get_data('topic_title')));
 	}
 
 	/**
@@ -112,10 +112,12 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		}
 		else
 		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
 			$username = $user_data['username'];
 		}
 
-		return $username . ' posted in the topic ' . censor_text($this->get_data('topic_title'));
+		return $this->phpbb_container->get('user')->lang('NOTIFICATION_POST', $username, censor_text($this->get_data('topic_title')));
 	}
 
 	/**
@@ -166,6 +168,8 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$this->set_data('post_username', $post['post_username']);
 
+		$this->set_data('forum_name', $post['forum_name']);
+
 		return parent::create_insert_array($post);
 	}
 }
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
new file mode 100644
index 0000000000..f58419a633
--- /dev/null
+++ b/phpBB/includes/notifications/type/topic.php
@@ -0,0 +1,185 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Topic notifications class
+* This class handles notifications for new topics
+*
+* @package notifications
+*/
+class phpbb_notifications_type_topic extends phpbb_notifications_type_base
+{
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'topic';
+	}
+
+	/**
+	* Get the id of the
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_id($post)
+	{
+		return $post['topic_id'];
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic)
+	{
+		$users = parent::_find_users_for_notification($phpbb_container, $topic['forum_id']);
+
+		if (!sizeof($users))
+		{
+			return array();
+		}
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $topic['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		foreach ($auth_read[$topic['forum_id']]['f_read'] as $user_id)
+		{
+			$notify_users[$user_id] = $users[$user_id];
+		}
+
+		return $notify_users;
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_formatted_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_TOPIC',
+			$username,
+			censor_text($this->get_data('topic_title')),
+			$this->get_data('forum_name')
+		);
+	}
+
+	/**
+	* Get the title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = $user_data['username'];
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_TOPIC',
+			$username,
+			censor_text($this->get_data('topic_title')),
+			$this->get_data('forum_name')
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "t{$this->item_id}");
+	}
+
+	/**
+	* Get the full url to this item
+	*
+	* @return string URL
+	*/
+	public function get_full_url()
+	{
+		return generate_board_url() . "/viewtopic.{$this->php_ext}?t{$this->item_id}";
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['poster_id']);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->item_id = $post['post_id'];
+
+		$this->set_data('poster_id', $post['poster_id']);
+
+		$this->set_data('topic_title', $post['topic_title']);
+
+		$this->set_data('post_username', $post['post_username']);
+
+		$this->set_data('forum_name', $post['forum_name']);
+
+		return parent::create_insert_array($post);
+	}
+}
-- 
cgit v1.2.1


From e09f25d59707fc842b073fa2909cefc3d16ecbf3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 14:55:40 -0500
Subject: [ticket/11103] Update notifications on post/topic edit

PHPBB3-11103
---
 phpBB/includes/functions_posting.php        | 19 ++++++++++++++++---
 phpBB/includes/notifications/service.php    |  6 +++---
 phpBB/includes/notifications/type/post.php  | 14 +++++++++++---
 phpBB/includes/notifications/type/topic.php |  8 ++++----
 4 files changed, 34 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6c5c4535a3..64840bfa51 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2220,12 +2220,18 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	}
 
 	// Send Notifications
-	if (($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_approval)
+	if ($post_approval)
 	{
 		$notifications = $phpbb_container->get('notifications');
 
 		switch ($mode)
 		{
+			case 'post' :
+				$notifications->add_notifications('topic', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+			break;
+
 			case 'reply' :
 			case 'quote' :
 				$notifications->add_notifications('post', array_merge($data, array(
@@ -2233,8 +2239,15 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				)));
 			break;
 
-			case 'post' :
-				$notifications->add_notifications('topic', array_merge($data, array(
+			case 'edit_topic' :
+			case 'edit_first_post' :
+			case 'edit' :
+			case 'edit_last_post' :
+				$notifications->update_notifications('topic', array_merge($data, array(
+					'post_username'		=> $username,
+					'topic_title'		=> $subject,
+				)));
+				$notifications->update_notifications('post', array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 463798fa07..112cbae3fd 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -58,10 +58,10 @@ class phpbb_notifications_service
 		// Merge default options
 		$options = array_merge(array(
 			'user_id'		=> $user->data['user_id'],
-			'limit'			=> 5,
-			'start'			=> 0,
 			'order_by'		=> 'time',
 			'order_dir'		=> 'DESC',
+			'limit'			=> 5,
+			'start'			=> 0,
 		), $options);
 
 		$notifications = $user_ids = array();
@@ -147,7 +147,7 @@ class phpbb_notifications_service
 			foreach ($methods as $method)
 			{
 				// setup the notification methods and add the notification to the queue
-				if ($method)
+				if ($method) // blank means we just insert it as a notification, but do not notify them by any other means
 				{
 					if (!isset($notification_methods[$method]))
 					{
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 04e269737e..efada4220e 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -96,7 +96,11 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 		}
 
-		return $this->phpbb_container->get('user')->lang('NOTIFICATION_POST', $username, censor_text($this->get_data('topic_title')));
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_POST',
+			$username,
+			censor_text($this->get_data('topic_title'))
+		);
 	}
 
 	/**
@@ -117,7 +121,11 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 			$username = $user_data['username'];
 		}
 
-		return $this->phpbb_container->get('user')->lang('NOTIFICATION_POST', $username, censor_text($this->get_data('topic_title')));
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_POST',
+			$username,
+			censor_text($this->get_data('topic_title'))
+		);
 	}
 
 	/**
@@ -166,7 +174,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$this->set_data('topic_title', $post['topic_title']);
 
-		$this->set_data('post_username', $post['post_username']);
+		$this->set_data('post_username', (($post['post_username'] != $this->phpbb_container->get('user')->data['username']) ? $post['post_username'] : ''));
 
 		$this->set_data('forum_name', $post['forum_name']);
 
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index f58419a633..ee8c21fd9c 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -137,7 +137,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*/
 	public function get_url()
 	{
-		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "t{$this->item_id}");
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "t={$this->item_id}");
 	}
 
 	/**
@@ -147,7 +147,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*/
 	public function get_full_url()
 	{
-		return generate_board_url() . "/viewtopic.{$this->php_ext}?t{$this->item_id}";
+		return generate_board_url() . "/viewtopic.{$this->php_ext}?t={$this->item_id}";
 	}
 
 	/**
@@ -170,13 +170,13 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*/
 	public function create_insert_array($post)
 	{
-		$this->item_id = $post['post_id'];
+		$this->item_id = $post['topic_id'];
 
 		$this->set_data('poster_id', $post['poster_id']);
 
 		$this->set_data('topic_title', $post['topic_title']);
 
-		$this->set_data('post_username', $post['post_username']);
+		$this->set_data('post_username', (($post['post_username'] != $this->phpbb_container->get('user')->data['username']) ? $post['post_username'] : ''));
 
 		$this->set_data('forum_name', $post['forum_name']);
 
-- 
cgit v1.2.1


From 5502f3c4aa30ce72131f2a55bcfa3db7a4059427 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 17:20:39 -0500
Subject: [ticket/11103] Restyle the notification list

Very rough (lots of inline CSS, very ugly)

PHPBB3-11103
---
 phpBB/includes/functions.php                |  2 +-
 phpBB/includes/functions_display.php        |  7 +++--
 phpBB/includes/mcp/mcp_queue.php            |  4 ++-
 phpBB/includes/notifications/service.php    | 14 +++++++++
 phpBB/includes/notifications/type/base.php  | 44 ++++++++++++++++++-----------
 phpBB/includes/notifications/type/pm.php    |  8 ++++++
 phpBB/includes/notifications/type/post.php  |  8 ++++++
 phpBB/includes/notifications/type/topic.php |  8 ++++++
 8 files changed, 73 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 7632ea1fcb..e5c7839894 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5096,7 +5096,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 	$phpbb_notifications = $phpbb_container->get('notifications');
 	foreach ($phpbb_notifications->load_notifications() as $notification)
 	{
-		$notification->display();
+		$template->assign_block_vars('notifications', $notification->prepare_for_display());
 	}
 
 	// application/xhtml+xml not used because of IE
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 8328b9ee7a..84cb47867e 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1319,10 +1319,11 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 * @param string $avatar_height Height of users avatar
 * @param string $alt Optional language string for alt tag within image, can be a language key or text
 * @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
+* @param string $custom_css Custom CSS class to apply to the image
 *
 * @return string Avatar image
 */
-function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false)
+function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false, $custom_css = '')
 {
 	global $user, $config, $phpbb_root_path, $phpEx;
 	global $phpbb_dispatcher;
@@ -1343,7 +1344,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
 	* @var	string	overwrite_avatar	If set, this string will be the avatar
 	* @since 3.1-A1
 	*/
-	$vars = array('avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'alt', 'ignore_config', 'overwrite_avatar');
+	$vars = array('avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'alt', 'ignore_config', 'overwrite_avatar', 'custom_css');
 	extract($phpbb_dispatcher->trigger_event('core.user_get_avatar', compact($vars)));
 
 	if ($overwrite_avatar)
@@ -1385,7 +1386,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
 	}
 
 	$avatar_img .= $avatar;
-	return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
+	return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" ' . ($custom_css ? 'class="' . $custom_css . '"' : '') . '/>';
 }
 
 /**
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index d5c431e478..1d9a2dfedc 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -451,7 +451,7 @@ function approve_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path;
-	global $request;
+	global $request, $phpbb_container;
 
 	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 	{
@@ -634,6 +634,8 @@ function approve_post($post_id_list, $id, $mode)
 		// Send out normal user notifications
 		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
+		$notifications = $phpbb_container->get('notifications');
+
 		foreach ($post_info as $post_id => $post_data)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 112cbae3fd..5dcfeb127b 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -210,6 +210,20 @@ class phpbb_notifications_service
 		$this->db->sql_query($sql);
 	}
 
+	public function add_subscription($item_type, $item_id, $method = '')
+	{
+		$this->get_item_type_class_name($item_type);
+
+		$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
+			$this->db->sql_build_array('INSERT', array(
+				'item_type'		=> $item_type,
+				'item_id'		=> (int) $item_id,
+				'user_id'		=> $this->phpbb_container->get('user')->data['user_id'],
+				'method'		=> $method,
+			));
+		$this->db->sql_query($sql);
+	}
+
 	/**
 	* Load user helper
 	*
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index df273f9e81..e60b20c449 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -104,28 +104,23 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	}
 
 	/**
-	* Output the notification to the template
-	*
-	* @param array $options Array of options
-	* 				template_block		Template block name to output to (Default: notifications)
+	* Prepare to output the notification to the template
 	*/
-	public function display($options = array())
+	public function prepare_for_display()
 	{
-		$template = $this->phpbb_container->get('template');
 		$user = $this->phpbb_container->get('user');
 
-		// Merge default options
-		$options = array_merge(array(
-			'template_block'		=> 'notifications',
-		), $options);
+		return array(
+			'AVATAR'			=> $this->get_avatar(),
+
+			'FORMATTED_TITLE'	=> $this->get_formatted_title(),
+			'TITLE'				=> $this->get_title(),
 
-		$template->assign_block_vars($options['template_block'], array(
-			'TITLE'		=> $this->get_formatted_title(),
-			'URL'		=> $this->get_url(),
-			'TIME'		=> $user->format_date($this->time),
+			'URL'				=> $this->get_url(),
+			'TIME'	   			=> $user->format_date($this->time),
 
-			'UNREAD'	=> $this->unread,
-		));
+			'UNREAD'			=> $this->unread,
+		);
 	}
 
 	/**
@@ -206,6 +201,13 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		return $rowset;
 	}
 
+	protected function _get_avatar($user_id)
+	{
+		$user = $this->service->get_user($user_id);
+
+		return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height'], $user['username'], false, 'notifications-avatar');
+	}
+
 	/**
 	* Get the formatted title of this notification (fall-back)
 	*
@@ -217,7 +219,7 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	}
 
 	/**
-	* URL to unsubscribe to this notification
+	* URL to unsubscribe to this notification (fall-back)
 	*
 	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
 	*/
@@ -225,4 +227,12 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	{
 		return false;
 	}
+
+	/**
+	* Get the user's avatar (fall-back)
+	*/
+	public function get_avatar()
+	{
+		return '';
+	}
 }
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 3368b171df..c78efcdd55 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -90,6 +90,14 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 		return $notify_users;
 	}
 
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('from_user_id'));
+	}
+
 	/**
 	* Get the HTML formatted title of this notification
 	*
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index efada4220e..f374114890 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -78,6 +78,14 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		return $notify_users;
 	}
 
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('poster_id'));
+	}
+
 	/**
 	* Get the HTML formatted title of this notification
 	*
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index ee8c21fd9c..51a95d5e19 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -78,6 +78,14 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 		return $notify_users;
 	}
 
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('poster_id'));
+	}
+
 	/**
 	* Get the HTML formatted title of this notification
 	*
-- 
cgit v1.2.1


From 2c31e82b60aebd650d288079b6dcd420e414e266 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 17:23:32 -0500
Subject: [ticket/11103] Coding guidelines (SQL Queries)

PHPBB3-11103
---
 phpBB/includes/notifications/service.php   | 9 ++++++---
 phpBB/includes/notifications/type/base.php | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 5dcfeb127b..e697374b0a 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -66,7 +66,8 @@ class phpbb_notifications_service
 
 		$notifications = $user_ids = array();
 
-		$sql = 'SELECT * FROM ' . NOTIFICATIONS_TABLE . '
+		$sql = 'SELECT *
+			FROM ' . NOTIFICATIONS_TABLE . '
 			WHERE user_id = ' . (int) $options['user_id'] . '
 				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 		$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
@@ -116,7 +117,8 @@ class phpbb_notifications_service
 
 		// Make sure not to send new notifications to users who've already been notified about this item
 		// This may happen when an item was added, but now new users are able to see the item
-		$sql = 'SELECT user_id FROM ' . NOTIFICATIONS_TABLE . "
+		$sql = 'SELECT user_id
+			FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 				AND item_id = " . (int) $item_id;
 		$result = $this->db->sql_query($sql);
@@ -239,7 +241,8 @@ class phpbb_notifications_service
 
 		if (sizeof($user_ids))
 		{
-			$sql = 'SELECT * FROM ' . USERS_TABLE . '
+			$sql = 'SELECT *
+				FROM ' . USERS_TABLE . '
 				WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
 			$result = $this->db->sql_query($sql);
 
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index e60b20c449..859ffb5116 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -183,7 +183,8 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 
 		$rowset = array();
 
-		$sql = 'SELECT * FROM ' . USER_NOTIFICATIONS_TABLE . "
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . static::get_item_type() . "'
 				AND item_id = " . (int) $item_id;
 		$result = $db->sql_query($sql);
-- 
cgit v1.2.1


From 12e46e48c80191d0e4ee134257375ea40c13da60 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 17:43:10 -0500
Subject: [ticket/11103] Remove notifications to posts/topics when they are
 deleted

PHPBB3-11103
---
 phpBB/includes/functions_admin.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 5e2ee8c8f6..6845ae14e3 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -619,6 +619,7 @@ function move_posts($post_ids, $topic_id, $auto_sync = true)
 function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_sync = true, $call_delete_posts = true)
 {
 	global $db, $config;
+	global $phpbb_container;
 
 	$approved_topics = 0;
 	$forum_ids = $topic_ids = array();
@@ -715,6 +716,10 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 		set_config_count('num_topics', $approved_topics * (-1), true);
 	}
 
+	// Delete notifications
+	$notifications = $phpbb_container->get('notifications');
+	$notifications->delete_notifications('topic', $topic_ids);
+
 	return $return;
 }
 
@@ -724,6 +729,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync = true, $post_count_sync = true, $call_delete_topics = true)
 {
 	global $db, $config, $phpbb_root_path, $phpEx, $auth, $user;
+	global $phpbb_container;
 
 	if ($where_type === 'range')
 	{
@@ -892,6 +898,10 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 		delete_topics('topic_id', $remove_topics, $auto_sync, $post_count_sync, false);
 	}
 
+	// Delete notifications
+	$notifications = $phpbb_container->get('notifications');
+	$notifications->delete_notifications('post', $post_ids);
+
 	return sizeof($post_ids);
 }
 
-- 
cgit v1.2.1


From 9b1de1e487e162f55085ce72e660c5b348615649 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Sep 2012 21:05:11 -0500
Subject: [ticket/11103] Add topic ID to view post URL

PHPBB3-11103
---
 phpBB/includes/notifications/type/post.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index f374114890..3568b9d478 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -143,7 +143,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	*/
 	public function get_url()
 	{
-		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "p={$this->item_id}#p{$this->item_id}");
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "t={$this->get_data('topic_id')}&amp;p={$this->item_id}#p{$this->item_id}");
 	}
 
 	/**
@@ -153,7 +153,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	*/
 	public function get_full_url()
 	{
-		return generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}";
+		return generate_board_url() . "/viewtopic.{$this->php_ext}?t={$this->get_data('topic_id')}&p={$this->item_id}#p{$this->item_id}";
 	}
 
 	/**
@@ -178,6 +178,8 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	{
 		$this->item_id = $post['post_id'];
 
+		$this->set_data('topic_id', $post['topic_id']);
+
 		$this->set_data('poster_id', $post['poster_id']);
 
 		$this->set_data('topic_title', $post['topic_title']);
-- 
cgit v1.2.1


From e14595621259edb093a8bb984a95747ede2041ff Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Sep 2012 21:23:24 -0500
Subject: [ticket/11103] Use the Topic/Forum Subscriptions system

Using the Topic/Forum Subscription system that already exists
is going to save many hours of work.

If it is desired, it can always be easily converted over to the new
USER_NOTIFICATIONS_TABLE later (for the same amount of work).

PHPBB3-11103
---
 phpBB/includes/notifications/type/post.php  | 16 ++++++++++++++--
 phpBB/includes/notifications/type/topic.php | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 3568b9d478..b951b79fa6 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -54,9 +54,21 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	*/
 	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
 	{
-		$users = parent::_find_users_for_notification($phpbb_container, $post['topic_id']);
+		// Let's continue to use the phpBB subscriptions system, at least for now.
+		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
+		//$users = parent::_find_users_for_notification($phpbb_container, $post['topic_id']);
 
-		if (!sizeof($users))
+		$db = $phpbb_container->get('dbal.conn');
+
+		$sql = 'SELECT user_id
+			FROM ' . TOPICS_WATCH_TABLE . '
+			WHERE topic_id = ' . (int) $post['topic_id'] . '
+				AND notify_status = ' . NOTIFY_YES;
+		$result = $db->sql_query($sql);
+		$users = $db->sql_fetchrowset($result);
+		$db->sql_freeresult($result);
+
+		if (empty($users))
 		{
 			return array();
 		}
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index 51a95d5e19..58a3740e3a 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -54,9 +54,21 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*/
 	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic)
 	{
-		$users = parent::_find_users_for_notification($phpbb_container, $topic['forum_id']);
+		// Let's continue to use the phpBB subscriptions system, at least for now.
+		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
+		//$users = parent::_find_users_for_notification($phpbb_container, $topic['forum_id']);
 
-		if (!sizeof($users))
+		$db = $phpbb_container->get('dbal.conn');
+
+		$sql = 'SELECT user_id
+			FROM ' . FORUMS_WATCH_TABLE . '
+			WHERE forum_id = ' . (int) $topic['forum_id'] . '
+				AND notify_status = ' . NOTIFY_YES;
+		$result = $db->sql_query($sql);
+		$users = $db->sql_fetchrowset($result);
+		$db->sql_freeresult($result);
+
+		if (empty($users))
 		{
 			return array();
 		}
-- 
cgit v1.2.1


From 3d1549d43f42631c7be8d90a1f215db239baac92 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Sep 2012 22:29:48 -0500
Subject: [ticket/11103] Add ability for notification types to load special
 data

For consistency, links to posts do not include topic_id. As is done in
viewtopic, do not include the topic_id when linking to a post

PHPBB3-11103
---
 phpBB/includes/notifications/service.php        | 17 ++++++
 phpBB/includes/notifications/type/base.php      | 70 +++++++++++++++++++++++++
 phpBB/includes/notifications/type/interface.php |  8 +++
 phpBB/includes/notifications/type/post.php      | 13 +++--
 4 files changed, 105 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index e697374b0a..b6255309c7 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -65,6 +65,7 @@ class phpbb_notifications_service
 		), $options);
 
 		$notifications = $user_ids = array();
+		$load_special = array();
 
 		$sql = 'SELECT *
 			FROM ' . NOTIFICATIONS_TABLE . '
@@ -78,14 +79,30 @@ class phpbb_notifications_service
 
 			$notification = new $item_type_class_name($this->phpbb_container, $row);
 
+			// Array of user_ids to query all at once
 			$user_ids = array_merge($user_ids, $notification->users_to_query());
 
+			// Some notification types also require querying additional tables themselves
+			if (!isset($load_special[$row['item_type']]))
+			{
+				$load_special[$row['item_type']] = array();
+			}
+			$load_special[$row['item_type']] = array_merge($load_special[$row['item_type']], $notification->get_load_special());
+
 			$notifications[] = $notification;
 		}
 		$this->db->sql_freeresult($result);
 
 		$this->load_users($user_ids);
 
+		// Allow each type to load it's own special items
+		foreach ($load_special as $item_type => $data)
+		{
+			$item_type_class_name = $this->get_item_type_class_name($item_type, true);
+
+			$item_type_class_name::load_special($this->phpbb_container, $data, $notifications);
+		}
+
 		return $notifications;
 	}
 
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 859ffb5116..47db2c4aa7 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -123,6 +123,55 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		);
 	}
 
+	/**
+	* Mark this item read
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_read($return = true)
+	{
+		return $this->mark(false, $return);
+	}
+
+	/**
+	* Mark this item unread
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_unread($return = true)
+	{
+		return $this->mark(true, $return);
+	}
+
+	/**
+	* Mark this item read/unread
+	*
+	* @param bool $unread Unread (True/False) (Default: False)
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	protected function mark($unread = true, $return = false)
+	{
+		$where = array(
+			'item_type = ' . $this->db->sql_escape($this->item_type),
+			'item_id = ' . (int) $this->item_id,
+			'user_id = ' . (int) $this->user_id,
+		);
+		$where = implode(' AND ' . $where);
+
+		if ($return)
+		{
+			return $where;
+		}
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+			SET unread = ' . (bool) $unread . '
+			WHERE ' . $where;
+		$this->db->sql_query($sql);
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
@@ -206,6 +255,11 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	{
 		$user = $this->service->get_user($user_id);
 
+		if (!function_exists('get_user_avatar'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+		}
+
 		return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height'], $user['username'], false, 'notifications-avatar');
 	}
 
@@ -236,4 +290,20 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	{
 		return '';
 	}
+
+	/**
+	* Get the special items to load (fall-back)
+	*/
+	public function get_load_special()
+	{
+		return array();
+	}
+
+	/**
+	* Load the special items (fall-back)
+	*/
+	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications)
+	{
+		return;
+	}
 }
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index c165815835..c1c0eb0b0c 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -37,5 +37,13 @@ interface phpbb_notifications_type_interface
 
 	public function get_unsubscribe_url($method);
 
+	public function mark_read($return);
+
+	public function mark_unread($return);
+
 	public function create_insert_array($type_data);
+
+	public function get_load_special();
+
+	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications);
 }
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index b951b79fa6..23358599a1 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -60,12 +60,19 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$db = $phpbb_container->get('dbal.conn');
 
+		/* todo
+		* find what type of notification they'd like to receive
+		* make sure not to send duplicate notifications
+		*/
 		$sql = 'SELECT user_id
 			FROM ' . TOPICS_WATCH_TABLE . '
 			WHERE topic_id = ' . (int) $post['topic_id'] . '
 				AND notify_status = ' . NOTIFY_YES;
 		$result = $db->sql_query($sql);
-		$users = $db->sql_fetchrowset($result);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$users[$row['user_id']] = array('');
+		}
 		$db->sql_freeresult($result);
 
 		if (empty($users))
@@ -155,7 +162,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	*/
 	public function get_url()
 	{
-		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "t={$this->get_data('topic_id')}&amp;p={$this->item_id}#p{$this->item_id}");
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "p={$this->item_id}#p{$this->item_id}");
 	}
 
 	/**
@@ -165,7 +172,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	*/
 	public function get_full_url()
 	{
-		return generate_board_url() . "/viewtopic.{$this->php_ext}?t={$this->get_data('topic_id')}&p={$this->item_id}#p{$this->item_id}";
+		return generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}";
 	}
 
 	/**
-- 
cgit v1.2.1


From 48cb98045ecd93f05b51aa528cc5248493b47c98 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Sep 2012 22:38:23 -0500
Subject: [ticket/11103] Correctly find users for notification for new topics

Append the forum_id to the URL to view the new topic in the notification

PHPBB3-11103
---
 phpBB/includes/notifications/type/post.php  |  2 ++
 phpBB/includes/notifications/type/topic.php | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 23358599a1..4fd4128168 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -60,6 +60,8 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$db = $phpbb_container->get('dbal.conn');
 
+		$users = array();
+
 		/* todo
 		* find what type of notification they'd like to receive
 		* make sure not to send duplicate notifications
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index 58a3740e3a..209d23b823 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -60,12 +60,21 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 
 		$db = $phpbb_container->get('dbal.conn');
 
+		$users = array();
+
+		/* todo
+		* find what type of notification they'd like to receive
+		* make sure not to send duplicate notifications
+		*/
 		$sql = 'SELECT user_id
 			FROM ' . FORUMS_WATCH_TABLE . '
 			WHERE forum_id = ' . (int) $topic['forum_id'] . '
 				AND notify_status = ' . NOTIFY_YES;
 		$result = $db->sql_query($sql);
-		$users = $db->sql_fetchrowset($result);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$users[$row['user_id']] = array('');
+		}
 		$db->sql_freeresult($result);
 
 		if (empty($users))
@@ -157,7 +166,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*/
 	public function get_url()
 	{
-		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "t={$this->item_id}");
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f={$this->get_data('forum_id')}&amp;t={$this->item_id}");
 	}
 
 	/**
@@ -167,7 +176,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*/
 	public function get_full_url()
 	{
-		return generate_board_url() . "/viewtopic.{$this->php_ext}?t={$this->item_id}";
+		return generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_id}";
 	}
 
 	/**
@@ -200,6 +209,8 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 
 		$this->set_data('forum_name', $post['forum_name']);
 
+		$this->set_data('forum_id', $post['forum_id']);
+
 		return parent::create_insert_array($post);
 	}
 }
-- 
cgit v1.2.1


From 97fde62b1470f04da17335674bceab3360542e3e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Sep 2012 23:03:26 -0500
Subject: [ticket/11103] Jabber notification method

PHPBB3-11103
---
 phpBB/includes/notifications/method/email.php     | 11 +++++--
 phpBB/includes/notifications/method/interface.php |  2 ++
 phpBB/includes/notifications/method/jabber.php    | 38 +++++++++++++++++++----
 3 files changed, 43 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index d6468c9dc3..1bcea13d92 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -23,11 +23,18 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notifications_method_email extends phpbb_notifications_method_base
 {
+	/**
+	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
+	*
+	* @var mixed
+	*/
+	protected $notify_method = NOTIFY_EMAIL;
+
 	/**
 	* Is this method available for the user?
 	* This is checked on the notifications options
 	*/
-	public static function is_available()
+	public function is_available()
 	{
 		// Email is always available
 		return true;
@@ -89,7 +96,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 				'U_UNSUBSCRIBE'		=> $notification->get_unsubscribe_url(),
 			));
 
-			$messenger->send('email');
+			$messenger->send($this->notify_method);
 		}
 
 		// Save the queue in the messenger class (has to be called or these emails could be lost?)
diff --git a/phpBB/includes/notifications/method/interface.php b/phpBB/includes/notifications/method/interface.php
index 7d7f3abcd0..820cf4fc12 100644
--- a/phpBB/includes/notifications/method/interface.php
+++ b/phpBB/includes/notifications/method/interface.php
@@ -21,5 +21,7 @@ if (!defined('IN_PHPBB'))
 */
 interface phpbb_notifications_method_interface
 {
+	public function is_available();
+
 	public function notify();
 }
diff --git a/phpBB/includes/notifications/method/jabber.php b/phpBB/includes/notifications/method/jabber.php
index 15614db96c..738400a50e 100644
--- a/phpBB/includes/notifications/method/jabber.php
+++ b/phpBB/includes/notifications/method/jabber.php
@@ -17,20 +17,46 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Jabber notification method class
-* This class handles sending Jabber notifications for notifications
+* This class handles sending Jabber messages for notifications
 *
 * @package notifications
 */
-class phpbb_notifications_method_jabber extends phpbb_notifications_method_base
+class phpbb_notifications_method_jabber extends phpbb_notifications_method_email
 {
-	public static function is_available()
+	/**
+	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
+	*
+	* @var mixed
+	*/
+	protected $notify_method = NOTIFY_IM;
+
+	/**
+	* Is this method available for the user?
+	* This is checked on the notifications options
+	*/
+	public function is_available()
+	{
+		return ($this->global_available() && $this->phpbb_container->get('user')->data['jabber']);
+	}
+
+	/**
+	* Is this method available at all?
+	* This is checked before notifications are sent
+	*/
+	public function global_available()
 	{
-		// Is jabber enabled & can this user receive jabber messages?
-		return false; // for now
+		$config = $this->phpbb_container->get('config');
+
+		return ($config['jab_enable'] && @extension_loaded('xml'));
 	}
 
 	public function notify()
 	{
-		// message the user
+		if (!$this->global_available())
+		{
+			return;
+		}
+
+		return parent::notify();
 	}
 }
-- 
cgit v1.2.1


From 207bbdf48cb05abfb611f238e4ba07131131c74d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Sep 2012 23:55:29 -0500
Subject: [ticket/11103] Quote notifications

PHPBB3-11103
---
 phpBB/includes/functions_posting.php        |   9 ++
 phpBB/includes/notifications/service.php    |   2 +-
 phpBB/includes/notifications/type/quote.php | 149 ++++++++++++++++++++++++++++
 3 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/includes/notifications/type/quote.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 64840bfa51..ff0a59a4e3 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2230,6 +2230,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$notifications->add_notifications('topic', array_merge($data, array(
 					'post_username'		=> $username,
 				)));
+				$notifications->add_notifications('quote', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
 			break;
 
 			case 'reply' :
@@ -2237,6 +2240,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$notifications->add_notifications('post', array_merge($data, array(
 					'post_username'		=> $username,
 				)));
+				$notifications->add_notifications('quote', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
 			break;
 
 			case 'edit_topic' :
@@ -2250,6 +2256,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$notifications->update_notifications('post', array_merge($data, array(
 					'post_username'		=> $username,
 				)));
+				$notifications->add_notifications('quote', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
 			break;
 		}
 	}
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index b6255309c7..0f7752446a 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -130,7 +130,7 @@ class phpbb_notifications_service
 		$notify_users = $item_type_class_name::find_users_for_notification($this->phpbb_container, $data);
 
 		// Never send notifications to the anonymous user or the current user!
-		$notify_users = array_diff($notify_users, array(ANONYMOUS, $this->phpbb_container->get('user')->data['user_id']));
+		unset($notify_users[ANONYMOUS], $notify_users[$this->phpbb_container->get('user')->data['user_id']]);
 
 		// Make sure not to send new notifications to users who've already been notified about this item
 		// This may happen when an item was added, but now new users are able to see the item
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
new file mode 100644
index 0000000000..8f93c67de1
--- /dev/null
+++ b/phpBB/includes/notifications/type/quote.php
@@ -0,0 +1,149 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post tagging notifications class
+* This class handles notifications for tagging users in a post (ex: @EXreaction)
+*
+* @package notifications
+*/
+class phpbb_notifications_type_quote extends phpbb_notifications_type_post
+{
+	protected static $regular_expression_match = '#\[quote=&quot;(.+?)&quot;:#';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'quote';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	{
+		$db = $phpbb_container->get('dbal.conn');
+
+		$usernames = false;
+		preg_match_all(self::$regular_expression_match, $post['message'], $usernames);
+
+		if (empty($usernames[1]))
+		{
+			return array();
+		}
+
+		$usernames[1] = array_unique($usernames[1]);
+
+		$usernames = array_map('utf8_clean_string', $usernames[1]);
+
+		$users = array();
+
+		/* todo
+		* find what type of notification they'd like to receive
+		*/
+		$sql = 'SELECT user_id
+			FROM ' . USERS_TABLE . '
+			WHERE ' . $db->sql_in_set('username_clean', $usernames);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$users[$row['user_id']] = array('');
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($users))
+		{
+			return array();
+		}
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		{
+			$notify_users[$user_id] = $users[$user_id];
+		}
+
+		return $notify_users;
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_formatted_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_QUOTE',
+			$username,
+			censor_text($this->get_data('topic_title'))
+		);
+	}
+
+	/**
+	* Get the title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = $user_data['username'];
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_QUOTE',
+			$username,
+			censor_text($this->get_data('topic_title'))
+		);
+	}
+}
-- 
cgit v1.2.1


From 44aa773ce07d81d4585f3a24a728f9b445c4c098 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 14:55:14 -0500
Subject: [ticket/11103] Allow notification types to override update
 functionality

This is needed for quote editing because we need to check if the users
are still all quoted or notify new quotes appropriately.

PHPBB3-11103
---
 phpBB/includes/functions_posting.php        |  2 +-
 phpBB/includes/notifications/service.php    | 39 ++++++++++++++++----
 phpBB/includes/notifications/type/pm.php    |  2 +-
 phpBB/includes/notifications/type/post.php  |  2 +-
 phpBB/includes/notifications/type/quote.php | 55 +++++++++++++++++++++++++++++
 phpBB/includes/notifications/type/topic.php |  2 +-
 6 files changed, 92 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index ff0a59a4e3..26d9b81896 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2256,7 +2256,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$notifications->update_notifications('post', array_merge($data, array(
 					'post_username'		=> $username,
 				)));
-				$notifications->add_notifications('quote', array_merge($data, array(
+				$notifications->update_notifications('quote', array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 0f7752446a..10af5b349b 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -110,7 +110,6 @@ class phpbb_notifications_service
 	* Add a notification
 	*
 	* @param string $item_type Type identifier
-	* @param int $item_id Identifier within the type
 	* @param array $data Data specific for this type that will be inserted
 	*/
 	public function add_notifications($item_type, $data)
@@ -120,20 +119,38 @@ class phpbb_notifications_service
 		$item_id = $item_type_class_name::get_item_id($data);
 
 		// Update any existing notifications for this item
-		$this->update_notifications($item_type, $item_id, $data);
-
-		$notify_users = $user_ids = array();
-		$notification_objects = $notification_methods = array();
-		$new_rows = array();
+		$this->update_notifications($item_type, $data);
 
 		// find out which users want to receive this type of notification
 		$notify_users = $item_type_class_name::find_users_for_notification($this->phpbb_container, $data);
 
+		$this->add_notifications_for_users($item_type, $data, $notify_users);
+	}
+
+	/**
+	* Add a notification for specific users
+	*
+	* @param string $item_type Type identifier
+	* @param array $data Data specific for this type that will be inserted
+	* @param array $notify_users User list to notify
+	*/
+	public function add_notifications_for_users($item_type, $data, $notify_users)
+	{
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
+
+		$item_id = $item_type_class_name::get_item_id($data);
+
+		$user_ids = array();
+		$notification_objects = $notification_methods = array();
+		$new_rows = array();
+
 		// Never send notifications to the anonymous user or the current user!
 		unset($notify_users[ANONYMOUS], $notify_users[$this->phpbb_container->get('user')->data['user_id']]);
 
 		// Make sure not to send new notifications to users who've already been notified about this item
 		// This may happen when an item was added, but now new users are able to see the item
+		// todo Users should not receive notifications from multiple events from the same item (ex: for a topic reply with a quote including your username)
+		//		Probably should be handled within each type?
 		$sql = 'SELECT user_id
 			FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
@@ -202,6 +219,16 @@ class phpbb_notifications_service
 	{
 		$item_type_class_name = $this->get_item_type_class_name($item_type);
 
+		// Allow the notifications class to over-ride the update_notifications functionality
+		if (method_exists($item_type_class_name, 'update_notifications'))
+		{
+			// Return False to over-ride the rest of the update
+			if ($item_type_class_name::update_notifications($this->phpbb_container, $data) === false)
+			{
+				return;
+			}
+		}
+
 		$item_id = $item_type_class_name::get_item_id($data);
 
 		$notification = new $item_type_class_name($this->phpbb_container);
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index c78efcdd55..8ea1045641 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -41,7 +41,7 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	*/
 	public static function get_item_id($pm)
 	{
-		return $pm['msg_id'];
+		return (int) $pm['msg_id'];
 	}
 
 	/**
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 4fd4128168..d5759111cf 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -41,7 +41,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	*/
 	public static function get_item_id($post)
 	{
-		return $post['post_id'];
+		return (int) $post['post_id'];
 	}
 
 	/**
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
index 8f93c67de1..e17769acea 100644
--- a/phpBB/includes/notifications/type/quote.php
+++ b/phpBB/includes/notifications/type/quote.php
@@ -146,4 +146,59 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 			censor_text($this->get_data('topic_title'))
 		);
 	}
+
+	/**
+	* Update a notification
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $data Data specific for this type that will be updated
+	*/
+	public static function update_notifications(ContainerBuilder $phpbb_container, $post)
+	{
+		$service = $phpbb_container->get('notifications');
+		$db = $phpbb_container->get('dbal.conn');
+
+		$old_notifications = array();
+		$sql = 'SELECT user_id
+			FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND item_id = " . self::get_item_id($post);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$old_notifications[] = $row['user_id'];
+		}
+		$db->sql_freeresult($result);
+
+		// Find the new users to notify
+		$notifications = self::find_users_for_notification($phpbb_container, $post);
+
+		// Find the notifications we must delete
+		$remove_notifications = array_diff($old_notifications, array_keys($notifications));
+
+		// Find the notifications we must add
+		$add_notifications = array();
+		foreach (array_diff(array_keys($notifications), $old_notifications) as $user_id)
+		{
+			$add_notifications[$user_id] = $notifications[$user_id];
+		}
+
+		var_dump($old_notifications, $notifications, $remove_notifications, $add_notifications);
+
+		// Add the necessary notifications
+		$service->add_notifications_for_users(self::get_item_type(), $post, $add_notifications);
+
+		// Remove the necessary notifications
+		if (!empty($remove_notifications))
+		{
+			$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
+				WHERE item_type = '" . self::get_item_type() . "'
+					AND item_id = " . self::get_item_id($post) . '
+					AND ' . $db->sql_in_set('user_id', $remove_notifications);
+			$db->sql_query($sql);
+		}
+
+		// return true to continue with the update code in the notifications service (this will update the rest of the notifications)
+		return true;
+	}
 }
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index 209d23b823..cb7bfdbb8f 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -41,7 +41,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*/
 	public static function get_item_id($post)
 	{
-		return $post['topic_id'];
+		return (int) $post['topic_id'];
 	}
 
 	/**
-- 
cgit v1.2.1


From fb0ed78c8fffe95d40e47c8dd27d44973eba88ae Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 15:59:13 -0500
Subject: [ticket/11103] Store the item's parent id for marking things read

Mark topics/posts read from the markread() function.

Identify unread items by a grey background in the header (for now)

PHPBB3-11103
---
 phpBB/includes/functions.php                |  18 +++-
 phpBB/includes/notifications/service.php    |  51 +++++++++-
 phpBB/includes/notifications/type/base.php  | 150 ++++++++++++++++------------
 phpBB/includes/notifications/type/pm.php    |  13 ++-
 phpBB/includes/notifications/type/post.php  |  16 ++-
 phpBB/includes/notifications/type/quote.php |   2 -
 phpBB/includes/notifications/type/topic.php |  20 ++--
 7 files changed, 183 insertions(+), 87 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e5c7839894..3d3dd1f5bc 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1285,15 +1285,20 @@ function phpbb_timezone_select($user, $default = '', $truncate = false)
 function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $user_id = 0)
 {
 	global $db, $user, $config;
-	global $request;
+	global $request, $phpbb_container;
 
 	if ($mode == 'all')
 	{
 		if ($forum_id === false || !sizeof($forum_id))
 		{
+			// Mark all forums read (index page)
+
+			// Mark all topic notifications read for this user
+			$notifications = $phpbb_container->get('notifications');
+			$notifications->mark_notifications_read('topic', false, $user->data['user_id'], $post_time);
+
 			if ($config['load_db_lastread'] && $user->data['is_registered'])
 			{
-				// Mark all forums read (index page)
 				$db->sql_query('DELETE FROM ' . TOPICS_TRACK_TABLE . " WHERE user_id = {$user->data['user_id']}");
 				$db->sql_query('DELETE FROM ' . FORUMS_TRACK_TABLE . " WHERE user_id = {$user->data['user_id']}");
 				$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_lastmark = ' . time() . " WHERE user_id = {$user->data['user_id']}");
@@ -1330,6 +1335,10 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			$forum_id = array($forum_id);
 		}
 
+		// Mark topic notifications read for this user in this forum
+		$notifications = $phpbb_container->get('notifications');
+		$notifications->mark_notifications_read_by_parent('topic', $forum_id, $user->data['user_id'], $post_time);
+
 		// Add 0 to forums array to mark global announcements correctly
 		// $forum_id[] = 0;
 
@@ -1424,6 +1433,11 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			return;
 		}
 
+		// Mark post notifications read for this user in this topic
+		$notifications = $phpbb_container->get('notifications');
+		$notifications->mark_notifications_read_by_parent('post', $topic_id, $user->data['user_id'], $post_time);
+		$notifications->mark_notifications_read_by_parent('quote', $topic_id, $user->data['user_id'], $post_time);
+
 		if ($config['load_db_lastread'] && $user->data['is_registered'])
 		{
 			$sql = 'UPDATE ' . TOPICS_TRACK_TABLE . '
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 10af5b349b..8be8ae2a95 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -106,6 +106,52 @@ class phpbb_notifications_service
 		return $notifications;
 	}
 
+	/**
+	* Mark notifications read
+	*
+	* @param string $item_type item type
+	* @param bool|int|array $item_id Item id or array of item ids. False to mark read for all item ids
+	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
+	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
+	*/
+	public function mark_notifications_read($item_type, $item_id, $user_id, $time = false)
+	{
+		$time = ($time) ?: time();
+
+		$this->get_item_type_class_name($item_type);
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+			SET unread = 0
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND time <= " . $time .
+				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '') .
+				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Mark notifications read from a parent identifier
+	*
+	* @param string $item_type item type
+	* @param bool|int|array $item_parent_id Item parent id or array of item parent ids. False to mark read for all item parent ids
+	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
+	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
+	*/
+	public function mark_notifications_read_by_parent($item_type, $item_parent_id, $user_id, $time = false)
+	{
+		$time = ($time) ?: time();
+
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+			SET unread = 0
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND time <= " . $time .
+				(($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') .
+				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
+		$this->db->sql_query($sql);
+	}
+
 	/**
 	* Add a notification
 	*
@@ -118,9 +164,6 @@ class phpbb_notifications_service
 
 		$item_id = $item_type_class_name::get_item_id($data);
 
-		// Update any existing notifications for this item
-		$this->update_notifications($item_type, $data);
-
 		// find out which users want to receive this type of notification
 		$notify_users = $item_type_class_name::find_users_for_notification($this->phpbb_container, $data);
 
@@ -250,6 +293,8 @@ class phpbb_notifications_service
 	*/
 	public function delete_notifications($item_type, $item_id)
 	{
+		$this->get_item_type_class_name($item_type);
+
 		$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 				AND " . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id);
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 47db2c4aa7..daca3b43cb 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -40,6 +40,7 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	* Indentification data
 	* item_type
 	* item_id
+	* item_parent_id // Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
 	* user_id
 	* unread
 	*
@@ -145,33 +146,6 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		return $this->mark(true, $return);
 	}
 
-	/**
-	* Mark this item read/unread
-	*
-	* @param bool $unread Unread (True/False) (Default: False)
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
-	*/
-	protected function mark($unread = true, $return = false)
-	{
-		$where = array(
-			'item_type = ' . $this->db->sql_escape($this->item_type),
-			'item_id = ' . (int) $this->item_id,
-			'user_id = ' . (int) $this->user_id,
-		);
-		$where = implode(' AND ' . $where);
-
-		if ($return)
-		{
-			return $where;
-		}
-
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
-			SET unread = ' . (bool) $unread . '
-			WHERE ' . $where;
-		$this->db->sql_query($sql);
-	}
-
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
@@ -184,11 +158,14 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	{
 		// Defaults
 		$data = array_merge(array(
-			'item_type'		=> $this->get_item_type(),
-			'time'			=> time(),
-			'unread'		=> true,
+			'item_id'				=> static::get_item_id($type_data),
+			'item_type'	   			=> $this->get_item_type(),
+			'item_parent_id'		=> static::get_item_parent_id($type_data),
 
-			'data'			=> array(),
+			'time'					=> time(),
+			'unread'				=> true,
+
+			'data'					=> array(),
 		), $this->data);
 
 		$data['data'] = serialize($data['data']);
@@ -218,6 +195,58 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		return $data;
 	}
 
+	/**
+	* -------------- Fall back functions -------------------
+	*/
+
+	/**
+	* Get the formatted title of this notification (fall-back)
+	*
+	* @return string
+	*/
+	public function get_formatted_title()
+	{
+		return $this->get_title();
+	}
+
+	/**
+	* URL to unsubscribe to this notification (fall-back)
+	*
+	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
+	*/
+	public function get_unsubscribe_url($method = false)
+	{
+		return false;
+	}
+
+	/**
+	* Get the user's avatar (fall-back)
+	*/
+	public function get_avatar()
+	{
+		return '';
+	}
+
+	/**
+	* Get the special items to load (fall-back)
+	*/
+	public function get_load_special()
+	{
+		return array();
+	}
+
+	/**
+	* Load the special items (fall-back)
+	*/
+	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications)
+	{
+		return;
+	}
+
+	/**
+	* -------------- Helper functions -------------------
+	*/
+
 	/**
 	* Find the users who want to receive notifications (helper)
 	*
@@ -251,6 +280,12 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		return $rowset;
 	}
 
+	/**
+	* Get avatar helper
+	*
+	* @param int $user_id
+	* @return string
+	*/
 	protected function _get_avatar($user_id)
 	{
 		$user = $this->service->get_user($user_id);
@@ -264,46 +299,29 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	}
 
 	/**
-	* Get the formatted title of this notification (fall-back)
+	* Mark this item read/unread helper
 	*
+	* @param bool $unread Unread (True/False) (Default: False)
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
 	* @return string
 	*/
-	public function get_formatted_title()
-	{
-		return $this->get_title();
-	}
-
-	/**
-	* URL to unsubscribe to this notification (fall-back)
-	*
-	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
-	*/
-	public function get_unsubscribe_url($method = false)
-	{
-		return false;
-	}
-
-	/**
-	* Get the user's avatar (fall-back)
-	*/
-	public function get_avatar()
+	protected function mark($unread = true, $return = false)
 	{
-		return '';
-	}
+		$where = array(
+			'item_type = ' . $this->db->sql_escape($this->item_type),
+			'item_id = ' . (int) $this->item_id,
+			'user_id = ' . (int) $this->user_id,
+		);
+		$where = implode(' AND ' . $where);
 
-	/**
-	* Get the special items to load (fall-back)
-	*/
-	public function get_load_special()
-	{
-		return array();
-	}
+		if ($return)
+		{
+			return $where;
+		}
 
-	/**
-	* Load the special items (fall-back)
-	*/
-	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications)
-	{
-		return;
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+			SET unread = ' . (bool) $unread . '
+			WHERE ' . $where;
+		$this->db->sql_query($sql);
 	}
 }
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 8ea1045641..89f338f3f9 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -44,6 +44,17 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 		return (int) $pm['msg_id'];
 	}
 
+	/**
+	* Get the id of the parent
+	*
+	* @param array $pm The data from the pm
+	*/
+	public static function get_item_parent_id($pm)
+	{
+		// No parent
+		return 0;
+	}
+
 	/**
 	* Find the users who want to receive notifications
 	*
@@ -164,8 +175,6 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	*/
 	public function create_insert_array($pm)
 	{
-		$this->item_id = $pm['msg_id'];
-
 		$this->set_data('from_user_id', $pm['from_user_id']);
 
 		$this->set_data('message_subject', $pm['message_subject']);
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index d5759111cf..324a40888d 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -35,7 +35,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	}
 
 	/**
-	* Get the id of the
+	* Get the id of the item
 	*
 	* @param array $post The data from the post
 	*/
@@ -44,6 +44,16 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		return (int) $post['post_id'];
 	}
 
+	/**
+	* Get the id of the parent
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_parent_id($post)
+	{
+		return (int) $post['topic_id'];
+	}
+
 	/**
 	* Find the users who want to receive notifications
 	*
@@ -197,10 +207,6 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	*/
 	public function create_insert_array($post)
 	{
-		$this->item_id = $post['post_id'];
-
-		$this->set_data('topic_id', $post['topic_id']);
-
 		$this->set_data('poster_id', $post['poster_id']);
 
 		$this->set_data('topic_title', $post['topic_title']);
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
index e17769acea..11186f3685 100644
--- a/phpBB/includes/notifications/type/quote.php
+++ b/phpBB/includes/notifications/type/quote.php
@@ -183,8 +183,6 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 			$add_notifications[$user_id] = $notifications[$user_id];
 		}
 
-		var_dump($old_notifications, $notifications, $remove_notifications, $add_notifications);
-
 		// Add the necessary notifications
 		$service->add_notifications_for_users(self::get_item_type(), $post, $add_notifications);
 
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index cb7bfdbb8f..0fce65a0cf 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -35,7 +35,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	}
 
 	/**
-	* Get the id of the
+	* Get the id of the item
 	*
 	* @param array $post The data from the post
 	*/
@@ -44,6 +44,16 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 		return (int) $post['topic_id'];
 	}
 
+	/**
+	* Get the id of the parent
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_parent_id($post)
+	{
+		return (int) $post['forum_id'];
+	}
+
 	/**
 	* Find the users who want to receive notifications
 	*
@@ -166,7 +176,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*/
 	public function get_url()
 	{
-		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f={$this->get_data('forum_id')}&amp;t={$this->item_id}");
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f={$this->item_parent_id}&amp;t={$this->item_id}");
 	}
 
 	/**
@@ -176,7 +186,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*/
 	public function get_full_url()
 	{
-		return generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_id}";
+		return generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}";
 	}
 
 	/**
@@ -199,8 +209,6 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*/
 	public function create_insert_array($post)
 	{
-		$this->item_id = $post['topic_id'];
-
 		$this->set_data('poster_id', $post['poster_id']);
 
 		$this->set_data('topic_title', $post['topic_title']);
@@ -209,8 +217,6 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 
 		$this->set_data('forum_name', $post['forum_name']);
 
-		$this->set_data('forum_id', $post['forum_id']);
-
 		return parent::create_insert_array($post);
 	}
 }
-- 
cgit v1.2.1


From f083c6d7765b63ad0179bc82a3d9f0abbf08637c Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 16:15:15 -0500
Subject: [ticket/11103] Mark all post/quote notifications read when marking
 topics

Mark forum read marks all topics read, so do so properly for notifications

PHPBB3-11103
---
 phpBB/includes/functions.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 3d3dd1f5bc..b996fef292 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1339,6 +1339,21 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		$notifications = $phpbb_container->get('notifications');
 		$notifications->mark_notifications_read_by_parent('topic', $forum_id, $user->data['user_id'], $post_time);
 
+		// Mark all post/quote notifications read for this user in this forum
+		$topic_ids = array();
+		$sql = 'SELECT topic_id
+			FROM ' . TOPICS_TABLE . '
+			WHERE ' . $db->sql_in_set('forum_id', $forum_id);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$topic_ids[] = $row['topic_id'];
+		}
+		$db->sql_freeresult($result);
+
+		$notifications->mark_notifications_read_by_parent('post', $topic_ids, $user->data['user_id'], $post_time);
+		$notifications->mark_notifications_read_by_parent('quote', $topic_ids, $user->data['user_id'], $post_time);
+
 		// Add 0 to forums array to mark global announcements correctly
 		// $forum_id[] = 0;
 
-- 
cgit v1.2.1


From 40bc3b1f19af09f974e2c5bd6c113b78bcfe4f0b Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 16:20:15 -0500
Subject: [ticket/11103] Mark Private Messages as read

PHPBB3-11103
---
 phpBB/includes/functions_privmsgs.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 88c5bd8e2a..dbf5df787f 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -876,7 +876,11 @@ function update_unread_status($unread, $msg_id, $user_id, $folder_id)
 		return;
 	}
 
-	global $db, $user;
+	global $db, $user, $phpbb_container;
+
+	// Mark the PM as read
+	$notifications = $phpbb_container->get('notifications');
+	$notifications->mark_notifications_read('pm', $msg_id, $user_id);
 
 	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
 		SET pm_unread = 0
-- 
cgit v1.2.1


From 1ab0c469e253df0e01f358a4a86e1b6df290d740 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 16:24:50 -0500
Subject: [ticket/11103] Delete notifications for PMs deleted by
 phpbb_delete_user_pms

PHPBB3-11103
---
 phpBB/includes/functions_privmsgs.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index dbf5df787f..133b6fc9bc 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1146,6 +1146,7 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 function phpbb_delete_user_pms($user_id)
 {
 	global $db, $user, $phpbb_root_path, $phpEx;
+	global $phpbb_container;
 
 	$user_id = (int) $user_id;
 
@@ -1262,6 +1263,10 @@ function phpbb_delete_user_pms($user_id)
 				WHERE folder_id = ' . PRIVMSGS_NO_BOX . '
 					AND ' . $db->sql_in_set('msg_id', $delivered_msg);
 			$db->sql_query($sql);
+
+			// Delete Notifications
+			$phpbb_notifications = $phpbb_container->get('notifications');
+			$phpbb_notifications->delete_notifications('pm', $delivered_msg);
 		}
 
 		if (!empty($undelivered_msg))
@@ -1273,6 +1278,10 @@ function phpbb_delete_user_pms($user_id)
 			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
 				WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
 			$db->sql_query($sql);
+
+			// Delete Notifications
+			$phpbb_notifications = $phpbb_container->get('notifications');
+			$phpbb_notifications->delete_notifications('pm', $undelivered_msg);
 		}
 	}
 
@@ -1315,6 +1324,10 @@ function phpbb_delete_user_pms($user_id)
 			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
 				WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
 			$db->sql_query($sql);
+
+			// Delete Notifications
+			$phpbb_notifications = $phpbb_container->get('notifications');
+			$phpbb_notifications->delete_notifications('pm', $delete_ids);
 		}
 	}
 
-- 
cgit v1.2.1


From ed1ec8e720a7ec3c1270cd631cc37e531f315f26 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 16:54:20 -0500
Subject: [ticket/11103] Add/Update/Mark Read functions accept an array for the
 type

This saves a lot of code in some areas (where the same data is sent, just
for different types)

Notifications for bookmarks

PHPBB3-11103
---
 phpBB/includes/functions.php                   |  6 +-
 phpBB/includes/functions_posting.php           | 16 ++---
 phpBB/includes/mcp/mcp_queue.php               |  2 +-
 phpBB/includes/notifications/service.php       | 60 +++++++++++++++--
 phpBB/includes/notifications/type/bookmark.php | 92 ++++++++++++++++++++++++++
 phpBB/includes/notifications/type/post.php     | 11 ++-
 phpBB/includes/notifications/type/quote.php    | 66 ++++--------------
 7 files changed, 177 insertions(+), 76 deletions(-)
 create mode 100644 phpBB/includes/notifications/type/bookmark.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b996fef292..aec7759f19 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1351,8 +1351,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		}
 		$db->sql_freeresult($result);
 
-		$notifications->mark_notifications_read_by_parent('post', $topic_ids, $user->data['user_id'], $post_time);
-		$notifications->mark_notifications_read_by_parent('quote', $topic_ids, $user->data['user_id'], $post_time);
+		$notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_ids, $user->data['user_id'], $post_time);
 
 		// Add 0 to forums array to mark global announcements correctly
 		// $forum_id[] = 0;
@@ -1450,8 +1449,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 
 		// Mark post notifications read for this user in this topic
 		$notifications = $phpbb_container->get('notifications');
-		$notifications->mark_notifications_read_by_parent('post', $topic_id, $user->data['user_id'], $post_time);
-		$notifications->mark_notifications_read_by_parent('quote', $topic_id, $user->data['user_id'], $post_time);
+		$notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_id, $user->data['user_id'], $post_time);
 
 		if ($config['load_db_lastread'] && $user->data['is_registered'])
 		{
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 26d9b81896..56f84562f7 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2227,20 +2227,14 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post' :
-				$notifications->add_notifications('topic', array_merge($data, array(
-					'post_username'		=> $username,
-				)));
-				$notifications->add_notifications('quote', array_merge($data, array(
+				$notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
 
 			case 'reply' :
 			case 'quote' :
-				$notifications->add_notifications('post', array_merge($data, array(
-					'post_username'		=> $username,
-				)));
-				$notifications->add_notifications('quote', array_merge($data, array(
+				$notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
@@ -2253,10 +2247,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 					'post_username'		=> $username,
 					'topic_title'		=> $subject,
 				)));
-				$notifications->update_notifications('post', array_merge($data, array(
-					'post_username'		=> $username,
-				)));
-				$notifications->update_notifications('quote', array_merge($data, array(
+
+				$notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 1d9a2dfedc..48557192d2 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -646,7 +646,7 @@ function approve_post($post_id_list, $id, $mode)
 			else
 			{
 				// Topic Notifications
-				$notifications->add_notifications('post', $post_data);
+				$notifications->add_notifications(array('quote', 'bookmark', 'post'), $post_data);
 			}
 		}
 
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 8be8ae2a95..4933cf0f9a 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -109,13 +109,23 @@ class phpbb_notifications_service
 	/**
 	* Mark notifications read
 	*
-	* @param string $item_type item type
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
 	* @param bool|int|array $item_id Item id or array of item ids. False to mark read for all item ids
 	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
 	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
 	*/
 	public function mark_notifications_read($item_type, $item_id, $user_id, $time = false)
 	{
+		if (is_array($item_type))
+		{
+			foreach ($item_type as $type)
+			{
+				$this->mark_notifications_read($type, $item_id, $user_id, $time);
+			}
+
+			return;
+		}
+
 		$time = ($time) ?: time();
 
 		$this->get_item_type_class_name($item_type);
@@ -132,13 +142,23 @@ class phpbb_notifications_service
 	/**
 	* Mark notifications read from a parent identifier
 	*
-	* @param string $item_type item type
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
 	* @param bool|int|array $item_parent_id Item parent id or array of item parent ids. False to mark read for all item parent ids
 	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
 	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
 	*/
 	public function mark_notifications_read_by_parent($item_type, $item_parent_id, $user_id, $time = false)
 	{
+		if (is_array($item_type))
+		{
+			foreach ($item_type as $type)
+			{
+				$this->mark_notifications_read($type, $item_id, $user_id, $time);
+			}
+
+			return;
+		}
+
 		$time = ($time) ?: time();
 
 		$item_type_class_name = $this->get_item_type_class_name($item_type);
@@ -155,11 +175,21 @@ class phpbb_notifications_service
 	/**
 	* Add a notification
 	*
-	* @param string $item_type Type identifier
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
 	* @param array $data Data specific for this type that will be inserted
 	*/
 	public function add_notifications($item_type, $data)
 	{
+		if (is_array($item_type))
+		{
+			foreach ($item_type as $type)
+			{
+				$this->add_notifications($type, $data);
+			}
+
+			return;
+		}
+
 		$item_type_class_name = $this->get_item_type_class_name($item_type);
 
 		$item_id = $item_type_class_name::get_item_id($data);
@@ -173,12 +203,22 @@ class phpbb_notifications_service
 	/**
 	* Add a notification for specific users
 	*
-	* @param string $item_type Type identifier
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
 	* @param array $data Data specific for this type that will be inserted
 	* @param array $notify_users User list to notify
 	*/
 	public function add_notifications_for_users($item_type, $data, $notify_users)
 	{
+		if (is_array($item_type))
+		{
+			foreach ($item_type as $type)
+			{
+				$this->add_notifications($type, $data);
+			}
+
+			return;
+		}
+
 		$item_type_class_name = $this->get_item_type_class_name($item_type);
 
 		$item_id = $item_type_class_name::get_item_id($data);
@@ -255,11 +295,21 @@ class phpbb_notifications_service
 	/**
 	* Update a notification
 	*
-	* @param string $item_type Type identifier
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
 	* @param array $data Data specific for this type that will be updated
 	*/
 	public function update_notifications($item_type, $data)
 	{
+		if (is_array($item_type))
+		{
+			foreach ($item_type as $type)
+			{
+				$this->add_notifications($type, $data);
+			}
+
+			return;
+		}
+
 		$item_type_class_name = $this->get_item_type_class_name($item_type);
 
 		// Allow the notifications class to over-ride the update_notifications functionality
diff --git a/phpBB/includes/notifications/type/bookmark.php b/phpBB/includes/notifications/type/bookmark.php
new file mode 100644
index 0000000000..7896703f00
--- /dev/null
+++ b/phpBB/includes/notifications/type/bookmark.php
@@ -0,0 +1,92 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Bookmark updating notifications class
+* This class handles notifications for replies to a bookmarked topic
+*
+* @package notifications
+*/
+class phpbb_notifications_type_bookmark extends phpbb_notifications_type_post
+{
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_BOOKMARK';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'bookmark';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	{
+		$db = $phpbb_container->get('dbal.conn');
+
+		$users = array();
+
+		/* todo
+		* find what type of notification they'd like to receive
+		*/
+		$sql = 'SELECT user_id
+			FROM ' . BOOKMARKS_TABLE . '
+			WHERE ' . $db->sql_in_set('topic_id', $post['topic_id']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$users[$row['user_id']] = array('');
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($users))
+		{
+			return array();
+		}
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		{
+			$notify_users[$user_id] = $users[$user_id];
+		}
+
+		return $notify_users;
+	}
+}
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 324a40888d..cc72ab8b1f 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -25,6 +25,13 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notifications_type_post extends phpbb_notifications_type_base
 {
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_POST';
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notifications_type_
@@ -136,7 +143,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		}
 
 		return $this->phpbb_container->get('user')->lang(
-			'NOTIFICATION_POST',
+			$this->language_key,
 			$username,
 			censor_text($this->get_data('topic_title'))
 		);
@@ -161,7 +168,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		}
 
 		return $this->phpbb_container->get('user')->lang(
-			'NOTIFICATION_POST',
+			$this->language_key,
 			$username,
 			censor_text($this->get_data('topic_title'))
 		);
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
index 11186f3685..86d157631d 100644
--- a/phpBB/includes/notifications/type/quote.php
+++ b/phpBB/includes/notifications/type/quote.php
@@ -18,15 +18,27 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Post tagging notifications class
-* This class handles notifications for tagging users in a post (ex: @EXreaction)
+* Post quoting notifications class
+* This class handles notifications for quoting users in a post
 *
 * @package notifications
 */
 class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 {
+	/**
+	* regular expression to match to find usernames
+	*
+	* @var string
+	*/
 	protected static $regular_expression_match = '#\[quote=&quot;(.+?)&quot;:#';
 
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_QUOTE';
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notifications_type_
@@ -97,56 +109,6 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 		return $notify_users;
 	}
 
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_formatted_title()
-	{
-		if ($this->get_data('post_username'))
-		{
-			$username = $this->get_data('post_username');
-		}
-		else
-		{
-			$user_data = $this->service->get_user($this->get_data('poster_id'));
-
-			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
-		}
-
-		return $this->phpbb_container->get('user')->lang(
-			'NOTIFICATION_QUOTE',
-			$username,
-			censor_text($this->get_data('topic_title'))
-		);
-	}
-
-	/**
-	* Get the title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		if ($this->get_data('post_username'))
-		{
-			$username = $this->get_data('post_username');
-		}
-		else
-		{
-			$user_data = $this->service->get_user($this->get_data('poster_id'));
-
-			$username = $user_data['username'];
-		}
-
-		return $this->phpbb_container->get('user')->lang(
-			'NOTIFICATION_QUOTE',
-			$username,
-			censor_text($this->get_data('topic_title'))
-		);
-	}
-
 	/**
 	* Update a notification
 	*
-- 
cgit v1.2.1


From 8e977544fb6763412e45f84791de8c3eccf321c9 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 17:01:08 -0500
Subject: [ticket/11103] Normalization of $phpbb_notifications variable name

Use $phpbb_notifications instead of $notifications everywhere for
consistency and conflict prevention.

PHPBB3-11103
---
 phpBB/includes/functions.php          | 14 +++++++-------
 phpBB/includes/functions_admin.php    |  8 ++++----
 phpBB/includes/functions_posting.php  | 10 +++++-----
 phpBB/includes/functions_privmsgs.php |  4 ++--
 phpBB/includes/mcp/mcp_queue.php      |  6 +++---
 5 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index aec7759f19..b7243227bd 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1294,8 +1294,8 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			// Mark all forums read (index page)
 
 			// Mark all topic notifications read for this user
-			$notifications = $phpbb_container->get('notifications');
-			$notifications->mark_notifications_read('topic', false, $user->data['user_id'], $post_time);
+			$phpbb_notifications = $phpbb_container->get('notifications');
+			$phpbb_notifications->mark_notifications_read('topic', false, $user->data['user_id'], $post_time);
 
 			if ($config['load_db_lastread'] && $user->data['is_registered'])
 			{
@@ -1336,8 +1336,8 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		}
 
 		// Mark topic notifications read for this user in this forum
-		$notifications = $phpbb_container->get('notifications');
-		$notifications->mark_notifications_read_by_parent('topic', $forum_id, $user->data['user_id'], $post_time);
+		$phpbb_notifications = $phpbb_container->get('notifications');
+		$phpbb_notifications->mark_notifications_read_by_parent('topic', $forum_id, $user->data['user_id'], $post_time);
 
 		// Mark all post/quote notifications read for this user in this forum
 		$topic_ids = array();
@@ -1351,7 +1351,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		}
 		$db->sql_freeresult($result);
 
-		$notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_ids, $user->data['user_id'], $post_time);
+		$phpbb_notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_ids, $user->data['user_id'], $post_time);
 
 		// Add 0 to forums array to mark global announcements correctly
 		// $forum_id[] = 0;
@@ -1448,8 +1448,8 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		}
 
 		// Mark post notifications read for this user in this topic
-		$notifications = $phpbb_container->get('notifications');
-		$notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_id, $user->data['user_id'], $post_time);
+		$phpbb_notifications = $phpbb_container->get('notifications');
+		$phpbb_notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_id, $user->data['user_id'], $post_time);
 
 		if ($config['load_db_lastread'] && $user->data['is_registered'])
 		{
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 6845ae14e3..1cbd44e97e 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -717,8 +717,8 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 	}
 
 	// Delete notifications
-	$notifications = $phpbb_container->get('notifications');
-	$notifications->delete_notifications('topic', $topic_ids);
+	$phpbb_notifications = $phpbb_container->get('notifications');
+	$phpbb_notifications->delete_notifications('topic', $topic_ids);
 
 	return $return;
 }
@@ -899,8 +899,8 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 	}
 
 	// Delete notifications
-	$notifications = $phpbb_container->get('notifications');
-	$notifications->delete_notifications('post', $post_ids);
+	$phpbb_notifications = $phpbb_container->get('notifications');
+	$phpbb_notifications->delete_notifications('post', $post_ids);
 
 	return sizeof($post_ids);
 }
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 56f84562f7..e48a2b6bec 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2222,19 +2222,19 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	// Send Notifications
 	if ($post_approval)
 	{
-		$notifications = $phpbb_container->get('notifications');
+		$phpbb_notifications = $phpbb_container->get('notifications');
 
 		switch ($mode)
 		{
 			case 'post' :
-				$notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
+				$phpbb_notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
 
 			case 'reply' :
 			case 'quote' :
-				$notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
+				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
@@ -2243,12 +2243,12 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			case 'edit_first_post' :
 			case 'edit' :
 			case 'edit_last_post' :
-				$notifications->update_notifications('topic', array_merge($data, array(
+				$phpbb_notifications->update_notifications('topic', array_merge($data, array(
 					'post_username'		=> $username,
 					'topic_title'		=> $subject,
 				)));
 
-				$notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
+				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 133b6fc9bc..8545cc7ef5 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -879,8 +879,8 @@ function update_unread_status($unread, $msg_id, $user_id, $folder_id)
 	global $db, $user, $phpbb_container;
 
 	// Mark the PM as read
-	$notifications = $phpbb_container->get('notifications');
-	$notifications->mark_notifications_read('pm', $msg_id, $user_id);
+	$phpbb_notifications = $phpbb_container->get('notifications');
+	$phpbb_notifications->mark_notifications_read('pm', $msg_id, $user_id);
 
 	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
 		SET pm_unread = 0
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 48557192d2..1373829ecf 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -634,19 +634,19 @@ function approve_post($post_id_list, $id, $mode)
 		// Send out normal user notifications
 		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
-		$notifications = $phpbb_container->get('notifications');
+		$phpbb_notifications = $phpbb_container->get('notifications');
 
 		foreach ($post_info as $post_id => $post_data)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
 			{
 				// Forum Notifications
-				$notifications->add_notifications('topic', $post_data);
+				$phpbb_notifications->add_notifications('topic', $post_data);
 			}
 			else
 			{
 				// Topic Notifications
-				$notifications->add_notifications(array('quote', 'bookmark', 'post'), $post_data);
+				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $post_data);
 			}
 		}
 
-- 
cgit v1.2.1


From 959c81d00e830e89fa9d583ee93bf8f166013fe0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 18:05:13 -0500
Subject: [ticket/11103] Use appropriate email templates to send notifications

Fixing a number of bugs

PHPBB3-11103
---
 phpBB/includes/functions_posting.php            |  2 ++
 phpBB/includes/notifications/method/email.php   | 14 +++++-------
 phpBB/includes/notifications/service.php        |  2 +-
 phpBB/includes/notifications/type/base.php      |  4 +++-
 phpBB/includes/notifications/type/bookmark.php  |  7 ++++++
 phpBB/includes/notifications/type/interface.php |  4 ++--
 phpBB/includes/notifications/type/pm.php        | 28 +++++++++++++++++------
 phpBB/includes/notifications/type/post.php      | 30 +++++++++++++++++++------
 phpBB/includes/notifications/type/quote.php     | 23 +++++++++++++++++++
 phpBB/includes/notifications/type/topic.php     | 27 ++++++++++++++++------
 10 files changed, 107 insertions(+), 34 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index e48a2b6bec..fc2c5a47b6 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2229,6 +2229,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			case 'post' :
 				$phpbb_notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
 					'post_username'		=> $username,
+					'poster_id'			=> (int) $user->data['user_id'],
 				)));
 			break;
 
@@ -2236,6 +2237,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			case 'quote' :
 				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
+					'poster_id'			=> (int) $user->data['user_id'],
 				)));
 			break;
 
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index 1bcea13d92..a1ca955ee1 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -82,19 +82,15 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 				continue;
 			}
 
-			$messenger->template('notification', $user['user_lang']);
+			$messenger->template($notification->email_template, $user['user_lang']);
 
 			$messenger->to($user['user_email'], $user['username']);
 
-			$messenger->assign_vars(array(
-				'USERNAME'			=> $user['username'],
+			$messenger->assign_vars(array_merge(array(
+				'USERNAME'						=> $user['username'],
 
-				'MESSAGE'			=> htmlspecialchars_decode($notification->get_title()),
-
-				'U_VIEW_MESSAGE'	=> $notification->get_full_url(),
-
-				'U_UNSUBSCRIBE'		=> $notification->get_unsubscribe_url(),
-			));
+				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=notifications', // todo Update URL
+			), $notification->get_email_template_variables()));
 
 			$messenger->send($this->notify_method);
 		}
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 4933cf0f9a..d2ff20333e 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -153,7 +153,7 @@ class phpbb_notifications_service
 		{
 			foreach ($item_type as $type)
 			{
-				$this->mark_notifications_read($type, $item_id, $user_id, $time);
+				$this->mark_notifications_read_by_parent($type, $item_parent_id, $user_id, $time);
 			}
 
 			return;
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index daca3b43cb..4958e27919 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -157,7 +157,7 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	public function create_insert_array($type_data)
 	{
 		// Defaults
-		$data = array_merge(array(
+		$this->data = array_merge(array(
 			'item_id'				=> static::get_item_id($type_data),
 			'item_type'	   			=> $this->get_item_type(),
 			'item_parent_id'		=> static::get_item_parent_id($type_data),
@@ -168,6 +168,8 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 			'data'					=> array(),
 		), $this->data);
 
+		$data = $this->data;
+
 		$data['data'] = serialize($data['data']);
 
 		return $data;
diff --git a/phpBB/includes/notifications/type/bookmark.php b/phpBB/includes/notifications/type/bookmark.php
index 7896703f00..86a99e4ff5 100644
--- a/phpBB/includes/notifications/type/bookmark.php
+++ b/phpBB/includes/notifications/type/bookmark.php
@@ -25,6 +25,13 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notifications_type_bookmark extends phpbb_notifications_type_post
 {
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'notifications/bookmark';
+
 	/**
 	* Language key used to output the text
 	*
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index c1c0eb0b0c..a8c6e4869b 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -31,9 +31,9 @@ interface phpbb_notifications_type_interface
 
 	public function get_formatted_title();
 
-	public function get_url();
+	public function get_email_template_variables();
 
-	public function get_full_url();
+	public function get_url();
 
 	public function get_unsubscribe_url($method);
 
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 89f338f3f9..816383949b 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -25,6 +25,13 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 {
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'privmsg_notify';
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notifications_type_
@@ -136,23 +143,30 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	}
 
 	/**
-	* Get the url to this item
+	* Get email template variables
 	*
-	* @return string URL
+	* @return array
 	*/
-	public function get_url()
+	public function get_email_template_variables()
 	{
-		return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=pm&amp;mode=view&amp;p={$this->item_id}");
+		$user_data = $this->service->get_user($this->get_data('from_user_id'));
+
+		return array(
+			'AUTHOR_NAME'				=> htmlspecialchars_decode($user_data['username']),
+			'SUBJECT'					=> htmlspecialchars_decode(censor_text($this->get_data('message_subject'))),
+
+			'U_VIEW_MESSAGE'			=> generate_board_url() . '/ucp.' . $this->php_ext . "?i=pm&mode=view&p={$this->item_id}",
+		);
 	}
 
 	/**
-	* Get the full url to this item
+	* Get the url to this item
 	*
 	* @return string URL
 	*/
-	public function get_full_url()
+	public function get_url()
 	{
-		return generate_board_url() . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$this->item_id}";
+		return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=pm&amp;mode=view&amp;p={$this->item_id}");
 	}
 
 	/**
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index cc72ab8b1f..13742ee78b 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -25,6 +25,13 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notifications_type_post extends phpbb_notifications_type_base
 {
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'topic_notify';
+
 	/**
 	* Language key used to output the text
 	*
@@ -175,23 +182,30 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	}
 
 	/**
-	* Get the url to this item
+	* Get email template variables
 	*
-	* @return string URL
+	* @return array
 	*/
-	public function get_url()
+	public function get_email_template_variables()
 	{
-		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "p={$this->item_id}#p{$this->item_id}");
+		return array(
+			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
+
+			'U_NEWEST_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
+			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
+			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
+			'U_STOP_WATCHING_TOPIC'		=> generate_board_url() . "/viewtopic.{$this->php_ext}?uid={$this->user_id}&f={$this->get_data('forum_id')}&t={$this->item_parent_id}&unwatch=topic",
+		);
 	}
 
 	/**
-	* Get the full url to this item
+	* Get the url to this item
 	*
 	* @return string URL
 	*/
-	public function get_full_url()
+	public function get_url()
 	{
-		return generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}";
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "p={$this->item_id}#p{$this->item_id}");
 	}
 
 	/**
@@ -220,6 +234,8 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$this->set_data('post_username', (($post['post_username'] != $this->phpbb_container->get('user')->data['username']) ? $post['post_username'] : ''));
 
+		$this->set_data('forum_id', $post['forum_id']);
+
 		$this->set_data('forum_name', $post['forum_name']);
 
 		return parent::create_insert_array($post);
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
index 86d157631d..48d63003dd 100644
--- a/phpBB/includes/notifications/type/quote.php
+++ b/phpBB/includes/notifications/type/quote.php
@@ -25,6 +25,13 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 {
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'notifications/quote';
+
 	/**
 	* regular expression to match to find usernames
 	*
@@ -161,4 +168,20 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 		// return true to continue with the update code in the notifications service (this will update the rest of the notifications)
 		return true;
 	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+		return array_merge(parent::get_email_template_variables(), array(
+			'AUTHOR_NAME'		=> htmlspecialchars_decode($user_data['username']),
+
+			'U_QUOTED_POST'		=> generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
+		));
+	}
 }
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index 0fce65a0cf..e31c8d792b 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -25,6 +25,13 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 {
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'newtopic_notify';
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notifications_type_
@@ -170,23 +177,29 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	}
 
 	/**
-	* Get the url to this item
+	* Get email template variables
 	*
-	* @return string URL
+	* @return array
 	*/
-	public function get_url()
+	public function get_email_template_variables()
 	{
-		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f={$this->item_parent_id}&amp;t={$this->item_id}");
+		return array(
+			'FORUM_NAME'				=> htmlspecialchars_decode($this->get_data('forum_name')),
+			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
+
+			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->item_parent_id}",
+			'U_STOP_WATCHING_FORUM'		=> generate_board_url() . "/viewforum.{$this->php_ext}?uid={$this->user_id}&f={$this->item_parent_id}&unwatch=forum",
+		);
 	}
 
 	/**
-	* Get the full url to this item
+	* Get the url to this item
 	*
 	* @return string URL
 	*/
-	public function get_full_url()
+	public function get_url()
 	{
-		return generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}";
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f={$this->item_parent_id}&amp;t={$this->item_id}");
 	}
 
 	/**
-- 
cgit v1.2.1


From 7589a3093d95048f5a8cfdc6259501f43fd3fe10 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 18:30:12 -0500
Subject: [ticket/11103] Display all unread notifications by default

Add unread count to the page title

PHPBB3-11103
---
 phpBB/includes/functions.php             | 16 +++++++-----
 phpBB/includes/notifications/service.php | 44 ++++++++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b7243227bd..e26db56442 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4994,6 +4994,14 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		$timezone_name = $user->lang['timezones'][$timezone_name];
 	}
 
+	// Output the notifications
+	$phpbb_notifications = $phpbb_container->get('notifications');
+	$notifications = $phpbb_notifications->load_notifications();
+	foreach ($notifications['notifications'] as $notification)
+	{
+		$template->assign_block_vars('notifications', $notification->prepare_for_display());
+	}
+
 	// The following assigns all _common_ variables that may be used at any point in a template.
 	$template->assign_vars(array(
 		'SITENAME'						=> $config['sitename'],
@@ -5008,6 +5016,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'RECORD_USERS'					=> $l_online_record,
 		'PRIVATE_MESSAGE_INFO'			=> $l_privmsgs_text,
 		'PRIVATE_MESSAGE_INFO_UNREAD'	=> $l_privmsgs_text_unread,
+		'NUM_UNREAD_NOTIFICATIONS'		=> $notifications['unread_count'],
 
 		'S_USER_NEW_PRIVMSG'			=> $user->data['user_new_privmsg'],
 		'S_USER_UNREAD_PRIVMSG'			=> $user->data['user_unread_privmsg'],
@@ -5119,13 +5128,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'A_COOKIE_SETTINGS'		=> addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')),
 	));
 
-	// Output the notifications
-	$phpbb_notifications = $phpbb_container->get('notifications');
-	foreach ($phpbb_notifications->load_notifications() as $notification)
-	{
-		$template->assign_block_vars('notifications', $notification->prepare_for_display());
-	}
-
 	// application/xhtml+xml not used because of IE
 	header('Content-type: text/html; charset=UTF-8');
 
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index d2ff20333e..9f3fe8326f 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -50,6 +50,7 @@ class phpbb_notifications_service
 	*				order_dir	Order direction (Default: DESC)
 	* 				limit		Number of notifications to load (Default: 5)
 	* 				start		Notifications offset (Default: 0)
+	* 				all_unread	Load all unread messages? (Default: true)
 	*/
 	public function load_notifications($options = array())
 	{
@@ -62,11 +63,24 @@ class phpbb_notifications_service
 			'order_dir'		=> 'DESC',
 			'limit'			=> 5,
 			'start'			=> 0,
+			'all_unread'	=> true,
 		), $options);
 
 		$notifications = $user_ids = array();
 		$load_special = array();
 
+		// Get the total number of unread notifications
+		$sql = 'SELECT COUNT(*) AS count
+			FROM ' . NOTIFICATIONS_TABLE . '
+			WHERE user_id = ' . (int) $options['user_id'] . '
+				AND unread = 1';
+		$result = $this->db->sql_query($sql);
+		$count = $this->db->sql_fetchfield('count', $result);
+		$this->db->sql_freeresult($result);
+
+		$rowset = array();
+
+		// Get the main notifications
 		$sql = 'SELECT *
 			FROM ' . NOTIFICATIONS_TABLE . '
 			WHERE user_id = ' . (int) $options['user_id'] . '
@@ -74,6 +88,30 @@ class phpbb_notifications_service
 		$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
 
 		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$rowset[$row['notification_id']] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		// Get all unread notifications
+		if ($options['all_unread'])
+		{
+			$sql = 'SELECT *
+				FROM ' . NOTIFICATIONS_TABLE . '
+				WHERE user_id = ' . (int) $options['user_id'] . '
+					AND unread = 1
+					AND ' . $this->db->sql_in_set('notification_id', array_keys($rowset), true) . '
+					ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
+			$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$rowset[$row['notification_id']] = $row;
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		foreach ($rowset as $row)
 		{
 			$item_type_class_name = $this->get_item_type_class_name($row['item_type'], true);
 
@@ -91,7 +129,6 @@ class phpbb_notifications_service
 
 			$notifications[] = $notification;
 		}
-		$this->db->sql_freeresult($result);
 
 		$this->load_users($user_ids);
 
@@ -103,7 +140,10 @@ class phpbb_notifications_service
 			$item_type_class_name::load_special($this->phpbb_container, $data, $notifications);
 		}
 
-		return $notifications;
+		return array(
+			'notifications'		=> $notifications,
+			'unread_count'		=> $count,
+		);
 	}
 
 	/**
-- 
cgit v1.2.1


From a1e2fb93add6cf6ff0c83879b347d1780411a335 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 11:59:30 -0500
Subject: [ticket/11103] Bots/Anonymous never receive notifications

Do not waste queries trying to load notifications for these users

PHPBB3-11103
---
 phpBB/includes/notifications/service.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 9f3fe8326f..7fdba5e48a 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -66,6 +66,12 @@ class phpbb_notifications_service
 			'all_unread'	=> true,
 		), $options);
 
+		// Anonymous users and bots never receive notifications
+		if ($options['user_id'] == $user->data['user_id'] && ($user->data['user_id'] == ANONYMOUS || $user->data['user_type'] == USER_IGNORE))
+		{
+			return;
+		}
+
 		$notifications = $user_ids = array();
 		$load_special = array();
 
@@ -94,7 +100,7 @@ class phpbb_notifications_service
 		$this->db->sql_freeresult($result);
 
 		// Get all unread notifications
-		if ($options['all_unread'])
+		if ($options['all_unread'] && !empty($rowset))
 		{
 			$sql = 'SELECT *
 				FROM ' . NOTIFICATIONS_TABLE . '
-- 
cgit v1.2.1


From 9c54465a1331216be1e3369346921dee9148e590 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 12:00:03 -0500
Subject: [ticket/11103] Starting approve_post type notification

PHPBB3-11103
---
 phpBB/includes/mcp/mcp_queue.php                   |  33 ++----
 phpBB/includes/notifications/type/approve_post.php | 114 +++++++++++++++++++++
 2 files changed, 122 insertions(+), 25 deletions(-)
 create mode 100644 phpBB/includes/notifications/type/approve_post.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 1373829ecf..df99e34576 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -597,45 +597,28 @@ function approve_post($post_id_list, $id, $mode)
 		sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
 		unset($topic_id_list, $forum_id_list);
 
-		$messenger = new messenger();
+		$phpbb_notifications = $phpbb_container->get('notifications');
 
 		// Notify Poster?
 		if ($notify_poster)
 		{
+			// Forum Notifications
 			foreach ($post_info as $post_id => $post_data)
 			{
-				if ($post_data['poster_id'] == ANONYMOUS)
+				if ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id'])
 				{
-					continue;
+					$phpbb_notifications->add_notifications('approve_topic', $post_data);
+				}
+				else
+				{
+					$phpbb_notifications->add_notifications('approve_post', $post_data);
 				}
-
-				$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_approved' : 'post_approved';
-
-				$messenger->template($email_template, $post_data['user_lang']);
-
-				$messenger->to($post_data['user_email'], $post_data['username']);
-				$messenger->im($post_data['user_jabber'], $post_data['username']);
-
-				$messenger->assign_vars(array(
-					'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
-					'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
-					'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])),
-
-					'U_VIEW_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&e=0",
-					'U_VIEW_POST'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&p=$post_id&e=$post_id")
-				);
-
-				$messenger->send($post_data['user_notify_type']);
 			}
 		}
 
-		$messenger->save_queue();
-
 		// Send out normal user notifications
 		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
-		$phpbb_notifications = $phpbb_container->get('notifications');
-
 		foreach ($post_info as $post_id => $post_data)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
diff --git a/phpBB/includes/notifications/type/approve_post.php b/phpBB/includes/notifications/type/approve_post.php
new file mode 100644
index 0000000000..9724916a0e
--- /dev/null
+++ b/phpBB/includes/notifications/type/approve_post.php
@@ -0,0 +1,114 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* This class handles notifications for replies to a topic
+*
+* @package notifications
+*/
+class phpbb_notifications_type_approve_post extends phpbb_notifications_type_post
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'post_approved';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_POST';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'approve_post';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	{
+		$users = array();
+
+		/* todo
+		* find what type of notification they'd like to receive
+		*/
+		$users[$post['poster_id']] = array('');
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		{
+			$notify_users[$user_id] = $users[$user_id];
+		}
+
+		return $notify_users;
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		return array(
+			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
+
+			'U_VIEW_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
+			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
+		);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('post_subject', $post['post_subject']);
+
+		return parent::create_insert_array($post);
+	}
+}
-- 
cgit v1.2.1


From 05b573ebf76c737f89deaefd22ce963aa910e5d1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 13:51:02 -0500
Subject: [ticket/11103] Topic and post dis/approval notifications

Remove the formatted title function, plaintext is not needed since
email templates are used

Fix a number of bugs.

PHPBB3-11103
---
 phpBB/includes/functions.php                       |   9 +-
 phpBB/includes/functions_posting.php               |   2 +
 phpBB/includes/mcp/mcp_queue.php                   |  82 +++++++--------
 phpBB/includes/notifications/service.php           |  11 +-
 phpBB/includes/notifications/type/approve_post.php |   4 +-
 .../includes/notifications/type/approve_topic.php  | 113 +++++++++++++++++++++
 phpBB/includes/notifications/type/base.php         |  13 +--
 phpBB/includes/notifications/type/bookmark.php     |   3 +
 .../notifications/type/disapprove_post.php         | 105 +++++++++++++++++++
 .../notifications/type/disapprove_topic.php        | 104 +++++++++++++++++++
 phpBB/includes/notifications/type/interface.php    |   2 -
 phpBB/includes/notifications/type/pm.php           |  14 +--
 phpBB/includes/notifications/type/post.php         |  32 ++----
 phpBB/includes/notifications/type/quote.php        |   5 +-
 phpBB/includes/notifications/type/topic.php        |  42 +++-----
 15 files changed, 404 insertions(+), 137 deletions(-)
 create mode 100644 phpBB/includes/notifications/type/approve_topic.php
 create mode 100644 phpBB/includes/notifications/type/disapprove_post.php
 create mode 100644 phpBB/includes/notifications/type/disapprove_topic.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index cb8dddd5f8..e9d673455c 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1295,7 +1295,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 
 			// Mark all topic notifications read for this user
 			$phpbb_notifications = $phpbb_container->get('notifications');
-			$phpbb_notifications->mark_notifications_read('topic', false, $user->data['user_id'], $post_time);
+			$phpbb_notifications->mark_notifications_read(array('topic', 'quote', 'bookmark', 'post', 'approve_topic', 'approve_post'), false, $user->data['user_id'], $post_time);
 
 			if ($config['load_db_lastread'] && $user->data['is_registered'])
 			{
@@ -1337,7 +1337,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 
 		// Mark topic notifications read for this user in this forum
 		$phpbb_notifications = $phpbb_container->get('notifications');
-		$phpbb_notifications->mark_notifications_read_by_parent('topic', $forum_id, $user->data['user_id'], $post_time);
+		$phpbb_notifications->mark_notifications_read_by_parent(array('topic', 'approve_topic'), $forum_id, $user->data['user_id'], $post_time);
 
 		// Mark all post/quote notifications read for this user in this forum
 		$topic_ids = array();
@@ -1351,7 +1351,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		}
 		$db->sql_freeresult($result);
 
-		$phpbb_notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_ids, $user->data['user_id'], $post_time);
+		$phpbb_notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post', 'approve_post'), $topic_ids, $user->data['user_id'], $post_time);
 
 		// Add 0 to forums array to mark global announcements correctly
 		// $forum_id[] = 0;
@@ -1449,7 +1449,8 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 
 		// Mark post notifications read for this user in this topic
 		$phpbb_notifications = $phpbb_container->get('notifications');
-		$phpbb_notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post'), $topic_id, $user->data['user_id'], $post_time);
+		$phpbb_notifications->mark_notifications_read(array('topic', 'approve_topic'), $topic_id, $user->data['user_id'], $post_time);
+		$phpbb_notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post', 'approve_post'), $topic_id, $user->data['user_id'], $post_time);
 
 		if ($config['load_db_lastread'] && $user->data['is_registered'])
 		{
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index fc2c5a47b6..6089ef0014 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2238,6 +2238,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
 					'poster_id'			=> (int) $user->data['user_id'],
+					'post_text'			=> $data['message'],
 				)));
 			break;
 
@@ -2252,6 +2253,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 
 				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
+					'post_text'			=> $data['message'],
 				)));
 			break;
 		}
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index df99e34576..bd2092e4bb 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -597,39 +597,34 @@ function approve_post($post_id_list, $id, $mode)
 		sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
 		unset($topic_id_list, $forum_id_list);
 
-		$phpbb_notifications = $phpbb_container->get('notifications');
-
-		// Notify Poster?
-		if ($notify_poster)
-		{
-			// Forum Notifications
-			foreach ($post_info as $post_id => $post_data)
-			{
-				if ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id'])
-				{
-					$phpbb_notifications->add_notifications('approve_topic', $post_data);
-				}
-				else
-				{
-					$phpbb_notifications->add_notifications('approve_post', $post_data);
-				}
-			}
-		}
-
 		// Send out normal user notifications
 		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
+		// Handle notifications
+		$phpbb_notifications = $phpbb_container->get('notifications');
 		foreach ($post_info as $post_id => $post_data)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
 			{
 				// Forum Notifications
 				$phpbb_notifications->add_notifications('topic', $post_data);
+
+				// Notify poster?
+				if ($notify_poster)
+				{
+					$phpbb_notifications->add_notifications('approve_topic', $post_data);
+				}
 			}
 			else
 			{
 				// Topic Notifications
 				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $post_data);
+
+				// Notify poster?
+				if ($notify_poster)
+				{
+					$phpbb_notifications->add_notifications('approve_post', $post_data);
+				}
 			}
 		}
 
@@ -719,7 +714,7 @@ function disapprove_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path;
-	global $request;
+	global $request, $phpbb_container;
 
 	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 	{
@@ -852,20 +847,16 @@ function disapprove_post($post_id_list, $id, $mode)
 			}
 		}
 
-		$messenger = new messenger();
-
 		// Notify Poster?
 		if ($notify_poster)
 		{
 			$lang_reasons = array();
 
+			// Handle notifications
+			$phpbb_notifications = $phpbb_container->get('notifications');
 			foreach ($post_info as $post_id => $post_data)
 			{
-				if ($post_data['poster_id'] == ANONYMOUS)
-				{
-					continue;
-				}
-
+				$post_data['disapprove_reason'] = '';
 				if (isset($disapprove_reason_lang))
 				{
 					// Okay we need to get the reason from the posters language
@@ -891,33 +882,32 @@ function disapprove_post($post_id_list, $id, $mode)
 						}
 					}
 
-					$email_disapprove_reason = $lang_reasons[$post_data['user_lang']];
-					$email_disapprove_reason .= ($reason) ? "\n\n" . $reason : '';
+					$post_data['disapprove_reason'] = $lang_reasons[$post_data['user_lang']];
+					$post_data['disapprove_reason'] .= ($reason) ? "\n\n" . $reason : '';
 				}
 
-				$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_disapproved' : 'post_disapproved';
-
-				$messenger->template($email_template, $post_data['user_lang']);
-
-				$messenger->to($post_data['user_email'], $post_data['username']);
-				$messenger->im($post_data['user_jabber'], $post_data['username']);
-
-				$messenger->assign_vars(array(
-					'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
-					'REASON'		=> htmlspecialchars_decode($email_disapprove_reason),
-					'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
-					'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])))
-				);
-
-				$messenger->send($post_data['user_notify_type']);
+				if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
+				{
+					// Notify poster?
+					if ($notify_poster)
+					{
+						$phpbb_notifications->add_notifications('disapprove_topic', $post_data);
+					}
+				}
+				else
+				{
+					// Notify poster?
+					if ($notify_poster)
+					{
+						$phpbb_notifications->add_notifications('disapprove_post', $post_data);
+					}
+				}
 			}
 
 			unset($lang_reasons);
 		}
 		unset($post_info, $disapprove_reason, $email_disapprove_reason, $disapprove_reason_lang);
 
-		$messenger->save_queue();
-
 		if ($num_disapproved_topics)
 		{
 			$success_msg = ($num_disapproved_topics == 1) ? 'TOPIC_DISAPPROVED_SUCCESS' : 'TOPICS_DISAPPROVED_SUCCESS';
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 7fdba5e48a..6e7b160e0f 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -69,7 +69,10 @@ class phpbb_notifications_service
 		// Anonymous users and bots never receive notifications
 		if ($options['user_id'] == $user->data['user_id'] && ($user->data['user_id'] == ANONYMOUS || $user->data['user_type'] == USER_IGNORE))
 		{
-			return;
+			return array(
+				'notifications'		=> array(),
+				'unread_count'		=> 0,
+			);
 		}
 
 		$notifications = $user_ids = array();
@@ -273,8 +276,8 @@ class phpbb_notifications_service
 		$notification_objects = $notification_methods = array();
 		$new_rows = array();
 
-		// Never send notifications to the anonymous user or the current user!
-		unset($notify_users[ANONYMOUS], $notify_users[$this->phpbb_container->get('user')->data['user_id']]);
+		// Never send notifications to the anonymous user!
+		unset($notify_users[ANONYMOUS]);
 
 		// Make sure not to send new notifications to users who've already been notified about this item
 		// This may happen when an item was added, but now new users are able to see the item
@@ -457,7 +460,7 @@ class phpbb_notifications_service
 	{
 		if (!$safe)
 		{
-			$item_type = preg_replace('#[^a-z]#', '', $item_type);
+			$item_type = preg_replace('#[^a-z_]#', '', $item_type);
 		}
 
 		return 'phpbb_notifications_type_' . $item_type;
diff --git a/phpBB/includes/notifications/type/approve_post.php b/phpBB/includes/notifications/type/approve_post.php
index 9724916a0e..4a310db389 100644
--- a/phpBB/includes/notifications/type/approve_post.php
+++ b/phpBB/includes/notifications/type/approve_post.php
@@ -37,7 +37,7 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
 	*
 	* @var string
 	*/
-	protected $language_key = 'NOTIFICATION_POST';
+	protected $language_key = 'NOTIFICATION_POST_APPROVED';
 
 	/**
 	* Get the type of notification this is
@@ -109,6 +109,8 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
 	{
 		$this->set_data('post_subject', $post['post_subject']);
 
+		$this->time = time();
+
 		return parent::create_insert_array($post);
 	}
 }
diff --git a/phpBB/includes/notifications/type/approve_topic.php b/phpBB/includes/notifications/type/approve_topic.php
new file mode 100644
index 0000000000..426c4e374a
--- /dev/null
+++ b/phpBB/includes/notifications/type/approve_topic.php
@@ -0,0 +1,113 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* This class handles notifications for replies to a topic
+*
+* @package notifications
+*/
+class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_topic
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'topic_approved';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_TOPIC_APPROVED';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'approve_topic';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	{
+		$users = array();
+
+		/* todo
+		* find what type of notification they'd like to receive
+		*/
+		$users[$post['poster_id']] = array('');
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		{
+			$notify_users[$user_id] = $users[$user_id];
+		}
+
+		return $notify_users;
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		return array(
+			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
+
+			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
+		);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->time = time();
+
+		return parent::create_insert_array($post);
+	}
+}
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 4958e27919..fb75e19cad 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -114,8 +114,7 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		return array(
 			'AVATAR'			=> $this->get_avatar(),
 
-			'FORMATTED_TITLE'	=> $this->get_formatted_title(),
-			'TITLE'				=> $this->get_title(),
+			'FORMATTED_TITLE'	=> $this->get_title(),
 
 			'URL'				=> $this->get_url(),
 			'TIME'	   			=> $user->format_date($this->time),
@@ -201,16 +200,6 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	* -------------- Fall back functions -------------------
 	*/
 
-	/**
-	* Get the formatted title of this notification (fall-back)
-	*
-	* @return string
-	*/
-	public function get_formatted_title()
-	{
-		return $this->get_title();
-	}
-
 	/**
 	* URL to unsubscribe to this notification (fall-back)
 	*
diff --git a/phpBB/includes/notifications/type/bookmark.php b/phpBB/includes/notifications/type/bookmark.php
index 86a99e4ff5..9f2c2e26dc 100644
--- a/phpBB/includes/notifications/type/bookmark.php
+++ b/phpBB/includes/notifications/type/bookmark.php
@@ -75,6 +75,9 @@ class phpbb_notifications_type_bookmark extends phpbb_notifications_type_post
 		}
 		$db->sql_freeresult($result);
 
+		// Never notify the poster
+		unset($users[$post['poster_id']]);
+
 		if (empty($users))
 		{
 			return array();
diff --git a/phpBB/includes/notifications/type/disapprove_post.php b/phpBB/includes/notifications/type/disapprove_post.php
new file mode 100644
index 0000000000..9ef32349b3
--- /dev/null
+++ b/phpBB/includes/notifications/type/disapprove_post.php
@@ -0,0 +1,105 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* This class handles notifications for replies to a topic
+*
+* @package notifications
+*/
+class phpbb_notifications_type_disapprove_post extends phpbb_notifications_type_approve_post
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'post_disapproved';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_POST_DISAPPROVED';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'disapprove_post';
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		return $this->phpbb_container->get('user')->lang(
+			$this->language_key,
+			censor_text($this->get_data('topic_title')),
+			$this->get_data('disapprove_reason')
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return '';
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		return array(
+			'POST_SUBJECT'		=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
+			'REASON'			=> htmlspecialchars_decode($this->get_data('disapprove_reason')),
+		);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('post_subject', $post['post_subject']);
+		$this->set_data('disapprove_reason', $post['disapprove_reason']);
+
+		$this->time = time();
+
+		return parent::create_insert_array($post);
+	}
+}
diff --git a/phpBB/includes/notifications/type/disapprove_topic.php b/phpBB/includes/notifications/type/disapprove_topic.php
new file mode 100644
index 0000000000..eba82d2548
--- /dev/null
+++ b/phpBB/includes/notifications/type/disapprove_topic.php
@@ -0,0 +1,104 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* This class handles notifications for replies to a topic
+*
+* @package notifications
+*/
+class phpbb_notifications_type_disapprove_topic extends phpbb_notifications_type_approve_topic
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'topic_disapproved';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_TOPIC_DISAPPROVED';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'disapprove_topic';
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		return $this->phpbb_container->get('user')->lang(
+			$this->language_key,
+			censor_text($this->get_data('topic_title')),
+			$this->get_data('disapprove_reason')
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return '';
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		return array(
+			'TOPIC_TITLE'		=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
+
+			'REASON'			=> htmlspecialchars_decode($this->get_data('disapprove_reason')),
+		);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('disapprove_reason', $post['disapprove_reason']);
+		$this->time = time();
+
+		return parent::create_insert_array($post);
+	}
+}
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index a8c6e4869b..de08576a38 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -29,8 +29,6 @@ interface phpbb_notifications_type_interface
 
 	public function get_title();
 
-	public function get_formatted_title();
-
 	public function get_email_template_variables();
 
 	public function get_url();
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 816383949b..df7b42564c 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -121,7 +121,7 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	*
 	* @return string
 	*/
-	public function get_formatted_title()
+	public function get_title()
 	{
 		$user_data = $this->service->get_user($this->get_data('from_user_id'));
 
@@ -130,18 +130,6 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 		return $this->phpbb_container->get('user')->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
 	}
 
-	/**
-	* Get the plain text title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		$user_data = $this->service->get_user($this->get_data('from_user_id'));
-
-		return $this->phpbb_container->get('user')->lang('NOTIFICATION_PM', $user_data['username'], $this->get_data('message_subject'));
-	}
-
 	/**
 	* Get email template variables
 	*
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 13742ee78b..0ad2c4893f 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -101,6 +101,9 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		}
 		$db->sql_freeresult($result);
 
+		// Never notify the poster
+		unset($users[$post['poster_id']]);
+
 		if (empty($users))
 		{
 			return array();
@@ -136,31 +139,6 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	*
 	* @return string
 	*/
-	public function get_formatted_title()
-	{
-		if ($this->get_data('post_username'))
-		{
-			$username = $this->get_data('post_username');
-		}
-		else
-		{
-			$user_data = $this->service->get_user($this->get_data('poster_id'));
-
-			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
-		}
-
-		return $this->phpbb_container->get('user')->lang(
-			$this->language_key,
-			$username,
-			censor_text($this->get_data('topic_title'))
-		);
-	}
-
-	/**
-	* Get the title of this notification
-	*
-	* @return string
-	*/
 	public function get_title()
 	{
 		if ($this->get_data('post_username'))
@@ -171,7 +149,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		{
 			$user_data = $this->service->get_user($this->get_data('poster_id'));
 
-			$username = $user_data['username'];
+			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 		}
 
 		return $this->phpbb_container->get('user')->lang(
@@ -238,6 +216,8 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$this->set_data('forum_name', $post['forum_name']);
 
+		$this->time = $post['post_time'];
+
 		return parent::create_insert_array($post);
 	}
 }
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
index 48d63003dd..647f81041d 100644
--- a/phpBB/includes/notifications/type/quote.php
+++ b/phpBB/includes/notifications/type/quote.php
@@ -68,7 +68,7 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 		$db = $phpbb_container->get('dbal.conn');
 
 		$usernames = false;
-		preg_match_all(self::$regular_expression_match, $post['message'], $usernames);
+		preg_match_all(self::$regular_expression_match, $post['post_text'], $usernames);
 
 		if (empty($usernames[1]))
 		{
@@ -94,6 +94,9 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 		}
 		$db->sql_freeresult($result);
 
+		// Never notify the poster
+		unset($users[$post['poster_id']]);
+
 		if (empty($users))
 		{
 			return array();
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index e31c8d792b..cfc629430b 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -32,6 +32,13 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*/
 	public $email_template = 'newtopic_notify';
 
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_TOPIC';
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notifications_type_
@@ -94,6 +101,9 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 		}
 		$db->sql_freeresult($result);
 
+		// Never notify the poster
+		unset($users[$topic['poster_id']]);
+
 		if (empty($users))
 		{
 			return array();
@@ -129,32 +139,6 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*
 	* @return string
 	*/
-	public function get_formatted_title()
-	{
-		if ($this->get_data('post_username'))
-		{
-			$username = $this->get_data('post_username');
-		}
-		else
-		{
-			$user_data = $this->service->get_user($this->get_data('poster_id'));
-
-			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
-		}
-
-		return $this->phpbb_container->get('user')->lang(
-			'NOTIFICATION_TOPIC',
-			$username,
-			censor_text($this->get_data('topic_title')),
-			$this->get_data('forum_name')
-		);
-	}
-
-	/**
-	* Get the title of this notification
-	*
-	* @return string
-	*/
 	public function get_title()
 	{
 		if ($this->get_data('post_username'))
@@ -165,11 +149,11 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 		{
 			$user_data = $this->service->get_user($this->get_data('poster_id'));
 
-			$username = $user_data['username'];
+			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 		}
 
 		return $this->phpbb_container->get('user')->lang(
-			'NOTIFICATION_TOPIC',
+			$this->language_key,
 			$username,
 			censor_text($this->get_data('topic_title')),
 			$this->get_data('forum_name')
@@ -230,6 +214,8 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 
 		$this->set_data('forum_name', $post['forum_name']);
 
+		$this->time = $post['post_time'];
+
 		return parent::create_insert_array($post);
 	}
 }
-- 
cgit v1.2.1


From 7454d5c2d526f237bf24825b80edf6c9f1750fc6 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 14:33:15 -0500
Subject: [ticket/11103] Topic/Post in queue notification

Also, bug fixes and cleanup

PHPBB3-11103
---
 phpBB/includes/functions_posting.php               | 31 ++++++-
 phpBB/includes/mcp/mcp_queue.php                   | 21 ++++-
 phpBB/includes/notifications/service.php           | 18 +++-
 phpBB/includes/notifications/type/approve_post.php | 21 +----
 .../includes/notifications/type/approve_topic.php  | 20 +----
 .../notifications/type/disapprove_post.php         | 14 ++--
 .../notifications/type/disapprove_topic.php        | 13 +--
 phpBB/includes/notifications/type/post.php         |  5 ++
 .../includes/notifications/type/post_in_queue.php  | 97 ++++++++++++++++++++++
 phpBB/includes/notifications/type/quote.php        |  2 -
 phpBB/includes/notifications/type/topic.php        |  4 +-
 .../includes/notifications/type/topic_in_queue.php | 97 ++++++++++++++++++++++
 12 files changed, 288 insertions(+), 55 deletions(-)
 create mode 100644 phpBB/includes/notifications/type/post_in_queue.php
 create mode 100644 phpBB/includes/notifications/type/topic_in_queue.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6089ef0014..4dd840ad53 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2220,10 +2220,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	}
 
 	// Send Notifications
+	$phpbb_notifications = $phpbb_container->get('notifications');
 	if ($post_approval)
 	{
-		$phpbb_notifications = $phpbb_container->get('notifications');
-
 		switch ($mode)
 		{
 			case 'post' :
@@ -2258,6 +2257,34 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			break;
 		}
 	}
+	else
+	{
+		switch ($mode)
+		{
+			case 'post' :
+				$phpbb_notifications->add_notifications(array('topic_in_queue'), array_merge($data, array(
+					'post_username'		=> $username,
+					'poster_id'			=> (int) $user->data['user_id'],
+				)));
+			break;
+
+			case 'reply' :
+			case 'quote' :
+				$phpbb_notifications->add_notifications(array('post_in_queue'), array_merge($data, array(
+					'post_username'		=> $username,
+					'poster_id'			=> (int) $user->data['user_id'],
+				)));
+			break;
+
+			case 'edit_topic' :
+			case 'edit_first_post' :
+			case 'edit' :
+			case 'edit_last_post' :
+				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
+				$phpbb_notifications->delete_notifications(array('quote', 'bookmark', 'post'), $data['post_id']);
+			break;
+		}
+	}
 
 	$params = $add_anchor = '';
 
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index bd2092e4bb..1d2caa38d5 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -606,6 +606,9 @@ function approve_post($post_id_list, $id, $mode)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
 			{
+				// Delete topic in queue notifications
+				$phpbb_notifications->delete_notifications(array('topic_in_queue'), $post_data['topic_id']);
+
 				// Forum Notifications
 				$phpbb_notifications->add_notifications('topic', $post_data);
 
@@ -617,6 +620,9 @@ function approve_post($post_id_list, $id, $mode)
 			}
 			else
 			{
+				// Delete post in queue notification
+				$phpbb_notifications->delete_notifications(array('post_in_queue'), $post_id);
+
 				// Topic Notifications
 				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $post_data);
 
@@ -847,13 +853,26 @@ function disapprove_post($post_id_list, $id, $mode)
 			}
 		}
 
+		// Handle notifications (topic/post in queue)
+		$phpbb_notifications = $phpbb_container->get('notifications');
+		foreach ($post_info as $post_id => $post_data)
+		{
+			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
+			{
+				$phpbb_notifications->delete_notifications(array('topic_in_queue'), $post_data['topic_id']);
+			}
+			else
+			{
+				$phpbb_notifications->delete_notifications(array('post_in_queue'), $post_id);
+			}
+		}
+
 		// Notify Poster?
 		if ($notify_poster)
 		{
 			$lang_reasons = array();
 
 			// Handle notifications
-			$phpbb_notifications = $phpbb_container->get('notifications');
 			foreach ($post_info as $post_id => $post_data)
 			{
 				$post_data['disapprove_reason'] = '';
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 6e7b160e0f..777fa9a42f 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -262,7 +262,7 @@ class phpbb_notifications_service
 		{
 			foreach ($item_type as $type)
 			{
-				$this->add_notifications($type, $data);
+				$this->add_notifications_for_users($type, $data, $notify_users);
 			}
 
 			return;
@@ -353,7 +353,7 @@ class phpbb_notifications_service
 		{
 			foreach ($item_type as $type)
 			{
-				$this->add_notifications($type, $data);
+				$this->update_notifications($type, $data);
 			}
 
 			return;
@@ -386,12 +386,22 @@ class phpbb_notifications_service
 	/**
 	* Delete a notification
 	*
-	* @param string $item_type Type identifier
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $item_id is identical for the specified types)
 	* @param int|array $item_id Identifier within the type (or array of ids)
 	* @param array $data Data specific for this type that will be updated
 	*/
 	public function delete_notifications($item_type, $item_id)
 	{
+		if (is_array($item_type))
+		{
+			foreach ($item_type as $type)
+			{
+				$this->delete_notifications($type, $item_id);
+			}
+
+			return;
+		}
+
 		$this->get_item_type_class_name($item_type);
 
 		$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
@@ -400,6 +410,7 @@ class phpbb_notifications_service
 		$this->db->sql_query($sql);
 	}
 
+/*
 	public function add_subscription($item_type, $item_id, $method = '')
 	{
 		$this->get_item_type_class_name($item_type);
@@ -413,6 +424,7 @@ class phpbb_notifications_service
 			));
 		$this->db->sql_query($sql);
 	}
+*/
 
 	/**
 	* Load user helper
diff --git a/phpBB/includes/notifications/type/approve_post.php b/phpBB/includes/notifications/type/approve_post.php
index 4a310db389..b5e5cfd337 100644
--- a/phpBB/includes/notifications/type/approve_post.php
+++ b/phpBB/includes/notifications/type/approve_post.php
@@ -82,21 +82,6 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
 		return $notify_users;
 	}
 
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array(
-			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
-
-			'U_VIEW_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
-			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
-		);
-	}
-
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
@@ -109,8 +94,10 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
 	{
 		$this->set_data('post_subject', $post['post_subject']);
 
-		$this->time = time();
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
 
-		return parent::create_insert_array($post);
+		return $data;
 	}
 }
diff --git a/phpBB/includes/notifications/type/approve_topic.php b/phpBB/includes/notifications/type/approve_topic.php
index 426c4e374a..3ba871599e 100644
--- a/phpBB/includes/notifications/type/approve_topic.php
+++ b/phpBB/includes/notifications/type/approve_topic.php
@@ -82,20 +82,6 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to
 		return $notify_users;
 	}
 
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array(
-			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
-
-			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
-		);
-	}
-
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
@@ -106,8 +92,10 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to
 	*/
 	public function create_insert_array($post)
 	{
-		$this->time = time();
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
 
-		return parent::create_insert_array($post);
+		return $data;
 	}
 }
diff --git a/phpBB/includes/notifications/type/disapprove_post.php b/phpBB/includes/notifications/type/disapprove_post.php
index 9ef32349b3..e0b7bfb178 100644
--- a/phpBB/includes/notifications/type/disapprove_post.php
+++ b/phpBB/includes/notifications/type/disapprove_post.php
@@ -79,10 +79,9 @@ class phpbb_notifications_type_disapprove_post extends phpbb_notifications_type_
 	*/
 	public function get_email_template_variables()
 	{
-		return array(
-			'POST_SUBJECT'		=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
-			'REASON'			=> htmlspecialchars_decode($this->get_data('disapprove_reason')),
-		);
+		return array_merge(parent::get_email_template_variables(), array(
+			'REASON'	=> htmlspecialchars_decode($this->get_data('disapprove_reason')),
+		));
 	}
 
 	/**
@@ -95,11 +94,12 @@ class phpbb_notifications_type_disapprove_post extends phpbb_notifications_type_
 	*/
 	public function create_insert_array($post)
 	{
-		$this->set_data('post_subject', $post['post_subject']);
 		$this->set_data('disapprove_reason', $post['disapprove_reason']);
 
-		$this->time = time();
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
 
-		return parent::create_insert_array($post);
+		return $data;
 	}
 }
diff --git a/phpBB/includes/notifications/type/disapprove_topic.php b/phpBB/includes/notifications/type/disapprove_topic.php
index eba82d2548..7ad4c4edb8 100644
--- a/phpBB/includes/notifications/type/disapprove_topic.php
+++ b/phpBB/includes/notifications/type/disapprove_topic.php
@@ -79,11 +79,9 @@ class phpbb_notifications_type_disapprove_topic extends phpbb_notifications_type
 	*/
 	public function get_email_template_variables()
 	{
-		return array(
-			'TOPIC_TITLE'		=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
-
+		return array_merge(parent::get_email_template_variables(), array(
 			'REASON'			=> htmlspecialchars_decode($this->get_data('disapprove_reason')),
-		);
+		));
 	}
 
 	/**
@@ -97,8 +95,11 @@ class phpbb_notifications_type_disapprove_topic extends phpbb_notifications_type
 	public function create_insert_array($post)
 	{
 		$this->set_data('disapprove_reason', $post['disapprove_reason']);
-		$this->time = time();
 
-		return parent::create_insert_array($post);
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
+
+		return $data;
 	}
 }
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 0ad2c4893f..8e801a2595 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -167,10 +167,13 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	public function get_email_template_variables()
 	{
 		return array(
+			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
 			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
 
+			'U_VIEW_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
 			'U_NEWEST_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
 			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
+			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
 			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
 			'U_STOP_WATCHING_TOPIC'		=> generate_board_url() . "/viewtopic.{$this->php_ext}?uid={$this->user_id}&f={$this->get_data('forum_id')}&t={$this->item_parent_id}&unwatch=topic",
 		);
@@ -210,6 +213,8 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$this->set_data('topic_title', $post['topic_title']);
 
+		$this->set_data('post_subject', $post['post_subject']);
+
 		$this->set_data('post_username', (($post['post_username'] != $this->phpbb_container->get('user')->data['username']) ? $post['post_username'] : ''));
 
 		$this->set_data('forum_id', $post['forum_id']);
diff --git a/phpBB/includes/notifications/type/post_in_queue.php b/phpBB/includes/notifications/type/post_in_queue.php
new file mode 100644
index 0000000000..cd3a452856
--- /dev/null
+++ b/phpBB/includes/notifications/type/post_in_queue.php
@@ -0,0 +1,97 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Topic notifications class
+* This class handles notifications for new topics
+*
+* @package notifications
+*/
+class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_post
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'notifications/post_in_queue';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_POST_IN_QUEUE';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'post_in_queue';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from the post
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	{
+		/* todo
+		* find what type of notification they'd like to receive
+		*/
+		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $post['forum_id']);
+
+		if (empty($auth_approve))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		foreach ($auth_approve[$post['forum_id']]['m_approve'] as $user_id)
+		{
+			$notify_users[$user_id] = array('');
+		}
+
+		return $notify_users;
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
+
+		return $data;
+	}
+}
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
index 647f81041d..d116a40e4d 100644
--- a/phpBB/includes/notifications/type/quote.php
+++ b/phpBB/includes/notifications/type/quote.php
@@ -183,8 +183,6 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 
 		return array_merge(parent::get_email_template_variables(), array(
 			'AUTHOR_NAME'		=> htmlspecialchars_decode($user_data['username']),
-
-			'U_QUOTED_POST'		=> generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
 		));
 	}
 }
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index cfc629430b..cf56451214 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -72,7 +72,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	* Find the users who want to receive notifications
 	*
 	* @param ContainerBuilder $phpbb_container
-	* @param array $post Data from
+	* @param array $topic Data from the topic
 	*
 	* @return array
 	*/
@@ -171,6 +171,8 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 			'FORUM_NAME'				=> htmlspecialchars_decode($this->get_data('forum_name')),
 			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
 
+			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
+			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
 			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->item_parent_id}",
 			'U_STOP_WATCHING_FORUM'		=> generate_board_url() . "/viewforum.{$this->php_ext}?uid={$this->user_id}&f={$this->item_parent_id}&unwatch=forum",
 		);
diff --git a/phpBB/includes/notifications/type/topic_in_queue.php b/phpBB/includes/notifications/type/topic_in_queue.php
new file mode 100644
index 0000000000..583ab5d8b3
--- /dev/null
+++ b/phpBB/includes/notifications/type/topic_in_queue.php
@@ -0,0 +1,97 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Topic notifications class
+* This class handles notifications for new topics
+*
+* @package notifications
+*/
+class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_topic
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'notifications/topic_in_queue';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_TOPIC_IN_QUEUE';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'topic_in_queue';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $topic Data from the topic
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic)
+	{
+		/* todo
+		* find what type of notification they'd like to receive
+		*/
+		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $topic['forum_id']);
+
+		if (empty($auth_approve))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		foreach ($auth_approve[$topic['forum_id']]['m_approve'] as $user_id)
+		{
+			$notify_users[$user_id] = array('');
+		}
+
+		return $notify_users;
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $topic Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($topic)
+	{
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
+
+		return $data;
+	}
+}
-- 
cgit v1.2.1


From b081729f25dab258ac4259907ba1af1a16ee8138 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 14:47:58 -0500
Subject: [ticket/11103] Revert the changes to functions_display.php

The css we need to apply to avatars can be applied through css rules.
We don't need to be able to specify a class for the img.

PHPBB3-11103
---
 phpBB/includes/functions_display.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 84cb47867e..8328b9ee7a 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1319,11 +1319,10 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 * @param string $avatar_height Height of users avatar
 * @param string $alt Optional language string for alt tag within image, can be a language key or text
 * @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
-* @param string $custom_css Custom CSS class to apply to the image
 *
 * @return string Avatar image
 */
-function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false, $custom_css = '')
+function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false)
 {
 	global $user, $config, $phpbb_root_path, $phpEx;
 	global $phpbb_dispatcher;
@@ -1344,7 +1343,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
 	* @var	string	overwrite_avatar	If set, this string will be the avatar
 	* @since 3.1-A1
 	*/
-	$vars = array('avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'alt', 'ignore_config', 'overwrite_avatar', 'custom_css');
+	$vars = array('avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'alt', 'ignore_config', 'overwrite_avatar');
 	extract($phpbb_dispatcher->trigger_event('core.user_get_avatar', compact($vars)));
 
 	if ($overwrite_avatar)
@@ -1386,7 +1385,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
 	}
 
 	$avatar_img .= $avatar;
-	return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" ' . ($custom_css ? 'class="' . $custom_css . '"' : '') . '/>';
+	return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
 }
 
 /**
-- 
cgit v1.2.1


From a4ec7e2aea8a47fff9d7effa76a3d07a2dd6a305 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 14:50:05 -0500
Subject: [ticket/11103] Delete some notifications when deleting posts/topics

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 1cbd44e97e..55e539cb37 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -718,7 +718,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 
 	// Delete notifications
 	$phpbb_notifications = $phpbb_container->get('notifications');
-	$phpbb_notifications->delete_notifications('topic', $topic_ids);
+	$phpbb_notifications->delete_notifications(array('topic', 'approve_topic', 'topic_in_queue')), $topic_ids);
 
 	return $return;
 }
@@ -900,7 +900,7 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 
 	// Delete notifications
 	$phpbb_notifications = $phpbb_container->get('notifications');
-	$phpbb_notifications->delete_notifications('post', $post_ids);
+	$phpbb_notifications->delete_notifications(array('quote', 'bookmark', 'post', 'approve_post', 'post_in_queue'), $post_ids);
 
 	return sizeof($post_ids);
 }
-- 
cgit v1.2.1


From 661dd09d6f44b46e5a30b37bb3425058f055ea01 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 16 Sep 2012 23:03:00 -0500
Subject: [ticket/11103] Bug fix

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 55e539cb37..27128aafac 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -718,7 +718,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 
 	// Delete notifications
 	$phpbb_notifications = $phpbb_container->get('notifications');
-	$phpbb_notifications->delete_notifications(array('topic', 'approve_topic', 'topic_in_queue')), $topic_ids);
+	$phpbb_notifications->delete_notifications(array('topic', 'approve_topic', 'topic_in_queue'), $topic_ids);
 
 	return $return;
 }
-- 
cgit v1.2.1


From 98731b127748af4673fdee92db2e139e84fd4d4b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 20 Sep 2012 10:36:11 -0500
Subject: [ticket/11103] Prettify the output for prosilver.

Create a way to mark items read from the output list.

PHPBB3-11103
---
 phpBB/includes/functions.php               |  5 +-
 phpBB/includes/notifications/service.php   | 73 +++++++++++++++++++++---------
 phpBB/includes/notifications/type/base.php |  2 +
 3 files changed, 57 insertions(+), 23 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e9d673455c..92cea20d10 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4997,7 +4997,10 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 
 	// Output the notifications
 	$phpbb_notifications = $phpbb_container->get('notifications');
-	$notifications = $phpbb_notifications->load_notifications();
+	$notifications = $phpbb_notifications->load_notifications(array(
+		'all_unread'	=> true,
+		'limit'			=> 5,
+	));
 	foreach ($notifications['notifications'] as $notification)
 	{
 		$template->assign_block_vars('notifications', $notification->prepare_for_display());
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 777fa9a42f..b1ee420c2e 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -45,12 +45,14 @@ class phpbb_notifications_service
 	* Load the user's notifications
 	*
 	* @param array $options Optional options to control what notifications are loaded
-	*				user_id		User id to load notifications for (Default: $user->data['user_id'])
-	*				order_by	Order by (Default: time)
-	*				order_dir	Order direction (Default: DESC)
-	* 				limit		Number of notifications to load (Default: 5)
-	* 				start		Notifications offset (Default: 0)
-	* 				all_unread	Load all unread messages? (Default: true)
+	*				notification_id		Notification id to load (or array of notification ids)
+	*				user_id				User id to load notifications for (Default: $user->data['user_id'])
+	*				order_by			Order by (Default: time)
+	*				order_dir			Order direction (Default: DESC)
+	* 				limit				Number of notifications to load (Default: 5)
+	* 				start				Notifications offset (Default: 0)
+	* 				all_unread			Load all unread messages? If set to true, count_unread is set to true (Default: false)
+	* 				count_unread		Count all unread messages? (Default: false)
 	*/
 	public function load_notifications($options = array())
 	{
@@ -58,14 +60,19 @@ class phpbb_notifications_service
 
 		// Merge default options
 		$options = array_merge(array(
-			'user_id'		=> $user->data['user_id'],
-			'order_by'		=> 'time',
-			'order_dir'		=> 'DESC',
-			'limit'			=> 5,
-			'start'			=> 0,
-			'all_unread'	=> true,
+			'notification_id'	=> false,
+			'user_id'			=> $user->data['user_id'],
+			'order_by'			=> 'time',
+			'order_dir'			=> 'DESC',
+			'limit'				=> 0,
+			'start'				=> 0,
+			'all_unread'		=> false,
+			'count_unread'		=> false,
 		), $options);
 
+		// If all_unread, count_unread mus be true
+		$options['count_unread'] = ($options['all_unread']) ? true : $options['count_unread'];
+
 		// Anonymous users and bots never receive notifications
 		if ($options['user_id'] == $user->data['user_id'] && ($user->data['user_id'] == ANONYMOUS || $user->data['user_type'] == USER_IGNORE))
 		{
@@ -77,22 +84,27 @@ class phpbb_notifications_service
 
 		$notifications = $user_ids = array();
 		$load_special = array();
+		$count = 0;
 
-		// Get the total number of unread notifications
-		$sql = 'SELECT COUNT(*) AS count
-			FROM ' . NOTIFICATIONS_TABLE . '
-			WHERE user_id = ' . (int) $options['user_id'] . '
-				AND unread = 1';
-		$result = $this->db->sql_query($sql);
-		$count = $this->db->sql_fetchfield('count', $result);
-		$this->db->sql_freeresult($result);
+		if ($options['count_unread'])
+		{
+			// Get the total number of unread notifications
+			$sql = 'SELECT COUNT(*) AS count
+				FROM ' . NOTIFICATIONS_TABLE . '
+				WHERE user_id = ' . (int) $options['user_id'] . '
+					AND unread = 1';
+			$result = $this->db->sql_query($sql);
+			$count = (int) $this->db->sql_fetchfield('count', $result);
+			$this->db->sql_freeresult($result);
+		}
 
 		$rowset = array();
 
 		// Get the main notifications
 		$sql = 'SELECT *
 			FROM ' . NOTIFICATIONS_TABLE . '
-			WHERE user_id = ' . (int) $options['user_id'] . '
+			WHERE user_id = ' . (int) $options['user_id'] .
+				(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('notification_id', $options['notification_id']) : ' AND notification_id = ' . (int) $options['notification_id']) : '') . '
 				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 		$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
 
@@ -103,7 +115,7 @@ class phpbb_notifications_service
 		$this->db->sql_freeresult($result);
 
 		// Get all unread notifications
-		if ($options['all_unread'] && !empty($rowset))
+		if ($count && $options['all_unread'] && !empty($rowset))
 		{
 			$sql = 'SELECT *
 				FROM ' . NOTIFICATIONS_TABLE . '
@@ -221,6 +233,23 @@ class phpbb_notifications_service
 		$this->db->sql_query($sql);
 	}
 
+	/**
+	* Mark notifications read
+	*
+	* @param int|array $notification_id Notification id or array of notification ids.
+	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
+	*/
+	public function mark_notifications_read_by_id($notification_id, $time = false)
+	{
+		$time = ($time) ?: time();
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+			SET unread = 0
+			WHERE time <= " . $time . '
+				AND ' . ((is_array($notification_id)) ? $this->db->sql_in_set('notification_id', $notification_id) : 'notification_id = ' . (int) $notification_id);
+		$this->db->sql_query($sql);
+	}
+
 	/**
 	* Add a notification
 	*
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index fb75e19cad..710f1f7c6e 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -120,6 +120,8 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 			'TIME'	   			=> $user->format_date($this->time),
 
 			'UNREAD'			=> $this->unread,
+
+			'U_MARK_READ'		=> append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification[]=' . $this->notification_id),
 		);
 	}
 
-- 
cgit v1.2.1


From 3897a442f7fe0107cf71adc02af999b496bfebaf Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 20 Sep 2012 10:40:18 -0500
Subject: [ticket/11103] Bug fixing

PHPBB3-11103
---
 phpBB/includes/functions_posting.php       | 4 ++++
 phpBB/includes/notifications/type/post.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 4dd840ad53..4ae5989fed 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2229,6 +2229,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$phpbb_notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
 					'post_username'		=> $username,
 					'poster_id'			=> (int) $user->data['user_id'],
+					'post_time'			=> $current_time,
 				)));
 			break;
 
@@ -2238,6 +2239,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 					'post_username'		=> $username,
 					'poster_id'			=> (int) $user->data['user_id'],
 					'post_text'			=> $data['message'],
+					'post_time'			=> $current_time,
 				)));
 			break;
 
@@ -2265,6 +2267,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$phpbb_notifications->add_notifications(array('topic_in_queue'), array_merge($data, array(
 					'post_username'		=> $username,
 					'poster_id'			=> (int) $user->data['user_id'],
+					'post_time'			=> $current_time,
 				)));
 			break;
 
@@ -2273,6 +2276,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$phpbb_notifications->add_notifications(array('post_in_queue'), array_merge($data, array(
 					'post_username'		=> $username,
 					'poster_id'			=> (int) $user->data['user_id'],
+					'post_time'			=> $current_time,
 				)));
 			break;
 
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 8e801a2595..17a7a6863a 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -215,7 +215,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$this->set_data('post_subject', $post['post_subject']);
 
-		$this->set_data('post_username', (($post['post_username'] != $this->phpbb_container->get('user')->data['username']) ? $post['post_username'] : ''));
+		$this->set_data('post_username', (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''));
 
 		$this->set_data('forum_id', $post['forum_id']);
 
-- 
cgit v1.2.1


From aa3f6f4002094d29952d0383107af687bf7dcb15 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Sep 2012 10:10:10 -0500
Subject: [ticket/11103] Fixing some bugs with the post/topic notifications

PHPBB3-11103
---
 phpBB/includes/functions_posting.php        | 43 +++++++++--------------------
 phpBB/includes/notifications/type/quote.php |  8 +++++-
 phpBB/includes/notifications/type/topic.php |  2 +-
 3 files changed, 21 insertions(+), 32 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 4ae5989fed..41bdd9f598 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2221,41 +2221,32 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 
 	// Send Notifications
 	$phpbb_notifications = $phpbb_container->get('notifications');
+	$notification_data = array_merge($data, array(
+		'topic_title'		=> (isset($data['topic_title'])) ? $data['topic_title'] : $subject,
+		'post_username'		=> $username,
+		'poster_id'			=> $poster_id,
+		'post_text'			=> $data['message'],
+		'post_time'			=> $current_time,
+		'post_subject'		=> $subject,
+	));
 	if ($post_approval)
 	{
 		switch ($mode)
 		{
 			case 'post' :
-				$phpbb_notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
-					'post_username'		=> $username,
-					'poster_id'			=> (int) $user->data['user_id'],
-					'post_time'			=> $current_time,
-				)));
+				$phpbb_notifications->add_notifications(array('topic', 'quote'), $notification_data);
 			break;
 
 			case 'reply' :
 			case 'quote' :
-				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
-					'post_username'		=> $username,
-					'poster_id'			=> (int) $user->data['user_id'],
-					'post_text'			=> $data['message'],
-					'post_time'			=> $current_time,
-				)));
+				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $notification_data);
 			break;
 
 			case 'edit_topic' :
 			case 'edit_first_post' :
 			case 'edit' :
 			case 'edit_last_post' :
-				$phpbb_notifications->update_notifications('topic', array_merge($data, array(
-					'post_username'		=> $username,
-					'topic_title'		=> $subject,
-				)));
-
-				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
-					'post_username'		=> $username,
-					'post_text'			=> $data['message'],
-				)));
+				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'topic', 'post'), $notification_data);
 			break;
 		}
 	}
@@ -2264,20 +2255,12 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post' :
-				$phpbb_notifications->add_notifications(array('topic_in_queue'), array_merge($data, array(
-					'post_username'		=> $username,
-					'poster_id'			=> (int) $user->data['user_id'],
-					'post_time'			=> $current_time,
-				)));
+				$phpbb_notifications->add_notifications(array('topic_in_queue'), $notification_data);
 			break;
 
 			case 'reply' :
 			case 'quote' :
-				$phpbb_notifications->add_notifications(array('post_in_queue'), array_merge($data, array(
-					'post_username'		=> $username,
-					'poster_id'			=> (int) $user->data['user_id'],
-					'post_time'			=> $current_time,
-				)));
+				$phpbb_notifications->add_notifications(array('post_in_queue'), $notification_data);
 			break;
 
 			case 'edit_topic' :
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
index d116a40e4d..2079617510 100644
--- a/phpBB/includes/notifications/type/quote.php
+++ b/phpBB/includes/notifications/type/quote.php
@@ -37,7 +37,7 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 	*
 	* @var string
 	*/
-	protected static $regular_expression_match = '#\[quote=&quot;(.+?)&quot;:#';
+	protected static $regular_expression_match = '#\[quote=&quot;(.+?)&quot;#';
 
 	/**
 	* Language key used to output the text
@@ -155,6 +155,12 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 			$add_notifications[$user_id] = $notifications[$user_id];
 		}
 
+		// todo Adding notifications while editing a post can be funky.
+		// If the user has read the topic/post already, and the user is newly quoted it an edit,
+		// The notification will be stuck as unread until another post is made and the user visits
+		// the topic again because the posts will not be marked as read since the topic is already
+		// marked as read
+
 		// Add the necessary notifications
 		$service->add_notifications_for_users(self::get_item_type(), $post, $add_notifications);
 
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index cf56451214..733b2108cc 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -212,7 +212,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 
 		$this->set_data('topic_title', $post['topic_title']);
 
-		$this->set_data('post_username', (($post['post_username'] != $this->phpbb_container->get('user')->data['username']) ? $post['post_username'] : ''));
+		$this->set_data('post_username', (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''));
 
 		$this->set_data('forum_name', $post['forum_name']);
 
-- 
cgit v1.2.1


From 3242ce0d3aa395b2c603e9172dfb17bcc5f081de Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Sep 2012 10:35:50 -0500
Subject: [ticket/11103] Add/delete subscription functions for the service

PHPBB3-11103
---
 phpBB/includes/notifications/service.php | 38 ++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index b1ee420c2e..feeafe09a5 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -439,21 +439,51 @@ class phpbb_notifications_service
 		$this->db->sql_query($sql);
 	}
 
-/*
-	public function add_subscription($item_type, $item_id, $method = '')
+	/**
+	* Add a subscription
+	*
+	* @param string $item_type Type identifier of the subscription
+	* @param int $item_id The id of the item
+	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
+	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
+	*/
+	public function add_subscription($item_type, $item_id, $method = '', $user_id = false)
 	{
 		$this->get_item_type_class_name($item_type);
 
+		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
+
 		$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
 			$this->db->sql_build_array('INSERT', array(
 				'item_type'		=> $item_type,
 				'item_id'		=> (int) $item_id,
-				'user_id'		=> $this->phpbb_container->get('user')->data['user_id'],
+				'user_id'		=> (int) $user_id,
 				'method'		=> $method,
 			));
 		$this->db->sql_query($sql);
 	}
-*/
+
+	/**
+	* Delete a subscription
+	*
+	* @param string $item_type Type identifier of the subscription
+	* @param int $item_id The id of the item
+	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
+	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
+	*/
+	public function delete_subscription($item_type, $item_id, $method = '', $user_id = false)
+	{
+		$this->get_item_type_class_name($item_type);
+
+		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
+
+		$sql = 'DELETE FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id . '
+				AND user_id = ' .(int) $user_id . "
+				AND method = '" . $this->db->sql_escape($method) . "'";
+		$this->db->sql_query($sql);
+	}
 
 	/**
 	* Load user helper
-- 
cgit v1.2.1


From 28c8c0ce463290b1b4085daafccc24f4297c0d23 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Sep 2012 21:48:59 -0500
Subject: [ticket/11103] Get subscription types/methods functions in the
 service

PHPBB3-11103
---
 phpBB/includes/notifications/service.php | 69 ++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index feeafe09a5..a174193491 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -439,6 +439,43 @@ class phpbb_notifications_service
 		$this->db->sql_query($sql);
 	}
 
+	/**
+	* Get all of the subscription types
+	*
+	* @return array Array of item types
+	*/
+	public function get_subscription_types()
+	{
+		$subscription_types = array();
+
+		foreach ($this->get_subscription_files('notifications/type/') as $class => $file)
+		{
+			$class = $this->get_item_type_class_name($class);
+
+			if (!class_exists($class))
+			{
+				include($file);
+			}
+
+			if (method_exists($class, 'get_item_type'))
+			{
+				$subscription_types[] = $class::get_item_type();
+			}
+		}
+
+		return $subscription_types;
+	}
+
+	/**
+	* Get all of the subscription methods
+	*
+	* @return array Array of methods
+	*/
+	public function get_subscription_methods()
+	{
+		return array_keys($this->get_subscription_files('notifications/method/'));
+	}
+
 	/**
 	* Add a subscription
 	*
@@ -536,4 +573,36 @@ class phpbb_notifications_service
 
 		return 'phpbb_notifications_type_' . $item_type;
 	}
+
+	/**
+	* Helper to get subscription related files with the finder
+	*/
+	private function get_subscription_files($path)
+	{
+		$ext_manager = $this->phpbb_container->get('ext.manager');
+		$php_ext = $this->phpbb_container->getParameter('core.php_ext');
+
+		$finder = $ext_manager->get_finder();
+
+		$subscription_files = array();
+
+		$files = $finder
+			->core_path('includes/' . $path)
+			->extension_directory($path)
+			->get_files();
+		foreach ($files as $file)
+		{
+			$class = substr($file, strrpos($file, '/'));
+			$class = substr($class, 1, (strpos($class, '.' . $php_ext) - 1));
+
+			if ($class == 'interface' || $class == 'base')
+			{
+				continue;
+			}
+
+			$subscription_files[$class] = $file;
+		}
+
+		return $subscription_files;
+	}
 }
-- 
cgit v1.2.1


From b052741fcb0b3cab4317a759ec935518bef7c73b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Sep 2012 21:50:21 -0500
Subject: [ticket/11103] UCP base files for notification options

PHPBB3-11103
---
 phpBB/includes/ucp/info/ucp_notifications.php | 34 +++++++++++++++++++++++++++
 phpBB/includes/ucp/ucp_notifications.php      | 26 ++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 phpBB/includes/ucp/info/ucp_notifications.php
 create mode 100644 phpBB/includes/ucp/ucp_notifications.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/info/ucp_notifications.php b/phpBB/includes/ucp/info/ucp_notifications.php
new file mode 100644
index 0000000000..f1e6bf65b8
--- /dev/null
+++ b/phpBB/includes/ucp/info/ucp_notifications.php
@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @package module_install
+*/
+class ucp_notifications_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'ucp_notifications',
+			'title'		=> 'UCP_NOTIFICATIONS',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'notification_options'		=> array('title' => 'UCP_NOTIFICATION_OPTIONS', 'auth' => '', 'cat' => array('UCP_MAIN')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
new file mode 100644
index 0000000000..92a899af7d
--- /dev/null
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -0,0 +1,26 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class ucp_notifications
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+
+	}
+}
-- 
cgit v1.2.1


From e66117409c68242832f76cdb456d16c40573639e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Sep 2012 22:39:12 -0500
Subject: [ticket/11103] More work on the UCP Notifications page

PHPBB3-11103
---
 phpBB/includes/notifications/service.php | 21 ++++++-
 phpBB/includes/ucp/ucp_notifications.php | 95 +++++++++++++++++++++++++++++++-
 2 files changed, 113 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index a174193491..3160864f37 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -473,7 +473,26 @@ class phpbb_notifications_service
 	*/
 	public function get_subscription_methods()
 	{
-		return array_keys($this->get_subscription_files('notifications/method/'));
+		$subscription_methods = array();
+
+		foreach ($this->get_subscription_files('notifications/method/') as $method_name => $file)
+		{
+			$class_name = 'phpbb_notifications_method_' . $method_name;
+
+			if (!class_exists($class_name))
+			{
+				include($file);
+			}
+
+			$method = new $class_name($this->phpbb_container);
+
+			if ($method->is_available())
+			{
+				$subscription_methods[] = $method_name;
+			}
+		}
+
+		return $subscription_methods;
 	}
 
 	/**
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 92a899af7d..0a01cd1cde 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -17,10 +17,101 @@ if (!defined('IN_PHPBB'))
 
 class ucp_notifications
 {
-	var $u_action;
+	public $u_action;
 
-	function main($id, $mode)
+	public function main($id, $mode)
 	{
+		global $phpbb_container;
 
+		$phpbb_notifications = $phpbb_container->get('notifications');
+		$template = $phpbb_container->get('template');
+		$user = $phpbb_container->get('user');
+		$request = $phpbb_container->get('request');
+
+		if ($request->is_set_post('submit'))
+		{
+			$notification_methods = $phpbb_notifications->get_subscription_methods();
+			foreach($phpbb_notifications->get_subscription_types() as $type)
+			{
+				if ($request->is_set_post($type . '_notification'))
+				{
+					// add
+				}
+				else
+				{
+					// remove
+				}
+
+				foreach($notification_methods as $method)
+				{
+					if ($request->is_set_post($type . '_' . $method))
+					{
+						// add
+					}
+					else
+					{
+						// remove
+					}
+				}
+			}
+		}
+
+		// todo include language files for extensions?
+
+		$this->output_notification_methods('notification_methods', $phpbb_notifications, $template, $user);
+
+		$this->output_notification_types('notification_types', $phpbb_notifications, $template, $user);
+
+		$this->tpl_name = 'ucp_notifications';
+		$this->page_title = 'UCP_NOTIFICATIONS';
+	}
+
+	/**
+	* Output all the notification types to the template
+	*
+	* @param string $block
+	* @param phpbb_notifications_service $phpbb_notifications
+	* @param phpbb_template $template
+	* @param phpbb_user $user
+	*/
+	public function output_notification_types($block = 'notification_types', phpbb_notifications_service $phpbb_notifications, phpbb_template $template, phpbb_user $user)
+	{
+		foreach($phpbb_notifications->get_subscription_types() as $type)
+		{
+			$template->assign_block_vars($block, array(
+				'TYPE'				=> $type,
+
+				'NAME'				=> $user->lang('NOTIFICATION_TYPE_' . strtoupper($type)),
+			));
+
+			$this->output_notification_methods($block . '.notification_methods', $phpbb_notifications, $template, $user);
+		}
+	}
+
+	/**
+	* Output all the notification methods to the template
+	*
+	* @param string $block
+	* @param phpbb_notifications_service $phpbb_notifications
+	* @param phpbb_template $template
+	* @param phpbb_user $user
+	*/
+	public function output_notification_methods($block = 'notification_methods', phpbb_notifications_service $phpbb_notifications, phpbb_template $template, phpbb_user $user)
+	{
+		static $notification_methods = false;
+
+		if ($notification_methods === false)
+		{
+			$notification_methods = $phpbb_notifications->get_subscription_methods();
+		}
+
+		foreach($notification_methods as $method)
+		{
+			$template->assign_block_vars($block, array(
+				'METHOD'			=> $method,
+
+				'NAME'				=> $user->lang('NOTIFICATION_METHOD_' . strtoupper($method)),
+			));
+		}
 	}
 }
-- 
cgit v1.2.1


From ae91a0a846828b44a53c2a7cd724e0ba062b0f3e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 10:37:37 -0500
Subject: [ticket/11103] Allow grouping of multiple types in ucp notification
 options

Ability to hide notification types from UCP Notification options
(if users do not have permission to use the notification type, or for
whatever reason they should not see it)

PHPBB3-11103
---
 phpBB/includes/notifications/service.php           | 15 ++++++--
 phpBB/includes/notifications/type/approve_post.php | 11 ++++++
 .../includes/notifications/type/approve_topic.php  | 11 ++++++
 phpBB/includes/notifications/type/base.php         | 16 ++++++++
 .../notifications/type/disapprove_post.php         | 11 ++++++
 .../notifications/type/disapprove_topic.php        | 11 ++++++
 phpBB/includes/notifications/type/interface.php    |  2 +
 .../includes/notifications/type/post_in_queue.php  | 41 ++++++++++++++++++---
 .../includes/notifications/type/topic_in_queue.php | 43 +++++++++++++++++++---
 phpBB/includes/ucp/info/ucp_notifications.php      |  2 +-
 phpBB/includes/ucp/ucp_notifications.php           |  4 +-
 11 files changed, 150 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 3160864f37..174b73f9a5 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -457,9 +457,16 @@ class phpbb_notifications_service
 				include($file);
 			}
 
-			if (method_exists($class, 'get_item_type'))
+			if ($class::is_available($this->phpbb_container) && method_exists($class, 'get_item_type'))
 			{
-				$subscription_types[] = $class::get_item_type();
+				if ($class::$notification_option === false)
+				{
+					$subscription_types[$class::get_item_type()] = $class::get_item_type();
+				}
+				else
+				{
+					$subscription_types[$class::$notification_option['id']] = $class::$notification_option;
+				}
 			}
 		}
 
@@ -548,6 +555,8 @@ class phpbb_notifications_service
 	*/
 	public function load_users($user_ids)
 	{
+		$user_ids[] = ANONYMOUS;
+
 		// Load the users
 		$user_ids = array_unique($user_ids);
 
@@ -577,7 +586,7 @@ class phpbb_notifications_service
 	*/
 	public function get_user($user_id)
 	{
-		return $this->users[$user_id];
+		return (isset($this->users[$user_id])) ? $this->users[$user_id] : $this->users[ANONYMOUS];
 	}
 
 	/**
diff --git a/phpBB/includes/notifications/type/approve_post.php b/phpBB/includes/notifications/type/approve_post.php
index b5e5cfd337..a3a52b8780 100644
--- a/phpBB/includes/notifications/type/approve_post.php
+++ b/phpBB/includes/notifications/type/approve_post.php
@@ -39,6 +39,17 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
 	*/
 	protected $language_key = 'NOTIFICATION_POST_APPROVED';
 
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'moderation_queue',
+		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+	);
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notifications_type_
diff --git a/phpBB/includes/notifications/type/approve_topic.php b/phpBB/includes/notifications/type/approve_topic.php
index 3ba871599e..ba7227c671 100644
--- a/phpBB/includes/notifications/type/approve_topic.php
+++ b/phpBB/includes/notifications/type/approve_topic.php
@@ -39,6 +39,17 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to
 	*/
 	protected $language_key = 'NOTIFICATION_TOPIC_APPROVED';
 
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'moderation_queue',
+		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+	);
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notifications_type_
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 710f1f7c6e..0da4dc8d93 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -36,6 +36,14 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	*/
 	protected $users = array();
 
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = false;
+
 	/**
 	* Indentification data
 	* item_type
@@ -236,6 +244,14 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		return;
 	}
 
+	/**
+	* Is available (fall-back)
+	*/
+	public static function is_available(ContainerBuilder $phpbb_container)
+	{
+		return true;
+	}
+
 	/**
 	* -------------- Helper functions -------------------
 	*/
diff --git a/phpBB/includes/notifications/type/disapprove_post.php b/phpBB/includes/notifications/type/disapprove_post.php
index e0b7bfb178..6911af5b08 100644
--- a/phpBB/includes/notifications/type/disapprove_post.php
+++ b/phpBB/includes/notifications/type/disapprove_post.php
@@ -39,6 +39,17 @@ class phpbb_notifications_type_disapprove_post extends phpbb_notifications_type_
 	*/
 	protected $language_key = 'NOTIFICATION_POST_DISAPPROVED';
 
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'moderation_queue',
+		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+	);
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notifications_type_
diff --git a/phpBB/includes/notifications/type/disapprove_topic.php b/phpBB/includes/notifications/type/disapprove_topic.php
index 7ad4c4edb8..dab5ec1b02 100644
--- a/phpBB/includes/notifications/type/disapprove_topic.php
+++ b/phpBB/includes/notifications/type/disapprove_topic.php
@@ -39,6 +39,17 @@ class phpbb_notifications_type_disapprove_topic extends phpbb_notifications_type
 	*/
 	protected $language_key = 'NOTIFICATION_TOPIC_DISAPPROVED';
 
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'moderation_queue',
+		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+	);
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notifications_type_
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index de08576a38..c85d7441f6 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -25,6 +25,8 @@ interface phpbb_notifications_type_interface
 
 	public static function get_item_id($type_data);
 
+	public static function is_available(ContainerBuilder $phpbb_container);
+
 	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $type_data);
 
 	public function get_title();
diff --git a/phpBB/includes/notifications/type/post_in_queue.php b/phpBB/includes/notifications/type/post_in_queue.php
index cd3a452856..0043a38944 100644
--- a/phpBB/includes/notifications/type/post_in_queue.php
+++ b/phpBB/includes/notifications/type/post_in_queue.php
@@ -39,6 +39,17 @@ class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_po
 	*/
 	protected $language_key = 'NOTIFICATION_POST_IN_QUEUE';
 
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'needs_approval',
+		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
+	);
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notifications_type_
@@ -48,6 +59,16 @@ class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_po
 		return 'post_in_queue';
 	}
 
+	/**
+	* Is available
+	*/
+	public static function is_available(ContainerBuilder $phpbb_container)
+	{
+		$m_approve = $phpbb_container->get('auth')->acl_getf('m_approve', true);
+
+		return (!empty($m_approve));
+	}
+
 	/**
 	* Find the users who want to receive notifications
 	*
@@ -58,9 +79,8 @@ class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_po
 	*/
 	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
 	{
-		/* todo
-		* find what type of notification they'd like to receive
-		*/
+		$db = $phpbb_container->get('dbal.conn');
+
 		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $post['forum_id']);
 
 		if (empty($auth_approve))
@@ -70,10 +90,21 @@ class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_po
 
 		$notify_users = array();
 
-		foreach ($auth_approve[$post['forum_id']]['m_approve'] as $user_id)
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = 'needs_approval'
+				AND " . $db->sql_in_set('user_id', $auth_approve[$topic['forum_id']]['m_approve']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
 		{
-			$notify_users[$user_id] = array('');
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
 		}
+		$db->sql_freeresult($result);
 
 		return $notify_users;
 	}
diff --git a/phpBB/includes/notifications/type/topic_in_queue.php b/phpBB/includes/notifications/type/topic_in_queue.php
index 583ab5d8b3..dda647d18e 100644
--- a/phpBB/includes/notifications/type/topic_in_queue.php
+++ b/phpBB/includes/notifications/type/topic_in_queue.php
@@ -39,6 +39,27 @@ class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_t
 	*/
 	protected $language_key = 'NOTIFICATION_TOPIC_IN_QUEUE';
 
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'needs_approval',
+		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
+	);
+
+	/**
+	* Is available
+	*/
+	public static function is_available(ContainerBuilder $phpbb_container)
+	{
+		$m_approve = $phpbb_container->get('auth')->acl_getf('m_approve', true);
+
+		return (!empty($m_approve));
+	}
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notifications_type_
@@ -58,9 +79,8 @@ class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_t
 	*/
 	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic)
 	{
-		/* todo
-		* find what type of notification they'd like to receive
-		*/
+		$db = $phpbb_container->get('dbal.conn');
+
 		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $topic['forum_id']);
 
 		if (empty($auth_approve))
@@ -70,10 +90,21 @@ class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_t
 
 		$notify_users = array();
 
-		foreach ($auth_approve[$topic['forum_id']]['m_approve'] as $user_id)
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = 'needs_approval'
+				AND " . $db->sql_in_set('user_id', $auth_approve[$topic['forum_id']]['m_approve']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
 		{
-			$notify_users[$user_id] = array('');
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
 		}
+		$db->sql_freeresult($result);
 
 		return $notify_users;
 	}
@@ -88,7 +119,7 @@ class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_t
 	*/
 	public function create_insert_array($topic)
 	{
-		$data = parent::create_insert_array($post);
+		$data = parent::create_insert_array($topic);
 
 		$this->time = $data['time'] = time();
 
diff --git a/phpBB/includes/ucp/info/ucp_notifications.php b/phpBB/includes/ucp/info/ucp_notifications.php
index f1e6bf65b8..4bc9ae2cea 100644
--- a/phpBB/includes/ucp/info/ucp_notifications.php
+++ b/phpBB/includes/ucp/info/ucp_notifications.php
@@ -16,7 +16,7 @@ class ucp_notifications_info
 	{
 		return array(
 			'filename'	=> 'ucp_notifications',
-			'title'		=> 'UCP_NOTIFICATIONS',
+			'title'		=> 'UCP_NOTIFICATION_OPTIONS',
 			'version'	=> '1.0.0',
 			'modes'		=> array(
 				'notification_options'		=> array('title' => 'UCP_NOTIFICATION_OPTIONS', 'auth' => '', 'cat' => array('UCP_MAIN')),
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 0a01cd1cde..86052ada14 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -76,12 +76,12 @@ class ucp_notifications
 	*/
 	public function output_notification_types($block = 'notification_types', phpbb_notifications_service $phpbb_notifications, phpbb_template $template, phpbb_user $user)
 	{
-		foreach($phpbb_notifications->get_subscription_types() as $type)
+		foreach($phpbb_notifications->get_subscription_types() as $type => $data)
 		{
 			$template->assign_block_vars($block, array(
 				'TYPE'				=> $type,
 
-				'NAME'				=> $user->lang('NOTIFICATION_TYPE_' . strtoupper($type)),
+				'NAME'				=> (isset($data['lang'])) ? $user->lang($data['lang']) : $user->lang('NOTIFICATION_TYPE_' . strtoupper($type)),
 			));
 
 			$this->output_notification_methods($block . '.notification_methods', $phpbb_notifications, $template, $user);
-- 
cgit v1.2.1


From f062087f30fab4ce497333cd88735920efe0737f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 10:42:50 -0500
Subject: [ticket/11103] Approve/disapprove notification options

PHPBB3-11103
---
 phpBB/includes/notifications/type/approve_post.php  | 21 +++++++++++++++------
 phpBB/includes/notifications/type/approve_topic.php | 21 +++++++++++++++------
 2 files changed, 30 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/type/approve_post.php b/phpBB/includes/notifications/type/approve_post.php
index a3a52b8780..91fb4106b1 100644
--- a/phpBB/includes/notifications/type/approve_post.php
+++ b/phpBB/includes/notifications/type/approve_post.php
@@ -69,11 +69,9 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
 	*/
 	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
 	{
-		$users = array();
+		$db = $phpbb_container->get('dbal.conn');
 
-		/* todo
-		* find what type of notification they'd like to receive
-		*/
+		$users = array();
 		$users[$post['poster_id']] = array('');
 
 		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
@@ -85,10 +83,21 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
 
 		$notify_users = array();
 
-		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = 'moderation_queue'
+				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
 		{
-			$notify_users[$user_id] = $users[$user_id];
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
 		}
+		$db->sql_freeresult($result);
 
 		return $notify_users;
 	}
diff --git a/phpBB/includes/notifications/type/approve_topic.php b/phpBB/includes/notifications/type/approve_topic.php
index ba7227c671..7da6fde747 100644
--- a/phpBB/includes/notifications/type/approve_topic.php
+++ b/phpBB/includes/notifications/type/approve_topic.php
@@ -69,11 +69,9 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to
 	*/
 	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
 	{
-		$users = array();
+		$db = $phpbb_container->get('dbal.conn');
 
-		/* todo
-		* find what type of notification they'd like to receive
-		*/
+		$users = array();
 		$users[$post['poster_id']] = array('');
 
 		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
@@ -85,10 +83,21 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to
 
 		$notify_users = array();
 
-		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = 'moderation_queue'
+				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
 		{
-			$notify_users[$user_id] = $users[$user_id];
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
 		}
+		$db->sql_freeresult($result);
 
 		return $notify_users;
 	}
-- 
cgit v1.2.1


From 48ccc9eb93c8413f05f6a50d40e597f560c671d8 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 18:25:37 -0500
Subject: [ticket/11103] UCP Notification Options can now be set

PHPBB3-11103
---
 phpBB/includes/functions.php             |  1 +
 phpBB/includes/notifications/service.php | 44 ++++++++++++++++++++++++++++++--
 phpBB/includes/ucp/ucp_notifications.php | 43 +++++++++++++++++++++----------
 3 files changed, 73 insertions(+), 15 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 92cea20d10..92d72b6636 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5021,6 +5021,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'PRIVATE_MESSAGE_INFO'			=> $l_privmsgs_text,
 		'PRIVATE_MESSAGE_INFO_UNREAD'	=> $l_privmsgs_text_unread,
 		'NUM_UNREAD_NOTIFICATIONS'		=> $notifications['unread_count'],
+		'NOTIFICATIONS_CNT'				=> $user->lang('NOTIFICATIONS_CNT', $notifications['unread_count']),
 
 		'S_USER_NEW_PRIVMSG'			=> $user->data['user_new_privmsg'],
 		'S_USER_UNREAD_PRIVMSG'			=> $user->data['user_unread_privmsg'],
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 174b73f9a5..2c1eb859c7 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -502,6 +502,46 @@ class phpbb_notifications_service
 		return $subscription_methods;
 	}
 
+	/**
+	* Get subscriptions
+	*
+	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
+	* @param bool $only_global True to select only global subscription options (item_id = 0)
+	*
+	* @return array Subscriptions
+	*/
+	public function get_subscriptions($user_id = false, $only_global = false)
+	{
+		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
+
+		$subscriptions = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . '
+			WHERE user_id = ' . (int) $user_id .
+				(($only_global) ? ' AND item_id = 0' : '');
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if ($only_global)
+			{
+				if (!isset($subscriptions[$row['item_type']]))
+				{
+					$subscriptions[$row['item_type']] = array();
+				}
+
+				$subscriptions[$row['item_type']][] = $row['method'];
+			}
+			else
+			{
+				$subscriptions[] = $row;
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		return $subscriptions;
+	}
+
 	/**
 	* Add a subscription
 	*
@@ -510,7 +550,7 @@ class phpbb_notifications_service
 	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
 	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
 	*/
-	public function add_subscription($item_type, $item_id, $method = '', $user_id = false)
+	public function add_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
 	{
 		$this->get_item_type_class_name($item_type);
 
@@ -534,7 +574,7 @@ class phpbb_notifications_service
 	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
 	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
 	*/
-	public function delete_subscription($item_type, $item_id, $method = '', $user_id = false)
+	public function delete_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
 	{
 		$this->get_item_type_class_name($item_type);
 
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 86052ada14..ad399ca290 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -28,29 +28,37 @@ class ucp_notifications
 		$user = $phpbb_container->get('user');
 		$request = $phpbb_container->get('request');
 
+		$subscriptions = $phpbb_notifications->get_subscriptions(false, true);
+
+		// Add/remove subscriptions
 		if ($request->is_set_post('submit'))
 		{
 			$notification_methods = $phpbb_notifications->get_subscription_methods();
-			foreach($phpbb_notifications->get_subscription_types() as $type)
+
+			foreach($phpbb_notifications->get_subscription_types() as $type => $data)
 			{
-				if ($request->is_set_post($type . '_notification'))
+				if ($request->is_set_post($type . '_notification') && !isset($subscriptions[$type]))
 				{
 					// add
+					$phpbb_notifications->add_subscription($type);
 				}
-				else
+				else if (!$request->is_set_post($type . '_notification') && isset($subscriptions[$type]))
 				{
 					// remove
+					$phpbb_notifications->delete_subscription($type);
 				}
 
 				foreach($notification_methods as $method)
 				{
-					if ($request->is_set_post($type . '_' . $method))
+					if ($request->is_set_post($type . '_' . $method) && (!isset($subscriptions[$type]) || !in_array($method, $subscriptions[$type])))
 					{
 						// add
+						$phpbb_notifications->add_subscription($type, 0, $method);
 					}
-					else
+					else if (!$request->is_set_post($type . '_' . $method) && isset($subscriptions[$type]) && in_array($method, $subscriptions[$type]))
 					{
 						// remove
+						$phpbb_notifications->delete_subscription($type, 0, $method);
 					}
 				}
 			}
@@ -76,15 +84,29 @@ class ucp_notifications
 	*/
 	public function output_notification_types($block = 'notification_types', phpbb_notifications_service $phpbb_notifications, phpbb_template $template, phpbb_user $user)
 	{
+		$notification_methods = $phpbb_notifications->get_subscription_methods();
+		$subscriptions = $phpbb_notifications->get_subscriptions(false, true);
+
 		foreach($phpbb_notifications->get_subscription_types() as $type => $data)
 		{
 			$template->assign_block_vars($block, array(
 				'TYPE'				=> $type,
 
-				'NAME'				=> (isset($data['lang'])) ? $user->lang($data['lang']) : $user->lang('NOTIFICATION_TYPE_' . strtoupper($type)),
+				'NAME'				=> (is_array($data) && isset($data['lang'])) ? $user->lang($data['lang']) : $user->lang('NOTIFICATION_TYPE_' . strtoupper($type)),
+
+				'SUBSCRIBED'		=> (isset($subscriptions[$type])) ? true : false,
 			));
 
-			$this->output_notification_methods($block . '.notification_methods', $phpbb_notifications, $template, $user);
+			foreach($notification_methods as $method)
+			{
+				$template->assign_block_vars($block . '.notification_methods', array(
+					'METHOD'			=> $method,
+
+					'NAME'				=> $user->lang('NOTIFICATION_METHOD_' . strtoupper($method)),
+
+					'SUBSCRIBED'		=> (isset($subscriptions[$type]) && in_array($method, $subscriptions[$type])) ? true : false,
+				));
+			}
 		}
 	}
 
@@ -98,12 +120,7 @@ class ucp_notifications
 	*/
 	public function output_notification_methods($block = 'notification_methods', phpbb_notifications_service $phpbb_notifications, phpbb_template $template, phpbb_user $user)
 	{
-		static $notification_methods = false;
-
-		if ($notification_methods === false)
-		{
-			$notification_methods = $phpbb_notifications->get_subscription_methods();
-		}
+		$notification_methods = $phpbb_notifications->get_subscription_methods();
 
 		foreach($notification_methods as $method)
 		{
-- 
cgit v1.2.1


From 858201cc1f96a749fbcc875d54d033cbe4aeb8ea Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 18:41:07 -0500
Subject: [ticket/11103] Types now all send notifications as per user setting

PHPBB3-11103
---
 phpBB/includes/notifications/type/approve_post.php |  2 +-
 .../includes/notifications/type/approve_topic.php  |  2 +-
 phpBB/includes/notifications/type/bookmark.php     | 28 +++++++++++++--------
 phpBB/includes/notifications/type/post.php         | 25 +++++++++++++------
 .../includes/notifications/type/post_in_queue.php  |  2 +-
 phpBB/includes/notifications/type/quote.php        | 28 +++++++++++++--------
 phpBB/includes/notifications/type/topic.php        | 29 +++++++++++++---------
 .../includes/notifications/type/topic_in_queue.php |  2 +-
 8 files changed, 72 insertions(+), 46 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/type/approve_post.php b/phpBB/includes/notifications/type/approve_post.php
index 91fb4106b1..faa88e862c 100644
--- a/phpBB/includes/notifications/type/approve_post.php
+++ b/phpBB/includes/notifications/type/approve_post.php
@@ -85,7 +85,7 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = 'moderation_queue'
+			WHERE item_type = '" . self::$notification_option['id'] . "'
 				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
diff --git a/phpBB/includes/notifications/type/approve_topic.php b/phpBB/includes/notifications/type/approve_topic.php
index 7da6fde747..fbe44c8a2c 100644
--- a/phpBB/includes/notifications/type/approve_topic.php
+++ b/phpBB/includes/notifications/type/approve_topic.php
@@ -85,7 +85,7 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = 'moderation_queue'
+			WHERE item_type = '" . self::$notification_option['id'] . "'
 				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
diff --git a/phpBB/includes/notifications/type/bookmark.php b/phpBB/includes/notifications/type/bookmark.php
index 9f2c2e26dc..0e5358b105 100644
--- a/phpBB/includes/notifications/type/bookmark.php
+++ b/phpBB/includes/notifications/type/bookmark.php
@@ -62,28 +62,23 @@ class phpbb_notifications_type_bookmark extends phpbb_notifications_type_post
 
 		$users = array();
 
-		/* todo
-		* find what type of notification they'd like to receive
-		*/
 		$sql = 'SELECT user_id
 			FROM ' . BOOKMARKS_TABLE . '
-			WHERE ' . $db->sql_in_set('topic_id', $post['topic_id']);
+			WHERE ' . $db->sql_in_set('topic_id', $post['topic_id']) . '
+				AND user_id <> ' . (int) $post['poster_id'];
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
-			$users[$row['user_id']] = array('');
+			$users[] = $row['user_id'];
 		}
 		$db->sql_freeresult($result);
 
-		// Never notify the poster
-		unset($users[$post['poster_id']]);
-
 		if (empty($users))
 		{
 			return array();
 		}
 
-		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
 
 		if (empty($auth_read))
 		{
@@ -92,10 +87,21 @@ class phpbb_notifications_type_bookmark extends phpbb_notifications_type_post
 
 		$notify_users = array();
 
-		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
 		{
-			$notify_users[$user_id] = $users[$user_id];
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
 		}
+		$db->sql_freeresult($result);
 
 		return $notify_users;
 	}
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 17a7a6863a..bf41d2b05e 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -93,23 +93,21 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		$sql = 'SELECT user_id
 			FROM ' . TOPICS_WATCH_TABLE . '
 			WHERE topic_id = ' . (int) $post['topic_id'] . '
-				AND notify_status = ' . NOTIFY_YES;
+				AND notify_status = ' . NOTIFY_YES . '
+				AND user_id <> ' . (int) $post['poster_id'];
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
-			$users[$row['user_id']] = array('');
+			$users[] = $row['user_id'];
 		}
 		$db->sql_freeresult($result);
 
-		// Never notify the poster
-		unset($users[$post['poster_id']]);
-
 		if (empty($users))
 		{
 			return array();
 		}
 
-		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
 
 		if (empty($auth_read))
 		{
@@ -118,10 +116,21 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$notify_users = array();
 
-		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
 		{
-			$notify_users[$user_id] = $users[$user_id];
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
 		}
+		$db->sql_freeresult($result);
 
 		return $notify_users;
 	}
diff --git a/phpBB/includes/notifications/type/post_in_queue.php b/phpBB/includes/notifications/type/post_in_queue.php
index 0043a38944..ca02b8d85a 100644
--- a/phpBB/includes/notifications/type/post_in_queue.php
+++ b/phpBB/includes/notifications/type/post_in_queue.php
@@ -92,7 +92,7 @@ class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_po
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = 'needs_approval'
+			WHERE item_type = '" . self::$notification_option['id'] . "'
 				AND " . $db->sql_in_set('user_id', $auth_approve[$topic['forum_id']]['m_approve']);
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
index 2079617510..be149673c2 100644
--- a/phpBB/includes/notifications/type/quote.php
+++ b/phpBB/includes/notifications/type/quote.php
@@ -81,28 +81,23 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 
 		$users = array();
 
-		/* todo
-		* find what type of notification they'd like to receive
-		*/
 		$sql = 'SELECT user_id
 			FROM ' . USERS_TABLE . '
-			WHERE ' . $db->sql_in_set('username_clean', $usernames);
+			WHERE ' . $db->sql_in_set('username_clean', $usernames) . '
+				AND user_id <> ' . (int) $post['poster_id'];
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
-			$users[$row['user_id']] = array('');
+			$users[] = $row['user_id'];
 		}
 		$db->sql_freeresult($result);
 
-		// Never notify the poster
-		unset($users[$post['poster_id']]);
-
 		if (empty($users))
 		{
 			return array();
 		}
 
-		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
 
 		if (empty($auth_read))
 		{
@@ -111,10 +106,21 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 
 		$notify_users = array();
 
-		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
 		{
-			$notify_users[$user_id] = $users[$user_id];
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
 		}
+		$db->sql_freeresult($result);
 
 		return $notify_users;
 	}
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index 733b2108cc..32d30bc142 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -86,30 +86,24 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 
 		$users = array();
 
-		/* todo
-		* find what type of notification they'd like to receive
-		* make sure not to send duplicate notifications
-		*/
 		$sql = 'SELECT user_id
 			FROM ' . FORUMS_WATCH_TABLE . '
 			WHERE forum_id = ' . (int) $topic['forum_id'] . '
-				AND notify_status = ' . NOTIFY_YES;
+				AND notify_status = ' . NOTIFY_YES . '
+				AND user_id <> ' . (int) $topic['poster_id'];
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
-			$users[$row['user_id']] = array('');
+			$users[] = $row['user_id'];
 		}
 		$db->sql_freeresult($result);
 
-		// Never notify the poster
-		unset($users[$topic['poster_id']]);
-
 		if (empty($users))
 		{
 			return array();
 		}
 
-		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $topic['forum_id']);
+		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $topic['forum_id']);
 
 		if (empty($auth_read))
 		{
@@ -118,10 +112,21 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 
 		$notify_users = array();
 
-		foreach ($auth_read[$topic['forum_id']]['f_read'] as $user_id)
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND " . $db->sql_in_set('user_id', $auth_read[$topic['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
 		{
-			$notify_users[$user_id] = $users[$user_id];
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
 		}
+		$db->sql_freeresult($result);
 
 		return $notify_users;
 	}
diff --git a/phpBB/includes/notifications/type/topic_in_queue.php b/phpBB/includes/notifications/type/topic_in_queue.php
index dda647d18e..559af3e505 100644
--- a/phpBB/includes/notifications/type/topic_in_queue.php
+++ b/phpBB/includes/notifications/type/topic_in_queue.php
@@ -92,7 +92,7 @@ class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_t
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = 'needs_approval'
+			WHERE item_type = '" . self::$notification_option['id'] . "'
 				AND " . $db->sql_in_set('user_id', $auth_approve[$topic['forum_id']]['m_approve']);
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
-- 
cgit v1.2.1


From cbe0d478f1d984560b588dc0ef0cd4bec233263f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 18:44:31 -0500
Subject: [ticket/11103] Bug (using wrong variable)

PHPBB3-11103
---
 phpBB/includes/notifications/type/post_in_queue.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/type/post_in_queue.php b/phpBB/includes/notifications/type/post_in_queue.php
index ca02b8d85a..5f8f9988c5 100644
--- a/phpBB/includes/notifications/type/post_in_queue.php
+++ b/phpBB/includes/notifications/type/post_in_queue.php
@@ -93,7 +93,7 @@ class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_po
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $db->sql_in_set('user_id', $auth_approve[$topic['forum_id']]['m_approve']);
+				AND " . $db->sql_in_set('user_id', $auth_approve[$post['forum_id']]['m_approve']);
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
-- 
cgit v1.2.1


From c841aa34b64f3c83dfa8c637f2b20ae472c6de4d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 18:48:13 -0500
Subject: [ticket/11103] A couple to-dos

PHPBB3-11103
---
 phpBB/includes/notifications/method/email.php | 2 +-
 phpBB/includes/notifications/type/post.php    | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index a1ca955ee1..ebfc0c7c71 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -89,7 +89,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 			$messenger->assign_vars(array_merge(array(
 				'USERNAME'						=> $user['username'],
 
-				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=notifications', // todo Update URL
+				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',
 			), $notification->get_email_template_variables()));
 
 			$messenger->send($this->notify_method);
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index bf41d2b05e..e47ddafe1d 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -86,10 +86,6 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 		$users = array();
 
-		/* todo
-		* find what type of notification they'd like to receive
-		* make sure not to send duplicate notifications
-		*/
 		$sql = 'SELECT user_id
 			FROM ' . TOPICS_WATCH_TABLE . '
 			WHERE topic_id = ' . (int) $post['topic_id'] . '
-- 
cgit v1.2.1


From ba7289b9d273df4f3dfb228ab37d324ff17cc9db Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 19:19:38 -0500
Subject: [ticket/11103] Use PM Notification Preferences from Notification
 Options

Remove all PM Notification preferences from UCP Board Preferences

PHPBB3-11103
---
 phpBB/includes/notifications/type/pm.php | 26 +++++++++++---------------
 phpBB/includes/ucp/ucp_prefs.php         | 18 ------------------
 2 files changed, 11 insertions(+), 33 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index df7b42564c..75c79e35e6 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -85,25 +85,21 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 
 		$notify_users = array();
 
-		foreach (array_keys($pm['recipients']) as $user_id)
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND " . $db->sql_in_set('user_id', array_keys($pm['recipients']));
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
 		{
-			$recipient = $service->get_user($user_id);
-
-			if ($recipient['user_notify_pm'])
+			if (!isset($rowset[$row['user_id']]))
 			{
-				$notify_users[$recipient['user_id']] = array();
-
-				if ($recipient['user_notify_type'] == NOTIFY_EMAIL || $recipient['user_notify_type'] == NOTIFY_BOTH)
-				{
-					$notify_users[$recipient['user_id']][] = 'email';
-				}
-
-				if ($recipient['user_notify_type'] == NOTIFY_IM || $recipient['user_notify_type'] == NOTIFY_BOTH)
-				{
-					$notify_users[$recipient['user_id']][] = 'jabber';
-				}
+				$notify_users[$row['user_id']] = array();
 			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
 		}
+		$db->sql_freeresult($result);
 
 		return $notify_users;
 	}
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 2228bc7931..709d2a90b0 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -37,7 +37,6 @@ class ucp_prefs
 			case 'personal':
 				add_form_key('ucp_prefs_personal');
 				$data = array(
-					'notifymethod'	=> request_var('notifymethod', $user->data['user_notify_type']),
 					'dateformat'	=> request_var('dateformat', $user->data['user_dateformat'], true),
 					'lang'			=> basename(request_var('lang', $user->data['user_lang'])),
 					'style'			=> request_var('style', (int) $user->data['user_style']),
@@ -46,17 +45,9 @@ class ucp_prefs
 					'viewemail'		=> request_var('viewemail', (bool) $user->data['user_allow_viewemail']),
 					'massemail'		=> request_var('massemail', (bool) $user->data['user_allow_massemail']),
 					'hideonline'	=> request_var('hideonline', (bool) !$user->data['user_allow_viewonline']),
-					'notifypm'		=> request_var('notifypm', (bool) $user->data['user_notify_pm']),
-					'popuppm'		=> request_var('popuppm', (bool) $user->optionget('popuppm')),
 					'allowpm'		=> request_var('allowpm', (bool) $user->data['user_allow_pm']),
 				);
 
-				if ($data['notifymethod'] == NOTIFY_IM && (!$config['jab_enable'] || !$user->data['user_jabber'] || !@extension_loaded('xml')))
-				{
-					// Jabber isnt enabled, or no jabber field filled in. Update the users table to be sure its correct.
-					$data['notifymethod'] = NOTIFY_BOTH;
-				}
-
 				if ($submit)
 				{
 					if ($config['override_user_style'])
@@ -81,15 +72,11 @@ class ucp_prefs
 
 					if (!sizeof($error))
 					{
-						$user->optionset('popuppm', $data['popuppm']);
-
 						$sql_ary = array(
 							'user_allow_pm'			=> $data['allowpm'],
 							'user_allow_viewemail'	=> $data['viewemail'],
 							'user_allow_massemail'	=> $data['massemail'],
 							'user_allow_viewonline'	=> ($auth->acl_get('u_hideonline')) ? !$data['hideonline'] : $user->data['user_allow_viewonline'],
-							'user_notify_type'		=> $data['notifymethod'],
-							'user_notify_pm'		=> $data['notifypm'],
 							'user_options'			=> $user->data['user_options'],
 
 							'user_dateformat'		=> $data['dateformat'],
@@ -135,15 +122,10 @@ class ucp_prefs
 				$template->assign_vars(array(
 					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 
-					'S_NOTIFY_EMAIL'	=> ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false,
-					'S_NOTIFY_IM'		=> ($data['notifymethod'] == NOTIFY_IM) ? true : false,
-					'S_NOTIFY_BOTH'		=> ($data['notifymethod'] == NOTIFY_BOTH) ? true : false,
 					'S_VIEW_EMAIL'		=> $data['viewemail'],
 					'S_MASS_EMAIL'		=> $data['massemail'],
 					'S_ALLOW_PM'		=> $data['allowpm'],
 					'S_HIDE_ONLINE'		=> $data['hideonline'],
-					'S_NOTIFY_PM'		=> $data['notifypm'],
-					'S_POPUP_PM'		=> $data['popuppm'],
 
 					'DATE_FORMAT'			=> $data['dateformat'],
 					'A_DATE_FORMAT'			=> addslashes($data['dateformat']),
-- 
cgit v1.2.1


From 07616bfa92654473580dc55ccda95139e8595575 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 19:21:57 -0500
Subject: [ticket/11103] UCP Notifications Options Form Key

PHPBB3-11103
---
 phpBB/includes/ucp/ucp_notifications.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index ad399ca290..950b70a156 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -23,6 +23,8 @@ class ucp_notifications
 	{
 		global $phpbb_container;
 
+		add_form_key('ucp_notification_options');
+
 		$phpbb_notifications = $phpbb_container->get('notifications');
 		$template = $phpbb_container->get('template');
 		$user = $phpbb_container->get('user');
@@ -33,6 +35,11 @@ class ucp_notifications
 		// Add/remove subscriptions
 		if ($request->is_set_post('submit'))
 		{
+			if (!check_form_key('ucp_notification_options'))
+			{
+				trigger_error('FORM_INVALID');
+			}
+
 			$notification_methods = $phpbb_notifications->get_subscription_methods();
 
 			foreach($phpbb_notifications->get_subscription_types() as $type => $data)
-- 
cgit v1.2.1


From 2a5baad61bace05ee4907f7125555777cf7b1401 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 20:05:06 -0500
Subject: [ticket/11103] Only notify a user once for a single item

Note: The user may be notified multiple times IF they use different
notification options. e.g They are subscribed to topics they have
bookmarked by a notification and subscribed to the topic by
an email notification. In this case, they would receive two notifications.
This occurs because we do not want to omit any more direct types of
notifications (if they want an email, they should _always_ get at least one
email).

PHPBB3-11103
---
 phpBB/includes/functions_posting.php                 |  2 +-
 phpBB/includes/notifications/service.php             | 18 ++++++++++++++----
 phpBB/includes/notifications/type/approve_post.php   | 11 ++++++++++-
 phpBB/includes/notifications/type/approve_topic.php  | 11 ++++++++++-
 phpBB/includes/notifications/type/base.php           | 11 ++++++++++-
 phpBB/includes/notifications/type/bookmark.php       | 11 ++++++++++-
 phpBB/includes/notifications/type/interface.php      |  2 +-
 phpBB/includes/notifications/type/pm.php             | 11 ++++++++++-
 phpBB/includes/notifications/type/post.php           | 11 ++++++++++-
 phpBB/includes/notifications/type/post_in_queue.php  | 11 ++++++++++-
 phpBB/includes/notifications/type/quote.php          | 11 ++++++++++-
 phpBB/includes/notifications/type/topic.php          | 11 ++++++++++-
 phpBB/includes/notifications/type/topic_in_queue.php | 11 ++++++++++-
 13 files changed, 116 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 41bdd9f598..6262cee4ad 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2234,7 +2234,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post' :
-				$phpbb_notifications->add_notifications(array('topic', 'quote'), $notification_data);
+				$phpbb_notifications->add_notifications(array('quote', 'topic'), $notification_data);
 			break;
 
 			case 'reply' :
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 2c1eb859c7..35d60a7c51 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -256,16 +256,24 @@ class phpbb_notifications_service
 	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
 	* @param array $data Data specific for this type that will be inserted
 	*/
-	public function add_notifications($item_type, $data)
+	public function add_notifications($item_type, $data, $options = array())
 	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
 		if (is_array($item_type))
 		{
+			$notified_users = array();
+			$temp_options = $options;
+
 			foreach ($item_type as $type)
 			{
-				$this->add_notifications($type, $data);
+				$temp_options['ignore_users'] = $options['ignore_users'] + $notified_users;
+				$notified_users += $this->add_notifications($type, $data, $temp_options);
 			}
 
-			return;
+			return $notified_users;
 		}
 
 		$item_type_class_name = $this->get_item_type_class_name($item_type);
@@ -273,9 +281,11 @@ class phpbb_notifications_service
 		$item_id = $item_type_class_name::get_item_id($data);
 
 		// find out which users want to receive this type of notification
-		$notify_users = $item_type_class_name::find_users_for_notification($this->phpbb_container, $data);
+		$notify_users = $item_type_class_name::find_users_for_notification($this->phpbb_container, $data, $options);
 
 		$this->add_notifications_for_users($item_type, $data, $notify_users);
+
+		return $notify_users;
 	}
 
 	/**
diff --git a/phpBB/includes/notifications/type/approve_post.php b/phpBB/includes/notifications/type/approve_post.php
index faa88e862c..912b9082a2 100644
--- a/phpBB/includes/notifications/type/approve_post.php
+++ b/phpBB/includes/notifications/type/approve_post.php
@@ -67,8 +67,12 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
 	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
 		$db = $phpbb_container->get('dbal.conn');
 
 		$users = array();
@@ -90,6 +94,11 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
 			if (!isset($rowset[$row['user_id']]))
 			{
 				$notify_users[$row['user_id']] = array();
diff --git a/phpBB/includes/notifications/type/approve_topic.php b/phpBB/includes/notifications/type/approve_topic.php
index fbe44c8a2c..e0e3a38e46 100644
--- a/phpBB/includes/notifications/type/approve_topic.php
+++ b/phpBB/includes/notifications/type/approve_topic.php
@@ -67,8 +67,12 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
 	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
 		$db = $phpbb_container->get('dbal.conn');
 
 		$users = array();
@@ -90,6 +94,11 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
 			if (!isset($rowset[$row['user_id']]))
 			{
 				$notify_users[$row['user_id']] = array();
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 0da4dc8d93..01720b4554 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -264,8 +264,12 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 	*
 	* @return array
 	*/
-	protected static function _find_users_for_notification(ContainerBuilder $phpbb_container, $item_id)
+	protected static function _find_users_for_notification(ContainerBuilder $phpbb_container, $item_id, $options)
 	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
 		$db = $phpbb_container->get('dbal.conn');
 
 		$rowset = array();
@@ -277,6 +281,11 @@ abstract class phpbb_notifications_type_base implements phpbb_notifications_type
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
 			if (!isset($rowset[$row['user_id']]))
 			{
 				$rowset[$row['user_id']] = array();
diff --git a/phpBB/includes/notifications/type/bookmark.php b/phpBB/includes/notifications/type/bookmark.php
index 0e5358b105..a452583c77 100644
--- a/phpBB/includes/notifications/type/bookmark.php
+++ b/phpBB/includes/notifications/type/bookmark.php
@@ -56,8 +56,12 @@ class phpbb_notifications_type_bookmark extends phpbb_notifications_type_post
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
 	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
 		$db = $phpbb_container->get('dbal.conn');
 
 		$users = array();
@@ -94,6 +98,11 @@ class phpbb_notifications_type_bookmark extends phpbb_notifications_type_post
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
 			if (!isset($rowset[$row['user_id']]))
 			{
 				$notify_users[$row['user_id']] = array();
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index c85d7441f6..95c307013e 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -27,7 +27,7 @@ interface phpbb_notifications_type_interface
 
 	public static function is_available(ContainerBuilder $phpbb_container);
 
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $type_data);
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $type_data, $options);
 
 	public function get_title();
 
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index 75c79e35e6..f0730f285c 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -70,8 +70,12 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $pm)
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $pm, $options = array())
 	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
 		$service = $phpbb_container->get('notifications');
 		$db = $phpbb_container->get('dbal.conn');
 		$user = $phpbb_container->get('user');
@@ -92,6 +96,11 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
 			if (!isset($rowset[$row['user_id']]))
 			{
 				$notify_users[$row['user_id']] = array();
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index e47ddafe1d..d654a2e3a3 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -76,8 +76,12 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
 	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
 		// Let's continue to use the phpBB subscriptions system, at least for now.
 		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
 		//$users = parent::_find_users_for_notification($phpbb_container, $post['topic_id']);
@@ -119,6 +123,11 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
 			if (!isset($rowset[$row['user_id']]))
 			{
 				$notify_users[$row['user_id']] = array();
diff --git a/phpBB/includes/notifications/type/post_in_queue.php b/phpBB/includes/notifications/type/post_in_queue.php
index 5f8f9988c5..64f68c07e2 100644
--- a/phpBB/includes/notifications/type/post_in_queue.php
+++ b/phpBB/includes/notifications/type/post_in_queue.php
@@ -77,8 +77,12 @@ class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_po
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
 	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
 		$db = $phpbb_container->get('dbal.conn');
 
 		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $post['forum_id']);
@@ -97,6 +101,11 @@ class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_po
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
 			if (!isset($rowset[$row['user_id']]))
 			{
 				$notify_users[$row['user_id']] = array();
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
index be149673c2..f162b37126 100644
--- a/phpBB/includes/notifications/type/quote.php
+++ b/phpBB/includes/notifications/type/quote.php
@@ -63,8 +63,12 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
 	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
 		$db = $phpbb_container->get('dbal.conn');
 
 		$usernames = false;
@@ -113,6 +117,11 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
 			if (!isset($rowset[$row['user_id']]))
 			{
 				$notify_users[$row['user_id']] = array();
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index 32d30bc142..ddef0147ba 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -76,8 +76,12 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic)
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic, $options = array())
 	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
 		// Let's continue to use the phpBB subscriptions system, at least for now.
 		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
 		//$users = parent::_find_users_for_notification($phpbb_container, $topic['forum_id']);
@@ -119,6 +123,11 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
 			if (!isset($rowset[$row['user_id']]))
 			{
 				$notify_users[$row['user_id']] = array();
diff --git a/phpBB/includes/notifications/type/topic_in_queue.php b/phpBB/includes/notifications/type/topic_in_queue.php
index 559af3e505..dc7f7aa105 100644
--- a/phpBB/includes/notifications/type/topic_in_queue.php
+++ b/phpBB/includes/notifications/type/topic_in_queue.php
@@ -77,8 +77,12 @@ class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_t
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic)
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic, $options = array())
 	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
 		$db = $phpbb_container->get('dbal.conn');
 
 		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $topic['forum_id']);
@@ -97,6 +101,11 @@ class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_t
 		$result = $db->sql_query($sql);
 		while ($row = $db->sql_fetchrow($result))
 		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
 			if (!isset($rowset[$row['user_id']]))
 			{
 				$notify_users[$row['user_id']] = array();
-- 
cgit v1.2.1


From 25b9ea24bfb75d62b01e2f7aceaaef100830b5a3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 20:11:28 -0500
Subject: [ticket/11103] Note on the add_notifications function about the last
 change

PHPBB3-11103
---
 phpBB/includes/notifications/service.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index 35d60a7c51..ebf4cef12d 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -254,6 +254,8 @@ class phpbb_notifications_service
 	* Add a notification
 	*
 	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
+	*			Note: If you send an array of types, any user who could receive multiple notifications from this single item will only receive
+	* 			a single notification. If they MUST receive multiple notifications, call this function multiple times instead of sending an array
 	* @param array $data Data specific for this type that will be inserted
 	*/
 	public function add_notifications($item_type, $data, $options = array())
-- 
cgit v1.2.1


From 8b2181eb851081a103802764517f7189ba8fc114 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Sep 2012 16:14:44 +0200
Subject: [feature/soft-delete] Comment out stuff about f_restore for
 performance reason

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 2e91521c78..55adf00e8c 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -47,9 +47,15 @@ class phpbb_content_visibility
 			{
 				// The user can see all types, so we simplify this to an empty string,
 				// as we don't need to restrict anything on the query.
-				return '';
+				return '1 = 1';
 			}
+		}
+
+		return $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
 
+		/**
+		* @todo: Commented out, because the performance is not the best
+		*
 			// If the user has m_restore, the rest of the function will not
 			// make more content visible, so we can return the query here.
 			return $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
@@ -64,7 +70,7 @@ class phpbb_content_visibility
 			$clause = '(' . $clause . "
 				OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . "
 					AND $table_alias$poster_column = " . (int) $user->data['user_id'] . '))';
-		}
+		}*/
 
 		return $clause;
 	}
@@ -100,6 +106,9 @@ class phpbb_content_visibility
 				AND ' . $db->sql_in_set($table_alias . 'forum_id', $restore_forums) . ')';
 		}
 
+		/*
+		* @todo: Commented out, because the performance is not the best
+		*
 		// we also allow the user to view deleted posts he himself made
 		$user_restore_forums = array_diff(array_intersect($forum_ids, array_keys($auth->acl_getf('f_restore', true))), $restore_forums);
 		if (sizeof($user_restore_forums) && !sizeof($restore_forums))
@@ -111,6 +120,7 @@ class phpbb_content_visibility
 				AND $table_alias{$mode}_visibility = " . ITEM_DELETED . "
 				AND " . $db->sql_in_set($table_alias . 'forum_id', $user_restore_forums) . ')';
 		}
+		*/
 
 		$where_sql .= ')';
 
@@ -148,6 +158,9 @@ class phpbb_content_visibility
 				AND ' . $db->sql_in_set($table_alias . 'forum_id', $restore_forums) . ')';
 		}
 
+		/*
+		* @todo: Commented out, because the performance is not the best
+		*
 		// we also allow the user to view deleted posts he himself made
 		$user_restore_forums = array_diff(array_keys($auth->acl_getf('f_restore', true)), $exclude_forum_ids);
 		if (sizeof($user_restore_forums) && !sizeof($restore_forums))
@@ -159,6 +172,7 @@ class phpbb_content_visibility
 				AND $table_alias{$mode}_visibility = " . ITEM_DELETED . "
 				AND " . $db->sql_in_set($table_alias . 'forum_id', $user_restore_forums) . ')';
 		}
+		*/
 
 		$where_sql .= ')';
 
-- 
cgit v1.2.1


From e5377e98c7eca8754f423ef495e4b092590f4e03 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Sep 2012 16:53:38 +0200
Subject: [feature/soft-delete] Allow setting the visibility change reason

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 49 +++++++++++++++++++++++++----------
 phpBB/includes/functions_posting.php  |  8 +++---
 2 files changed, 39 insertions(+), 18 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 55adf00e8c..165c28f1af 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -185,21 +185,28 @@ class phpbb_content_visibility
 	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
 	* @param $topic_id - int - topic ID to act on
 	* @param $forum_id - int - forum ID where $topic_id resides
-	* @return bool true = success, false = fail
+	* @return void
 	*/
-	static public function set_topic_visibility($visibility, $topic_id, $forum_id)
+	static public function set_topic_visibility($visibility, $topic_id, $forum_id, $user_id, $time, $reason)
 	{
 		global $db;
 
-		$sql = 'UPDATE ' . TOPICS_TABLE . ' SET topic_visibility = ' . (int) $visibility . '
+		$data = array(
+			'topic_visibility'		=> (int) $visibility,
+			'topic_delete_user'		=> (int) $user_id,
+			'topic_delete_time'		=> ((int) $time) ?: time(),
+			'topic_delete_reason'	=> truncate_string($reason, 255, 255, false),
+		);
+
+		$sql = 'UPDATE ' . TOPICS_TABLE . '
+			SET ' . $db->sql_build_array('UPDATE', $data) . '
 			WHERE topic_id = ' . (int) $topic_id;
 		$db->sql_query($sql);
 
-		// if we're approving, disapproving, or deleteing a topic, assume that
-		// we are adjusting _all_ posts in that topic.
-		$status = self::set_post_visibility($visibility, false, $topic_id, $forum_id, true, true);
-
-		return $status;
+		// If we're approving, disapproving, or deleteing a topic
+		// we also update all posts in that topic that need to be changed.
+		// However, we do not set the same reason for every post.
+		self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true);
 	}
 
 	/**
@@ -209,8 +216,9 @@ class phpbb_content_visibility
 	* @param $forum_id - int - forum ID where $topic_id resides
 	* @param $is_starter - bool - is this the first post of the topic
 	* @param $is_latest - bool - is this the last post of the topic
+	* @return void
 	*/
-	static public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $is_starter, $is_latest)
+	static public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $user_id, $time, $reason, $is_starter, $is_latest)
 	{
 		global $db;
 
@@ -230,19 +238,32 @@ class phpbb_content_visibility
 		}
 		else
 		{
-			// throw new MissingArgumentsException(); <-- a nice idea
-			return false;
+			return;
 		}
 
-		$sql = 'UPDATE ' . POSTS_TABLE . ' SET post_visibility = ' . (int) $visibility . '
+		$data = array(
+			'post_visibility'		=> (int) $visibility,
+			'post_delete_user'		=> (int) $user_id,
+			'post_delete_time'		=> ((int) $time) ?: time(),
+			'post_delete_reason'	=> truncate_string($reason, 255, 255, false),
+		);
+
+		$sql = 'UPDATE ' . POSTS_TABLE . '
+			SET ' . $db->sql_build_array('UPDATE', $data) . '
 			WHERE ' . $where_sql;
 		$db->sql_query($sql);
 
 		// Sync the first/last topic information if needed
 		if ($is_starter || $is_latest)
 		{
-			update_post_information('topic', $topic_id, false);
-			update_post_information('forum', $forum_id, false);
+			if ($topic_id)
+			{
+				update_post_information('topic', $topic_id, false);
+			}
+			if ($forum_id)
+			{
+				update_post_information('forum', $forum_id, false);
+			}
 		}
 	}
 
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index b63a41df7d..38f173330a 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1411,7 +1411,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
 /**
 * Delete Post
 */
-function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
+function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $softdelete_reason = '')
 {
 	global $db, $user, $auth;
 	global $config, $phpEx, $phpbb_root_path;
@@ -1466,7 +1466,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 
 	if ($is_soft)
 	{
-		phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
+		phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
 		phpbb_content_visibility::hide_post($forum_id, time(), $data, $sql_data);
 	}
 	else
@@ -1501,7 +1501,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 			if ($is_soft)
 			{
 				$topic_row = array();
-				phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id);
+				phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason);
 				phpbb_content_visibility::hide_topic($topic_id, $forum_id, $topic_row, $sql_data);
 			}
 			else
@@ -1548,8 +1548,8 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
 		case 'delete_last_post':
 			if ($is_soft)
 			{
+				phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason, false, true);
 				phpbb_content_visibility::hide_post($forum_id, time(), $data, $sql_data);
-				phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, false, true);
 			}
 			else
 			{
-- 
cgit v1.2.1


From 1943de36f32609b37230da32aa679466043702fe Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 1 Oct 2012 16:25:05 +0200
Subject: [feature/soft-delete] Comment out user_posts update for the moment

It should rely on the permissions of the post not the current user.

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 10 ++++++++++
 phpBB/includes/mcp/mcp_queue.php      |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 165c28f1af..9d2bf34370 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -346,10 +346,16 @@ class phpbb_content_visibility
 		set_config_count('num_posts', ($topic_row['topic_replies'] + 1) * (-1), true);
 
 		// Only decrement this post, since this is the one non-approved now
+		//
+		/**
+		* @todo: this is wrong, it should rely on post_postcount
+		*		 also a user might have more than one post in the topic
+		*
 		if ($auth->acl_get('f_postcount', $forum_id))
 		{
 			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
 		}
+		*/
 	}
 
 	/**
@@ -383,10 +389,14 @@ class phpbb_content_visibility
 
 		set_config_count('num_posts', -1, true);
 
+		/**
+		* @todo: this is wrong, it should rely on post_postcount
+		*
 		if ($auth->acl_get('f_postcount', $forum_id))
 		{
 			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
 		}
+		*/
 	}
 
 	/**
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 3b18b7f0e7..b1b4ea99aa 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -465,7 +465,7 @@ class mcp_queue
 
 
 /**
-* Approve Post/Topic
+* Restore Post/Topic
 */
 function restore_post($post_id_list, $id, $mode)
 {
-- 
cgit v1.2.1


From 4a65940e6206aef6b85a0aacfb5324ecabf76e12 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 1 Oct 2012 22:14:04 +0200
Subject: [feature/soft-delete] Add unit tests for get_forums_visibility_sql()

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 5 +++--
 phpBB/includes/functions_display.php  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 9d2bf34370..a598d863a4 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -82,12 +82,13 @@ class phpbb_content_visibility
 	* @param $table_alias string - Table alias to prefix in SQL queries
 	* @return string with the appropriate combination SQL logic for topic/post_visibility
 	*/
-	static public function get_visibility_sql_forums($mode, $forum_ids = array(), $table_alias = '')
+	static public function get_forums_visibility_sql($mode, $forum_ids = array(), $table_alias = '')
 	{
 		global $auth, $db, $user;
 
 		// users can always see approved posts
-		$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
+		$where_sql = "(($table_alias{$mode}_visibility = " . ITEM_APPROVED . '
+				AND ' . $db->sql_in_set($table_alias . 'forum_id', $forum_ids) . ')';
 
 		// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
 		$approve_forums = array_intersect($forum_ids, array_keys($auth->acl_getf('m_approve', true)));
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 2781f1a7bb..5849f5cf4c 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1003,7 +1003,7 @@ function display_user_activity(&$userdata)
 		FROM ' . POSTS_TABLE . '
 		WHERE poster_id = ' . $userdata['user_id'] . '
 			AND post_postcount = 1
-			AND ' . phpbb_content_visibility::get_visibility_sql_forums('post', $forum_ary) . '
+			AND ' . phpbb_content_visibility::get_forums_visibility_sql('post', $forum_ary) . '
 		GROUP BY forum_id
 		ORDER BY num_posts DESC';
 	$result = $db->sql_query_limit($sql, 1);
@@ -1029,7 +1029,7 @@ function display_user_activity(&$userdata)
 		FROM ' . POSTS_TABLE . '
 		WHERE poster_id = ' . $userdata['user_id'] . '
 			AND post_postcount = 1
-			AND ' . phpbb_content_visibility::get_visibility_sql_forums('post', $forum_ary) . '
+			AND ' . phpbb_content_visibility::get_forums_visibility_sql('post', $forum_ary) . '
 		GROUP BY topic_id
 		ORDER BY num_posts DESC';
 	$result = $db->sql_query_limit($sql, 1);
-- 
cgit v1.2.1


From b629b2cd95a9da67376f7a628c15199007e2ebd6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 1 Oct 2012 22:44:39 +0200
Subject: [feature/soft-delete] Add unit tests for get_global_visibility_sql()

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index a598d863a4..e927460a49 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -135,12 +135,20 @@ class phpbb_content_visibility
 	* @param $table_alias string - Table alias to prefix in SQL queries
 	* @return string with the appropriate combination SQL logic for topic/post_visibility
 	*/
-	static public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
+	static public function get_global_visibility_sql($mode, $exclude_forum_ids = array(), $table_alias = '')
 	{
 		global $auth, $db, $user;
 
 		// users can always see approved posts
-		$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
+		if (sizeof($exclude_forum_ids))
+		{
+			$where_sql = '((' . $db->sql_in_set($table_alias . 'forum_id', $exclude_forum_ids, true, true) . "
+				AND $table_alias{$mode}_visibility = " . ITEM_APPROVED . ')';
+		}
+		else
+		{
+			$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
+		}
 
 		// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
 		$approve_forums = array_diff(array_keys($auth->acl_getf('m_approve', true)), $exclude_forum_ids);
-- 
cgit v1.2.1


From a84e4029e4ecde691a0d34ef72ddab4fc56a07ee Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 2 Oct 2012 12:46:44 +0200
Subject: [feature/soft-delete] Update doc blocks to proper format

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 39 ++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index e927460a49..1aa2ad1a29 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -24,10 +24,13 @@ class phpbb_content_visibility
 {
 	/**
 	* Create topic/post visibility SQL for a given forum ID
-	* @param $mode string - either "topic" or "post"
-	* @param $forum_id int - current forum ID
-	* @param $table_alias string - Table alias to prefix in SQL queries
-	* @return string with the appropriate combination SQL logic for topic/post_visibility
+	*
+	* Note: Read permissions are not checked.
+	*
+	* @param $mode			string	Either "topic" or "post"
+	* @param $forum_id		int		The forum id is used for permission checks
+	* @param $table_alias	string	Table alias to prefix in SQL queries
+	* @return string	The appropriate combination SQL logic for topic/post_visibility
 	*/
 	static public function get_visibility_sql($mode, $forum_id, $table_alias = '')
 	{
@@ -76,11 +79,15 @@ class phpbb_content_visibility
 	}
 
 	/**
-	* Fetch visibility SQL for a set of forums
-	* @param $mode string - either "topic" or "post"
-	* @param $forum_ids - int array - 
-	* @param $table_alias string - Table alias to prefix in SQL queries
-	* @return string with the appropriate combination SQL logic for topic/post_visibility
+	* Create topic/post visibility SQL for a set of forums
+	*
+	* Note: Read permissions are not checked. Forums without read permissions
+	*		should not be in $forum_ids
+	*
+	* @param $mode			string	Either "topic" or "post"
+	* @param $forum_ids		array	Array of forum ids which the posts/topics are limited to
+	* @param $table_alias	string	Table alias to prefix in SQL queries
+	* @return string	The appropriate combination SQL logic for topic/post_visibility
 	*/
 	static public function get_forums_visibility_sql($mode, $forum_ids = array(), $table_alias = '')
 	{
@@ -129,11 +136,15 @@ class phpbb_content_visibility
 	}
 
 	/**
-	* Fetch visibility SQL for all forums on the board.
-	* @param $mode string - either "topic" or "post"
-	* @param $exclude_forum_ids - int array - 
-	* @param $table_alias string - Table alias to prefix in SQL queries
-	* @return string with the appropriate combination SQL logic for topic/post_visibility
+	* Create topic/post visibility SQL for all forums on the board
+	*
+	* Note: Read permissions are not checked. Forums without read permissions
+	*		should be in $exclude_forum_ids
+	*
+	* @param $mode				string	Either "topic" or "post"
+	* @param $exclude_forum_ids	array	Array of forum ids which are excluded
+	* @param $table_alias		string	Table alias to prefix in SQL queries
+	* @return string	The appropriate combination SQL logic for topic/post_visibility
 	*/
 	static public function get_global_visibility_sql($mode, $exclude_forum_ids = array(), $table_alias = '')
 	{
-- 
cgit v1.2.1


From 5b64ebc11d10b66212661282a4dcfd411d038211 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 2 Oct 2012 15:34:18 +0200
Subject: [feature/soft-delete] Fix a bug in sync() and set_post_visibility()

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 15 ++++++++-------
 phpBB/includes/functions_admin.php    |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 1aa2ad1a29..8bc67a7fd2 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -242,12 +242,6 @@ class phpbb_content_visibility
 	{
 		global $db;
 
-		// if we're changing the starter, we need to change the rest of the topic
-		if ($is_starter && !$is_latest)
-		{
-			return self::set_topic_visibility($visibility, $topic_id, $forum_id);
-		}
-
 		if ($post_id)
 		{
 			$where_sql = 'post_id = ' . (int) $post_id;
@@ -274,8 +268,9 @@ class phpbb_content_visibility
 		$db->sql_query($sql);
 
 		// Sync the first/last topic information if needed
-		if ($is_starter || $is_latest)
+		if (!$is_starter && $is_latest)
 		{
+			// update_post_information can only update the last post info ...
 			if ($topic_id)
 			{
 				update_post_information('topic', $topic_id, false);
@@ -285,6 +280,12 @@ class phpbb_content_visibility
 				update_post_information('forum', $forum_id, false);
 			}
 		}
+		else if (($is_starter || $is_latest) && $topic_id)
+		{
+			// ... so we need to use sync, if the first post is changed.
+			// The forum is resynced recursive by sync() itself.
+			sync('topic', 'topic_id', $topic_id, true);
+		}
 	}
 
 	/**
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 54130df935..bb8b02bbea 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1908,12 +1908,12 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 					unset($delete_topics[$topic_id]);
 
 					$topic_data[$topic_id]['replies_real'] += $row['total_posts'];
-					$topic_data[$topic_id]['first_post_id'] = (!$topic_data[$topic_id]['first_post_id']) ? $row['first_post_id'] : min($topic_data[$topic_id]['first_post_id'], $row['first_post_id']);
 
-					if ($row['post_visibility'] || !$topic_data[$topic_id]['last_post_id'])
+					if ($row['post_visibility'] == ITEM_APPROVED)
 					{
-						$topic_data[$topic_id]['replies'] = $row['total_posts'] - 1;
+						$topic_data[$topic_id]['first_post_id'] = $row['first_post_id'];
 						$topic_data[$topic_id]['last_post_id'] = $row['last_post_id'];
+						$topic_data[$topic_id]['replies'] = $row['total_posts'] - 1;
 					}
 				}
 			}
-- 
cgit v1.2.1


From 37e24736058f4e41c67023ce48edeb75e44bbe75 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Oct 2012 13:39:54 -0500
Subject: [ticket/11103] Rename classes

phpbb_notifications_service -> phpbb_notification_manager
phpbb_notifications_ -> phpbb_notification_

PHPBB3-11103
---
 phpBB/includes/notifications/method/base.php           | 6 +++---
 phpBB/includes/notifications/method/email.php          | 2 +-
 phpBB/includes/notifications/method/interface.php      | 2 +-
 phpBB/includes/notifications/method/jabber.php         | 2 +-
 phpBB/includes/notifications/service.php               | 2 +-
 phpBB/includes/notifications/type/approve_post.php     | 4 ++--
 phpBB/includes/notifications/type/approve_topic.php    | 4 ++--
 phpBB/includes/notifications/type/base.php             | 2 +-
 phpBB/includes/notifications/type/bookmark.php         | 4 ++--
 phpBB/includes/notifications/type/disapprove_post.php  | 4 ++--
 phpBB/includes/notifications/type/disapprove_topic.php | 4 ++--
 phpBB/includes/notifications/type/interface.php        | 2 +-
 phpBB/includes/notifications/type/pm.php               | 4 ++--
 phpBB/includes/notifications/type/post.php             | 4 ++--
 phpBB/includes/notifications/type/post_in_queue.php    | 4 ++--
 phpBB/includes/notifications/type/quote.php            | 4 ++--
 phpBB/includes/notifications/type/topic.php            | 4 ++--
 phpBB/includes/notifications/type/topic_in_queue.php   | 4 ++--
 phpBB/includes/ucp/ucp_notifications.php               | 8 ++++----
 19 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notifications/method/base.php
index b860fcffda..b502d3afd0 100644
--- a/phpBB/includes/notifications/method/base.php
+++ b/phpBB/includes/notifications/method/base.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 * Base notifications method class
 * @package notifications
 */
-abstract class phpbb_notifications_method_base implements phpbb_notifications_method_interface
+abstract class phpbb_notification_method_base implements phpbb_notification_method_interface
 {
 	protected $phpbb_container;
 	protected $service;
@@ -75,9 +75,9 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 	/**
 	* Add a notification to the queue
 	*
-	* @param phpbb_notifications_type_interface $notification
+	* @param phpbb_notification_type_interface $notification
 	*/
-	public function add_to_queue(phpbb_notifications_type_interface $notification)
+	public function add_to_queue(phpbb_notification_type_interface $notification)
 	{
 		$this->queue[] = $notification;
 	}
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index ebfc0c7c71..1b6b44d137 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_method_email extends phpbb_notifications_method_base
+class phpbb_notification_method_email extends phpbb_notification_method_base
 {
 	/**
 	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
diff --git a/phpBB/includes/notifications/method/interface.php b/phpBB/includes/notifications/method/interface.php
index 820cf4fc12..4b990ec9fa 100644
--- a/phpBB/includes/notifications/method/interface.php
+++ b/phpBB/includes/notifications/method/interface.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Base notifications method interface
 * @package notifications
 */
-interface phpbb_notifications_method_interface
+interface phpbb_notification_method_interface
 {
 	public function is_available();
 
diff --git a/phpBB/includes/notifications/method/jabber.php b/phpBB/includes/notifications/method/jabber.php
index 738400a50e..9232d8fc45 100644
--- a/phpBB/includes/notifications/method/jabber.php
+++ b/phpBB/includes/notifications/method/jabber.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_method_jabber extends phpbb_notifications_method_email
+class phpbb_notification_method_jabber extends phpbb_notification_method_email
 {
 	/**
 	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
index ebf4cef12d..2bf21cefa5 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notifications/service.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 * Notifications service class
 * @package notifications
 */
-class phpbb_notifications_service
+class phpbb_notification_manager
 {
 	protected $phpbb_container;
 	protected $db;
diff --git a/phpBB/includes/notifications/type/approve_post.php b/phpBB/includes/notifications/type/approve_post.php
index 912b9082a2..9a3def6217 100644
--- a/phpBB/includes/notifications/type/approve_post.php
+++ b/phpBB/includes/notifications/type/approve_post.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_type_approve_post extends phpbb_notifications_type_post
+class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 {
 	/**
 	* Email template to use to send notifications
@@ -52,7 +52,7 @@ class phpbb_notifications_type_approve_post extends phpbb_notifications_type_pos
 
 	/**
 	* Get the type of notification this is
-	* phpbb_notifications_type_
+	* phpbb_notification_type_
 	*/
 	public static function get_item_type()
 	{
diff --git a/phpBB/includes/notifications/type/approve_topic.php b/phpBB/includes/notifications/type/approve_topic.php
index e0e3a38e46..00af312018 100644
--- a/phpBB/includes/notifications/type/approve_topic.php
+++ b/phpBB/includes/notifications/type/approve_topic.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_topic
+class phpbb_notification_type_approve_topic extends phpbb_notification_type_topic
 {
 	/**
 	* Email template to use to send notifications
@@ -52,7 +52,7 @@ class phpbb_notifications_type_approve_topic extends phpbb_notifications_type_to
 
 	/**
 	* Get the type of notification this is
-	* phpbb_notifications_type_
+	* phpbb_notification_type_
 	*/
 	public static function get_item_type()
 	{
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
index 01720b4554..40462bccfb 100644
--- a/phpBB/includes/notifications/type/base.php
+++ b/phpBB/includes/notifications/type/base.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 * Base notifications class
 * @package notifications
 */
-abstract class phpbb_notifications_type_base implements phpbb_notifications_type_interface
+abstract class phpbb_notification_type_base implements phpbb_notification_type_interface
 {
 	protected $phpbb_container;
 	protected $service;
diff --git a/phpBB/includes/notifications/type/bookmark.php b/phpBB/includes/notifications/type/bookmark.php
index a452583c77..51f23bc294 100644
--- a/phpBB/includes/notifications/type/bookmark.php
+++ b/phpBB/includes/notifications/type/bookmark.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_type_bookmark extends phpbb_notifications_type_post
+class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 {
 	/**
 	* Email template to use to send notifications
@@ -41,7 +41,7 @@ class phpbb_notifications_type_bookmark extends phpbb_notifications_type_post
 
 	/**
 	* Get the type of notification this is
-	* phpbb_notifications_type_
+	* phpbb_notification_type_
 	*/
 	public static function get_item_type()
 	{
diff --git a/phpBB/includes/notifications/type/disapprove_post.php b/phpBB/includes/notifications/type/disapprove_post.php
index 6911af5b08..8fa0102e3d 100644
--- a/phpBB/includes/notifications/type/disapprove_post.php
+++ b/phpBB/includes/notifications/type/disapprove_post.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_type_disapprove_post extends phpbb_notifications_type_approve_post
+class phpbb_notification_type_disapprove_post extends phpbb_notification_type_approve_post
 {
 	/**
 	* Email template to use to send notifications
@@ -52,7 +52,7 @@ class phpbb_notifications_type_disapprove_post extends phpbb_notifications_type_
 
 	/**
 	* Get the type of notification this is
-	* phpbb_notifications_type_
+	* phpbb_notification_type_
 	*/
 	public static function get_item_type()
 	{
diff --git a/phpBB/includes/notifications/type/disapprove_topic.php b/phpBB/includes/notifications/type/disapprove_topic.php
index dab5ec1b02..186c42d2b6 100644
--- a/phpBB/includes/notifications/type/disapprove_topic.php
+++ b/phpBB/includes/notifications/type/disapprove_topic.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_type_disapprove_topic extends phpbb_notifications_type_approve_topic
+class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_approve_topic
 {
 	/**
 	* Email template to use to send notifications
@@ -52,7 +52,7 @@ class phpbb_notifications_type_disapprove_topic extends phpbb_notifications_type
 
 	/**
 	* Get the type of notification this is
-	* phpbb_notifications_type_
+	* phpbb_notification_type_
 	*/
 	public static function get_item_type()
 	{
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
index 95c307013e..aa54c62a97 100644
--- a/phpBB/includes/notifications/type/interface.php
+++ b/phpBB/includes/notifications/type/interface.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Base notifications interface
 * @package notifications
 */
-interface phpbb_notifications_type_interface
+interface phpbb_notification_type_interface
 {
 	public static function get_item_type();
 
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index f0730f285c..8252a8577b 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_type_pm extends phpbb_notifications_type_base
+class phpbb_notification_type_pm extends phpbb_notification_type_base
 {
 	/**
 	* Email template to use to send notifications
@@ -34,7 +34,7 @@ class phpbb_notifications_type_pm extends phpbb_notifications_type_base
 
 	/**
 	* Get the type of notification this is
-	* phpbb_notifications_type_
+	* phpbb_notification_type_
 	*/
 	public static function get_item_type()
 	{
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index d654a2e3a3..1e654ef51b 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_type_post extends phpbb_notifications_type_base
+class phpbb_notification_type_post extends phpbb_notification_type_base
 {
 	/**
 	* Email template to use to send notifications
@@ -41,7 +41,7 @@ class phpbb_notifications_type_post extends phpbb_notifications_type_base
 
 	/**
 	* Get the type of notification this is
-	* phpbb_notifications_type_
+	* phpbb_notification_type_
 	*/
 	public static function get_item_type()
 	{
diff --git a/phpBB/includes/notifications/type/post_in_queue.php b/phpBB/includes/notifications/type/post_in_queue.php
index 64f68c07e2..f0a5e0baec 100644
--- a/phpBB/includes/notifications/type/post_in_queue.php
+++ b/phpBB/includes/notifications/type/post_in_queue.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_post
+class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 {
 	/**
 	* Email template to use to send notifications
@@ -52,7 +52,7 @@ class phpbb_notifications_type_post_in_queue extends phpbb_notifications_type_po
 
 	/**
 	* Get the type of notification this is
-	* phpbb_notifications_type_
+	* phpbb_notification_type_
 	*/
 	public static function get_item_type()
 	{
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
index f162b37126..dd3cbedee2 100644
--- a/phpBB/includes/notifications/type/quote.php
+++ b/phpBB/includes/notifications/type/quote.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_type_quote extends phpbb_notifications_type_post
+class phpbb_notification_type_quote extends phpbb_notification_type_post
 {
 	/**
 	* Email template to use to send notifications
@@ -48,7 +48,7 @@ class phpbb_notifications_type_quote extends phpbb_notifications_type_post
 
 	/**
 	* Get the type of notification this is
-	* phpbb_notifications_type_
+	* phpbb_notification_type_
 	*/
 	public static function get_item_type()
 	{
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
index ddef0147ba..7753b196e8 100644
--- a/phpBB/includes/notifications/type/topic.php
+++ b/phpBB/includes/notifications/type/topic.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_type_topic extends phpbb_notifications_type_base
+class phpbb_notification_type_topic extends phpbb_notification_type_base
 {
 	/**
 	* Email template to use to send notifications
@@ -41,7 +41,7 @@ class phpbb_notifications_type_topic extends phpbb_notifications_type_base
 
 	/**
 	* Get the type of notification this is
-	* phpbb_notifications_type_
+	* phpbb_notification_type_
 	*/
 	public static function get_item_type()
 	{
diff --git a/phpBB/includes/notifications/type/topic_in_queue.php b/phpBB/includes/notifications/type/topic_in_queue.php
index dc7f7aa105..385578cec8 100644
--- a/phpBB/includes/notifications/type/topic_in_queue.php
+++ b/phpBB/includes/notifications/type/topic_in_queue.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_topic
+class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_topic
 {
 	/**
 	* Email template to use to send notifications
@@ -62,7 +62,7 @@ class phpbb_notifications_type_topic_in_queue extends phpbb_notifications_type_t
 
 	/**
 	* Get the type of notification this is
-	* phpbb_notifications_type_
+	* phpbb_notification_type_
 	*/
 	public static function get_item_type()
 	{
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 950b70a156..d248099b06 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -85,11 +85,11 @@ class ucp_notifications
 	* Output all the notification types to the template
 	*
 	* @param string $block
-	* @param phpbb_notifications_service $phpbb_notifications
+	* @param phpbb_notification_manager $phpbb_notifications
 	* @param phpbb_template $template
 	* @param phpbb_user $user
 	*/
-	public function output_notification_types($block = 'notification_types', phpbb_notifications_service $phpbb_notifications, phpbb_template $template, phpbb_user $user)
+	public function output_notification_types($block = 'notification_types', phpbb_notification_manager $phpbb_notifications, phpbb_template $template, phpbb_user $user)
 	{
 		$notification_methods = $phpbb_notifications->get_subscription_methods();
 		$subscriptions = $phpbb_notifications->get_subscriptions(false, true);
@@ -121,11 +121,11 @@ class ucp_notifications
 	* Output all the notification methods to the template
 	*
 	* @param string $block
-	* @param phpbb_notifications_service $phpbb_notifications
+	* @param phpbb_notification_manager $phpbb_notifications
 	* @param phpbb_template $template
 	* @param phpbb_user $user
 	*/
-	public function output_notification_methods($block = 'notification_methods', phpbb_notifications_service $phpbb_notifications, phpbb_template $template, phpbb_user $user)
+	public function output_notification_methods($block = 'notification_methods', phpbb_notification_manager $phpbb_notifications, phpbb_template $template, phpbb_user $user)
 	{
 		$notification_methods = $phpbb_notifications->get_subscription_methods();
 
-- 
cgit v1.2.1


From 64820546d758b34720888311d0abffcf95609436 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Oct 2012 13:40:40 -0500
Subject: [ticket/11103] Move notification files to includes/notification/

PHPBB3-11103
---
 phpBB/includes/notification/manager.php            | 688 +++++++++++++++++++++
 phpBB/includes/notification/method/base.php        |  92 +++
 phpBB/includes/notification/method/email.php       | 104 ++++
 phpBB/includes/notification/method/interface.php   |  27 +
 phpBB/includes/notification/method/jabber.php      |  62 ++
 phpBB/includes/notification/type/approve_post.php  | 132 ++++
 phpBB/includes/notification/type/approve_topic.php | 130 ++++
 phpBB/includes/notification/type/base.php          | 345 +++++++++++
 phpBB/includes/notification/type/bookmark.php      | 117 ++++
 .../includes/notification/type/disapprove_post.php | 116 ++++
 .../notification/type/disapprove_topic.php         | 116 ++++
 phpBB/includes/notification/type/interface.php     |  49 ++
 phpBB/includes/notification/type/pm.php            | 191 ++++++
 phpBB/includes/notification/type/post.php          | 242 ++++++++
 phpBB/includes/notification/type/post_in_queue.php | 137 ++++
 phpBB/includes/notification/type/quote.php         | 209 +++++++
 phpBB/includes/notification/type/topic.php         | 237 +++++++
 .../includes/notification/type/topic_in_queue.php  | 137 ++++
 phpBB/includes/notifications/method/base.php       |  92 ---
 phpBB/includes/notifications/method/email.php      | 104 ----
 phpBB/includes/notifications/method/interface.php  |  27 -
 phpBB/includes/notifications/method/jabber.php     |  62 --
 phpBB/includes/notifications/service.php           | 688 ---------------------
 phpBB/includes/notifications/type/approve_post.php | 132 ----
 .../includes/notifications/type/approve_topic.php  | 130 ----
 phpBB/includes/notifications/type/base.php         | 345 -----------
 phpBB/includes/notifications/type/bookmark.php     | 117 ----
 .../notifications/type/disapprove_post.php         | 116 ----
 .../notifications/type/disapprove_topic.php        | 116 ----
 phpBB/includes/notifications/type/interface.php    |  49 --
 phpBB/includes/notifications/type/pm.php           | 191 ------
 phpBB/includes/notifications/type/post.php         | 242 --------
 .../includes/notifications/type/post_in_queue.php  | 137 ----
 phpBB/includes/notifications/type/quote.php        | 209 -------
 phpBB/includes/notifications/type/topic.php        | 237 -------
 .../includes/notifications/type/topic_in_queue.php | 137 ----
 36 files changed, 3131 insertions(+), 3131 deletions(-)
 create mode 100644 phpBB/includes/notification/manager.php
 create mode 100644 phpBB/includes/notification/method/base.php
 create mode 100644 phpBB/includes/notification/method/email.php
 create mode 100644 phpBB/includes/notification/method/interface.php
 create mode 100644 phpBB/includes/notification/method/jabber.php
 create mode 100644 phpBB/includes/notification/type/approve_post.php
 create mode 100644 phpBB/includes/notification/type/approve_topic.php
 create mode 100644 phpBB/includes/notification/type/base.php
 create mode 100644 phpBB/includes/notification/type/bookmark.php
 create mode 100644 phpBB/includes/notification/type/disapprove_post.php
 create mode 100644 phpBB/includes/notification/type/disapprove_topic.php
 create mode 100644 phpBB/includes/notification/type/interface.php
 create mode 100644 phpBB/includes/notification/type/pm.php
 create mode 100644 phpBB/includes/notification/type/post.php
 create mode 100644 phpBB/includes/notification/type/post_in_queue.php
 create mode 100644 phpBB/includes/notification/type/quote.php
 create mode 100644 phpBB/includes/notification/type/topic.php
 create mode 100644 phpBB/includes/notification/type/topic_in_queue.php
 delete mode 100644 phpBB/includes/notifications/method/base.php
 delete mode 100644 phpBB/includes/notifications/method/email.php
 delete mode 100644 phpBB/includes/notifications/method/interface.php
 delete mode 100644 phpBB/includes/notifications/method/jabber.php
 delete mode 100644 phpBB/includes/notifications/service.php
 delete mode 100644 phpBB/includes/notifications/type/approve_post.php
 delete mode 100644 phpBB/includes/notifications/type/approve_topic.php
 delete mode 100644 phpBB/includes/notifications/type/base.php
 delete mode 100644 phpBB/includes/notifications/type/bookmark.php
 delete mode 100644 phpBB/includes/notifications/type/disapprove_post.php
 delete mode 100644 phpBB/includes/notifications/type/disapprove_topic.php
 delete mode 100644 phpBB/includes/notifications/type/interface.php
 delete mode 100644 phpBB/includes/notifications/type/pm.php
 delete mode 100644 phpBB/includes/notifications/type/post.php
 delete mode 100644 phpBB/includes/notifications/type/post_in_queue.php
 delete mode 100644 phpBB/includes/notifications/type/quote.php
 delete mode 100644 phpBB/includes/notifications/type/topic.php
 delete mode 100644 phpBB/includes/notifications/type/topic_in_queue.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
new file mode 100644
index 0000000000..15db3f89fd
--- /dev/null
+++ b/phpBB/includes/notification/manager.php
@@ -0,0 +1,688 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Notifications service class
+* @package notifications
+*/
+class phpbb_notification_manager
+{
+	protected $phpbb_container;
+	protected $db;
+
+	/**
+	* Users loaded from the DB
+	*
+	* @var array Array of user data that we've loaded from the DB
+	*/
+	protected $users = array();
+
+	public function __construct(ContainerBuilder $phpbb_container)
+	{
+		$this->phpbb_container = $phpbb_container;
+
+		// Some common things we're going to use
+		$this->db = $phpbb_container->get('dbal.conn');
+	}
+
+	/**
+	* Load the user's notifications
+	*
+	* @param array $options Optional options to control what notifications are loaded
+	*				notification_id		Notification id to load (or array of notification ids)
+	*				user_id				User id to load notifications for (Default: $user->data['user_id'])
+	*				order_by			Order by (Default: time)
+	*				order_dir			Order direction (Default: DESC)
+	* 				limit				Number of notifications to load (Default: 5)
+	* 				start				Notifications offset (Default: 0)
+	* 				all_unread			Load all unread messages? If set to true, count_unread is set to true (Default: false)
+	* 				count_unread		Count all unread messages? (Default: false)
+	*/
+	public function load_notifications($options = array())
+	{
+		$user = $this->phpbb_container->get('user');
+
+		// Merge default options
+		$options = array_merge(array(
+			'notification_id'	=> false,
+			'user_id'			=> $user->data['user_id'],
+			'order_by'			=> 'time',
+			'order_dir'			=> 'DESC',
+			'limit'				=> 0,
+			'start'				=> 0,
+			'all_unread'		=> false,
+			'count_unread'		=> false,
+		), $options);
+
+		// If all_unread, count_unread mus be true
+		$options['count_unread'] = ($options['all_unread']) ? true : $options['count_unread'];
+
+		// Anonymous users and bots never receive notifications
+		if ($options['user_id'] == $user->data['user_id'] && ($user->data['user_id'] == ANONYMOUS || $user->data['user_type'] == USER_IGNORE))
+		{
+			return array(
+				'notifications'		=> array(),
+				'unread_count'		=> 0,
+			);
+		}
+
+		$notifications = $user_ids = array();
+		$load_special = array();
+		$count = 0;
+
+		if ($options['count_unread'])
+		{
+			// Get the total number of unread notifications
+			$sql = 'SELECT COUNT(*) AS count
+				FROM ' . NOTIFICATIONS_TABLE . '
+				WHERE user_id = ' . (int) $options['user_id'] . '
+					AND unread = 1';
+			$result = $this->db->sql_query($sql);
+			$count = (int) $this->db->sql_fetchfield('count', $result);
+			$this->db->sql_freeresult($result);
+		}
+
+		$rowset = array();
+
+		// Get the main notifications
+		$sql = 'SELECT *
+			FROM ' . NOTIFICATIONS_TABLE . '
+			WHERE user_id = ' . (int) $options['user_id'] .
+				(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('notification_id', $options['notification_id']) : ' AND notification_id = ' . (int) $options['notification_id']) : '') . '
+				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
+		$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$rowset[$row['notification_id']] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		// Get all unread notifications
+		if ($count && $options['all_unread'] && !empty($rowset))
+		{
+			$sql = 'SELECT *
+				FROM ' . NOTIFICATIONS_TABLE . '
+				WHERE user_id = ' . (int) $options['user_id'] . '
+					AND unread = 1
+					AND ' . $this->db->sql_in_set('notification_id', array_keys($rowset), true) . '
+					ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
+			$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$rowset[$row['notification_id']] = $row;
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		foreach ($rowset as $row)
+		{
+			$item_type_class_name = $this->get_item_type_class_name($row['item_type'], true);
+
+			$notification = new $item_type_class_name($this->phpbb_container, $row);
+
+			// Array of user_ids to query all at once
+			$user_ids = array_merge($user_ids, $notification->users_to_query());
+
+			// Some notification types also require querying additional tables themselves
+			if (!isset($load_special[$row['item_type']]))
+			{
+				$load_special[$row['item_type']] = array();
+			}
+			$load_special[$row['item_type']] = array_merge($load_special[$row['item_type']], $notification->get_load_special());
+
+			$notifications[] = $notification;
+		}
+
+		$this->load_users($user_ids);
+
+		// Allow each type to load it's own special items
+		foreach ($load_special as $item_type => $data)
+		{
+			$item_type_class_name = $this->get_item_type_class_name($item_type, true);
+
+			$item_type_class_name::load_special($this->phpbb_container, $data, $notifications);
+		}
+
+		return array(
+			'notifications'		=> $notifications,
+			'unread_count'		=> $count,
+		);
+	}
+
+	/**
+	* Mark notifications read
+	*
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
+	* @param bool|int|array $item_id Item id or array of item ids. False to mark read for all item ids
+	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
+	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
+	*/
+	public function mark_notifications_read($item_type, $item_id, $user_id, $time = false)
+	{
+		if (is_array($item_type))
+		{
+			foreach ($item_type as $type)
+			{
+				$this->mark_notifications_read($type, $item_id, $user_id, $time);
+			}
+
+			return;
+		}
+
+		$time = ($time) ?: time();
+
+		$this->get_item_type_class_name($item_type);
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+			SET unread = 0
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND time <= " . $time .
+				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '') .
+				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Mark notifications read from a parent identifier
+	*
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
+	* @param bool|int|array $item_parent_id Item parent id or array of item parent ids. False to mark read for all item parent ids
+	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
+	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
+	*/
+	public function mark_notifications_read_by_parent($item_type, $item_parent_id, $user_id, $time = false)
+	{
+		if (is_array($item_type))
+		{
+			foreach ($item_type as $type)
+			{
+				$this->mark_notifications_read_by_parent($type, $item_parent_id, $user_id, $time);
+			}
+
+			return;
+		}
+
+		$time = ($time) ?: time();
+
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+			SET unread = 0
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND time <= " . $time .
+				(($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') .
+				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Mark notifications read
+	*
+	* @param int|array $notification_id Notification id or array of notification ids.
+	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
+	*/
+	public function mark_notifications_read_by_id($notification_id, $time = false)
+	{
+		$time = ($time) ?: time();
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+			SET unread = 0
+			WHERE time <= " . $time . '
+				AND ' . ((is_array($notification_id)) ? $this->db->sql_in_set('notification_id', $notification_id) : 'notification_id = ' . (int) $notification_id);
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Add a notification
+	*
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
+	*			Note: If you send an array of types, any user who could receive multiple notifications from this single item will only receive
+	* 			a single notification. If they MUST receive multiple notifications, call this function multiple times instead of sending an array
+	* @param array $data Data specific for this type that will be inserted
+	*/
+	public function add_notifications($item_type, $data, $options = array())
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		if (is_array($item_type))
+		{
+			$notified_users = array();
+			$temp_options = $options;
+
+			foreach ($item_type as $type)
+			{
+				$temp_options['ignore_users'] = $options['ignore_users'] + $notified_users;
+				$notified_users += $this->add_notifications($type, $data, $temp_options);
+			}
+
+			return $notified_users;
+		}
+
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
+
+		$item_id = $item_type_class_name::get_item_id($data);
+
+		// find out which users want to receive this type of notification
+		$notify_users = $item_type_class_name::find_users_for_notification($this->phpbb_container, $data, $options);
+
+		$this->add_notifications_for_users($item_type, $data, $notify_users);
+
+		return $notify_users;
+	}
+
+	/**
+	* Add a notification for specific users
+	*
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
+	* @param array $data Data specific for this type that will be inserted
+	* @param array $notify_users User list to notify
+	*/
+	public function add_notifications_for_users($item_type, $data, $notify_users)
+	{
+		if (is_array($item_type))
+		{
+			foreach ($item_type as $type)
+			{
+				$this->add_notifications_for_users($type, $data, $notify_users);
+			}
+
+			return;
+		}
+
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
+
+		$item_id = $item_type_class_name::get_item_id($data);
+
+		$user_ids = array();
+		$notification_objects = $notification_methods = array();
+		$new_rows = array();
+
+		// Never send notifications to the anonymous user!
+		unset($notify_users[ANONYMOUS]);
+
+		// Make sure not to send new notifications to users who've already been notified about this item
+		// This may happen when an item was added, but now new users are able to see the item
+		// todo Users should not receive notifications from multiple events from the same item (ex: for a topic reply with a quote including your username)
+		//		Probably should be handled within each type?
+		$sql = 'SELECT user_id
+			FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id;
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			unset($notify_users[$row['user_id']]);
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!sizeof($notify_users))
+		{
+			return;
+		}
+
+		// Go through each user so we can insert a row in the DB and then notify them by their desired means
+		foreach ($notify_users as $user => $methods)
+		{
+			$notification = new $item_type_class_name($this->phpbb_container);
+
+			$notification->user_id = (int) $user;
+
+			// Store the creation array in our new rows that will be inserted later
+			$new_rows[] = $notification->create_insert_array($data);
+
+			// Users are needed to send notifications
+			$user_ids = array_merge($user_ids, $notification->users_to_query());
+
+			foreach ($methods as $method)
+			{
+				// setup the notification methods and add the notification to the queue
+				if ($method) // blank means we just insert it as a notification, but do not notify them by any other means
+				{
+					if (!isset($notification_methods[$method]))
+					{
+						$method_class_name = 'phpbb_notification_method_' . $method;
+						$notification_methods[$method] = new $method_class_name($this->phpbb_container);
+					}
+
+					$notification_methods[$method]->add_to_queue($notification);
+				}
+			}
+		}
+
+		// insert into the db
+		$this->db->sql_multi_insert(NOTIFICATIONS_TABLE, $new_rows);
+
+		// We need to load all of the users to send notifications
+		$this->load_users($user_ids);
+
+		// run the queue for each method to send notifications
+		foreach ($notification_methods as $method)
+		{
+			$method->notify();
+		}
+	}
+
+	/**
+	* Update a notification
+	*
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
+	* @param array $data Data specific for this type that will be updated
+	*/
+	public function update_notifications($item_type, $data)
+	{
+		if (is_array($item_type))
+		{
+			foreach ($item_type as $type)
+			{
+				$this->update_notifications($type, $data);
+			}
+
+			return;
+		}
+
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
+
+		// Allow the notifications class to over-ride the update_notifications functionality
+		if (method_exists($item_type_class_name, 'update_notifications'))
+		{
+			// Return False to over-ride the rest of the update
+			if ($item_type_class_name::update_notifications($this->phpbb_container, $data) === false)
+			{
+				return;
+			}
+		}
+
+		$item_id = $item_type_class_name::get_item_id($data);
+
+		$notification = new $item_type_class_name($this->phpbb_container);
+		$update_array = $notification->create_update_array($data);
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+			SET ' . $this->db->sql_build_array('UPDATE', $update_array) . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id;
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Delete a notification
+	*
+	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $item_id is identical for the specified types)
+	* @param int|array $item_id Identifier within the type (or array of ids)
+	* @param array $data Data specific for this type that will be updated
+	*/
+	public function delete_notifications($item_type, $item_id)
+	{
+		if (is_array($item_type))
+		{
+			foreach ($item_type as $type)
+			{
+				$this->delete_notifications($type, $item_id);
+			}
+
+			return;
+		}
+
+		$this->get_item_type_class_name($item_type);
+
+		$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND " . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id);
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Get all of the subscription types
+	*
+	* @return array Array of item types
+	*/
+	public function get_subscription_types()
+	{
+		$subscription_types = array();
+
+		foreach ($this->get_subscription_files('notifications/type/') as $class => $file)
+		{
+			$class = $this->get_item_type_class_name($class);
+
+			if (!class_exists($class))
+			{
+				include($file);
+			}
+
+			if ($class::is_available($this->phpbb_container) && method_exists($class, 'get_item_type'))
+			{
+				if ($class::$notification_option === false)
+				{
+					$subscription_types[$class::get_item_type()] = $class::get_item_type();
+				}
+				else
+				{
+					$subscription_types[$class::$notification_option['id']] = $class::$notification_option;
+				}
+			}
+		}
+
+		return $subscription_types;
+	}
+
+	/**
+	* Get all of the subscription methods
+	*
+	* @return array Array of methods
+	*/
+	public function get_subscription_methods()
+	{
+		$subscription_methods = array();
+
+		foreach ($this->get_subscription_files('notifications/method/') as $method_name => $file)
+		{
+			$class_name = 'phpbb_notification_method_' . $method_name;
+
+			if (!class_exists($class_name))
+			{
+				include($file);
+			}
+
+			$method = new $class_name($this->phpbb_container);
+
+			if ($method->is_available())
+			{
+				$subscription_methods[] = $method_name;
+			}
+		}
+
+		return $subscription_methods;
+	}
+
+	/**
+	* Get subscriptions
+	*
+	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
+	* @param bool $only_global True to select only global subscription options (item_id = 0)
+	*
+	* @return array Subscriptions
+	*/
+	public function get_subscriptions($user_id = false, $only_global = false)
+	{
+		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
+
+		$subscriptions = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . '
+			WHERE user_id = ' . (int) $user_id .
+				(($only_global) ? ' AND item_id = 0' : '');
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if ($only_global)
+			{
+				if (!isset($subscriptions[$row['item_type']]))
+				{
+					$subscriptions[$row['item_type']] = array();
+				}
+
+				$subscriptions[$row['item_type']][] = $row['method'];
+			}
+			else
+			{
+				$subscriptions[] = $row;
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		return $subscriptions;
+	}
+
+	/**
+	* Add a subscription
+	*
+	* @param string $item_type Type identifier of the subscription
+	* @param int $item_id The id of the item
+	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
+	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
+	*/
+	public function add_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
+	{
+		$this->get_item_type_class_name($item_type);
+
+		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
+
+		$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
+			$this->db->sql_build_array('INSERT', array(
+				'item_type'		=> $item_type,
+				'item_id'		=> (int) $item_id,
+				'user_id'		=> (int) $user_id,
+				'method'		=> $method,
+			));
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Delete a subscription
+	*
+	* @param string $item_type Type identifier of the subscription
+	* @param int $item_id The id of the item
+	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
+	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
+	*/
+	public function delete_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
+	{
+		$this->get_item_type_class_name($item_type);
+
+		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
+
+		$sql = 'DELETE FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id . '
+				AND user_id = ' .(int) $user_id . "
+				AND method = '" . $this->db->sql_escape($method) . "'";
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Load user helper
+	*
+	* @param array $user_ids
+	*/
+	public function load_users($user_ids)
+	{
+		$user_ids[] = ANONYMOUS;
+
+		// Load the users
+		$user_ids = array_unique($user_ids);
+
+		// Do not load users we already have in $this->users
+		$user_ids = array_diff($user_ids, array_keys($this->users));
+
+		if (sizeof($user_ids))
+		{
+			$sql = 'SELECT *
+				FROM ' . USERS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$this->users[$row['user_id']] = $row;
+			}
+			$this->db->sql_freeresult($result);
+		}
+	}
+
+	/**
+	* Get a user row from our users cache
+	*
+	* @param int $user_id
+	* @return array
+	*/
+	public function get_user($user_id)
+	{
+		return (isset($this->users[$user_id])) ? $this->users[$user_id] : $this->users[ANONYMOUS];
+	}
+
+	/**
+	* Helper to get the notifications item type class name and clean it if unsafe
+	*/
+	private function get_item_type_class_name(&$item_type, $safe = false)
+	{
+		if (!$safe)
+		{
+			$item_type = preg_replace('#[^a-z_]#', '', $item_type);
+		}
+
+		return 'phpbb_notification_type_' . $item_type;
+	}
+
+	/**
+	* Helper to get subscription related files with the finder
+	*/
+	private function get_subscription_files($path)
+	{
+		$ext_manager = $this->phpbb_container->get('ext.manager');
+		$php_ext = $this->phpbb_container->getParameter('core.php_ext');
+
+		$finder = $ext_manager->get_finder();
+
+		$subscription_files = array();
+
+		$files = $finder
+			->core_path('includes/' . $path)
+			->extension_directory($path)
+			->get_files();
+		foreach ($files as $file)
+		{
+			$class = substr($file, strrpos($file, '/'));
+			$class = substr($class, 1, (strpos($class, '.' . $php_ext) - 1));
+
+			if ($class == 'interface' || $class == 'base')
+			{
+				continue;
+			}
+
+			$subscription_files[$class] = $file;
+		}
+
+		return $subscription_files;
+	}
+}
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
new file mode 100644
index 0000000000..b502d3afd0
--- /dev/null
+++ b/phpBB/includes/notification/method/base.php
@@ -0,0 +1,92 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications method class
+* @package notifications
+*/
+abstract class phpbb_notification_method_base implements phpbb_notification_method_interface
+{
+	protected $phpbb_container;
+	protected $service;
+	protected $db;
+	protected $user;
+	protected $phpbb_root_path;
+	protected $php_ext;
+
+	/**
+	* Desired notifications
+	* unique by (type, type_id, user_id, method)
+	* if multiple methods are desired, multiple rows will exist.
+	*
+	* method of "none" will over-ride any other options
+	*
+	* item_type
+	* item_id
+	* user_id
+	* method
+	* 	none (will never receive notifications)
+	* 	standard (listed in notifications window
+	* 	popup?
+	* 	email
+	* 	jabber
+	*	sms?
+	*/
+
+	/**
+	* Queue of messages to be sent
+	*
+	* @var array
+	*/
+	protected $queue = array();
+
+	public function __construct(ContainerBuilder $phpbb_container)
+	{
+		// phpBB Container
+		$this->phpbb_container = $phpbb_container;
+
+		// Service
+		$this->service = $phpbb_container->get('notifications');
+
+		// Some common things we're going to use
+		$this->db = $phpbb_container->get('dbal.conn');
+		$this->user = $phpbb_container->get('user');
+
+		$this->phpbb_root_path = $phpbb_container->getParameter('core.root_path');
+		$this->php_ext = $phpbb_container->getParameter('core.php_ext');
+	}
+
+	/**
+	* Add a notification to the queue
+	*
+	* @param phpbb_notification_type_interface $notification
+	*/
+	public function add_to_queue(phpbb_notification_type_interface $notification)
+	{
+		$this->queue[] = $notification;
+	}
+
+	/**
+	* Empty the queue
+	*/
+	protected function empty_queue()
+	{
+		$this->queue = array();
+	}
+}
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
new file mode 100644
index 0000000000..1b6b44d137
--- /dev/null
+++ b/phpBB/includes/notification/method/email.php
@@ -0,0 +1,104 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Email notification method class
+* This class handles sending emails for notifications
+*
+* @package notifications
+*/
+class phpbb_notification_method_email extends phpbb_notification_method_base
+{
+	/**
+	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
+	*
+	* @var mixed
+	*/
+	protected $notify_method = NOTIFY_EMAIL;
+
+	/**
+	* Is this method available for the user?
+	* This is checked on the notifications options
+	*/
+	public function is_available()
+	{
+		// Email is always available
+		return true;
+	}
+
+	public function notify()
+	{
+		if (!sizeof($this->queue))
+		{
+			return;
+		}
+
+		// Load all users we want to notify (we need their email address)
+		$user_ids = $users = array();
+		foreach ($this->queue as $notification)
+		{
+			$user_ids[] = $notification->user_id;
+		}
+
+		// We do not send emails to banned users
+		if (!function_exists('phpbb_get_banned_user_ids'))
+		{
+			include($this->phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $this->phpbb_container->getParameter('core.php_ext'));
+		}
+		$banned_users = phpbb_get_banned_user_ids($user_ids);
+
+		// Load all the users we need
+		$this->service->load_users($user_ids);
+
+		// Load the messenger
+		if (!class_exists('messenger'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
+		}
+		$messenger = new messenger();
+		$board_url = generate_board_url();
+
+		// Time to go through the queue and send emails
+		foreach ($this->queue as $notification)
+		{
+			$user = $this->service->get_user($notification->user_id);
+
+			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
+			{
+				continue;
+			}
+
+			$messenger->template($notification->email_template, $user['user_lang']);
+
+			$messenger->to($user['user_email'], $user['username']);
+
+			$messenger->assign_vars(array_merge(array(
+				'USERNAME'						=> $user['username'],
+
+				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',
+			), $notification->get_email_template_variables()));
+
+			$messenger->send($this->notify_method);
+		}
+
+		// Save the queue in the messenger class (has to be called or these emails could be lost?)
+		$messenger->save_queue();
+
+		// We're done, empty the queue
+		$this->empty_queue();
+	}
+}
diff --git a/phpBB/includes/notification/method/interface.php b/phpBB/includes/notification/method/interface.php
new file mode 100644
index 0000000000..4b990ec9fa
--- /dev/null
+++ b/phpBB/includes/notification/method/interface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications method interface
+* @package notifications
+*/
+interface phpbb_notification_method_interface
+{
+	public function is_available();
+
+	public function notify();
+}
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
new file mode 100644
index 0000000000..9232d8fc45
--- /dev/null
+++ b/phpBB/includes/notification/method/jabber.php
@@ -0,0 +1,62 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Jabber notification method class
+* This class handles sending Jabber messages for notifications
+*
+* @package notifications
+*/
+class phpbb_notification_method_jabber extends phpbb_notification_method_email
+{
+	/**
+	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
+	*
+	* @var mixed
+	*/
+	protected $notify_method = NOTIFY_IM;
+
+	/**
+	* Is this method available for the user?
+	* This is checked on the notifications options
+	*/
+	public function is_available()
+	{
+		return ($this->global_available() && $this->phpbb_container->get('user')->data['jabber']);
+	}
+
+	/**
+	* Is this method available at all?
+	* This is checked before notifications are sent
+	*/
+	public function global_available()
+	{
+		$config = $this->phpbb_container->get('config');
+
+		return ($config['jab_enable'] && @extension_loaded('xml'));
+	}
+
+	public function notify()
+	{
+		if (!$this->global_available())
+		{
+			return;
+		}
+
+		return parent::notify();
+	}
+}
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
new file mode 100644
index 0000000000..9a3def6217
--- /dev/null
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -0,0 +1,132 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* This class handles notifications for replies to a topic
+*
+* @package notifications
+*/
+class phpbb_notification_type_approve_post extends phpbb_notification_type_post
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'post_approved';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_POST_APPROVED';
+
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'moderation_queue',
+		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+	);
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'approve_post';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		$db = $phpbb_container->get('dbal.conn');
+
+		$users = array();
+		$users[$post['poster_id']] = array('');
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::$notification_option['id'] . "'
+				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $notify_users;
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('post_subject', $post['post_subject']);
+
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
+
+		return $data;
+	}
+}
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
new file mode 100644
index 0000000000..00af312018
--- /dev/null
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -0,0 +1,130 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* This class handles notifications for replies to a topic
+*
+* @package notifications
+*/
+class phpbb_notification_type_approve_topic extends phpbb_notification_type_topic
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'topic_approved';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_TOPIC_APPROVED';
+
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'moderation_queue',
+		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+	);
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'approve_topic';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		$db = $phpbb_container->get('dbal.conn');
+
+		$users = array();
+		$users[$post['poster_id']] = array('');
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::$notification_option['id'] . "'
+				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $notify_users;
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
+
+		return $data;
+	}
+}
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
new file mode 100644
index 0000000000..40462bccfb
--- /dev/null
+++ b/phpBB/includes/notification/type/base.php
@@ -0,0 +1,345 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications class
+* @package notifications
+*/
+abstract class phpbb_notification_type_base implements phpbb_notification_type_interface
+{
+	protected $phpbb_container;
+	protected $service;
+	protected $db;
+	protected $phpbb_root_path;
+	protected $php_ext;
+
+	/**
+	* Array of user data containing information needed to output the notifications to the template
+	*
+	* @var array
+	*/
+	protected $users = array();
+
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = false;
+
+	/**
+	* Indentification data
+	* item_type
+	* item_id
+	* item_parent_id // Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
+	* user_id
+	* unread
+	*
+	* time
+	* data (special serialized field that each notification type can use to store stuff)
+	*
+	* @var array $data Notification row from the database
+	* 		This must be private, all interaction should use __get(), __set(), get_data(), set_data()
+	*/
+	private $data = array();
+
+	public function __construct(ContainerBuilder $phpbb_container, $data = array())
+	{
+		// phpBB Container
+		$this->phpbb_container = $phpbb_container;
+
+		// Service
+		$this->service = $phpbb_container->get('notifications');
+
+		// Some common things we're going to use
+		$this->db = $phpbb_container->get('dbal.conn');
+
+		$this->phpbb_root_path = $phpbb_container->getParameter('core.root_path');
+		$this->php_ext = $phpbb_container->getParameter('core.php_ext');
+
+		// The row from the database (unless this is a new notification we're going to add)
+		$this->data = $data;
+		$this->data['data'] = (isset($this->data['data'])) ? unserialize($this->data['data']) : array();
+	}
+
+	public function __get($name)
+	{
+		return $this->data[$name];
+	}
+
+	public function __set($name, $value)
+	{
+		$this->data[$name] = $value;
+	}
+
+	/**
+	* Get special data (only important for the classes that extend this)
+	*
+	* @param string $name Name of the variable to get
+	*
+	* @return mixed
+	*/
+	protected function get_data($name)
+	{
+		return (isset($this->data['data'][$name])) ? $this->data['data'][$name] : null;
+	}
+
+	/**
+	* Set special data (only important for the classes that extend this)
+	*
+	* @param string $name Name of the variable to set
+	* @param mixed $value Value to set to the variable
+	*/
+	protected function set_data($name, $value)
+	{
+		$this->data['data'][$name] = $value;
+	}
+
+	/**
+	* Prepare to output the notification to the template
+	*/
+	public function prepare_for_display()
+	{
+		$user = $this->phpbb_container->get('user');
+
+		return array(
+			'AVATAR'			=> $this->get_avatar(),
+
+			'FORMATTED_TITLE'	=> $this->get_title(),
+
+			'URL'				=> $this->get_url(),
+			'TIME'	   			=> $user->format_date($this->time),
+
+			'UNREAD'			=> $this->unread,
+
+			'U_MARK_READ'		=> append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification[]=' . $this->notification_id),
+		);
+	}
+
+	/**
+	* Mark this item read
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_read($return = true)
+	{
+		return $this->mark(false, $return);
+	}
+
+	/**
+	* Mark this item unread
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_unread($return = true)
+	{
+		return $this->mark(true, $return);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $type_data Data unique to this notification type
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($type_data)
+	{
+		// Defaults
+		$this->data = array_merge(array(
+			'item_id'				=> static::get_item_id($type_data),
+			'item_type'	   			=> $this->get_item_type(),
+			'item_parent_id'		=> static::get_item_parent_id($type_data),
+
+			'time'					=> time(),
+			'unread'				=> true,
+
+			'data'					=> array(),
+		), $this->data);
+
+		$data = $this->data;
+
+		$data['data'] = serialize($data['data']);
+
+		return $data;
+	}
+
+	/**
+	* Function for preparing the data for update in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $type_data Data unique to this notification type
+	*
+	* @return array Array of data ready to be updated in the database
+	*/
+	public function create_update_array($type_data)
+	{
+		$data = $this->create_insert_array($type_data);
+
+		// Unset data unique to each row
+		unset(
+			$data['notification_id'],
+			$data['unread'],
+			$data['user_id']
+		);
+
+		return $data;
+	}
+
+	/**
+	* -------------- Fall back functions -------------------
+	*/
+
+	/**
+	* URL to unsubscribe to this notification (fall-back)
+	*
+	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
+	*/
+	public function get_unsubscribe_url($method = false)
+	{
+		return false;
+	}
+
+	/**
+	* Get the user's avatar (fall-back)
+	*/
+	public function get_avatar()
+	{
+		return '';
+	}
+
+	/**
+	* Get the special items to load (fall-back)
+	*/
+	public function get_load_special()
+	{
+		return array();
+	}
+
+	/**
+	* Load the special items (fall-back)
+	*/
+	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications)
+	{
+		return;
+	}
+
+	/**
+	* Is available (fall-back)
+	*/
+	public static function is_available(ContainerBuilder $phpbb_container)
+	{
+		return true;
+	}
+
+	/**
+	* -------------- Helper functions -------------------
+	*/
+
+	/**
+	* Find the users who want to receive notifications (helper)
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $item_id The item_id to search for
+	*
+	* @return array
+	*/
+	protected static function _find_users_for_notification(ContainerBuilder $phpbb_container, $item_id, $options)
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		$db = $phpbb_container->get('dbal.conn');
+
+		$rowset = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . static::get_item_type() . "'
+				AND item_id = " . (int) $item_id;
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$rowset[$row['user_id']] = array();
+			}
+
+			$rowset[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $rowset;
+	}
+
+	/**
+	* Get avatar helper
+	*
+	* @param int $user_id
+	* @return string
+	*/
+	protected function _get_avatar($user_id)
+	{
+		$user = $this->service->get_user($user_id);
+
+		if (!function_exists('get_user_avatar'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+		}
+
+		return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height'], $user['username'], false, 'notifications-avatar');
+	}
+
+	/**
+	* Mark this item read/unread helper
+	*
+	* @param bool $unread Unread (True/False) (Default: False)
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	protected function mark($unread = true, $return = false)
+	{
+		$where = array(
+			'item_type = ' . $this->db->sql_escape($this->item_type),
+			'item_id = ' . (int) $this->item_id,
+			'user_id = ' . (int) $this->user_id,
+		);
+		$where = implode(' AND ' . $where);
+
+		if ($return)
+		{
+			return $where;
+		}
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+			SET unread = ' . (bool) $unread . '
+			WHERE ' . $where;
+		$this->db->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
new file mode 100644
index 0000000000..51f23bc294
--- /dev/null
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -0,0 +1,117 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Bookmark updating notifications class
+* This class handles notifications for replies to a bookmarked topic
+*
+* @package notifications
+*/
+class phpbb_notification_type_bookmark extends phpbb_notification_type_post
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'notifications/bookmark';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_BOOKMARK';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'bookmark';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		$db = $phpbb_container->get('dbal.conn');
+
+		$users = array();
+
+		$sql = 'SELECT user_id
+			FROM ' . BOOKMARKS_TABLE . '
+			WHERE ' . $db->sql_in_set('topic_id', $post['topic_id']) . '
+				AND user_id <> ' . (int) $post['poster_id'];
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$users[] = $row['user_id'];
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($users))
+		{
+			return array();
+		}
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $notify_users;
+	}
+}
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
new file mode 100644
index 0000000000..8fa0102e3d
--- /dev/null
+++ b/phpBB/includes/notification/type/disapprove_post.php
@@ -0,0 +1,116 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* This class handles notifications for replies to a topic
+*
+* @package notifications
+*/
+class phpbb_notification_type_disapprove_post extends phpbb_notification_type_approve_post
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'post_disapproved';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_POST_DISAPPROVED';
+
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'moderation_queue',
+		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+	);
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'disapprove_post';
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		return $this->phpbb_container->get('user')->lang(
+			$this->language_key,
+			censor_text($this->get_data('topic_title')),
+			$this->get_data('disapprove_reason')
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return '';
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		return array_merge(parent::get_email_template_variables(), array(
+			'REASON'	=> htmlspecialchars_decode($this->get_data('disapprove_reason')),
+		));
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('disapprove_reason', $post['disapprove_reason']);
+
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
+
+		return $data;
+	}
+}
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
new file mode 100644
index 0000000000..186c42d2b6
--- /dev/null
+++ b/phpBB/includes/notification/type/disapprove_topic.php
@@ -0,0 +1,116 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* This class handles notifications for replies to a topic
+*
+* @package notifications
+*/
+class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_approve_topic
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'topic_disapproved';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_TOPIC_DISAPPROVED';
+
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'moderation_queue',
+		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+	);
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'disapprove_topic';
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		return $this->phpbb_container->get('user')->lang(
+			$this->language_key,
+			censor_text($this->get_data('topic_title')),
+			$this->get_data('disapprove_reason')
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return '';
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		return array_merge(parent::get_email_template_variables(), array(
+			'REASON'			=> htmlspecialchars_decode($this->get_data('disapprove_reason')),
+		));
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('disapprove_reason', $post['disapprove_reason']);
+
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
+
+		return $data;
+	}
+}
diff --git a/phpBB/includes/notification/type/interface.php b/phpBB/includes/notification/type/interface.php
new file mode 100644
index 0000000000..aa54c62a97
--- /dev/null
+++ b/phpBB/includes/notification/type/interface.php
@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications interface
+* @package notifications
+*/
+interface phpbb_notification_type_interface
+{
+	public static function get_item_type();
+
+	public static function get_item_id($type_data);
+
+	public static function is_available(ContainerBuilder $phpbb_container);
+
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $type_data, $options);
+
+	public function get_title();
+
+	public function get_email_template_variables();
+
+	public function get_url();
+
+	public function get_unsubscribe_url($method);
+
+	public function mark_read($return);
+
+	public function mark_unread($return);
+
+	public function create_insert_array($type_data);
+
+	public function get_load_special();
+
+	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications);
+}
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
new file mode 100644
index 0000000000..8252a8577b
--- /dev/null
+++ b/phpBB/includes/notification/type/pm.php
@@ -0,0 +1,191 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Private message notifications class
+* This class handles notifications for private messages
+*
+* @package notifications
+*/
+class phpbb_notification_type_pm extends phpbb_notification_type_base
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'privmsg_notify';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'pm';
+	}
+
+	/**
+	* Get the id of the
+	*
+	* @param array $pm The data from the private message
+	*/
+	public static function get_item_id($pm)
+	{
+		return (int) $pm['msg_id'];
+	}
+
+	/**
+	* Get the id of the parent
+	*
+	* @param array $pm The data from the pm
+	*/
+	public static function get_item_parent_id($pm)
+	{
+		// No parent
+		return 0;
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $pm Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $pm, $options = array())
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		$service = $phpbb_container->get('notifications');
+		$db = $phpbb_container->get('dbal.conn');
+		$user = $phpbb_container->get('user');
+
+		if (!sizeof($pm['recipients']))
+		{
+			return array();
+		}
+
+		$service->load_users(array_keys($pm['recipients']));
+
+		$notify_users = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND " . $db->sql_in_set('user_id', array_keys($pm['recipients']));
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $notify_users;
+	}
+
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('from_user_id'));
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		$user_data = $this->service->get_user($this->get_data('from_user_id'));
+
+		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+
+		return $this->phpbb_container->get('user')->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		$user_data = $this->service->get_user($this->get_data('from_user_id'));
+
+		return array(
+			'AUTHOR_NAME'				=> htmlspecialchars_decode($user_data['username']),
+			'SUBJECT'					=> htmlspecialchars_decode(censor_text($this->get_data('message_subject'))),
+
+			'U_VIEW_MESSAGE'			=> generate_board_url() . '/ucp.' . $this->php_ext . "?i=pm&mode=view&p={$this->item_id}",
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=pm&amp;mode=view&amp;p={$this->item_id}");
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['from_user_id']);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($pm)
+	{
+		$this->set_data('from_user_id', $pm['from_user_id']);
+
+		$this->set_data('message_subject', $pm['message_subject']);
+
+		return parent::create_insert_array($pm);
+	}
+}
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
new file mode 100644
index 0000000000..1e654ef51b
--- /dev/null
+++ b/phpBB/includes/notification/type/post.php
@@ -0,0 +1,242 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* This class handles notifications for replies to a topic
+*
+* @package notifications
+*/
+class phpbb_notification_type_post extends phpbb_notification_type_base
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'topic_notify';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_POST';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'post';
+	}
+
+	/**
+	* Get the id of the item
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_id($post)
+	{
+		return (int) $post['post_id'];
+	}
+
+	/**
+	* Get the id of the parent
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_parent_id($post)
+	{
+		return (int) $post['topic_id'];
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		// Let's continue to use the phpBB subscriptions system, at least for now.
+		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
+		//$users = parent::_find_users_for_notification($phpbb_container, $post['topic_id']);
+
+		$db = $phpbb_container->get('dbal.conn');
+
+		$users = array();
+
+		$sql = 'SELECT user_id
+			FROM ' . TOPICS_WATCH_TABLE . '
+			WHERE topic_id = ' . (int) $post['topic_id'] . '
+				AND notify_status = ' . NOTIFY_YES . '
+				AND user_id <> ' . (int) $post['poster_id'];
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$users[] = $row['user_id'];
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($users))
+		{
+			return array();
+		}
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $notify_users;
+	}
+
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('poster_id'));
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			$this->language_key,
+			$username,
+			censor_text($this->get_data('topic_title'))
+		);
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		return array(
+			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
+			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
+
+			'U_VIEW_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
+			'U_NEWEST_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
+			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
+			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
+			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
+			'U_STOP_WATCHING_TOPIC'		=> generate_board_url() . "/viewtopic.{$this->php_ext}?uid={$this->user_id}&f={$this->get_data('forum_id')}&t={$this->item_parent_id}&unwatch=topic",
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "p={$this->item_id}#p{$this->item_id}");
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['poster_id']);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('poster_id', $post['poster_id']);
+
+		$this->set_data('topic_title', $post['topic_title']);
+
+		$this->set_data('post_subject', $post['post_subject']);
+
+		$this->set_data('post_username', (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''));
+
+		$this->set_data('forum_id', $post['forum_id']);
+
+		$this->set_data('forum_name', $post['forum_name']);
+
+		$this->time = $post['post_time'];
+
+		return parent::create_insert_array($post);
+	}
+}
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
new file mode 100644
index 0000000000..f0a5e0baec
--- /dev/null
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -0,0 +1,137 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Topic notifications class
+* This class handles notifications for new topics
+*
+* @package notifications
+*/
+class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'notifications/post_in_queue';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_POST_IN_QUEUE';
+
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'needs_approval',
+		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
+	);
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'post_in_queue';
+	}
+
+	/**
+	* Is available
+	*/
+	public static function is_available(ContainerBuilder $phpbb_container)
+	{
+		$m_approve = $phpbb_container->get('auth')->acl_getf('m_approve', true);
+
+		return (!empty($m_approve));
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from the post
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		$db = $phpbb_container->get('dbal.conn');
+
+		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $post['forum_id']);
+
+		if (empty($auth_approve))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::$notification_option['id'] . "'
+				AND " . $db->sql_in_set('user_id', $auth_approve[$post['forum_id']]['m_approve']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $notify_users;
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
+
+		return $data;
+	}
+}
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
new file mode 100644
index 0000000000..dd3cbedee2
--- /dev/null
+++ b/phpBB/includes/notification/type/quote.php
@@ -0,0 +1,209 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post quoting notifications class
+* This class handles notifications for quoting users in a post
+*
+* @package notifications
+*/
+class phpbb_notification_type_quote extends phpbb_notification_type_post
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'notifications/quote';
+
+	/**
+	* regular expression to match to find usernames
+	*
+	* @var string
+	*/
+	protected static $regular_expression_match = '#\[quote=&quot;(.+?)&quot;#';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_QUOTE';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'quote';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		$db = $phpbb_container->get('dbal.conn');
+
+		$usernames = false;
+		preg_match_all(self::$regular_expression_match, $post['post_text'], $usernames);
+
+		if (empty($usernames[1]))
+		{
+			return array();
+		}
+
+		$usernames[1] = array_unique($usernames[1]);
+
+		$usernames = array_map('utf8_clean_string', $usernames[1]);
+
+		$users = array();
+
+		$sql = 'SELECT user_id
+			FROM ' . USERS_TABLE . '
+			WHERE ' . $db->sql_in_set('username_clean', $usernames) . '
+				AND user_id <> ' . (int) $post['poster_id'];
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$users[] = $row['user_id'];
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($users))
+		{
+			return array();
+		}
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $notify_users;
+	}
+
+	/**
+	* Update a notification
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $data Data specific for this type that will be updated
+	*/
+	public static function update_notifications(ContainerBuilder $phpbb_container, $post)
+	{
+		$service = $phpbb_container->get('notifications');
+		$db = $phpbb_container->get('dbal.conn');
+
+		$old_notifications = array();
+		$sql = 'SELECT user_id
+			FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND item_id = " . self::get_item_id($post);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$old_notifications[] = $row['user_id'];
+		}
+		$db->sql_freeresult($result);
+
+		// Find the new users to notify
+		$notifications = self::find_users_for_notification($phpbb_container, $post);
+
+		// Find the notifications we must delete
+		$remove_notifications = array_diff($old_notifications, array_keys($notifications));
+
+		// Find the notifications we must add
+		$add_notifications = array();
+		foreach (array_diff(array_keys($notifications), $old_notifications) as $user_id)
+		{
+			$add_notifications[$user_id] = $notifications[$user_id];
+		}
+
+		// todo Adding notifications while editing a post can be funky.
+		// If the user has read the topic/post already, and the user is newly quoted it an edit,
+		// The notification will be stuck as unread until another post is made and the user visits
+		// the topic again because the posts will not be marked as read since the topic is already
+		// marked as read
+
+		// Add the necessary notifications
+		$service->add_notifications_for_users(self::get_item_type(), $post, $add_notifications);
+
+		// Remove the necessary notifications
+		if (!empty($remove_notifications))
+		{
+			$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
+				WHERE item_type = '" . self::get_item_type() . "'
+					AND item_id = " . self::get_item_id($post) . '
+					AND ' . $db->sql_in_set('user_id', $remove_notifications);
+			$db->sql_query($sql);
+		}
+
+		// return true to continue with the update code in the notifications service (this will update the rest of the notifications)
+		return true;
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+		return array_merge(parent::get_email_template_variables(), array(
+			'AUTHOR_NAME'		=> htmlspecialchars_decode($user_data['username']),
+		));
+	}
+}
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
new file mode 100644
index 0000000000..7753b196e8
--- /dev/null
+++ b/phpBB/includes/notification/type/topic.php
@@ -0,0 +1,237 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Topic notifications class
+* This class handles notifications for new topics
+*
+* @package notifications
+*/
+class phpbb_notification_type_topic extends phpbb_notification_type_base
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'newtopic_notify';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_TOPIC';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'topic';
+	}
+
+	/**
+	* Get the id of the item
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_id($post)
+	{
+		return (int) $post['topic_id'];
+	}
+
+	/**
+	* Get the id of the parent
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_parent_id($post)
+	{
+		return (int) $post['forum_id'];
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $topic Data from the topic
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic, $options = array())
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		// Let's continue to use the phpBB subscriptions system, at least for now.
+		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
+		//$users = parent::_find_users_for_notification($phpbb_container, $topic['forum_id']);
+
+		$db = $phpbb_container->get('dbal.conn');
+
+		$users = array();
+
+		$sql = 'SELECT user_id
+			FROM ' . FORUMS_WATCH_TABLE . '
+			WHERE forum_id = ' . (int) $topic['forum_id'] . '
+				AND notify_status = ' . NOTIFY_YES . '
+				AND user_id <> ' . (int) $topic['poster_id'];
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$users[] = $row['user_id'];
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($users))
+		{
+			return array();
+		}
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $topic['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND " . $db->sql_in_set('user_id', $auth_read[$topic['forum_id']]['f_read']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $notify_users;
+	}
+
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('poster_id'));
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			$this->language_key,
+			$username,
+			censor_text($this->get_data('topic_title')),
+			$this->get_data('forum_name')
+		);
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		return array(
+			'FORUM_NAME'				=> htmlspecialchars_decode($this->get_data('forum_name')),
+			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
+
+			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
+			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
+			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->item_parent_id}",
+			'U_STOP_WATCHING_FORUM'		=> generate_board_url() . "/viewforum.{$this->php_ext}?uid={$this->user_id}&f={$this->item_parent_id}&unwatch=forum",
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f={$this->item_parent_id}&amp;t={$this->item_id}");
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['poster_id']);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('poster_id', $post['poster_id']);
+
+		$this->set_data('topic_title', $post['topic_title']);
+
+		$this->set_data('post_username', (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''));
+
+		$this->set_data('forum_name', $post['forum_name']);
+
+		$this->time = $post['post_time'];
+
+		return parent::create_insert_array($post);
+	}
+}
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
new file mode 100644
index 0000000000..385578cec8
--- /dev/null
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -0,0 +1,137 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Topic notifications class
+* This class handles notifications for new topics
+*
+* @package notifications
+*/
+class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_topic
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'notifications/topic_in_queue';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_TOPIC_IN_QUEUE';
+
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'needs_approval',
+		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
+	);
+
+	/**
+	* Is available
+	*/
+	public static function is_available(ContainerBuilder $phpbb_container)
+	{
+		$m_approve = $phpbb_container->get('auth')->acl_getf('m_approve', true);
+
+		return (!empty($m_approve));
+	}
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'topic_in_queue';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $topic Data from the topic
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic, $options = array())
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		$db = $phpbb_container->get('dbal.conn');
+
+		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $topic['forum_id']);
+
+		if (empty($auth_approve))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::$notification_option['id'] . "'
+				AND " . $db->sql_in_set('user_id', $auth_approve[$topic['forum_id']]['m_approve']);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $notify_users;
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $topic Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($topic)
+	{
+		$data = parent::create_insert_array($topic);
+
+		$this->time = $data['time'] = time();
+
+		return $data;
+	}
+}
diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notifications/method/base.php
deleted file mode 100644
index b502d3afd0..0000000000
--- a/phpBB/includes/notifications/method/base.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base notifications method class
-* @package notifications
-*/
-abstract class phpbb_notification_method_base implements phpbb_notification_method_interface
-{
-	protected $phpbb_container;
-	protected $service;
-	protected $db;
-	protected $user;
-	protected $phpbb_root_path;
-	protected $php_ext;
-
-	/**
-	* Desired notifications
-	* unique by (type, type_id, user_id, method)
-	* if multiple methods are desired, multiple rows will exist.
-	*
-	* method of "none" will over-ride any other options
-	*
-	* item_type
-	* item_id
-	* user_id
-	* method
-	* 	none (will never receive notifications)
-	* 	standard (listed in notifications window
-	* 	popup?
-	* 	email
-	* 	jabber
-	*	sms?
-	*/
-
-	/**
-	* Queue of messages to be sent
-	*
-	* @var array
-	*/
-	protected $queue = array();
-
-	public function __construct(ContainerBuilder $phpbb_container)
-	{
-		// phpBB Container
-		$this->phpbb_container = $phpbb_container;
-
-		// Service
-		$this->service = $phpbb_container->get('notifications');
-
-		// Some common things we're going to use
-		$this->db = $phpbb_container->get('dbal.conn');
-		$this->user = $phpbb_container->get('user');
-
-		$this->phpbb_root_path = $phpbb_container->getParameter('core.root_path');
-		$this->php_ext = $phpbb_container->getParameter('core.php_ext');
-	}
-
-	/**
-	* Add a notification to the queue
-	*
-	* @param phpbb_notification_type_interface $notification
-	*/
-	public function add_to_queue(phpbb_notification_type_interface $notification)
-	{
-		$this->queue[] = $notification;
-	}
-
-	/**
-	* Empty the queue
-	*/
-	protected function empty_queue()
-	{
-		$this->queue = array();
-	}
-}
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
deleted file mode 100644
index 1b6b44d137..0000000000
--- a/phpBB/includes/notifications/method/email.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Email notification method class
-* This class handles sending emails for notifications
-*
-* @package notifications
-*/
-class phpbb_notification_method_email extends phpbb_notification_method_base
-{
-	/**
-	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
-	*
-	* @var mixed
-	*/
-	protected $notify_method = NOTIFY_EMAIL;
-
-	/**
-	* Is this method available for the user?
-	* This is checked on the notifications options
-	*/
-	public function is_available()
-	{
-		// Email is always available
-		return true;
-	}
-
-	public function notify()
-	{
-		if (!sizeof($this->queue))
-		{
-			return;
-		}
-
-		// Load all users we want to notify (we need their email address)
-		$user_ids = $users = array();
-		foreach ($this->queue as $notification)
-		{
-			$user_ids[] = $notification->user_id;
-		}
-
-		// We do not send emails to banned users
-		if (!function_exists('phpbb_get_banned_user_ids'))
-		{
-			include($this->phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $this->phpbb_container->getParameter('core.php_ext'));
-		}
-		$banned_users = phpbb_get_banned_user_ids($user_ids);
-
-		// Load all the users we need
-		$this->service->load_users($user_ids);
-
-		// Load the messenger
-		if (!class_exists('messenger'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
-		}
-		$messenger = new messenger();
-		$board_url = generate_board_url();
-
-		// Time to go through the queue and send emails
-		foreach ($this->queue as $notification)
-		{
-			$user = $this->service->get_user($notification->user_id);
-
-			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
-			{
-				continue;
-			}
-
-			$messenger->template($notification->email_template, $user['user_lang']);
-
-			$messenger->to($user['user_email'], $user['username']);
-
-			$messenger->assign_vars(array_merge(array(
-				'USERNAME'						=> $user['username'],
-
-				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',
-			), $notification->get_email_template_variables()));
-
-			$messenger->send($this->notify_method);
-		}
-
-		// Save the queue in the messenger class (has to be called or these emails could be lost?)
-		$messenger->save_queue();
-
-		// We're done, empty the queue
-		$this->empty_queue();
-	}
-}
diff --git a/phpBB/includes/notifications/method/interface.php b/phpBB/includes/notifications/method/interface.php
deleted file mode 100644
index 4b990ec9fa..0000000000
--- a/phpBB/includes/notifications/method/interface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base notifications method interface
-* @package notifications
-*/
-interface phpbb_notification_method_interface
-{
-	public function is_available();
-
-	public function notify();
-}
diff --git a/phpBB/includes/notifications/method/jabber.php b/phpBB/includes/notifications/method/jabber.php
deleted file mode 100644
index 9232d8fc45..0000000000
--- a/phpBB/includes/notifications/method/jabber.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Jabber notification method class
-* This class handles sending Jabber messages for notifications
-*
-* @package notifications
-*/
-class phpbb_notification_method_jabber extends phpbb_notification_method_email
-{
-	/**
-	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
-	*
-	* @var mixed
-	*/
-	protected $notify_method = NOTIFY_IM;
-
-	/**
-	* Is this method available for the user?
-	* This is checked on the notifications options
-	*/
-	public function is_available()
-	{
-		return ($this->global_available() && $this->phpbb_container->get('user')->data['jabber']);
-	}
-
-	/**
-	* Is this method available at all?
-	* This is checked before notifications are sent
-	*/
-	public function global_available()
-	{
-		$config = $this->phpbb_container->get('config');
-
-		return ($config['jab_enable'] && @extension_loaded('xml'));
-	}
-
-	public function notify()
-	{
-		if (!$this->global_available())
-		{
-			return;
-		}
-
-		return parent::notify();
-	}
-}
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
deleted file mode 100644
index 2bf21cefa5..0000000000
--- a/phpBB/includes/notifications/service.php
+++ /dev/null
@@ -1,688 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Notifications service class
-* @package notifications
-*/
-class phpbb_notification_manager
-{
-	protected $phpbb_container;
-	protected $db;
-
-	/**
-	* Users loaded from the DB
-	*
-	* @var array Array of user data that we've loaded from the DB
-	*/
-	protected $users = array();
-
-	public function __construct(ContainerBuilder $phpbb_container)
-	{
-		$this->phpbb_container = $phpbb_container;
-
-		// Some common things we're going to use
-		$this->db = $phpbb_container->get('dbal.conn');
-	}
-
-	/**
-	* Load the user's notifications
-	*
-	* @param array $options Optional options to control what notifications are loaded
-	*				notification_id		Notification id to load (or array of notification ids)
-	*				user_id				User id to load notifications for (Default: $user->data['user_id'])
-	*				order_by			Order by (Default: time)
-	*				order_dir			Order direction (Default: DESC)
-	* 				limit				Number of notifications to load (Default: 5)
-	* 				start				Notifications offset (Default: 0)
-	* 				all_unread			Load all unread messages? If set to true, count_unread is set to true (Default: false)
-	* 				count_unread		Count all unread messages? (Default: false)
-	*/
-	public function load_notifications($options = array())
-	{
-		$user = $this->phpbb_container->get('user');
-
-		// Merge default options
-		$options = array_merge(array(
-			'notification_id'	=> false,
-			'user_id'			=> $user->data['user_id'],
-			'order_by'			=> 'time',
-			'order_dir'			=> 'DESC',
-			'limit'				=> 0,
-			'start'				=> 0,
-			'all_unread'		=> false,
-			'count_unread'		=> false,
-		), $options);
-
-		// If all_unread, count_unread mus be true
-		$options['count_unread'] = ($options['all_unread']) ? true : $options['count_unread'];
-
-		// Anonymous users and bots never receive notifications
-		if ($options['user_id'] == $user->data['user_id'] && ($user->data['user_id'] == ANONYMOUS || $user->data['user_type'] == USER_IGNORE))
-		{
-			return array(
-				'notifications'		=> array(),
-				'unread_count'		=> 0,
-			);
-		}
-
-		$notifications = $user_ids = array();
-		$load_special = array();
-		$count = 0;
-
-		if ($options['count_unread'])
-		{
-			// Get the total number of unread notifications
-			$sql = 'SELECT COUNT(*) AS count
-				FROM ' . NOTIFICATIONS_TABLE . '
-				WHERE user_id = ' . (int) $options['user_id'] . '
-					AND unread = 1';
-			$result = $this->db->sql_query($sql);
-			$count = (int) $this->db->sql_fetchfield('count', $result);
-			$this->db->sql_freeresult($result);
-		}
-
-		$rowset = array();
-
-		// Get the main notifications
-		$sql = 'SELECT *
-			FROM ' . NOTIFICATIONS_TABLE . '
-			WHERE user_id = ' . (int) $options['user_id'] .
-				(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('notification_id', $options['notification_id']) : ' AND notification_id = ' . (int) $options['notification_id']) : '') . '
-				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
-		$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$rowset[$row['notification_id']] = $row;
-		}
-		$this->db->sql_freeresult($result);
-
-		// Get all unread notifications
-		if ($count && $options['all_unread'] && !empty($rowset))
-		{
-			$sql = 'SELECT *
-				FROM ' . NOTIFICATIONS_TABLE . '
-				WHERE user_id = ' . (int) $options['user_id'] . '
-					AND unread = 1
-					AND ' . $this->db->sql_in_set('notification_id', array_keys($rowset), true) . '
-					ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
-			$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$rowset[$row['notification_id']] = $row;
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		foreach ($rowset as $row)
-		{
-			$item_type_class_name = $this->get_item_type_class_name($row['item_type'], true);
-
-			$notification = new $item_type_class_name($this->phpbb_container, $row);
-
-			// Array of user_ids to query all at once
-			$user_ids = array_merge($user_ids, $notification->users_to_query());
-
-			// Some notification types also require querying additional tables themselves
-			if (!isset($load_special[$row['item_type']]))
-			{
-				$load_special[$row['item_type']] = array();
-			}
-			$load_special[$row['item_type']] = array_merge($load_special[$row['item_type']], $notification->get_load_special());
-
-			$notifications[] = $notification;
-		}
-
-		$this->load_users($user_ids);
-
-		// Allow each type to load it's own special items
-		foreach ($load_special as $item_type => $data)
-		{
-			$item_type_class_name = $this->get_item_type_class_name($item_type, true);
-
-			$item_type_class_name::load_special($this->phpbb_container, $data, $notifications);
-		}
-
-		return array(
-			'notifications'		=> $notifications,
-			'unread_count'		=> $count,
-		);
-	}
-
-	/**
-	* Mark notifications read
-	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
-	* @param bool|int|array $item_id Item id or array of item ids. False to mark read for all item ids
-	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
-	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
-	*/
-	public function mark_notifications_read($item_type, $item_id, $user_id, $time = false)
-	{
-		if (is_array($item_type))
-		{
-			foreach ($item_type as $type)
-			{
-				$this->mark_notifications_read($type, $item_id, $user_id, $time);
-			}
-
-			return;
-		}
-
-		$time = ($time) ?: time();
-
-		$this->get_item_type_class_name($item_type);
-
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
-			SET unread = 0
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND time <= " . $time .
-				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '') .
-				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Mark notifications read from a parent identifier
-	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
-	* @param bool|int|array $item_parent_id Item parent id or array of item parent ids. False to mark read for all item parent ids
-	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
-	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
-	*/
-	public function mark_notifications_read_by_parent($item_type, $item_parent_id, $user_id, $time = false)
-	{
-		if (is_array($item_type))
-		{
-			foreach ($item_type as $type)
-			{
-				$this->mark_notifications_read_by_parent($type, $item_parent_id, $user_id, $time);
-			}
-
-			return;
-		}
-
-		$time = ($time) ?: time();
-
-		$item_type_class_name = $this->get_item_type_class_name($item_type);
-
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
-			SET unread = 0
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND time <= " . $time .
-				(($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') .
-				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Mark notifications read
-	*
-	* @param int|array $notification_id Notification id or array of notification ids.
-	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
-	*/
-	public function mark_notifications_read_by_id($notification_id, $time = false)
-	{
-		$time = ($time) ?: time();
-
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
-			SET unread = 0
-			WHERE time <= " . $time . '
-				AND ' . ((is_array($notification_id)) ? $this->db->sql_in_set('notification_id', $notification_id) : 'notification_id = ' . (int) $notification_id);
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Add a notification
-	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
-	*			Note: If you send an array of types, any user who could receive multiple notifications from this single item will only receive
-	* 			a single notification. If they MUST receive multiple notifications, call this function multiple times instead of sending an array
-	* @param array $data Data specific for this type that will be inserted
-	*/
-	public function add_notifications($item_type, $data, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		if (is_array($item_type))
-		{
-			$notified_users = array();
-			$temp_options = $options;
-
-			foreach ($item_type as $type)
-			{
-				$temp_options['ignore_users'] = $options['ignore_users'] + $notified_users;
-				$notified_users += $this->add_notifications($type, $data, $temp_options);
-			}
-
-			return $notified_users;
-		}
-
-		$item_type_class_name = $this->get_item_type_class_name($item_type);
-
-		$item_id = $item_type_class_name::get_item_id($data);
-
-		// find out which users want to receive this type of notification
-		$notify_users = $item_type_class_name::find_users_for_notification($this->phpbb_container, $data, $options);
-
-		$this->add_notifications_for_users($item_type, $data, $notify_users);
-
-		return $notify_users;
-	}
-
-	/**
-	* Add a notification for specific users
-	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
-	* @param array $data Data specific for this type that will be inserted
-	* @param array $notify_users User list to notify
-	*/
-	public function add_notifications_for_users($item_type, $data, $notify_users)
-	{
-		if (is_array($item_type))
-		{
-			foreach ($item_type as $type)
-			{
-				$this->add_notifications_for_users($type, $data, $notify_users);
-			}
-
-			return;
-		}
-
-		$item_type_class_name = $this->get_item_type_class_name($item_type);
-
-		$item_id = $item_type_class_name::get_item_id($data);
-
-		$user_ids = array();
-		$notification_objects = $notification_methods = array();
-		$new_rows = array();
-
-		// Never send notifications to the anonymous user!
-		unset($notify_users[ANONYMOUS]);
-
-		// Make sure not to send new notifications to users who've already been notified about this item
-		// This may happen when an item was added, but now new users are able to see the item
-		// todo Users should not receive notifications from multiple events from the same item (ex: for a topic reply with a quote including your username)
-		//		Probably should be handled within each type?
-		$sql = 'SELECT user_id
-			FROM ' . NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id;
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			unset($notify_users[$row['user_id']]);
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!sizeof($notify_users))
-		{
-			return;
-		}
-
-		// Go through each user so we can insert a row in the DB and then notify them by their desired means
-		foreach ($notify_users as $user => $methods)
-		{
-			$notification = new $item_type_class_name($this->phpbb_container);
-
-			$notification->user_id = (int) $user;
-
-			// Store the creation array in our new rows that will be inserted later
-			$new_rows[] = $notification->create_insert_array($data);
-
-			// Users are needed to send notifications
-			$user_ids = array_merge($user_ids, $notification->users_to_query());
-
-			foreach ($methods as $method)
-			{
-				// setup the notification methods and add the notification to the queue
-				if ($method) // blank means we just insert it as a notification, but do not notify them by any other means
-				{
-					if (!isset($notification_methods[$method]))
-					{
-						$method_class_name = 'phpbb_notifications_method_' . $method;
-						$notification_methods[$method] = new $method_class_name($this->phpbb_container);
-					}
-
-					$notification_methods[$method]->add_to_queue($notification);
-				}
-			}
-		}
-
-		// insert into the db
-		$this->db->sql_multi_insert(NOTIFICATIONS_TABLE, $new_rows);
-
-		// We need to load all of the users to send notifications
-		$this->load_users($user_ids);
-
-		// run the queue for each method to send notifications
-		foreach ($notification_methods as $method)
-		{
-			$method->notify();
-		}
-	}
-
-	/**
-	* Update a notification
-	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
-	* @param array $data Data specific for this type that will be updated
-	*/
-	public function update_notifications($item_type, $data)
-	{
-		if (is_array($item_type))
-		{
-			foreach ($item_type as $type)
-			{
-				$this->update_notifications($type, $data);
-			}
-
-			return;
-		}
-
-		$item_type_class_name = $this->get_item_type_class_name($item_type);
-
-		// Allow the notifications class to over-ride the update_notifications functionality
-		if (method_exists($item_type_class_name, 'update_notifications'))
-		{
-			// Return False to over-ride the rest of the update
-			if ($item_type_class_name::update_notifications($this->phpbb_container, $data) === false)
-			{
-				return;
-			}
-		}
-
-		$item_id = $item_type_class_name::get_item_id($data);
-
-		$notification = new $item_type_class_name($this->phpbb_container);
-		$update_array = $notification->create_update_array($data);
-
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
-			SET ' . $this->db->sql_build_array('UPDATE', $update_array) . "
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id;
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Delete a notification
-	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $item_id is identical for the specified types)
-	* @param int|array $item_id Identifier within the type (or array of ids)
-	* @param array $data Data specific for this type that will be updated
-	*/
-	public function delete_notifications($item_type, $item_id)
-	{
-		if (is_array($item_type))
-		{
-			foreach ($item_type as $type)
-			{
-				$this->delete_notifications($type, $item_id);
-			}
-
-			return;
-		}
-
-		$this->get_item_type_class_name($item_type);
-
-		$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND " . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id);
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Get all of the subscription types
-	*
-	* @return array Array of item types
-	*/
-	public function get_subscription_types()
-	{
-		$subscription_types = array();
-
-		foreach ($this->get_subscription_files('notifications/type/') as $class => $file)
-		{
-			$class = $this->get_item_type_class_name($class);
-
-			if (!class_exists($class))
-			{
-				include($file);
-			}
-
-			if ($class::is_available($this->phpbb_container) && method_exists($class, 'get_item_type'))
-			{
-				if ($class::$notification_option === false)
-				{
-					$subscription_types[$class::get_item_type()] = $class::get_item_type();
-				}
-				else
-				{
-					$subscription_types[$class::$notification_option['id']] = $class::$notification_option;
-				}
-			}
-		}
-
-		return $subscription_types;
-	}
-
-	/**
-	* Get all of the subscription methods
-	*
-	* @return array Array of methods
-	*/
-	public function get_subscription_methods()
-	{
-		$subscription_methods = array();
-
-		foreach ($this->get_subscription_files('notifications/method/') as $method_name => $file)
-		{
-			$class_name = 'phpbb_notifications_method_' . $method_name;
-
-			if (!class_exists($class_name))
-			{
-				include($file);
-			}
-
-			$method = new $class_name($this->phpbb_container);
-
-			if ($method->is_available())
-			{
-				$subscription_methods[] = $method_name;
-			}
-		}
-
-		return $subscription_methods;
-	}
-
-	/**
-	* Get subscriptions
-	*
-	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
-	* @param bool $only_global True to select only global subscription options (item_id = 0)
-	*
-	* @return array Subscriptions
-	*/
-	public function get_subscriptions($user_id = false, $only_global = false)
-	{
-		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
-
-		$subscriptions = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . '
-			WHERE user_id = ' . (int) $user_id .
-				(($only_global) ? ' AND item_id = 0' : '');
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if ($only_global)
-			{
-				if (!isset($subscriptions[$row['item_type']]))
-				{
-					$subscriptions[$row['item_type']] = array();
-				}
-
-				$subscriptions[$row['item_type']][] = $row['method'];
-			}
-			else
-			{
-				$subscriptions[] = $row;
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		return $subscriptions;
-	}
-
-	/**
-	* Add a subscription
-	*
-	* @param string $item_type Type identifier of the subscription
-	* @param int $item_id The id of the item
-	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
-	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
-	*/
-	public function add_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
-	{
-		$this->get_item_type_class_name($item_type);
-
-		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
-
-		$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
-			$this->db->sql_build_array('INSERT', array(
-				'item_type'		=> $item_type,
-				'item_id'		=> (int) $item_id,
-				'user_id'		=> (int) $user_id,
-				'method'		=> $method,
-			));
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Delete a subscription
-	*
-	* @param string $item_type Type identifier of the subscription
-	* @param int $item_id The id of the item
-	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
-	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
-	*/
-	public function delete_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
-	{
-		$this->get_item_type_class_name($item_type);
-
-		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
-
-		$sql = 'DELETE FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id . '
-				AND user_id = ' .(int) $user_id . "
-				AND method = '" . $this->db->sql_escape($method) . "'";
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Load user helper
-	*
-	* @param array $user_ids
-	*/
-	public function load_users($user_ids)
-	{
-		$user_ids[] = ANONYMOUS;
-
-		// Load the users
-		$user_ids = array_unique($user_ids);
-
-		// Do not load users we already have in $this->users
-		$user_ids = array_diff($user_ids, array_keys($this->users));
-
-		if (sizeof($user_ids))
-		{
-			$sql = 'SELECT *
-				FROM ' . USERS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$this->users[$row['user_id']] = $row;
-			}
-			$this->db->sql_freeresult($result);
-		}
-	}
-
-	/**
-	* Get a user row from our users cache
-	*
-	* @param int $user_id
-	* @return array
-	*/
-	public function get_user($user_id)
-	{
-		return (isset($this->users[$user_id])) ? $this->users[$user_id] : $this->users[ANONYMOUS];
-	}
-
-	/**
-	* Helper to get the notifications item type class name and clean it if unsafe
-	*/
-	private function get_item_type_class_name(&$item_type, $safe = false)
-	{
-		if (!$safe)
-		{
-			$item_type = preg_replace('#[^a-z_]#', '', $item_type);
-		}
-
-		return 'phpbb_notifications_type_' . $item_type;
-	}
-
-	/**
-	* Helper to get subscription related files with the finder
-	*/
-	private function get_subscription_files($path)
-	{
-		$ext_manager = $this->phpbb_container->get('ext.manager');
-		$php_ext = $this->phpbb_container->getParameter('core.php_ext');
-
-		$finder = $ext_manager->get_finder();
-
-		$subscription_files = array();
-
-		$files = $finder
-			->core_path('includes/' . $path)
-			->extension_directory($path)
-			->get_files();
-		foreach ($files as $file)
-		{
-			$class = substr($file, strrpos($file, '/'));
-			$class = substr($class, 1, (strpos($class, '.' . $php_ext) - 1));
-
-			if ($class == 'interface' || $class == 'base')
-			{
-				continue;
-			}
-
-			$subscription_files[$class] = $file;
-		}
-
-		return $subscription_files;
-	}
-}
diff --git a/phpBB/includes/notifications/type/approve_post.php b/phpBB/includes/notifications/type/approve_post.php
deleted file mode 100644
index 9a3def6217..0000000000
--- a/phpBB/includes/notifications/type/approve_post.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post notifications class
-* This class handles notifications for replies to a topic
-*
-* @package notifications
-*/
-class phpbb_notification_type_approve_post extends phpbb_notification_type_post
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'post_approved';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_POST_APPROVED';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'moderation_queue',
-		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
-	);
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'approve_post';
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param ContainerBuilder $phpbb_container
-	* @param array $post Data from
-	*
-	* @return array
-	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$db = $phpbb_container->get('dbal.conn');
-
-		$users = array();
-		$users[$post['poster_id']] = array('');
-
-		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post)
-	{
-		$this->set_data('post_subject', $post['post_subject']);
-
-		$data = parent::create_insert_array($post);
-
-		$this->time = $data['time'] = time();
-
-		return $data;
-	}
-}
diff --git a/phpBB/includes/notifications/type/approve_topic.php b/phpBB/includes/notifications/type/approve_topic.php
deleted file mode 100644
index 00af312018..0000000000
--- a/phpBB/includes/notifications/type/approve_topic.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post notifications class
-* This class handles notifications for replies to a topic
-*
-* @package notifications
-*/
-class phpbb_notification_type_approve_topic extends phpbb_notification_type_topic
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'topic_approved';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_TOPIC_APPROVED';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'moderation_queue',
-		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
-	);
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'approve_topic';
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param ContainerBuilder $phpbb_container
-	* @param array $post Data from
-	*
-	* @return array
-	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$db = $phpbb_container->get('dbal.conn');
-
-		$users = array();
-		$users[$post['poster_id']] = array('');
-
-		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post)
-	{
-		$data = parent::create_insert_array($post);
-
-		$this->time = $data['time'] = time();
-
-		return $data;
-	}
-}
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
deleted file mode 100644
index 40462bccfb..0000000000
--- a/phpBB/includes/notifications/type/base.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base notifications class
-* @package notifications
-*/
-abstract class phpbb_notification_type_base implements phpbb_notification_type_interface
-{
-	protected $phpbb_container;
-	protected $service;
-	protected $db;
-	protected $phpbb_root_path;
-	protected $php_ext;
-
-	/**
-	* Array of user data containing information needed to output the notifications to the template
-	*
-	* @var array
-	*/
-	protected $users = array();
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
-	*/
-	public static $notification_option = false;
-
-	/**
-	* Indentification data
-	* item_type
-	* item_id
-	* item_parent_id // Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
-	* user_id
-	* unread
-	*
-	* time
-	* data (special serialized field that each notification type can use to store stuff)
-	*
-	* @var array $data Notification row from the database
-	* 		This must be private, all interaction should use __get(), __set(), get_data(), set_data()
-	*/
-	private $data = array();
-
-	public function __construct(ContainerBuilder $phpbb_container, $data = array())
-	{
-		// phpBB Container
-		$this->phpbb_container = $phpbb_container;
-
-		// Service
-		$this->service = $phpbb_container->get('notifications');
-
-		// Some common things we're going to use
-		$this->db = $phpbb_container->get('dbal.conn');
-
-		$this->phpbb_root_path = $phpbb_container->getParameter('core.root_path');
-		$this->php_ext = $phpbb_container->getParameter('core.php_ext');
-
-		// The row from the database (unless this is a new notification we're going to add)
-		$this->data = $data;
-		$this->data['data'] = (isset($this->data['data'])) ? unserialize($this->data['data']) : array();
-	}
-
-	public function __get($name)
-	{
-		return $this->data[$name];
-	}
-
-	public function __set($name, $value)
-	{
-		$this->data[$name] = $value;
-	}
-
-	/**
-	* Get special data (only important for the classes that extend this)
-	*
-	* @param string $name Name of the variable to get
-	*
-	* @return mixed
-	*/
-	protected function get_data($name)
-	{
-		return (isset($this->data['data'][$name])) ? $this->data['data'][$name] : null;
-	}
-
-	/**
-	* Set special data (only important for the classes that extend this)
-	*
-	* @param string $name Name of the variable to set
-	* @param mixed $value Value to set to the variable
-	*/
-	protected function set_data($name, $value)
-	{
-		$this->data['data'][$name] = $value;
-	}
-
-	/**
-	* Prepare to output the notification to the template
-	*/
-	public function prepare_for_display()
-	{
-		$user = $this->phpbb_container->get('user');
-
-		return array(
-			'AVATAR'			=> $this->get_avatar(),
-
-			'FORMATTED_TITLE'	=> $this->get_title(),
-
-			'URL'				=> $this->get_url(),
-			'TIME'	   			=> $user->format_date($this->time),
-
-			'UNREAD'			=> $this->unread,
-
-			'U_MARK_READ'		=> append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification[]=' . $this->notification_id),
-		);
-	}
-
-	/**
-	* Mark this item read
-	*
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
-	*/
-	public function mark_read($return = true)
-	{
-		return $this->mark(false, $return);
-	}
-
-	/**
-	* Mark this item unread
-	*
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
-	*/
-	public function mark_unread($return = true)
-	{
-		return $this->mark(true, $return);
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $type_data Data unique to this notification type
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($type_data)
-	{
-		// Defaults
-		$this->data = array_merge(array(
-			'item_id'				=> static::get_item_id($type_data),
-			'item_type'	   			=> $this->get_item_type(),
-			'item_parent_id'		=> static::get_item_parent_id($type_data),
-
-			'time'					=> time(),
-			'unread'				=> true,
-
-			'data'					=> array(),
-		), $this->data);
-
-		$data = $this->data;
-
-		$data['data'] = serialize($data['data']);
-
-		return $data;
-	}
-
-	/**
-	* Function for preparing the data for update in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $type_data Data unique to this notification type
-	*
-	* @return array Array of data ready to be updated in the database
-	*/
-	public function create_update_array($type_data)
-	{
-		$data = $this->create_insert_array($type_data);
-
-		// Unset data unique to each row
-		unset(
-			$data['notification_id'],
-			$data['unread'],
-			$data['user_id']
-		);
-
-		return $data;
-	}
-
-	/**
-	* -------------- Fall back functions -------------------
-	*/
-
-	/**
-	* URL to unsubscribe to this notification (fall-back)
-	*
-	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
-	*/
-	public function get_unsubscribe_url($method = false)
-	{
-		return false;
-	}
-
-	/**
-	* Get the user's avatar (fall-back)
-	*/
-	public function get_avatar()
-	{
-		return '';
-	}
-
-	/**
-	* Get the special items to load (fall-back)
-	*/
-	public function get_load_special()
-	{
-		return array();
-	}
-
-	/**
-	* Load the special items (fall-back)
-	*/
-	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications)
-	{
-		return;
-	}
-
-	/**
-	* Is available (fall-back)
-	*/
-	public static function is_available(ContainerBuilder $phpbb_container)
-	{
-		return true;
-	}
-
-	/**
-	* -------------- Helper functions -------------------
-	*/
-
-	/**
-	* Find the users who want to receive notifications (helper)
-	*
-	* @param ContainerBuilder $phpbb_container
-	* @param array $item_id The item_id to search for
-	*
-	* @return array
-	*/
-	protected static function _find_users_for_notification(ContainerBuilder $phpbb_container, $item_id, $options)
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$db = $phpbb_container->get('dbal.conn');
-
-		$rowset = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . static::get_item_type() . "'
-				AND item_id = " . (int) $item_id;
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$rowset[$row['user_id']] = array();
-			}
-
-			$rowset[$row['user_id']][] = $row['method'];
-		}
-		$db->sql_freeresult($result);
-
-		return $rowset;
-	}
-
-	/**
-	* Get avatar helper
-	*
-	* @param int $user_id
-	* @return string
-	*/
-	protected function _get_avatar($user_id)
-	{
-		$user = $this->service->get_user($user_id);
-
-		if (!function_exists('get_user_avatar'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
-		}
-
-		return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height'], $user['username'], false, 'notifications-avatar');
-	}
-
-	/**
-	* Mark this item read/unread helper
-	*
-	* @param bool $unread Unread (True/False) (Default: False)
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
-	*/
-	protected function mark($unread = true, $return = false)
-	{
-		$where = array(
-			'item_type = ' . $this->db->sql_escape($this->item_type),
-			'item_id = ' . (int) $this->item_id,
-			'user_id = ' . (int) $this->user_id,
-		);
-		$where = implode(' AND ' . $where);
-
-		if ($return)
-		{
-			return $where;
-		}
-
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
-			SET unread = ' . (bool) $unread . '
-			WHERE ' . $where;
-		$this->db->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/notifications/type/bookmark.php b/phpBB/includes/notifications/type/bookmark.php
deleted file mode 100644
index 51f23bc294..0000000000
--- a/phpBB/includes/notifications/type/bookmark.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Bookmark updating notifications class
-* This class handles notifications for replies to a bookmarked topic
-*
-* @package notifications
-*/
-class phpbb_notification_type_bookmark extends phpbb_notification_type_post
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'notifications/bookmark';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_BOOKMARK';
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'bookmark';
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param ContainerBuilder $phpbb_container
-	* @param array $post Data from
-	*
-	* @return array
-	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$db = $phpbb_container->get('dbal.conn');
-
-		$users = array();
-
-		$sql = 'SELECT user_id
-			FROM ' . BOOKMARKS_TABLE . '
-			WHERE ' . $db->sql_in_set('topic_id', $post['topic_id']) . '
-				AND user_id <> ' . (int) $post['poster_id'];
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$users[] = $row['user_id'];
-		}
-		$db->sql_freeresult($result);
-
-		if (empty($users))
-		{
-			return array();
-		}
-
-		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-}
diff --git a/phpBB/includes/notifications/type/disapprove_post.php b/phpBB/includes/notifications/type/disapprove_post.php
deleted file mode 100644
index 8fa0102e3d..0000000000
--- a/phpBB/includes/notifications/type/disapprove_post.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post notifications class
-* This class handles notifications for replies to a topic
-*
-* @package notifications
-*/
-class phpbb_notification_type_disapprove_post extends phpbb_notification_type_approve_post
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'post_disapproved';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_POST_DISAPPROVED';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'moderation_queue',
-		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
-	);
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'disapprove_post';
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		return $this->phpbb_container->get('user')->lang(
-			$this->language_key,
-			censor_text($this->get_data('topic_title')),
-			$this->get_data('disapprove_reason')
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return '';
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array_merge(parent::get_email_template_variables(), array(
-			'REASON'	=> htmlspecialchars_decode($this->get_data('disapprove_reason')),
-		));
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post)
-	{
-		$this->set_data('disapprove_reason', $post['disapprove_reason']);
-
-		$data = parent::create_insert_array($post);
-
-		$this->time = $data['time'] = time();
-
-		return $data;
-	}
-}
diff --git a/phpBB/includes/notifications/type/disapprove_topic.php b/phpBB/includes/notifications/type/disapprove_topic.php
deleted file mode 100644
index 186c42d2b6..0000000000
--- a/phpBB/includes/notifications/type/disapprove_topic.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post notifications class
-* This class handles notifications for replies to a topic
-*
-* @package notifications
-*/
-class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_approve_topic
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'topic_disapproved';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_TOPIC_DISAPPROVED';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'moderation_queue',
-		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
-	);
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'disapprove_topic';
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		return $this->phpbb_container->get('user')->lang(
-			$this->language_key,
-			censor_text($this->get_data('topic_title')),
-			$this->get_data('disapprove_reason')
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return '';
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array_merge(parent::get_email_template_variables(), array(
-			'REASON'			=> htmlspecialchars_decode($this->get_data('disapprove_reason')),
-		));
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post)
-	{
-		$this->set_data('disapprove_reason', $post['disapprove_reason']);
-
-		$data = parent::create_insert_array($post);
-
-		$this->time = $data['time'] = time();
-
-		return $data;
-	}
-}
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
deleted file mode 100644
index aa54c62a97..0000000000
--- a/phpBB/includes/notifications/type/interface.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base notifications interface
-* @package notifications
-*/
-interface phpbb_notification_type_interface
-{
-	public static function get_item_type();
-
-	public static function get_item_id($type_data);
-
-	public static function is_available(ContainerBuilder $phpbb_container);
-
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $type_data, $options);
-
-	public function get_title();
-
-	public function get_email_template_variables();
-
-	public function get_url();
-
-	public function get_unsubscribe_url($method);
-
-	public function mark_read($return);
-
-	public function mark_unread($return);
-
-	public function create_insert_array($type_data);
-
-	public function get_load_special();
-
-	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications);
-}
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
deleted file mode 100644
index 8252a8577b..0000000000
--- a/phpBB/includes/notifications/type/pm.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Private message notifications class
-* This class handles notifications for private messages
-*
-* @package notifications
-*/
-class phpbb_notification_type_pm extends phpbb_notification_type_base
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'privmsg_notify';
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'pm';
-	}
-
-	/**
-	* Get the id of the
-	*
-	* @param array $pm The data from the private message
-	*/
-	public static function get_item_id($pm)
-	{
-		return (int) $pm['msg_id'];
-	}
-
-	/**
-	* Get the id of the parent
-	*
-	* @param array $pm The data from the pm
-	*/
-	public static function get_item_parent_id($pm)
-	{
-		// No parent
-		return 0;
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param ContainerBuilder $phpbb_container
-	* @param array $pm Data from
-	*
-	* @return array
-	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $pm, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$service = $phpbb_container->get('notifications');
-		$db = $phpbb_container->get('dbal.conn');
-		$user = $phpbb_container->get('user');
-
-		if (!sizeof($pm['recipients']))
-		{
-			return array();
-		}
-
-		$service->load_users(array_keys($pm['recipients']));
-
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
-				AND " . $db->sql_in_set('user_id', array_keys($pm['recipients']));
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-
-	/**
-	* Get the user's avatar
-	*/
-	public function get_avatar()
-	{
-		return $this->_get_avatar($this->get_data('from_user_id'));
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		$user_data = $this->service->get_user($this->get_data('from_user_id'));
-
-		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
-
-		return $this->phpbb_container->get('user')->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		$user_data = $this->service->get_user($this->get_data('from_user_id'));
-
-		return array(
-			'AUTHOR_NAME'				=> htmlspecialchars_decode($user_data['username']),
-			'SUBJECT'					=> htmlspecialchars_decode(censor_text($this->get_data('message_subject'))),
-
-			'U_VIEW_MESSAGE'			=> generate_board_url() . '/ucp.' . $this->php_ext . "?i=pm&mode=view&p={$this->item_id}",
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=pm&amp;mode=view&amp;p={$this->item_id}");
-	}
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query()
-	{
-		return array($this->data['from_user_id']);
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($pm)
-	{
-		$this->set_data('from_user_id', $pm['from_user_id']);
-
-		$this->set_data('message_subject', $pm['message_subject']);
-
-		return parent::create_insert_array($pm);
-	}
-}
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
deleted file mode 100644
index 1e654ef51b..0000000000
--- a/phpBB/includes/notifications/type/post.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post notifications class
-* This class handles notifications for replies to a topic
-*
-* @package notifications
-*/
-class phpbb_notification_type_post extends phpbb_notification_type_base
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'topic_notify';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_POST';
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'post';
-	}
-
-	/**
-	* Get the id of the item
-	*
-	* @param array $post The data from the post
-	*/
-	public static function get_item_id($post)
-	{
-		return (int) $post['post_id'];
-	}
-
-	/**
-	* Get the id of the parent
-	*
-	* @param array $post The data from the post
-	*/
-	public static function get_item_parent_id($post)
-	{
-		return (int) $post['topic_id'];
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param ContainerBuilder $phpbb_container
-	* @param array $post Data from
-	*
-	* @return array
-	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		// Let's continue to use the phpBB subscriptions system, at least for now.
-		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
-		//$users = parent::_find_users_for_notification($phpbb_container, $post['topic_id']);
-
-		$db = $phpbb_container->get('dbal.conn');
-
-		$users = array();
-
-		$sql = 'SELECT user_id
-			FROM ' . TOPICS_WATCH_TABLE . '
-			WHERE topic_id = ' . (int) $post['topic_id'] . '
-				AND notify_status = ' . NOTIFY_YES . '
-				AND user_id <> ' . (int) $post['poster_id'];
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$users[] = $row['user_id'];
-		}
-		$db->sql_freeresult($result);
-
-		if (empty($users))
-		{
-			return array();
-		}
-
-		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-
-	/**
-	* Get the user's avatar
-	*/
-	public function get_avatar()
-	{
-		return $this->_get_avatar($this->get_data('poster_id'));
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		if ($this->get_data('post_username'))
-		{
-			$username = $this->get_data('post_username');
-		}
-		else
-		{
-			$user_data = $this->service->get_user($this->get_data('poster_id'));
-
-			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
-		}
-
-		return $this->phpbb_container->get('user')->lang(
-			$this->language_key,
-			$username,
-			censor_text($this->get_data('topic_title'))
-		);
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array(
-			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
-			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
-
-			'U_VIEW_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
-			'U_NEWEST_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
-			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
-			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
-			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
-			'U_STOP_WATCHING_TOPIC'		=> generate_board_url() . "/viewtopic.{$this->php_ext}?uid={$this->user_id}&f={$this->get_data('forum_id')}&t={$this->item_parent_id}&unwatch=topic",
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "p={$this->item_id}#p{$this->item_id}");
-	}
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query()
-	{
-		return array($this->data['poster_id']);
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post)
-	{
-		$this->set_data('poster_id', $post['poster_id']);
-
-		$this->set_data('topic_title', $post['topic_title']);
-
-		$this->set_data('post_subject', $post['post_subject']);
-
-		$this->set_data('post_username', (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''));
-
-		$this->set_data('forum_id', $post['forum_id']);
-
-		$this->set_data('forum_name', $post['forum_name']);
-
-		$this->time = $post['post_time'];
-
-		return parent::create_insert_array($post);
-	}
-}
diff --git a/phpBB/includes/notifications/type/post_in_queue.php b/phpBB/includes/notifications/type/post_in_queue.php
deleted file mode 100644
index f0a5e0baec..0000000000
--- a/phpBB/includes/notifications/type/post_in_queue.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Topic notifications class
-* This class handles notifications for new topics
-*
-* @package notifications
-*/
-class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'notifications/post_in_queue';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_POST_IN_QUEUE';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'needs_approval',
-		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
-	);
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'post_in_queue';
-	}
-
-	/**
-	* Is available
-	*/
-	public static function is_available(ContainerBuilder $phpbb_container)
-	{
-		$m_approve = $phpbb_container->get('auth')->acl_getf('m_approve', true);
-
-		return (!empty($m_approve));
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param ContainerBuilder $phpbb_container
-	* @param array $post Data from the post
-	*
-	* @return array
-	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$db = $phpbb_container->get('dbal.conn');
-
-		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $post['forum_id']);
-
-		if (empty($auth_approve))
-		{
-			return array();
-		}
-
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $db->sql_in_set('user_id', $auth_approve[$post['forum_id']]['m_approve']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post)
-	{
-		$data = parent::create_insert_array($post);
-
-		$this->time = $data['time'] = time();
-
-		return $data;
-	}
-}
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
deleted file mode 100644
index dd3cbedee2..0000000000
--- a/phpBB/includes/notifications/type/quote.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post quoting notifications class
-* This class handles notifications for quoting users in a post
-*
-* @package notifications
-*/
-class phpbb_notification_type_quote extends phpbb_notification_type_post
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'notifications/quote';
-
-	/**
-	* regular expression to match to find usernames
-	*
-	* @var string
-	*/
-	protected static $regular_expression_match = '#\[quote=&quot;(.+?)&quot;#';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_QUOTE';
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'quote';
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param ContainerBuilder $phpbb_container
-	* @param array $post Data from
-	*
-	* @return array
-	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$db = $phpbb_container->get('dbal.conn');
-
-		$usernames = false;
-		preg_match_all(self::$regular_expression_match, $post['post_text'], $usernames);
-
-		if (empty($usernames[1]))
-		{
-			return array();
-		}
-
-		$usernames[1] = array_unique($usernames[1]);
-
-		$usernames = array_map('utf8_clean_string', $usernames[1]);
-
-		$users = array();
-
-		$sql = 'SELECT user_id
-			FROM ' . USERS_TABLE . '
-			WHERE ' . $db->sql_in_set('username_clean', $usernames) . '
-				AND user_id <> ' . (int) $post['poster_id'];
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$users[] = $row['user_id'];
-		}
-		$db->sql_freeresult($result);
-
-		if (empty($users))
-		{
-			return array();
-		}
-
-		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-
-	/**
-	* Update a notification
-	*
-	* @param ContainerBuilder $phpbb_container
-	* @param array $data Data specific for this type that will be updated
-	*/
-	public static function update_notifications(ContainerBuilder $phpbb_container, $post)
-	{
-		$service = $phpbb_container->get('notifications');
-		$db = $phpbb_container->get('dbal.conn');
-
-		$old_notifications = array();
-		$sql = 'SELECT user_id
-			FROM ' . NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
-				AND item_id = " . self::get_item_id($post);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$old_notifications[] = $row['user_id'];
-		}
-		$db->sql_freeresult($result);
-
-		// Find the new users to notify
-		$notifications = self::find_users_for_notification($phpbb_container, $post);
-
-		// Find the notifications we must delete
-		$remove_notifications = array_diff($old_notifications, array_keys($notifications));
-
-		// Find the notifications we must add
-		$add_notifications = array();
-		foreach (array_diff(array_keys($notifications), $old_notifications) as $user_id)
-		{
-			$add_notifications[$user_id] = $notifications[$user_id];
-		}
-
-		// todo Adding notifications while editing a post can be funky.
-		// If the user has read the topic/post already, and the user is newly quoted it an edit,
-		// The notification will be stuck as unread until another post is made and the user visits
-		// the topic again because the posts will not be marked as read since the topic is already
-		// marked as read
-
-		// Add the necessary notifications
-		$service->add_notifications_for_users(self::get_item_type(), $post, $add_notifications);
-
-		// Remove the necessary notifications
-		if (!empty($remove_notifications))
-		{
-			$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
-				WHERE item_type = '" . self::get_item_type() . "'
-					AND item_id = " . self::get_item_id($post) . '
-					AND ' . $db->sql_in_set('user_id', $remove_notifications);
-			$db->sql_query($sql);
-		}
-
-		// return true to continue with the update code in the notifications service (this will update the rest of the notifications)
-		return true;
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		$user_data = $this->service->get_user($this->get_data('poster_id'));
-
-		return array_merge(parent::get_email_template_variables(), array(
-			'AUTHOR_NAME'		=> htmlspecialchars_decode($user_data['username']),
-		));
-	}
-}
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
deleted file mode 100644
index 7753b196e8..0000000000
--- a/phpBB/includes/notifications/type/topic.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Topic notifications class
-* This class handles notifications for new topics
-*
-* @package notifications
-*/
-class phpbb_notification_type_topic extends phpbb_notification_type_base
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'newtopic_notify';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_TOPIC';
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'topic';
-	}
-
-	/**
-	* Get the id of the item
-	*
-	* @param array $post The data from the post
-	*/
-	public static function get_item_id($post)
-	{
-		return (int) $post['topic_id'];
-	}
-
-	/**
-	* Get the id of the parent
-	*
-	* @param array $post The data from the post
-	*/
-	public static function get_item_parent_id($post)
-	{
-		return (int) $post['forum_id'];
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param ContainerBuilder $phpbb_container
-	* @param array $topic Data from the topic
-	*
-	* @return array
-	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		// Let's continue to use the phpBB subscriptions system, at least for now.
-		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
-		//$users = parent::_find_users_for_notification($phpbb_container, $topic['forum_id']);
-
-		$db = $phpbb_container->get('dbal.conn');
-
-		$users = array();
-
-		$sql = 'SELECT user_id
-			FROM ' . FORUMS_WATCH_TABLE . '
-			WHERE forum_id = ' . (int) $topic['forum_id'] . '
-				AND notify_status = ' . NOTIFY_YES . '
-				AND user_id <> ' . (int) $topic['poster_id'];
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$users[] = $row['user_id'];
-		}
-		$db->sql_freeresult($result);
-
-		if (empty($users))
-		{
-			return array();
-		}
-
-		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $topic['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$topic['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-
-	/**
-	* Get the user's avatar
-	*/
-	public function get_avatar()
-	{
-		return $this->_get_avatar($this->get_data('poster_id'));
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		if ($this->get_data('post_username'))
-		{
-			$username = $this->get_data('post_username');
-		}
-		else
-		{
-			$user_data = $this->service->get_user($this->get_data('poster_id'));
-
-			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
-		}
-
-		return $this->phpbb_container->get('user')->lang(
-			$this->language_key,
-			$username,
-			censor_text($this->get_data('topic_title')),
-			$this->get_data('forum_name')
-		);
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array(
-			'FORUM_NAME'				=> htmlspecialchars_decode($this->get_data('forum_name')),
-			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
-
-			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
-			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
-			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->item_parent_id}",
-			'U_STOP_WATCHING_FORUM'		=> generate_board_url() . "/viewforum.{$this->php_ext}?uid={$this->user_id}&f={$this->item_parent_id}&unwatch=forum",
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f={$this->item_parent_id}&amp;t={$this->item_id}");
-	}
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query()
-	{
-		return array($this->data['poster_id']);
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post)
-	{
-		$this->set_data('poster_id', $post['poster_id']);
-
-		$this->set_data('topic_title', $post['topic_title']);
-
-		$this->set_data('post_username', (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''));
-
-		$this->set_data('forum_name', $post['forum_name']);
-
-		$this->time = $post['post_time'];
-
-		return parent::create_insert_array($post);
-	}
-}
diff --git a/phpBB/includes/notifications/type/topic_in_queue.php b/phpBB/includes/notifications/type/topic_in_queue.php
deleted file mode 100644
index 385578cec8..0000000000
--- a/phpBB/includes/notifications/type/topic_in_queue.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Topic notifications class
-* This class handles notifications for new topics
-*
-* @package notifications
-*/
-class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_topic
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'notifications/topic_in_queue';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_TOPIC_IN_QUEUE';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'needs_approval',
-		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
-	);
-
-	/**
-	* Is available
-	*/
-	public static function is_available(ContainerBuilder $phpbb_container)
-	{
-		$m_approve = $phpbb_container->get('auth')->acl_getf('m_approve', true);
-
-		return (!empty($m_approve));
-	}
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'topic_in_queue';
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param ContainerBuilder $phpbb_container
-	* @param array $topic Data from the topic
-	*
-	* @return array
-	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$db = $phpbb_container->get('dbal.conn');
-
-		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $topic['forum_id']);
-
-		if (empty($auth_approve))
-		{
-			return array();
-		}
-
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $db->sql_in_set('user_id', $auth_approve[$topic['forum_id']]['m_approve']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $topic Data from submit_post
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($topic)
-	{
-		$data = parent::create_insert_array($topic);
-
-		$this->time = $data['time'] = time();
-
-		return $data;
-	}
-}
-- 
cgit v1.2.1


From cea94d89848a806f449610ddb2a7df7b7eec1328 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Oct 2012 14:27:43 -0500
Subject: [ticket/11103] Use dependency injection instead of phpbb_container

PHPBB3-11103
---
 phpBB/includes/notification/manager.php            | 93 ++++++++++++++--------
 phpBB/includes/notification/method/base.php        | 30 +++----
 phpBB/includes/notification/method/email.php       |  6 +-
 phpBB/includes/notification/method/jabber.php      |  6 +-
 phpBB/includes/notification/type/approve_post.php  | 15 ++--
 phpBB/includes/notification/type/approve_topic.php | 15 ++--
 phpBB/includes/notification/type/base.php          | 60 +++++++-------
 phpBB/includes/notification/type/bookmark.php      | 23 +++---
 .../includes/notification/type/disapprove_post.php |  2 +-
 .../notification/type/disapprove_topic.php         |  2 +-
 phpBB/includes/notification/type/interface.php     |  6 +-
 phpBB/includes/notification/type/pm.php            | 23 +++---
 phpBB/includes/notification/type/post.php          | 25 +++---
 phpBB/includes/notification/type/post_in_queue.php | 19 ++---
 phpBB/includes/notification/type/quote.php         | 43 +++++-----
 phpBB/includes/notification/type/topic.php         | 25 +++---
 .../includes/notification/type/topic_in_queue.php  | 19 ++---
 17 files changed, 195 insertions(+), 217 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 15db3f89fd..e2c6c9d0f4 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -23,8 +23,7 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_manager
 {
-	protected $phpbb_container;
-	protected $db;
+	protected $db, $cache, $template, $extension_manager, $user, $auth, $config, $phpbb_root_path, $php_ext = null;
 
 	/**
 	* Users loaded from the DB
@@ -33,12 +32,17 @@ class phpbb_notification_manager
 	*/
 	protected $users = array();
 
-	public function __construct(ContainerBuilder $phpbb_container)
+	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
-		$this->phpbb_container = $phpbb_container;
-
-		// Some common things we're going to use
-		$this->db = $phpbb_container->get('dbal.conn');
+		$this->db = $db;
+		$this->cache = $cache;
+		$this->template = $template;
+		$this->extension_manager = $extension_manager;
+		$this->user = $user;
+		$this->auth = $auth;
+		$this->config = $config;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -56,12 +60,10 @@ class phpbb_notification_manager
 	*/
 	public function load_notifications($options = array())
 	{
-		$user = $this->phpbb_container->get('user');
-
 		// Merge default options
 		$options = array_merge(array(
 			'notification_id'	=> false,
-			'user_id'			=> $user->data['user_id'],
+			'user_id'			=> $this->user->data['user_id'],
 			'order_by'			=> 'time',
 			'order_dir'			=> 'DESC',
 			'limit'				=> 0,
@@ -74,7 +76,7 @@ class phpbb_notification_manager
 		$options['count_unread'] = ($options['all_unread']) ? true : $options['count_unread'];
 
 		// Anonymous users and bots never receive notifications
-		if ($options['user_id'] == $user->data['user_id'] && ($user->data['user_id'] == ANONYMOUS || $user->data['user_type'] == USER_IGNORE))
+		if ($options['user_id'] == $this->user->data['user_id'] && ($this->user->data['user_id'] == ANONYMOUS || $this->user->data['user_type'] == USER_IGNORE))
 		{
 			return array(
 				'notifications'		=> array(),
@@ -136,7 +138,7 @@ class phpbb_notification_manager
 		{
 			$item_type_class_name = $this->get_item_type_class_name($row['item_type'], true);
 
-			$notification = new $item_type_class_name($this->phpbb_container, $row);
+			$notification = $this->get_item_type_class($item_type_class_name, $row);
 
 			// Array of user_ids to query all at once
 			$user_ids = array_merge($user_ids, $notification->users_to_query());
@@ -153,12 +155,14 @@ class phpbb_notification_manager
 
 		$this->load_users($user_ids);
 
-		// Allow each type to load it's own special items
+		// Allow each type to load its own special items
 		foreach ($load_special as $item_type => $data)
 		{
 			$item_type_class_name = $this->get_item_type_class_name($item_type, true);
 
-			$item_type_class_name::load_special($this->phpbb_container, $data, $notifications);
+			$item_class = $this->get_item_type_class($item_type_class_name);
+
+			$item_class->load_special($data, $notifications);
 		}
 
 		return array(
@@ -283,7 +287,7 @@ class phpbb_notification_manager
 		$item_id = $item_type_class_name::get_item_id($data);
 
 		// find out which users want to receive this type of notification
-		$notify_users = $item_type_class_name::find_users_for_notification($this->phpbb_container, $data, $options);
+		$notify_users = $this->get_item_type_class($item_type_class_name)->find_users_for_notification($data, $options);
 
 		$this->add_notifications_for_users($item_type, $data, $notify_users);
 
@@ -343,7 +347,7 @@ class phpbb_notification_manager
 		// Go through each user so we can insert a row in the DB and then notify them by their desired means
 		foreach ($notify_users as $user => $methods)
 		{
-			$notification = new $item_type_class_name($this->phpbb_container);
+			$notification = $this->get_item_type_class($item_type_class_name);
 
 			$notification->user_id = (int) $user;
 
@@ -361,7 +365,7 @@ class phpbb_notification_manager
 					if (!isset($notification_methods[$method]))
 					{
 						$method_class_name = 'phpbb_notification_method_' . $method;
-						$notification_methods[$method] = new $method_class_name($this->phpbb_container);
+						$notification_methods[$method] = $this->get_method_class($method_class_name);
 					}
 
 					$notification_methods[$method]->add_to_queue($notification);
@@ -406,7 +410,7 @@ class phpbb_notification_manager
 		if (method_exists($item_type_class_name, 'update_notifications'))
 		{
 			// Return False to over-ride the rest of the update
-			if ($item_type_class_name::update_notifications($this->phpbb_container, $data) === false)
+			if ($this->get_item_type_class($item_type_class_name)->update_notifications($data) === false)
 			{
 				return;
 			}
@@ -414,7 +418,7 @@ class phpbb_notification_manager
 
 		$item_id = $item_type_class_name::get_item_id($data);
 
-		$notification = new $item_type_class_name($this->phpbb_container);
+		$notification = $this->get_item_type_class($item_type_class_name);
 		$update_array = $notification->create_update_array($data);
 
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
@@ -460,24 +464,26 @@ class phpbb_notification_manager
 	{
 		$subscription_types = array();
 
-		foreach ($this->get_subscription_files('notifications/type/') as $class => $file)
+		foreach ($this->get_subscription_files('notifications/type/') as $class_name => $file)
 		{
-			$class = $this->get_item_type_class_name($class);
+			$class_name = $this->get_item_type_class_name($class_name);
 
-			if (!class_exists($class))
+			if (!class_exists($class_name))
 			{
 				include($file);
 			}
 
-			if ($class::is_available($this->phpbb_container) && method_exists($class, 'get_item_type'))
+			$class = $this->get_item_type_class($class_name);
+
+			if ($class->is_available() && method_exists($class_name, 'get_item_type'))
 			{
-				if ($class::$notification_option === false)
+				if ($class_name::$notification_option === false)
 				{
-					$subscription_types[$class::get_item_type()] = $class::get_item_type();
+					$subscription_types[$class_name::get_item_type()] = $class_name::get_item_type();
 				}
 				else
 				{
-					$subscription_types[$class::$notification_option['id']] = $class::$notification_option;
+					$subscription_types[$class_name::$notification_option['id']] = $class_name::$notification_option;
 				}
 			}
 		}
@@ -503,7 +509,7 @@ class phpbb_notification_manager
 				include($file);
 			}
 
-			$method = new $class_name($this->phpbb_container);
+			$method = $this->get_method_class($class_name);
 
 			if ($method->is_available())
 			{
@@ -524,7 +530,7 @@ class phpbb_notification_manager
 	*/
 	public function get_subscriptions($user_id = false, $only_global = false)
 	{
-		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
+		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
 		$subscriptions = array();
 
@@ -566,7 +572,7 @@ class phpbb_notification_manager
 	{
 		$this->get_item_type_class_name($item_type);
 
-		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
+		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
 		$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
 			$this->db->sql_build_array('INSERT', array(
@@ -590,7 +596,7 @@ class phpbb_notification_manager
 	{
 		$this->get_item_type_class_name($item_type);
 
-		$user_id = ($user_id === false) ? $this->phpbb_container->get('user')->data['user_id'] : $user_id;
+		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
 		$sql = 'DELETE FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
@@ -654,15 +660,32 @@ class phpbb_notification_manager
 		return 'phpbb_notification_type_' . $item_type;
 	}
 
+	/**
+	* Helper to get the notifications item type class and set it up
+	*/
+	private function get_item_type_class($item_type, $data = array())
+	{
+		$item = new $item_type($this, $this->db, $this->cache, $this->template, $this->extension_manager, $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext);
+
+		$item->set_initial_data($data);
+
+		return $item;
+	}
+
+	/**
+	* Helper to get the notifications method class and set it up
+	*/
+	private function get_method_class($method_name)
+	{
+		return new $method_name($this, $this->db, $this->cache, $this->template, $this->extension_manager, $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext);
+	}
+
 	/**
 	* Helper to get subscription related files with the finder
 	*/
 	private function get_subscription_files($path)
 	{
-		$ext_manager = $this->phpbb_container->get('ext.manager');
-		$php_ext = $this->phpbb_container->getParameter('core.php_ext');
-
-		$finder = $ext_manager->get_finder();
+		$finder = $this->extension_manager->get_finder();
 
 		$subscription_files = array();
 
@@ -673,7 +696,7 @@ class phpbb_notification_manager
 		foreach ($files as $file)
 		{
 			$class = substr($file, strrpos($file, '/'));
-			$class = substr($class, 1, (strpos($class, '.' . $php_ext) - 1));
+			$class = substr($class, 1, (strpos($class, '.' . $this->php_ext) - 1));
 
 			if ($class == 'interface' || $class == 'base')
 			{
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index b502d3afd0..ced85e2582 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -23,12 +23,7 @@ if (!defined('IN_PHPBB'))
 */
 abstract class phpbb_notification_method_base implements phpbb_notification_method_interface
 {
-	protected $phpbb_container;
-	protected $service;
-	protected $db;
-	protected $user;
-	protected $phpbb_root_path;
-	protected $php_ext;
+	protected $notification_manager, $db, $cache, $template, $extension_manager, $user, $auth, $config, $phpbb_root_path, $php_ext = null;
 
 	/**
 	* Desired notifications
@@ -56,20 +51,17 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	*/
 	protected $queue = array();
 
-	public function __construct(ContainerBuilder $phpbb_container)
+	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
-		// phpBB Container
-		$this->phpbb_container = $phpbb_container;
-
-		// Service
-		$this->service = $phpbb_container->get('notifications');
-
-		// Some common things we're going to use
-		$this->db = $phpbb_container->get('dbal.conn');
-		$this->user = $phpbb_container->get('user');
-
-		$this->phpbb_root_path = $phpbb_container->getParameter('core.root_path');
-		$this->php_ext = $phpbb_container->getParameter('core.php_ext');
+		$this->db = $db;
+		$this->cache = $cache;
+		$this->template = $template;
+		$this->extension_manager = $extension_manager;
+		$this->user = $user;
+		$this->auth = $auth;
+		$this->config = $config;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index 1b6b44d137..c2e272aca1 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -57,12 +57,12 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 		// We do not send emails to banned users
 		if (!function_exists('phpbb_get_banned_user_ids'))
 		{
-			include($this->phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $this->phpbb_container->getParameter('core.php_ext'));
+			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 		}
 		$banned_users = phpbb_get_banned_user_ids($user_ids);
 
 		// Load all the users we need
-		$this->service->load_users($user_ids);
+		$this->notification_manager->load_users($user_ids);
 
 		// Load the messenger
 		if (!class_exists('messenger'))
@@ -75,7 +75,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 		// Time to go through the queue and send emails
 		foreach ($this->queue as $notification)
 		{
-			$user = $this->service->get_user($notification->user_id);
+			$user = $this->notification_manager->get_user($notification->user_id);
 
 			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
 			{
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
index 9232d8fc45..664e387d61 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/includes/notification/method/jabber.php
@@ -36,7 +36,7 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
 	*/
 	public function is_available()
 	{
-		return ($this->global_available() && $this->phpbb_container->get('user')->data['jabber']);
+		return ($this->global_available() && $this->user->data['jabber']);
 	}
 
 	/**
@@ -45,9 +45,7 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
 	*/
 	public function global_available()
 	{
-		$config = $this->phpbb_container->get('config');
-
-		return ($config['jab_enable'] && @extension_loaded('xml'));
+		return ($this->config['jab_enable'] && @extension_loaded('xml'));
 	}
 
 	public function notify()
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index 9a3def6217..3a88d9f54a 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -62,23 +62,20 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 	/**
 	* Find the users who want to receive notifications
 	*
-	* @param ContainerBuilder $phpbb_container
 	* @param array $post Data from
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	public function find_users_for_notification($post, $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
 		), $options);
 
-		$db = $phpbb_container->get('dbal.conn');
-
 		$users = array();
 		$users[$post['poster_id']] = array('');
 
-		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+		$auth_read = $this->auth->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
 
 		if (empty($auth_read))
 		{
@@ -90,9 +87,9 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
 			{
@@ -106,7 +103,7 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 
 			$notify_users[$row['user_id']][] = $row['method'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $notify_users;
 	}
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 00af312018..0a6ca14a84 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -62,23 +62,20 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 	/**
 	* Find the users who want to receive notifications
 	*
-	* @param ContainerBuilder $phpbb_container
 	* @param array $post Data from
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	public function find_users_for_notification($post, $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
 		), $options);
 
-		$db = $phpbb_container->get('dbal.conn');
-
 		$users = array();
 		$users[$post['poster_id']] = array('');
 
-		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+		$auth_read = $this->auth->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
 
 		if (empty($auth_read))
 		{
@@ -90,9 +87,9 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
 			{
@@ -106,7 +103,7 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 
 			$notify_users[$row['user_id']][] = $row['method'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $notify_users;
 	}
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 40462bccfb..626fe821e6 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -23,11 +23,7 @@ if (!defined('IN_PHPBB'))
 */
 abstract class phpbb_notification_type_base implements phpbb_notification_type_interface
 {
-	protected $phpbb_container;
-	protected $service;
-	protected $db;
-	protected $phpbb_root_path;
-	protected $php_ext;
+	protected $notification_manager, $db, $cache, $template, $extension_manager, $user, $auth, $config, $phpbb_root_path, $php_ext = null;
 
 	/**
 	* Array of user data containing information needed to output the notifications to the template
@@ -39,7 +35,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/**
 	* Notification option data (for outputting to the user)
 	*
-	* @var bool|array False if the service should use it's default data
+	* @var bool|array False if the service should use its default data
 	* 					Array of data (including keys 'id' and 'lang')
 	*/
 	public static $notification_option = false;
@@ -60,20 +56,27 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	private $data = array();
 
-	public function __construct(ContainerBuilder $phpbb_container, $data = array())
+	public function __construct(phpbb_notification_manager $notification_manager, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
-		// phpBB Container
-		$this->phpbb_container = $phpbb_container;
-
-		// Service
-		$this->service = $phpbb_container->get('notifications');
-
-		// Some common things we're going to use
-		$this->db = $phpbb_container->get('dbal.conn');
-
-		$this->phpbb_root_path = $phpbb_container->getParameter('core.root_path');
-		$this->php_ext = $phpbb_container->getParameter('core.php_ext');
+		$this->notification_manager = $notification_manager;
+		$this->db = $db;
+		$this->cache = $cache;
+		$this->template = $template;
+		$this->extension_manager = $extension_manager;
+		$this->user = $user;
+		$this->auth = $auth;
+		$this->config = $config;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+	}
 
+	/**
+	* Set initial data from the database
+	*
+	* @param array $data Row directly from the database
+	*/
+	public function set_initial_data($data = array())
+	{
 		// The row from the database (unless this is a new notification we're going to add)
 		$this->data = $data;
 		$this->data['data'] = (isset($this->data['data'])) ? unserialize($this->data['data']) : array();
@@ -117,15 +120,13 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	public function prepare_for_display()
 	{
-		$user = $this->phpbb_container->get('user');
-
 		return array(
 			'AVATAR'			=> $this->get_avatar(),
 
 			'FORMATTED_TITLE'	=> $this->get_title(),
 
 			'URL'				=> $this->get_url(),
-			'TIME'	   			=> $user->format_date($this->time),
+			'TIME'	   			=> $this->user->format_date($this->time),
 
 			'UNREAD'			=> $this->unread,
 
@@ -239,7 +240,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/**
 	* Load the special items (fall-back)
 	*/
-	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications)
+	public function load_special($data, $notifications)
 	{
 		return;
 	}
@@ -247,7 +248,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/**
 	* Is available (fall-back)
 	*/
-	public static function is_available(ContainerBuilder $phpbb_container)
+	public function is_available()
 	{
 		return true;
 	}
@@ -259,27 +260,24 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/**
 	* Find the users who want to receive notifications (helper)
 	*
-	* @param ContainerBuilder $phpbb_container
 	* @param array $item_id The item_id to search for
 	*
 	* @return array
 	*/
-	protected static function _find_users_for_notification(ContainerBuilder $phpbb_container, $item_id, $options)
+	protected function _find_users_for_notification($item_id, $options)
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
 		), $options);
 
-		$db = $phpbb_container->get('dbal.conn');
-
 		$rowset = array();
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . static::get_item_type() . "'
 				AND item_id = " . (int) $item_id;
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
 			{
@@ -293,7 +291,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 			$rowset[$row['user_id']][] = $row['method'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $rowset;
 	}
@@ -306,7 +304,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	protected function _get_avatar($user_id)
 	{
-		$user = $this->service->get_user($user_id);
+		$user = $this->notification_manager->get_user($user_id);
 
 		if (!function_exists('get_user_avatar'))
 		{
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index 51f23bc294..5ff39821dc 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -51,38 +51,35 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 	/**
 	* Find the users who want to receive notifications
 	*
-	* @param ContainerBuilder $phpbb_container
 	* @param array $post Data from
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	public function find_users_for_notification($post, $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
 		), $options);
 
-		$db = $phpbb_container->get('dbal.conn');
-
 		$users = array();
 
 		$sql = 'SELECT user_id
 			FROM ' . BOOKMARKS_TABLE . '
-			WHERE ' . $db->sql_in_set('topic_id', $post['topic_id']) . '
+			WHERE ' . $this->db->sql_in_set('topic_id', $post['topic_id']) . '
 				AND user_id <> ' . (int) $post['poster_id'];
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$users[] = $row['user_id'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($users))
 		{
 			return array();
 		}
 
-		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
+		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
 
 		if (empty($auth_read))
 		{
@@ -94,9 +91,9 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
 			{
@@ -110,7 +107,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 
 			$notify_users[$row['user_id']][] = $row['method'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $notify_users;
 	}
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
index 8fa0102e3d..3ef45fb8e3 100644
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ b/phpBB/includes/notification/type/disapprove_post.php
@@ -66,7 +66,7 @@ class phpbb_notification_type_disapprove_post extends phpbb_notification_type_ap
 	*/
 	public function get_title()
 	{
-		return $this->phpbb_container->get('user')->lang(
+		return $this->user->lang(
 			$this->language_key,
 			censor_text($this->get_data('topic_title')),
 			$this->get_data('disapprove_reason')
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
index 186c42d2b6..afd293a94f 100644
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ b/phpBB/includes/notification/type/disapprove_topic.php
@@ -66,7 +66,7 @@ class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_a
 	*/
 	public function get_title()
 	{
-		return $this->phpbb_container->get('user')->lang(
+		return $this->user->lang(
 			$this->language_key,
 			censor_text($this->get_data('topic_title')),
 			$this->get_data('disapprove_reason')
diff --git a/phpBB/includes/notification/type/interface.php b/phpBB/includes/notification/type/interface.php
index aa54c62a97..c17f248080 100644
--- a/phpBB/includes/notification/type/interface.php
+++ b/phpBB/includes/notification/type/interface.php
@@ -25,9 +25,9 @@ interface phpbb_notification_type_interface
 
 	public static function get_item_id($type_data);
 
-	public static function is_available(ContainerBuilder $phpbb_container);
+	public function is_available();
 
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $type_data, $options);
+	public function find_users_for_notification($type_data, $options);
 
 	public function get_title();
 
@@ -45,5 +45,5 @@ interface phpbb_notification_type_interface
 
 	public function get_load_special();
 
-	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications);
+	public function load_special($data, $notifications);
 }
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index 8252a8577b..9c1f353514 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -65,36 +65,31 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 	/**
 	* Find the users who want to receive notifications
 	*
-	* @param ContainerBuilder $phpbb_container
 	* @param array $pm Data from
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $pm, $options = array())
+	public function find_users_for_notification($pm, $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
 		), $options);
 
-		$service = $phpbb_container->get('notifications');
-		$db = $phpbb_container->get('dbal.conn');
-		$user = $phpbb_container->get('user');
-
 		if (!sizeof($pm['recipients']))
 		{
 			return array();
 		}
 
-		$service->load_users(array_keys($pm['recipients']));
+		$this->notification_manager->load_users(array_keys($pm['recipients']));
 
 		$notify_users = array();
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
-				AND " . $db->sql_in_set('user_id', array_keys($pm['recipients']));
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+				AND " . $this->db->sql_in_set('user_id', array_keys($pm['recipients']));
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
 			{
@@ -108,7 +103,7 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 
 			$notify_users[$row['user_id']][] = $row['method'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $notify_users;
 	}
@@ -128,11 +123,11 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 	*/
 	public function get_title()
 	{
-		$user_data = $this->service->get_user($this->get_data('from_user_id'));
+		$user_data = $this->notification_manager->get_user($this->get_data('from_user_id'));
 
 		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 
-		return $this->phpbb_container->get('user')->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
+		return $this->user->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
 	}
 
 	/**
@@ -142,7 +137,7 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 	*/
 	public function get_email_template_variables()
 	{
-		$user_data = $this->service->get_user($this->get_data('from_user_id'));
+		$user_data = $this->notification_manager->get_user($this->get_data('from_user_id'));
 
 		return array(
 			'AUTHOR_NAME'				=> htmlspecialchars_decode($user_data['username']),
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 1e654ef51b..37020825d3 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -71,12 +71,11 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 	/**
 	* Find the users who want to receive notifications
 	*
-	* @param ContainerBuilder $phpbb_container
 	* @param array $post Data from
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	public function find_users_for_notification($post, $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
@@ -86,8 +85,6 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
 		//$users = parent::_find_users_for_notification($phpbb_container, $post['topic_id']);
 
-		$db = $phpbb_container->get('dbal.conn');
-
 		$users = array();
 
 		$sql = 'SELECT user_id
@@ -95,19 +92,19 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			WHERE topic_id = ' . (int) $post['topic_id'] . '
 				AND notify_status = ' . NOTIFY_YES . '
 				AND user_id <> ' . (int) $post['poster_id'];
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$users[] = $row['user_id'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($users))
 		{
 			return array();
 		}
 
-		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
+		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
 
 		if (empty($auth_read))
 		{
@@ -119,9 +116,9 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
 			{
@@ -135,7 +132,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 
 			$notify_users[$row['user_id']][] = $row['method'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $notify_users;
 	}
@@ -161,12 +158,12 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		}
 		else
 		{
-			$user_data = $this->service->get_user($this->get_data('poster_id'));
+			$user_data = $this->notification_manager->get_user($this->get_data('poster_id'));
 
 			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 		}
 
-		return $this->phpbb_container->get('user')->lang(
+		return $this->user->lang(
 			$this->language_key,
 			$username,
 			censor_text($this->get_data('topic_title'))
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index f0a5e0baec..44f4f9391c 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -62,9 +62,9 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 	/**
 	* Is available
 	*/
-	public static function is_available(ContainerBuilder $phpbb_container)
+	public function is_available()
 	{
-		$m_approve = $phpbb_container->get('auth')->acl_getf('m_approve', true);
+		$m_approve = $this->auth->acl_getf('m_approve', true);
 
 		return (!empty($m_approve));
 	}
@@ -72,20 +72,17 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 	/**
 	* Find the users who want to receive notifications
 	*
-	* @param ContainerBuilder $phpbb_container
 	* @param array $post Data from the post
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	public function find_users_for_notification($post, $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
 		), $options);
 
-		$db = $phpbb_container->get('dbal.conn');
-
-		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $post['forum_id']);
+		$auth_approve = $this->auth->acl_get_list(false, 'm_approve', $post['forum_id']);
 
 		if (empty($auth_approve))
 		{
@@ -97,9 +94,9 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $db->sql_in_set('user_id', $auth_approve[$post['forum_id']]['m_approve']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+				AND " . $this->db->sql_in_set('user_id', $auth_approve[$post['forum_id']]['m_approve']);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
 			{
@@ -113,7 +110,7 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 
 			$notify_users[$row['user_id']][] = $row['method'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $notify_users;
 	}
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index dd3cbedee2..32ee06787c 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -58,19 +58,16 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 	/**
 	* Find the users who want to receive notifications
 	*
-	* @param ContainerBuilder $phpbb_container
 	* @param array $post Data from
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post, $options = array())
+	public function find_users_for_notification($post, $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
 		), $options);
 
-		$db = $phpbb_container->get('dbal.conn');
-
 		$usernames = false;
 		preg_match_all(self::$regular_expression_match, $post['post_text'], $usernames);
 
@@ -87,21 +84,21 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 
 		$sql = 'SELECT user_id
 			FROM ' . USERS_TABLE . '
-			WHERE ' . $db->sql_in_set('username_clean', $usernames) . '
+			WHERE ' . $this->db->sql_in_set('username_clean', $usernames) . '
 				AND user_id <> ' . (int) $post['poster_id'];
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$users[] = $row['user_id'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($users))
 		{
 			return array();
 		}
 
-		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $post['forum_id']);
+		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
 
 		if (empty($auth_read))
 		{
@@ -113,9 +110,9 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
 			{
@@ -129,7 +126,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 
 			$notify_users[$row['user_id']][] = $row['method'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $notify_users;
 	}
@@ -137,28 +134,24 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 	/**
 	* Update a notification
 	*
-	* @param ContainerBuilder $phpbb_container
 	* @param array $data Data specific for this type that will be updated
 	*/
-	public static function update_notifications(ContainerBuilder $phpbb_container, $post)
+	public function update_notifications($post)
 	{
-		$service = $phpbb_container->get('notifications');
-		$db = $phpbb_container->get('dbal.conn');
-
 		$old_notifications = array();
 		$sql = 'SELECT user_id
 			FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
 				AND item_id = " . self::get_item_id($post);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$old_notifications[] = $row['user_id'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		// Find the new users to notify
-		$notifications = self::find_users_for_notification($phpbb_container, $post);
+		$notifications = $this->find_users_for_notification($post);
 
 		// Find the notifications we must delete
 		$remove_notifications = array_diff($old_notifications, array_keys($notifications));
@@ -185,8 +178,8 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 			$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
 				WHERE item_type = '" . self::get_item_type() . "'
 					AND item_id = " . self::get_item_id($post) . '
-					AND ' . $db->sql_in_set('user_id', $remove_notifications);
-			$db->sql_query($sql);
+					AND ' . $this->db->sql_in_set('user_id', $remove_notifications);
+			$this->db->sql_query($sql);
 		}
 
 		// return true to continue with the update code in the notifications service (this will update the rest of the notifications)
@@ -200,7 +193,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 	*/
 	public function get_email_template_variables()
 	{
-		$user_data = $this->service->get_user($this->get_data('poster_id'));
+		$user_data = $this->notification_manager->get_user($this->get_data('poster_id'));
 
 		return array_merge(parent::get_email_template_variables(), array(
 			'AUTHOR_NAME'		=> htmlspecialchars_decode($user_data['username']),
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 7753b196e8..01f394ccd2 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -71,12 +71,11 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 	/**
 	* Find the users who want to receive notifications
 	*
-	* @param ContainerBuilder $phpbb_container
 	* @param array $topic Data from the topic
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic, $options = array())
+	public function find_users_for_notification($topic, $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
@@ -86,8 +85,6 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
 		//$users = parent::_find_users_for_notification($phpbb_container, $topic['forum_id']);
 
-		$db = $phpbb_container->get('dbal.conn');
-
 		$users = array();
 
 		$sql = 'SELECT user_id
@@ -95,19 +92,19 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 			WHERE forum_id = ' . (int) $topic['forum_id'] . '
 				AND notify_status = ' . NOTIFY_YES . '
 				AND user_id <> ' . (int) $topic['poster_id'];
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$users[] = $row['user_id'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($users))
 		{
 			return array();
 		}
 
-		$auth_read = $phpbb_container->get('auth')->acl_get_list($users, 'f_read', $topic['forum_id']);
+		$auth_read = $this->auth->acl_get_list($users, 'f_read', $topic['forum_id']);
 
 		if (empty($auth_read))
 		{
@@ -119,9 +116,9 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
-				AND " . $db->sql_in_set('user_id', $auth_read[$topic['forum_id']]['f_read']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+				AND " . $this->db->sql_in_set('user_id', $auth_read[$topic['forum_id']]['f_read']);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
 			{
@@ -135,7 +132,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 
 			$notify_users[$row['user_id']][] = $row['method'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $notify_users;
 	}
@@ -161,12 +158,12 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		}
 		else
 		{
-			$user_data = $this->service->get_user($this->get_data('poster_id'));
+			$user_data = $this->notification_manager->get_user($this->get_data('poster_id'));
 
 			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 		}
 
-		return $this->phpbb_container->get('user')->lang(
+		return $this->user->lang(
 			$this->language_key,
 			$username,
 			censor_text($this->get_data('topic_title')),
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index 385578cec8..d931168013 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -53,9 +53,9 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 	/**
 	* Is available
 	*/
-	public static function is_available(ContainerBuilder $phpbb_container)
+	public function is_available()
 	{
-		$m_approve = $phpbb_container->get('auth')->acl_getf('m_approve', true);
+		$m_approve = $this->auth->acl_getf('m_approve', true);
 
 		return (!empty($m_approve));
 	}
@@ -72,20 +72,17 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 	/**
 	* Find the users who want to receive notifications
 	*
-	* @param ContainerBuilder $phpbb_container
 	* @param array $topic Data from the topic
 	*
 	* @return array
 	*/
-	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic, $options = array())
+	public function find_users_for_notification($topic, $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
 		), $options);
 
-		$db = $phpbb_container->get('dbal.conn');
-
-		$auth_approve = $phpbb_container->get('auth')->acl_get_list(false, 'm_approve', $topic['forum_id']);
+		$auth_approve = $this->auth->acl_get_list(false, 'm_approve', $topic['forum_id']);
 
 		if (empty($auth_approve))
 		{
@@ -97,9 +94,9 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $db->sql_in_set('user_id', $auth_approve[$topic['forum_id']]['m_approve']);
-		$result = $db->sql_query($sql);
-		while ($row = $db->sql_fetchrow($result))
+				AND " . $this->db->sql_in_set('user_id', $auth_approve[$topic['forum_id']]['m_approve']);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
 			{
@@ -113,7 +110,7 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 
 			$notify_users[$row['user_id']][] = $row['method'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $notify_users;
 	}
-- 
cgit v1.2.1


From 07fb66ac1090dfe92431ed749b520115595f7927 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Oct 2012 14:31:00 -0500
Subject: [ticket/11103] Do not abbreviate template output

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 162b0046b5..d005ccaaab 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5020,8 +5020,8 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'RECORD_USERS'					=> $l_online_record,
 		'PRIVATE_MESSAGE_INFO'			=> $l_privmsgs_text,
 		'PRIVATE_MESSAGE_INFO_UNREAD'	=> $l_privmsgs_text_unread,
-		'NUM_UNREAD_NOTIFICATIONS'		=> $notifications['unread_count'],
-		'NOTIFICATIONS_CNT'				=> $user->lang('NOTIFICATIONS_CNT', $notifications['unread_count']),
+		'UNREAD_NOTIFICATIONS_COUNT'	=> $notifications['unread_count'],
+		'NOTIFICATIONS_COUNT'			=> $user->lang('NOTIFICATIONS_COUNT', $notifications['unread_count']),
 
 		'S_USER_NEW_PRIVMSG'			=> $user->data['user_new_privmsg'],
 		'S_USER_UNREAD_PRIVMSG'			=> $user->data['user_unread_privmsg'],
-- 
cgit v1.2.1


From b9bc65eed88bbd2dff12102909903cbf4dc9b368 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Oct 2012 14:47:13 -0500
Subject: [ticket/11103] Make $phpbb_notifications a global and use it
 everywhere

Do not use phpbb_container everywhere (makes testing difficult)

PHPBB3-11103
---
 phpBB/includes/functions.php             |  8 ++------
 phpBB/includes/functions_admin.php       |  6 ++----
 phpBB/includes/functions_posting.php     |  4 ++--
 phpBB/includes/functions_privmsgs.php    | 35 +++++++++++++-------------------
 phpBB/includes/mcp/mcp_queue.php         |  6 ++----
 phpBB/includes/ucp/ucp_notifications.php |  7 +------
 6 files changed, 23 insertions(+), 43 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d005ccaaab..9513c6919f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1285,7 +1285,7 @@ function phpbb_timezone_select($user, $default = '', $truncate = false)
 function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $user_id = 0)
 {
 	global $db, $user, $config;
-	global $request, $phpbb_container;
+	global $request, $phpbb_notifications;
 
 	if ($mode == 'all')
 	{
@@ -1294,7 +1294,6 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			// Mark all forums read (index page)
 
 			// Mark all topic notifications read for this user
-			$phpbb_notifications = $phpbb_container->get('notifications');
 			$phpbb_notifications->mark_notifications_read(array('topic', 'quote', 'bookmark', 'post', 'approve_topic', 'approve_post'), false, $user->data['user_id'], $post_time);
 
 			if ($config['load_db_lastread'] && $user->data['is_registered'])
@@ -1336,7 +1335,6 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		}
 
 		// Mark topic notifications read for this user in this forum
-		$phpbb_notifications = $phpbb_container->get('notifications');
 		$phpbb_notifications->mark_notifications_read_by_parent(array('topic', 'approve_topic'), $forum_id, $user->data['user_id'], $post_time);
 
 		// Mark all post/quote notifications read for this user in this forum
@@ -1448,7 +1446,6 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		}
 
 		// Mark post notifications read for this user in this topic
-		$phpbb_notifications = $phpbb_container->get('notifications');
 		$phpbb_notifications->mark_notifications_read(array('topic', 'approve_topic'), $topic_id, $user->data['user_id'], $post_time);
 		$phpbb_notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post', 'approve_post'), $topic_id, $user->data['user_id'], $post_time);
 
@@ -4806,7 +4803,7 @@ function phpbb_http_login($param)
 function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum')
 {
 	global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path;
-	global $phpbb_dispatcher, $phpbb_container;
+	global $phpbb_dispatcher, $phpbb_notifications;
 
 	if (defined('HEADER_INC'))
 	{
@@ -4996,7 +4993,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 	}
 
 	// Output the notifications
-	$phpbb_notifications = $phpbb_container->get('notifications');
 	$notifications = $phpbb_notifications->load_notifications(array(
 		'all_unread'	=> true,
 		'limit'			=> 5,
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 27128aafac..3deb2e9c59 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -619,7 +619,7 @@ function move_posts($post_ids, $topic_id, $auto_sync = true)
 function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_sync = true, $call_delete_posts = true)
 {
 	global $db, $config;
-	global $phpbb_container;
+	global $phpbb_notifications;
 
 	$approved_topics = 0;
 	$forum_ids = $topic_ids = array();
@@ -717,7 +717,6 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 	}
 
 	// Delete notifications
-	$phpbb_notifications = $phpbb_container->get('notifications');
 	$phpbb_notifications->delete_notifications(array('topic', 'approve_topic', 'topic_in_queue'), $topic_ids);
 
 	return $return;
@@ -729,7 +728,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync = true, $post_count_sync = true, $call_delete_topics = true)
 {
 	global $db, $config, $phpbb_root_path, $phpEx, $auth, $user;
-	global $phpbb_container;
+	global $phpbb_notifications;
 
 	if ($where_type === 'range')
 	{
@@ -899,7 +898,6 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 	}
 
 	// Delete notifications
-	$phpbb_notifications = $phpbb_container->get('notifications');
 	$phpbb_notifications->delete_notifications(array('quote', 'bookmark', 'post', 'approve_post', 'post_in_queue'), $post_ids);
 
 	return sizeof($post_ids);
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6262cee4ad..3658757e5e 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1409,7 +1409,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true, $update_search_index = true)
 {
 	global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path;
-	global $phpbb_container;
+	global $phpbb_notifications;
 
 	// We do not handle erasing posts here
 	if ($mode == 'delete')
@@ -2220,7 +2220,6 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	}
 
 	// Send Notifications
-	$phpbb_notifications = $phpbb_container->get('notifications');
 	$notification_data = array_merge($data, array(
 		'topic_title'		=> (isset($data['topic_title'])) ? $data['topic_title'] : $subject,
 		'post_username'		=> $username,
@@ -2229,6 +2228,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		'post_time'			=> $current_time,
 		'post_subject'		=> $subject,
 	));
+
 	if ($post_approval)
 	{
 		switch ($mode)
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 8545cc7ef5..6c31c6d6c3 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -269,46 +269,46 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id)
 		case RULE_IS_LIKE:
 			$result = preg_match("/" . preg_quote($rule_row['rule_string'], '/') . '/i', $check0);
 		break;
-		
+
 		case RULE_IS_NOT_LIKE:
 			$result = !preg_match("/" . preg_quote($rule_row['rule_string'], '/') . '/i', $check0);
 		break;
-		
+
 		case RULE_IS:
 			$result = ($check0 == $rule_row['rule_string']);
 		break;
-		
+
 		case RULE_IS_NOT:
 			$result = ($check0 != $rule_row['rule_string']);
 		break;
-		
+
 		case RULE_BEGINS_WITH:
 			$result = preg_match("/^" . preg_quote($rule_row['rule_string'], '/') . '/i', $check0);
 		break;
-		
+
 		case RULE_ENDS_WITH:
 			$result = preg_match("/" . preg_quote($rule_row['rule_string'], '/') . '$/i', $check0);
 		break;
-		
+
 		case RULE_IS_FRIEND:
 		case RULE_IS_FOE:
 		case RULE_ANSWERED:
 		case RULE_FORWARDED:
 			$result = ($check0 == 1);
 		break;
-		
+
 		case RULE_IS_USER:
 			$result = ($check0 == $rule_row['rule_user_id']);
 		break;
-		
+
 		case RULE_IS_GROUP:
 			$result = in_array($rule_row['rule_group_id'], $check0);
 		break;
-		
+
 		case RULE_TO_GROUP:
 			$result = (in_array('g_' . $message_row[$check_ary['check2']], $check0) || in_array('g_' . $message_row[$check_ary['check2']], $message_row[$check_ary['check1']]));
 		break;
-		
+
 		case RULE_TO_ME:
 			$result = (in_array('u_' . $user_id, $check0) || in_array('u_' . $user_id, $message_row[$check_ary['check1']]));
 		break;
@@ -876,10 +876,9 @@ function update_unread_status($unread, $msg_id, $user_id, $folder_id)
 		return;
 	}
 
-	global $db, $user, $phpbb_container;
+	global $db, $user, $phpbb_notifications;
 
 	// Mark the PM as read
-	$phpbb_notifications = $phpbb_container->get('notifications');
 	$phpbb_notifications->mark_notifications_read('pm', $msg_id, $user_id);
 
 	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
@@ -986,7 +985,7 @@ function handle_mark_actions($user_id, $mark_action)
 function delete_pm($user_id, $msg_ids, $folder_id)
 {
 	global $db, $user, $phpbb_root_path, $phpEx;
-	global $phpbb_container;
+	global $phpbb_notifications;
 
 	$user_id	= (int) $user_id;
 	$folder_id	= (int) $folder_id;
@@ -1099,7 +1098,6 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 	}
 
 	// Delete Notifications
-	$phpbb_notifications = $phpbb_container->get('notifications');
 	$phpbb_notifications->delete_notifications('pm', array_keys($delete_rows));
 
 	// Now we have to check which messages we can delete completely
@@ -1146,7 +1144,7 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 function phpbb_delete_user_pms($user_id)
 {
 	global $db, $user, $phpbb_root_path, $phpEx;
-	global $phpbb_container;
+	global $phpbb_notifications;
 
 	$user_id = (int) $user_id;
 
@@ -1265,7 +1263,6 @@ function phpbb_delete_user_pms($user_id)
 			$db->sql_query($sql);
 
 			// Delete Notifications
-			$phpbb_notifications = $phpbb_container->get('notifications');
 			$phpbb_notifications->delete_notifications('pm', $delivered_msg);
 		}
 
@@ -1280,7 +1277,6 @@ function phpbb_delete_user_pms($user_id)
 			$db->sql_query($sql);
 
 			// Delete Notifications
-			$phpbb_notifications = $phpbb_container->get('notifications');
 			$phpbb_notifications->delete_notifications('pm', $undelivered_msg);
 		}
 	}
@@ -1326,7 +1322,6 @@ function phpbb_delete_user_pms($user_id)
 			$db->sql_query($sql);
 
 			// Delete Notifications
-			$phpbb_notifications = $phpbb_container->get('notifications');
 			$phpbb_notifications->delete_notifications('pm', $delete_ids);
 		}
 	}
@@ -1565,7 +1560,7 @@ function get_folder_status($folder_id, $folder)
 function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 {
 	global $db, $auth, $config, $phpEx, $template, $user, $phpbb_root_path;
-	global $phpbb_container;
+	global $phpbb_notifications;
 
 	// We do not handle erasing pms here
 	if ($mode == 'delete')
@@ -1865,8 +1860,6 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 	$db->sql_transaction('commit');
 
 	// Send Notifications
-	$phpbb_notifications = $phpbb_container->get('notifications');
-
 	$pm_data = array_merge($data, array(
 		'message_subject'		=> $subject,
 		'recipients'			=> $recipients,
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 1d2caa38d5..77e778fc38 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -451,7 +451,7 @@ function approve_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path;
-	global $request, $phpbb_container;
+	global $request, $phpbb_notifications;
 
 	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 	{
@@ -601,7 +601,6 @@ function approve_post($post_id_list, $id, $mode)
 		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
 		// Handle notifications
-		$phpbb_notifications = $phpbb_container->get('notifications');
 		foreach ($post_info as $post_id => $post_data)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
@@ -720,7 +719,7 @@ function disapprove_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path;
-	global $request, $phpbb_container;
+	global $request, $phpbb_notifications;
 
 	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 	{
@@ -854,7 +853,6 @@ function disapprove_post($post_id_list, $id, $mode)
 		}
 
 		// Handle notifications (topic/post in queue)
-		$phpbb_notifications = $phpbb_container->get('notifications');
 		foreach ($post_info as $post_id => $post_data)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index d248099b06..9ea44f49bf 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -21,15 +21,10 @@ class ucp_notifications
 
 	public function main($id, $mode)
 	{
-		global $phpbb_container;
+		global $template, $user, $request, $phpbb_notifications;
 
 		add_form_key('ucp_notification_options');
 
-		$phpbb_notifications = $phpbb_container->get('notifications');
-		$template = $phpbb_container->get('template');
-		$user = $phpbb_container->get('user');
-		$request = $phpbb_container->get('request');
-
 		$subscriptions = $phpbb_notifications->get_subscriptions(false, true);
 
 		// Add/remove subscriptions
-- 
cgit v1.2.1


From ff136cc96a62147bc7468b716b86a30f12754e77 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Oct 2012 15:21:07 -0500
Subject: [ticket/11103] Do not use  Symfony\...\ContainerBuilder;

It's no longer needed

PHPBB3-11103
---
 phpBB/includes/notification/manager.php               | 2 --
 phpBB/includes/notification/method/base.php           | 1 -
 phpBB/includes/notification/type/approve_post.php     | 1 -
 phpBB/includes/notification/type/approve_topic.php    | 1 -
 phpBB/includes/notification/type/base.php             | 1 -
 phpBB/includes/notification/type/bookmark.php         | 1 -
 phpBB/includes/notification/type/disapprove_post.php  | 1 -
 phpBB/includes/notification/type/disapprove_topic.php | 1 -
 phpBB/includes/notification/type/pm.php               | 1 -
 phpBB/includes/notification/type/post.php             | 1 -
 phpBB/includes/notification/type/post_in_queue.php    | 1 -
 phpBB/includes/notification/type/quote.php            | 1 -
 phpBB/includes/notification/type/topic.php            | 1 -
 phpBB/includes/notification/type/topic_in_queue.php   | 1 -
 14 files changed, 15 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index e2c6c9d0f4..be29f37a3e 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -7,8 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index ced85e2582..d95a65fa72 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index 3a88d9f54a..bbd2bccfc0 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 0a6ca14a84..5006e3bbb8 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 626fe821e6..31150477bb 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index 5ff39821dc..ee06a6d33b 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
index 3ef45fb8e3..6ef4de5cd9 100644
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ b/phpBB/includes/notification/type/disapprove_post.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
index afd293a94f..6f92c1de77 100644
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ b/phpBB/includes/notification/type/disapprove_topic.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index 9c1f353514..a647106a53 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 37020825d3..de224776db 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 44f4f9391c..19c3ed9fc9 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 32ee06787c..0920cea428 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 01f394ccd2..621c0f484b 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index d931168013..c549cb12a1 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -7,7 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
 * @ignore
-- 
cgit v1.2.1


From ceb56da965f12245bca6b735cb71f3bbaf505307 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Oct 2012 21:39:17 -0500
Subject: [ticket/11103] Fixing a few bugs from the previous changes

PHPBB3-11103
---
 phpBB/includes/notification/manager.php     | 6 +++---
 phpBB/includes/notification/method/base.php | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index be29f37a3e..854d72009e 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -30,7 +30,7 @@ class phpbb_notification_manager
 	*/
 	protected $users = array();
 
-	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;
 		$this->cache = $cache;
@@ -462,7 +462,7 @@ class phpbb_notification_manager
 	{
 		$subscription_types = array();
 
-		foreach ($this->get_subscription_files('notifications/type/') as $class_name => $file)
+		foreach ($this->get_subscription_files('notification/type/') as $class_name => $file)
 		{
 			$class_name = $this->get_item_type_class_name($class_name);
 
@@ -498,7 +498,7 @@ class phpbb_notification_manager
 	{
 		$subscription_methods = array();
 
-		foreach ($this->get_subscription_files('notifications/method/') as $method_name => $file)
+		foreach ($this->get_subscription_files('notification/method/') as $method_name => $file)
 		{
 			$class_name = 'phpbb_notification_method_' . $method_name;
 
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index d95a65fa72..9f1db6d9f5 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -50,8 +50,9 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	*/
 	protected $queue = array();
 
-	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_notification_manager $notification_manager, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
+		$this->notification_manager = $notification_manager;
 		$this->db = $db;
 		$this->cache = $cache;
 		$this->template = $template;
-- 
cgit v1.2.1


From 3f2e3ad633930744e1ed92cc529ca473ccfa09e0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Oct 2012 00:07:48 -0500
Subject: [ticket/11103] Working on test case

Fixing extension type/method naming scheme so they can be autoloaded.

Other bugs

PHPBB3-11103
---
 phpBB/includes/notification/manager.php        | 39 +++++++++++++++-----------
 phpBB/includes/notification/method/base.php    |  2 +-
 phpBB/includes/notification/type/base.php      |  7 ++++-
 phpBB/includes/notification/type/interface.php |  2 ++
 4 files changed, 31 insertions(+), 19 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 854d72009e..c1ae61e08a 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -466,11 +466,6 @@ class phpbb_notification_manager
 		{
 			$class_name = $this->get_item_type_class_name($class_name);
 
-			if (!class_exists($class_name))
-			{
-				include($file);
-			}
-
 			$class = $this->get_item_type_class($class_name);
 
 			if ($class->is_available() && method_exists($class_name, 'get_item_type'))
@@ -502,11 +497,6 @@ class phpbb_notification_manager
 		{
 			$class_name = 'phpbb_notification_method_' . $method_name;
 
-			if (!class_exists($class_name))
-			{
-				include($file);
-			}
-
 			$method = $this->get_method_class($class_name);
 
 			if ($method->is_available())
@@ -652,7 +642,14 @@ class phpbb_notification_manager
 	{
 		if (!$safe)
 		{
-			$item_type = preg_replace('#[^a-z_]#', '', $item_type);
+			$item_type = preg_replace('#[^a-z_-]#', '', $item_type);
+		}
+
+		if (strpos($item_type, 'ext_') === 0)
+		{
+			$item_type_ary = explode('-', substr($item_type, 4), 2);
+
+			return 'phpbb_ext_' . $item_type_ary[0] . '_notification_type_' . $item_type_ary[1];
 		}
 
 		return 'phpbb_notification_type_' . $item_type;
@@ -661,7 +658,7 @@ class phpbb_notification_manager
 	/**
 	* Helper to get the notifications item type class and set it up
 	*/
-	private function get_item_type_class($item_type, $data = array())
+	public function get_item_type_class($item_type, $data = array())
 	{
 		$item = new $item_type($this, $this->db, $this->cache, $this->template, $this->extension_manager, $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext);
 
@@ -673,7 +670,7 @@ class phpbb_notification_manager
 	/**
 	* Helper to get the notifications method class and set it up
 	*/
-	private function get_method_class($method_name)
+	public function get_method_class($method_name)
 	{
 		return new $method_name($this, $this->db, $this->cache, $this->template, $this->extension_manager, $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext);
 	}
@@ -693,15 +690,23 @@ class phpbb_notification_manager
 			->get_files();
 		foreach ($files as $file)
 		{
-			$class = substr($file, strrpos($file, '/'));
-			$class = substr($class, 1, (strpos($class, '.' . $this->php_ext) - 1));
+			$name = substr($file, strrpos($file, '/'));
+			$name = substr($name, 1, (strpos($name, '.' . $this->php_ext) - 1));
 
-			if ($class == 'interface' || $class == 'base')
+			if ($name == 'interface' || $name == 'base')
 			{
 				continue;
 			}
 
-			$subscription_files[$class] = $file;
+			if (!strpos($file, 'includes/')) // is an extension
+			{
+				$ext_name = substr($file, (strpos($file, 'ext/') + 4));
+				$ext_name = substr($ext_name, 0, strpos($ext_name, '/'));
+
+				$name = 'ext_' . $ext_name . '-' . $name;
+			}
+
+			$subscription_files[$name] = $file;
 		}
 
 		return $subscription_files;
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index 9f1db6d9f5..6410b1f519 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -50,7 +50,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	*/
 	protected $queue = array();
 
-	public function __construct(phpbb_notification_manager $notification_manager, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_notification_manager $notification_manager, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
 		$this->notification_manager = $notification_manager;
 		$this->db = $db;
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 31150477bb..9e31d57108 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -55,7 +55,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	private $data = array();
 
-	public function __construct(phpbb_notification_manager $notification_manager, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, phpbb_user $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_notification_manager $notification_manager, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
 		$this->notification_manager = $notification_manager;
 		$this->db = $db;
@@ -91,6 +91,11 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		$this->data[$name] = $value;
 	}
 
+	public function __toString()
+	{
+		return (!empty($this->data)) ? var_export($this->data, true) : static::get_item_type();
+	}
+
 	/**
 	* Get special data (only important for the classes that extend this)
 	*
diff --git a/phpBB/includes/notification/type/interface.php b/phpBB/includes/notification/type/interface.php
index c17f248080..56fad9fd80 100644
--- a/phpBB/includes/notification/type/interface.php
+++ b/phpBB/includes/notification/type/interface.php
@@ -43,6 +43,8 @@ interface phpbb_notification_type_interface
 
 	public function create_insert_array($type_data);
 
+	public function users_to_query();
+
 	public function get_load_special();
 
 	public function load_special($data, $notifications);
-- 
cgit v1.2.1


From 2d69707a88fdb618730243cbe65ebc055cf68bae Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Oct 2012 00:23:14 -0500
Subject: [ticket/11103] Remove extra line break in the header

Was introduced with ff136cc96a62147bc7468b716b86a30f12754e77

PHPBB3-11103
---
 phpBB/includes/notification/method/base.php           | 1 -
 phpBB/includes/notification/type/approve_post.php     | 1 -
 phpBB/includes/notification/type/approve_topic.php    | 1 -
 phpBB/includes/notification/type/base.php             | 1 -
 phpBB/includes/notification/type/bookmark.php         | 1 -
 phpBB/includes/notification/type/disapprove_post.php  | 1 -
 phpBB/includes/notification/type/disapprove_topic.php | 1 -
 phpBB/includes/notification/type/pm.php               | 1 -
 phpBB/includes/notification/type/post.php             | 1 -
 phpBB/includes/notification/type/post_in_queue.php    | 1 -
 phpBB/includes/notification/type/quote.php            | 1 -
 phpBB/includes/notification/type/topic.php            | 1 -
 phpBB/includes/notification/type/topic_in_queue.php   | 1 -
 13 files changed, 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index 6410b1f519..5457ca99b2 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index bbd2bccfc0..98dfe678c2 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 5006e3bbb8..496dc688ad 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 9e31d57108..2ba0dd3bf7 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index ee06a6d33b..6c42f1d860 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
index 6ef4de5cd9..d1f7dfa85d 100644
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ b/phpBB/includes/notification/type/disapprove_post.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
index 6f92c1de77..89c06b344f 100644
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ b/phpBB/includes/notification/type/disapprove_topic.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index a647106a53..9f9a3e2892 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index de224776db..d83ecf4fae 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 19c3ed9fc9..9c4f0ab8d3 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 0920cea428..48d8f24a25 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 621c0f484b..1c3d216b18 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index c549cb12a1..bee0ebbb22 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -7,7 +7,6 @@
 *
 */
 
-
 /**
 * @ignore
 */
-- 
cgit v1.2.1


From 2a81e4b48ee223d8538e960b6e8e6e1c3e1277b2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Oct 2012 12:06:36 +0200
Subject: [feature/soft-delete] Fix the get functions to match the new logic

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 138 +++++++++-------------------------
 1 file changed, 35 insertions(+), 103 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 8bc67a7fd2..112780224f 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -34,48 +34,14 @@ class phpbb_content_visibility
 	*/
 	static public function get_visibility_sql($mode, $forum_id, $table_alias = '')
 	{
-		global $auth, $db, $user;
+		global $auth;
 
-		$status_ary = array(ITEM_APPROVED);
 		if ($auth->acl_get('m_approve', $forum_id))
 		{
-			$status_ary[] = ITEM_UNAPPROVED;
+			return '1 = 1';
 		}
 
-		if ($auth->acl_get('m_restore', $forum_id))
-		{
-			$status_ary[] = ITEM_DELETED;
-
-			if (sizeof($status_ary) == 3)
-			{
-				// The user can see all types, so we simplify this to an empty string,
-				// as we don't need to restrict anything on the query.
-				return '1 = 1';
-			}
-		}
-
-		return $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
-
-		/**
-		* @todo: Commented out, because the performance is not the best
-		*
-			// If the user has m_restore, the rest of the function will not
-			// make more content visible, so we can return the query here.
-			return $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
-		}
-
-		$clause = $db->sql_in_set($table_alias . $mode . '_visibility', $status_ary);
-
-		// only allow the user to view deleted posts he himself made
-		if ($auth->acl_get('f_restore', $forum_id) && !$auth->acl_get('m_restore', $forum_id))
-		{
-			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
-			$clause = '(' . $clause . "
-				OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . "
-					AND $table_alias$poster_column = " . (int) $user->data['user_id'] . '))';
-		}*/
-
-		return $clause;
+		return $table_alias . $mode . '_visibility = ' . ITEM_APPROVED;
 	}
 
 	/**
@@ -91,46 +57,37 @@ class phpbb_content_visibility
 	*/
 	static public function get_forums_visibility_sql($mode, $forum_ids = array(), $table_alias = '')
 	{
-		global $auth, $db, $user;
+		global $auth, $db;
 
-		// users can always see approved posts
-		$where_sql = "(($table_alias{$mode}_visibility = " . ITEM_APPROVED . '
-				AND ' . $db->sql_in_set($table_alias . 'forum_id', $forum_ids) . ')';
+		$where_sql = '(';
 
-		// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
 		$approve_forums = array_intersect($forum_ids, array_keys($auth->acl_getf('m_approve', true)));
+
 		if (sizeof($approve_forums))
 		{
-			// users can view unapproved topics in certain forums. specify them.
-			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_UNAPPROVED . '
-				AND ' . $db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ')';
-		}
+			// Remove moderator forums from the rest
+			$forum_ids = array_diff($forum_ids, $approve_forums);
 
-		// this is exactly the same logic as for approve forums, above
-		$restore_forums = array_intersect($forum_ids, array_keys($auth->acl_getf('m_restore', true)));
-		if (sizeof($restore_forums))
-		{
-			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . '
-				AND ' . $db->sql_in_set($table_alias . 'forum_id', $restore_forums) . ')';
+			if (!sizeof($forum_ids))
+			{
+				// The user can see all posts/topics in all specified forums
+				return $db->sql_in_set($table_alias . 'forum_id', $approve_forums);
+			}
+			else
+			{
+				// Moderator can view all posts/topics in some forums
+				$where_sql .= $db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ' OR ';
+			}
 		}
-
-		/*
-		* @todo: Commented out, because the performance is not the best
-		*
-		// we also allow the user to view deleted posts he himself made
-		$user_restore_forums = array_diff(array_intersect($forum_ids, array_keys($auth->acl_getf('f_restore', true))), $restore_forums);
-		if (sizeof($user_restore_forums) && !sizeof($restore_forums))
+		else
 		{
-			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
-
-			// specify the poster ID, the visibility type, and the forums we're interested in
-			$where_sql .= " OR ($table_alias$poster_column = " . $user->data['user_id'] . "
-				AND $table_alias{$mode}_visibility = " . ITEM_DELETED . "
-				AND " . $db->sql_in_set($table_alias . 'forum_id', $user_restore_forums) . ')';
+			// The user is just a normal user
+			return "$table_alias{$mode}_visibility = " . ITEM_APPROVED . '
+				AND ' . $db->sql_in_set($table_alias . 'forum_id', $forum_ids, false, true);
 		}
-		*/
 
-		$where_sql .= ')';
+		$where_sql .= "($table_alias{$mode}_visibility = " . ITEM_APPROVED . '
+			AND ' . $db->sql_in_set($table_alias . 'forum_id', $forum_ids) . '))';
 
 		return $where_sql;
 	}
@@ -148,55 +105,30 @@ class phpbb_content_visibility
 	*/
 	static public function get_global_visibility_sql($mode, $exclude_forum_ids = array(), $table_alias = '')
 	{
-		global $auth, $db, $user;
+		global $auth, $db;
+
+		$where_sqls = array();
+
+		$approve_forums = array_diff(array_keys($auth->acl_getf('m_approve', true)), $exclude_forum_ids);
 
-		// users can always see approved posts
 		if (sizeof($exclude_forum_ids))
 		{
-			$where_sql = '((' . $db->sql_in_set($table_alias . 'forum_id', $exclude_forum_ids, true, true) . "
+			$where_sqls[] = '(' . $db->sql_in_set($table_alias . 'forum_id', $exclude_forum_ids, true) . "
 				AND $table_alias{$mode}_visibility = " . ITEM_APPROVED . ')';
 		}
 		else
 		{
-			$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
+			$where_sqls[] = "$table_alias{$mode}_visibility = " . ITEM_APPROVED;
 		}
 
-		// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
-		$approve_forums = array_diff(array_keys($auth->acl_getf('m_approve', true)), $exclude_forum_ids);
 		if (sizeof($approve_forums))
 		{
-			// users can view unapproved topics in certain forums. specify them.
-			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_UNAPPROVED . '
-				AND ' . $db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ')';
+			$where_sqls[] = $db->sql_in_set($table_alias . 'forum_id', $approve_forums);
+			return '(' . implode(' OR ', $where_sqls) . ')';
 		}
 
-		// this is exactly the same logic as for approve forums, above
-		$restore_forums = array_diff(array_keys($auth->acl_getf('m_restore', true)), $exclude_forum_ids);
-		if (sizeof($restore_forums))
-		{
-			$where_sql .= " OR ($table_alias{$mode}_visibility = " . ITEM_DELETED . '
-				AND ' . $db->sql_in_set($table_alias . 'forum_id', $restore_forums) . ')';
-		}
-
-		/*
-		* @todo: Commented out, because the performance is not the best
-		*
-		// we also allow the user to view deleted posts he himself made
-		$user_restore_forums = array_diff(array_keys($auth->acl_getf('f_restore', true)), $exclude_forum_ids);
-		if (sizeof($user_restore_forums) && !sizeof($restore_forums))
-		{
-			$poster_column = ($mode == 'topic') ? 'topic_poster' : 'poster_id';
-
-			// specify the poster ID, the visibility type, and the forums we're interested in
-			$where_sql .= " OR ($table_alias$poster_column = " . $user->data['user_id'] . "
-				AND $table_alias{$mode}_visibility = " . ITEM_DELETED . "
-				AND " . $db->sql_in_set($table_alias . 'forum_id', $user_restore_forums) . ')';
-		}
-		*/
-
-		$where_sql .= ')';
-
-		return $where_sql;
+		// There is only one element, so we just return that one
+		return $where_sqls[0];
 	}
 
 	/**
-- 
cgit v1.2.1


From 63d11c976b0bcef68ce4809c8c76124451df88ea Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Oct 2012 12:37:01 +0200
Subject: [feature/soft-delete] Fix sync('topic') to match the new logic

This also fixes set_post_visibility()

PHPBB3-9567
---
 phpBB/includes/content_visibility.php |  2 +-
 phpBB/includes/functions_admin.php    | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 112780224f..fbcdf27f08 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -212,7 +212,7 @@ class phpbb_content_visibility
 				update_post_information('forum', $forum_id, false);
 			}
 		}
-		else if (($is_starter || $is_latest) && $topic_id)
+		else if ($is_starter && $topic_id)
 		{
 			// ... so we need to use sync, if the first post is changed.
 			// The forum is resynced recursive by sync() itself.
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index bb8b02bbea..04c99b5e62 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1889,6 +1889,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				GROUP BY t.topic_id, t.post_visibility";
 			$result = $db->sql_query($sql);
 
+			$topic_firstlast_data = array();
 			while ($row = $db->sql_fetchrow($result))
 			{
 				$topic_id = (int) $row['topic_id'];
@@ -1911,10 +1912,19 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 					if ($row['post_visibility'] == ITEM_APPROVED)
 					{
+						$topic_firstlast_data[$topic_id]['visibility'] = ITEM_APPROVED;
 						$topic_data[$topic_id]['first_post_id'] = $row['first_post_id'];
 						$topic_data[$topic_id]['last_post_id'] = $row['last_post_id'];
 						$topic_data[$topic_id]['replies'] = $row['total_posts'] - 1;
 					}
+					else if (!isset($topic_firstlast_data[$topic_id]['visibility']) || $topic_firstlast_data[$topic_id]['visibility'] != ITEM_APPROVED)
+					{
+						// If there is no approved post, we take the min/max of the other visibilities
+						// for the last and first post info, because it is only visible to moderators anyway
+						$topic_data[$topic_id]['first_post_id'] = (!empty($topic_data[$topic_id]['first_post_id'])) ? min($topic_data[$topic_id]['first_post_id'], $row['first_post_id']) : $row['first_post_id'];
+						$topic_data[$topic_id]['last_post_id'] = max($topic_data[$topic_id]['last_post_id'], $row['last_post_id']);
+						$topic_firstlast_data[$topic_id]['visibility'] = $row['post_visibility'];
+					}
 				}
 			}
 			$db->sql_freeresult($result);
-- 
cgit v1.2.1


From bfa6a50a4ff2caf1589a1039c1037d4153223d63 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Oct 2012 13:12:36 +0200
Subject: [feature/soft-delete] Extend functionality for updating a hole topic

Limit the posts to a certain visibility and deletion time
This allows us to only restore posts, that were approved
when the topic got soft deleted. So previous soft deleted
and unapproved posts are still soft deleted/unapproved

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 37 ++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index fbcdf27f08..be08a5f536 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -162,18 +162,28 @@ class phpbb_content_visibility
 	}
 
 	/**
-	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
-	* @param $post_id - int - the post ID to act on
-	* @param $topic_id - int - forum where $post_id is found
-	* @param $forum_id - int - forum ID where $topic_id resides
-	* @param $is_starter - bool - is this the first post of the topic
-	* @param $is_latest - bool - is this the last post of the topic
+	* Change visibility status of one post or a hole topic
+	*
+	* @param $visibility	int		Element of {ITEM_APPROVED, ITEM_DELETED}
+	* @param $post_id		mixed	Post ID to act on, if it is empty,
+	*								all posts of topic_id will be modified
+	* @param $topic_id		int		Topic where $post_id is found
+	* @param $forum_id		int		Forum where $topic_id is found
+	* @param $is_starter	bool	Is this the first post of the topic changed?
+	* @param $is_latest		bool	Is this the last post of the topic changed?
+	* @param $limit_visibility	mixed	Limit updating per topic_id to a certain visibility
+	* @param $limit_delete_time	mixed	Limit updating per topic_id to a certain deletion time
 	* @return void
 	*/
-	static public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $user_id, $time, $reason, $is_starter, $is_latest)
+	static public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $user_id, $time, $reason, $is_starter, $is_latest, $limit_visibility = false, $limit_delete_time = false)
 	{
 		global $db;
 
+		if (!in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
+		{
+			return;
+		}
+
 		if ($post_id)
 		{
 			$where_sql = 'post_id = ' . (int) $post_id;
@@ -181,6 +191,19 @@ class phpbb_content_visibility
 		else if ($topic_id)
 		{
 			$where_sql = 'topic_id = ' . (int) $topic_id;
+
+			// Limit the posts to a certain visibility and deletion time
+			// This allows us to only restore posts, that were approved
+			// when the topic got soft deleted. So previous soft deleted
+			// and unapproved posts are still soft deleted/unapproved
+			if ($limit_visibility !== false)
+			{
+				$where_sql .= ' AND post_visibility = ' . (int) $limit_visibility;
+			}
+			if ($limit_delete_time !== false)
+			{
+				$where_sql .= ' AND post_delete_time = ' . (int) $limit_delete_time;
+			}
 		}
 		else
 		{
-- 
cgit v1.2.1


From 42bb97a95cf57074edf2a30f1b4f417cfce81d13 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Oct 2012 13:15:55 +0200
Subject: [feature/soft-delete] Make use of set_post_visibility() limits when
 applicable

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index be08a5f536..7bcabbdfd6 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -143,6 +143,24 @@ class phpbb_content_visibility
 	{
 		global $db;
 
+		if (in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
+		{
+			return;
+		}
+
+		$sql = 'SELECT topic_visibility, topic_delete_time
+			FROM ' . TOPICS_TABLE . '
+			WHERE topic_id = ' . (int) $topic_id;
+		$result = $db->sql_query($sql);
+		$original_topic_data = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		if (!$original_topic_data)
+		{
+			// The topic does not exist...
+			return;
+		}
+
 		$data = array(
 			'topic_visibility'		=> (int) $visibility,
 			'topic_delete_user'		=> (int) $user_id,
@@ -155,10 +173,16 @@ class phpbb_content_visibility
 			WHERE topic_id = ' . (int) $topic_id;
 		$db->sql_query($sql);
 
-		// If we're approving, disapproving, or deleteing a topic
-		// we also update all posts in that topic that need to be changed.
-		// However, we do not set the same reason for every post.
-		self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true);
+		// If we're restoring a topic we only restore posts, that were soft deleted through the topic soft deletion.
+		if ($original_topic_data['topic_delete_time'] && $original_topic_data['topic_visibility'] == ITEM_DELETED && $visibility == ITEM_APPROVED)
+		{
+			// Note, we do not set the same reason for every post.
+			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true, $original_topic_data['topic_visibility'], $original_topic_data['topic_delete_time']);
+		}
+		else
+		{
+			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true);
+		}
 	}
 
 	/**
-- 
cgit v1.2.1


From 92c5039af971722198ce634d719db6290d58c678 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Oct 2012 13:18:06 +0200
Subject: [feature/soft-delete] Allow forcing the set_visibility for all posts

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 7bcabbdfd6..4f5da25919 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -139,7 +139,7 @@ class phpbb_content_visibility
 	* @param $forum_id - int - forum ID where $topic_id resides
 	* @return void
 	*/
-	static public function set_topic_visibility($visibility, $topic_id, $forum_id, $user_id, $time, $reason)
+	static public function set_topic_visibility($visibility, $topic_id, $forum_id, $user_id, $time, $reason, $force_update_all = false)
 	{
 		global $db;
 
@@ -148,17 +148,20 @@ class phpbb_content_visibility
 			return;
 		}
 
-		$sql = 'SELECT topic_visibility, topic_delete_time
-			FROM ' . TOPICS_TABLE . '
-			WHERE topic_id = ' . (int) $topic_id;
-		$result = $db->sql_query($sql);
-		$original_topic_data = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		if (!$original_topic_data)
+		if (!$force_update_all && $visibility == ITEM_APPROVED)
 		{
-			// The topic does not exist...
-			return;
+			$sql = 'SELECT topic_visibility, topic_delete_time
+				FROM ' . TOPICS_TABLE . '
+				WHERE topic_id = ' . (int) $topic_id;
+			$result = $db->sql_query($sql);
+			$original_topic_data = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if (!$original_topic_data)
+			{
+				// The topic does not exist...
+				return;
+			}
 		}
 
 		$data = array(
@@ -174,7 +177,7 @@ class phpbb_content_visibility
 		$db->sql_query($sql);
 
 		// If we're restoring a topic we only restore posts, that were soft deleted through the topic soft deletion.
-		if ($original_topic_data['topic_delete_time'] && $original_topic_data['topic_visibility'] == ITEM_DELETED && $visibility == ITEM_APPROVED)
+		if (!$force_update_all && $original_topic_data['topic_delete_time'] && $original_topic_data['topic_visibility'] == ITEM_DELETED && $visibility == ITEM_APPROVED)
 		{
 			// Note, we do not set the same reason for every post.
 			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true, $original_topic_data['topic_visibility'], $original_topic_data['topic_delete_time']);
-- 
cgit v1.2.1


From 01a78907bd05fc51f62ebd169065277365c5d1f4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Oct 2012 13:30:59 +0200
Subject: [feature/soft-delete] Update set_topic_visibility() with some more
 logic

By default, when a soft deleted topic is restored. Only posts that were
approved at the time of soft deleting, are being restored. Same applies to
soft deleting. Only approved posts will be marked as soft deleted.

If you want to update all posts, use the force option.

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 4f5da25919..238e131f1d 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -132,11 +132,24 @@ class phpbb_content_visibility
 	}
 
 	/**
-	* Description: Allows approving (which is akin to undeleting), unapproving (!) or soft deleting an entire topic.
+	* Set topic visibility
+	*
+	* Allows approving (which is akin to undeleting/restore) or soft deleting an entire topic.
 	* Calls set_post_visibility as needed.
-	* @param $visibility - int - element of {ITEM_UNAPPROVED, ITEM_APPROVED, ITEM_DELETED}
-	* @param $topic_id - int - topic ID to act on
-	* @param $forum_id - int - forum ID where $topic_id resides
+	*
+	* Note: By default, when a soft deleted topic is restored. Only posts that
+	*		were approved at the time of soft deleting, are being restored.
+	*		Same applies to soft deleting. Only approved posts will be marked
+	*		as soft deleted.
+	*		If you want to update all posts, use the force option.
+	*
+	* @param $visibility	int		Element of {ITEM_APPROVED, ITEM_DELETED}
+	* @param $topic_id		mixed	Topic ID to act on
+	* @param $forum_id		int		Forum where $topic_id is found
+	* @param $user_id		int		User performing the action
+	* @param $time			int		Timestamp when the action is performed
+	* @param $reason		string	Reason why the visibilty was changed.
+	* @param $force_update_all	bool	Force to update all posts within the topic
 	* @return void
 	*/
 	static public function set_topic_visibility($visibility, $topic_id, $forum_id, $user_id, $time, $reason, $force_update_all = false)
@@ -164,6 +177,7 @@ class phpbb_content_visibility
 			}
 		}
 
+		// Note, we do not set a reason for the posts, just for the topic
 		$data = array(
 			'topic_visibility'		=> (int) $visibility,
 			'topic_delete_user'		=> (int) $user_id,
@@ -176,12 +190,16 @@ class phpbb_content_visibility
 			WHERE topic_id = ' . (int) $topic_id;
 		$db->sql_query($sql);
 
-		// If we're restoring a topic we only restore posts, that were soft deleted through the topic soft deletion.
 		if (!$force_update_all && $original_topic_data['topic_delete_time'] && $original_topic_data['topic_visibility'] == ITEM_DELETED && $visibility == ITEM_APPROVED)
 		{
-			// Note, we do not set the same reason for every post.
+			// If we're restoring a topic we only restore posts, that were soft deleted through the topic soft deletion.
 			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true, $original_topic_data['topic_visibility'], $original_topic_data['topic_delete_time']);
 		}
+		else if (!$force_update_all && $original_topic_data['topic_visibility'] == ITEM_APPROVED && $visibility == ITEM_DELETED)
+		{
+			// If we're soft deleting a topic we only approved posts are soft deleted.
+			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true, $original_topic_data['topic_visibility']);
+		}
 		else
 		{
 			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true);
-- 
cgit v1.2.1


From 7969cc7319002fdf24d041e8d298577cd04d9c4a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Oct 2012 13:31:47 +0200
Subject: [feature/soft-delete] Fix docs of set_post_visibility()

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 238e131f1d..325993bd2a 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -214,6 +214,9 @@ class phpbb_content_visibility
 	*								all posts of topic_id will be modified
 	* @param $topic_id		int		Topic where $post_id is found
 	* @param $forum_id		int		Forum where $topic_id is found
+	* @param $user_id		int		User performing the action
+	* @param $time			int		Timestamp when the action is performed
+	* @param $reason		string	Reason why the visibilty was changed.
 	* @param $is_starter	bool	Is this the first post of the topic changed?
 	* @param $is_latest		bool	Is this the last post of the topic changed?
 	* @param $limit_visibility	mixed	Limit updating per topic_id to a certain visibility
-- 
cgit v1.2.1


From 526721c7db9ddc8fc39fd84409042deb470a1736 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Oct 2012 14:26:52 +0200
Subject: [feature/soft-delete] Fix set_topic_visibility() so it passes the
 tests

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 325993bd2a..a0bb3e9fd4 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -156,12 +156,12 @@ class phpbb_content_visibility
 	{
 		global $db;
 
-		if (in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
+		if (!in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
 		{
 			return;
 		}
 
-		if (!$force_update_all && $visibility == ITEM_APPROVED)
+		if (!$force_update_all)
 		{
 			$sql = 'SELECT topic_visibility, topic_delete_time
 				FROM ' . TOPICS_TABLE . '
-- 
cgit v1.2.1


From 05f236675528b5af68ba5f0ff140eb8c51ab92b1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Oct 2012 14:42:11 +0200
Subject: [feature/soft-delete] Update docs of can_soft_delete and remove
 can_restore

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index a0bb3e9fd4..f2915a5143 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -293,9 +293,10 @@ class phpbb_content_visibility
 
 	/**
 	* Can the current logged-in user soft-delete posts?
-	* @param $forum_id - int - the forum ID whose permissions to check
-	* @param $poster_id - int - the poster ID of the post in question
-	* @param $post_locked - bool - is the post locked?
+	*
+	* @param $forum_id		int		Forum ID whose permissions to check
+	* @param $poster_id		int		Poster ID of the post in question
+	* @param $post_locked	bool	Is the post locked?
 	* @return bool
 	*/
 	static function can_soft_delete($forum_id, $poster_id, $post_locked)
@@ -310,28 +311,7 @@ class phpbb_content_visibility
 		{
 			return true;
 		}
-		return false;
-	}
 
-	/**
-	* Can the current logged-in user restore soft-deleted posts?
-	* @param $forum_id - int - the forum ID whose permissions to check
-	* @param $poster_id - int - the poster ID of the post in question
-	* @param $post_locked - bool - is the post locked?
-	* @return bool
-	*/
-	public function can_restore($forum_id, $poster_id, $post_locked)
-	{
-		global $auth, $user;
-
-		if ($auth->acl_get('m_restore', $forum_id))
-		{
-			return true;
-		}
-		else if ($auth->acl_get('f_restore', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
-		{
-			return true;
-		}
 		return false;
 	}
 
-- 
cgit v1.2.1


From c22d5bd37c26fb5e007519a0ea93001ecd060a1c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Oct 2012 17:00:14 +0200
Subject: [feature/soft-delete] Clean the code of hide_post() and rely on
 postcount

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 41 ++++++++++-------------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index f2915a5143..2b79868930 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -316,8 +316,7 @@ class phpbb_content_visibility
 	}
 
 	/**
-	* Do the required math to hide a complete topic (going from approved to
-	* unapproved or from approved to deleted)
+	* Do the required math to hide a complete topic (going from approved to deleted)
 	* @param $topic_id - int - the topic to act on
 	* @param $forum_id - int - the forum where the topic resides
 	* @param $topic_row - array - data about the topic, may be empty at call time
@@ -326,7 +325,7 @@ class phpbb_content_visibility
 	*/
 	static public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data)
 	{
-		global $auth, $config, $db;
+		global $db;
 
 		// Do we need to grab some topic informations?
 		if (!sizeof($topic_row))
@@ -339,9 +338,6 @@ class phpbb_content_visibility
 			$db->sql_freeresult($result);
 		}
 
-		// If this is the only post remaining we do not need to decrement topic_replies.
-		// Also do not decrement if first post - then the topic_replies will not be adjusted if approving the topic again.
-
 		// If this is an edited topic or the first post the topic gets completely disapproved later on...
 		$sql_data[FORUMS_TABLE] = 'forum_topics = forum_topics - 1';
 		$sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
@@ -363,44 +359,31 @@ class phpbb_content_visibility
 	}
 
 	/**
-	* Do the required math to hide a single post (going from approved to
-	* unapproved or from approved to deleted)
+	* Do the required math to hide a single post (going from approved to deleted)
 	* Notably, we do _not_ need the post ID to do this operation. We're only changing statistic caches
 	* @param $forum_id - int - the forum where the topic resides
 	* @param $current_time - int - passed for consistency instead of calling time() internally
-	* @param $topic_row - array - contains information from the topics table about given topic
+	* @param $data - array - contains information from the topics table about given topic
 	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
 	* @return void
 	*/
-	static public function hide_post($forum_id, $current_time, $topic_row, &$sql_data)
+	//static public function remove_post_from_postcount($forum_id, $current_time, $data, &$sql_data)
+	static public function hide_post($forum_id, $current_time, $data, &$sql_data)
 	{
-		global $auth, $config, $db;
-
-		// initialize the array if needed (php throws E_NOTICE when .= is used
-		// on a non-existing array element)
-		if (empty($sql_data[TOPICS_TABLE]))
-		{
-			$sql_data[TOPICS_TABLE] = '';
-		}
-
-		if ($topic_row['topic_replies'] > 0)
+		$sql_data[TOPICS_TABLE] = 'topic_last_view_time = ' . $current_time;
+		if ($data['topic_replies'] > 0)
 		{
-			$sql_data[TOPICS_TABLE] = 'topic_replies = topic_replies - 1,';
+			$sql_data[TOPICS_TABLE] .= ', topic_replies = topic_replies - 1,';
 		}
-		$sql_data[TOPICS_TABLE] .= ' topic_last_view_time = ' . $current_time;
 
 		$sql_data[FORUMS_TABLE] = 'forum_posts = forum_posts - 1';
 
-		set_config_count('num_posts', -1, true);
-
-		/**
-		* @todo: this is wrong, it should rely on post_postcount
-		*
-		if ($auth->acl_get('f_postcount', $forum_id))
+		if ($data['post_postcount'])
 		{
 			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
 		}
-		*/
+
+		set_config_count('num_posts', -1, true);
 	}
 
 	/**
-- 
cgit v1.2.1


From 3088855aa6c9bed9a15f3bd4ab1113d37be916a5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 5 Oct 2012 17:46:29 +0200
Subject: [feature/soft-delete] Fix SQL error in search

PHPBB3-9567
---
 phpBB/includes/search/fulltext_native.php   | 1 +
 phpBB/includes/search/fulltext_postgres.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 56332e872b..0e520b63a2 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -857,6 +857,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
 		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
 		$sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : '';
+		$post_visibility = ($post_visibility) ? ' AND ' . $post_visibility : '';
 
 		// Build sql strings for sorting
 		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index fc2050e76c..dfe90db0f0 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -243,7 +243,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
 	{
 		// No keywords? No posts.
 		if (!$this->search_query)
-- 
cgit v1.2.1


From 0bab8ff777bcb82361b75441c085ee2e510db5cc Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Oct 2012 13:43:03 -0500
Subject: [ticket/11103] ACP option to enable/disable notifications output in
 header

PHPBB3-11103
---
 phpBB/includes/acp/acp_board.php |  1 +
 phpBB/includes/functions.php     | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 322e1c55d8..aed27d7122 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -314,6 +314,7 @@ class acp_board
 						'load_online_time'	=> array('lang' => 'ONLINE_LENGTH',		'validate' => 'int:0',	'type' => 'text:4:3', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
 
 						'legend2'				=> 'GENERAL_OPTIONS',
+						'load_notifications'	=> array('lang' => 'LOAD_NOTIFICATIONS',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'load_db_track'			=> array('lang' => 'YES_POST_MARKING',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'load_db_lastread'		=> array('lang' => 'YES_READ_MARKING',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'load_anon_lastread'	=> array('lang' => 'YES_ANON_READ_MARKING',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9513c6919f..795bfb77bf 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4993,13 +4993,17 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 	}
 
 	// Output the notifications
-	$notifications = $phpbb_notifications->load_notifications(array(
-		'all_unread'	=> true,
-		'limit'			=> 5,
-	));
-	foreach ($notifications['notifications'] as $notification)
+	if ($config['load_notifications'])
 	{
-		$template->assign_block_vars('notifications', $notification->prepare_for_display());
+		$notifications = $phpbb_notifications->load_notifications(array(
+			'all_unread'	=> true,
+			'limit'			=> 5,
+		));
+
+		foreach ($notifications['notifications'] as $notification)
+		{
+			$template->assign_block_vars('notifications', $notification->prepare_for_display());
+		}
 	}
 
 	// The following assigns all _common_ variables that may be used at any point in a template.
@@ -5016,8 +5020,9 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'RECORD_USERS'					=> $l_online_record,
 		'PRIVATE_MESSAGE_INFO'			=> $l_privmsgs_text,
 		'PRIVATE_MESSAGE_INFO_UNREAD'	=> $l_privmsgs_text_unread,
-		'UNREAD_NOTIFICATIONS_COUNT'	=> $notifications['unread_count'],
-		'NOTIFICATIONS_COUNT'			=> $user->lang('NOTIFICATIONS_COUNT', $notifications['unread_count']),
+		'UNREAD_NOTIFICATIONS_COUNT'	=> ($config['load_notifications']) ? $notifications['unread_count'] : '',
+		'NOTIFICATIONS_COUNT'			=> ($config['load_notifications']) ? $user->lang('NOTIFICATIONS_COUNT', $notifications['unread_count']) : '',
+		'S_NOTIFICATIONS_DISPLAY'		=> $config['load_notifications'],
 
 		'S_USER_NEW_PRIVMSG'			=> $user->data['user_new_privmsg'],
 		'S_USER_UNREAD_PRIVMSG'			=> $user->data['user_unread_privmsg'],
-- 
cgit v1.2.1


From 54629aa87d3ef6f6fcb8ce8708e85ac039b98fa3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Oct 2012 13:46:52 -0500
Subject: [ticket/11103] Bug fixing

PHPBB3-11103
---
 phpBB/includes/notification/type/quote.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 48d8f24a25..1eea8f1066 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -168,7 +168,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		// marked as read
 
 		// Add the necessary notifications
-		$service->add_notifications_for_users(self::get_item_type(), $post, $add_notifications);
+		$this->notification_manager->add_notifications_for_users(self::get_item_type(), $post, $add_notifications);
 
 		// Remove the necessary notifications
 		if (!empty($remove_notifications))
-- 
cgit v1.2.1


From 868554cbaeaf7a23db2af4c97aa07c77e6ea98b0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Oct 2012 13:50:59 -0500
Subject: [ticket/11103] trigger_error message when preferences updated in UCP

PHPBB3-11103
---
 phpBB/includes/ucp/ucp_notifications.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 9ea44f49bf..2cb14d05c9 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -64,6 +64,10 @@ class ucp_notifications
 					}
 				}
 			}
+
+			meta_refresh(3, $this->u_action);
+			$message = $user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+			trigger_error($message);
 		}
 
 		// todo include language files for extensions?
-- 
cgit v1.2.1


From 948bd69495175db6967c0f5e99c3e0ba31e1882a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Oct 2012 13:54:27 -0500
Subject: [ticket/11103] Move UCP Notification Options to Board Preferences tab

Also rename to "Edit notification options" for consistency

PHPBB3-11103
---
 phpBB/includes/ucp/info/ucp_notifications.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/info/ucp_notifications.php b/phpBB/includes/ucp/info/ucp_notifications.php
index 4bc9ae2cea..3c7ea80bee 100644
--- a/phpBB/includes/ucp/info/ucp_notifications.php
+++ b/phpBB/includes/ucp/info/ucp_notifications.php
@@ -19,7 +19,7 @@ class ucp_notifications_info
 			'title'		=> 'UCP_NOTIFICATION_OPTIONS',
 			'version'	=> '1.0.0',
 			'modes'		=> array(
-				'notification_options'		=> array('title' => 'UCP_NOTIFICATION_OPTIONS', 'auth' => '', 'cat' => array('UCP_MAIN')),
+				'notification_options'		=> array('title' => 'UCP_NOTIFICATION_OPTIONS', 'auth' => '', 'cat' => array('UCP_PREFS')),
 			),
 		);
 	}
-- 
cgit v1.2.1


From bafb5b0ecad7266c9641624bae2de2f3c7efe500 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Oct 2012 18:12:48 -0500
Subject: [ticket/11103] Starting work on combining notifications

Just for posts currently and not yet outputted.

PHPBB3-11103
---
 phpBB/includes/notification/manager.php   |  6 ++++
 phpBB/includes/notification/type/base.php |  2 +-
 phpBB/includes/notification/type/post.php | 58 +++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index c1ae61e08a..c5fd41c901 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -660,6 +660,12 @@ class phpbb_notification_manager
 	*/
 	public function get_item_type_class($item_type, $data = array())
 	{
+		if (!strpos($item_type, 'notification_type_'))
+		{
+			$item_class = $this->get_item_type_class_name($item_type);
+			$item_type = $item_class;
+		}
+
 		$item = new $item_type($this, $this->db, $this->cache, $this->template, $this->extension_manager, $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext);
 
 		$item->set_initial_data($data);
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 2ba0dd3bf7..b72875fb85 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -104,7 +104,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	protected function get_data($name)
 	{
-		return (isset($this->data['data'][$name])) ? $this->data['data'][$name] : null;
+		return ($name === false) ? $this->data['data'] : ((isset($this->data['data'][$name])) ? $this->data['data'][$name] : null);
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index d83ecf4fae..65b0c1adf2 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -132,6 +132,28 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		}
 		$this->db->sql_freeresult($result);
 
+		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
+		$update_notifications = array();
+		$sql = 'SELECT *
+			FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
+				AND unread = 1';
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			// Do not create a new notification
+			unset($notify_users[$row['user_id']]);
+
+			$notification = $this->notification_manager->get_item_type_class(self::get_item_type(), $row);
+			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
+				WHERE notification_id = ' . $row['notification_id'];
+				echo $sql;
+			$this->db->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+
 		return $notify_users;
 	}
 
@@ -234,4 +256,40 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 
 		return parent::create_insert_array($post);
 	}
+
+	/**
+	* Add responders to the notification
+	*
+	* @param mixed $post
+	*/
+	public function add_responders($post)
+	{
+		// Do not add them as a responder if they were the original poster that created the notification
+		if ($this->get_data('poster_id') == $post['poster_id'])
+		{
+			return array('data' => serialize($this->get_data(false)));
+		}
+
+		$responders = $this->get_data('responders');
+
+		$responders = ($responders === null) ? array() : $responders;
+
+		foreach ($responders as $responder)
+		{
+			// Do not add them as a responder multiple times
+			if ($responder['poster_id'] == $post['poster_id'])
+			{
+				return array('data' => serialize($this->get_data(false)));
+			}
+		}
+
+		$responders[] = array(
+			'poster_id'		=> $post['poster_id'],
+			'username'		=> (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''),
+		);
+
+		$this->set_data('responders', $responders);
+
+		return array('data' => serialize($this->get_data(false)));
+	}
 }
-- 
cgit v1.2.1


From 009bd698fb46a529f09d9d9a63748e63eec62895 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Oct 2012 03:59:49 +0200
Subject: [feature/soft-delete] Update and simplify the logic on delete_post()

Todo: delete_topic case

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 25 +++++------
 phpBB/includes/functions_posting.php  | 80 +++++++++++++++++------------------
 2 files changed, 48 insertions(+), 57 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 2b79868930..f8b632bbe8 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -359,28 +359,22 @@ class phpbb_content_visibility
 	}
 
 	/**
-	* Do the required math to hide a single post (going from approved to deleted)
-	* Notably, we do _not_ need the post ID to do this operation. We're only changing statistic caches
-	* @param $forum_id - int - the forum where the topic resides
-	* @param $current_time - int - passed for consistency instead of calling time() internally
-	* @param $data - array - contains information from the topics table about given topic
-	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
+	* Remove post from topic and forum statistics
+	*
+	* @param $forum_id		int		Forum where the topic is found
+	* @param $data			array	Contains information from the topics table about given topic
+	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
 	* @return void
 	*/
-	//static public function remove_post_from_postcount($forum_id, $current_time, $data, &$sql_data)
-	static public function hide_post($forum_id, $current_time, $data, &$sql_data)
+	static public function remove_post_from_postcount($forum_id, $data, &$sql_data)
 	{
-		$sql_data[TOPICS_TABLE] = 'topic_last_view_time = ' . $current_time;
-		if ($data['topic_replies'] > 0)
-		{
-			$sql_data[TOPICS_TABLE] .= ', topic_replies = topic_replies - 1,';
-		}
+		$sql_data[TOPICS_TABLE] = ($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies = topic_replies - 1';
 
-		$sql_data[FORUMS_TABLE] = 'forum_posts = forum_posts - 1';
+		$sql_data[FORUMS_TABLE] = ($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts - 1';
 
 		if ($data['post_postcount'])
 		{
-			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
+			$sql_data[USERS_TABLE] = ($sql_data[USERS_TABLE]) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts - 1';
 		}
 
 		set_config_count('num_posts', -1, true);
@@ -539,6 +533,7 @@ class phpbb_content_visibility
 
 		if ($total_topics)
 		{
+			//@todo: plurals!
 			$success_msg = ($total_topics == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS';
 		}
 		else
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 38f173330a..7738fcbc4e 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1422,14 +1422,10 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 	{
 		$post_mode = 'delete_topic';
 	}
-	else if ($data['topic_first_post_id'] == $post_id && !$is_soft)
+	else if ($data['topic_first_post_id'] == $post_id)
 	{
 		$post_mode = 'delete_first_post';
 	}
-	else if ($data['topic_first_post_id'] == $post_id && $is_soft)
-	{
-		$post_mode = 'delete_topic';
-	}
 	else if ($data['topic_last_post_id'] == $post_id)
 	{
 		$post_mode = 'delete_last_post';
@@ -1464,10 +1460,10 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 		$db->sql_freeresult($result);
 	}
 
+	// (Soft) delete the post
 	if ($is_soft)
 	{
 		phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
-		phpbb_content_visibility::hide_post($forum_id, time(), $data, $sql_data);
 	}
 	else
 	{
@@ -1535,53 +1531,45 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 			$row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
 
-			$sql_data[FORUMS_TABLE] = ($data['post_visibility'] == ITEM_APPROVED) ? 'forum_posts = forum_posts - 1' : '';
-
-			$sql_data[TOPICS_TABLE] = 'topic_poster = ' . intval($row['poster_id']) . ', topic_first_post_id = ' . intval($row['post_id']) . ", topic_first_poster_colour = '" . $db->sql_escape($row['user_colour']) . "', topic_first_poster_name = '" . (($row['poster_id'] == ANONYMOUS) ? $db->sql_escape($row['post_username']) : $db->sql_escape($row['username'])) . "', topic_time = " . (int) $row['post_time'];
-
-			// Decrementing topic_replies here is fine because this case only happens if there is more than one post within the topic - basically removing one "reply"
-			$sql_data[TOPICS_TABLE] .= ', topic_replies_real = topic_replies_real - 1' . (($data['post_visibility'] == ITEM_APPROVED) ? ', topic_replies = topic_replies - 1' : '');
-
 			$next_post_id = (int) $row['post_id'];
+
+			$sql_data[TOPICS_TABLE] = $db->sql_build_array('UPDATE', array(
+				'topic_poster'				=> (int) $row['poster_id'],
+				'topic_first_post_id'		=> (int) $row['post_id']
+				'topic_first_poster_colour'	=> $row['user_colour'],
+				'topic_first_poster_name'	=> ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username'],
+				'topic_time'				=> (int) $row['post_time'],
+			));
 		break;
 
 		case 'delete_last_post':
-			if ($is_soft)
+			if (!$is_soft)
 			{
-				phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason, false, true);
-				phpbb_content_visibility::hide_post($forum_id, time(), $data, $sql_data);
-			}
-			else
-			{
-				$sql_data[FORUMS_TABLE] = ($data['post_visibility'] == ITEM_APPROVED) ? 'forum_posts = forum_posts - 1' : '';
-
 				$update_sql = update_post_information('forum', $forum_id, true);
 				if (sizeof($update_sql))
 				{
-					$sql_data[FORUMS_TABLE] .= ($sql_data[FORUMS_TABLE]) ? ', ' : '';
-					$sql_data[FORUMS_TABLE] .= implode(', ', $update_sql[$forum_id]);
+					$sql_data[FORUMS_TABLE] = ($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . implode(', ', $update_sql[$forum_id]);
 				}
 
-				$sql_data[TOPICS_TABLE] = 'topic_bumped = 0, topic_bumper = 0, topic_replies_real = topic_replies_real - 1' . (($data['post_visibility'] == ITEM_APPROVED) ? ', topic_replies = topic_replies - 1' : '');
-			}
+				$sql_data[TOPICS_TABLE] = ($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_bumped = 0, topic_bumper = 0';
 
-			$update_sql = update_post_information('topic', $topic_id, true);
-			if (sizeof($update_sql) && !$is_soft)
-			{
-				$sql_data[TOPICS_TABLE] .= ', ' . implode(', ', $update_sql[$topic_id]);
-				$next_post_id = (int) str_replace('topic_last_post_id = ', '', $update_sql[$topic_id][0]);
+				$update_sql = update_post_information('topic', $topic_id, true);
+				if (!empty($update_sql))
+				{
+					$sql_data[TOPICS_TABLE] .= ', ' . implode(', ', $update_sql[$topic_id]);
+					$next_post_id = (int) str_replace('topic_last_post_id = ', '', $update_sql[$topic_id][0]);
+				}
 			}
-			else
+
+			if (!$next_post_id)
 			{
 				$sql = 'SELECT MAX(post_id) as last_post_id
 					FROM ' . POSTS_TABLE . "
 					WHERE topic_id = $topic_id
 						AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id);
 				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
+				$next_post_id = (int) $db->sql_fetchfield('last_post_id');
 				$db->sql_freeresult($result);
-
-				$next_post_id = (int) $row['last_post_id'];
 			}
 		break;
 
@@ -1593,14 +1581,22 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 					AND post_time > ' . $data['post_time'] . '
 				ORDER BY post_time ASC';
 			$result = $db->sql_query_limit($sql, 1);
-			$row = $db->sql_fetchrow($result);
+			$next_post_id = (int) $db->sql_fetchfield('post_id');
 			$db->sql_freeresult($result);
+		break;
+	}
 
-			$sql_data[FORUMS_TABLE] = ($data['post_visibility'] == ITEM_APPROVED) ? 'forum_posts = forum_posts - 1' : '';
+	if (($post_mode == 'delete') || ($post_mode == 'delete_last_post') || ($post_mode == 'delete_first_post'))
+	{
+		if ($data['post_visibility'] == ITEM_APPROVED)
+		{
+			phpbb_content_visibility::remove_post_from_postcount($forum_id, $data, $sql_data);
+		}
 
-			$sql_data[TOPICS_TABLE] = 'topic_replies_real = topic_replies_real - 1' . (($data['post_visibility'] == ITEM_APPROVED) ? ', topic_replies = topic_replies - 1' : '');
-			$next_post_id = (int) $row['post_id'];
-		break;
+		if (!$is_soft)
+		{
+			$sql_data[TOPICS_TABLE] .= ', topic_replies_real = topic_replies_real - 1';
+		}
 	}
 
 	if (($post_mode == 'delete') || ($post_mode == 'delete_last_post') || ($post_mode == 'delete_first_post'))
@@ -1625,7 +1621,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 	$where_sql = array(
 		FORUMS_TABLE	=> "forum_id = $forum_id",
 		TOPICS_TABLE	=> "topic_id = $topic_id",
-		USERS_TABLE		=> 'user_id = ' . $data['poster_id']
+		USERS_TABLE		=> 'user_id = ' . $data['poster_id'],
 	);
 
 	foreach ($sql_data as $table => $update_sql)
@@ -1960,7 +1956,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			// Correctly set back the topic replies and forum posts... but only if the post was approved before.
 			if (!$post_approval && $data['post_visibility'] == ITEM_APPROVED)
 			{
-				//phpbb_content_visibility::hide_post($forum_id, $current_time, $sql_data);
+				//phpbb_content_visibility::remove_post_from_postcount($forum_id, $current_time, $sql_data);
 				// ^^ hide_post SQL is identical, except that it does not include the ['stat'] sub-array
 				$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1';
@@ -2302,7 +2298,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			}
 		}
 	}
-	else if (!$data['post_visibility'] == ITEM_APPROVED && ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies'])))
+	else if ($data['post_visibility'] != ITEM_APPROVED && ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies'])))
 	{
 		// like having the rug pulled from under us
 		$sql = 'SELECT MAX(post_id) as last_post_id
-- 
cgit v1.2.1


From 44005f338e227c10a21270456d181d56749d3f29 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Oct 2012 16:36:38 +0200
Subject: [feature/soft-delete] Fix delete_post() function

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 23 +++++++++--------
 phpBB/includes/functions_posting.php  | 48 +++++++++++++++++++++++------------
 2 files changed, 44 insertions(+), 27 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index f8b632bbe8..54c580cd40 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -316,14 +316,15 @@ class phpbb_content_visibility
 	}
 
 	/**
-	* Do the required math to hide a complete topic (going from approved to deleted)
-	* @param $topic_id - int - the topic to act on
-	* @param $forum_id - int - the forum where the topic resides
-	* @param $topic_row - array - data about the topic, may be empty at call time
-	* @param $sql_data - array - populated with the SQL changes, may be empty at call time
+	* Remove topic from forum statistics
+	*
+	* @param $topic_id		int		The topic to act on
+	* @param $forum_id		int		Forum where the topic is found
+	* @param $topic_row		array	Contains information from the topic, may be empty at call time
+	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
 	* @return void
 	*/
-	static public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data)
+	static public function remove_topic_from_statistic($topic_id, $forum_id, &$topic_row, &$sql_data)
 	{
 		global $db;
 
@@ -339,7 +340,7 @@ class phpbb_content_visibility
 		}
 
 		// If this is an edited topic or the first post the topic gets completely disapproved later on...
-		$sql_data[FORUMS_TABLE] = 'forum_topics = forum_topics - 1';
+		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_topics = forum_topics - 1';
 		$sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
 
 		set_config_count('num_topics', -1, true);
@@ -366,15 +367,15 @@ class phpbb_content_visibility
 	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
 	* @return void
 	*/
-	static public function remove_post_from_postcount($forum_id, $data, &$sql_data)
+	static public function remove_post_from_statistic($forum_id, $data, &$sql_data)
 	{
-		$sql_data[TOPICS_TABLE] = ($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies = topic_replies - 1';
+		$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies = topic_replies - 1';
 
-		$sql_data[FORUMS_TABLE] = ($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts - 1';
+		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts - 1';
 
 		if ($data['post_postcount'])
 		{
-			$sql_data[USERS_TABLE] = ($sql_data[USERS_TABLE]) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts - 1';
+			$sql_data[USERS_TABLE] = (($sql_data[USERS_TABLE]) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts - 1';
 		}
 
 		set_config_count('num_posts', -1, true);
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 7738fcbc4e..d9fbd84ce1 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1490,7 +1490,11 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 			{
 				// counting is fun! we only have to do sizeof($forum_ids) number of queries,
 				// even if the topic is moved back to where its shadow lives (we count how many times it is in a forum)
-				$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_topics_real = forum_topics_real - ' . $topic_count . ', forum_topics = forum_topics - ' . $topic_count . ' WHERE forum_id = ' . $updated_forum);
+				$sql = 'UPDATE ' . FORUMS_TABLE . '
+					SET forum_topics_real = forum_topics_real - ' . $topic_count . ',
+						forum_topics = forum_topics - ' . $topic_count . '
+					WHERE forum_id = ' . $updated_forum;
+				$db->sql_query($sql);
 				update_post_information('forum', $updated_forum);
 			}
 
@@ -1498,18 +1502,15 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 			{
 				$topic_row = array();
 				phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason);
-				phpbb_content_visibility::hide_topic($topic_id, $forum_id, $topic_row, $sql_data);
+				phpbb_content_visibility::remove_topic_from_statistic($topic_id, $forum_id, $topic_row, $sql_data);
 			}
 			else
 			{
 				delete_topics('topic_id', array($topic_id), false);
 
 
-				if ($data['topic_type'] != POST_GLOBAL)
-				{
-					$sql_data[FORUMS_TABLE] .= 'forum_topics_real = forum_topics_real - 1';
-					$sql_data[FORUMS_TABLE] .= ($data['topic_visibility'] == ITEM_APPROVED) ? ', forum_posts = forum_posts - 1, forum_topics = forum_topics - 1' : '';
-				}
+				$sql_data[FORUMS_TABLE] .= 'forum_topics_real = forum_topics_real - 1';
+				$sql_data[FORUMS_TABLE] .= ($data['topic_visibility'] == ITEM_APPROVED) ? ', forum_posts = forum_posts - 1, forum_topics = forum_topics - 1' : '';
 
 				$update_sql = update_post_information('forum', $forum_id, true);
 				if (sizeof($update_sql))
@@ -1526,16 +1527,30 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
 				WHERE p.topic_id = $topic_id
 					AND p.poster_id = u.user_id
-				ORDER BY p.post_time ASC";
+					AND p.post_visibility = " . ITEM_APPROVED . '
+				ORDER BY p.post_time ASC';
 			$result = $db->sql_query_limit($sql, 1);
 			$row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
 
+			if (!$row)
+			{
+				// No approved post, so the first is a not-approved post (unapproved or soft deleted)
+				$sql = 'SELECT p.post_id, p.poster_id, p.post_time, p.post_username, u.username, u.user_colour
+					FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
+					WHERE p.topic_id = $topic_id
+						AND p.poster_id = u.user_id
+					ORDER BY p.post_time ASC";
+				$result = $db->sql_query_limit($sql, 1);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+			}
+
 			$next_post_id = (int) $row['post_id'];
 
 			$sql_data[TOPICS_TABLE] = $db->sql_build_array('UPDATE', array(
 				'topic_poster'				=> (int) $row['poster_id'],
-				'topic_first_post_id'		=> (int) $row['post_id']
+				'topic_first_post_id'		=> (int) $row['post_id'],
 				'topic_first_poster_colour'	=> $row['user_colour'],
 				'topic_first_poster_name'	=> ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username'],
 				'topic_time'				=> (int) $row['post_time'],
@@ -1545,13 +1560,14 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 		case 'delete_last_post':
 			if (!$is_soft)
 			{
+				// Update last post information when hard deleting. Soft delete already did that by itself.
 				$update_sql = update_post_information('forum', $forum_id, true);
 				if (sizeof($update_sql))
 				{
-					$sql_data[FORUMS_TABLE] = ($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . implode(', ', $update_sql[$forum_id]);
+					$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . implode(', ', $update_sql[$forum_id]);
 				}
 
-				$sql_data[TOPICS_TABLE] = ($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_bumped = 0, topic_bumper = 0';
+				$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_bumped = 0, topic_bumper = 0';
 
 				$update_sql = update_post_information('topic', $topic_id, true);
 				if (!empty($update_sql))
@@ -1586,11 +1602,11 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 		break;
 	}
 
-	if (($post_mode == 'delete') || ($post_mode == 'delete_last_post') || ($post_mode == 'delete_first_post'))
+	if (($post_mode == 'delete') || ($post_mode == 'delete_last_post') || ($post_mode == 'delete_first_post' && !$is_soft))
 	{
 		if ($data['post_visibility'] == ITEM_APPROVED)
 		{
-			phpbb_content_visibility::remove_post_from_postcount($forum_id, $data, $sql_data);
+			phpbb_content_visibility::remove_post_from_statistic($forum_id, $data, $sql_data);
 		}
 
 		if (!$is_soft)
@@ -1945,7 +1961,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			// Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved
 			if (!$post_approval && $data['topic_visibility'] == ITEM_APPROVED)
 			{
-				phpbb_content_visibility::hide_topic($data['topic_id'], $data['forum_id'], $topic_row, $sql_data);
+				phpbb_content_visibility::remove_topic_from_statistic($data['topic_id'], $data['forum_id'], $topic_row, $sql_data);
 			}
 
 		break;
@@ -1956,8 +1972,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			// Correctly set back the topic replies and forum posts... but only if the post was approved before.
 			if (!$post_approval && $data['post_visibility'] == ITEM_APPROVED)
 			{
-				//phpbb_content_visibility::remove_post_from_postcount($forum_id, $current_time, $sql_data);
-				// ^^ hide_post SQL is identical, except that it does not include the ['stat'] sub-array
+				//phpbb_content_visibility::remove_post_from_statistic($forum_id, $current_time, $sql_data);
+				// ^^ remove_post_from_statistic SQL is identical, except that it does not include the ['stat'] sub-array
 				$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1';
 
-- 
cgit v1.2.1


From 25804eb8e8b17196116e233b2c8ad3b444cfb5ae Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Oct 2012 19:56:52 +0200
Subject: [feature/soft-delete] Add test case for (soft)deleting the only post
 + fix

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 2 +-
 phpBB/includes/functions_posting.php  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 54c580cd40..0d08cb83b6 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -416,7 +416,7 @@ class phpbb_content_visibility
 				$forum_id_list[$post_data['forum_id']] = 1;
 			}
 
-			// User post update (we do not care about topic or post, since user posts are strictly connected to posts)
+			// User post update (we do not care about topic or post, since user topics are strictly connected to posts)
 			// But we care about forums where post counts get not increased. ;)
 			if ($post_data['post_postcount'])
 			{
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index d9fbd84ce1..9cf7b59ad3 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1461,11 +1461,11 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 	}
 
 	// (Soft) delete the post
-	if ($is_soft)
+	if ($is_soft && ($post_mode != 'delete_topic'))
 	{
 		phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
 	}
-	else
+	else if (!$is_soft)
 	{
 		if (!delete_posts('post_id', array($post_id), false, false))
 		{
@@ -1502,7 +1502,6 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 			{
 				$topic_row = array();
 				phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason);
-				phpbb_content_visibility::remove_topic_from_statistic($topic_id, $forum_id, $topic_row, $sql_data);
 			}
 			else
 			{
-- 
cgit v1.2.1


From c525e900d3b96b829c939010db343d8032698011 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 8 Oct 2012 15:01:20 +0200
Subject: [feature/soft-delete] Allow to update multiple posts with
 set_post_visibility

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 15 +++++++++++----
 phpBB/includes/functions_posting.php  |  2 --
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 0d08cb83b6..868400b5f6 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -210,8 +210,8 @@ class phpbb_content_visibility
 	* Change visibility status of one post or a hole topic
 	*
 	* @param $visibility	int		Element of {ITEM_APPROVED, ITEM_DELETED}
-	* @param $post_id		mixed	Post ID to act on, if it is empty,
-	*								all posts of topic_id will be modified
+	* @param $post_id		mixed	Post ID or array of post IDs to act on,
+	*								if it is empty, all posts of topic_id will be modified
 	* @param $topic_id		int		Topic where $post_id is found
 	* @param $forum_id		int		Forum where $topic_id is found
 	* @param $user_id		int		User performing the action
@@ -234,7 +234,14 @@ class phpbb_content_visibility
 
 		if ($post_id)
 		{
-			$where_sql = 'post_id = ' . (int) $post_id;
+			if (is_array($post_id))
+			{
+				$where_sql = $db->sql_in_set('post_id', array_map('intval', $post_id));
+			}
+			else
+			{
+				$where_sql = 'post_id = ' . (int) $post_id;
+			}
 		}
 		else if ($topic_id)
 		{
@@ -382,7 +389,7 @@ class phpbb_content_visibility
 	}
 
 	/**
-	* One function to rule them all ... and unhide posts and topics.  This could
+	* One function to rule them all... and unhide posts and topics. This could
 	* reasonably be broken up, I straight copied this code from the mcp_queue.php
 	* file here for global access.
 	* @param $mode - string - member of the set {'approve', 'restore'}
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 9cf7b59ad3..2ae4fe2bd8 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1629,8 +1629,6 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 		}
 	}
 
-//	$sql_data[USERS_TABLE] = ($data['post_postcount']) ? 'user_posts = user_posts - 1' : '';
-
 	$db->sql_transaction('begin');
 
 	$where_sql = array(
-- 
cgit v1.2.1


From 91398c9e48df7ce0da6763790d9ec233ab06e729 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 8 Oct 2012 15:03:54 +0200
Subject: [feature/soft-delete] Change order of functions

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 868400b5f6..182df69ec2 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -22,6 +22,30 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_content_visibility
 {
+	/**
+	* Can the current logged-in user soft-delete posts?
+	*
+	* @param $forum_id		int		Forum ID whose permissions to check
+	* @param $poster_id		int		Poster ID of the post in question
+	* @param $post_locked	bool	Is the post locked?
+	* @return bool
+	*/
+	static function can_soft_delete($forum_id, $poster_id, $post_locked)
+	{
+		global $auth, $user;
+
+		if ($auth->acl_get('m_softdelete', $forum_id))
+		{
+			return true;
+		}
+		else if ($auth->acl_get('f_softdelete', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
 	/**
 	* Create topic/post visibility SQL for a given forum ID
 	*
@@ -207,7 +231,7 @@ class phpbb_content_visibility
 	}
 
 	/**
-	* Change visibility status of one post or a hole topic
+	* Change visibility status of one post or all posts of a topic
 	*
 	* @param $visibility	int		Element of {ITEM_APPROVED, ITEM_DELETED}
 	* @param $post_id		mixed	Post ID or array of post IDs to act on,
@@ -298,30 +322,6 @@ class phpbb_content_visibility
 		}
 	}
 
-	/**
-	* Can the current logged-in user soft-delete posts?
-	*
-	* @param $forum_id		int		Forum ID whose permissions to check
-	* @param $poster_id		int		Poster ID of the post in question
-	* @param $post_locked	bool	Is the post locked?
-	* @return bool
-	*/
-	static function can_soft_delete($forum_id, $poster_id, $post_locked)
-	{
-		global $auth, $user;
-
-		if ($auth->acl_get('m_softdelete', $forum_id))
-		{
-			return true;
-		}
-		else if ($auth->acl_get('f_softdelete', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
 	/**
 	* Remove topic from forum statistics
 	*
-- 
cgit v1.2.1


From 53e01bba19784b0fb36324c10c010f969f05d253 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 8 Oct 2012 22:47:50 +0200
Subject: [feature/soft-delete] Update post counts within set_post_visibility

This is an additional query in some rare cases,
but it makes it much easier to use and understand.
This is mostly a preparation for the restore case.

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 337 ++++++++++++++++++++++++----------
 phpBB/includes/functions_posting.php  |  22 +--
 2 files changed, 247 insertions(+), 112 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 182df69ec2..7761587c53 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -155,6 +155,208 @@ class phpbb_content_visibility
 		return $where_sqls[0];
 	}
 
+	/**
+	* Change visibility status of one post or all posts of a topic
+	*
+	* @param $visibility	int		Element of {ITEM_APPROVED, ITEM_DELETED}
+	* @param $post_id		mixed	Post ID or array of post IDs to act on,
+	*								if it is empty, all posts of topic_id will be modified
+	* @param $topic_id		int		Topic where $post_id is found
+	* @param $forum_id		int		Forum where $topic_id is found
+	* @param $user_id		int		User performing the action
+	* @param $time			int		Timestamp when the action is performed
+	* @param $reason		string	Reason why the visibilty was changed.
+	* @param $is_starter	bool	Is this the first post of the topic changed?
+	* @param $is_latest		bool	Is this the last post of the topic changed?
+	* @param $limit_visibility	mixed	Limit updating per topic_id to a certain visibility
+	* @param $limit_delete_time	mixed	Limit updating per topic_id to a certain deletion time
+	* @return array		Changed post data, empty array if an error occured.
+	*/
+	static public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $user_id, $time, $reason, $is_starter, $is_latest, $limit_visibility = false, $limit_delete_time = false)
+	{
+		global $db;
+
+		if (!in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
+		{
+			return array();
+		}
+
+		if ($post_id)
+		{
+			if (is_array($post_id))
+			{
+				$where_sql = $db->sql_in_set('post_id', array_map('intval', $post_id));
+			}
+			else
+			{
+				$where_sql = 'post_id = ' . (int) $post_id;
+			}
+			$where_sql .= ' AND topic_id = ' . (int) $topic_id;
+		}
+		else
+		{
+			$where_sql = 'topic_id = ' . (int) $topic_id;
+
+			// Limit the posts to a certain visibility and deletion time
+			// This allows us to only restore posts, that were approved
+			// when the topic got soft deleted. So previous soft deleted
+			// and unapproved posts are still soft deleted/unapproved
+			if ($limit_visibility !== false)
+			{
+				$where_sql .= ' AND post_visibility = ' . (int) $limit_visibility;
+			}
+			if ($limit_delete_time !== false)
+			{
+				$where_sql .= ' AND post_delete_time = ' . (int) $limit_delete_time;
+			}
+		}
+
+		$sql = 'SELECT poster_id, post_id, post_postcount, post_visibility
+			FROM ' . POSTS_TABLE . '
+			WHERE ' . $where_sql;
+		$result = $db->sql_query($sql);
+
+		$post_ids = $poster_postcounts = $postcounts = $postcount_visibility = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$post_ids[] = (int) $row['post_id'];
+
+			if ($row['post_visibility'] != $visibility)
+			{
+				if ($row['post_postcount'] && !isset($poster_postcounts[$row['poster_id']]))
+				{
+					$poster_postcounts[$row['poster_id']] = 1;
+				}
+				else if ($row['post_postcount'])
+				{
+					$poster_postcounts[$row['poster_id']]++;
+				}
+
+				if (!isset($postcount_visibility[$row['post_visibility']]))
+				{
+					$postcount_visibility[$row['post_visibility']] = 1;
+				}
+				else
+				{
+					$postcount_visibility[$row['post_visibility']]++;
+				}
+			}
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($post_ids))
+		{
+			return array();
+		}
+
+		$data = array(
+			'post_visibility'		=> (int) $visibility,
+			'post_delete_user'		=> (int) $user_id,
+			'post_delete_time'		=> ((int) $time) ?: time(),
+			'post_delete_reason'	=> truncate_string($reason, 255, 255, false),
+		);
+
+		$sql = 'UPDATE ' . POSTS_TABLE . '
+			SET ' . $db->sql_build_array('UPDATE', $data) . '
+			WHERE ' . $db->sql_in_set('post_id', $post_ids);
+		$db->sql_query($sql);
+
+		// Group the authors by post count, to reduce the number of queries
+		foreach ($poster_postcounts as $poster_id => $num_posts)
+		{
+			$postcounts[$num_posts][] = $poster_id;
+		}
+
+		// Update users postcounts
+		foreach ($postcounts as $num_posts => $poster_ids)
+		{
+			if ($visibility == ITEM_DELETED)
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_posts = 0
+					WHERE ' . $db->sql_in_set('user_id', $poster_ids) . '
+						AND user_posts < ' . $num_posts;
+				$db->sql_query($sql);
+
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_posts = user_posts - ' . $num_posts . '
+					WHERE ' . $db->sql_in_set('user_id', $poster_ids) . '
+						AND user_posts >= ' . $num_posts;
+				$db->sql_query($sql);
+			}
+			else
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_posts = user_posts + ' . $num_posts . '
+					WHERE ' . $db->sql_in_set('user_id', $poster_ids) . '
+						AND user_posts >= ' . $num_posts;
+				$db->sql_query($sql);
+			}
+		}
+
+		$update_topic_postcount = true;
+
+		// Sync the first/last topic information if needed
+		if (!$is_starter && $is_latest)
+		{
+			// update_post_information can only update the last post info ...
+			if ($topic_id)
+			{
+				update_post_information('topic', $topic_id, false);
+			}
+			if ($forum_id)
+			{
+				update_post_information('forum', $forum_id, false);
+			}
+		}
+		else if ($is_starter && $topic_id)
+		{
+			// ... so we need to use sync, if the first post is changed.
+			// The forum is resynced recursive by sync() itself.
+			sync('topic', 'topic_id', $topic_id, true);
+
+			// sync recalculates the topic replies and forum posts by itself, so we don't do that.
+			$update_topic_postcount = false;
+		}
+
+		// Update the topic's reply count and the forum's post count
+		if ($update_topic_postcount)
+		{
+			$num_posts = 0;
+			foreach ($postcount_visibility as $post_visibility => $visibility_posts)
+			{
+				// If we soft delete, we need to substract approved posts from the counters ...
+				if ($post_visibility == ITEM_APPROVED && $visibility == ITEM_DELETED)
+				{
+					$num_posts += $visibility_posts;
+				}
+				// ... and when we approve/restore, all others.
+				else if ($post_visibility != ITEM_APPROVED && $visibility == ITEM_APPROVED)
+				{
+					$num_posts += $visibility_posts;
+				}
+			}
+
+			if ($num_posts)
+			{
+				$sql_num_posts = (($visibility == ITEM_DELETED) ? ' - ' : ' + ') . $num_posts;
+
+				// Update the number for replies and posts
+				$sql = 'UPDATE ' . TOPICS_TABLE . "
+					SET topic_replies = topic_replies $sql_num_posts
+					WHERE topic_id = $topic_id";
+				$db->sql_query($sql);
+
+				$sql = 'UPDATE ' . FORUMS_TABLE . "
+					SET forum_posts = forum_posts $sql_num_posts
+					WHERE forum_id = $forum_id";
+				$db->sql_query($sql);
+			}
+		}
+
+		return $data;
+	}
+
 	/**
 	* Set topic visibility
 	*
@@ -174,7 +376,7 @@ class phpbb_content_visibility
 	* @param $time			int		Timestamp when the action is performed
 	* @param $reason		string	Reason why the visibilty was changed.
 	* @param $force_update_all	bool	Force to update all posts within the topic
-	* @return void
+	* @return array		Changed topic data, empty array if an error occured.
 	*/
 	static public function set_topic_visibility($visibility, $topic_id, $forum_id, $user_id, $time, $reason, $force_update_all = false)
 	{
@@ -182,7 +384,7 @@ class phpbb_content_visibility
 
 		if (!in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
 		{
-			return;
+			return array();
 		}
 
 		if (!$force_update_all)
@@ -197,7 +399,7 @@ class phpbb_content_visibility
 			if (!$original_topic_data)
 			{
 				// The topic does not exist...
-				return;
+				return array();
 			}
 		}
 
@@ -214,6 +416,11 @@ class phpbb_content_visibility
 			WHERE topic_id = ' . (int) $topic_id;
 		$db->sql_query($sql);
 
+		if (!$db->sql_affectedrows())
+		{
+			return array();
+		}
+
 		if (!$force_update_all && $original_topic_data['topic_delete_time'] && $original_topic_data['topic_visibility'] == ITEM_DELETED && $visibility == ITEM_APPROVED)
 		{
 			// If we're restoring a topic we only restore posts, that were soft deleted through the topic soft deletion.
@@ -228,98 +435,50 @@ class phpbb_content_visibility
 		{
 			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true);
 		}
+
+		return $data;
 	}
 
 	/**
-	* Change visibility status of one post or all posts of a topic
+	* Add post to topic and forum statistics
 	*
-	* @param $visibility	int		Element of {ITEM_APPROVED, ITEM_DELETED}
-	* @param $post_id		mixed	Post ID or array of post IDs to act on,
-	*								if it is empty, all posts of topic_id will be modified
-	* @param $topic_id		int		Topic where $post_id is found
-	* @param $forum_id		int		Forum where $topic_id is found
-	* @param $user_id		int		User performing the action
-	* @param $time			int		Timestamp when the action is performed
-	* @param $reason		string	Reason why the visibilty was changed.
-	* @param $is_starter	bool	Is this the first post of the topic changed?
-	* @param $is_latest		bool	Is this the last post of the topic changed?
-	* @param $limit_visibility	mixed	Limit updating per topic_id to a certain visibility
-	* @param $limit_delete_time	mixed	Limit updating per topic_id to a certain deletion time
+	* @param $data			array	Contains information from the topics table about given topic
+	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
 	* @return void
 	*/
-	static public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $user_id, $time, $reason, $is_starter, $is_latest, $limit_visibility = false, $limit_delete_time = false)
+	static public function add_post_to_statistic($data, &$sql_data)
 	{
-		global $db;
+		$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies = topic_replies + 1';
 
-		if (!in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
-		{
-			return;
-		}
+		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts + 1';
 
-		if ($post_id)
+		if ($data['post_postcount'])
 		{
-			if (is_array($post_id))
-			{
-				$where_sql = $db->sql_in_set('post_id', array_map('intval', $post_id));
-			}
-			else
-			{
-				$where_sql = 'post_id = ' . (int) $post_id;
-			}
+			$sql_data[USERS_TABLE] = (($sql_data[USERS_TABLE]) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts + 1';
 		}
-		else if ($topic_id)
-		{
-			$where_sql = 'topic_id = ' . (int) $topic_id;
 
-			// Limit the posts to a certain visibility and deletion time
-			// This allows us to only restore posts, that were approved
-			// when the topic got soft deleted. So previous soft deleted
-			// and unapproved posts are still soft deleted/unapproved
-			if ($limit_visibility !== false)
-			{
-				$where_sql .= ' AND post_visibility = ' . (int) $limit_visibility;
-			}
-			if ($limit_delete_time !== false)
-			{
-				$where_sql .= ' AND post_delete_time = ' . (int) $limit_delete_time;
-			}
-		}
-		else
-		{
-			return;
-		}
+		set_config_count('num_posts', 1, true);
+	}
 
-		$data = array(
-			'post_visibility'		=> (int) $visibility,
-			'post_delete_user'		=> (int) $user_id,
-			'post_delete_time'		=> ((int) $time) ?: time(),
-			'post_delete_reason'	=> truncate_string($reason, 255, 255, false),
-		);
+	/**
+	* Remove post from topic and forum statistics
+	*
+	* @param $data			array	Contains information from the topics table about given topic
+	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
+	* @return void
+	*/
+	static public function remove_post_from_statistic($data, &$sql_data)
+	{
+		$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies = topic_replies - 1';
 
-		$sql = 'UPDATE ' . POSTS_TABLE . '
-			SET ' . $db->sql_build_array('UPDATE', $data) . '
-			WHERE ' . $where_sql;
-		$db->sql_query($sql);
+		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts - 1';
 
-		// Sync the first/last topic information if needed
-		if (!$is_starter && $is_latest)
-		{
-			// update_post_information can only update the last post info ...
-			if ($topic_id)
-			{
-				update_post_information('topic', $topic_id, false);
-			}
-			if ($forum_id)
-			{
-				update_post_information('forum', $forum_id, false);
-			}
-		}
-		else if ($is_starter && $topic_id)
+		if ($data['post_postcount'])
 		{
-			// ... so we need to use sync, if the first post is changed.
-			// The forum is resynced recursive by sync() itself.
-			sync('topic', 'topic_id', $topic_id, true);
+			$sql_data[USERS_TABLE] = (($sql_data[USERS_TABLE]) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts - 1';
 		}
+
+		set_config_count('num_posts', -1, true);
 	}
 
 	/**
@@ -366,28 +525,6 @@ class phpbb_content_visibility
 		*/
 	}
 
-	/**
-	* Remove post from topic and forum statistics
-	*
-	* @param $forum_id		int		Forum where the topic is found
-	* @param $data			array	Contains information from the topics table about given topic
-	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
-	* @return void
-	*/
-	static public function remove_post_from_statistic($forum_id, $data, &$sql_data)
-	{
-		$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies = topic_replies - 1';
-
-		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts - 1';
-
-		if ($data['post_postcount'])
-		{
-			$sql_data[USERS_TABLE] = (($sql_data[USERS_TABLE]) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts - 1';
-		}
-
-		set_config_count('num_posts', -1, true);
-	}
-
 	/**
 	* One function to rule them all... and unhide posts and topics. This could
 	* reasonably be broken up, I straight copied this code from the mcp_queue.php
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 2ae4fe2bd8..250d20b005 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1601,21 +1601,19 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 		break;
 	}
 
-	if (($post_mode == 'delete') || ($post_mode == 'delete_last_post') || ($post_mode == 'delete_first_post' && !$is_soft))
-	{
-		if ($data['post_visibility'] == ITEM_APPROVED)
-		{
-			phpbb_content_visibility::remove_post_from_statistic($forum_id, $data, $sql_data);
-		}
 
+	if (($post_mode == 'delete') || ($post_mode == 'delete_last_post') || ($post_mode == 'delete_first_post'))
+	{
 		if (!$is_soft)
 		{
-			$sql_data[TOPICS_TABLE] .= ', topic_replies_real = topic_replies_real - 1';
+			if ($data['post_visibility'] == ITEM_APPROVED)
+			{
+				phpbb_content_visibility::remove_post_from_statistic($data, $sql_data);
+			}
+
+			$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies_real = topic_replies_real - 1';
 		}
-	}
 
-	if (($post_mode == 'delete') || ($post_mode == 'delete_last_post') || ($post_mode == 'delete_first_post'))
-	{
 		$sql = 'SELECT 1 AS has_attachments
 			FROM ' . ATTACHMENTS_TABLE . '
 			WHERE topic_id = ' . $topic_id;
@@ -1625,7 +1623,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 
 		if (!$has_attachments)
 		{
-			$sql_data[TOPICS_TABLE] .= ', topic_attachment = 0';
+			$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_attachment = 0';
 		}
 	}
 
@@ -1969,7 +1967,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			// Correctly set back the topic replies and forum posts... but only if the post was approved before.
 			if (!$post_approval && $data['post_visibility'] == ITEM_APPROVED)
 			{
-				//phpbb_content_visibility::remove_post_from_statistic($forum_id, $current_time, $sql_data);
+				//phpbb_content_visibility::remove_post_from_statistic($current_time, $sql_data);
 				// ^^ remove_post_from_statistic SQL is identical, except that it does not include the ['stat'] sub-array
 				$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1';
-- 
cgit v1.2.1


From e447a0fa0797440688335bc0dc18c8a73b5586ec Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 8 Oct 2012 23:09:12 +0200
Subject: [feature/soft-delete] Fix restoring a post via editing

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 6 ++++++
 phpBB/includes/functions_posting.php  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 7761587c53..dcb7f363f8 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -311,6 +311,12 @@ class phpbb_content_visibility
 		}
 		else if ($is_starter && $topic_id)
 		{
+			if (!function_exists('sync'))
+			{
+				global $phpEx, $phpbb_root_path;
+				include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+			}
+
 			// ... so we need to use sync, if the first post is changed.
 			// The forum is resynced recursive by sync() itself.
 			sync('topic', 'topic_id', $topic_id, true);
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 250d20b005..6d74c6b2d7 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1481,7 +1481,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 	$db->sql_transaction('commit');
 
 	// Collect the necessary information for updating the tables
-	$sql_data[FORUMS_TABLE] = '';
+	$sql_data[FORUMS_TABLE] = $sql_data[TOPICS_TABLE] = '';
 	switch ($post_mode)
 	{
 		case 'delete_topic':
-- 
cgit v1.2.1


From 94417742885d066823314f100b1bdbe5b8b76c91 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 9 Oct 2012 11:55:31 +0200
Subject: [feature/soft-delete] Topic visibility is already synced by
 sync('topic')

PHPBB3-9567
---
 phpBB/includes/acp/acp_forums.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 622d84d15e..7f2539ec8d 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -314,7 +314,6 @@ class acp_forums
 					$end = $start + $batch_size;
 
 					// Sync all topics in batch mode...
-					sync('topic_visibility', 'range', 'topic_id BETWEEN ' . $start . ' AND ' . $end, true, false);
 					sync('topic', 'range', 'topic_id BETWEEN ' . $start . ' AND ' . $end, true, true);
 
 					if ($end < $row2['max_topic_id'])
-- 
cgit v1.2.1


From 2841ecc44f2c9773fe3eb19134f52bfcf4beb05e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 9 Oct 2012 12:08:17 +0200
Subject: [feature/soft-delete] Fix display_user_activity()

The Logic of $forum_ary was inverted, so if the array is empty, we can skip
the queries. We also should not merge passworded forums into the $forum_ary
as we removed them from that array right before that.

PHPBB3-9567
---
 phpBB/includes/functions_display.php | 84 ++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 5849f5cf4c..10f07bfbf1 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -996,54 +996,54 @@ function display_user_activity(&$userdata)
 		}
 	}
 
-	$forum_ary = array_diff($forum_ary, $user->get_passworded_forums());;
-
-	// Obtain active forum
-	$sql = 'SELECT forum_id, COUNT(post_id) AS num_posts
-		FROM ' . POSTS_TABLE . '
-		WHERE poster_id = ' . $userdata['user_id'] . '
-			AND post_postcount = 1
-			AND ' . phpbb_content_visibility::get_forums_visibility_sql('post', $forum_ary) . '
-		GROUP BY forum_id
-		ORDER BY num_posts DESC';
-	$result = $db->sql_query_limit($sql, 1);
-	$active_f_row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
+	$forum_ary = array_diff($forum_ary, $user->get_passworded_forums());
 
-	if (!empty($active_f_row))
+	$active_f_row = $active_t_row = array();
+	if (!empty($forum_ary))
 	{
-		$sql = 'SELECT forum_name
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_id = ' . $active_f_row['forum_id'];
-		$result = $db->sql_query($sql, 3600);
-		$active_f_row['forum_name'] = (string) $db->sql_fetchfield('forum_name');
+		// Obtain active forum
+		$sql = 'SELECT forum_id, COUNT(post_id) AS num_posts
+			FROM ' . POSTS_TABLE . '
+			WHERE poster_id = ' . $userdata['user_id'] . '
+				AND post_postcount = 1
+				AND ' . phpbb_content_visibility::get_forums_visibility_sql('post', $forum_ary) . '
+			GROUP BY forum_id
+			ORDER BY num_posts DESC';
+		$result = $db->sql_query_limit($sql, 1);
+		$active_f_row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
-	}
 
-	// Obtain active topic
-	// We need to exclude passworded forums here so we do not leak the topic title
-	$forum_ary_topic = array_unique(array_merge($forum_ary, $user->get_passworded_forums()));
-	$forum_sql_topic = (!empty($forum_ary_topic)) ? 'AND ' . $db->sql_in_set('forum_id', $forum_ary_topic, true) : '';
-
-	$sql = 'SELECT topic_id, COUNT(post_id) AS num_posts
-		FROM ' . POSTS_TABLE . '
-		WHERE poster_id = ' . $userdata['user_id'] . '
-			AND post_postcount = 1
-			AND ' . phpbb_content_visibility::get_forums_visibility_sql('post', $forum_ary) . '
-		GROUP BY topic_id
-		ORDER BY num_posts DESC';
-	$result = $db->sql_query_limit($sql, 1);
-	$active_t_row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
+		if (!empty($active_f_row))
+		{
+			$sql = 'SELECT forum_name
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_id = ' . $active_f_row['forum_id'];
+			$result = $db->sql_query($sql, 3600);
+			$active_f_row['forum_name'] = (string) $db->sql_fetchfield('forum_name');
+			$db->sql_freeresult($result);
+		}
 
-	if (!empty($active_t_row))
-	{
-		$sql = 'SELECT topic_title
-			FROM ' . TOPICS_TABLE . '
-			WHERE topic_id = ' . $active_t_row['topic_id'];
-		$result = $db->sql_query($sql);
-		$active_t_row['topic_title'] = (string) $db->sql_fetchfield('topic_title');
+		// Obtain active topic
+		$sql = 'SELECT topic_id, COUNT(post_id) AS num_posts
+			FROM ' . POSTS_TABLE . '
+			WHERE poster_id = ' . $userdata['user_id'] . '
+				AND post_postcount = 1
+				AND ' . phpbb_content_visibility::get_forums_visibility_sql('post', $forum_ary) . '
+			GROUP BY topic_id
+			ORDER BY num_posts DESC';
+		$result = $db->sql_query_limit($sql, 1);
+		$active_t_row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
+
+		if (!empty($active_t_row))
+		{
+			$sql = 'SELECT topic_title
+				FROM ' . TOPICS_TABLE . '
+				WHERE topic_id = ' . $active_t_row['topic_id'];
+			$result = $db->sql_query($sql);
+			$active_t_row['topic_title'] = (string) $db->sql_fetchfield('topic_title');
+			$db->sql_freeresult($result);
+		}
 	}
 
 	$userdata['active_t_row'] = $active_t_row;
-- 
cgit v1.2.1


From 7cc8b3eef82a70a1aa708614e37fd82482d9d7d2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 9 Oct 2012 12:23:15 +0200
Subject: [feature/soft-delete] Correctly update user_posts count

Before soft delete this was much easier, as an unapproved topic could only
have one post, because no one could reply to unapproved topics. Now we need
to run multiple queries to correctly reduce the post counts.

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 38 ++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index dcb7f363f8..8854981303 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -518,17 +518,37 @@ class phpbb_content_visibility
 		set_config_count('num_topics', -1, true);
 		set_config_count('num_posts', ($topic_row['topic_replies'] + 1) * (-1), true);
 
-		// Only decrement this post, since this is the one non-approved now
-		//
-		/**
-		* @todo: this is wrong, it should rely on post_postcount
-		*		 also a user might have more than one post in the topic
-		*
-		if ($auth->acl_get('f_postcount', $forum_id))
+		// Get user post count information
+		$sql = 'SELECT poster_id, COUNT(post_id) AS num_posts
+			FROM ' . POSTS_TABLE . '
+			WHERE topic_id = ' . $topic_id . '
+				AND post_postcount = 1
+				AND post_visibility = ' . ITEM_APPROVED . '
+			GROUP BY poster_id';
+		$result = $db->sql_query($sql);
+
+		$postcounts = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$postcounts[(int) $row['num_posts']][] = (int) $row['poster_id'];
+		}
+		$db->sql_freeresult($result);
+
+		// Decrement users post count
+		foreach ($postcounts as $num_posts => $poster_ids)
 		{
-			$sql_data[USERS_TABLE] = 'user_posts = user_posts - 1';
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_posts = 0
+				WHERE user_posts < ' . $num_posts . '
+					AND ' . $db->sql_in_set('user_id', $poster_ids);
+			$db->sql_query($sql);
+
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_posts = user_posts - ' . $num_posts . '
+				WHERE user_posts >= ' . $num_posts . '
+					AND ' . $db->sql_in_set('user_id', $poster_ids);
+			$db->sql_query($sql);
 		}
-		*/
 	}
 
 	/**
-- 
cgit v1.2.1


From 224be5bc4f7ffdf6f22c3da3aff94fb7a3d7571f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 9 Oct 2012 14:02:42 +0200
Subject: [feature/soft-delete] Fix sync('topic_visibility')

The function can not rely on the first post anymore, as that one could be soft
deleted but the topic still has approved replies which are still visible.

PHPBB3-9567
---
 phpBB/includes/functions_admin.php | 73 +++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 32 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 04c99b5e62..0a351aa6e8 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1383,43 +1383,52 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 		case 'topic_visibility':
 
 			$db->sql_transaction('begin');
-			switch ($db->sql_layer)
+
+			$sql = 'SELECT t.topic_id, p.post_visibility
+				FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
+				$where_sql_and p.topic_id = t.topic_id
+					AND p.post_visibility = " . ITEM_APPROVED;
+			$result = $db->sql_query($sql);
+
+			$topics_approved = array();
+			while ($row = $db->sql_fetchrow($result))
 			{
-				case 'mysql4':
-				case 'mysqli':
-					$sql = 'UPDATE ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-						SET t.topic_visibility = p.post_visibility
-						$where_sql_and t.topic_first_post_id = p.post_id";
-					$db->sql_query($sql);
-				break;
+				$topics_approved[] = (int) $row['topic_id'];
+			}
+			$db->sql_freeresult($result);
 
-				default:
-					$sql = 'SELECT t.topic_id, p.post_visibility
-						FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-						$where_sql_and p.post_id = t.topic_first_post_id
-							AND p.post_visibility <> t.topic_visibility";
-					$result = $db->sql_query($sql);
+			$sql = 'SELECT t.topic_id, p.post_visibility
+				FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
+				$where_sql_and " . $db->sql_in_set('t.topic_id', $topics_approved, true, true) . '
+					AND p.topic_id = t.topic_id
+					AND p.post_visibility = ' . ITEM_DELETED;
+			$result = $db->sql_query($sql);
 
-					$topic_ids = array();
-					while ($row = $db->sql_fetchrow($result))
-					{
-						$topic_ids[$row['topic_id']] = $row['post_visibility'];
-					}
-					$db->sql_freeresult($result);
+			$topics_softdeleted = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$topics_softdeleted[] = (int) $row['topic_id'];
+			}
+			$db->sql_freeresult($result);
 
-					if (!sizeof($topic_ids))
-					{
-						return;
-					}
+			$topics_softdeleted = array_diff($topics_softdeleted, $topics_approved);
+			$topics_not_unapproved = array_merge($topics_softdeleted, $topics_approved);
 
-					foreach ($topic_ids as $topic_id => $visibility)
-					{
-						$sql = 'UPDATE ' . TOPICS_TABLE . '
-							SET topic_visibility = ' . $visibility . '
-							WHERE topic_id' . $topic_id;
-						$db->sql_query($sql);
-					}
-				break;
+			$update_ary = array(
+				ITEM_UNAPPROVED	=> (!empty($topics_not_unapproved)) ? $where_sql_and . ' ' . $db->sql_in_set('topic_id', $topics_not_unapproved, true) : '',
+				ITEM_APPROVED	=> (!empty($topics_approved)) ? ' WHERE ' . $db->sql_in_set('topic_id', $topics_approved) : '',
+				ITEM_DELETED	=> (!empty($topics_softdeleted)) ? ' WHERE ' . $db->sql_in_set('topic_id', $topics_softdeleted) : '',
+			);
+
+			foreach ($topic_visiblities as $visibility => $sql_where)
+			{
+				if ($sql_where)
+				{
+					$sql = 'UPDATE ' . TOPICS_TABLE . '
+						SET topic_visibility = ' . $visibility . '
+						' . $sql_where;
+					$db->sql_query($sql);
+				}
 			}
 
 			$db->sql_transaction('commit');
-- 
cgit v1.2.1


From fbf85b76c15c27e478f24947098d56c8c4bb3435 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 9 Oct 2012 15:38:50 +0200
Subject: [feature/soft-delete] Correctly synchronize the topic_visibility in
 sync()

This also makes sync('topic_visibility') obsolete, but we keep it for now.
Also fix a unit test, because ITEM_DELETED overpowers ITEM_UNAPPROVED

PHPBB3-9567
---
 phpBB/includes/functions_admin.php | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 0a351aa6e8..cb84d1cfb1 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1854,7 +1854,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			break;
 
 		case 'topic':
-			$topic_data = $post_ids = $approved_unapproved_ids = $resync_forums = $delete_topics = $delete_posts = $moved_topics = array();
+			$topic_data = $post_ids = $resync_forums = $delete_topics = $delete_posts = $moved_topics = array();
 
 			$db->sql_transaction('begin');
 
@@ -1873,6 +1873,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 				$topic_id = (int) $row['topic_id'];
 				$topic_data[$topic_id] = $row;
+				$topic_data[$topic_id]['visibility'] = ITEM_UNAPPROVED;
 				$topic_data[$topic_id]['replies_real'] = -1;
 				$topic_data[$topic_id]['replies'] = 0;
 				$topic_data[$topic_id]['first_post_id'] = 0;
@@ -1898,7 +1899,6 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				GROUP BY t.topic_id, t.post_visibility";
 			$result = $db->sql_query($sql);
 
-			$topic_firstlast_data = array();
 			while ($row = $db->sql_fetchrow($result))
 			{
 				$topic_id = (int) $row['topic_id'];
@@ -1921,18 +1921,23 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 					if ($row['post_visibility'] == ITEM_APPROVED)
 					{
-						$topic_firstlast_data[$topic_id]['visibility'] = ITEM_APPROVED;
+						$topic_data[$topic_id]['visibility'] = ITEM_APPROVED;
 						$topic_data[$topic_id]['first_post_id'] = $row['first_post_id'];
 						$topic_data[$topic_id]['last_post_id'] = $row['last_post_id'];
 						$topic_data[$topic_id]['replies'] = $row['total_posts'] - 1;
 					}
-					else if (!isset($topic_firstlast_data[$topic_id]['visibility']) || $topic_firstlast_data[$topic_id]['visibility'] != ITEM_APPROVED)
+					else if ($topic_data[$topic_id]['visibility'] != ITEM_APPROVED)
 					{
 						// If there is no approved post, we take the min/max of the other visibilities
 						// for the last and first post info, because it is only visible to moderators anyway
 						$topic_data[$topic_id]['first_post_id'] = (!empty($topic_data[$topic_id]['first_post_id'])) ? min($topic_data[$topic_id]['first_post_id'], $row['first_post_id']) : $row['first_post_id'];
 						$topic_data[$topic_id]['last_post_id'] = max($topic_data[$topic_id]['last_post_id'], $row['last_post_id']);
-						$topic_firstlast_data[$topic_id]['visibility'] = $row['post_visibility'];
+
+						if ($topic_data[$topic_id]['visibility'] == ITEM_UNAPPROVED)
+						{
+							// Soft delete status is stronger than unapproved.
+							$topic_data[$topic_id]['visibility'] = $row['post_visibility'];
+						}
 					}
 				}
 			}
@@ -1987,10 +1992,6 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 				if ($row['post_id'] == $topic_data[$topic_id]['first_post_id'])
 				{
-					if ($topic_data[$topic_id]['topic_visibility'] != $row['post_visibility'])
-					{
-						$approved_unapproved_ids[$topic_id] = $row['post_visibility'];
-					}
 					$topic_data[$topic_id]['time'] = $row['post_time'];
 					$topic_data[$topic_id]['poster'] = $row['poster_id'];
 					$topic_data[$topic_id]['first_poster_name'] = ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username'];
@@ -2118,22 +2119,8 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				unset($sync_shadow_topics, $shadow_topic_data);
 			}
 
-			// approved becomes unapproved, and vice-versa
-			if (sizeof($approved_unapproved_ids))
-			{
-				foreach ($approved_unapproved_ids as $update_topic_id => $status)
-				{
-					// @TODO: Consider grouping by $status and only running 3 queries
-    				$sql = 'UPDATE ' . TOPICS_TABLE . '
-						SET topic_visibility = ' . $status . '
-						WHERE topic_id = ' . $update_topic_id;
-					$db->sql_query($sql);
-				}
-			}
-			unset($approved_unapproved_ids);
-
 			// These are fields that will be synchronised
-			$fieldnames = array('time', 'replies', 'replies_real', 'poster', 'first_post_id', 'first_poster_name', 'first_poster_colour', 'last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
+			$fieldnames = array('time', 'visibility', 'replies', 'replies_real', 'poster', 'first_post_id', 'first_poster_name', 'first_poster_colour', 'last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
 
 			if ($sync_extra)
 			{
-- 
cgit v1.2.1


From 7a92594bc0b2985019559e85c7d6067c7e9cd1b1 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 9 Oct 2012 10:09:10 -0500
Subject: [ticket/11103] Fix the issue of time changing when editing items

PHPBB3-11103
---
 phpBB/includes/notification/type/base.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index b72875fb85..a41a5a8ac3 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -82,7 +82,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 	public function __get($name)
 	{
-		return $this->data[$name];
+		return (!isset($this->data[$name])) ? null : $this->data[$name];
 	}
 
 	public function __set($name, $value)
@@ -202,6 +202,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 		// Unset data unique to each row
 		unset(
+			$data['time'], // Also unsetting time, since it always tries to change the time to current (if you actually need to change the time, over-ride this function)
 			$data['notification_id'],
 			$data['unread'],
 			$data['user_id']
-- 
cgit v1.2.1


From 7411d1d1bdb2e6cc61d5e97d15e184351ea67c64 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 9 Oct 2012 10:30:55 -0500
Subject: [ticket/11103] Starting work on the reported posts notification

PHPBB3-11103
---
 phpBB/includes/notification/type/post_in_queue.php | 11 ++-
 phpBB/includes/notification/type/report.php        | 85 ++++++++++++++++++++++
 2 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 phpBB/includes/notification/type/report.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 9c4f0ab8d3..60b4bb4937 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -48,6 +48,13 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
 	);
 
+	/**
+	* Permission to check for (in find_users_for_notification)
+	*
+	* @var string Permission name
+	*/
+	protected $permission = 'm_approve';
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notification_type_
@@ -62,7 +69,7 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 	*/
 	public function is_available()
 	{
-		$m_approve = $this->auth->acl_getf('m_approve', true);
+		$m_approve = $this->auth->acl_getf($this->permission, true);
 
 		return (!empty($m_approve));
 	}
@@ -80,7 +87,7 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 			'ignore_users'		=> array(),
 		), $options);
 
-		$auth_approve = $this->auth->acl_get_list(false, 'm_approve', $post['forum_id']);
+		$auth_approve = $this->auth->acl_get_list(false, $this->permission, $post['forum_id']);
 
 		if (empty($auth_approve))
 		{
diff --git a/phpBB/includes/notification/type/report.php b/phpBB/includes/notification/type/report.php
new file mode 100644
index 0000000000..76c37c99f0
--- /dev/null
+++ b/phpBB/includes/notification/type/report.php
@@ -0,0 +1,85 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* This class handles notifications for replies to a topic
+*
+* @package notifications
+*/
+class phpbb_notification_type_report extends phpbb_notification_type_post_in_queue
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'topic_notify';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_REPORT';
+
+	/**
+	* Permission to check for (in find_users_for_notification)
+	*
+	* @var string Permission name
+	*/
+	protected $permission = 'm_report';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'report';
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		return array(
+			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
+			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
+
+			'U_VIEW_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
+			'U_NEWEST_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
+			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
+			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
+			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
+			'U_STOP_WATCHING_TOPIC'		=> generate_board_url() . "/viewtopic.{$this->php_ext}?uid={$this->user_id}&f={$this->get_data('forum_id')}&t={$this->item_parent_id}&unwatch=topic",
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports");
+	}
+}
-- 
cgit v1.2.1


From e4c9e55b53923baedfc9318eb589a914a4ffccef Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 9 Oct 2012 22:24:06 +0200
Subject: [feature/soft-delete] Fix several issues within submit_post()

- $post_visibility is not boolean, so we need to check for == ITEM_APPROVED
- sync() already updates the topic/forum info, so we don't need to do that again
- use set_post_visibility() when changing the posts visibility

Should be ready for testing.

PHPBB3-9567
---
 phpBB/includes/functions_posting.php | 291 +++++++++++------------------------
 1 file changed, 91 insertions(+), 200 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6d74c6b2d7..b6223b72d4 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1729,21 +1729,24 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		$data['post_visibility'] = $topic_row['post_visibility'];
 	}
 
-	// This variable indicates if the user is able to post or put into the queue - it is used later for all code decisions regarding approval
-	// The variable name should be $post_approved, because it indicates if the post is approved or not
-	$post_approval = 1;
+	// This variable indicates if the user is able to post or put into the queue
+	$post_visibility = ITEM_APPROVED;
 
 	// Check the permissions for post approval. Moderators are not affected.
 	if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']))
 	{
 		// Post not approved, but in queue
-		$post_approval = 0;
+		$post_visibility = ITEM_UNAPPROVED;
 	}
 
-	// Mods are able to force approved/unapproved posts. True means the post is approved, false the post is unapproved
+	// MODs/Extensions are able to force any visibility on posts
 	if (isset($data['force_approved_state']))
 	{
-		$post_approval = ($data['force_approved_state']) ? ITEM_APPROVED : ITEM_UNAPPROVED;
+		$post_visibility = (in_array((int) $data['force_approved_state'], array(ITEM_APPROVED, ITEM_UNAPPROVED, ITEM_DELETED))) ? (int) $data['force_approved_state'] : $post_visibility;
+	}
+	if (isset($data['force_visibility']))
+	{
+		$post_visibility = (in_array((int) $data['force_visibility'], array(ITEM_APPROVED, ITEM_UNAPPROVED, ITEM_DELETED))) ? (int) $data['force_visibility'] : $post_visibility;
 	}
 
 	// Start the transaction here
@@ -1760,7 +1763,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				'icon_id'			=> $data['icon_id'],
 				'poster_ip'			=> $user->ip,
 				'post_time'			=> $current_time,
-				'post_visibility'	=> $post_approval,
+				'post_visibility'	=> $post_visibility,
 				'enable_bbcode'		=> $data['enable_bbcode'],
 				'enable_smilies'	=> $data['enable_smilies'],
 				'enable_magic_url'	=> $data['enable_urls'],
@@ -1826,7 +1829,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				'forum_id'			=> $data['forum_id'],
 				'poster_id'			=> $data['poster_id'],
 				'icon_id'			=> $data['icon_id'],
-				'post_visibility'	=> (!$post_approval) ? 0 : $data['post_visibility'],
+				// We will change the visibility later
+				//'post_visibility'	=> $post_visibility,
 				'enable_bbcode'		=> $data['enable_bbcode'],
 				'enable_smilies'	=> $data['enable_smilies'],
 				'enable_magic_url'	=> $data['enable_urls'],
@@ -1847,8 +1851,6 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 
 		break;
 	}
-
-	$post_approved = $sql_data[POSTS_TABLE]['sql']['post_visibility'];
 	$topic_row = array();
 
 	// And the topic ladies and gentlemen
@@ -1861,7 +1863,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				'topic_last_view_time'		=> $current_time,
 				'forum_id'					=> $data['forum_id'],
 				'icon_id'					=> $data['icon_id'],
-				'topic_visibility'			=> $post_approval,
+				'topic_visibility'			=> $post_visibility,
 				'topic_title'				=> $subject,
 				'topic_first_poster_name'	=> (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''),
 				'topic_first_poster_colour'	=> $user->data['user_colour'],
@@ -1893,13 +1895,13 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				);
 			}
 
-			$sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($auth->acl_get('f_postcount', $data['forum_id']) && $post_approval) ? ', user_posts = user_posts + 1' : '');
+			$sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($auth->acl_get('f_postcount', $data['forum_id']) && $post_visibility == ITEM_APPROVED) ? ', user_posts = user_posts + 1' : '');
 
-			if ($post_approval)
+			if ($post_visibility == ITEM_APPROVED)
 			{
 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
 			}
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real + 1' . (($post_approval) ? ', forum_topics = forum_topics + 1' : '');
+			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real + 1' . (($post_visibility == ITEM_APPROVED) ? ', forum_topics = forum_topics + 1' : '');
 		break;
 
 		case 'reply':
@@ -1907,12 +1909,12 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				topic_replies_real = topic_replies_real + 1,
 				topic_bumped = 0,
 				topic_bumper = 0' .
-				(($post_approval) ? ', topic_replies = topic_replies + 1' : '') .
+				(($post_visibility == ITEM_APPROVED) ? ', topic_replies = topic_replies + 1' : '') .
 				((!empty($data['attachment_data']) || (isset($data['topic_attachment']) && $data['topic_attachment'])) ? ', topic_attachment = 1' : '');
 
-			$sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($auth->acl_get('f_postcount', $data['forum_id']) && $post_approval) ? ', user_posts = user_posts + 1' : '');
+			$sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($auth->acl_get('f_postcount', $data['forum_id']) && $post_visibility == ITEM_APPROVED) ? ', user_posts = user_posts + 1' : '');
 
-			if ($post_approval)
+			if ($post_visibility == ITEM_APPROVED)
 			{
 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
 			}
@@ -1938,7 +1940,6 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			$sql_data[TOPICS_TABLE]['sql'] = array(
 				'forum_id'					=> $data['forum_id'],
 				'icon_id'					=> $data['icon_id'],
-				'topic_visibility'			=> (!$post_approval) ? 0 : $data['topic_visibility'],
 				'topic_title'				=> $subject,
 				'topic_first_poster_name'	=> $username,
 				'topic_type'				=> $topic_type,
@@ -1953,34 +1954,6 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				'topic_attachment'			=> (!empty($data['attachment_data'])) ? 1 : (isset($data['topic_attachment']) ? $data['topic_attachment'] : 0),
 			);
 
-			// Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved
-			if (!$post_approval && $data['topic_visibility'] == ITEM_APPROVED)
-			{
-				phpbb_content_visibility::remove_topic_from_statistic($data['topic_id'], $data['forum_id'], $topic_row, $sql_data);
-			}
-
-		break;
-
-		case 'edit':
-		case 'edit_last_post':
-
-			// Correctly set back the topic replies and forum posts... but only if the post was approved before.
-			if (!$post_approval && $data['post_visibility'] == ITEM_APPROVED)
-			{
-				//phpbb_content_visibility::remove_post_from_statistic($current_time, $sql_data);
-				// ^^ remove_post_from_statistic SQL is identical, except that it does not include the ['stat'] sub-array
-				$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1';
-
-				set_config_count('num_posts', -1, true);
-
-				if ($auth->acl_get('f_postcount', $data['forum_id']))
-				{
-					$sql_data[USERS_TABLE]['stat'][] = 'user_posts = user_posts - 1';
-				}
-
-			}
-
 		break;
 	}
 
@@ -2013,19 +1986,40 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		$db->sql_query($sql);
 		$data['post_id'] = $db->sql_nextid();
 
-		if ($post_mode == 'post')
+		if ($post_mode == 'post' || $post_visibility == ITEM_APPROVED)
 		{
 			$sql_data[TOPICS_TABLE]['sql'] = array(
-				'topic_first_post_id'		=> $data['post_id'],
 				'topic_last_post_id'		=> $data['post_id'],
 				'topic_last_post_time'		=> $current_time,
-				'topic_last_poster_id'		=> (int) $user->data['user_id'],
-				'topic_last_poster_name'	=> (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''),
+				'topic_last_poster_id'		=> $sql_data[POSTS_TABLE]['sql']['poster_id'],
+				'topic_last_poster_name'	=> $sql_data[POSTS_TABLE]['sql']['post_username'],
 				'topic_last_poster_colour'	=> $user->data['user_colour'],
 				'topic_last_post_subject'	=> (string) $subject,
 			);
 		}
 
+		if ($post_mode == 'post')
+		{
+			$sql_data[TOPICS_TABLE]['sql']['topic_first_post_id'] = $data['post_id'];
+		}
+
+		// Update total post count and forum information
+		if ($post_visibility == ITEM_APPROVED)
+		{
+			if ($post_mode == 'post')
+			{
+				set_config_count('num_topics', 1, true);
+			}
+			set_config_count('num_posts', 1, true);
+
+			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = ' . $data['post_id'];
+			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . $db->sql_escape($subject) . "'";
+			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . $current_time;
+			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $user->data['user_id'];
+			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape((!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : '')) . "'";
+			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . $db->sql_escape($user->data['user_colour']) . "'";
+		}
+
 		unset($sql_data[POSTS_TABLE]['sql']);
 	}
 
@@ -2036,6 +2030,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			SET ' . $db->sql_build_array('UPDATE', $sql_data[TOPICS_TABLE]['sql']) . '
 			WHERE topic_id = ' . $data['topic_id'];
 		$db->sql_query($sql);
+
+		unset($sql_data[TOPICS_TABLE]['sql']);
 	}
 
 	// Update the posts table
@@ -2045,6 +2041,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			SET ' . $db->sql_build_array('UPDATE', $sql_data[POSTS_TABLE]['sql']) . '
 			WHERE post_id = ' . $data['post_id'];
 		$db->sql_query($sql);
+
+		unset($sql_data[POSTS_TABLE]['sql']);
 	}
 
 	// Update Poll Tables
@@ -2190,114 +2188,20 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		}
 	}
 
-	// we need to update the last forum information
-	// only applicable if the topic is approved
-	if ($post_approved || $data['post_visibility'] != ITEM_APPROVED)
+	// Fix the post's and topic's visibility and first/last post information, when the post is edited
+	if (($post_mode != 'post' && $post_mode != 'reply') && $data['post_visibility'] != $post_visibility)
 	{
-		// the last post makes us update the forum table. This can happen if...
-		// We make a new topic
-		// We reply to a topic
-		// We edit the last post in a topic and this post is the latest in the forum (maybe)
-		// We edit the only post in the topic
-		// We edit the first post in the topic and all the other posts are not approved
-		if (($post_mode == 'post' || $post_mode == 'reply') && $post_approved)
-		{
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = ' . $data['post_id'];
-			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . $db->sql_escape($subject) . "'";
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . $current_time;
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $user->data['user_id'];
-			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape((!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : '')) . "'";
-			$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . $db->sql_escape($user->data['user_colour']) . "'";
-		}
-		else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies']))
-		{
-			// this does not _necessarily_ mean that we must update the info again,
-			// it just means that we might have to
-			$sql = 'SELECT forum_last_post_id, forum_last_post_subject
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_id = ' . (int) $data['forum_id'];
-			$result = $db->sql_query($sql);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			// this post is the latest post in the forum, better update
-			if ($row['forum_last_post_id'] == $data['post_id'])
-			{
-				// If post approved and subject changed, or poster is anonymous, we need to update the forum_last* rows
-				if ($post_approved && ($row['forum_last_post_subject'] !== $subject || $data['poster_id'] == ANONYMOUS))
-				{
-					// the post's subject changed
-					if ($row['forum_last_post_subject'] !== $subject)
-					{
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_subject = \'' . $db->sql_escape($subject) . '\'';
-					}
+		// If the post was not approved, it could also be the starter,
+		// so we sync the starter after approving/restoring, to ensure that the stats are correct
+		// Same applies for the last post
+		$is_starter = ($post_mode == 'edit_first_post' || $data['post_visibility'] != ITEM_APPROVED);
+		$is_latest = ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || $data['post_visibility'] != ITEM_APPROVED);
 
-					// Update the user name if poster is anonymous... just in case an admin changed it
-					if ($data['poster_id'] == ANONYMOUS)
-					{
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape($username) . "'";
-					}
-				}
-				else if ($data['post_visibility'] !== $post_approved)
-				{
-					// we need a fresh change of socks, everything has become invalidated
-					$sql = 'SELECT MAX(topic_last_post_id) as last_post_id
-						FROM ' . TOPICS_TABLE . '
-						WHERE forum_id = ' . (int) $data['forum_id'] . '
-							AND topic_visibility = ' . ITEM_APPROVED;
-					$result = $db->sql_query($sql);
-					$row = $db->sql_fetchrow($result);
-					$db->sql_freeresult($result);
-
-					// any posts left in this forum?
-					if (!empty($row['last_post_id']))
-					{
-						$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour
-							FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-							WHERE p.poster_id = u.user_id
-								AND p.post_id = ' . (int) $row['last_post_id'];
-						$result = $db->sql_query($sql);
-						$row = $db->sql_fetchrow($result);
-						$db->sql_freeresult($result);
-
-						// salvation, a post is found! jam it into the forums table
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = ' . (int) $row['post_id'];
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . $db->sql_escape($row['post_subject']) . "'";
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . (int) $row['post_time'];
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $row['poster_id'];
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape(($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']) . "'";
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . $db->sql_escape($row['user_colour']) . "'";
-					}
-					else
-					{
-						// just our luck, the last topic in the forum has just been turned unapproved...
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = 0';
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = ''";
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = 0';
-						$sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = 0';
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = ''";
-						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = ''";
-					}
-				}
-			}
-		}
+		phpbb_content_visibility::set_post_visibility($post_visibility, $data['post_id'], $data['topic_id'], $data['forum_id'], $user->data['user_id'], time(), '', $is_starter, $is_latest);
 	}
-
-	// topic sync time!
-	// simply, we update if it is a reply or the last post is edited
-	if ($post_approved)
+	else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies']))
 	{
-		// reply requires the whole thing
-		if ($post_mode == 'reply')
-		{
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_id = ' . (int) $data['post_id'];
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_poster_id = ' . (int) $user->data['user_id'];
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_name = '" . $db->sql_escape((!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : '')) . "'";
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_colour = '" . (($user->data['user_id'] != ANONYMOUS) ? $db->sql_escape($user->data['user_colour']) : '') . "'";
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_post_subject = '" . $db->sql_escape($subject) . "'";
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_time = ' . (int) $current_time;
-		}
-		else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies']))
+		if ($post_visibility == ITEM_APPROVED || $data['topic_visibility'] == $post_visibility)
 		{
 			// only the subject can be changed from edit
 			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_post_subject = '" . $db->sql_escape($subject) . "'";
@@ -2307,57 +2211,44 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			{
 				$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_name = '" . $db->sql_escape($username) . "'";
 			}
-		}
-	}
-	else if ($data['post_visibility'] != ITEM_APPROVED && ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies'])))
-	{
-		// like having the rug pulled from under us
-		$sql = 'SELECT MAX(post_id) as last_post_id
-			FROM ' . POSTS_TABLE . '
-			WHERE topic_id = ' . (int) $data['topic_id'] . '
-				AND post_visibility = ' . ITEM_APPROVED;
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		// any posts left in this forum?
-		if (!empty($row['last_post_id']))
-		{
-			$sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour
-				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
-				WHERE p.poster_id = u.user_id
-					AND p.post_id = ' . (int) $row['last_post_id'];
-			$result = $db->sql_query($sql);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
 
-			// salvation, a post is found! jam it into the topics table
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_id = ' . (int) $row['post_id'];
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_post_subject = '" . $db->sql_escape($row['post_subject']) . "'";
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_time = ' . (int) $row['post_time'];
-			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_poster_id = ' . (int) $row['poster_id'];
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_name = '" . $db->sql_escape(($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']) . "'";
-			$sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_colour = '" . $db->sql_escape($row['user_colour']) . "'";
-		}
-	}
+			if ($post_visibility == ITEM_APPROVED)
+			{
+				// this does not _necessarily_ mean that we must update the info again,
+				// it just means that we might have to
+				$sql = 'SELECT forum_last_post_id, forum_last_post_subject
+					FROM ' . FORUMS_TABLE . '
+					WHERE forum_id = ' . (int) $data['forum_id'];
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
 
-	// Update total post count, do not consider moderated posts/topics
-	if ($post_approval)
-	{
-		if ($post_mode == 'post')
-		{
-			set_config_count('num_topics', 1, true);
-			set_config_count('num_posts', 1, true);
-		}
+				// this post is the latest post in the forum, better update
+				if ($row['forum_last_post_id'] == $data['post_id'] && ($row['forum_last_post_subject'] !== $subject || $data['poster_id'] == ANONYMOUS))
+				{
+					// the post's subject changed
+					if ($row['forum_last_post_subject'] !== $subject)
+					{
+						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . $db->sql_escape($subject) . "'";
+					}
 
-		if ($post_mode == 'reply')
-		{
-			set_config_count('num_posts', 1, true);
+					// Update the user name if poster is anonymous... just in case a moderator changed it
+					if ($data['poster_id'] == ANONYMOUS)
+					{
+						$sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape($username) . "'";
+					}
+				}
+			}
 		}
 	}
 
 	// Update forum stats
-	$where_sql = array(POSTS_TABLE => 'post_id = ' . $data['post_id'], TOPICS_TABLE => 'topic_id = ' . $data['topic_id'], FORUMS_TABLE => 'forum_id = ' . $data['forum_id'], USERS_TABLE => 'user_id = ' . $poster_id);
+	$where_sql = array(
+		POSTS_TABLE		=> 'post_id = ' . $data['post_id'],
+		TOPICS_TABLE	=> 'topic_id = ' . $data['topic_id'],
+		FORUMS_TABLE	=> 'forum_id = ' . $data['forum_id'],
+		USERS_TABLE		=> 'user_id = ' . $poster_id
+	);
 
 	foreach ($sql_data as $table => $update_ary)
 	{
@@ -2469,14 +2360,14 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	}
 
 	// Send Notifications
-	if (($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_approval)
+	if (($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_visibility == ITEM_APPROVED)
 	{
 		user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id']);
 	}
 
 	$params = $add_anchor = '';
 
-	if ($post_approval)
+	if ($post_visibility == ITEM_APPROVED)
 	{
 		$params .= '&amp;t=' . $data['topic_id'];
 
-- 
cgit v1.2.1


From b33e5273942c4f67e8168763eec224fd61edaa8f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 9 Oct 2012 22:02:49 -0500
Subject: [ticket/11103] Working on report notifications (post/pm)

PHPBB3-11103
---
 phpBB/includes/mcp/mcp_reports.php                 |   6 +-
 phpBB/includes/notification/type/post_in_queue.php |   2 +-
 phpBB/includes/notification/type/report.php        |  85 ----------
 phpBB/includes/notification/type/report_pm.php     | 178 +++++++++++++++++++++
 phpBB/includes/notification/type/report_post.php   | 139 ++++++++++++++++
 5 files changed, 323 insertions(+), 87 deletions(-)
 delete mode 100644 phpBB/includes/notification/type/report.php
 create mode 100644 phpBB/includes/notification/type/report_pm.php
 create mode 100644 phpBB/includes/notification/type/report_post.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 2890cd56e2..b43f9d6ec4 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -34,6 +34,7 @@ class mcp_reports
 	{
 		global $auth, $db, $user, $template, $cache;
 		global $config, $phpbb_root_path, $phpEx, $action;
+		global $phpbb_notifications;
 
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
 
@@ -87,6 +88,9 @@ class mcp_reports
 					trigger_error('NO_REPORT');
 				}
 
+				// Mark the notification as read
+				$phpbb_notifications->mark_notifications_read('report_post', $post_id, $user->data['user_id']);
+
 				if (!$report_id && $report['report_closed'])
 				{
 					trigger_error('REPORT_CLOSED');
@@ -413,7 +417,7 @@ class mcp_reports
 
 				$base_url = $this->u_action . "&amp;f=$forum_id&amp;t=$topic_id&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir";
 				phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total, $config['topics_per_page'], $start);
-				
+
 				// Now display the page
 				$template->assign_vars(array(
 					'L_EXPLAIN'				=> ($mode == 'reports') ? $user->lang['MCP_REPORTS_OPEN_EXPLAIN'] : $user->lang['MCP_REPORTS_CLOSED_EXPLAIN'],
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 60b4bb4937..1d75ca4dc9 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -99,7 +99,7 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $this->db->sql_in_set('user_id', $auth_approve[$post['forum_id']]['m_approve']);
+				AND " . $this->db->sql_in_set('user_id', $auth_approve[$post['forum_id']][$this->permission]);
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
diff --git a/phpBB/includes/notification/type/report.php b/phpBB/includes/notification/type/report.php
deleted file mode 100644
index 76c37c99f0..0000000000
--- a/phpBB/includes/notification/type/report.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post notifications class
-* This class handles notifications for replies to a topic
-*
-* @package notifications
-*/
-class phpbb_notification_type_report extends phpbb_notification_type_post_in_queue
-{
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'topic_notify';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_REPORT';
-
-	/**
-	* Permission to check for (in find_users_for_notification)
-	*
-	* @var string Permission name
-	*/
-	protected $permission = 'm_report';
-
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'report';
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array(
-			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
-			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
-
-			'U_VIEW_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
-			'U_NEWEST_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
-			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
-			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
-			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
-			'U_STOP_WATCHING_TOPIC'		=> generate_board_url() . "/viewtopic.{$this->php_ext}?uid={$this->user_id}&f={$this->get_data('forum_id')}&t={$this->item_parent_id}&unwatch=topic",
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports");
-	}
-}
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
new file mode 100644
index 0000000000..9c680ce6a9
--- /dev/null
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -0,0 +1,178 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Private message notifications class
+* This class handles notifications for reporting private messages
+*
+* @package notifications
+*/
+class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'notifications/report_post';
+
+	/**
+	* Permission to check for (in find_users_for_notification)
+	*
+	* @var string Permission name
+	*/
+	protected $permission = 'm_report';
+
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'report',
+		'lang'	=> 'NOTIFICATION_TYPE_REPORT',
+	);
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'report_pm';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param array $post Data from the post
+	*
+	* @return array
+	*/
+	public function find_users_for_notification($post, $options = array())
+	{
+		$options = array_merge(array(
+			'ignore_users'		=> array(),
+		), $options);
+
+		$auth_approve = $this->auth->acl_get_list(false, $this->permission, $post['forum_id']);
+
+		if (empty($auth_approve))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::$notification_option['id'] . "'
+				AND " . $this->db->sql_in_set('user_id', $auth_approve[$post['forum_id']][$this->permission]);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			{
+				continue;
+			}
+
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$notify_users[$row['user_id']] = array();
+			}
+
+			$notify_users[$row['user_id']][] = $row['method'];
+		}
+		$this->db->sql_freeresult($result);
+
+		return $notify_users;
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		$board_url = generate_board_url();
+
+		return array(
+			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
+			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
+
+			'U_VIEW_REPORT'				=> "{$board_url}mcp.{$this->php_ext}?f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports",
+			'U_VIEW_POST'				=> "{$board_url}/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
+			'U_NEWEST_POST'				=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
+			'U_TOPIC'					=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
+			'U_VIEW_TOPIC'				=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
+			'U_FORUM'					=> "{$board_url}/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports");
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		$this->user->add_lang('mcp');
+
+		if (isset($this->user->lang[$this->get_data('reason_title')]))
+		{
+			return $this->user->lang(
+				$this->language_key,
+				censor_text($this->get_data('post_subject')),
+				$this->user->lang[$this->get_data('reason_title')]
+			);
+		}
+
+		return $this->user->lang(
+			$this->language_key,
+			censor_text($this->get_data('post_subject')),
+			$this->get_data('reason_description')
+		);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('reason_title', strtoupper($post['reason_title']));
+		$this->set_data('reason_description', $post['reason_description']);
+
+		return parent::create_insert_array($post);
+	}
+}
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
new file mode 100644
index 0000000000..70d3a4c114
--- /dev/null
+++ b/phpBB/includes/notification/type/report_post.php
@@ -0,0 +1,139 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Reported post notifications class
+* This class handles notifications for reported posts
+*
+* @package notifications
+*/
+class phpbb_notification_type_report_post extends phpbb_notification_type_post_in_queue
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = 'notifications/report_post';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_REPORT';
+
+	/**
+	* Permission to check for (in find_users_for_notification)
+	*
+	* @var string Permission name
+	*/
+	protected $permission = 'm_report';
+
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id' and 'lang')
+	*/
+	public static $notification_option = array(
+		'id'	=> 'report',
+		'lang'	=> 'NOTIFICATION_TYPE_REPORT',
+	);
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'report_post';
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		$board_url = generate_board_url();
+
+		return array(
+			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
+			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
+
+			'U_VIEW_REPORT'				=> "{$board_url}mcp.{$this->php_ext}?f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports",
+			'U_VIEW_POST'				=> "{$board_url}/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
+			'U_NEWEST_POST'				=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
+			'U_TOPIC'					=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
+			'U_VIEW_TOPIC'				=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
+			'U_FORUM'					=> "{$board_url}/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports");
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		$this->user->add_lang('mcp');
+
+		if (isset($this->user->lang[$this->get_data('reason_title')]))
+		{
+			return $this->user->lang(
+				$this->language_key,
+				censor_text($this->get_data('post_subject')),
+				$this->user->lang[$this->get_data('reason_title')]
+			);
+		}
+
+		return $this->user->lang(
+			$this->language_key,
+			censor_text($this->get_data('post_subject')),
+			$this->get_data('reason_description')
+		);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('reason_title', strtoupper($post['reason_title']));
+		$this->set_data('reason_description', $post['reason_description']);
+
+		return parent::create_insert_array($post);
+	}
+}
-- 
cgit v1.2.1


From 6d53bd4675e00419bcfcf476b03166b9774bebca Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 9 Oct 2012 22:28:41 -0500
Subject: [ticket/11103] Finishing up PM Report notifications

PHPBB3-11103
---
 phpBB/includes/mcp/mcp_pm_reports.php            |  4 +++
 phpBB/includes/notification/type/report_pm.php   | 44 ++++++++++++++++--------
 phpBB/includes/notification/type/report_post.php |  2 +-
 3 files changed, 34 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index 24e531517c..227c89bb79 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -34,6 +34,7 @@ class mcp_pm_reports
 	{
 		global $auth, $db, $user, $template, $cache;
 		global $config, $phpbb_root_path, $phpEx, $action;
+		global $phpbb_notifications;
 
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
 		include_once($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
@@ -89,6 +90,9 @@ class mcp_pm_reports
 					trigger_error('NO_REPORT');
 				}
 
+				// Mark the notification as read
+				$phpbb_notifications->mark_notifications_read_by_parent('report_pm', $report_id, $user->data['user_id']);
+
 				$pm_id = $report['pm_id'];
 				$report_id = $report['report_id'];
 
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 9c680ce6a9..e9fa4c0f11 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -28,7 +28,14 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	*
 	* @var string
 	*/
-	public $email_template = 'notifications/report_post';
+	public $email_template = 'notifications/report_pm';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_REPORT_PM';
 
 	/**
 	* Permission to check for (in find_users_for_notification)
@@ -57,8 +64,19 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 		return 'report_pm';
 	}
 
+	/**
+	* Get the id of the parent
+	*
+	* @param array $pm The data from the pm
+	*/
+	public static function get_item_parent_id($pm)
+	{
+		return (int) $pm['report_id'];
+	}
+
 	/**
 	* Find the users who want to receive notifications
+	*  (copied from post_in_queue)
 	*
 	* @param array $post Data from the post
 	*
@@ -70,6 +88,9 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 			'ignore_users'		=> array(),
 		), $options);
 
+		// Global
+		$post['forum_id'] = 0;
+
 		$auth_approve = $this->auth->acl_get_list(false, $this->permission, $post['forum_id']);
 
 		if (empty($auth_approve))
@@ -110,18 +131,11 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	*/
 	public function get_email_template_variables()
 	{
-		$board_url = generate_board_url();
-
 		return array(
-			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
-			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
-
-			'U_VIEW_REPORT'				=> "{$board_url}mcp.{$this->php_ext}?f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports",
-			'U_VIEW_POST'				=> "{$board_url}/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
-			'U_NEWEST_POST'				=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
-			'U_TOPIC'					=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
-			'U_VIEW_TOPIC'				=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
-			'U_FORUM'					=> "{$board_url}/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
+			'AUTHOR_NAME'				=> htmlspecialchars_decode($user_data['username']),
+			'SUBJECT'					=> htmlspecialchars_decode(censor_text($this->get_data('message_subject'))),
+
+			'U_VIEW_REPORT'				=> generate_board_url() . "mcp.{$this->php_ext}?r={$this->item_parent_id}&amp;i=pm_reports&amp;mode=pm_report_details",
 		);
 	}
 
@@ -132,7 +146,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	*/
 	public function get_url()
 	{
-		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports");
+		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "r={$this->item_parent_id}&amp;i=pm_reports&amp;mode=pm_report_details");
 	}
 
 	/**
@@ -148,14 +162,14 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 		{
 			return $this->user->lang(
 				$this->language_key,
-				censor_text($this->get_data('post_subject')),
+				censor_text($this->get_data('message_subject')),
 				$this->user->lang[$this->get_data('reason_title')]
 			);
 		}
 
 		return $this->user->lang(
 			$this->language_key,
-			censor_text($this->get_data('post_subject')),
+			censor_text($this->get_data('message_subject')),
 			$this->get_data('reason_description')
 		);
 	}
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index 70d3a4c114..df67a8e338 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -35,7 +35,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	*
 	* @var string
 	*/
-	protected $language_key = 'NOTIFICATION_REPORT';
+	protected $language_key = 'NOTIFICATION_REPORT_POST';
 
 	/**
 	* Permission to check for (in find_users_for_notification)
-- 
cgit v1.2.1


From 18f77020e5c4a33e2b9bb1145342dab7ea55fd32 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 10 Oct 2012 23:10:46 +0200
Subject: [feature/soft-delete] Fix several problems in the forum mcp

PHPBB3-9567
---
 phpBB/includes/mcp/info/mcp_queue.php | 2 +-
 phpBB/includes/mcp/mcp_forum.php      | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/info/mcp_queue.php b/phpBB/includes/mcp/info/mcp_queue.php
index 31e9cc9af6..43f6c81694 100644
--- a/phpBB/includes/mcp/info/mcp_queue.php
+++ b/phpBB/includes/mcp/info/mcp_queue.php
@@ -21,7 +21,7 @@ class mcp_queue_info
 			'modes'		=> array(
 				'unapproved_topics'	=> array('title' => 'MCP_QUEUE_UNAPPROVED_TOPICS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')),
 				'unapproved_posts'	=> array('title' => 'MCP_QUEUE_UNAPPROVED_POSTS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')),
-				'deleted_posts'		=> array('title' => 'MCP_QUEUE_DELETED_POSTS', 'auth' => 'aclf_m_restore', 'cat' => array('MCP_QUEUE')),
+				'deleted_posts'		=> array('title' => 'MCP_QUEUE_DELETED_POSTS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')),
 				'approve_details'	=> array('title' => 'MCP_QUEUE_APPROVE_DETAILS', 'auth' => 'acl_m_approve,$id || (!$id && aclf_m_approve)', 'cat' => array('MCP_QUEUE')),
 			),
 		);
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index ff079baeb8..02a1ba6dcc 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -154,7 +154,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 	$sql = 'SELECT t.topic_id
 		FROM ' . TOPICS_TABLE . ' t
 		WHERE t.forum_id = ' . $forum_id . '
-			' . phpbb_content_visibility::get_visibility_sql('topic', $forum_id, 't.') . "
+			AND ' . phpbb_content_visibility::get_visibility_sql('topic', $forum_id, 't.') . "
 			$limit_time_sql
 		ORDER BY t.topic_type DESC, $sort_order_sql";
 	$result = $db->sql_query_limit($sql, $topics_per_page, $start);
@@ -222,8 +222,9 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 		$topic_unapproved = ($row['topic_visibility'] == ITEM_UNAPPROVED  && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
 		$posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
-		$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? $url . '&amp;i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . '&amp;t=' . $row['topic_id'] : '';
 		$topic_deleted = ($row['topic_visibility'] == ITEM_DELETED) ? true : false;
+		$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? $url . '&amp;i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . '&amp;t=' . $row['topic_id'] : '';
+		$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? $url . 'i=queue&amp;mode=deleted_posts&amp;t=' . $topic_id : $u_mcp_queue;
 
 		$topic_row = array(
 			'ATTACH_ICON_IMG'		=> ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
@@ -233,7 +234,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 			'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
 			'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
 			'UNAPPROVED_IMG'		=> ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '',
-			'DELETED_IMG'           => ($topic_deleted) ? $user->img(/*TODO*/) : '',
+			'DELETED_IMG'			=> ($topic_deleted) ? $user->img('icon_topic_deleted', 'POSTS_DELETED') : '',
 
 			'TOPIC_AUTHOR'				=> get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
 			'TOPIC_AUTHOR_COLOUR'		=> get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
@@ -256,7 +257,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 			'S_TOPIC_REPORTED'		=> (!empty($row['topic_reported']) && empty($row['topic_moved_id']) && $auth->acl_get('m_report', $row['forum_id'])) ? true : false,
 			'S_TOPIC_UNAPPROVED'	=> $topic_unapproved,
 			'S_POSTS_UNAPPROVED'	=> $posts_unapproved,
-			'S_TOPIC_DELETED'       => $topic_deleted,
+			'S_TOPIC_DELETED'		=> $topic_deleted,
 			'S_UNREAD_TOPIC'		=> $unread_topic,
 
 		);
-- 
cgit v1.2.1


From 1b56a1d6be12afb851a158a5e09965a6528d1435 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Oct 2012 22:36:48 -0500
Subject: [ticket/11103] Finishing up report post/pm and adding report closed

PHPBB3-11103
---
 phpBB/includes/mcp/mcp_reports.php                 |  34 ++---
 phpBB/includes/notification/type/report_pm.php     |  25 ++++
 .../notification/type/report_pm_closed.php         | 140 +++++++++++++++++++++
 phpBB/includes/notification/type/report_post.php   |  25 ++++
 .../notification/type/report_post_closed.php       | 140 +++++++++++++++++++++
 5 files changed, 342 insertions(+), 22 deletions(-)
 create mode 100644 phpBB/includes/notification/type/report_pm_closed.php
 create mode 100644 phpBB/includes/notification/type/report_post_closed.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index b43f9d6ec4..7c6352a244 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -448,6 +448,7 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 {
 	global $db, $template, $user, $config, $auth;
 	global $phpEx, $phpbb_root_path;
+	global $phpbb_notifications;
 
 	$pm_where = ($pm) ? ' AND r.post_id = 0 ' : ' AND r.pm_id = 0 ';
 	$id_column = ($pm) ? 'pm_id' : 'post_id';
@@ -633,8 +634,6 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 			}
 		}
 
-		$messenger = new messenger();
-
 		// Notify reporters
 		if (sizeof($notify_reporters))
 		{
@@ -647,30 +646,23 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 
 				$post_id = $reporter[$id_column];
 
-				$messenger->template((($pm) ? 'pm_report_' : 'report_') . $action . 'd', $reporter['user_lang']);
-
-				$messenger->to($reporter['user_email'], $reporter['username']);
-				$messenger->im($reporter['user_jabber'], $reporter['username']);
-
 				if ($pm)
 				{
-					$messenger->assign_vars(array(
-						'USERNAME'		=> htmlspecialchars_decode($reporter['username']),
-						'CLOSER_NAME'	=> htmlspecialchars_decode($user->data['username']),
-						'PM_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_info[$post_id]['message_subject'])),
-					));
+					$phpbb_notifications->add_notifications('report_pm_closed', array_merge($post_info[$post_id], array(
+						'reporter'			=> $reporter['user_id'],
+						'closer_id'			=> $user->data['user_id'],
+						'from_user_id'		=> $post_info[$post_id]['author_id'],
+					)));
+					$phpbb_notifications->delete_notifications('report_pm', $post_id);
 				}
 				else
 				{
-					$messenger->assign_vars(array(
-						'USERNAME'		=> htmlspecialchars_decode($reporter['username']),
-						'CLOSER_NAME'	=> htmlspecialchars_decode($user->data['username']),
-						'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_info[$post_id]['post_subject'])),
-						'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_info[$post_id]['topic_title'])))
-					);
+					$phpbb_notifications->add_notifications('report_post_closed', array_merge($post_info[$post_id], array(
+						'reporter'			=> $reporter['user_id'],
+						'closer_id'			=> $user->data['user_id'],
+					)));
+					$phpbb_notifications->delete_notifications('report_post', $post_id);
 				}
-
-				$messenger->send($reporter['user_notify_type']);
 			}
 		}
 
@@ -685,8 +677,6 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 
 		unset($notify_reporters, $post_info, $reports);
 
-		$messenger->save_queue();
-
 		$success_msg = (sizeof($report_id_list) == 1) ? "{$pm_prefix}REPORT_" . strtoupper($action) . 'D_SUCCESS' : "{$pm_prefix}REPORTS_" . strtoupper($action) . 'D_SUCCESS';
 	}
 	else
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index e9fa4c0f11..af1f71433c 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -158,10 +158,15 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	{
 		$this->user->add_lang('mcp');
 
+		$user_data = $this->notification_manager->get_user($this->get_data('reporter_id'));
+
+		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+
 		if (isset($this->user->lang[$this->get_data('reason_title')]))
 		{
 			return $this->user->lang(
 				$this->language_key,
+				$username,
 				censor_text($this->get_data('message_subject')),
 				$this->user->lang[$this->get_data('reason_title')]
 			);
@@ -169,11 +174,30 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 
 		return $this->user->lang(
 			$this->language_key,
+				$username,
 			censor_text($this->get_data('message_subject')),
 			$this->get_data('reason_description')
 		);
 	}
 
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('reporter_id'));
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['reporter_id']);
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
@@ -184,6 +208,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	*/
 	public function create_insert_array($post)
 	{
+		$this->set_data('reporter_id', $this->user->data['user_id']);
 		$this->set_data('reason_title', strtoupper($post['reason_title']));
 		$this->set_data('reason_description', $post['reason_description']);
 
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
new file mode 100644
index 0000000000..534e1288a6
--- /dev/null
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -0,0 +1,140 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Reported post notifications class
+* This class handles notifications for reported pms
+*
+* @package notifications
+*/
+class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_pm
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = '';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_REPORT_CLOSED';
+
+	public function is_available()
+	{
+		return false;
+	}
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'report_pm_closed';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public function find_users_for_notification($post, $options = array())
+	{
+		return array($post['reporter'] => array(''));
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		return array();
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return '';
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		$user_data = $this->notification_manager->get_user($this->get_data('closer_id'));
+
+		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+
+		return $this->user->lang(
+			$this->language_key,
+			$username,
+			censor_text($this->get_data('message_subject'))
+		);
+	}
+
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('closer_id'));
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['closer_id']);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('closer_id', $post['closer_id']);
+
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
+
+		return $data;
+	}
+}
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index df67a8e338..2346e4e57c 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -105,10 +105,15 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	{
 		$this->user->add_lang('mcp');
 
+		$user_data = $this->notification_manager->get_user($this->get_data('reporter_id'));
+
+		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+
 		if (isset($this->user->lang[$this->get_data('reason_title')]))
 		{
 			return $this->user->lang(
 				$this->language_key,
+				$username,
 				censor_text($this->get_data('post_subject')),
 				$this->user->lang[$this->get_data('reason_title')]
 			);
@@ -116,11 +121,30 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 
 		return $this->user->lang(
 			$this->language_key,
+			$username,
 			censor_text($this->get_data('post_subject')),
 			$this->get_data('reason_description')
 		);
 	}
 
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('reporter_id'));
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['reporter_id']);
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
@@ -131,6 +155,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	*/
 	public function create_insert_array($post)
 	{
+		$this->set_data('reporter_id', $this->user->data['user_id']);
 		$this->set_data('reason_title', strtoupper($post['reason_title']));
 		$this->set_data('reason_description', $post['reason_description']);
 
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
new file mode 100644
index 0000000000..d8537a8152
--- /dev/null
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -0,0 +1,140 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Reported post notifications class
+* This class handles notifications for reported posts
+*
+* @package notifications
+*/
+class phpbb_notification_type_report_post_closed extends phpbb_notification_type_post
+{
+	/**
+	* Email template to use to send notifications
+	*
+	* @var string
+	*/
+	public $email_template = '';
+
+	/**
+	* Language key used to output the text
+	*
+	* @var string
+	*/
+	protected $language_key = 'NOTIFICATION_REPORT_CLOSED';
+
+	public function is_available()
+	{
+		return false;
+	}
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'report_post_closed';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public function find_users_for_notification($post, $options = array())
+	{
+		return array($post['reporter'] => array(''));
+	}
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables()
+	{
+		return array();
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return '';
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		$user_data = $this->notification_manager->get_user($this->get_data('closer_id'));
+
+		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+
+		return $this->user->lang(
+			$this->language_key,
+			$username,
+			censor_text($this->get_data('post_subject'))
+		);
+	}
+
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('closer_id'));
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['closer_id']);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('closer_id', $post['closer_id']);
+
+		$data = parent::create_insert_array($post);
+
+		$this->time = $data['time'] = time();
+
+		return $data;
+	}
+}
-- 
cgit v1.2.1


From 1e3abdc49fa1d51703127033b0d8f2cd45da9741 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Oct 2012 22:40:48 -0500
Subject: [ticket/11103] Remove debug code

PHPBB3-11103
---
 phpBB/includes/notification/type/post.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 65b0c1adf2..a2b1fbf82a 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -149,7 +149,6 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
 				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
 				WHERE notification_id = ' . $row['notification_id'];
-				echo $sql;
 			$this->db->sql_query($sql);
 		}
 		$this->db->sql_freeresult($result);
-- 
cgit v1.2.1


From 43e3af4b46bdfe0935c766489a66c5c0f8786e3f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 12 Oct 2012 11:37:51 -0500
Subject: [ticket/11103] Notification grouping output for posts.

PHPBB3-11103
---
 phpBB/includes/notification/type/post.php | 48 ++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index a2b1fbf82a..d6f6c16e59 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -171,20 +171,36 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 	*/
 	public function get_title()
 	{
-		if ($this->get_data('post_username'))
+		$responders = $this->get_data('responders');
+		$usernames = array();
+
+		if (!is_array($responders))
 		{
-			$username = $this->get_data('post_username');
+			$responders = array();
 		}
-		else
+
+		$responders = array_merge(array(array(
+			'poster_id'		=> $this->get_data('poster_id'),
+			'username'		=> $this->get_data('post_username'),
+		)), $responders);
+
+		foreach ($responders as $responder)
 		{
-			$user_data = $this->notification_manager->get_user($this->get_data('poster_id'));
+			if ($responder['username'])
+			{
+				$usernames[] = $responder['username'];
+			}
+			else
+			{
+				$user_data = $this->notification_manager->get_user($responder['poster_id']);
 
-			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+				$usernames[] = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+			}
 		}
 
 		return $this->user->lang(
 			$this->language_key,
-			$username,
+			implode(', ', $usernames),
 			censor_text($this->get_data('topic_title'))
 		);
 	}
@@ -226,7 +242,25 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 	*/
 	public function users_to_query()
 	{
-		return array($this->data['poster_id']);
+		/*$responders[] = array(
+			'poster_id'		=> $post['poster_id'],
+			'username'		=> (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''),
+		);*/
+
+		$responders = $this->get_data('responders');
+		$users = array(
+			$this->get_data('poster_id'),
+		);
+
+		if (is_array($responders))
+		{
+			foreach ($responders as $responder)
+			{
+				$users[] = $responder['poster_id'];
+			}
+		}
+
+		return $users;
 	}
 
 	/**
-- 
cgit v1.2.1


From 8b2f1127e4167e241c41f8709964c203e401de94 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 12 Oct 2012 11:40:13 -0500
Subject: [ticket/11103] Notification grouping output for bookmark/quote

PHPBB3-11103
---
 phpBB/includes/notification/type/bookmark.php | 21 +++++++++++++++++++++
 phpBB/includes/notification/type/quote.php    | 21 +++++++++++++++++++++
 2 files changed, 42 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index 6c42f1d860..8a23859d05 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -107,6 +107,27 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 		}
 		$this->db->sql_freeresult($result);
 
+		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
+		$update_notifications = array();
+		$sql = 'SELECT *
+			FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
+				AND unread = 1';
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			// Do not create a new notification
+			unset($notify_users[$row['user_id']]);
+
+			$notification = $this->notification_manager->get_item_type_class(self::get_item_type(), $row);
+			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
+				WHERE notification_id = ' . $row['notification_id'];
+			$this->db->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+
 		return $notify_users;
 	}
 }
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 1eea8f1066..34907ef8d6 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -126,6 +126,27 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		}
 		$this->db->sql_freeresult($result);
 
+		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
+		$update_notifications = array();
+		$sql = 'SELECT *
+			FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
+				AND unread = 1';
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			// Do not create a new notification
+			unset($notify_users[$row['user_id']]);
+
+			$notification = $this->notification_manager->get_item_type_class(self::get_item_type(), $row);
+			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
+				WHERE notification_id = ' . $row['notification_id'];
+			$this->db->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+
 		return $notify_users;
 	}
 
-- 
cgit v1.2.1


From 3d79ce28031b4c85ee34bd4d43f0c64b18b1a80b Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 12 Oct 2012 16:54:42 -0500
Subject: [ticket/11103] Ability to query data before running
 create_insert_array()

Mark post/topic in queue notifications read when visiting mcp
Change post/topic in queue notification url to use MCP.

Fix the bug:
Approving a topic marks the topic as read, but before the notification
is created for the user approving the topic (if they would get a
notification that the topic has been made). This causes it to be
stuck "unread".

PHPBB3-11103
---
 phpBB/includes/mcp/mcp_queue.php                   |  7 ++++
 phpBB/includes/notification/manager.php            |  9 ++--
 phpBB/includes/notification/type/approve_post.php  |  5 ++-
 phpBB/includes/notification/type/approve_topic.php |  5 ++-
 phpBB/includes/notification/type/base.php          | 19 ++++++++-
 .../includes/notification/type/disapprove_post.php |  3 +-
 .../notification/type/disapprove_topic.php         |  5 ++-
 phpBB/includes/notification/type/interface.php     |  4 +-
 phpBB/includes/notification/type/pm.php            |  5 ++-
 phpBB/includes/notification/type/post.php          | 48 ++++++++++++++++++----
 phpBB/includes/notification/type/post_in_queue.php | 15 ++++++-
 phpBB/includes/notification/type/report_pm.php     |  5 ++-
 .../notification/type/report_pm_closed.php         |  5 ++-
 phpBB/includes/notification/type/report_post.php   |  5 ++-
 .../notification/type/report_post_closed.php       |  5 ++-
 phpBB/includes/notification/type/topic.php         | 45 ++++++++++++++++++--
 .../includes/notification/type/topic_in_queue.php  | 15 ++++++-
 17 files changed, 169 insertions(+), 36 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 77e778fc38..b23e5f4e45 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -34,6 +34,7 @@ class mcp_queue
 	{
 		global $auth, $db, $user, $template, $cache;
 		global $config, $phpbb_root_path, $phpEx, $action;
+		global $phpbb_notifications;
 
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
 
@@ -84,6 +85,9 @@ class mcp_queue
 					if (isset($topic_info[$topic_id]['topic_first_post_id']))
 					{
 						$post_id = (int) $topic_info[$topic_id]['topic_first_post_id'];
+
+						// Mark the notification as read
+						$phpbb_notifications->mark_notifications_read('topic_in_queue', $topic_id, $user->data['user_id']);
 					}
 					else
 					{
@@ -91,6 +95,9 @@ class mcp_queue
 					}
 				}
 
+				// Mark the notification as read
+				$phpbb_notifications->mark_notifications_read('post_in_queue', $post_id, $user->data['user_id']);
+
 				$post_info = get_post_data(array($post_id), 'm_approve', true);
 
 				if (!sizeof($post_info))
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index c5fd41c901..6c74fa965e 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -324,8 +324,6 @@ class phpbb_notification_manager
 
 		// Make sure not to send new notifications to users who've already been notified about this item
 		// This may happen when an item was added, but now new users are able to see the item
-		// todo Users should not receive notifications from multiple events from the same item (ex: for a topic reply with a quote including your username)
-		//		Probably should be handled within each type?
 		$sql = 'SELECT user_id
 			FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
@@ -342,6 +340,11 @@ class phpbb_notification_manager
 			return;
 		}
 
+		// Allow notifications to perform actions before creating the insert array (such as run a query to cache some data needed for all notifications)
+		$notification = $this->get_item_type_class($item_type_class_name);
+		$pre_create_data = $notification->pre_create_insert_array($data, $notify_users);
+		unset($notification);
+
 		// Go through each user so we can insert a row in the DB and then notify them by their desired means
 		foreach ($notify_users as $user => $methods)
 		{
@@ -350,7 +353,7 @@ class phpbb_notification_manager
 			$notification->user_id = (int) $user;
 
 			// Store the creation array in our new rows that will be inserted later
-			$new_rows[] = $notification->create_insert_array($data);
+			$new_rows[] = $notification->create_insert_array($data, $pre_create_data);
 
 			// Users are needed to send notifications
 			$user_ids = array_merge($user_ids, $notification->users_to_query());
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index 98dfe678c2..9275ec2f6d 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -111,14 +111,15 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($post, $pre_create_data = array())
 	{
 		$this->set_data('post_subject', $post['post_subject']);
 
-		$data = parent::create_insert_array($post);
+		$data = parent::create_insert_array($post, $pre_create_data);
 
 		$this->time = $data['time'] = time();
 
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 496dc688ad..325ccd0eab 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -111,12 +111,13 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($post, $pre_create_data = array())
 	{
-		$data = parent::create_insert_array($post);
+		$data = parent::create_insert_array($post, $pre_create_data);
 
 		$this->time = $data['time'] = time();
 
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index a41a5a8ac3..45dc463061 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -164,10 +164,11 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* (The service handles insertion)
 	*
 	* @param array $type_data Data unique to this notification type
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($type_data)
+	public function create_insert_array($type_data, $pre_create_data = array())
 	{
 		// Defaults
 		$this->data = array_merge(array(
@@ -257,6 +258,22 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		return true;
 	}
 
+	/**
+	* Pre create insert array function
+	* This allows you to perform certain actions, like run a query
+	* and load data, before create_insert_array() is run. The data
+	* returned from this function will be sent to create_insert_array().
+	*
+	* @param array $type_data Data unique to this notification type
+	* @param array $notify_users Notify users list
+	* 		Formated from find_users_for_notification()
+	* @return array Whatever you want to send to create_insert_array().
+	*/
+	public function pre_create_insert_array($type_data, $notify_users)
+	{
+		return array();
+	}
+
 	/**
 	* -------------- Helper functions -------------------
 	*/
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
index d1f7dfa85d..1bf9242c52 100644
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ b/phpBB/includes/notification/type/disapprove_post.php
@@ -98,10 +98,11 @@ class phpbb_notification_type_disapprove_post extends phpbb_notification_type_ap
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($post, $pre_create_data = array())
 	{
 		$this->set_data('disapprove_reason', $post['disapprove_reason']);
 
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
index 89c06b344f..f3e0be4883 100644
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ b/phpBB/includes/notification/type/disapprove_topic.php
@@ -98,14 +98,15 @@ class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_a
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($post, $pre_create_data = array())
 	{
 		$this->set_data('disapprove_reason', $post['disapprove_reason']);
 
-		$data = parent::create_insert_array($post);
+		$data = parent::create_insert_array($post, $pre_create_data);
 
 		$this->time = $data['time'] = time();
 
diff --git a/phpBB/includes/notification/type/interface.php b/phpBB/includes/notification/type/interface.php
index 56fad9fd80..084a819af7 100644
--- a/phpBB/includes/notification/type/interface.php
+++ b/phpBB/includes/notification/type/interface.php
@@ -41,7 +41,9 @@ interface phpbb_notification_type_interface
 
 	public function mark_unread($return);
 
-	public function create_insert_array($type_data);
+	public function pre_create_insert_array($type_data, $notify_users);
+
+	public function create_insert_array($type_data, $pre_create_data);
 
 	public function users_to_query();
 
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index 9f9a3e2892..c2065fef99 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -170,15 +170,16 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($pm)
+	public function create_insert_array($pm, $pre_create_data = array())
 	{
 		$this->set_data('from_user_id', $pm['from_user_id']);
 
 		$this->set_data('message_subject', $pm['message_subject']);
 
-		return parent::create_insert_array($pm);
+		return parent::create_insert_array($pm, $pre_create_data);
 	}
 }
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index d6f6c16e59..76a7846f30 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -242,11 +242,6 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 	*/
 	public function users_to_query()
 	{
-		/*$responders[] = array(
-			'poster_id'		=> $post['poster_id'],
-			'username'		=> (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''),
-		);*/
-
 		$responders = $this->get_data('responders');
 		$users = array(
 			$this->get_data('poster_id'),
@@ -263,15 +258,47 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		return $users;
 	}
 
+	/**
+	* Pre create insert array function
+	* This allows you to perform certain actions, like run a query
+	* and load data, before create_insert_array() is run. The data
+	* returned from this function will be sent to create_insert_array().
+	*
+	* @param array $post Post data from submit_post
+	* @param array $notify_users Notify users list
+	* 		Formated from find_users_for_notification()
+	* @return array Whatever you want to send to create_insert_array().
+	*/
+	public function pre_create_insert_array($post, $notify_users)
+	{
+		if (!sizeof($notify_users))
+		{
+			return array();
+		}
+
+		$tracking_data = array();
+		$sql = 'SELECT user_id, mark_time FROM ' . TOPICS_TRACK_TABLE . '
+			WHERE topic_id = ' . (int) $post['topic_id'] . '
+				AND ' . $this->db->sql_in_set('user_id', array_keys($notify_users));
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$tracking_data[$row['user_id']] = $row['mark_time'];
+		}
+
+		return $tracking_data;
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($post, $pre_create_data = array())
 	{
 		$this->set_data('poster_id', $post['poster_id']);
 
@@ -287,7 +314,14 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 
 		$this->time = $post['post_time'];
 
-		return parent::create_insert_array($post);
+		// Topics can be "read" before they are public (while awaiting approval).
+		// Make sure that if the user has read the topic, it's marked as read in the notification
+		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->time)
+		{
+			$this->unread = false;
+		}
+
+		return parent::create_insert_array($post, $pre_create_data);
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 1d75ca4dc9..f00a83de36 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -120,17 +120,28 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 		return $notify_users;
 	}
 
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "i=queue&amp;mode=approve_details&amp;f={$this->get_data('forum_id')}&amp;p={$this->item_id}");
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($post, $pre_create_data = array())
 	{
-		$data = parent::create_insert_array($post);
+		$data = parent::create_insert_array($post, $pre_create_data);
 
 		$this->time = $data['time'] = time();
 
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index af1f71433c..db0ad6ac6e 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -203,15 +203,16 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($post, $pre_create_data = array())
 	{
 		$this->set_data('reporter_id', $this->user->data['user_id']);
 		$this->set_data('reason_title', strtoupper($post['reason_title']));
 		$this->set_data('reason_description', $post['reason_description']);
 
-		return parent::create_insert_array($post);
+		return parent::create_insert_array($post, $pre_create_data);
 	}
 }
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index 534e1288a6..f5790ba449 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -124,14 +124,15 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($post, $pre_create_data = array())
 	{
 		$this->set_data('closer_id', $post['closer_id']);
 
-		$data = parent::create_insert_array($post);
+		$data = parent::create_insert_array($post, $pre_create_data);
 
 		$this->time = $data['time'] = time();
 
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index 2346e4e57c..d7a0d58167 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -150,15 +150,16 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($post, $pre_create_data = array())
 	{
 		$this->set_data('reporter_id', $this->user->data['user_id']);
 		$this->set_data('reason_title', strtoupper($post['reason_title']));
 		$this->set_data('reason_description', $post['reason_description']);
 
-		return parent::create_insert_array($post);
+		return parent::create_insert_array($post, $pre_create_data);
 	}
 }
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index d8537a8152..0d5c5b292e 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -124,14 +124,15 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($post, $pre_create_data = array())
 	{
 		$this->set_data('closer_id', $post['closer_id']);
 
-		$data = parent::create_insert_array($post);
+		$data = parent::create_insert_array($post, $pre_create_data);
 
 		$this->time = $data['time'] = time();
 
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 1c3d216b18..cb38b0274e 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -76,7 +76,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 	public function find_users_for_notification($topic, $options = array())
 	{
 		$options = array_merge(array(
-			'ignore_users'		=> array(),
+			'ignore_users'			=> array(),
 		), $options);
 
 		// Let's continue to use the phpBB subscriptions system, at least for now.
@@ -207,15 +207,47 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		return array($this->data['poster_id']);
 	}
 
+	/**
+	* Pre create insert array function
+	* This allows you to perform certain actions, like run a query
+	* and load data, before create_insert_array() is run. The data
+	* returned from this function will be sent to create_insert_array().
+	*
+	* @param array $post Post data from submit_post
+	* @param array $notify_users Notify users list
+	* 		Formated from find_users_for_notification()
+	* @return array Whatever you want to send to create_insert_array().
+	*/
+	public function pre_create_insert_array($post, $notify_users)
+	{
+		if (!sizeof($notify_users))
+		{
+			return array();
+		}
+
+		$tracking_data = array();
+		$sql = 'SELECT user_id, mark_time FROM ' . TOPICS_TRACK_TABLE . '
+			WHERE topic_id = ' . (int) $post['topic_id'] . '
+				AND ' . $this->db->sql_in_set('user_id', array_keys($notify_users));
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$tracking_data[$row['user_id']] = $row['mark_time'];
+		}
+
+		return $tracking_data;
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
 	*
 	* @param array $post Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post)
+	public function create_insert_array($post, $pre_create_data = array())
 	{
 		$this->set_data('poster_id', $post['poster_id']);
 
@@ -227,6 +259,13 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 
 		$this->time = $post['post_time'];
 
-		return parent::create_insert_array($post);
+		// Topics can be "read" before they are public (while awaiting approval).
+		// Make sure that if the user has read the topic, it's marked as read in the notification
+		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->time)
+		{
+			$this->unread = false;
+		}
+
+		return parent::create_insert_array($post, $pre_create_data);
 	}
 }
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index bee0ebbb22..176ec0b901 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -113,17 +113,28 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 		return $notify_users;
 	}
 
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "i=queue&amp;mode=approve_details&amp;f={$this->item_parent_id}&amp;t={$this->item_id}");
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
 	*
 	* @param array $topic Data from submit_post
+	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($topic)
+	public function create_insert_array($topic, $pre_create_data = array())
 	{
-		$data = parent::create_insert_array($topic);
+		$data = parent::create_insert_array($topic, $pre_create_data);
 
 		$this->time = $data['time'] = time();
 
-- 
cgit v1.2.1


From 4bf922fa03ae80533c726bd10aeab1f0bad0d179 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 13 Oct 2012 19:00:08 +0200
Subject: [feature/soft-delete] Fix restoring posts via MCP

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_queue.php | 60 +++++++++++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index b1b4ea99aa..184959dfb6 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -230,14 +230,7 @@ class mcp_queue
 			case 'unapproved_topics':
 			case 'unapproved_posts':
 			case 'deleted_posts':
-				if ($mode == 'deleted_posts')
-				{
-					$m_perm = 'm_restore';
-				}
-				else
-				{
-					$m_perm = 'm_approve';
-				}
+				$m_perm = 'm_approve';
 
 				$user->add_lang(array('viewtopic', 'viewforum'));
 
@@ -472,7 +465,7 @@ function restore_post($post_id_list, $id, $mode)
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path, $request;
 
-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_restore')))
+	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 	{
 		trigger_error('NOT_AUTHORISED');
 	}
@@ -481,9 +474,51 @@ function restore_post($post_id_list, $id, $mode)
 	$redirect = reapply_sid($redirect);
 	$success_msg = '';
 
-	$post_info = get_post_data($post_id_list, 'm_restore');
+	$post_info = get_post_data($post_id_list, 'm_approve');
+
+	$topic_info = array();
+
+	// Group the posts by topic_id
+	foreach ($post_info as $post_id => $post_data)
+	{
+		if ($post_data['post_visibility'] == ITEM_APPROVED)
+		{
+			continue;
+		}
+		$topic_id = (int) $post_data['topic_id'];
+
+		$topic_info[$topic_id]['posts'][] = (int) $post_id;
+		$topic_info[$topic_id]['forum_id'] = (int) $post_data['forum_id'];
+
+		if ($post_id == $post_data['topic_first_post_id'])
+		{
+			$topic_info[$topic_id]['first_post'] = true;
+		}
+
+		if ($post_id == $post_data['topic_last_post_id'])
+		{
+			$topic_info[$topic_id]['last_post'] = true;
+		}
+	}
+
+	foreach ($topic_info as $topic_id => $topic_data)
+	{
+		phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));
+	}
 
-	$success_msg = phpbb_content_visibility::unhide_posts_topics('restore', $post_info, $post_id_list);
+	$success_msg = '';
+	/**
+	* Currently only works for approving posts
+	if (sizeof($topic_info) > 1)
+	{
+		$success_msg = ((sizeof($post_info) == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS';
+	}
+	else
+	*/
+	if (sizeof($post_info) >= 1)
+	{
+		$success_msg = (sizeof($post_info) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS';
+	}
 
 	if (!$success_msg)
 	{
@@ -491,8 +526,6 @@ function restore_post($post_id_list, $id, $mode)
 	}
 	else
 	{
-		meta_refresh(3, $redirect);
-
 		// If approving one post, also give links back to post...
 		$add_message = '';
 		if (sizeof($post_id_list) == 1 && !empty($post_url))
@@ -513,6 +546,7 @@ function restore_post($post_id_list, $id, $mode)
 			));
 		}
 
+		meta_refresh(3, $redirect);
 		trigger_error($message);
 	}
 }
-- 
cgit v1.2.1


From 4392054044d3bf63481098cca9e27e17ae306fa0 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 17:06:01 -0500
Subject: [ticket/11103] Reported pm notifications require m_report permissions

PHPBB3-11103
---
 phpBB/includes/notification/type/report_pm.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index db0ad6ac6e..3619c5510c 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -74,6 +74,17 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 		return (int) $pm['report_id'];
 	}
 
+	/**
+	* Is available
+	*/
+	public function is_available()
+	{
+		$m_approve = $this->auth->acl_getf($this->permission, true);
+
+		return (!empty($m_approve));
+	}
+
+
 	/**
 	* Find the users who want to receive notifications
 	*  (copied from post_in_queue)
-- 
cgit v1.2.1


From 397d039ce5c7b61145b4ff8daa41e511a75122c6 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 17:37:59 -0500
Subject: [ticket/11103] Allow global moderators to receive moderator
 notifications

PHPBB3-11103
---
 phpBB/includes/notification/type/post_in_queue.php  | 5 ++++-
 phpBB/includes/notification/type/topic_in_queue.php | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index f00a83de36..4f92eb157a 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -87,13 +87,16 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 			'ignore_users'		=> array(),
 		), $options);
 
-		$auth_approve = $this->auth->acl_get_list(false, $this->permission, $post['forum_id']);
+		// 0 is for global
+		$auth_approve = $this->auth->acl_get_list(false, $this->permission, array($post['forum_id'], 0));
 
 		if (empty($auth_approve))
 		{
 			return array();
 		}
 
+		$auth_approve[$post['forum_id']] = array_unique(array_merge($auth_approve[$post['forum_id']], $auth_approve[0]));
+
 		$notify_users = array();
 
 		$sql = 'SELECT *
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index 176ec0b901..96f09cef9e 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -80,13 +80,16 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 			'ignore_users'		=> array(),
 		), $options);
 
-		$auth_approve = $this->auth->acl_get_list(false, 'm_approve', $topic['forum_id']);
+		// 0 is for global
+		$auth_approve = $this->auth->acl_get_list(false, 'm_approve', array($topic['forum_id'], 0));
 
 		if (empty($auth_approve))
 		{
 			return array();
 		}
 
+		$auth_approve[$topic['forum_id']] = array_unique(array_merge($auth_approve[$topic['forum_id']], $auth_approve[0]));
+
 		$notify_users = array();
 
 		$sql = 'SELECT *
-- 
cgit v1.2.1


From c60b15294a72d5a2be8e7d23fd1b4052ec944ec8 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 17:49:12 -0500
Subject: [ticket/11103] Global moderators with m_approve permission never need
 approval

They do not need to receive notifications if their post/topic is approved or
disapproved

PHPBB3-11103
---
 phpBB/includes/notification/type/approve_post.php  | 8 ++++++++
 phpBB/includes/notification/type/approve_topic.php | 8 ++++++++
 2 files changed, 16 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index 9275ec2f6d..dbd2e4417f 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -57,6 +57,14 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 		return 'approve_post';
 	}
 
+	/**
+	* Is available
+	*/
+	public function is_available()
+	{
+		return !$this->auth->acl_get('m_approve');
+	}
+
 	/**
 	* Find the users who want to receive notifications
 	*
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 325ccd0eab..3608bfba85 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -57,6 +57,14 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 		return 'approve_topic';
 	}
 
+	/**
+	* Is available
+	*/
+	public function is_available()
+	{
+		return !$this->auth->acl_get('m_approve');
+	}
+
 	/**
 	* Find the users who want to receive notifications
 	*
-- 
cgit v1.2.1


From 39fd31d3aedd5d583041b1ee76bed3e7d0edcf36 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 18:12:33 -0500
Subject: [ticket/11103] Trying to fix an odd issue with unread status on
 approved posts

From a recent change, when your posts/topics are approved, they will be
marked read automatically because you've read the topic/post already.

To change that I've forced the notification to be marked unread and
attempted to reset the read status on the post/topic to be unread before
the post that was approved.

This does not seem to work so well and I don't know of any way this can
really be properly fixed, so the code I was working on I've commented out.

For now, users will just need to manually mark these types of notifications
as read. I cannot think of a way for this to be fixed without running
two additional queries on every viewtopic.

PHPBB3-11103
---
 phpBB/includes/notification/type/approve_post.php  | 32 ++++++++++++++++++++++
 phpBB/includes/notification/type/approve_topic.php | 30 ++++++++++++++++++++
 2 files changed, 62 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index dbd2e4417f..68e8352a13 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -114,6 +114,38 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 		return $notify_users;
 	}
 
+	/**
+	* Pre create insert array function
+	* This allows you to perform certain actions, like run a query
+	* and load data, before create_insert_array() is run. The data
+	* returned from this function will be sent to create_insert_array().
+	*
+	* @param array $post Post data from submit_post
+	* @param array $notify_users Notify users list
+	* 		Formated from find_users_for_notification()
+	* @return array Whatever you want to send to create_insert_array().
+	*/
+	public function pre_create_insert_array($post, $notify_users)
+	{
+		/*if (!sizeof($notify_users))
+		{
+			return array();
+		}
+
+		// Mark the topic unread before the post
+		$sql = 'UPDATE ' . TOPICS_TRACK_TABLE . '
+			SET mark_time = ' . (int) ($post['post_time'] - 1) . '
+			WHERE topic_id = ' . (int) $post['topic_id'] . '
+				AND ' . $this->db->sql_in_set('user_id', array_keys($notify_users));
+		$this->db->sql_query($sql);*/
+
+		// In the parent class, this is used to check if the post is already
+		// read by a user and marks the notification read if it was marked read.
+		// Returning an empty array in effect, forces it to be marked as unread
+		// (and also saves a query)
+		return array();
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 3608bfba85..f3a94e44b8 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -114,6 +114,36 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 		return $notify_users;
 	}
 
+	/**
+	* Pre create insert array function
+	* This allows you to perform certain actions, like run a query
+	* and load data, before create_insert_array() is run. The data
+	* returned from this function will be sent to create_insert_array().
+	*
+	* @param array $post Post data from submit_post
+	* @param array $notify_users Notify users list
+	* 		Formated from find_users_for_notification()
+	* @return array Whatever you want to send to create_insert_array().
+	*/
+	public function pre_create_insert_array($post, $notify_users)
+	{
+		/*if (!sizeof($notify_users))
+		{
+			return array();
+		}
+
+		// Mark the topic unread
+		$sql = 'DELETE FROM ' . TOPICS_TRACK_TABLE . '
+			WHERE topic_id = ' . (int) $post['topic_id'] . '
+				AND ' . $this->db->sql_in_set('user_id', array_keys($notify_users));
+		$this->db->sql_query($sql*/
+
+		// In the parent class, this is used to check if the post is already
+		// read by a user and marks the notification read if it was marked read.
+		// Returning an empty array in effect, forces it to be marked as unread
+		return array();
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
-- 
cgit v1.2.1


From 6df3de2b9c723ef3fe190ba85a0b5fa419f86b6f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 18:58:29 -0500
Subject: [ticket/11103] Starting work on UCP Notifications list

PHPBB3-11103
---
 phpBB/includes/ucp/ucp_notifications.php | 89 +++++++++++++++++---------------
 1 file changed, 48 insertions(+), 41 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 2cb14d05c9..8ce12dae35 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -25,59 +25,66 @@ class ucp_notifications
 
 		add_form_key('ucp_notification_options');
 
-		$subscriptions = $phpbb_notifications->get_subscriptions(false, true);
-
-		// Add/remove subscriptions
-		if ($request->is_set_post('submit'))
+		switch ($mode)
 		{
-			if (!check_form_key('ucp_notification_options'))
-			{
-				trigger_error('FORM_INVALID');
-			}
-
-			$notification_methods = $phpbb_notifications->get_subscription_methods();
+			case 'notification_options':
+				$subscriptions = $phpbb_notifications->get_subscriptions(false, true);
 
-			foreach($phpbb_notifications->get_subscription_types() as $type => $data)
-			{
-				if ($request->is_set_post($type . '_notification') && !isset($subscriptions[$type]))
-				{
-					// add
-					$phpbb_notifications->add_subscription($type);
-				}
-				else if (!$request->is_set_post($type . '_notification') && isset($subscriptions[$type]))
+				// Add/remove subscriptions
+				if ($request->is_set_post('submit'))
 				{
-					// remove
-					$phpbb_notifications->delete_subscription($type);
-				}
-
-				foreach($notification_methods as $method)
-				{
-					if ($request->is_set_post($type . '_' . $method) && (!isset($subscriptions[$type]) || !in_array($method, $subscriptions[$type])))
+					if (!check_form_key('ucp_notification_options'))
 					{
-						// add
-						$phpbb_notifications->add_subscription($type, 0, $method);
+						trigger_error('FORM_INVALID');
 					}
-					else if (!$request->is_set_post($type . '_' . $method) && isset($subscriptions[$type]) && in_array($method, $subscriptions[$type]))
+
+					$notification_methods = $phpbb_notifications->get_subscription_methods();
+
+					foreach($phpbb_notifications->get_subscription_types() as $type => $data)
 					{
-						// remove
-						$phpbb_notifications->delete_subscription($type, 0, $method);
+						if ($request->is_set_post($type . '_notification') && !isset($subscriptions[$type]))
+						{
+							// add
+							$phpbb_notifications->add_subscription($type);
+						}
+						else if (!$request->is_set_post($type . '_notification') && isset($subscriptions[$type]))
+						{
+							// remove
+							$phpbb_notifications->delete_subscription($type);
+						}
+
+						foreach($notification_methods as $method)
+						{
+							if ($request->is_set_post($type . '_' . $method) && (!isset($subscriptions[$type]) || !in_array($method, $subscriptions[$type])))
+							{
+								// add
+								$phpbb_notifications->add_subscription($type, 0, $method);
+							}
+							else if (!$request->is_set_post($type . '_' . $method) && isset($subscriptions[$type]) && in_array($method, $subscriptions[$type]))
+							{
+								// remove
+								$phpbb_notifications->delete_subscription($type, 0, $method);
+							}
+						}
 					}
-				}
-			}
 
-			meta_refresh(3, $this->u_action);
-			$message = $user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-			trigger_error($message);
-		}
+					meta_refresh(3, $this->u_action);
+					$message = $user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+					trigger_error($message);
+				}
+				// todo include language files for extensions?
 
-		// todo include language files for extensions?
+				$this->output_notification_methods('notification_methods', $phpbb_notifications, $template, $user);
 
-		$this->output_notification_methods('notification_methods', $phpbb_notifications, $template, $user);
+				$this->output_notification_types('notification_types', $phpbb_notifications, $template, $user);
 
-		$this->output_notification_types('notification_types', $phpbb_notifications, $template, $user);
+				$this->tpl_name = 'ucp_notifications';
+				$this->page_title = 'UCP_NOTIFICATIONS';
+			break;
 
-		$this->tpl_name = 'ucp_notifications';
-		$this->page_title = 'UCP_NOTIFICATIONS';
+			default:
+				//$phpbb_notifications->load_notifications();
+			break;
 	}
 
 	/**
-- 
cgit v1.2.1


From cb937841269017d13058208378e4c9ad79718c6e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 20:02:38 -0500
Subject: [ticket/11103] UCP Notification List

PHPBB3-11103
---
 phpBB/includes/notification/manager.php       | 33 ++++++++---
 phpBB/includes/notification/type/base.php     |  6 +-
 phpBB/includes/ucp/info/ucp_notifications.php |  1 +
 phpBB/includes/ucp/ucp_notifications.php      | 82 +++++++++++++++++++++++++--
 4 files changed, 108 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 6c74fa965e..22fa12967a 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -68,6 +68,7 @@ class phpbb_notification_manager
 			'start'				=> 0,
 			'all_unread'		=> false,
 			'count_unread'		=> false,
+			'count_total'		=> false,
 		), $options);
 
 		// If all_unread, count_unread mus be true
@@ -79,12 +80,13 @@ class phpbb_notification_manager
 			return array(
 				'notifications'		=> array(),
 				'unread_count'		=> 0,
+				'total_count'		=> 0,
 			);
 		}
 
 		$notifications = $user_ids = array();
 		$load_special = array();
-		$count = 0;
+		$total_count = $unread_count = 0;
 
 		if ($options['count_unread'])
 		{
@@ -94,7 +96,18 @@ class phpbb_notification_manager
 				WHERE user_id = ' . (int) $options['user_id'] . '
 					AND unread = 1';
 			$result = $this->db->sql_query($sql);
-			$count = (int) $this->db->sql_fetchfield('count', $result);
+			$unread_count = (int) $this->db->sql_fetchfield('count', $result);
+			$this->db->sql_freeresult($result);
+		}
+
+		if ($options['count_total'])
+		{
+			// Get the total number of notifications
+			$sql = 'SELECT COUNT(*) AS count
+				FROM ' . NOTIFICATIONS_TABLE . '
+				WHERE user_id = ' . (int) $options['user_id'];
+			$result = $this->db->sql_query($sql);
+			$total_count = (int) $this->db->sql_fetchfield('count', $result);
 			$this->db->sql_freeresult($result);
 		}
 
@@ -115,7 +128,7 @@ class phpbb_notification_manager
 		$this->db->sql_freeresult($result);
 
 		// Get all unread notifications
-		if ($count && $options['all_unread'] && !empty($rowset))
+		if ($unread_count && $options['all_unread'] && !empty($rowset))
 		{
 			$sql = 'SELECT *
 				FROM ' . NOTIFICATIONS_TABLE . '
@@ -165,14 +178,15 @@ class phpbb_notification_manager
 
 		return array(
 			'notifications'		=> $notifications,
-			'unread_count'		=> $count,
+			'unread_count'		=> $unread_count,
+			'total_count'		=> $total_count,
 		);
 	}
 
 	/**
 	* Mark notifications read
 	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
+	* @param bool|string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types). False to mark read for all item types
 	* @param bool|int|array $item_id Item id or array of item ids. False to mark read for all item ids
 	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
 	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
@@ -191,12 +205,15 @@ class phpbb_notification_manager
 
 		$time = ($time) ?: time();
 
-		$this->get_item_type_class_name($item_type);
+		if ($item_type !== false)
+		{
+			$this->get_item_type_class_name($item_type);
+		}
 
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
 			SET unread = 0
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND time <= " . $time .
+			WHERE time <= " . $time .
+				(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
 				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '') .
 				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
 		$this->db->sql_query($sql);
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 45dc463061..f6b61aee49 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -124,6 +124,8 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	public function prepare_for_display()
 	{
 		return array(
+			'NOTIFICATION_ID'	=> $this->notification_id,
+
 			'AVATAR'			=> $this->get_avatar(),
 
 			'FORMATTED_TITLE'	=> $this->get_title(),
@@ -344,6 +346,8 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	protected function mark($unread = true, $return = false)
 	{
+		$this->unread = (bool) $unread;
+
 		$where = array(
 			'item_type = ' . $this->db->sql_escape($this->item_type),
 			'item_id = ' . (int) $this->item_id,
@@ -357,7 +361,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		}
 
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
-			SET unread = ' . (bool) $unread . '
+			SET unread = ' . $this->unread . '
 			WHERE ' . $where;
 		$this->db->sql_query($sql);
 	}
diff --git a/phpBB/includes/ucp/info/ucp_notifications.php b/phpBB/includes/ucp/info/ucp_notifications.php
index 3c7ea80bee..98d8b9db61 100644
--- a/phpBB/includes/ucp/info/ucp_notifications.php
+++ b/phpBB/includes/ucp/info/ucp_notifications.php
@@ -20,6 +20,7 @@ class ucp_notifications_info
 			'version'	=> '1.0.0',
 			'modes'		=> array(
 				'notification_options'		=> array('title' => 'UCP_NOTIFICATION_OPTIONS', 'auth' => '', 'cat' => array('UCP_PREFS')),
+				'notification_list'			=> array('title' => 'UCP_NOTIFICATION_LIST', 'auth' => '', 'cat' => array('UCP_MAIN')),
 			),
 		);
 	}
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 8ce12dae35..35783e1b56 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -21,9 +21,13 @@ class ucp_notifications
 
 	public function main($id, $mode)
 	{
-		global $template, $user, $request, $phpbb_notifications;
+		global $config, $template, $user, $request, $phpbb_notifications;
+		global $phpbb_root_path, $phpEx;
 
-		add_form_key('ucp_notification_options');
+		add_form_key('ucp_notification');
+
+		$start = request_var('start', 0);
+		$form_time = min(request_var('form_time', 0), time());
 
 		switch ($mode)
 		{
@@ -33,7 +37,7 @@ class ucp_notifications
 				// Add/remove subscriptions
 				if ($request->is_set_post('submit'))
 				{
-					if (!check_form_key('ucp_notification_options'))
+					if (!check_form_key('ucp_notification'))
 					{
 						trigger_error('FORM_INVALID');
 					}
@@ -79,12 +83,80 @@ class ucp_notifications
 				$this->output_notification_types('notification_types', $phpbb_notifications, $template, $user);
 
 				$this->tpl_name = 'ucp_notifications';
-				$this->page_title = 'UCP_NOTIFICATIONS';
+				$this->page_title = 'UCP_NOTIFICATION_OPTIONS';
 			break;
 
+			case 'notification_list':
 			default:
-				//$phpbb_notifications->load_notifications();
+				// Mark all items read
+				if (request_var('mark', '') == 'all' && (confirm_box(true) || check_link_hash(request_var('token', ''), 'mark_all_notifications_read')))
+				{
+					if (confirm_box(true))
+					{
+						$phpbb_notifications->mark_notifications_read(false, false, $user->data['user_id'], $form_time);
+
+						meta_refresh(3, $this->u_action);
+						$message = $user->lang['NOTIFICATIONS_MARK_ALL_READ_SUCCESS'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						trigger_error($message);
+					}
+					else
+					{
+						confirm_box(false, 'NOTIFICATIONS_MARK_ALL_READ', build_hidden_fields(array(
+							'mark'		=> 'all',
+							'form_time'	=> $form_time,
+						)));
+					}
+				}
+
+				// Mark specific notifications read
+				if ($request->is_set_post('submit'))
+				{
+					if (!check_form_key('ucp_notification'))
+					{
+						trigger_error('FORM_INVALID');
+					}
+
+					$mark_read = request_var('mark', array(0));
+
+					if (!empty($mark_read))
+					{
+						$phpbb_notifications->mark_notifications_read_by_id($mark_read, $form_time);
+					}
+				}
+
+				$notifications = $phpbb_notifications->load_notifications(array(
+					'start'			=> $start,
+					'limit'			=> $config['topics_per_page'],
+					'count_total'	=> true,
+				));
+
+				foreach ($notifications['notifications'] as $notification)
+				{
+					$template->assign_block_vars('notification_list', $notification->prepare_for_display());
+				}
+
+				$base_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=ucp_notifications&amp;mode=notification_list");
+				phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $notifications['total_count'], $config['topics_per_page'], $start);
+
+				$template->assign_vars(array(
+					'PAGE_NUMBER'	=> phpbb_on_page($template, $user, $base_url, $notifications['total_count'], $config['topics_per_page'], $start),
+					'TOTAL_COUNT'	=> $user->lang('NOTIFICATIONS_COUNT', $notifications['total_count']),
+					'U_MARK_ALL'	=> $base_url . '&amp;mark=all&amp;token=' . generate_link_hash('mark_all_notifications_read'),
+				));
+
+				$this->tpl_name = 'ucp_notifications';
+				$this->page_title = 'UCP_NOTIFICATION_LIST';
 			break;
+		}
+
+		$template->assign_vars(array(
+			'TITLE'				=> $user->lang($this->page_title),
+			'TITLE_EXPLAIN'		=> $user->lang($this->page_title . '_EXPLAIN'),
+
+			'MODE'				=> $mode,
+
+			'FORM_TIME'			=> time(),
+		));
 	}
 
 	/**
-- 
cgit v1.2.1


From 94ffbb4050b2985ee62be0ecc0c6a244532e43ca Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 23:24:30 -0500
Subject: [ticket/11103] Add is_disabled column to notifications table

EXTENSION AUTHORS TAKE NOTE! This is to prevent errors with notifications
from extensions!

Set is_disabled to 1 for all your notifications when your extension is
disabled so they are ignored and do not cause errors.

When your extension is enabled again, set is_disabled to 0 and your
notifications will be working again.

PHPBB3-11103
---
 phpBB/includes/notification/manager.php       | 15 ++++++++++-----
 phpBB/includes/notification/type/base.php     |  5 ++++-
 phpBB/includes/notification/type/bookmark.php |  3 ++-
 phpBB/includes/notification/type/post.php     |  3 ++-
 phpBB/includes/notification/type/quote.php    |  6 ++++--
 5 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 22fa12967a..16fdae6dd0 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -94,7 +94,8 @@ class phpbb_notification_manager
 			$sql = 'SELECT COUNT(*) AS count
 				FROM ' . NOTIFICATIONS_TABLE . '
 				WHERE user_id = ' . (int) $options['user_id'] . '
-					AND unread = 1';
+					AND unread = 1
+					AND is_disabled = 0';
 			$result = $this->db->sql_query($sql);
 			$unread_count = (int) $this->db->sql_fetchfield('count', $result);
 			$this->db->sql_freeresult($result);
@@ -105,7 +106,8 @@ class phpbb_notification_manager
 			// Get the total number of notifications
 			$sql = 'SELECT COUNT(*) AS count
 				FROM ' . NOTIFICATIONS_TABLE . '
-				WHERE user_id = ' . (int) $options['user_id'];
+				WHERE user_id = ' . (int) $options['user_id'] . '
+					AND is_disabled = 0';
 			$result = $this->db->sql_query($sql);
 			$total_count = (int) $this->db->sql_fetchfield('count', $result);
 			$this->db->sql_freeresult($result);
@@ -118,7 +120,8 @@ class phpbb_notification_manager
 			FROM ' . NOTIFICATIONS_TABLE . '
 			WHERE user_id = ' . (int) $options['user_id'] .
 				(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('notification_id', $options['notification_id']) : ' AND notification_id = ' . (int) $options['notification_id']) : '') . '
-				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
+			 	AND is_disabled = 0
+			ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 		$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
 
 		while ($row = $this->db->sql_fetchrow($result))
@@ -135,7 +138,8 @@ class phpbb_notification_manager
 				WHERE user_id = ' . (int) $options['user_id'] . '
 					AND unread = 1
 					AND ' . $this->db->sql_in_set('notification_id', array_keys($rowset), true) . '
-					ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
+					AND is_disabled = 0
+				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 			$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
 
 			while ($row = $this->db->sql_fetchrow($result))
@@ -344,7 +348,8 @@ class phpbb_notification_manager
 		$sql = 'SELECT user_id
 			FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id;
+				AND item_id = " . (int) $item_id . '
+				AND is_disabled = 0';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index f6b61aee49..3aac8a7dd3 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -42,9 +42,12 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* Indentification data
 	* item_type
 	* item_id
-	* item_parent_id // Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
+	* item_parent_id - Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
 	* user_id
 	* unread
+	* is_disabled	- EXTENSION AUTHORS TAKE NOTE! This is to prevent errors with notifications from extensions!
+	* 				- Set is_disabled to 1 for all your notifications when your extension is disabled so they are ignored and do not cause errors.
+	* 				- When your extension is enabled again, set is_disabled to 0 and your notifications will be working again.
 	*
 	* time
 	* data (special serialized field that each notification type can use to store stuff)
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index 8a23859d05..e5435b5829 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -113,7 +113,8 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 			FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND unread = 1';
+				AND unread = 1
+				AND is_disabled = 0';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 76a7846f30..a4792cd7f2 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -138,7 +138,8 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND unread = 1';
+				AND unread = 1
+				AND is_disabled = 0';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 34907ef8d6..4d1e637820 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -132,7 +132,8 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 			FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND unread = 1';
+				AND unread = 1
+				AND is_disabled = 0';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
@@ -161,7 +162,8 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		$sql = 'SELECT user_id
 			FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
-				AND item_id = " . self::get_item_id($post);
+				AND item_id = " . self::get_item_id($post) . '
+				AND is_disabled = 0';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-- 
cgit v1.2.1


From c5f280351a96aaebd90c27da095c9b1ff28624a5 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 23:52:49 -0500
Subject: [ticket/11103] UCP Notification option grouping

Also add the ability to specify an _EXPLAIN text for the notification option

PHPBB3-11103
---
 phpBB/includes/notification/manager.php            | 23 +++++---
 phpBB/includes/notification/type/approve_post.php  |  3 +-
 phpBB/includes/notification/type/approve_topic.php |  3 +-
 phpBB/includes/notification/type/base.php          |  2 +-
 .../includes/notification/type/disapprove_post.php |  3 +-
 .../notification/type/disapprove_topic.php         |  3 +-
 phpBB/includes/notification/type/post.php          | 10 ++++
 phpBB/includes/notification/type/post_in_queue.php |  3 +-
 phpBB/includes/notification/type/report_pm.php     |  3 +-
 phpBB/includes/notification/type/report_post.php   |  1 +
 phpBB/includes/notification/type/topic.php         | 10 ++++
 .../includes/notification/type/topic_in_queue.php  |  3 +-
 phpBB/includes/ucp/ucp_notifications.php           | 67 +++++++++++++---------
 13 files changed, 90 insertions(+), 44 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 16fdae6dd0..fc9b48c624 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -495,17 +495,24 @@ class phpbb_notification_manager
 
 			if ($class->is_available() && method_exists($class_name, 'get_item_type'))
 			{
-				if ($class_name::$notification_option === false)
-				{
-					$subscription_types[$class_name::get_item_type()] = $class_name::get_item_type();
-				}
-				else
-				{
-					$subscription_types[$class_name::$notification_option['id']] = $class_name::$notification_option;
-				}
+				$options = array_merge(array(
+					'id'		=> $class_name::get_item_type(),
+					'lang'		=> 'NOTIFICATION_TYPE_' . strtoupper($class_name::get_item_type()),
+					'group'		=> 'NOTIFICATION_GROUP_MISCELLANEOUS',
+				), (($class_name::$notification_option !== false) ? $class_name::$notification_option : array()));
+
+				$subscription_types[$options['group']][$options['id']] = $options;
 			}
 		}
 
+		// Move Miscellaneous to the very last section
+		if (isset($subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']))
+		{
+			$miscellaneous = $subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'];
+			unset($subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']);
+			$subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'] = $miscellaneous;
+		}
+
 		return $subscription_types;
 	}
 
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index 68e8352a13..6ed9b6c67c 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -41,11 +41,12 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
+	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
 		'id'	=> 'moderation_queue',
 		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
 	/**
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index f3a94e44b8..1ff5ae43bd 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -41,11 +41,12 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
+	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
 		'id'	=> 'moderation_queue',
 		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
 	/**
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 3aac8a7dd3..e8959d1352 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -34,7 +34,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use its default data
-	* 					Array of data (including keys 'id' and 'lang')
+	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = false;
 
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
index 1bf9242c52..8044a3e0ea 100644
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ b/phpBB/includes/notification/type/disapprove_post.php
@@ -41,11 +41,12 @@ class phpbb_notification_type_disapprove_post extends phpbb_notification_type_ap
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
+	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
 		'id'	=> 'moderation_queue',
 		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
 	/**
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
index f3e0be4883..04fec87014 100644
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ b/phpBB/includes/notification/type/disapprove_topic.php
@@ -41,11 +41,12 @@ class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_a
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
+	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
 		'id'	=> 'moderation_queue',
 		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
+		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
 	/**
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index a4792cd7f2..ee26a8c33e 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -37,6 +37,16 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 	*/
 	protected $language_key = 'NOTIFICATION_POST';
 
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id', 'lang', and 'group')
+	*/
+	public static $notification_option = array(
+		'group'	=> 'NOTIFICATION_GROUP_POSTING',
+	);
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notification_type_
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 4f92eb157a..499fd1e8ed 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -41,11 +41,12 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
+	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
 		'id'	=> 'needs_approval',
 		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
+		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
 	);
 
 	/**
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 3619c5510c..440092afdc 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -48,11 +48,12 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
+	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
 		'id'	=> 'report',
 		'lang'	=> 'NOTIFICATION_TYPE_REPORT',
+		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
 	);
 
 	/**
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index d7a0d58167..d860fb1b38 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -53,6 +53,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	public static $notification_option = array(
 		'id'	=> 'report',
 		'lang'	=> 'NOTIFICATION_TYPE_REPORT',
+		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
 	);
 
 	/**
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index cb38b0274e..237f430003 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -37,6 +37,16 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 	*/
 	protected $language_key = 'NOTIFICATION_TOPIC';
 
+	/**
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id', 'lang', and 'group')
+	*/
+	public static $notification_option = array(
+		'group'	=> 'NOTIFICATION_GROUP_POSTING',
+	);
+
 	/**
 	* Get the type of notification this is
 	* phpbb_notification_type_
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index 96f09cef9e..eb14c098e1 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -41,11 +41,12 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
+	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
 		'id'	=> 'needs_approval',
 		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
+		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
 	);
 
 	/**
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 35783e1b56..98165a7bf7 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -44,30 +44,33 @@ class ucp_notifications
 
 					$notification_methods = $phpbb_notifications->get_subscription_methods();
 
-					foreach($phpbb_notifications->get_subscription_types() as $type => $data)
+					foreach($phpbb_notifications->get_subscription_types() as $group => $subscription_types)
 					{
-						if ($request->is_set_post($type . '_notification') && !isset($subscriptions[$type]))
+						foreach($subscription_types as $type => $data)
 						{
-							// add
-							$phpbb_notifications->add_subscription($type);
-						}
-						else if (!$request->is_set_post($type . '_notification') && isset($subscriptions[$type]))
-						{
-							// remove
-							$phpbb_notifications->delete_subscription($type);
-						}
-
-						foreach($notification_methods as $method)
-						{
-							if ($request->is_set_post($type . '_' . $method) && (!isset($subscriptions[$type]) || !in_array($method, $subscriptions[$type])))
+							if ($request->is_set_post($type . '_notification') && !isset($subscriptions[$type]))
 							{
 								// add
-								$phpbb_notifications->add_subscription($type, 0, $method);
+								$phpbb_notifications->add_subscription($type);
 							}
-							else if (!$request->is_set_post($type . '_' . $method) && isset($subscriptions[$type]) && in_array($method, $subscriptions[$type]))
+							else if (!$request->is_set_post($type . '_notification') && isset($subscriptions[$type]))
 							{
 								// remove
-								$phpbb_notifications->delete_subscription($type, 0, $method);
+								$phpbb_notifications->delete_subscription($type);
+							}
+
+							foreach($notification_methods as $method)
+							{
+								if ($request->is_set_post($type . '_' . $method) && (!isset($subscriptions[$type]) || !in_array($method, $subscriptions[$type])))
+								{
+									// add
+									$phpbb_notifications->add_subscription($type, 0, $method);
+								}
+								else if (!$request->is_set_post($type . '_' . $method) && isset($subscriptions[$type]) && in_array($method, $subscriptions[$type]))
+								{
+									// remove
+									$phpbb_notifications->delete_subscription($type, 0, $method);
+								}
 							}
 						}
 					}
@@ -172,25 +175,33 @@ class ucp_notifications
 		$notification_methods = $phpbb_notifications->get_subscription_methods();
 		$subscriptions = $phpbb_notifications->get_subscriptions(false, true);
 
-		foreach($phpbb_notifications->get_subscription_types() as $type => $data)
+		foreach($phpbb_notifications->get_subscription_types() as $group => $subscription_types)
 		{
 			$template->assign_block_vars($block, array(
-				'TYPE'				=> $type,
-
-				'NAME'				=> (is_array($data) && isset($data['lang'])) ? $user->lang($data['lang']) : $user->lang('NOTIFICATION_TYPE_' . strtoupper($type)),
-
-				'SUBSCRIBED'		=> (isset($subscriptions[$type])) ? true : false,
+				'GROUP_NAME'	=> $user->lang($group),
 			));
 
-			foreach($notification_methods as $method)
+			foreach($subscription_types as $type => $data)
 			{
-				$template->assign_block_vars($block . '.notification_methods', array(
-					'METHOD'			=> $method,
+				$template->assign_block_vars($block, array(
+					'TYPE'				=> $type,
 
-					'NAME'				=> $user->lang('NOTIFICATION_METHOD_' . strtoupper($method)),
+					'NAME'				=> $user->lang($data['lang']),
+					'EXPLAIN'			=> (isset($user->lang[$data['lang'] . '_EXPLAIN'])) ? $user->lang($data['lang'] . '_EXPLAIN') : '',
 
-					'SUBSCRIBED'		=> (isset($subscriptions[$type]) && in_array($method, $subscriptions[$type])) ? true : false,
+					'SUBSCRIBED'		=> (isset($subscriptions[$type])) ? true : false,
 				));
+
+				foreach($notification_methods as $method)
+				{
+					$template->assign_block_vars($block . '.notification_methods', array(
+						'METHOD'			=> $method,
+
+						'NAME'				=> $user->lang('NOTIFICATION_METHOD_' . strtoupper($method)),
+
+						'SUBSCRIBED'		=> (isset($subscriptions[$type]) && in_array($method, $subscriptions[$type])) ? true : false,
+					));
+				}
 			}
 		}
 	}
-- 
cgit v1.2.1


From a48f09033810148fd9b2d5a0b6a683f14ac73a6a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 12:35:35 -0500
Subject: [ticket/11103] Make sure notifications are marked read when clicking
 them

How do we do this? If an item is unread, the URL to view that item will
be the URL to mark it as read (index.php?mark_notification=$id). When the
URL is visited it marks the item as read and redirects them to the correct
URL for the item.

If the item is read, the URL is directly to the item.

Prettify the html output

PHPBB-11103
---
 phpBB/includes/notification/manager.php   |  2 +-
 phpBB/includes/notification/type/base.php | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index fc9b48c624..03776de2b4 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -165,7 +165,7 @@ class phpbb_notification_manager
 			}
 			$load_special[$row['item_type']] = array_merge($load_special[$row['item_type']], $notification->get_load_special());
 
-			$notifications[] = $notification;
+			$notifications[$row['notification_id']] = $notification;
 		}
 
 		$this->load_users($user_ids);
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index e8959d1352..9ef0e71009 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -138,7 +138,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 			'UNREAD'			=> $this->unread,
 
-			'U_MARK_READ'		=> append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification[]=' . $this->notification_id),
+			'U_MARK_READ'		=> append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id),
 		);
 	}
 
@@ -148,7 +148,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
 	* @return string
 	*/
-	public function mark_read($return = true)
+	public function mark_read($return = false)
 	{
 		return $this->mark(false, $return);
 	}
@@ -159,7 +159,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
 	* @return string
 	*/
-	public function mark_unread($return = true)
+	public function mark_unread($return = false)
 	{
 		return $this->mark(true, $return);
 	}
@@ -352,11 +352,11 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		$this->unread = (bool) $unread;
 
 		$where = array(
-			'item_type = ' . $this->db->sql_escape($this->item_type),
+			"item_type = '" . $this->db->sql_escape($this->item_type) . "'",
 			'item_id = ' . (int) $this->item_id,
 			'user_id = ' . (int) $this->user_id,
 		);
-		$where = implode(' AND ' . $where);
+		$where = implode(' AND ', $where);
 
 		if ($return)
 		{
@@ -364,7 +364,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		}
 
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
-			SET unread = ' . $this->unread . '
+			SET unread = ' . (int) $this->unread . '
 			WHERE ' . $where;
 		$this->db->sql_query($sql);
 	}
-- 
cgit v1.2.1


From 0d5d328c81362acdcbccffc28288505db8517616 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 12:42:18 -0500
Subject: [ticket/11103] Spacing consistency

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 3658757e5e..4deffe653b 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2233,19 +2233,19 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	{
 		switch ($mode)
 		{
-			case 'post' :
+			case 'post':
 				$phpbb_notifications->add_notifications(array('quote', 'topic'), $notification_data);
 			break;
 
-			case 'reply' :
-			case 'quote' :
+			case 'reply':
+			case 'quote':
 				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $notification_data);
 			break;
 
-			case 'edit_topic' :
-			case 'edit_first_post' :
-			case 'edit' :
-			case 'edit_last_post' :
+			case 'edit_topic':
+			case 'edit_first_post':
+			case 'edit':
+			case 'edit_last_post':
 				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'topic', 'post'), $notification_data);
 			break;
 		}
@@ -2254,19 +2254,19 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	{
 		switch ($mode)
 		{
-			case 'post' :
+			case 'post':
 				$phpbb_notifications->add_notifications(array('topic_in_queue'), $notification_data);
 			break;
 
-			case 'reply' :
-			case 'quote' :
+			case 'reply':
+			case 'quote':
 				$phpbb_notifications->add_notifications(array('post_in_queue'), $notification_data);
 			break;
 
-			case 'edit_topic' :
-			case 'edit_first_post' :
-			case 'edit' :
-			case 'edit_last_post' :
+			case 'edit_topic':
+			case 'edit_first_post':
+			case 'edit':
+			case 'edit_last_post':
 				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
 				$phpbb_notifications->delete_notifications(array('quote', 'bookmark', 'post'), $data['post_id']);
 			break;
-- 
cgit v1.2.1


From fa6d60401656ee875ef18b35dc7ce43bd270ff4e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 12:49:09 -0500
Subject: [ticket/11103] Remove todo comments that are no longer todo

PHPBB3-11103
---
 phpBB/includes/notification/type/quote.php | 6 ------
 phpBB/includes/ucp/ucp_notifications.php   | 1 -
 2 files changed, 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 4d1e637820..0cc183346f 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -184,12 +184,6 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 			$add_notifications[$user_id] = $notifications[$user_id];
 		}
 
-		// todo Adding notifications while editing a post can be funky.
-		// If the user has read the topic/post already, and the user is newly quoted it an edit,
-		// The notification will be stuck as unread until another post is made and the user visits
-		// the topic again because the posts will not be marked as read since the topic is already
-		// marked as read
-
 		// Add the necessary notifications
 		$this->notification_manager->add_notifications_for_users(self::get_item_type(), $post, $add_notifications);
 
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 98165a7bf7..321730a64b 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -79,7 +79,6 @@ class ucp_notifications
 					$message = $user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 					trigger_error($message);
 				}
-				// todo include language files for extensions?
 
 				$this->output_notification_methods('notification_methods', $phpbb_notifications, $template, $user);
 
-- 
cgit v1.2.1


From 7c2cc9cfeface2ea4267dca204f56f794e3418af Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 15 Oct 2012 14:02:16 +0200
Subject: [feature/soft-delete] Turn restore_post() into a method and add the
 docs

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_queue.php | 153 ++++++++++++++++++++-------------------
 1 file changed, 77 insertions(+), 76 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 184959dfb6..31a5e09582 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -62,7 +62,7 @@ class mcp_queue
 				}
 				else if ($action == 'restore')
 				{
-					restore_post($post_id_list, 'queue', $mode);
+					$this->restore_posts($post_id_list, 'queue', $mode);
 				}
 				else
 				{
@@ -443,7 +443,7 @@ class mcp_queue
 					'S_FORUM_OPTIONS'		=> $forum_options,
 					'S_MCP_ACTION'			=> build_url(array('t', 'f', 'sd', 'st', 'sk')),
 					'S_TOPICS'				=> ($mode == 'unapproved_topics') ? true : false,
-					'S_RESTORE'             => ($mode == 'deleted_posts') ? true : false,
+					'S_RESTORE'				=> ($mode == 'deleted_posts') ? true : false,
 
 					'PAGE_NUMBER'			=> phpbb_on_page($template, $user, $base_url, $total, $config['topics_per_page'], $start),
 					'TOPIC_ID'				=> $topic_id,
@@ -454,103 +454,104 @@ class mcp_queue
 			break;
 		}
 	}
-}
-
-
-/**
-* Restore Post/Topic
-*/
-function restore_post($post_id_list, $id, $mode)
-{
-	global $db, $template, $user, $config;
-	global $phpEx, $phpbb_root_path, $request;
 
-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
+	/**
+	* Restore Posts
+	*
+	* @todo: Add some XSS protection, or even a confirm_box()
+	*
+	* @param $post_id_list	array	IDs of the posts to restore
+	* @param $id			mixed	Category of the current active module
+	* @param $mode			string	Active module
+	* @return void
+	*/
+	function restore_posts($post_id_list, $id, $mode)
 	{
-		trigger_error('NOT_AUTHORISED');
-	}
+		global $db, $template, $user, $config;
+		global $phpEx, $phpbb_root_path, $request;
 
-	$redirect = request_var('redirect', build_url(array('quickmod')));
-	$redirect = reapply_sid($redirect);
-	$success_msg = '';
+		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
+		{
+			trigger_error('NOT_AUTHORISED');
+		}
 
-	$post_info = get_post_data($post_id_list, 'm_approve');
+		$redirect = request_var('redirect', build_url(array('quickmod')));
+		$redirect = reapply_sid($redirect);
+		$success_msg = '';
 
-	$topic_info = array();
+		$post_info = get_post_data($post_id_list, 'm_approve');
 
-	// Group the posts by topic_id
-	foreach ($post_info as $post_id => $post_data)
-	{
-		if ($post_data['post_visibility'] == ITEM_APPROVED)
+		$topic_info = array();
+
+		// Group the posts by topic_id
+		foreach ($post_info as $post_id => $post_data)
 		{
-			continue;
-		}
-		$topic_id = (int) $post_data['topic_id'];
+			if ($post_data['post_visibility'] == ITEM_APPROVED)
+			{
+				continue;
+			}
+			$topic_id = (int) $post_data['topic_id'];
 
-		$topic_info[$topic_id]['posts'][] = (int) $post_id;
-		$topic_info[$topic_id]['forum_id'] = (int) $post_data['forum_id'];
+			$topic_info[$topic_id]['posts'][] = (int) $post_id;
+			$topic_info[$topic_id]['forum_id'] = (int) $post_data['forum_id'];
 
-		if ($post_id == $post_data['topic_first_post_id'])
-		{
-			$topic_info[$topic_id]['first_post'] = true;
+			if ($post_id == $post_data['topic_first_post_id'])
+			{
+				$topic_info[$topic_id]['first_post'] = true;
+			}
+
+			if ($post_id == $post_data['topic_last_post_id'])
+			{
+				$topic_info[$topic_id]['last_post'] = true;
+			}
+
+			$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&amp;t={$post_data['topic_id']}&amp;p={$post_data['post_id']}") . '#p' . $post_data['post_id'];
 		}
 
-		if ($post_id == $post_data['topic_last_post_id'])
+		foreach ($topic_info as $topic_id => $topic_data)
 		{
-			$topic_info[$topic_id]['last_post'] = true;
+			phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));
 		}
-	}
-
-	foreach ($topic_info as $topic_id => $topic_data)
-	{
-		phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));
-	}
 
-	$success_msg = '';
-	/**
-	* Currently only works for approving posts
-	if (sizeof($topic_info) > 1)
-	{
-		$success_msg = ((sizeof($post_info) == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS';
-	}
-	else
-	*/
-	if (sizeof($post_info) >= 1)
-	{
-		$success_msg = (sizeof($post_info) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS';
-	}
-
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		// If approving one post, also give links back to post...
-		$add_message = '';
-		if (sizeof($post_id_list) == 1 && !empty($post_url))
+		$success_msg = '';
+		if (sizeof($post_info) >= 1)
 		{
-			$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');
+			$success_msg = (sizeof($post_info) == 1) ? 'POST_RESTORED_SUCCESS' : 'POSTS_RESTORED_SUCCESS';
 		}
 
-		$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message;
-
-		if ($request->is_ajax())
+		if (!$success_msg)
 		{
-			$json_response = new phpbb_json_response;
-			$json_response->send(array(
-				'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
-				'MESSAGE_TEXT'		=> $message,
-				'REFRESH_DATA'		=> null,
-				'visible'			=> true,
-			));
+			redirect($redirect);
 		}
+		else
+		{
+			// If restoring one post, also give links back to post...
+			$add_message = '';
+			if (sizeof($post_id_list) == 1 && !empty($post_url))
+			{
+				$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');
+			}
 
-		meta_refresh(3, $redirect);
-		trigger_error($message);
+			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message;
+
+			if ($request->is_ajax())
+			{
+				$json_response = new phpbb_json_response;
+				$json_response->send(array(
+					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
+					'MESSAGE_TEXT'		=> $message,
+					'REFRESH_DATA'		=> null,
+					'visible'			=> true,
+				));
+			}
+
+			meta_refresh(3, $redirect);
+			trigger_error($message);
+		}
 	}
 }
 
+
 /**
 * Approve Post/Topic
 */
-- 
cgit v1.2.1


From a92927d24cace3b3444cb3502de765c6e8e16fa9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 15 Oct 2012 15:05:02 +0200
Subject: [feature/soft-delete] Turn other functions into methods as well

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_queue.php | 637 +++++++++++++++++++--------------------
 1 file changed, 318 insertions(+), 319 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 31a5e09582..99c4a6eccb 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -58,7 +58,7 @@ class mcp_queue
 
 				if ($action == 'approve')
 				{
-					approve_post($post_id_list, 'queue', $mode);
+					$this->approve_posts($post_id_list, 'queue', $mode);
 				}
 				else if ($action == 'restore')
 				{
@@ -66,7 +66,7 @@ class mcp_queue
 				}
 				else
 				{
-					disapprove_post($post_id_list, 'queue', $mode);
+					$this->disapprove_posts($post_id_list, 'queue', $mode);
 				}
 
 			break;
@@ -549,432 +549,431 @@ class mcp_queue
 			trigger_error($message);
 		}
 	}
-}
-
 
-/**
-* Approve Post/Topic
-*/
-function approve_post($post_id_list, $id, $mode)
-{
-	global $db, $template, $user, $config;
-	global $phpEx, $phpbb_root_path;
-	global $request;
-
-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
+	/**
+	* Approve Post/Topic
+	*/
+	function approve_posts($post_id_list, $id, $mode)
 	{
-		trigger_error('NOT_AUTHORISED');
-	}
+		global $db, $template, $user, $config;
+		global $phpEx, $phpbb_root_path;
+		global $request;
+
+		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
+		{
+			trigger_error('NOT_AUTHORISED');
+		}
 
-	$redirect = request_var('redirect', build_url(array('quickmod')));
-	$success_msg = '';
+		$redirect = request_var('redirect', build_url(array('quickmod')));
+		$success_msg = '';
 
-	$s_hidden_fields = build_hidden_fields(array(
-		'i'				=> $id,
-		'mode'			=> $mode,
-		'post_id_list'	=> $post_id_list,
-		'action'		=> 'approve',
-		'redirect'		=> $redirect)
-	);
+		$s_hidden_fields = build_hidden_fields(array(
+			'i'				=> $id,
+			'mode'			=> $mode,
+			'post_id_list'	=> $post_id_list,
+			'action'		=> 'approve',
+			'redirect'		=> $redirect)
+		);
 
-	$post_info = get_post_data($post_id_list, 'm_approve');
+		$post_info = get_post_data($post_id_list, 'm_approve');
 
-	if (confirm_box(true))
-	{
-		$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
+		if (confirm_box(true))
+		{
+			$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
 
-		$success_msg = phpbb_content_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
+			$success_msg = phpbb_content_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
 
-		$messenger = new messenger();
+			$messenger = new messenger();
 
-		// Notify Poster?
-		if ($notify_poster)
-		{
-			foreach ($post_info as $post_id => $post_data)
+			// Notify Poster?
+			if ($notify_poster)
 			{
-				if ($post_data['poster_id'] == ANONYMOUS)
+				foreach ($post_info as $post_id => $post_data)
 				{
-					continue;
-				}
+					if ($post_data['poster_id'] == ANONYMOUS)
+					{
+						continue;
+					}
 
-				$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_approved' : 'post_approved';
+					$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_approved' : 'post_approved';
 
-				$messenger->template($email_template, $post_data['user_lang']);
+					$messenger->template($email_template, $post_data['user_lang']);
 
-				$messenger->to($post_data['user_email'], $post_data['username']);
-				$messenger->im($post_data['user_jabber'], $post_data['username']);
+					$messenger->to($post_data['user_email'], $post_data['username']);
+					$messenger->im($post_data['user_jabber'], $post_data['username']);
 
-				$messenger->assign_vars(array(
-					'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
-					'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
-					'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])),
+					$messenger->assign_vars(array(
+						'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
+						'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
+						'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])),
 
-					'U_VIEW_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&e=0",
-					'U_VIEW_POST'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&p=$post_id&e=$post_id")
-				);
+						'U_VIEW_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&e=0",
+						'U_VIEW_POST'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&p=$post_id&e=$post_id")
+					);
 
-				$messenger->send($post_data['user_notify_type']);
+					$messenger->send($post_data['user_notify_type']);
+				}
 			}
-		}
 
-		$messenger->save_queue();
+			$messenger->save_queue();
 
-		// Send out normal user notifications
-		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
+			// Send out normal user notifications
+			$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
-		foreach ($post_info as $post_id => $post_data)
-		{
-			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
+			foreach ($post_info as $post_id => $post_data)
 			{
-				// Forum Notifications
-				user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+				if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
+				{
+					// Forum Notifications
+					user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+				}
+				else
+				{
+					// Topic Notifications
+					user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+				}
 			}
-			else
+
+			if (sizeof($post_id_list) == 1)
 			{
-				// Topic Notifications
-				user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+				$post_data = $post_info[$post_id_list[0]];
+				$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&amp;t={$post_data['topic_id']}&amp;p={$post_data['post_id']}") . '#p' . $post_data['post_id'];
 			}
+			unset($post_info);
 		}
-
-		if (sizeof($post_id_list) == 1)
+		else
 		{
-			$post_data = $post_info[$post_id_list[0]];
-			$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&amp;t={$post_data['topic_id']}&amp;p={$post_data['post_id']}") . '#p' . $post_data['post_id'];
-		}
-		unset($post_info);
-	}
-	else
-	{
-		$show_notify = false;
+			$show_notify = false;
 
-		if ($config['email_enable'] || $config['jab_enable'])
-		{
-			foreach ($post_info as $post_data)
+			if ($config['email_enable'] || $config['jab_enable'])
 			{
-				if ($post_data['poster_id'] == ANONYMOUS)
+				foreach ($post_info as $post_data)
 				{
-					continue;
-				}
-				else
-				{
-					$show_notify = true;
-					break;
+					if ($post_data['poster_id'] == ANONYMOUS)
+					{
+						continue;
+					}
+					else
+					{
+						$show_notify = true;
+						break;
+					}
 				}
 			}
-		}
 
-		$template->assign_vars(array(
-			'S_NOTIFY_POSTER'	=> $show_notify,
-			'S_APPROVE'			=> true)
-		);
-
-		confirm_box(false, 'APPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
-	}
-
-	$redirect = request_var('redirect', "index.$phpEx");
-	$redirect = reapply_sid($redirect);
-
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		meta_refresh(3, $redirect);
+			$template->assign_vars(array(
+				'S_NOTIFY_POSTER'	=> $show_notify,
+				'S_APPROVE'			=> true)
+			);
 
-		// If approving one post, also give links back to post...
-		$add_message = '';
-		if (sizeof($post_id_list) == 1 && !empty($post_url))
-		{
-			$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');
+			confirm_box(false, 'APPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
 		}
 
-		$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message;
+		$redirect = request_var('redirect', "index.$phpEx");
+		$redirect = reapply_sid($redirect);
 
-		if ($request->is_ajax())
+		if (!$success_msg)
 		{
-			$json_response = new phpbb_json_response;
-			$json_response->send(array(
-				'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
-				'MESSAGE_TEXT'		=> $message,
-				'REFRESH_DATA'		=> null,
-				'visible'			=> true,
-			));
+			redirect($redirect);
 		}
+		else
+		{
+			meta_refresh(3, $redirect);
 
-		trigger_error($message);
-	}
-}
+			// If approving one post, also give links back to post...
+			$add_message = '';
+			if (sizeof($post_id_list) == 1 && !empty($post_url))
+			{
+				$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');
+			}
 
-/**
-* Disapprove Post/Topic
-*/
-function disapprove_post($post_id_list, $id, $mode)
-{
-	global $db, $template, $user, $config;
-	global $phpEx, $phpbb_root_path;
-	global $request;
+			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message;
 
-	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
-	{
-		trigger_error('NOT_AUTHORISED');
+			if ($request->is_ajax())
+			{
+				$json_response = new phpbb_json_response;
+				$json_response->send(array(
+					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
+					'MESSAGE_TEXT'		=> $message,
+					'REFRESH_DATA'		=> null,
+					'visible'			=> true,
+				));
+			}
+
+			trigger_error($message);
+		}
 	}
 
-	$redirect = request_var('redirect', build_url(array('t', 'mode', 'quickmod')) . "&amp;mode=$mode");
-	$reason = utf8_normalize_nfc(request_var('reason', '', true));
-	$reason_id = request_var('reason_id', 0);
-	$success_msg = $additional_msg = '';
+	/**
+	* Disapprove Post/Topic
+	*/
+	function disapprove_posts($post_id_list, $id, $mode)
+	{
+		global $db, $template, $user, $config;
+		global $phpEx, $phpbb_root_path;
+		global $request;
 
-	$s_hidden_fields = build_hidden_fields(array(
-		'i'				=> $id,
-		'mode'			=> $mode,
-		'post_id_list'	=> $post_id_list,
-		'action'		=> 'disapprove',
-		'redirect'		=> $redirect)
-	);
+		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
+		{
+			trigger_error('NOT_AUTHORISED');
+		}
 
-	$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
-	$disapprove_reason = '';
+		$redirect = request_var('redirect', build_url(array('t', 'mode', 'quickmod')) . "&amp;mode=$mode");
+		$reason = utf8_normalize_nfc(request_var('reason', '', true));
+		$reason_id = request_var('reason_id', 0);
+		$success_msg = $additional_msg = '';
+
+		$s_hidden_fields = build_hidden_fields(array(
+			'i'				=> $id,
+			'mode'			=> $mode,
+			'post_id_list'	=> $post_id_list,
+			'action'		=> 'disapprove',
+			'redirect'		=> $redirect)
+		);
 
-	if ($reason_id)
-	{
-		$sql = 'SELECT reason_title, reason_description
-			FROM ' . REPORTS_REASONS_TABLE . "
-			WHERE reason_id = $reason_id";
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		if (!$row || (!$reason && strtolower($row['reason_title']) == 'other'))
-		{
-			$additional_msg = $user->lang['NO_REASON_DISAPPROVAL'];
+		$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
+		$disapprove_reason = '';
 
-			$request->overwrite('confirm', null, phpbb_request_interface::POST);
-			$request->overwrite('confirm_key', null, phpbb_request_interface::POST);
-			$request->overwrite('confirm_key', null, phpbb_request_interface::REQUEST);
-		}
-		else
+		if ($reason_id)
 		{
-			// If the reason is defined within the language file, we will use the localized version, else just use the database entry...
-			$disapprove_reason = (strtolower($row['reason_title']) != 'other') ? ((isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])])) ? $user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])] : $row['reason_description']) : '';
-			$disapprove_reason .= ($reason) ? "\n\n" . $reason : '';
-
-			if (isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])]))
+			$sql = 'SELECT reason_title, reason_description
+				FROM ' . REPORTS_REASONS_TABLE . "
+				WHERE reason_id = $reason_id";
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if (!$row || (!$reason && strtolower($row['reason_title']) == 'other'))
 			{
-				$disapprove_reason_lang = strtoupper($row['reason_title']);
+				$additional_msg = $user->lang['NO_REASON_DISAPPROVAL'];
+
+				$request->overwrite('confirm', null, phpbb_request_interface::POST);
+				$request->overwrite('confirm_key', null, phpbb_request_interface::POST);
+				$request->overwrite('confirm_key', null, phpbb_request_interface::REQUEST);
 			}
+			else
+			{
+				// If the reason is defined within the language file, we will use the localized version, else just use the database entry...
+				$disapprove_reason = (strtolower($row['reason_title']) != 'other') ? ((isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])])) ? $user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])] : $row['reason_description']) : '';
+				$disapprove_reason .= ($reason) ? "\n\n" . $reason : '';
 
-			$email_disapprove_reason = $disapprove_reason;
-		}
-	}
+				if (isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])]))
+				{
+					$disapprove_reason_lang = strtoupper($row['reason_title']);
+				}
 
-	$post_info = get_post_data($post_id_list, 'm_approve');
+				$email_disapprove_reason = $disapprove_reason;
+			}
+		}
 
-	if (confirm_box(true))
-	{
-		$disapprove_log = $disapprove_log_topics = $disapprove_log_posts = array();
-		$topic_replies_real = $post_disapprove_list = array();
+		$post_info = get_post_data($post_id_list, 'm_approve');
 
-		// Build a list of posts to be unapproved and get the related topics real replies count
-		foreach ($post_info as $post_id => $post_data)
+		if (confirm_box(true))
 		{
-			$post_disapprove_list[$post_id] = $post_data['topic_id'];
-			if (!isset($topic_replies_real[$post_data['topic_id']]))
+			$disapprove_log = $disapprove_log_topics = $disapprove_log_posts = array();
+			$topic_replies_real = $post_disapprove_list = array();
+
+			// Build a list of posts to be unapproved and get the related topics real replies count
+			foreach ($post_info as $post_id => $post_data)
 			{
-				$topic_replies_real[$post_data['topic_id']] = $post_data['topic_replies_real'];
+				$post_disapprove_list[$post_id] = $post_data['topic_id'];
+				if (!isset($topic_replies_real[$post_data['topic_id']]))
+				{
+					$topic_replies_real[$post_data['topic_id']] = $post_data['topic_replies_real'];
+				}
 			}
-		}
 
-		// Now we build the log array
-		foreach ($post_disapprove_list as $post_id => $topic_id)
-		{
-			// If the count of disapproved posts for the topic is greater
-			// than topic's real replies count, the whole topic is disapproved/deleted
-			if (sizeof(array_keys($post_disapprove_list, $topic_id)) > $topic_replies_real[$topic_id])
+			// Now we build the log array
+			foreach ($post_disapprove_list as $post_id => $topic_id)
 			{
-				// Don't write the log more than once for every topic
-				if (!isset($disapprove_log_topics[$topic_id]))
+				// If the count of disapproved posts for the topic is greater
+				// than topic's real replies count, the whole topic is disapproved/deleted
+				if (sizeof(array_keys($post_disapprove_list, $topic_id)) > $topic_replies_real[$topic_id])
+				{
+					// Don't write the log more than once for every topic
+					if (!isset($disapprove_log_topics[$topic_id]))
+					{
+						// Build disapproved topics log
+						$disapprove_log_topics[$topic_id] = array(
+							'type'			=> 'topic',
+							'post_subject'	=> $post_info[$post_id]['topic_title'],
+							'forum_id'		=> $post_info[$post_id]['forum_id'],
+							'topic_id'		=> 0, // useless to log a topic id, as it will be deleted
+						);
+					}
+				}
+				else
 				{
-					// Build disapproved topics log
-					$disapprove_log_topics[$topic_id] = array(
-						'type'			=> 'topic',
-						'post_subject'	=> $post_info[$post_id]['topic_title'],
+					// Build disapproved posts log
+					$disapprove_log_posts[] = array(
+						'type'			=> 'post',
+						'post_subject'	=> $post_info[$post_id]['post_subject'],
 						'forum_id'		=> $post_info[$post_id]['forum_id'],
-						'topic_id'		=> 0, // useless to log a topic id, as it will be deleted
+						'topic_id'		=> $post_info[$post_id]['topic_id'],
 					);
-				}
-			}
-			else
-			{
-				// Build disapproved posts log
-				$disapprove_log_posts[] = array(
-					'type'			=> 'post',
-					'post_subject'	=> $post_info[$post_id]['post_subject'],
-					'forum_id'		=> $post_info[$post_id]['forum_id'],
-					'topic_id'		=> $post_info[$post_id]['topic_id'],
-				);
 
+				}
 			}
-		}
 
-		// Get disapproved posts/topics counts separately
-		$num_disapproved_topics = sizeof($disapprove_log_topics);
-		$num_disapproved_posts = sizeof($disapprove_log_posts);
+			// Get disapproved posts/topics counts separately
+			$num_disapproved_topics = sizeof($disapprove_log_topics);
+			$num_disapproved_posts = sizeof($disapprove_log_posts);
 
-		// Build the whole log
-		$disapprove_log = array_merge($disapprove_log_topics, $disapprove_log_posts);
+			// Build the whole log
+			$disapprove_log = array_merge($disapprove_log_topics, $disapprove_log_posts);
 
-		// Unset unneeded arrays
-		unset($post_data, $disapprove_log_topics, $disapprove_log_posts);
+			// Unset unneeded arrays
+			unset($post_data, $disapprove_log_topics, $disapprove_log_posts);
 
-		// Let's do the job - delete disapproved posts
-		if (sizeof($post_disapprove_list))
-		{
-			if (!function_exists('delete_posts'))
+			// Let's do the job - delete disapproved posts
+			if (sizeof($post_disapprove_list))
 			{
-				include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
-			}
+				if (!function_exists('delete_posts'))
+				{
+					include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+				}
 
-			// We do not check for permissions here, because the moderator allowed approval/disapproval should be allowed to delete the disapproved posts
-			// Note: function delete_posts triggers related forums/topics sync,
-			// so we don't need to call update_post_information later and to adjust real topic replies or forum topics count manually
-			delete_posts('post_id', array_keys($post_disapprove_list));
+				// We do not check for permissions here, because the moderator allowed approval/disapproval should be allowed to delete the disapproved posts
+				// Note: function delete_posts triggers related forums/topics sync,
+				// so we don't need to call update_post_information later and to adjust real topic replies or forum topics count manually
+				delete_posts('post_id', array_keys($post_disapprove_list));
 
-			foreach ($disapprove_log as $log_data)
-			{
-				add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_DISAPPROVED' : 'LOG_POST_DISAPPROVED', $log_data['post_subject'], $disapprove_reason);
+				foreach ($disapprove_log as $log_data)
+				{
+					add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_DISAPPROVED' : 'LOG_POST_DISAPPROVED', $log_data['post_subject'], $disapprove_reason);
+				}
 			}
-		}
-
-		$messenger = new messenger();
 
-		// Notify Poster?
-		if ($notify_poster)
-		{
-			$lang_reasons = array();
+			$messenger = new messenger();
 
-			foreach ($post_info as $post_id => $post_data)
+			// Notify Poster?
+			if ($notify_poster)
 			{
-				if ($post_data['poster_id'] == ANONYMOUS)
-				{
-					continue;
-				}
+				$lang_reasons = array();
 
-				if (isset($disapprove_reason_lang))
+				foreach ($post_info as $post_id => $post_data)
 				{
-					// Okay we need to get the reason from the posters language
-					if (!isset($lang_reasons[$post_data['user_lang']]))
+					if ($post_data['poster_id'] == ANONYMOUS)
 					{
-						// Assign the current users translation as the default, this is not ideal but getting the board default adds another layer of complexity.
-						$lang_reasons[$post_data['user_lang']] = $user->lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang];
+						continue;
+					}
 
-						// Only load up the language pack if the language is different to the current one
-						if ($post_data['user_lang'] != $user->lang_name && file_exists($phpbb_root_path . '/language/' . $post_data['user_lang'] . '/mcp.' . $phpEx))
+					if (isset($disapprove_reason_lang))
+					{
+						// Okay we need to get the reason from the posters language
+						if (!isset($lang_reasons[$post_data['user_lang']]))
 						{
-							// Load up the language pack
-							$lang = array();
-							@include($phpbb_root_path . '/language/' . basename($post_data['user_lang']) . '/mcp.' . $phpEx);
+							// Assign the current users translation as the default, this is not ideal but getting the board default adds another layer of complexity.
+							$lang_reasons[$post_data['user_lang']] = $user->lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang];
 
-							// If we find the reason in this language pack use it
-							if (isset($lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang]))
+							// Only load up the language pack if the language is different to the current one
+							if ($post_data['user_lang'] != $user->lang_name && file_exists($phpbb_root_path . '/language/' . $post_data['user_lang'] . '/mcp.' . $phpEx))
 							{
-								$lang_reasons[$post_data['user_lang']] = $lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang];
-							}
+								// Load up the language pack
+								$lang = array();
+								@include($phpbb_root_path . '/language/' . basename($post_data['user_lang']) . '/mcp.' . $phpEx);
 
-							unset($lang); // Free memory
+								// If we find the reason in this language pack use it
+								if (isset($lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang]))
+								{
+									$lang_reasons[$post_data['user_lang']] = $lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang];
+								}
+
+								unset($lang); // Free memory
+							}
 						}
+
+						$email_disapprove_reason = $lang_reasons[$post_data['user_lang']];
+						$email_disapprove_reason .= ($reason) ? "\n\n" . $reason : '';
 					}
 
-					$email_disapprove_reason = $lang_reasons[$post_data['user_lang']];
-					$email_disapprove_reason .= ($reason) ? "\n\n" . $reason : '';
-				}
+					$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_disapproved' : 'post_disapproved';
 
-				$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_disapproved' : 'post_disapproved';
+					$messenger->template($email_template, $post_data['user_lang']);
 
-				$messenger->template($email_template, $post_data['user_lang']);
+					$messenger->to($post_data['user_email'], $post_data['username']);
+					$messenger->im($post_data['user_jabber'], $post_data['username']);
 
-				$messenger->to($post_data['user_email'], $post_data['username']);
-				$messenger->im($post_data['user_jabber'], $post_data['username']);
+					$messenger->assign_vars(array(
+						'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
+						'REASON'		=> htmlspecialchars_decode($email_disapprove_reason),
+						'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
+						'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])))
+					);
 
-				$messenger->assign_vars(array(
-					'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
-					'REASON'		=> htmlspecialchars_decode($email_disapprove_reason),
-					'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
-					'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])))
-				);
+					$messenger->send($post_data['user_notify_type']);
+				}
 
-				$messenger->send($post_data['user_notify_type']);
+				unset($lang_reasons);
 			}
+			unset($post_info, $disapprove_reason, $email_disapprove_reason, $disapprove_reason_lang);
 
-			unset($lang_reasons);
-		}
-		unset($post_info, $disapprove_reason, $email_disapprove_reason, $disapprove_reason_lang);
+			$messenger->save_queue();
 
-		$messenger->save_queue();
-
-		if ($num_disapproved_topics)
-		{
-			$success_msg = ($num_disapproved_topics == 1) ? 'TOPIC_DISAPPROVED_SUCCESS' : 'TOPICS_DISAPPROVED_SUCCESS';
+			if ($num_disapproved_topics)
+			{
+				$success_msg = ($num_disapproved_topics == 1) ? 'TOPIC_DISAPPROVED_SUCCESS' : 'TOPICS_DISAPPROVED_SUCCESS';
+			}
+			else
+			{
+				$success_msg = ($num_disapproved_posts == 1) ? 'POST_DISAPPROVED_SUCCESS' : 'POSTS_DISAPPROVED_SUCCESS';
+			}
 		}
 		else
 		{
-			$success_msg = ($num_disapproved_posts == 1) ? 'POST_DISAPPROVED_SUCCESS' : 'POSTS_DISAPPROVED_SUCCESS';
-		}
-	}
-	else
-	{
-		include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+			include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 
-		display_reasons($reason_id);
+			display_reasons($reason_id);
 
-		$show_notify = false;
+			$show_notify = false;
 
-		foreach ($post_info as $post_data)
-		{
-			if ($post_data['poster_id'] == ANONYMOUS)
-			{
-				continue;
-			}
-			else
+			foreach ($post_info as $post_data)
 			{
-				$show_notify = true;
-				break;
+				if ($post_data['poster_id'] == ANONYMOUS)
+				{
+					continue;
+				}
+				else
+				{
+					$show_notify = true;
+					break;
+				}
 			}
-		}
 
-		$template->assign_vars(array(
-			'S_NOTIFY_POSTER'	=> $show_notify,
-			'S_APPROVE'			=> false,
-			'REASON'			=> $reason,
-			'ADDITIONAL_MSG'	=> $additional_msg)
-		);
+			$template->assign_vars(array(
+				'S_NOTIFY_POSTER'	=> $show_notify,
+				'S_APPROVE'			=> false,
+				'REASON'			=> $reason,
+				'ADDITIONAL_MSG'	=> $additional_msg)
+			);
 
-		confirm_box(false, 'DISAPPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
-	}
-
-	$redirect = request_var('redirect', "index.$phpEx");
-	$redirect = reapply_sid($redirect);
+			confirm_box(false, 'DISAPPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
+		}
 
-	if (!$success_msg)
-	{
-		redirect($redirect);
-	}
-	else
-	{
-		$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>');
+		$redirect = request_var('redirect', "index.$phpEx");
+		$redirect = reapply_sid($redirect);
 
-		if ($request->is_ajax())
+		if (!$success_msg)
 		{
-			$json_response = new phpbb_json_response;
-			$json_response->send(array(
-				'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
-				'MESSAGE_TEXT'		=> $message,
-				'REFRESH_DATA'		=> null,
-				'visible'			=> false,
-			));
+			redirect($redirect);
 		}
+		else
+		{
+			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>');
 
-		meta_refresh(3, $redirect);
-		trigger_error($message);
+			if ($request->is_ajax())
+			{
+				$json_response = new phpbb_json_response;
+				$json_response->send(array(
+					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
+					'MESSAGE_TEXT'		=> $message,
+					'REFRESH_DATA'		=> null,
+					'visible'			=> false,
+				));
+			}
+
+			meta_refresh(3, $redirect);
+			trigger_error($message);
+		}
 	}
 }
-- 
cgit v1.2.1


From b1ce8a8c13eca920abf3659fcbfec267684071bb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 15 Oct 2012 15:19:32 +0200
Subject: [feature/soft-delete] Add checkbox to restoring posts like on approve

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_queue.php | 72 +++++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 27 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 99c4a6eccb..a56d4ac898 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -458,8 +458,6 @@ class mcp_queue
 	/**
 	* Restore Posts
 	*
-	* @todo: Add some XSS protection, or even a confirm_box()
-	*
 	* @param $post_id_list	array	IDs of the posts to restore
 	* @param $id			mixed	Category of the current active module
 	* @param $mode			string	Active module
@@ -476,49 +474,69 @@ class mcp_queue
 		}
 
 		$redirect = request_var('redirect', build_url(array('quickmod')));
-		$redirect = reapply_sid($redirect);
 		$success_msg = '';
 
-		$post_info = get_post_data($post_id_list, 'm_approve');
+		$s_hidden_fields = build_hidden_fields(array(
+			'i'				=> $id,
+			'mode'			=> $mode,
+			'post_id_list'	=> $post_id_list,
+			'action'		=> 'approve',
+			'redirect'		=> $redirect)
+		);
 
-		$topic_info = array();
+		$post_info = get_post_data($post_id_list, 'm_approve');
 
-		// Group the posts by topic_id
-		foreach ($post_info as $post_id => $post_data)
+		if (confirm_box(true))
 		{
-			if ($post_data['post_visibility'] == ITEM_APPROVED)
+			$topic_info = array();
+
+			// Group the posts by topic_id
+			foreach ($post_info as $post_id => $post_data)
 			{
-				continue;
-			}
-			$topic_id = (int) $post_data['topic_id'];
+				if ($post_data['post_visibility'] == ITEM_APPROVED)
+				{
+					continue;
+				}
+				$topic_id = (int) $post_data['topic_id'];
 
-			$topic_info[$topic_id]['posts'][] = (int) $post_id;
-			$topic_info[$topic_id]['forum_id'] = (int) $post_data['forum_id'];
+				$topic_info[$topic_id]['posts'][] = (int) $post_id;
+				$topic_info[$topic_id]['forum_id'] = (int) $post_data['forum_id'];
 
-			if ($post_id == $post_data['topic_first_post_id'])
-			{
-				$topic_info[$topic_id]['first_post'] = true;
+				if ($post_id == $post_data['topic_first_post_id'])
+				{
+					$topic_info[$topic_id]['first_post'] = true;
+				}
+
+				if ($post_id == $post_data['topic_last_post_id'])
+				{
+					$topic_info[$topic_id]['last_post'] = true;
+				}
+
+				$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&amp;t={$post_data['topic_id']}&amp;p={$post_data['post_id']}") . '#p' . $post_data['post_id'];
 			}
 
-			if ($post_id == $post_data['topic_last_post_id'])
+			foreach ($topic_info as $topic_id => $topic_data)
 			{
-				$topic_info[$topic_id]['last_post'] = true;
+				phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));
 			}
 
-			$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&amp;t={$post_data['topic_id']}&amp;p={$post_data['post_id']}") . '#p' . $post_data['post_id'];
+			if (sizeof($post_info) >= 1)
+			{
+				$success_msg = (sizeof($post_info) == 1) ? 'POST_RESTORED_SUCCESS' : 'POSTS_RESTORED_SUCCESS';
+			}
 		}
-
-		foreach ($topic_info as $topic_id => $topic_data)
+		else
 		{
-			phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));
-		}
+			$template->assign_vars(array(
+				'S_APPROVE'			=> true,
+			));
 
-		$success_msg = '';
-		if (sizeof($post_info) >= 1)
-		{
-			$success_msg = (sizeof($post_info) == 1) ? 'POST_RESTORED_SUCCESS' : 'POSTS_RESTORED_SUCCESS';
+			confirm_box(false, 'RESTORE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
 		}
 
+		$redirect = request_var('redirect', "index.$phpEx");
+		$redirect = reapply_sid($redirect);
+
 		if (!$success_msg)
 		{
 			redirect($redirect);
-- 
cgit v1.2.1


From 33073fafbe53cb103e9e00bceb249a0879a2eb9c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 15 Oct 2012 15:53:32 +0200
Subject: [feature/soft-delete] Add module for soft deleted topics

Unapproved/soft deleted posts are posts, that have a different visibility than
the topic. All others will be hidden from the posts list and can be managed
with the topic modules.

PHPBB3-9567
---
 phpBB/includes/mcp/info/mcp_queue.php |   1 +
 phpBB/includes/mcp/mcp_queue.php      | 120 +++++++++++++++++++++++++++++-----
 2 files changed, 105 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/info/mcp_queue.php b/phpBB/includes/mcp/info/mcp_queue.php
index 43f6c81694..68cac5abd2 100644
--- a/phpBB/includes/mcp/info/mcp_queue.php
+++ b/phpBB/includes/mcp/info/mcp_queue.php
@@ -21,6 +21,7 @@ class mcp_queue_info
 			'modes'		=> array(
 				'unapproved_topics'	=> array('title' => 'MCP_QUEUE_UNAPPROVED_TOPICS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')),
 				'unapproved_posts'	=> array('title' => 'MCP_QUEUE_UNAPPROVED_POSTS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')),
+				'deleted_topics'	=> array('title' => 'MCP_QUEUE_DELETED_TOPICS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')),
 				'deleted_posts'		=> array('title' => 'MCP_QUEUE_DELETED_POSTS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')),
 				'approve_details'	=> array('title' => 'MCP_QUEUE_APPROVE_DETAILS', 'auth' => 'acl_m_approve,$id || (!$id && aclf_m_approve)', 'cat' => array('MCP_QUEUE')),
 			),
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index a56d4ac898..d61c5fa5ef 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -229,8 +229,12 @@ class mcp_queue
 
 			case 'unapproved_topics':
 			case 'unapproved_posts':
+			case 'deleted_topics':
 			case 'deleted_posts':
 				$m_perm = 'm_approve';
+				$is_topics = ($mode == 'unapproved_topics' || $mode == 'deleted_topics') ? true : false;
+				$is_restore = ($mode == 'deleted_posts' || $mode == 'deleted_topics') ? true : false;
+				$visibility_const = (!$is_restore) ? ITEM_UNAPPROVED : ITEM_DELETED;
 
 				$user->add_lang(array('viewtopic', 'viewforum'));
 
@@ -312,11 +316,8 @@ class mcp_queue
 
 				$forum_names = array();
 
-				if ($mode == 'unapproved_posts' || $mode == 'deleted_posts')
+				if (!$is_topics)
 				{
-					$visibility_const = ($mode == 'unapproved_posts') ? ITEM_UNAPPROVED : ITEM_DELETED;
-					$starter_sql = ($mode == 'unapproved_posts') ? 'AND t.topic_first_post_id <> p.post_id' : '';
-
 					$sql = 'SELECT p.post_id
 						FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . '
 						WHERE ' . $db->sql_in_set('p.forum_id', $forum_list) . '
@@ -324,7 +325,7 @@ class mcp_queue
 							' . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . '
 							' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . "
 							AND t.topic_id = p.topic_id
-							$starter_sql
+							AND t.topic_visibility <> p.post_visibility
 							$limit_time_sql
 						ORDER BY $sort_order_sql";
 					$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
@@ -370,9 +371,9 @@ class mcp_queue
 				else
 				{
 					$sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, t.topic_title AS post_subject, t.topic_time AS post_time, t.topic_poster AS poster_id, t.topic_first_post_id AS post_id, t.topic_attachment AS post_attachment, t.topic_first_poster_name AS username, t.topic_first_poster_colour AS user_colour
-						FROM ' . TOPICS_TABLE . " t
-						WHERE " . $db->sql_in_set('forum_id', $forum_list) . "
-							AND topic_visibility = " . ITEM_UNAPPROVED . "
+						FROM ' . TOPICS_TABLE . ' t
+						WHERE ' . $db->sql_in_set('forum_id', $forum_list) . '
+							AND topic_visibility = ' . $visibility_const . "
 							$limit_time_sql
 						ORDER BY $sort_order_sql";
 					$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
@@ -432,22 +433,22 @@ class mcp_queue
 
 				$base_url = $this->u_action . "&amp;f=$forum_id&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir";
 				phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total, $config['topics_per_page'], $start);
-				
+
 				// Now display the page
 				$template->assign_vars(array(
-					'L_DISPLAY_ITEMS'		=> ($mode == 'unapproved_posts') ? $user->lang['DISPLAY_POSTS'] : $user->lang['DISPLAY_TOPICS'],
+					'L_DISPLAY_ITEMS'		=> (!$is_topics) ? $user->lang['DISPLAY_POSTS'] : $user->lang['DISPLAY_TOPICS'],
 					'L_EXPLAIN'				=> $user->lang['MCP_QUEUE_' . strtoupper($mode) . '_EXPLAIN'],
 					'L_TITLE'				=> $user->lang['MCP_QUEUE_' . strtoupper($mode)],
 					'L_ONLY_TOPIC'			=> ($topic_id) ? sprintf($user->lang['ONLY_TOPIC'], $topic_info['topic_title']) : '',
 
 					'S_FORUM_OPTIONS'		=> $forum_options,
 					'S_MCP_ACTION'			=> build_url(array('t', 'f', 'sd', 'st', 'sk')),
-					'S_TOPICS'				=> ($mode == 'unapproved_topics') ? true : false,
-					'S_RESTORE'				=> ($mode == 'deleted_posts') ? true : false,
+					'S_TOPICS'				=> $is_topics,
+					'S_RESTORE'				=> $is_restore,
 
 					'PAGE_NUMBER'			=> phpbb_on_page($template, $user, $base_url, $total, $config['topics_per_page'], $start),
 					'TOPIC_ID'				=> $topic_id,
-					'TOTAL'					=> $user->lang((($mode == 'unapproved_posts') ? 'VIEW_TOPIC_POSTS' : 'VIEW_FORUM_TOPICS'), (int) $total),
+					'TOTAL'					=> $user->lang(((!$is_topics) ? 'VIEW_TOPIC_POSTS' : 'VIEW_FORUM_TOPICS'), (int) $total),
 				));
 
 				$this->tpl_name = 'mcp_queue';
@@ -480,9 +481,9 @@ class mcp_queue
 			'i'				=> $id,
 			'mode'			=> $mode,
 			'post_id_list'	=> $post_id_list,
-			'action'		=> 'approve',
-			'redirect'		=> $redirect)
-		);
+			'action'		=> 'restore',
+			'redirect'		=> $redirect,
+		));
 
 		$post_info = get_post_data($post_id_list, 'm_approve');
 
@@ -568,6 +569,93 @@ class mcp_queue
 		}
 	}
 
+	/**
+	* Restore topics
+	*
+	* @param $topic_id_list	array	IDs of the topics to restore
+	* @param $id			mixed	Category of the current active module
+	* @param $mode			string	Active module
+	* @return void
+	*/
+	function restore_topics($topic_id_list, $id, $mode)
+	{
+		global $db, $template, $user, $config;
+		global $phpEx, $phpbb_root_path, $request;
+
+		if (!check_ids($topic_id_list, TOPICS_TABLE, 'topic_id', array('m_approve')))
+		{
+			trigger_error('NOT_AUTHORISED');
+		}
+
+		$redirect = request_var('redirect', build_url(array('quickmod')));
+		$success_msg = '';
+
+		$s_hidden_fields = build_hidden_fields(array(
+			'i'				=> $id,
+			'mode'			=> $mode,
+			'topic_id_list'	=> $topic_id_list,
+			'action'		=> 'restore',
+			'redirect'		=> $redirect,
+		));
+
+		$topic_info = get_topic_data($topic_id_list, 'm_approve');
+
+		if (confirm_box(true))
+		{
+			foreach ($topic_info as $topic_id => $topic_data)
+			{
+				phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
+				$topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$topic_data['forum_id']}&amp;t={$topic_id}");
+			}
+
+			if (sizeof($topic_info) >= 1)
+			{
+				$success_msg = 'TOPIC' . ((sizeof($topic_info) == 1) ? '' : 'S') . '_RESTORED_SUCCESS';
+			}
+		}
+		else
+		{
+			$template->assign_vars(array(
+				'S_APPROVE'			=> true,
+			));
+
+			confirm_box(false, 'RESTORE_TOPIC' . ((sizeof($topic_info) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
+		}
+
+		$redirect = request_var('redirect', "index.$phpEx");
+		$redirect = reapply_sid($redirect);
+
+		if (!$success_msg)
+		{
+			redirect($redirect);
+		}
+		else
+		{
+			// If restoring one topic, also give links back to topic...
+			$add_message = '';
+			if (sizeof($topic_info) == 1 && !empty($topic_url))
+			{
+				$add_message = '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $topic_url . '">', '</a>');
+			}
+
+			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message;
+
+			if ($request->is_ajax())
+			{
+				$json_response = new phpbb_json_response;
+				$json_response->send(array(
+					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
+					'MESSAGE_TEXT'		=> $message,
+					'REFRESH_DATA'		=> null,
+					'visible'			=> true,
+				));
+			}
+
+			meta_refresh(3, $redirect);
+			trigger_error($message);
+		}
+	}
+
 	/**
 	* Approve Post/Topic
 	*/
-- 
cgit v1.2.1


From 51d54109e0ad159a521be57192b6547bebc02fe3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 16 Oct 2012 13:55:22 +0200
Subject: [feature/soft-delete] Merge approving and restoring posts into one
 function

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_queue.php | 189 +++++++++++++++++++++++++--------------
 1 file changed, 124 insertions(+), 65 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index d61c5fa5ef..26e6ad574f 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -50,23 +50,33 @@ class mcp_queue
 				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 
 				$post_id_list = request_var('post_id_list', array(0));
+				$topic_id_list = request_var('topic_id_list', array(0));
 
-				if (!sizeof($post_id_list))
+				if (!empty($post_id_list))
 				{
-					trigger_error('NO_POST_SELECTED');
-				}
-
-				if ($action == 'approve')
-				{
-					$this->approve_posts($post_id_list, 'queue', $mode);
+					if ($action != 'disapprove')
+					{
+						$this->approve_posts($action, $post_id_list, 'queue', $mode);
+					}
+					else
+					{
+						$this->disapprove_posts($post_id_list, 'queue', $mode);
+					}
 				}
-				else if ($action == 'restore')
+				else if (!empty($topic_id_list))
 				{
-					$this->restore_posts($post_id_list, 'queue', $mode);
+					if ($action != 'disapprove')
+					{
+						$this->approve_topics($action, $post_id_list, 'queue', $mode);
+					}
+					else
+					{
+						$this->disapprove_posts($post_id_list, 'queue', $mode);
+					}
 				}
 				else
 				{
-					$this->disapprove_posts($post_id_list, 'queue', $mode);
+					trigger_error('NO_POST_SELECTED');
 				}
 
 			break;
@@ -657,13 +667,18 @@ class mcp_queue
 	}
 
 	/**
-	* Approve Post/Topic
+	* Approve/Restore posts
+	*
+	* @param $action		string	Action we perform on the posts ('approve' or 'restore')
+	* @param $post_id_list	array	IDs of the posts to restore
+	* @param $id			mixed	Category of the current active module
+	* @param $mode			string	Active module
+	* @return void
 	*/
-	function approve_posts($post_id_list, $id, $mode)
+	function approve_posts($action, $post_id_list, $id, $mode)
 	{
 		global $db, $template, $user, $config;
-		global $phpEx, $phpbb_root_path;
-		global $request;
+		global $phpEx, $phpbb_root_path, $request;
 
 		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 		{
@@ -671,87 +686,131 @@ class mcp_queue
 		}
 
 		$redirect = request_var('redirect', build_url(array('quickmod')));
-		$success_msg = '';
+		$success_msg = $post_url = '';
+		$approve_log = array();
 
 		$s_hidden_fields = build_hidden_fields(array(
 			'i'				=> $id,
 			'mode'			=> $mode,
 			'post_id_list'	=> $post_id_list,
-			'action'		=> 'approve',
-			'redirect'		=> $redirect)
-		);
+			'action'		=> $action,
+			'redirect'		=> $redirect,
+		));
 
 		$post_info = get_post_data($post_id_list, 'm_approve');
 
 		if (confirm_box(true))
 		{
-			$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
-
-			$success_msg = phpbb_content_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
+			$notify_poster = ($action == 'approve' && isset($_REQUEST['notify_poster'])) ? true : false;
 
-			$messenger = new messenger();
+			$topic_info = array();
 
-			// Notify Poster?
-			if ($notify_poster)
+			// Group the posts by topic_id
+			foreach ($post_info as $post_id => $post_data)
 			{
-				foreach ($post_info as $post_id => $post_data)
+				if ($post_data['post_visibility'] == ITEM_APPROVED)
 				{
-					if ($post_data['poster_id'] == ANONYMOUS)
-					{
-						continue;
-					}
+					continue;
+				}
+				$topic_id = (int) $post_data['topic_id'];
 
-					$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_approved' : 'post_approved';
+				$topic_info[$topic_id]['posts'][] = (int) $post_id;
+				$topic_info[$topic_id]['forum_id'] = (int) $post_data['forum_id'];
 
-					$messenger->template($email_template, $post_data['user_lang']);
+				if ($post_id == $post_data['topic_first_post_id'])
+				{
+					$topic_info[$topic_id]['first_post'] = true;
+				}
 
-					$messenger->to($post_data['user_email'], $post_data['username']);
-					$messenger->im($post_data['user_jabber'], $post_data['username']);
+				if ($post_id == $post_data['topic_last_post_id'])
+				{
+					$topic_info[$topic_id]['last_post'] = true;
+				}
 
-					$messenger->assign_vars(array(
-						'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
-						'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
-						'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])),
+				$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&amp;t={$post_data['topic_id']}&amp;p={$post_data['post_id']}") . '#p' . $post_data['post_id'];
 
-						'U_VIEW_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&e=0",
-						'U_VIEW_POST'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&p=$post_id&e=$post_id")
-					);
+				$approve_log[] = array(
+					'forum_id'		=> $post_data['forum_id'],
+					'topic_id'		=> $post_data['topic_id'],
+					'post_subject'	=> $post_data['post_subject'],
+				);
+			}
 
-					$messenger->send($post_data['user_notify_type']);
-				}
+			foreach ($topic_info as $topic_id => $topic_data)
+			{
+				phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));
 			}
 
-			$messenger->save_queue();
+			if (sizeof($post_info) >= 1)
+			{
+				$success_msg = (sizeof($post_info) == 1) ? 'POST_' . strtoupper($action) . 'D_SUCCESS' : 'POSTS_' . strtoupper($action) . 'D_SUCCESS';
+			}
 
-			// Send out normal user notifications
-			$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
+			foreach ($approve_log as $log_data)
+			{
+				add_log('mod', $log_data['forum_id'], $log_data['topic_id'], 'LOG_POST_' . strtoupper($action) . 'D', $log_data['post_subject']);
+			}
 
-			foreach ($post_info as $post_id => $post_data)
+			// Only send out the mails, when the posts are being approved
+			if ($action == 'approve')
 			{
-				if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
+				$messenger = new messenger();
+
+				// Notify Poster?
+				if ($notify_poster)
 				{
-					// Forum Notifications
-					user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+					foreach ($post_info as $post_id => $post_data)
+					{
+						if ($post_data['poster_id'] == ANONYMOUS)
+						{
+							continue;
+						}
+
+						$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_approved' : 'post_approved';
+
+						$messenger->template($email_template, $post_data['user_lang']);
+
+						$messenger->to($post_data['user_email'], $post_data['username']);
+						$messenger->im($post_data['user_jabber'], $post_data['username']);
+
+						$messenger->assign_vars(array(
+							'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
+							'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
+							'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])),
+
+							'U_VIEW_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&e=0",
+							'U_VIEW_POST'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&p=$post_id&e=$post_id")
+						);
+
+						$messenger->send($post_data['user_notify_type']);
+					}
 				}
-				else
+
+				$messenger->save_queue();
+
+				// Send out normal user notifications
+				$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
+
+				foreach ($post_info as $post_id => $post_data)
 				{
-					// Topic Notifications
-					user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+					if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
+					{
+						// Forum Notifications
+						user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+					}
+					else
+					{
+						// Topic Notifications
+						user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+					}
 				}
 			}
-
-			if (sizeof($post_id_list) == 1)
-			{
-				$post_data = $post_info[$post_id_list[0]];
-				$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&amp;t={$post_data['topic_id']}&amp;p={$post_data['post_id']}") . '#p' . $post_data['post_id'];
-			}
-			unset($post_info);
 		}
 		else
 		{
 			$show_notify = false;
 
-			if ($config['email_enable'] || $config['jab_enable'])
+			if ($action == 'approve' && ($config['email_enable'] || $config['jab_enable']))
 			{
 				foreach ($post_info as $post_data)
 				{
@@ -768,11 +827,11 @@ class mcp_queue
 			}
 
 			$template->assign_vars(array(
-				'S_NOTIFY_POSTER'	=> $show_notify,
-				'S_APPROVE'			=> true)
-			);
+				'S_NOTIFY_POSTER'			=> $show_notify,
+				'S_' . strtoupper($action)	=> true,
+			));
 
-			confirm_box(false, 'APPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
+			confirm_box(false, strtoupper($action) . '_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
 		}
 
 		$redirect = request_var('redirect', "index.$phpEx");
@@ -788,7 +847,7 @@ class mcp_queue
 
 			// If approving one post, also give links back to post...
 			$add_message = '';
-			if (sizeof($post_id_list) == 1 && !empty($post_url))
+			if (sizeof($post_info) == 1 && $post_url)
 			{
 				$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');
 			}
-- 
cgit v1.2.1


From 722835a4baad13e6886ffd724f92ffaf61990b90 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 16 Oct 2012 14:18:56 +0200
Subject: [feature/soft-delete] Merge approving and restoring topics into one
 function

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_queue.php | 187 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 173 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 26e6ad574f..f4a78525c8 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -670,7 +670,7 @@ class mcp_queue
 	* Approve/Restore posts
 	*
 	* @param $action		string	Action we perform on the posts ('approve' or 'restore')
-	* @param $post_id_list	array	IDs of the posts to restore
+	* @param $post_id_list	array	IDs of the posts to approve/restore
 	* @param $id			mixed	Category of the current active module
 	* @param $mode			string	Active module
 	* @return void
@@ -766,9 +766,7 @@ class mcp_queue
 							continue;
 						}
 
-						$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_approved' : 'post_approved';
-
-						$messenger->template($email_template, $post_data['user_lang']);
+						$messenger->template('post_approved', $post_data['user_lang']);
 
 						$messenger->to($post_data['user_email'], $post_data['username']);
 						$messenger->im($post_data['user_jabber'], $post_data['username']);
@@ -793,16 +791,8 @@ class mcp_queue
 
 				foreach ($post_info as $post_id => $post_data)
 				{
-					if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
-					{
-						// Forum Notifications
-						user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
-					}
-					else
-					{
-						// Topic Notifications
-						user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
-					}
+					// Topic Notifications
+					user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
 				}
 			}
 		}
@@ -869,6 +859,175 @@ class mcp_queue
 		}
 	}
 
+	/**
+	* Approve/Restore topics
+	*
+	* @param $action		string	Action we perform on the posts ('approve' or 'restore')
+	* @param $topic_id_list	array	IDs of the topics to approve/restore
+	* @param $id			mixed	Category of the current active module
+	* @param $mode			string	Active module
+	* @return void
+	*/
+	function approve_topics($action, $topic_id_list, $id, $mode)
+	{
+		global $db, $template, $user, $config;
+		global $phpEx, $phpbb_root_path, $request;
+
+		if (!check_ids($topic_id_list, TOPICS_TABLE, 'topic_id', array('m_approve')))
+		{
+			trigger_error('NOT_AUTHORISED');
+		}
+
+		$redirect = request_var('redirect', build_url(array('quickmod')));
+		$success_msg = $topic_url = '';
+		$approve_log = array();
+
+		$s_hidden_fields = build_hidden_fields(array(
+			'i'				=> $id,
+			'mode'			=> $mode,
+			'topic_id_list'	=> $topic_id_list,
+			'action'		=> $action,
+			'redirect'		=> $redirect,
+		));
+
+		$topic_info = get_topic_data($topic_id_list, 'm_approve');
+
+		if (confirm_box(true))
+		{
+			$notify_poster = ($action == 'approve' && isset($_REQUEST['notify_poster'])) ? true : false;
+
+			foreach ($topic_info as $topic_id => $topic_data)
+			{
+				phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
+
+				$topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$topic_data['forum_id']}&amp;t={$topic_id}");
+
+				$approve_log[] = array(
+					'forum_id'		=> $topic_data['forum_id'],
+					'topic_id'		=> $topic_data['topic_id'],
+					'topic_title'	=> $topic_data['topic_title'],
+				);
+			}
+
+			foreach ($topic_info as $topic_id => $topic_data)
+			{
+				phpbb_content_visibility::set_topic_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
+			}
+
+			if (sizeof($topic_info) >= 1)
+			{
+				$success_msg = (sizeof($topic_info) == 1) ? 'TOPIC_' . strtoupper($action) . 'D_SUCCESS' : 'TOPICS_' . strtoupper($action) . 'D_SUCCESS';
+			}
+
+			foreach ($approve_log as $log_data)
+			{
+				add_log('mod', $log_data['forum_id'], $log_data['topic_id'], 'LOG_TOPIC_' . strtoupper($action) . 'D', $log_data['topic_title']);
+			}
+
+			// Only send out the mails, when the posts are being approved
+			if ($action == 'approve')
+			{
+				$messenger = new messenger();
+
+				// Notify Poster?
+				if ($notify_poster)
+				{
+					foreach ($topic_info as $topic_id => $topic_data)
+					{
+						if ($topic_data['topic_poster'] == ANONYMOUS)
+						{
+							continue;
+						}
+
+						$messenger->template('topic_approved', $topic_data['user_lang']);
+						$messenger->to($topic_data['user_email'], $topic_data['username']);
+						$messenger->im($topic_data['user_jabber'], $topic_data['username']);
+
+						$messenger->assign_vars(array(
+							'USERNAME'		=> htmlspecialchars_decode($topic_data['username']),
+							'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($topic_data['topic_title'])),
+							'U_VIEW_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?f={$topic_data['forum_id']}&t={$topic_data['topic_id']}&e=0",
+						);
+
+						$messenger->send($topic_data['user_notify_type']);
+					}
+				}
+
+				$messenger->save_queue();
+
+				// Send out normal user notifications
+				$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
+
+				foreach ($topic_info as $topic_id => $topic_data)
+				{
+					// Forum Notifications
+					user_notification('post', $topic_data['topic_title'], $topic_data['topic_title'], $topic_data['forum_name'], $topic_data['forum_id'], $topic_data['topic_id'], 0);
+				}
+			}
+		}
+		else
+		{
+			$show_notify = false;
+
+			if ($action == 'approve' && ($config['email_enable'] || $config['jab_enable']))
+			{
+				foreach ($topic_info as $topic_data)
+				{
+					if ($topic_data['topic_poster'] == ANONYMOUS)
+					{
+						continue;
+					}
+					else
+					{
+						$show_notify = true;
+						break;
+					}
+				}
+			}
+
+			$template->assign_vars(array(
+				'S_NOTIFY_POSTER'			=> $show_notify,
+				'S_' . strtoupper($action)	=> true,
+			));
+
+			confirm_box(false, strtoupper($action) . '_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
+		}
+
+		$redirect = request_var('redirect', "index.$phpEx");
+		$redirect = reapply_sid($redirect);
+
+		if (!$success_msg)
+		{
+			redirect($redirect);
+		}
+		else
+		{
+			meta_refresh(3, $redirect);
+
+			// If approving one topic, also give links back to topic...
+			$add_message = '';
+			if (sizeof($topic_info) == 1 && $topic_url)
+			{
+				$add_message = '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $topic_url . '">', '</a>');
+			}
+
+			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message;
+
+			if ($request->is_ajax())
+			{
+				$json_response = new phpbb_json_response;
+				$json_response->send(array(
+					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
+					'MESSAGE_TEXT'		=> $message,
+					'REFRESH_DATA'		=> null,
+					'visible'			=> true,
+				));
+			}
+
+			trigger_error($message);
+		}
+	}
+
 	/**
 	* Disapprove Post/Topic
 	*/
-- 
cgit v1.2.1


From 43d041bdecb5e564ad48efdf4702cad3714c7837 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 16 Oct 2012 14:20:23 +0200
Subject: [feature/soft-delete] Removed unused old functions

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 164 ----------------------------
 phpBB/includes/mcp/mcp_queue.php      | 200 ----------------------------------
 2 files changed, 364 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 8854981303..8bfdfd2917 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -550,168 +550,4 @@ class phpbb_content_visibility
 			$db->sql_query($sql);
 		}
 	}
-
-	/**
-	* One function to rule them all... and unhide posts and topics. This could
-	* reasonably be broken up, I straight copied this code from the mcp_queue.php
-	* file here for global access.
-	* @param $mode - string - member of the set {'approve', 'restore'}
-	* @param $post_info - array - Contains info from post U topics table about
-	* 	the posts/topics in question
-	* @param $post_id_list - array of ints - the set of posts being worked on
-	*/
-	static public function unhide_posts_topics($mode, $post_info, $post_id_list)
-	{
-		global $db, $config;
-
-		// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
-		// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
-
-		$total_topics = $total_posts = 0;
-		$topic_approve_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array();
-		$user_posts_sql = $post_approved_list = array();
-
-		foreach ($post_info as $post_id => $post_data)
-		{
-			if ($post_data['post_visibility'] == ITEM_APPROVED)
-			{
-				$post_approved_list[] = $post_id;
-				continue;
-			}
-
-			$topic_id_list[$post_data['topic_id']] = 1;
-
-			if ($post_data['forum_id'])
-			{
-				$forum_id_list[$post_data['forum_id']] = 1;
-			}
-
-			// User post update (we do not care about topic or post, since user topics are strictly connected to posts)
-			// But we care about forums where post counts get not increased. ;)
-			if ($post_data['post_postcount'])
-			{
-				$user_posts_sql[$post_data['poster_id']] = (empty($user_posts_sql[$post_data['poster_id']])) ? 1 : $user_posts_sql[$post_data['poster_id']] + 1;
-			}
-
-			// Topic or Post. ;)
-			if ($post_data['topic_first_post_id'] == $post_id)
-			{
-				if ($post_data['forum_id'])
-				{
-					$total_topics++;
-				}
-				$topic_approve_sql[] = $post_data['topic_id'];
-
-				$approve_log[] = array(
-					'type'			=> 'topic',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> $post_data['topic_id'],
-				);
-			}
-			else
-			{
-				$approve_log[] = array(
-					'type'			=> 'post',
-					'post_subject'	=> $post_data['post_subject'],
-					'forum_id'		=> $post_data['forum_id'],
-					'topic_id'		=> $post_data['topic_id'],
-				);
-			}
-
-			if ($post_data['forum_id'])
-			{
-				$total_posts++;
-
-				// Increment by topic_replies if we approve a topic...
-				// This works because we do not adjust the topic_replies when re-approving a topic after an edit.
-				if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_replies'])
-				{
-					$total_posts += $post_data['topic_replies'];
-				}
-			}
-
-			$post_approve_sql[] = $post_id;
-		}
-
-		$post_id_list = array_values(array_diff($post_id_list, $post_approved_list));
-		for ($i = 0, $size = sizeof($post_approved_list); $i < $size; $i++)
-		{
-			unset($post_info[$post_approved_list[$i]]);
-		}
-
-		if (sizeof($topic_approve_sql))
-		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET topic_visibility = ' . ITEM_APPROVED . '
-				WHERE ' . $db->sql_in_set('topic_id', $topic_approve_sql);
-			$db->sql_query($sql);
-		}
-
-		if (sizeof($post_approve_sql))
-		{
-			$sql = 'UPDATE ' . POSTS_TABLE . '
-				SET post_visibility = ' . ITEM_APPROVED . '
-				WHERE ' . $db->sql_in_set('post_id', $post_approve_sql);
-			$db->sql_query($sql);
-		}
-
-		unset($topic_approve_sql, $post_approve_sql);
-
-		foreach ($approve_log as $log_data)
-		{
-			add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_' . strtoupper($mode) . 'D' : 'LOG_POST_' . strtoupper($mode) . 'D', $log_data['post_subject']);
-		}
-
-		if (sizeof($user_posts_sql))
-		{
-			// Try to minimize the query count by merging users with the same post count additions
-			$user_posts_update = array();
-
-			foreach ($user_posts_sql as $user_id => $user_posts)
-			{
-				$user_posts_update[$user_posts][] = $user_id;
-			}
-
-			foreach ($user_posts_update as $user_posts => $user_id_ary)
-			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_posts = user_posts + ' . $user_posts . '
-					WHERE ' . $db->sql_in_set('user_id', $user_id_ary);
-				$db->sql_query($sql);
-			}
-		}
-
-		if ($total_topics)
-		{
-			set_config_count('num_topics', $total_topics, true);
-		}
-
-		if ($total_posts)
-		{
-			set_config_count('num_posts', $total_posts, true);
-		}
-
-		if (!function_exists('sync'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include ($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
-		}
-
-		sync('topic', 'topic_id', array_keys($topic_id_list), true);
-		sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
-		unset($topic_id_list, $forum_id_list);
-
-		if ($total_topics)
-		{
-			//@todo: plurals!
-			$success_msg = ($total_topics == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS';
-		}
-		else
-		{
-			$success_msg = (sizeof($post_id_list) + sizeof($post_approved_list) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS';
-		}
-
-		return $success_msg;
-	}
 }
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index f4a78525c8..5e7c53c8de 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -466,206 +466,6 @@ class mcp_queue
 		}
 	}
 
-	/**
-	* Restore Posts
-	*
-	* @param $post_id_list	array	IDs of the posts to restore
-	* @param $id			mixed	Category of the current active module
-	* @param $mode			string	Active module
-	* @return void
-	*/
-	function restore_posts($post_id_list, $id, $mode)
-	{
-		global $db, $template, $user, $config;
-		global $phpEx, $phpbb_root_path, $request;
-
-		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
-		{
-			trigger_error('NOT_AUTHORISED');
-		}
-
-		$redirect = request_var('redirect', build_url(array('quickmod')));
-		$success_msg = '';
-
-		$s_hidden_fields = build_hidden_fields(array(
-			'i'				=> $id,
-			'mode'			=> $mode,
-			'post_id_list'	=> $post_id_list,
-			'action'		=> 'restore',
-			'redirect'		=> $redirect,
-		));
-
-		$post_info = get_post_data($post_id_list, 'm_approve');
-
-		if (confirm_box(true))
-		{
-			$topic_info = array();
-
-			// Group the posts by topic_id
-			foreach ($post_info as $post_id => $post_data)
-			{
-				if ($post_data['post_visibility'] == ITEM_APPROVED)
-				{
-					continue;
-				}
-				$topic_id = (int) $post_data['topic_id'];
-
-				$topic_info[$topic_id]['posts'][] = (int) $post_id;
-				$topic_info[$topic_id]['forum_id'] = (int) $post_data['forum_id'];
-
-				if ($post_id == $post_data['topic_first_post_id'])
-				{
-					$topic_info[$topic_id]['first_post'] = true;
-				}
-
-				if ($post_id == $post_data['topic_last_post_id'])
-				{
-					$topic_info[$topic_id]['last_post'] = true;
-				}
-
-				$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&amp;t={$post_data['topic_id']}&amp;p={$post_data['post_id']}") . '#p' . $post_data['post_id'];
-			}
-
-			foreach ($topic_info as $topic_id => $topic_data)
-			{
-				phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));
-			}
-
-			if (sizeof($post_info) >= 1)
-			{
-				$success_msg = (sizeof($post_info) == 1) ? 'POST_RESTORED_SUCCESS' : 'POSTS_RESTORED_SUCCESS';
-			}
-		}
-		else
-		{
-			$template->assign_vars(array(
-				'S_APPROVE'			=> true,
-			));
-
-			confirm_box(false, 'RESTORE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
-		}
-
-		$redirect = request_var('redirect', "index.$phpEx");
-		$redirect = reapply_sid($redirect);
-
-		if (!$success_msg)
-		{
-			redirect($redirect);
-		}
-		else
-		{
-			// If restoring one post, also give links back to post...
-			$add_message = '';
-			if (sizeof($post_id_list) == 1 && !empty($post_url))
-			{
-				$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');
-			}
-
-			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message;
-
-			if ($request->is_ajax())
-			{
-				$json_response = new phpbb_json_response;
-				$json_response->send(array(
-					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
-					'MESSAGE_TEXT'		=> $message,
-					'REFRESH_DATA'		=> null,
-					'visible'			=> true,
-				));
-			}
-
-			meta_refresh(3, $redirect);
-			trigger_error($message);
-		}
-	}
-
-	/**
-	* Restore topics
-	*
-	* @param $topic_id_list	array	IDs of the topics to restore
-	* @param $id			mixed	Category of the current active module
-	* @param $mode			string	Active module
-	* @return void
-	*/
-	function restore_topics($topic_id_list, $id, $mode)
-	{
-		global $db, $template, $user, $config;
-		global $phpEx, $phpbb_root_path, $request;
-
-		if (!check_ids($topic_id_list, TOPICS_TABLE, 'topic_id', array('m_approve')))
-		{
-			trigger_error('NOT_AUTHORISED');
-		}
-
-		$redirect = request_var('redirect', build_url(array('quickmod')));
-		$success_msg = '';
-
-		$s_hidden_fields = build_hidden_fields(array(
-			'i'				=> $id,
-			'mode'			=> $mode,
-			'topic_id_list'	=> $topic_id_list,
-			'action'		=> 'restore',
-			'redirect'		=> $redirect,
-		));
-
-		$topic_info = get_topic_data($topic_id_list, 'm_approve');
-
-		if (confirm_box(true))
-		{
-			foreach ($topic_info as $topic_id => $topic_data)
-			{
-				phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
-				$topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$topic_data['forum_id']}&amp;t={$topic_id}");
-			}
-
-			if (sizeof($topic_info) >= 1)
-			{
-				$success_msg = 'TOPIC' . ((sizeof($topic_info) == 1) ? '' : 'S') . '_RESTORED_SUCCESS';
-			}
-		}
-		else
-		{
-			$template->assign_vars(array(
-				'S_APPROVE'			=> true,
-			));
-
-			confirm_box(false, 'RESTORE_TOPIC' . ((sizeof($topic_info) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
-		}
-
-		$redirect = request_var('redirect', "index.$phpEx");
-		$redirect = reapply_sid($redirect);
-
-		if (!$success_msg)
-		{
-			redirect($redirect);
-		}
-		else
-		{
-			// If restoring one topic, also give links back to topic...
-			$add_message = '';
-			if (sizeof($topic_info) == 1 && !empty($topic_url))
-			{
-				$add_message = '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $topic_url . '">', '</a>');
-			}
-
-			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message;
-
-			if ($request->is_ajax())
-			{
-				$json_response = new phpbb_json_response;
-				$json_response->send(array(
-					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
-					'MESSAGE_TEXT'		=> $message,
-					'REFRESH_DATA'		=> null,
-					'visible'			=> true,
-				));
-			}
-
-			meta_refresh(3, $redirect);
-			trigger_error($message);
-		}
-	}
-
 	/**
 	* Approve/Restore posts
 	*
-- 
cgit v1.2.1


From c8b66a26ef4f6ac2a71980c75a13356dcda72dd6 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 10:51:07 -0500
Subject: [ticket/11103] Mark read link if notification has no URL to view it

Other style stuff

PHPBB3-11103
---
 phpBB/includes/notification/type/base.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 9ef0e71009..afd6a9fc9b 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -126,6 +126,17 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	public function prepare_for_display()
 	{
+		if ($this->get_url())
+		{
+			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id);
+		}
+		else
+		{
+			$redirect = (($this->user->page['page_dir']) ? $this->user->page['page_dir'] . '/' : '') . $this->user->page['page_name'] . (($this->user->page['query_string']) ? '?' . $this->user->page['query_string'] : '');
+
+			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&amp;redirect=' . urlencode($redirect));
+		}
+
 		return array(
 			'NOTIFICATION_ID'	=> $this->notification_id,
 
@@ -138,7 +149,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 			'UNREAD'			=> $this->unread,
 
-			'U_MARK_READ'		=> append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id),
+			'U_MARK_READ'		=> ($this->unread) ? $u_mark_read : '',
 		);
 	}
 
-- 
cgit v1.2.1


From 61a1467c90e865f43c359bb8678d27b5e571f21f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 16:47:18 -0500
Subject: [ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link

PHPBB3-11103
---
 phpBB/includes/functions.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 2645e55446..790724d3c5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5020,8 +5020,10 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'RECORD_USERS'					=> $l_online_record,
 		'PRIVATE_MESSAGE_INFO'			=> $l_privmsgs_text,
 		'PRIVATE_MESSAGE_INFO_UNREAD'	=> $l_privmsgs_text_unread,
+
 		'UNREAD_NOTIFICATIONS_COUNT'	=> ($config['load_notifications']) ? $notifications['unread_count'] : '',
 		'NOTIFICATIONS_COUNT'			=> ($config['load_notifications']) ? $user->lang('NOTIFICATIONS_COUNT', $notifications['unread_count']) : '',
+		'U_VIEW_ALL_NOTIFICATIONS'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications'),
 		'S_NOTIFICATIONS_DISPLAY'		=> $config['load_notifications'],
 
 		'S_USER_NEW_PRIVMSG'			=> $user->data['user_new_privmsg'],
-- 
cgit v1.2.1


From 3839fe69027836d0c9083095208e4ed548a7ea38 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 17:44:46 -0500
Subject: [ticket/11103] Use report text for report notification, never notify
 reporter

PHPBB3-11103
---
 phpBB/includes/notification/type/report_pm.php   | 14 +++++++++++-
 phpBB/includes/notification/type/report_post.php | 28 ++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 440092afdc..3327dbe734 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -115,7 +115,8 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $this->db->sql_in_set('user_id', $auth_approve[$post['forum_id']][$this->permission]);
+				AND " . $this->db->sql_in_set('user_id', $auth_approve[$post['forum_id']][$this->permission]) . '
+				AND user_id <> ' . $this->user->data['user_id'];
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
@@ -174,6 +175,16 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 
 		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 
+		if ($this->get_data('report_text'))
+		{
+			return $this->user->lang(
+				$this->language_key,
+				$username,
+				censor_text($this->get_data('message_subject')),
+				$this->get_data('report_text')
+			);
+		}
+
 		if (isset($this->user->lang[$this->get_data('reason_title')]))
 		{
 			return $this->user->lang(
@@ -224,6 +235,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 		$this->set_data('reporter_id', $this->user->data['user_id']);
 		$this->set_data('reason_title', strtoupper($post['reason_title']));
 		$this->set_data('reason_description', $post['reason_description']);
+		$this->set_data('report_text', $post['report_text']);
 
 		return parent::create_insert_array($post, $pre_create_data);
 	}
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index d860fb1b38..151841ef02 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -65,6 +65,23 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 		return 'report_post';
 	}
 
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param array $post Data from the post
+	*
+	* @return array
+	*/
+	public function find_users_for_notification($post, $options = array())
+	{
+		$notify_users = parent::find_users_for_notification($post, $options);
+
+		// never notify reporter
+		unset($notify_users[$this->user->data['user_id']]);
+
+		return $notify_users;
+	}
+
 	/**
 	* Get email template variables
 	*
@@ -110,6 +127,16 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 
 		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 
+		if ($this->get_data('report_text'))
+		{
+			return $this->user->lang(
+				$this->language_key,
+				$username,
+				censor_text($this->get_data('post_subject')),
+				$this->get_data('report_text')
+			);
+		}
+
 		if (isset($this->user->lang[$this->get_data('reason_title')]))
 		{
 			return $this->user->lang(
@@ -160,6 +187,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 		$this->set_data('reporter_id', $this->user->data['user_id']);
 		$this->set_data('reason_title', strtoupper($post['reason_title']));
 		$this->set_data('reason_description', $post['reason_description']);
+		$this->set_data('report_text', $post['report_text']);
 
 		return parent::create_insert_array($post, $pre_create_data);
 	}
-- 
cgit v1.2.1


From 230e9d2e322e707c46c6d99c18a0591fb56b6f74 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 17:47:27 -0500
Subject: [ticket/11103] Do not send PM received notifications to the author

(you won't be notified if you PM yourself)

PHPBB3-11103
---
 phpBB/includes/notification/type/pm.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index c2065fef99..dc4bd3b3a5 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -85,7 +85,8 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
-				AND " . $this->db->sql_in_set('user_id', array_keys($pm['recipients']));
+				AND " . $this->db->sql_in_set('user_id', array_keys($pm['recipients'])) . '
+				AND user_id <> ' . $pm['from_user_id'];
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-- 
cgit v1.2.1


From 92b533aad381ae1da8ccb1cd33fa19f31d8a0e98 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 17:49:54 -0500
Subject: [ticket/11103] Do not notify yourself when you close your own report

PHPBB3-11103
---
 .../includes/notification/type/report_pm_closed.php | 21 +++++++++++++--------
 .../notification/type/report_post_closed.php        |  5 +++++
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index f5790ba449..8d79c8446b 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -16,7 +16,7 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Reported post notifications class
+* Reported pm notifications class
 * This class handles notifications for reported pms
 *
 * @package notifications
@@ -54,13 +54,18 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
 	/**
 	* Find the users who want to receive notifications
 	*
-	* @param array $post Data from
+	* @param array $pm Data from
 	*
 	* @return array
 	*/
-	public function find_users_for_notification($post, $options = array())
+	public function find_users_for_notification($pm, $options = array())
 	{
-		return array($post['reporter'] => array(''));
+		if ($pm['reporter'] == $this->user->data['user_id'])
+		{
+			return array();
+		}
+
+		return array($pm['reporter'] => array(''));
 	}
 
 	/**
@@ -123,16 +128,16 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
 	*
-	* @param array $post Data from submit_post
+	* @param array $pm PM Data
 	* @param array $pre_create_data Data from pre_create_insert_array()
 	*
 	* @return array Array of data ready to be inserted into the database
 	*/
-	public function create_insert_array($post, $pre_create_data = array())
+	public function create_insert_array($pm, $pre_create_data = array())
 	{
-		$this->set_data('closer_id', $post['closer_id']);
+		$this->set_data('closer_id', $pm['closer_id']);
 
-		$data = parent::create_insert_array($post, $pre_create_data);
+		$data = parent::create_insert_array($pm, $pre_create_data);
 
 		$this->time = $data['time'] = time();
 
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index 0d5c5b292e..3e66bde9bc 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -60,6 +60,11 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
 	*/
 	public function find_users_for_notification($post, $options = array())
 	{
+		if ($post['reporter'] == $this->user->data['user_id'])
+		{
+			return array();
+		}
+
 		return array($post['reporter'] => array(''));
 	}
 
-- 
cgit v1.2.1


From 77bc12d334167ec5d1c7e3bc7c2b582218df32f6 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 16 Oct 2012 23:27:49 -0500
Subject: [ticket/11103] Add author name output to post/topic email templates

For a recent merge:
https://github.com/phpbb/phpbb3/pull/624

PHPBB3-11103
---
 phpBB/includes/notification/type/post.php  | 12 ++++++++++++
 phpBB/includes/notification/type/topic.php | 12 ++++++++++++
 2 files changed, 24 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index ee26a8c33e..0681b4418c 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -223,7 +223,19 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 	*/
 	public function get_email_template_variables()
 	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->notification_manager->get_user($this->get_data('poster_id'));
+
+			$username = get_username_string('username', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		}
+
 		return array(
+			'AUTHOR_NAME'				=> htmlspecialchars_decode($username),
 			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
 			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
 
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 237f430003..a9beb469c3 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -186,7 +186,19 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 	*/
 	public function get_email_template_variables()
 	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->notification_manager->get_user($this->get_data('poster_id'));
+
+			$username = get_username_string('username', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		}
+
 		return array(
+			'AUTHOR_NAME'				=> htmlspecialchars_decode($username),
 			'FORUM_NAME'				=> htmlspecialchars_decode($this->get_data('forum_name')),
 			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
 
-- 
cgit v1.2.1


From 2adb37049e8c7eab5fa762a8968605a8f608aaa8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Oct 2012 15:23:16 +0200
Subject: [feature/soft-delete] Display guest username in topic list instead of
 "Guest"

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_queue.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 5e7c53c8de..bf34c7c53c 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -417,7 +417,7 @@ class mcp_queue
 				{
 					if (empty($row['post_username']))
 					{
-						$row['post_username'] = $user->lang['GUEST'];
+						$row['post_username'] = $row['username'] ?: $user->lang['GUEST'];
 					}
 
 					$template->assign_block_vars('postrow', array(
@@ -747,7 +747,7 @@ class mcp_queue
 							'USERNAME'		=> htmlspecialchars_decode($topic_data['username']),
 							'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($topic_data['topic_title'])),
 							'U_VIEW_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?f={$topic_data['forum_id']}&t={$topic_data['topic_id']}&e=0",
-						);
+						));
 
 						$messenger->send($topic_data['user_notify_type']);
 					}
-- 
cgit v1.2.1


From 0822d2bb61dda3b887911d6686a8c6db05131c47 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Oct 2012 15:32:57 +0200
Subject: [feature/soft-delete] Split unapproved/soft deleted posts from topics

If a topic is soft deleted through a moderator, the topic_delete_user is set.
If it is passively soft deleted (f.e. while the only approved post is deleted)
the topic_delete_user is not set. This way, we can distinguish between these
two cases. The same also applies to unapproved posts. So we need to set the
topic_delete_user when an unapproved topic is posted.

Topics that were soft deleted/unapproved by a user (rather then passive) are
going to be displayed in the Topics modules, while all others are in the posts
modules of the MCP queue.

PHPBB3-9567
---
 phpBB/includes/functions_posting.php | 1 +
 phpBB/includes/mcp/mcp_queue.php     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index b6223b72d4..1a0fdcee85 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1864,6 +1864,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				'forum_id'					=> $data['forum_id'],
 				'icon_id'					=> $data['icon_id'],
 				'topic_visibility'			=> $post_visibility,
+				'topic_delete_user'			=> ($post_visibility != ITEM_APPROVED) ? (int) $user->data['user_id'] : 0,
 				'topic_title'				=> $subject,
 				'topic_first_poster_name'	=> (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''),
 				'topic_first_poster_colour'	=> $user->data['user_colour'],
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index bf34c7c53c..554a7c080b 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -335,7 +335,8 @@ class mcp_queue
 							' . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . '
 							' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . "
 							AND t.topic_id = p.topic_id
-							AND t.topic_visibility <> p.post_visibility
+							AND (t.topic_visibility <> p.post_visibility
+								OR t.topic_delete_user = 0)
 							$limit_time_sql
 						ORDER BY $sort_order_sql";
 					$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
@@ -384,6 +385,7 @@ class mcp_queue
 						FROM ' . TOPICS_TABLE . ' t
 						WHERE ' . $db->sql_in_set('forum_id', $forum_list) . '
 							AND topic_visibility = ' . $visibility_const . "
+							AND topic_delete_user <> 0
 							$limit_time_sql
 						ORDER BY $sort_order_sql";
 					$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
-- 
cgit v1.2.1


From ae670cc87df197e44b768667b853e1dae3009b4d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 18 Oct 2012 18:32:13 -0500
Subject: [ticket/11103] Remove unnecessary comments

Comments that are not needed because the actions are completely
self-explanatory

PHPBB3-11103
---
 phpBB/includes/functions.php             |  1 -
 phpBB/includes/functions_admin.php       |  2 --
 phpBB/includes/functions_privmsgs.php    |  5 -----
 phpBB/includes/mcp/mcp_pm_reports.php    |  1 -
 phpBB/includes/mcp/mcp_queue.php         | 11 -----------
 phpBB/includes/mcp/mcp_reports.php       |  1 -
 phpBB/includes/ucp/ucp_notifications.php |  4 ----
 7 files changed, 25 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 0af8e824c8..2827dae1a8 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1386,7 +1386,6 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			$forum_id = array($forum_id);
 		}
 
-		// Mark topic notifications read for this user in this forum
 		$phpbb_notifications->mark_notifications_read_by_parent(array('topic', 'approve_topic'), $forum_id, $user->data['user_id'], $post_time);
 
 		// Mark all post/quote notifications read for this user in this forum
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 3deb2e9c59..893c7a247d 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -716,7 +716,6 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 		set_config_count('num_topics', $approved_topics * (-1), true);
 	}
 
-	// Delete notifications
 	$phpbb_notifications->delete_notifications(array('topic', 'approve_topic', 'topic_in_queue'), $topic_ids);
 
 	return $return;
@@ -897,7 +896,6 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 		delete_topics('topic_id', $remove_topics, $auto_sync, $post_count_sync, false);
 	}
 
-	// Delete notifications
 	$phpbb_notifications->delete_notifications(array('quote', 'bookmark', 'post', 'approve_post', 'post_in_queue'), $post_ids);
 
 	return sizeof($post_ids);
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 6c31c6d6c3..4638091601 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -878,7 +878,6 @@ function update_unread_status($unread, $msg_id, $user_id, $folder_id)
 
 	global $db, $user, $phpbb_notifications;
 
-	// Mark the PM as read
 	$phpbb_notifications->mark_notifications_read('pm', $msg_id, $user_id);
 
 	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
@@ -1097,7 +1096,6 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 		$user->data['user_unread_privmsg'] -= $num_unread;
 	}
 
-	// Delete Notifications
 	$phpbb_notifications->delete_notifications('pm', array_keys($delete_rows));
 
 	// Now we have to check which messages we can delete completely
@@ -1262,7 +1260,6 @@ function phpbb_delete_user_pms($user_id)
 					AND ' . $db->sql_in_set('msg_id', $delivered_msg);
 			$db->sql_query($sql);
 
-			// Delete Notifications
 			$phpbb_notifications->delete_notifications('pm', $delivered_msg);
 		}
 
@@ -1276,7 +1273,6 @@ function phpbb_delete_user_pms($user_id)
 				WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
 			$db->sql_query($sql);
 
-			// Delete Notifications
 			$phpbb_notifications->delete_notifications('pm', $undelivered_msg);
 		}
 	}
@@ -1321,7 +1317,6 @@ function phpbb_delete_user_pms($user_id)
 				WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
 			$db->sql_query($sql);
 
-			// Delete Notifications
 			$phpbb_notifications->delete_notifications('pm', $delete_ids);
 		}
 	}
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index 227c89bb79..001edfd8db 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -90,7 +90,6 @@ class mcp_pm_reports
 					trigger_error('NO_REPORT');
 				}
 
-				// Mark the notification as read
 				$phpbb_notifications->mark_notifications_read_by_parent('report_pm', $report_id, $user->data['user_id']);
 
 				$pm_id = $report['pm_id'];
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index b23e5f4e45..72f1c00c72 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -86,7 +86,6 @@ class mcp_queue
 					{
 						$post_id = (int) $topic_info[$topic_id]['topic_first_post_id'];
 
-						// Mark the notification as read
 						$phpbb_notifications->mark_notifications_read('topic_in_queue', $topic_id, $user->data['user_id']);
 					}
 					else
@@ -95,7 +94,6 @@ class mcp_queue
 					}
 				}
 
-				// Mark the notification as read
 				$phpbb_notifications->mark_notifications_read('post_in_queue', $post_id, $user->data['user_id']);
 
 				$post_info = get_post_data(array($post_id), 'm_approve', true);
@@ -612,13 +610,10 @@ function approve_post($post_id_list, $id, $mode)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
 			{
-				// Delete topic in queue notifications
 				$phpbb_notifications->delete_notifications(array('topic_in_queue'), $post_data['topic_id']);
 
-				// Forum Notifications
 				$phpbb_notifications->add_notifications('topic', $post_data);
 
-				// Notify poster?
 				if ($notify_poster)
 				{
 					$phpbb_notifications->add_notifications('approve_topic', $post_data);
@@ -626,13 +621,10 @@ function approve_post($post_id_list, $id, $mode)
 			}
 			else
 			{
-				// Delete post in queue notification
 				$phpbb_notifications->delete_notifications(array('post_in_queue'), $post_id);
 
-				// Topic Notifications
 				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $post_data);
 
-				// Notify poster?
 				if ($notify_poster)
 				{
 					$phpbb_notifications->add_notifications('approve_post', $post_data);
@@ -859,7 +851,6 @@ function disapprove_post($post_id_list, $id, $mode)
 			}
 		}
 
-		// Handle notifications (topic/post in queue)
 		foreach ($post_info as $post_id => $post_data)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
@@ -912,7 +903,6 @@ function disapprove_post($post_id_list, $id, $mode)
 
 				if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
 				{
-					// Notify poster?
 					if ($notify_poster)
 					{
 						$phpbb_notifications->add_notifications('disapprove_topic', $post_data);
@@ -920,7 +910,6 @@ function disapprove_post($post_id_list, $id, $mode)
 				}
 				else
 				{
-					// Notify poster?
 					if ($notify_poster)
 					{
 						$phpbb_notifications->add_notifications('disapprove_post', $post_data);
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 7c6352a244..f6121e7e03 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -88,7 +88,6 @@ class mcp_reports
 					trigger_error('NO_REPORT');
 				}
 
-				// Mark the notification as read
 				$phpbb_notifications->mark_notifications_read('report_post', $post_id, $user->data['user_id']);
 
 				if (!$report_id && $report['report_closed'])
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 321730a64b..aeace13968 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -50,12 +50,10 @@ class ucp_notifications
 						{
 							if ($request->is_set_post($type . '_notification') && !isset($subscriptions[$type]))
 							{
-								// add
 								$phpbb_notifications->add_subscription($type);
 							}
 							else if (!$request->is_set_post($type . '_notification') && isset($subscriptions[$type]))
 							{
-								// remove
 								$phpbb_notifications->delete_subscription($type);
 							}
 
@@ -63,12 +61,10 @@ class ucp_notifications
 							{
 								if ($request->is_set_post($type . '_' . $method) && (!isset($subscriptions[$type]) || !in_array($method, $subscriptions[$type])))
 								{
-									// add
 									$phpbb_notifications->add_subscription($type, 0, $method);
 								}
 								else if (!$request->is_set_post($type . '_' . $method) && isset($subscriptions[$type]) && in_array($method, $subscriptions[$type]))
 								{
-									// remove
 									$phpbb_notifications->delete_subscription($type, 0, $method);
 								}
 							}
-- 
cgit v1.2.1


From eb07b3ad9cfb37fd2943088170e380bff2db94a3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 18 Oct 2012 18:45:43 -0500
Subject: [ticket/11103] Expand class vars and use docblocks for phpBB classes

PHPBB3-11103
---
 phpBB/includes/notification/manager.php     | 29 ++++++++++++++++--
 phpBB/includes/notification/method/base.php | 47 +++++++++++++++++------------
 phpBB/includes/notification/type/base.php   | 30 +++++++++++++++++-
 3 files changed, 84 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 03776de2b4..a98e1f7af3 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -21,7 +21,32 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_manager
 {
-	protected $db, $cache, $template, $extension_manager, $user, $auth, $config, $phpbb_root_path, $php_ext = null;
+	/** @var dbal */
+	protected $db = null;
+
+	/** @var phpbb_cache_service */
+	protected $cache = null;
+
+	/** @var phpbb_template */
+	protected $template = null;
+
+	/** @var phpbb_extension_manager */
+	protected $extension_manager = null;
+
+	/** @var phpbb_user */
+	protected $user = null;
+
+	/** @var phpbb_auth */
+	protected $auth = null;
+
+	/** @var phpbb_config */
+	protected $config = null;
+
+	/** @var string */
+	protected $phpbb_root_path = null;
+
+	/** @var string */
+	protected $php_ext = null;
 
 	/**
 	* Users loaded from the DB
@@ -71,7 +96,7 @@ class phpbb_notification_manager
 			'count_total'		=> false,
 		), $options);
 
-		// If all_unread, count_unread mus be true
+		// If all_unread, count_unread must be true
 		$options['count_unread'] = ($options['all_unread']) ? true : $options['count_unread'];
 
 		// Anonymous users and bots never receive notifications
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index 5457ca99b2..88ec2674be 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -21,26 +21,35 @@ if (!defined('IN_PHPBB'))
 */
 abstract class phpbb_notification_method_base implements phpbb_notification_method_interface
 {
-	protected $notification_manager, $db, $cache, $template, $extension_manager, $user, $auth, $config, $phpbb_root_path, $php_ext = null;
+	/** @var phpbb_notification_manager */
+	protected $notification_manager = null;
 
-	/**
-	* Desired notifications
-	* unique by (type, type_id, user_id, method)
-	* if multiple methods are desired, multiple rows will exist.
-	*
-	* method of "none" will over-ride any other options
-	*
-	* item_type
-	* item_id
-	* user_id
-	* method
-	* 	none (will never receive notifications)
-	* 	standard (listed in notifications window
-	* 	popup?
-	* 	email
-	* 	jabber
-	*	sms?
-	*/
+	/** @var dbal */
+	protected $db = null;
+
+	/** @var phpbb_cache_service */
+	protected $cache = null;
+
+	/** @var phpbb_template */
+	protected $template = null;
+
+	/** @var phpbb_extension_manager */
+	protected $extension_manager = null;
+
+	/** @var phpbb_user */
+	protected $user = null;
+
+	/** @var phpbb_auth */
+	protected $auth = null;
+
+	/** @var phpbb_config */
+	protected $config = null;
+
+	/** @var string */
+	protected $phpbb_root_path = null;
+
+	/** @var string */
+	protected $php_ext = null;
 
 	/**
 	* Queue of messages to be sent
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index afd6a9fc9b..39a21a1054 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -21,7 +21,35 @@ if (!defined('IN_PHPBB'))
 */
 abstract class phpbb_notification_type_base implements phpbb_notification_type_interface
 {
-	protected $notification_manager, $db, $cache, $template, $extension_manager, $user, $auth, $config, $phpbb_root_path, $php_ext = null;
+	/** @var phpbb_notification_manager */
+	protected $notification_manager = null;
+
+	/** @var dbal */
+	protected $db = null;
+
+	/** @var phpbb_cache_service */
+	protected $cache = null;
+
+	/** @var phpbb_template */
+	protected $template = null;
+
+	/** @var phpbb_extension_manager */
+	protected $extension_manager = null;
+
+	/** @var phpbb_user */
+	protected $user = null;
+
+	/** @var phpbb_auth */
+	protected $auth = null;
+
+	/** @var phpbb_config */
+	protected $config = null;
+
+	/** @var string */
+	protected $phpbb_root_path = null;
+
+	/** @var string */
+	protected $php_ext = null;
 
 	/**
 	* Array of user data containing information needed to output the notifications to the template
-- 
cgit v1.2.1


From f96dac335287f2fd51ff6628facbc8b6af6a517f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 18 Oct 2012 19:13:47 -0500
Subject: [ticket/11103] Interface docblocks

PHPBB3-11103
---
 phpBB/includes/notification/method/email.php     |   3 +
 phpBB/includes/notification/method/interface.php |  19 +++
 phpBB/includes/notification/type/base.php        | 128 ++++++++++----------
 phpBB/includes/notification/type/interface.php   | 146 +++++++++++++++++++++--
 phpBB/includes/notification/type/post.php        |   4 -
 phpBB/includes/notification/type/report_pm.php   |   4 +-
 6 files changed, 222 insertions(+), 82 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index c2e272aca1..e902ea1e85 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -40,6 +40,9 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 		return true;
 	}
 
+	/**
+	* Parse the queue and notify the users
+	*/
 	public function notify()
 	{
 		if (!sizeof($this->queue))
diff --git a/phpBB/includes/notification/method/interface.php b/phpBB/includes/notification/method/interface.php
index 4b990ec9fa..f5c210a2fc 100644
--- a/phpBB/includes/notification/method/interface.php
+++ b/phpBB/includes/notification/method/interface.php
@@ -21,7 +21,26 @@ if (!defined('IN_PHPBB'))
 */
 interface phpbb_notification_method_interface
 {
+	/**
+	* Is this method available for the user?
+	* This is checked on the notifications options
+	*/
 	public function is_available();
 
+	/**
+	* Add a notification to the queue
+	*
+	* @param phpbb_notification_type_interface $notification
+	*/
+	public function add_to_queue(phpbb_notification_type_interface $notification);
+
+	/**
+	* Empty the queue
+	*/
+	protected function empty_queue();
+
+	/**
+	* Parse the queue and notify the users
+	*/
 	public function notify();
 }
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 39a21a1054..22824dc2ed 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -149,60 +149,6 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		$this->data['data'][$name] = $value;
 	}
 
-	/**
-	* Prepare to output the notification to the template
-	*/
-	public function prepare_for_display()
-	{
-		if ($this->get_url())
-		{
-			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id);
-		}
-		else
-		{
-			$redirect = (($this->user->page['page_dir']) ? $this->user->page['page_dir'] . '/' : '') . $this->user->page['page_name'] . (($this->user->page['query_string']) ? '?' . $this->user->page['query_string'] : '');
-
-			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&amp;redirect=' . urlencode($redirect));
-		}
-
-		return array(
-			'NOTIFICATION_ID'	=> $this->notification_id,
-
-			'AVATAR'			=> $this->get_avatar(),
-
-			'FORMATTED_TITLE'	=> $this->get_title(),
-
-			'URL'				=> $this->get_url(),
-			'TIME'	   			=> $this->user->format_date($this->time),
-
-			'UNREAD'			=> $this->unread,
-
-			'U_MARK_READ'		=> ($this->unread) ? $u_mark_read : '',
-		);
-	}
-
-	/**
-	* Mark this item read
-	*
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
-	*/
-	public function mark_read($return = false)
-	{
-		return $this->mark(false, $return);
-	}
-
-	/**
-	* Mark this item unread
-	*
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
-	*/
-	public function mark_unread($return = false)
-	{
-		return $this->mark(true, $return);
-	}
-
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
@@ -256,12 +202,66 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		return $data;
 	}
 
+	/**
+	* Mark this item read
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_read($return = false)
+	{
+		return $this->mark(false, $return);
+	}
+
+	/**
+	* Mark this item unread
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_unread($return = false)
+	{
+		return $this->mark(true, $return);
+	}
+
+	/**
+	* Prepare to output the notification to the template
+	*/
+	public function prepare_for_display()
+	{
+		if ($this->get_url())
+		{
+			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id);
+		}
+		else
+		{
+			$redirect = (($this->user->page['page_dir']) ? $this->user->page['page_dir'] . '/' : '') . $this->user->page['page_name'] . (($this->user->page['query_string']) ? '?' . $this->user->page['query_string'] : '');
+
+			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&amp;redirect=' . urlencode($redirect));
+		}
+
+		return array(
+			'NOTIFICATION_ID'	=> $this->notification_id,
+
+			'AVATAR'			=> $this->get_avatar(),
+
+			'FORMATTED_TITLE'	=> $this->get_title(),
+
+			'URL'				=> $this->get_url(),
+			'TIME'	   			=> $this->user->format_date($this->time),
+
+			'UNREAD'			=> $this->unread,
+
+			'U_MARK_READ'		=> ($this->unread) ? $u_mark_read : '',
+		);
+	}
+
 	/**
 	* -------------- Fall back functions -------------------
 	*/
 
 	/**
-	* URL to unsubscribe to this notification (fall-back)
+	* URL to unsubscribe to this notification (fall back)
 	*
 	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
 	*/
@@ -271,7 +271,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	}
 
 	/**
-	* Get the user's avatar (fall-back)
+	* Get the user's avatar (fall back)
 	*/
 	public function get_avatar()
 	{
@@ -279,7 +279,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	}
 
 	/**
-	* Get the special items to load (fall-back)
+	* Get the special items to load (fall back)
 	*/
 	public function get_load_special()
 	{
@@ -287,7 +287,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	}
 
 	/**
-	* Load the special items (fall-back)
+	* Load the special items (fall back)
 	*/
 	public function load_special($data, $notifications)
 	{
@@ -295,7 +295,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	}
 
 	/**
-	* Is available (fall-back)
+	* Is available (fall back)
 	*/
 	public function is_available()
 	{
@@ -303,15 +303,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	}
 
 	/**
-	* Pre create insert array function
-	* This allows you to perform certain actions, like run a query
-	* and load data, before create_insert_array() is run. The data
-	* returned from this function will be sent to create_insert_array().
-	*
-	* @param array $type_data Data unique to this notification type
-	* @param array $notify_users Notify users list
-	* 		Formated from find_users_for_notification()
-	* @return array Whatever you want to send to create_insert_array().
+	* Pre create insert array function (fall back)
 	*/
 	public function pre_create_insert_array($type_data, $notify_users)
 	{
diff --git a/phpBB/includes/notification/type/interface.php b/phpBB/includes/notification/type/interface.php
index 084a819af7..1d79a2c8d8 100644
--- a/phpBB/includes/notification/type/interface.php
+++ b/phpBB/includes/notification/type/interface.php
@@ -21,33 +21,161 @@ if (!defined('IN_PHPBB'))
 */
 interface phpbb_notification_type_interface
 {
+	/**
+	* Set initial data from the database
+	*
+	* @param array $data Row directly from the database
+	*/
+	public function set_initial_data($data);
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notification_type_
+	*/
 	public static function get_item_type();
 
+	/**
+	* Get the id of the item
+	*
+	* @param array $type_data The type specific data
+	*/
 	public static function get_item_id($type_data);
 
+	/**
+	* Get the id of the parent
+	*
+	* @param array $type_data The type specific data
+	*/
+	public static function get_item_parent_id($type_data);
+
+	/**
+	* Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
+	*
+	* @return bool True/False whether or not this is available to the user
+	*/
 	public function is_available();
 
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param array $type_data The type specific data
+	* @param array $options Options for finding users for notification
+	* 		ignore_users => array of users and user types that should not receive notifications from this type because they've already been notified
+	* 						e.g.: array(2 => array(''), 3 => array('', 'email'), ...)
+	*
+	* @return array
+	*/
 	public function find_users_for_notification($type_data, $options);
 
-	public function get_title();
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query();
 
-	public function get_email_template_variables();
+	/**
+	* Get the special items to load
+	*
+	* @return array Data will be combined sent to load_special() so you can run a single query and get data required for this notification type
+	*/
+	public function get_load_special();
 
+	/**
+	* Load the special items
+	*
+	* @param array $data Data from get_load_special()
+	* @param array $notifications Array of notifications (key is notification_id, value is the notification objects)
+	*/
+	public function load_special($data, $notifications);
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_title();
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
 	public function get_url();
 
+	/**
+	* URL to unsubscribe to this notification
+	*
+	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
+	*/
 	public function get_unsubscribe_url($method);
 
-	public function mark_read($return);
-
-	public function mark_unread($return);
+	/**
+	* Get the user's avatar (the user who caused the notification typically)
+	*
+	* @return string
+	*/
+	public function get_avatar();
+
+	/**
+	* Prepare to output the notification to the template
+	*/
+	public function prepare_for_display();
+
+	/**
+	* Get email template variables
+	*
+	* @return array
+	*/
+	public function get_email_template_variables();
 
+	/**
+	* Pre create insert array function
+	* This allows you to perform certain actions, like run a query
+	* and load data, before create_insert_array() is run. The data
+	* returned from this function will be sent to create_insert_array().
+	*
+	* @param array $type_data The type specific data
+	* @param array $notify_users Notify users list
+	* 		Formated from find_users_for_notification()
+	* @return array Whatever you want to send to create_insert_array().
+	*/
 	public function pre_create_insert_array($type_data, $notify_users);
 
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $type_data The type specific data
+	* @param array $pre_create_data Data from pre_create_insert_array()
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
 	public function create_insert_array($type_data, $pre_create_data);
 
-	public function users_to_query();
-
-	public function get_load_special();
+	/**
+	* Function for preparing the data for update in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $type_data Data unique to this notification type
+	*
+	* @return array Array of data ready to be updated in the database
+	*/
+	public function create_update_array($type_data);
+
+	/**
+	* Mark this item read
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_read($return);
 
-	public function load_special($data, $notifications);
+	/**
+	* Mark this item unread
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_unread($return);
 }
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 0681b4418c..f5f3936c63 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -89,10 +89,6 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			'ignore_users'		=> array(),
 		), $options);
 
-		// Let's continue to use the phpBB subscriptions system, at least for now.
-		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
-		//$users = parent::_find_users_for_notification($phpbb_container, $post['topic_id']);
-
 		$users = array();
 
 		$sql = 'SELECT user_id
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 3327dbe734..d78c108f56 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -76,7 +76,9 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	}
 
 	/**
-	* Is available
+	* Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
+	*
+	* @return bool True/False whether or not this is available to the user
 	*/
 	public function is_available()
 	{
-- 
cgit v1.2.1


From 2c06c2bd3646585a5b02e6269be655287352a667 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 18 Oct 2012 19:20:54 -0500
Subject: [ticket/11103] Declare $ for jQuery, check for instance of, newlines
 at eof

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index a98e1f7af3..38c72ad755 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -518,7 +518,7 @@ class phpbb_notification_manager
 
 			$class = $this->get_item_type_class($class_name);
 
-			if ($class->is_available() && method_exists($class_name, 'get_item_type'))
+			if ($class instanceof phpbb_notification_type_interface && $class->is_available() && method_exists($class_name, 'get_item_type'))
 			{
 				$options = array_merge(array(
 					'id'		=> $class_name::get_item_type(),
@@ -556,7 +556,7 @@ class phpbb_notification_manager
 
 			$method = $this->get_method_class($class_name);
 
-			if ($method->is_available())
+			if ($method instanceof phpbb_notification_method_interface && $method->is_available())
 			{
 				$subscription_methods[] = $method_name;
 			}
-- 
cgit v1.2.1


From 471ca5e7dc8276e80e790e05a2ae36dfe35cfe10 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 19 Oct 2012 15:49:49 -0500
Subject: [ticket/11103] Change is_disabled to is_enabled

If you're following along and would like to update your DB, you can run
the following queries to do so:

ALTER TABLE phpbb_notifications CHANGE `is_disabled` `is_enabled`
TINYINT( 1 ) NOT NULL DEFAULT  '1';

UPDATE `phpbb_notifications` SET is_enabled = 1;

PHPBB3-11103
---
 phpBB/includes/notification/manager.php       | 10 +++++-----
 phpBB/includes/notification/type/base.php     | 12 ++++++------
 phpBB/includes/notification/type/bookmark.php |  2 +-
 phpBB/includes/notification/type/post.php     |  2 +-
 phpBB/includes/notification/type/quote.php    |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 38c72ad755..3a4c4cd696 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -120,7 +120,7 @@ class phpbb_notification_manager
 				FROM ' . NOTIFICATIONS_TABLE . '
 				WHERE user_id = ' . (int) $options['user_id'] . '
 					AND unread = 1
-					AND is_disabled = 0';
+					AND is_enabled = 1';
 			$result = $this->db->sql_query($sql);
 			$unread_count = (int) $this->db->sql_fetchfield('count', $result);
 			$this->db->sql_freeresult($result);
@@ -132,7 +132,7 @@ class phpbb_notification_manager
 			$sql = 'SELECT COUNT(*) AS count
 				FROM ' . NOTIFICATIONS_TABLE . '
 				WHERE user_id = ' . (int) $options['user_id'] . '
-					AND is_disabled = 0';
+					AND is_enabled = 1';
 			$result = $this->db->sql_query($sql);
 			$total_count = (int) $this->db->sql_fetchfield('count', $result);
 			$this->db->sql_freeresult($result);
@@ -145,7 +145,7 @@ class phpbb_notification_manager
 			FROM ' . NOTIFICATIONS_TABLE . '
 			WHERE user_id = ' . (int) $options['user_id'] .
 				(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('notification_id', $options['notification_id']) : ' AND notification_id = ' . (int) $options['notification_id']) : '') . '
-			 	AND is_disabled = 0
+			 	AND is_enabled = 1
 			ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 		$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
 
@@ -163,7 +163,7 @@ class phpbb_notification_manager
 				WHERE user_id = ' . (int) $options['user_id'] . '
 					AND unread = 1
 					AND ' . $this->db->sql_in_set('notification_id', array_keys($rowset), true) . '
-					AND is_disabled = 0
+					AND is_is_enabled = 1
 				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 			$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
 
@@ -374,7 +374,7 @@ class phpbb_notification_manager
 			FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 				AND item_id = " . (int) $item_id . '
-				AND is_disabled = 0';
+				AND is_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 22824dc2ed..ab2f76c650 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -68,14 +68,14 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 	/**
 	* Indentification data
-	* item_type
-	* item_id
-	* item_parent_id - Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
+	* item_type			- Type of the item (translates to the notification type)
+	* item_id			- ID of the item (e.g. post_id, msg_id)
+	* item_parent_id	- Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
 	* user_id
 	* unread
-	* is_disabled	- EXTENSION AUTHORS TAKE NOTE! This is to prevent errors with notifications from extensions!
-	* 				- Set is_disabled to 1 for all your notifications when your extension is disabled so they are ignored and do not cause errors.
-	* 				- When your extension is enabled again, set is_disabled to 0 and your notifications will be working again.
+	* is_enabled		- EXTENSION AUTHORS TAKE NOTE! This is to prevent errors with notifications from extensions!
+	* 					- Set is_enabled to 0 for all your notifications when your extension is disabled so they are ignored and do not cause errors.
+	* 					- When your extension is enabled again, set is_enabled to 1 and your notifications will be working again.
 	*
 	* time
 	* data (special serialized field that each notification type can use to store stuff)
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index e5435b5829..dff7ac4c7d 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -114,7 +114,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 			WHERE item_type = '" . self::get_item_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
-				AND is_disabled = 0';
+				AND is_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index f5f3936c63..a5e822336d 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -145,7 +145,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			WHERE item_type = '" . self::get_item_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
-				AND is_disabled = 0';
+				AND is_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 0cc183346f..4c615d8dc6 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -133,7 +133,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 			WHERE item_type = '" . self::get_item_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
-				AND is_disabled = 0';
+				AND is_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
@@ -163,7 +163,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 			FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . self::get_item_type() . "'
 				AND item_id = " . self::get_item_id($post) . '
-				AND is_disabled = 0';
+				AND is_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-- 
cgit v1.2.1


From 0ac9079d1c4e32ae04bb7b5da55fa030279ec9b5 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 18:55:13 -0500
Subject: [ticket/11103] Replace $email_template with get_email_template()

PHPBB3-11103
---
 phpBB/includes/notification/method/email.php            |  7 ++++++-
 phpBB/includes/notification/type/approve_post.php       | 17 ++++++++++-------
 phpBB/includes/notification/type/approve_topic.php      | 17 ++++++++++-------
 phpBB/includes/notification/type/base.php               |  7 -------
 phpBB/includes/notification/type/bookmark.php           | 17 ++++++++++-------
 phpBB/includes/notification/type/disapprove_post.php    | 17 ++++++++++-------
 phpBB/includes/notification/type/disapprove_topic.php   | 17 ++++++++++-------
 phpBB/includes/notification/type/interface.php          |  7 +++++++
 phpBB/includes/notification/type/pm.php                 | 17 ++++++++++-------
 phpBB/includes/notification/type/post.php               | 17 ++++++++++-------
 phpBB/includes/notification/type/post_in_queue.php      | 17 ++++++++++-------
 phpBB/includes/notification/type/quote.php              | 17 ++++++++++-------
 phpBB/includes/notification/type/report_pm.php          | 17 ++++++++++-------
 phpBB/includes/notification/type/report_pm_closed.php   | 10 ++++++++++
 phpBB/includes/notification/type/report_post.php        | 17 ++++++++++-------
 phpBB/includes/notification/type/report_post_closed.php | 10 ++++++++++
 phpBB/includes/notification/type/topic.php              | 17 ++++++++++-------
 phpBB/includes/notification/type/topic_in_queue.php     | 17 ++++++++++-------
 18 files changed, 163 insertions(+), 99 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index e902ea1e85..df7edb13e7 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -78,6 +78,11 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 		// Time to go through the queue and send emails
 		foreach ($this->queue as $notification)
 		{
+			if ($notification->get_email_template() === false)
+			{
+				continue;
+			}
+
 			$user = $this->notification_manager->get_user($notification->user_id);
 
 			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
@@ -85,7 +90,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 				continue;
 			}
 
-			$messenger->template($notification->email_template, $user['user_lang']);
+			$messenger->template($notification->get_email_template(), $user['user_lang']);
 
 			$messenger->to($user['user_email'], $user['username']);
 
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index 6ed9b6c67c..4ed5124415 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'post_approved';
-
 	/**
 	* Language key used to output the text
 	*
@@ -166,4 +159,14 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 
 		return $data;
 	}
+
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'post_approved';
+	}
 }
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 1ff5ae43bd..32a1de8cf8 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_approve_topic extends phpbb_notification_type_topic
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'topic_approved';
-
 	/**
 	* Language key used to output the text
 	*
@@ -162,4 +155,14 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 
 		return $data;
 	}
+
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'topic_approved';
+	}
 }
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index ab2f76c650..4c496f0a22 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -51,13 +51,6 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/** @var string */
 	protected $php_ext = null;
 
-	/**
-	* Array of user data containing information needed to output the notifications to the template
-	*
-	* @var array
-	*/
-	protected $users = array();
-
 	/**
 	* Notification option data (for outputting to the user)
 	*
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index dff7ac4c7d..eb1a735249 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'notifications/bookmark';
-
 	/**
 	* Language key used to output the text
 	*
@@ -131,4 +124,14 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 
 		return $notify_users;
 	}
+
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'notifications/bookmark';
+	}
 }
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
index 8044a3e0ea..d4e659c5f3 100644
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ b/phpBB/includes/notification/type/disapprove_post.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_disapprove_post extends phpbb_notification_type_approve_post
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'post_disapproved';
-
 	/**
 	* Language key used to output the text
 	*
@@ -113,4 +106,14 @@ class phpbb_notification_type_disapprove_post extends phpbb_notification_type_ap
 
 		return $data;
 	}
+
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'post_disapproved';
+	}
 }
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
index 04fec87014..4bbf458d4a 100644
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ b/phpBB/includes/notification/type/disapprove_topic.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_approve_topic
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'topic_disapproved';
-
 	/**
 	* Language key used to output the text
 	*
@@ -113,4 +106,14 @@ class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_a
 
 		return $data;
 	}
+
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'topic_disapproved';
+	}
 }
diff --git a/phpBB/includes/notification/type/interface.php b/phpBB/includes/notification/type/interface.php
index 1d79a2c8d8..25dc24d922 100644
--- a/phpBB/includes/notification/type/interface.php
+++ b/phpBB/includes/notification/type/interface.php
@@ -122,6 +122,13 @@ interface phpbb_notification_type_interface
 	*/
 	public function prepare_for_display();
 
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template();
+
 	/**
 	* Get email template variables
 	*
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index dc4bd3b3a5..721af4bce5 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_pm extends phpbb_notification_type_base
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'privmsg_notify';
-
 	/**
 	* Get the type of notification this is
 	* phpbb_notification_type_
@@ -129,6 +122,16 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 		return $this->user->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
 	}
 
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'privmsg_notify';
+	}
+
 	/**
 	* Get email template variables
 	*
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index a5e822336d..9bb06e3620 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_post extends phpbb_notification_type_base
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'topic_notify';
-
 	/**
 	* Language key used to output the text
 	*
@@ -212,6 +205,16 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		);
 	}
 
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'topic_notify';
+	}
+
 	/**
 	* Get email template variables
 	*
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 499fd1e8ed..0bf8685660 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'notifications/post_in_queue';
-
 	/**
 	* Language key used to output the text
 	*
@@ -151,4 +144,14 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 
 		return $data;
 	}
+
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'notifications/post_in_queue';
+	}
 }
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 4c615d8dc6..f700821353 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_quote extends phpbb_notification_type_post
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'notifications/quote';
-
 	/**
 	* regular expression to match to find usernames
 	*
@@ -201,6 +194,16 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		return true;
 	}
 
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'notifications/quote';
+	}
+
 	/**
 	* Get email template variables
 	*
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index d78c108f56..b18493ff29 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'notifications/report_pm';
-
 	/**
 	* Language key used to output the text
 	*
@@ -139,6 +132,16 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 		return $notify_users;
 	}
 
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'notifications/report_pm';
+	}
+
 	/**
 	* Get email template variables
 	*
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index 8d79c8446b..0bde7dfe48 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -68,6 +68,16 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
 		return array($pm['reporter'] => array(''));
 	}
 
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return false;
+	}
+
 	/**
 	* Get email template variables
 	*
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index 151841ef02..f1ee073a4d 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_report_post extends phpbb_notification_type_post_in_queue
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'notifications/report_post';
-
 	/**
 	* Language key used to output the text
 	*
@@ -82,6 +75,16 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 		return $notify_users;
 	}
 
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'notifications/report_post';
+	}
+
 	/**
 	* Get email template variables
 	*
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index 3e66bde9bc..52bdadc547 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -68,6 +68,16 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
 		return array($post['reporter'] => array(''));
 	}
 
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return false;
+	}
+
 	/**
 	* Get email template variables
 	*
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index a9beb469c3..4737031e87 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_topic extends phpbb_notification_type_base
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'newtopic_notify';
-
 	/**
 	* Language key used to output the text
 	*
@@ -179,6 +172,16 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		);
 	}
 
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'newtopic_notify';
+	}
+
 	/**
 	* Get email template variables
 	*
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index eb14c098e1..ee565ab6e6 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -23,13 +23,6 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_topic
 {
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = 'notifications/topic_in_queue';
-
 	/**
 	* Language key used to output the text
 	*
@@ -144,4 +137,14 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 
 		return $data;
 	}
+
+	/**
+	* Get email template
+	*
+	* @return string|bool
+	*/
+	public function get_email_template()
+	{
+		return 'notifications/topic_in_queue';
+	}
 }
-- 
cgit v1.2.1


From 52bb4a1bd60dfcaad99d1ac181d8a0372db9cc2b Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 19:00:37 -0500
Subject: [ticket/11103] Do not have empty queue in the interface

This is not needed as it is not public.

PHPBB3-11103
---
 phpBB/includes/notification/method/interface.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/interface.php b/phpBB/includes/notification/method/interface.php
index f5c210a2fc..3c6c757d5c 100644
--- a/phpBB/includes/notification/method/interface.php
+++ b/phpBB/includes/notification/method/interface.php
@@ -34,11 +34,6 @@ interface phpbb_notification_method_interface
 	*/
 	public function add_to_queue(phpbb_notification_type_interface $notification);
 
-	/**
-	* Empty the queue
-	*/
-	protected function empty_queue();
-
 	/**
 	* Parse the queue and notify the users
 	*/
-- 
cgit v1.2.1


From 94d682f77431add84867bb0b196ad0719b293606 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 20:54:18 -0500
Subject: [ticket/11103] Use the full class name as the item_type/method

This is going to require you recreate the db tables.

PHPBB3-11103
---
 phpBB/includes/functions.php                       |  33 +++-
 phpBB/includes/functions_admin.php                 |  14 +-
 phpBB/includes/functions_posting.php               |  30 +++-
 phpBB/includes/functions_privmsgs.php              |  14 +-
 phpBB/includes/mcp/mcp_pm_reports.php              |   2 +-
 phpBB/includes/mcp/mcp_queue.php                   |  28 +--
 phpBB/includes/mcp/mcp_reports.php                 |  10 +-
 phpBB/includes/notification/manager.php            | 200 +++++++--------------
 phpBB/includes/notification/type/approve_post.php  |   9 -
 phpBB/includes/notification/type/approve_topic.php |   9 -
 phpBB/includes/notification/type/base.php          |   6 +-
 phpBB/includes/notification/type/bookmark.php      |  20 ++-
 .../includes/notification/type/disapprove_post.php |   9 -
 .../notification/type/disapprove_topic.php         |   9 -
 phpBB/includes/notification/type/interface.php     |   6 -
 phpBB/includes/notification/type/pm.php            |  15 +-
 phpBB/includes/notification/type/post.php          |  16 +-
 phpBB/includes/notification/type/post_in_queue.php |   9 -
 phpBB/includes/notification/type/quote.php         |  26 +--
 phpBB/includes/notification/type/report_pm.php     |   9 -
 .../notification/type/report_pm_closed.php         |   9 -
 phpBB/includes/notification/type/report_post.php   |   9 -
 .../notification/type/report_post_closed.php       |   9 -
 phpBB/includes/notification/type/topic.php         |  12 +-
 .../includes/notification/type/topic_in_queue.php  |   9 -
 phpBB/includes/ucp/ucp_notifications.php           |   4 +-
 26 files changed, 203 insertions(+), 323 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 2827dae1a8..3488a3003b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1330,7 +1330,14 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			// Mark all forums read (index page)
 
 			// Mark all topic notifications read for this user
-			$phpbb_notifications->mark_notifications_read(array('topic', 'quote', 'bookmark', 'post', 'approve_topic', 'approve_post'), false, $user->data['user_id'], $post_time);
+			$phpbb_notifications->mark_notifications_read(array(
+				'phpbb_notification_type_topic',
+				'phpbb_notification_type_quote',
+				'phpbb_notification_type_bookmark',
+				'phpbb_notification_type_post',
+				'phpbb_notification_type_approve_topic',
+				'phpbb_notification_type_approve_post',
+			), false, $user->data['user_id'], $post_time);
 
 			if ($config['load_db_lastread'] && $user->data['is_registered'])
 			{
@@ -1386,7 +1393,10 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			$forum_id = array($forum_id);
 		}
 
-		$phpbb_notifications->mark_notifications_read_by_parent(array('topic', 'approve_topic'), $forum_id, $user->data['user_id'], $post_time);
+		$phpbb_notifications->mark_notifications_read_by_parent(array(
+			'phpbb_notification_type_topic',
+			'phpbb_notification_type_approve_topic',
+		), $forum_id, $user->data['user_id'], $post_time);
 
 		// Mark all post/quote notifications read for this user in this forum
 		$topic_ids = array();
@@ -1400,7 +1410,12 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		}
 		$db->sql_freeresult($result);
 
-		$phpbb_notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post', 'approve_post'), $topic_ids, $user->data['user_id'], $post_time);
+		$phpbb_notifications->mark_notifications_read_by_parent(array(
+			'phpbb_notification_type_quote',
+			'phpbb_notification_type_bookmark',
+			'phpbb_notification_type_post',
+			'phpbb_notification_type_approve_post',
+		), $topic_ids, $user->data['user_id'], $post_time);
 
 		// Add 0 to forums array to mark global announcements correctly
 		// $forum_id[] = 0;
@@ -1500,8 +1515,16 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		}
 
 		// Mark post notifications read for this user in this topic
-		$phpbb_notifications->mark_notifications_read(array('topic', 'approve_topic'), $topic_id, $user->data['user_id'], $post_time);
-		$phpbb_notifications->mark_notifications_read_by_parent(array('quote', 'bookmark', 'post', 'approve_post'), $topic_id, $user->data['user_id'], $post_time);
+		$phpbb_notifications->mark_notifications_read(array(
+			'phpbb_notification_type_topic',
+			'phpbb_notification_type_approve_topic',
+		), $topic_id, $user->data['user_id'], $post_time);
+		$phpbb_notifications->mark_notifications_read_by_parent(array(
+			'phpbb_notification_type_quote',
+			'phpbb_notification_type_bookmark',
+			'phpbb_notification_type_post',
+			'phpbb_notification_type_approve_post',
+		), $topic_id, $user->data['user_id'], $post_time);
 
 		if ($config['load_db_lastread'] && $user->data['is_registered'])
 		{
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 893c7a247d..fdae1905a0 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -716,7 +716,11 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 		set_config_count('num_topics', $approved_topics * (-1), true);
 	}
 
-	$phpbb_notifications->delete_notifications(array('topic', 'approve_topic', 'topic_in_queue'), $topic_ids);
+	$phpbb_notifications->delete_notifications(array(
+		'phpbb_notification_type_topic',
+		'phpbb_notification_type_approve_topic',
+		'phpbb_notification_type_topic_in_queue',
+	), $topic_ids);
 
 	return $return;
 }
@@ -896,7 +900,13 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 		delete_topics('topic_id', $remove_topics, $auto_sync, $post_count_sync, false);
 	}
 
-	$phpbb_notifications->delete_notifications(array('quote', 'bookmark', 'post', 'approve_post', 'post_in_queue'), $post_ids);
+	$phpbb_notifications->delete_notifications(array(
+		'phpbb_notification_type_quote',
+		'phpbb_notification_type_bookmark',
+		'phpbb_notification_type_post',
+		'phpbb_notification_type_approve_post',
+		'phpbb_notification_type_post_in_queue',
+	), $post_ids);
 
 	return sizeof($post_ids);
 }
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 4deffe653b..02c31eb6cc 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2234,19 +2234,31 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post':
-				$phpbb_notifications->add_notifications(array('quote', 'topic'), $notification_data);
+				$phpbb_notifications->add_notifications(array(
+					'phpbb_notification_type_quote',
+					'phpbb_notification_type_topic',
+				), $notification_data);
 			break;
 
 			case 'reply':
 			case 'quote':
-				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $notification_data);
+				$phpbb_notifications->add_notifications(array(
+					'phpbb_notification_type_quote',
+					'phpbb_notification_type_bookmark',
+					'phpbb_notification_type_post',
+				), $notification_data);
 			break;
 
 			case 'edit_topic':
 			case 'edit_first_post':
 			case 'edit':
 			case 'edit_last_post':
-				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'topic', 'post'), $notification_data);
+				$phpbb_notifications->update_notifications(array(
+					'phpbb_notification_type_quote',
+					'phpbb_notification_type_bookmark',
+					'phpbb_notification_type_topic',
+					'phpbb_notification_type_post',
+				), $notification_data);
 			break;
 		}
 	}
@@ -2255,20 +2267,24 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post':
-				$phpbb_notifications->add_notifications(array('topic_in_queue'), $notification_data);
+				$phpbb_notifications->add_notifications('phpbb_notification_type_topic_in_queue', $notification_data);
 			break;
 
 			case 'reply':
 			case 'quote':
-				$phpbb_notifications->add_notifications(array('post_in_queue'), $notification_data);
+				$phpbb_notifications->add_notifications('phpbb_notification_type_post_in_queue', $notification_data);
 			break;
 
 			case 'edit_topic':
 			case 'edit_first_post':
 			case 'edit':
 			case 'edit_last_post':
-				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
-				$phpbb_notifications->delete_notifications(array('quote', 'bookmark', 'post'), $data['post_id']);
+				$phpbb_notifications->delete_notifications('phpbb_notification_type_topic', $data['topic_id']);
+				$phpbb_notifications->delete_notifications(array(
+					'phpbb_notification_type_quote',
+					'phpbb_notification_type_bookmark',
+					'phpbb_notification_type_post',
+				), $data['post_id']);
 			break;
 		}
 	}
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 4638091601..ec671e4f41 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -878,7 +878,7 @@ function update_unread_status($unread, $msg_id, $user_id, $folder_id)
 
 	global $db, $user, $phpbb_notifications;
 
-	$phpbb_notifications->mark_notifications_read('pm', $msg_id, $user_id);
+	$phpbb_notifications->mark_notifications_read('phpbb_notification_type_pm', $msg_id, $user_id);
 
 	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
 		SET pm_unread = 0
@@ -1096,7 +1096,7 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 		$user->data['user_unread_privmsg'] -= $num_unread;
 	}
 
-	$phpbb_notifications->delete_notifications('pm', array_keys($delete_rows));
+	$phpbb_notifications->delete_notifications('phpbb_notification_type_pm', array_keys($delete_rows));
 
 	// Now we have to check which messages we can delete completely
 	$sql = 'SELECT msg_id
@@ -1260,7 +1260,7 @@ function phpbb_delete_user_pms($user_id)
 					AND ' . $db->sql_in_set('msg_id', $delivered_msg);
 			$db->sql_query($sql);
 
-			$phpbb_notifications->delete_notifications('pm', $delivered_msg);
+			$phpbb_notifications->delete_notifications('phpbb_notification_type_pm', $delivered_msg);
 		}
 
 		if (!empty($undelivered_msg))
@@ -1273,7 +1273,7 @@ function phpbb_delete_user_pms($user_id)
 				WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
 			$db->sql_query($sql);
 
-			$phpbb_notifications->delete_notifications('pm', $undelivered_msg);
+			$phpbb_notifications->delete_notifications('phpbb_notification_type_pm', $undelivered_msg);
 		}
 	}
 
@@ -1317,7 +1317,7 @@ function phpbb_delete_user_pms($user_id)
 				WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
 			$db->sql_query($sql);
 
-			$phpbb_notifications->delete_notifications('pm', $delete_ids);
+			$phpbb_notifications->delete_notifications('phpbb_notification_type_pm', $delete_ids);
 		}
 	}
 
@@ -1862,11 +1862,11 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 
 	if ($mode == 'edit')
 	{
-		$phpbb_notifications->update_notifications('pm', $pm_data);
+		$phpbb_notifications->update_notifications('phpbb_notification_type_pm', $pm_data);
 	}
 	else
 	{
-		$phpbb_notifications->add_notifications('pm', $pm_data);
+		$phpbb_notifications->add_notifications('phpbb_notification_type_pm', $pm_data);
 	}
 
 	return $data['msg_id'];
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index 001edfd8db..572969af4a 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -90,7 +90,7 @@ class mcp_pm_reports
 					trigger_error('NO_REPORT');
 				}
 
-				$phpbb_notifications->mark_notifications_read_by_parent('report_pm', $report_id, $user->data['user_id']);
+				$phpbb_notifications->mark_notifications_read_by_parent('phpbb_notification_type_report_pm', $report_id, $user->data['user_id']);
 
 				$pm_id = $report['pm_id'];
 				$report_id = $report['report_id'];
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 72f1c00c72..f13ce914bf 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -86,7 +86,7 @@ class mcp_queue
 					{
 						$post_id = (int) $topic_info[$topic_id]['topic_first_post_id'];
 
-						$phpbb_notifications->mark_notifications_read('topic_in_queue', $topic_id, $user->data['user_id']);
+						$phpbb_notifications->mark_notifications_read('phpbb_notification_type_topic_in_queue', $topic_id, $user->data['user_id']);
 					}
 					else
 					{
@@ -94,7 +94,7 @@ class mcp_queue
 					}
 				}
 
-				$phpbb_notifications->mark_notifications_read('post_in_queue', $post_id, $user->data['user_id']);
+				$phpbb_notifications->mark_notifications_read('phpbb_notification_type_post_in_queue', $post_id, $user->data['user_id']);
 
 				$post_info = get_post_data(array($post_id), 'm_approve', true);
 
@@ -610,24 +610,28 @@ function approve_post($post_id_list, $id, $mode)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
 			{
-				$phpbb_notifications->delete_notifications(array('topic_in_queue'), $post_data['topic_id']);
+				$phpbb_notifications->delete_notifications('phpbb_notification_type_topic_in_queue', $post_data['topic_id']);
 
-				$phpbb_notifications->add_notifications('topic', $post_data);
+				$phpbb_notifications->add_notifications('phpbb_notification_type_topic', $post_data);
 
 				if ($notify_poster)
 				{
-					$phpbb_notifications->add_notifications('approve_topic', $post_data);
+					$phpbb_notifications->add_notifications('phpbb_notification_type_approve_topic', $post_data);
 				}
 			}
 			else
 			{
-				$phpbb_notifications->delete_notifications(array('post_in_queue'), $post_id);
+				$phpbb_notifications->delete_notifications('phpbb_notification_type_post_in_queue', $post_id);
 
-				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $post_data);
+				$phpbb_notifications->add_notifications(array(
+					'phpbb_notification_type_quote',
+					'phpbb_notification_type_bookmark',
+					'phpbb_notification_type_post',
+				), $post_data);
 
 				if ($notify_poster)
 				{
-					$phpbb_notifications->add_notifications('approve_post', $post_data);
+					$phpbb_notifications->add_notifications('phpbb_notification_type_approve_post', $post_data);
 				}
 			}
 		}
@@ -855,11 +859,11 @@ function disapprove_post($post_id_list, $id, $mode)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
 			{
-				$phpbb_notifications->delete_notifications(array('topic_in_queue'), $post_data['topic_id']);
+				$phpbb_notifications->delete_notifications('phpbb_notification_type_topic_in_queue', $post_data['topic_id']);
 			}
 			else
 			{
-				$phpbb_notifications->delete_notifications(array('post_in_queue'), $post_id);
+				$phpbb_notifications->delete_notifications('phpbb_notification_type_post_in_queue', $post_id);
 			}
 		}
 
@@ -905,14 +909,14 @@ function disapprove_post($post_id_list, $id, $mode)
 				{
 					if ($notify_poster)
 					{
-						$phpbb_notifications->add_notifications('disapprove_topic', $post_data);
+						$phpbb_notifications->add_notifications('phpbb_notification_type_disapprove_topic', $post_data);
 					}
 				}
 				else
 				{
 					if ($notify_poster)
 					{
-						$phpbb_notifications->add_notifications('disapprove_post', $post_data);
+						$phpbb_notifications->add_notifications('phpbb_notification_type_disapprove_post', $post_data);
 					}
 				}
 			}
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index f6121e7e03..5bda6f2de7 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -88,7 +88,7 @@ class mcp_reports
 					trigger_error('NO_REPORT');
 				}
 
-				$phpbb_notifications->mark_notifications_read('report_post', $post_id, $user->data['user_id']);
+				$phpbb_notifications->mark_notifications_read('phpbb_notification_type_report_post', $post_id, $user->data['user_id']);
 
 				if (!$report_id && $report['report_closed'])
 				{
@@ -647,20 +647,20 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 
 				if ($pm)
 				{
-					$phpbb_notifications->add_notifications('report_pm_closed', array_merge($post_info[$post_id], array(
+					$phpbb_notifications->add_notifications('phpbb_notification_type_report_pm_closed', array_merge($post_info[$post_id], array(
 						'reporter'			=> $reporter['user_id'],
 						'closer_id'			=> $user->data['user_id'],
 						'from_user_id'		=> $post_info[$post_id]['author_id'],
 					)));
-					$phpbb_notifications->delete_notifications('report_pm', $post_id);
+					$phpbb_notifications->delete_notifications('phpbb_notification_type_report_pm', $post_id);
 				}
 				else
 				{
-					$phpbb_notifications->add_notifications('report_post_closed', array_merge($post_info[$post_id], array(
+					$phpbb_notifications->add_notifications('phpbb_notification_type_report_post_closed', array_merge($post_info[$post_id], array(
 						'reporter'			=> $reporter['user_id'],
 						'closer_id'			=> $user->data['user_id'],
 					)));
-					$phpbb_notifications->delete_notifications('report_post', $post_id);
+					$phpbb_notifications->delete_notifications('phpbb_notification_type_report_post', $post_id);
 				}
 			}
 		}
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 3a4c4cd696..06ebaf24c4 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -138,32 +138,16 @@ class phpbb_notification_manager
 			$this->db->sql_freeresult($result);
 		}
 
-		$rowset = array();
-
-		// Get the main notifications
-		$sql = 'SELECT *
-			FROM ' . NOTIFICATIONS_TABLE . '
-			WHERE user_id = ' . (int) $options['user_id'] .
-				(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('notification_id', $options['notification_id']) : ' AND notification_id = ' . (int) $options['notification_id']) : '') . '
-			 	AND is_enabled = 1
-			ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
-		$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
-
-		while ($row = $this->db->sql_fetchrow($result))
+		if (!$options['count_total'] || $total_count)
 		{
-			$rowset[$row['notification_id']] = $row;
-		}
-		$this->db->sql_freeresult($result);
+			$rowset = array();
 
-		// Get all unread notifications
-		if ($unread_count && $options['all_unread'] && !empty($rowset))
-		{
+			// Get the main notifications
 			$sql = 'SELECT *
 				FROM ' . NOTIFICATIONS_TABLE . '
-				WHERE user_id = ' . (int) $options['user_id'] . '
-					AND unread = 1
-					AND ' . $this->db->sql_in_set('notification_id', array_keys($rowset), true) . '
-					AND is_is_enabled = 1
+				WHERE user_id = ' . (int) $options['user_id'] .
+					(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('notification_id', $options['notification_id']) : ' AND notification_id = ' . (int) $options['notification_id']) : '') . '
+			 		AND is_enabled = 1
 				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 			$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
 
@@ -172,37 +156,52 @@ class phpbb_notification_manager
 				$rowset[$row['notification_id']] = $row;
 			}
 			$this->db->sql_freeresult($result);
-		}
-
-		foreach ($rowset as $row)
-		{
-			$item_type_class_name = $this->get_item_type_class_name($row['item_type'], true);
 
-			$notification = $this->get_item_type_class($item_type_class_name, $row);
-
-			// Array of user_ids to query all at once
-			$user_ids = array_merge($user_ids, $notification->users_to_query());
-
-			// Some notification types also require querying additional tables themselves
-			if (!isset($load_special[$row['item_type']]))
+			// Get all unread notifications
+			if ($unread_count && $options['all_unread'] && !empty($rowset))
 			{
-				$load_special[$row['item_type']] = array();
+				$sql = 'SELECT *
+					FROM ' . NOTIFICATIONS_TABLE . '
+					WHERE user_id = ' . (int) $options['user_id'] . '
+						AND unread = 1
+						AND ' . $this->db->sql_in_set('notification_id', array_keys($rowset), true) . '
+						AND is_enabled = 1
+					ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
+				$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
+
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$rowset[$row['notification_id']] = $row;
+				}
+				$this->db->sql_freeresult($result);
 			}
-			$load_special[$row['item_type']] = array_merge($load_special[$row['item_type']], $notification->get_load_special());
 
-			$notifications[$row['notification_id']] = $notification;
-		}
+			foreach ($rowset as $row)
+			{
+				$notification = $this->get_item_type_class($row['item_type'], $row);
 
-		$this->load_users($user_ids);
+				// Array of user_ids to query all at once
+				$user_ids = array_merge($user_ids, $notification->users_to_query());
 
-		// Allow each type to load its own special items
-		foreach ($load_special as $item_type => $data)
-		{
-			$item_type_class_name = $this->get_item_type_class_name($item_type, true);
+				// Some notification types also require querying additional tables themselves
+				if (!isset($load_special[$row['item_type']]))
+				{
+					$load_special[$row['item_type']] = array();
+				}
+				$load_special[$row['item_type']] = array_merge($load_special[$row['item_type']], $notification->get_load_special());
+
+				$notifications[$row['notification_id']] = $notification;
+			}
+
+			$this->load_users($user_ids);
 
-			$item_class = $this->get_item_type_class($item_type_class_name);
+			// Allow each type to load its own special items
+			foreach ($load_special as $item_type => $data)
+			{
+				$item_class = $this->get_item_type_class($item_type);
 
-			$item_class->load_special($data, $notifications);
+				$item_class->load_special($data, $notifications);
+			}
 		}
 
 		return array(
@@ -234,11 +233,6 @@ class phpbb_notification_manager
 
 		$time = ($time) ?: time();
 
-		if ($item_type !== false)
-		{
-			$this->get_item_type_class_name($item_type);
-		}
-
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
 			SET unread = 0
 			WHERE time <= " . $time .
@@ -270,8 +264,6 @@ class phpbb_notification_manager
 
 		$time = ($time) ?: time();
 
-		$item_type_class_name = $this->get_item_type_class_name($item_type);
-
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
 			SET unread = 0
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
@@ -326,12 +318,10 @@ class phpbb_notification_manager
 			return $notified_users;
 		}
 
-		$item_type_class_name = $this->get_item_type_class_name($item_type);
-
-		$item_id = $item_type_class_name::get_item_id($data);
+		$item_id = $item_type::get_item_id($data);
 
 		// find out which users want to receive this type of notification
-		$notify_users = $this->get_item_type_class($item_type_class_name)->find_users_for_notification($data, $options);
+		$notify_users = $this->get_item_type_class($item_type)->find_users_for_notification($data, $options);
 
 		$this->add_notifications_for_users($item_type, $data, $notify_users);
 
@@ -357,9 +347,7 @@ class phpbb_notification_manager
 			return;
 		}
 
-		$item_type_class_name = $this->get_item_type_class_name($item_type);
-
-		$item_id = $item_type_class_name::get_item_id($data);
+		$item_id = $item_type::get_item_id($data);
 
 		$user_ids = array();
 		$notification_objects = $notification_methods = array();
@@ -388,14 +376,14 @@ class phpbb_notification_manager
 		}
 
 		// Allow notifications to perform actions before creating the insert array (such as run a query to cache some data needed for all notifications)
-		$notification = $this->get_item_type_class($item_type_class_name);
+		$notification = $this->get_item_type_class($item_type);
 		$pre_create_data = $notification->pre_create_insert_array($data, $notify_users);
 		unset($notification);
 
 		// Go through each user so we can insert a row in the DB and then notify them by their desired means
 		foreach ($notify_users as $user => $methods)
 		{
-			$notification = $this->get_item_type_class($item_type_class_name);
+			$notification = $this->get_item_type_class($item_type);
 
 			$notification->user_id = (int) $user;
 
@@ -412,8 +400,7 @@ class phpbb_notification_manager
 				{
 					if (!isset($notification_methods[$method]))
 					{
-						$method_class_name = 'phpbb_notification_method_' . $method;
-						$notification_methods[$method] = $this->get_method_class($method_class_name);
+						$notification_methods[$method] = $this->get_method_class($method);
 					}
 
 					$notification_methods[$method]->add_to_queue($notification);
@@ -452,21 +439,19 @@ class phpbb_notification_manager
 			return;
 		}
 
-		$item_type_class_name = $this->get_item_type_class_name($item_type);
+		$notification = $this->get_item_type_class($item_type);
 
 		// Allow the notifications class to over-ride the update_notifications functionality
-		if (method_exists($item_type_class_name, 'update_notifications'))
+		if (method_exists($notification, 'update_notifications'))
 		{
 			// Return False to over-ride the rest of the update
-			if ($this->get_item_type_class($item_type_class_name)->update_notifications($data) === false)
+			if ($notification->update_notifications($data) === false)
 			{
 				return;
 			}
 		}
 
-		$item_id = $item_type_class_name::get_item_id($data);
-
-		$notification = $this->get_item_type_class($item_type_class_name);
+		$item_id = $item_type::get_item_id($data);
 		$update_array = $notification->create_update_array($data);
 
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
@@ -495,8 +480,6 @@ class phpbb_notification_manager
 			return;
 		}
 
-		$this->get_item_type_class_name($item_type);
-
 		$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 				AND " . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id);
@@ -512,17 +495,15 @@ class phpbb_notification_manager
 	{
 		$subscription_types = array();
 
-		foreach ($this->get_subscription_files('notification/type/') as $class_name => $file)
+		foreach ($this->get_subscription_files('notification/type/') as $class_name)
 		{
-			$class_name = $this->get_item_type_class_name($class_name);
-
 			$class = $this->get_item_type_class($class_name);
 
-			if ($class instanceof phpbb_notification_type_interface && $class->is_available() && method_exists($class_name, 'get_item_type'))
+			if ($class instanceof phpbb_notification_type_interface && $class->is_available())
 			{
 				$options = array_merge(array(
-					'id'		=> $class_name::get_item_type(),
-					'lang'		=> 'NOTIFICATION_TYPE_' . strtoupper($class_name::get_item_type()),
+					'id'		=> $class_name,
+					'lang'		=> 'NOTIFICATION_TYPE_' . strtoupper($class_name),
 					'group'		=> 'NOTIFICATION_GROUP_MISCELLANEOUS',
 				), (($class_name::$notification_option !== false) ? $class_name::$notification_option : array()));
 
@@ -550,15 +531,13 @@ class phpbb_notification_manager
 	{
 		$subscription_methods = array();
 
-		foreach ($this->get_subscription_files('notification/method/') as $method_name => $file)
+		foreach ($this->get_subscription_files('notification/method/') as $class_name)
 		{
-			$class_name = 'phpbb_notification_method_' . $method_name;
-
 			$method = $this->get_method_class($class_name);
 
 			if ($method instanceof phpbb_notification_method_interface && $method->is_available())
 			{
-				$subscription_methods[] = $method_name;
+				$subscription_methods[] = $class_name;
 			}
 		}
 
@@ -615,8 +594,6 @@ class phpbb_notification_manager
 	*/
 	public function add_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
 	{
-		$this->get_item_type_class_name($item_type);
-
 		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
 		$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
@@ -639,8 +616,6 @@ class phpbb_notification_manager
 	*/
 	public function delete_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
 	{
-		$this->get_item_type_class_name($item_type);
-
 		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
 		$sql = 'DELETE FROM ' . USER_NOTIFICATIONS_TABLE . "
@@ -692,37 +667,11 @@ class phpbb_notification_manager
 		return (isset($this->users[$user_id])) ? $this->users[$user_id] : $this->users[ANONYMOUS];
 	}
 
-	/**
-	* Helper to get the notifications item type class name and clean it if unsafe
-	*/
-	private function get_item_type_class_name(&$item_type, $safe = false)
-	{
-		if (!$safe)
-		{
-			$item_type = preg_replace('#[^a-z_-]#', '', $item_type);
-		}
-
-		if (strpos($item_type, 'ext_') === 0)
-		{
-			$item_type_ary = explode('-', substr($item_type, 4), 2);
-
-			return 'phpbb_ext_' . $item_type_ary[0] . '_notification_type_' . $item_type_ary[1];
-		}
-
-		return 'phpbb_notification_type_' . $item_type;
-	}
-
 	/**
 	* Helper to get the notifications item type class and set it up
 	*/
 	public function get_item_type_class($item_type, $data = array())
 	{
-		if (!strpos($item_type, 'notification_type_'))
-		{
-			$item_class = $this->get_item_type_class_name($item_type);
-			$item_type = $item_class;
-		}
-
 		$item = new $item_type($this, $this->db, $this->cache, $this->template, $this->extension_manager, $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext);
 
 		$item->set_initial_data($data);
@@ -747,31 +696,16 @@ class phpbb_notification_manager
 
 		$subscription_files = array();
 
-		$files = $finder
+		$classes = $finder
 			->core_path('includes/' . $path)
 			->extension_directory($path)
-			->get_files();
-		foreach ($files as $file)
-		{
-			$name = substr($file, strrpos($file, '/'));
-			$name = substr($name, 1, (strpos($name, '.' . $this->php_ext) - 1));
+			->get_classes();
 
-			if ($name == 'interface' || $name == 'base')
-			{
-				continue;
-			}
-
-			if (!strpos($file, 'includes/')) // is an extension
-			{
-				$ext_name = substr($file, (strpos($file, 'ext/') + 4));
-				$ext_name = substr($ext_name, 0, strpos($ext_name, '/'));
-
-				$name = 'ext_' . $ext_name . '-' . $name;
-			}
-
-			$subscription_files[$name] = $file;
-		}
+		unset($classes[array_search('phpbb_notification_type_interface', $classes)]);
+		unset($classes[array_search('phpbb_notification_type_base', $classes)]);
+		unset($classes[array_search('phpbb_notification_method_interface', $classes)]);
+		unset($classes[array_search('phpbb_notification_method_base', $classes)]);
 
-		return $subscription_files;
+		return $classes;
 	}
 }
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index 4ed5124415..46f2c16c14 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -42,15 +42,6 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'approve_post';
-	}
-
 	/**
 	* Is available
 	*/
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 32a1de8cf8..0015858c2e 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -42,15 +42,6 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'approve_topic';
-	}
-
 	/**
 	* Is available
 	*/
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 4c496f0a22..df04dc2a49 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -116,7 +116,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 	public function __toString()
 	{
-		return (!empty($this->data)) ? var_export($this->data, true) : static::get_item_type();
+		return (!empty($this->data)) ? var_export($this->data, true) : get_class($this);
 	}
 
 	/**
@@ -156,7 +156,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		// Defaults
 		$this->data = array_merge(array(
 			'item_id'				=> static::get_item_id($type_data),
-			'item_type'	   			=> $this->get_item_type(),
+			'item_type'	   			=> get_class($this),
 			'item_parent_id'		=> static::get_item_parent_id($type_data),
 
 			'time'					=> time(),
@@ -324,7 +324,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . static::get_item_type() . "'
+			WHERE item_type = '" . get_class($this) . "'
 				AND item_id = " . (int) $item_id;
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index eb1a735249..4d5a1fd299 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -31,13 +31,15 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 	protected $language_key = 'NOTIFICATION_BOOKMARK';
 
 	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
-	public static function get_item_type()
-	{
-		return 'bookmark';
-	}
+	public static $notification_option = array(
+		'lang'	=> 'NOTIFICATION_TYPE_BOOKMARK',
+		'group'	=> 'NOTIFICATION_GROUP_POSTING',
+	);
 
 	/**
 	* Find the users who want to receive notifications
@@ -81,7 +83,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
+			WHERE item_type = '" . get_class($this) . "'
 				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
@@ -104,7 +106,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 		$update_notifications = array();
 		$sql = 'SELECT *
 			FROM ' . NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
+			WHERE item_type = '" . get_class($this) . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
 				AND is_enabled = 1';
@@ -114,7 +116,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 			// Do not create a new notification
 			unset($notify_users[$row['user_id']]);
 
-			$notification = $this->notification_manager->get_item_type_class(self::get_item_type(), $row);
+			$notification = $this->notification_manager->get_item_type_class(get_class($this), $row);
 			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
 				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
 				WHERE notification_id = ' . $row['notification_id'];
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
index d4e659c5f3..3b5719c3fe 100644
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ b/phpBB/includes/notification/type/disapprove_post.php
@@ -42,15 +42,6 @@ class phpbb_notification_type_disapprove_post extends phpbb_notification_type_ap
 		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'disapprove_post';
-	}
-
 	/**
 	* Get the HTML formatted title of this notification
 	*
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
index 4bbf458d4a..7369fd64bd 100644
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ b/phpBB/includes/notification/type/disapprove_topic.php
@@ -42,15 +42,6 @@ class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_a
 		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'disapprove_topic';
-	}
-
 	/**
 	* Get the HTML formatted title of this notification
 	*
diff --git a/phpBB/includes/notification/type/interface.php b/phpBB/includes/notification/type/interface.php
index 25dc24d922..9d9965261e 100644
--- a/phpBB/includes/notification/type/interface.php
+++ b/phpBB/includes/notification/type/interface.php
@@ -28,12 +28,6 @@ interface phpbb_notification_type_interface
 	*/
 	public function set_initial_data($data);
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type();
-
 	/**
 	* Get the id of the item
 	*
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index 721af4bce5..adb03ab1a3 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -24,13 +24,14 @@ if (!defined('IN_PHPBB'))
 class phpbb_notification_type_pm extends phpbb_notification_type_base
 {
 	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
-	public static function get_item_type()
-	{
-		return 'pm';
-	}
+	public static $notification_option = array(
+		'lang'	=> 'NOTIFICATION_TYPE_PM',
+	);
 
 	/**
 	* Get the id of the
@@ -77,7 +78,7 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
+			WHERE item_type = '" . get_class($this) . "'
 				AND " . $this->db->sql_in_set('user_id', array_keys($pm['recipients'])) . '
 				AND user_id <> ' . $pm['from_user_id'];
 		$result = $this->db->sql_query($sql);
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 9bb06e3620..9317669e57 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -37,18 +37,10 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
+		'lang'	=> 'NOTIFICATION_TYPE_POST',
 		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'post';
-	}
-
 	/**
 	* Get the id of the item
 	*
@@ -112,7 +104,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
+			WHERE item_type = '" . get_class($this) . "'
 				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
@@ -135,7 +127,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		$update_notifications = array();
 		$sql = 'SELECT *
 			FROM ' . NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
+			WHERE item_type = '" . get_class($this) . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
 				AND is_enabled = 1';
@@ -145,7 +137,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			// Do not create a new notification
 			unset($notify_users[$row['user_id']]);
 
-			$notification = $this->notification_manager->get_item_type_class(self::get_item_type(), $row);
+			$notification = $this->notification_manager->get_item_type_class(get_class($this), $row);
 			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
 				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
 				WHERE notification_id = ' . $row['notification_id'];
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 0bf8685660..5771b60df7 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -49,15 +49,6 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 	*/
 	protected $permission = 'm_approve';
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'post_in_queue';
-	}
-
 	/**
 	* Is available
 	*/
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index f700821353..e4b40e0aec 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -38,13 +38,15 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 	protected $language_key = 'NOTIFICATION_QUOTE';
 
 	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
+	* Notification option data (for outputting to the user)
+	*
+	* @var bool|array False if the service should use it's default data
+	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
-	public static function get_item_type()
-	{
-		return 'quote';
-	}
+	public static $notification_option = array(
+		'lang'	=> 'NOTIFICATION_TYPE_QUOTE',
+		'group'	=> 'NOTIFICATION_GROUP_POSTING',
+	);
 
 	/**
 	* Find the users who want to receive notifications
@@ -100,7 +102,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
+			WHERE item_type = '" . get_class($this) . "'
 				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
@@ -123,7 +125,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		$update_notifications = array();
 		$sql = 'SELECT *
 			FROM ' . NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
+			WHERE item_type = '" . get_class($this) . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
 				AND is_enabled = 1';
@@ -133,7 +135,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 			// Do not create a new notification
 			unset($notify_users[$row['user_id']]);
 
-			$notification = $this->notification_manager->get_item_type_class(self::get_item_type(), $row);
+			$notification = $this->notification_manager->get_item_type_class(get_class($this), $row);
 			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
 				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
 				WHERE notification_id = ' . $row['notification_id'];
@@ -154,7 +156,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		$old_notifications = array();
 		$sql = 'SELECT user_id
 			FROM ' . NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
+			WHERE item_type = '" . get_class($this) . "'
 				AND item_id = " . self::get_item_id($post) . '
 				AND is_enabled = 1';
 		$result = $this->db->sql_query($sql);
@@ -178,13 +180,13 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		}
 
 		// Add the necessary notifications
-		$this->notification_manager->add_notifications_for_users(self::get_item_type(), $post, $add_notifications);
+		$this->notification_manager->add_notifications_for_users(get_class($this), $post, $add_notifications);
 
 		// Remove the necessary notifications
 		if (!empty($remove_notifications))
 		{
 			$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
-				WHERE item_type = '" . self::get_item_type() . "'
+				WHERE item_type = '" . get_class($this) . "'
 					AND item_id = " . self::get_item_id($post) . '
 					AND ' . $this->db->sql_in_set('user_id', $remove_notifications);
 			$this->db->sql_query($sql);
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index b18493ff29..42631ca97a 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -49,15 +49,6 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
 	);
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'report_pm';
-	}
-
 	/**
 	* Get the id of the parent
 	*
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index 0bde7dfe48..a7dd341d1d 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -42,15 +42,6 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
 		return false;
 	}
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'report_pm_closed';
-	}
-
 	/**
 	* Find the users who want to receive notifications
 	*
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index f1ee073a4d..2a493d7f2a 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -49,15 +49,6 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
 	);
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'report_post';
-	}
-
 	/**
 	* Find the users who want to receive notifications
 	*
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index 52bdadc547..38be1d9fee 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -42,15 +42,6 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
 		return false;
 	}
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'report_post_closed';
-	}
-
 	/**
 	* Find the users who want to receive notifications
 	*
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 4737031e87..db1d4028f0 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -37,18 +37,10 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 	* 					Array of data (including keys 'id', 'lang', and 'group')
 	*/
 	public static $notification_option = array(
+		'lang'	=> 'NOTIFICATION_TYPE_TOPIC',
 		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'topic';
-	}
-
 	/**
 	* Get the id of the item
 	*
@@ -116,7 +108,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 
 		$sql = 'SELECT *
 			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::get_item_type() . "'
+			WHERE item_type = '" . get_class($this) . "'
 				AND " . $this->db->sql_in_set('user_id', $auth_read[$topic['forum_id']]['f_read']);
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index ee565ab6e6..91e12fcfbf 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -52,15 +52,6 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 		return (!empty($m_approve));
 	}
 
-	/**
-	* Get the type of notification this is
-	* phpbb_notification_type_
-	*/
-	public static function get_item_type()
-	{
-		return 'topic_in_queue';
-	}
-
 	/**
 	* Find the users who want to receive notifications
 	*
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index aeace13968..8749c88ba1 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -192,7 +192,7 @@ class ucp_notifications
 					$template->assign_block_vars($block . '.notification_methods', array(
 						'METHOD'			=> $method,
 
-						'NAME'				=> $user->lang('NOTIFICATION_METHOD_' . strtoupper($method)),
+						'NAME'				=> $user->lang(strtoupper($method)),
 
 						'SUBSCRIBED'		=> (isset($subscriptions[$type]) && in_array($method, $subscriptions[$type])) ? true : false,
 					));
@@ -218,7 +218,7 @@ class ucp_notifications
 			$template->assign_block_vars($block, array(
 				'METHOD'			=> $method,
 
-				'NAME'				=> $user->lang('NOTIFICATION_METHOD_' . strtoupper($method)),
+				'NAME'				=> $user->lang(strtoupper($method)),
 			));
 		}
 	}
-- 
cgit v1.2.1


From de7e17b7321feebbefb5249febbbfe173e275ada Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 21:22:06 -0500
Subject: [ticket/11103] Notifications for subscriptions/bookmarks must obey
 ACP options

If bookmarks/subscriptions are disabled, they should not be listed in the UCP

PHPBB3-11103
---
 phpBB/includes/notification/type/bookmark.php | 8 ++++++++
 phpBB/includes/notification/type/post.php     | 8 ++++++++
 phpBB/includes/notification/type/quote.php    | 8 ++++++++
 phpBB/includes/notification/type/topic.php    | 8 ++++++++
 4 files changed, 32 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index 4d5a1fd299..4bbe9bbbf4 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -41,6 +41,14 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
+	/**
+	* Is available
+	*/
+	public function is_available()
+	{
+		return $this->config['allow_bookmarks'];
+	}
+
 	/**
 	* Find the users who want to receive notifications
 	*
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 9317669e57..11202ee6e9 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -41,6 +41,14 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
+	/**
+	* Is available
+	*/
+	public function is_available()
+	{
+		return $this->config['allow_topic_notify'];
+	}
+
 	/**
 	* Get the id of the item
 	*
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index e4b40e0aec..47337b1cda 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -48,6 +48,14 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
+	/**
+	* Is available
+	*/
+	public function is_available()
+	{
+		return true;
+	}
+
 	/**
 	* Find the users who want to receive notifications
 	*
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index db1d4028f0..99f7b5bee4 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -41,6 +41,14 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		'group'	=> 'NOTIFICATION_GROUP_POSTING',
 	);
 
+	/**
+	* Is available
+	*/
+	public function is_available()
+	{
+		return $this->config['allow_forum_notify'];
+	}
+
 	/**
 	* Get the id of the item
 	*
-- 
cgit v1.2.1


From f62e55091aac6aa62c56dde172f2f2bb0371f7fd Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 21:26:39 -0500
Subject: [ticket/11103] PM notifications are not available if users cannot
 read them

PHPBB3-11103
---
 phpBB/includes/notification/type/pm.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index adb03ab1a3..697feca962 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -33,6 +33,14 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 		'lang'	=> 'NOTIFICATION_TYPE_PM',
 	);
 
+	/**
+	* Is available
+	*/
+	public function is_available()
+	{
+		return ($this->config['allow_privmsg'] && $this->auth->acl_get('u_readpm'));
+	}
+
 	/**
 	* Get the id of the
 	*
-- 
cgit v1.2.1


From 7e6f31b51d51b1ea6416ed15c425acbb669c463d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 21:45:15 -0500
Subject: [ticket/11103] Correct the comments on the notification classes

PHPBB3-11103
---
 phpBB/includes/notification/type/approve_post.php       | 4 ++--
 phpBB/includes/notification/type/approve_topic.php      | 4 ++--
 phpBB/includes/notification/type/disapprove_post.php    | 4 ++--
 phpBB/includes/notification/type/disapprove_topic.php   | 4 ++--
 phpBB/includes/notification/type/post_in_queue.php      | 4 ++--
 phpBB/includes/notification/type/report_pm.php          | 4 ++--
 phpBB/includes/notification/type/report_pm_closed.php   | 4 ++--
 phpBB/includes/notification/type/report_post_closed.php | 4 ++--
 phpBB/includes/notification/type/topic_in_queue.php     | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index 46f2c16c14..e08039baa9 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -16,8 +16,8 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Post notifications class
-* This class handles notifications for replies to a topic
+* Post approved notifications class
+* This class handles notifications for posts when they are approved (to their authors)
 *
 * @package notifications
 */
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 0015858c2e..6d3f8e60ae 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -16,8 +16,8 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Post notifications class
-* This class handles notifications for replies to a topic
+* Topic approved notifications class
+* This class handles notifications for topics when they are approved (for authors)
 *
 * @package notifications
 */
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
index 3b5719c3fe..ddacd4d367 100644
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ b/phpBB/includes/notification/type/disapprove_post.php
@@ -16,8 +16,8 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Post notifications class
-* This class handles notifications for replies to a topic
+* Post disapproved notifications class
+* This class handles notifications for posts when they are disapproved (for authors)
 *
 * @package notifications
 */
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
index 7369fd64bd..dfda4f8371 100644
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ b/phpBB/includes/notification/type/disapprove_topic.php
@@ -16,8 +16,8 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Post notifications class
-* This class handles notifications for replies to a topic
+* Topic disapproved notifications class
+* This class handles notifications for topics when they are disapproved (for authors)
 *
 * @package notifications
 */
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 5771b60df7..d0f5f22e0f 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -16,8 +16,8 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Topic notifications class
-* This class handles notifications for new topics
+* Post in queue notifications class
+* This class handles notifications for posts that are put in the moderation queue (for moderators)
 *
 * @package notifications
 */
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 42631ca97a..b2f514d483 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -16,8 +16,8 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Private message notifications class
-* This class handles notifications for reporting private messages
+* Private message reproted notifications class
+* This class handles notifications for private messages when they are reported
 *
 * @package notifications
 */
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index a7dd341d1d..46bca8d831 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -16,8 +16,8 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Reported pm notifications class
-* This class handles notifications for reported pms
+* PM report closed notifications class
+* This class handles notifications for when reports are closed on PMs (for the one who reported the PM)
 *
 * @package notifications
 */
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index 38be1d9fee..34b69dbe47 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -16,8 +16,8 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Reported post notifications class
-* This class handles notifications for reported posts
+* Post report closed notifications class
+* This class handles notifications for when reports are closed on posts (for the one who reported the post)
 *
 * @package notifications
 */
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index 91e12fcfbf..f99fde4c75 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -16,8 +16,8 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Topic notifications class
-* This class handles notifications for new topics
+* Topic in queue notifications class
+* This class handles notifications for topics when they are put in the moderation queue (for moderators)
 *
 * @package notifications
 */
-- 
cgit v1.2.1


From bc18e368c36af90b2e998913e827dc7be71f3bd0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 21:55:58 -0500
Subject: [ticket/11103] Correct the test case

Fix a bug that broke it and make sure to set the needed config/auth settings

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 06ebaf24c4..75155c5dc3 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -701,10 +701,25 @@ class phpbb_notification_manager
 			->extension_directory($path)
 			->get_classes();
 
-		unset($classes[array_search('phpbb_notification_type_interface', $classes)]);
-		unset($classes[array_search('phpbb_notification_type_base', $classes)]);
-		unset($classes[array_search('phpbb_notification_method_interface', $classes)]);
-		unset($classes[array_search('phpbb_notification_method_base', $classes)]);
+		if (array_search('phpbb_notification_type_interface', $classes) !== false)
+		{
+			unset($classes[array_search('phpbb_notification_type_interface', $classes)]);
+		}
+
+		if (array_search('phpbb_notification_type_base', $classes) !== false)
+		{
+			unset($classes[array_search('phpbb_notification_type_base', $classes)]);
+		}
+
+		if (array_search('phpbb_notification_method_interface', $classes) !== false)
+		{
+			unset($classes[array_search('phpbb_notification_method_interface', $classes)]);
+		}
+
+		if (array_search('phpbb_notification_method_base', $classes) !== false)
+		{
+			unset($classes[array_search('phpbb_notification_method_base', $classes)]);
+		}
 
 		return $classes;
 	}
-- 
cgit v1.2.1


From 4874226b6e41df64959761ff53a61cfa190cabf1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 22:11:41 -0500
Subject: [ticket/11103] Re-add notify method to the UCP preferences

I've noticed that this is used in other areas still in phpBB, so it should
not be removed.

PHPBB3-11103
---
 phpBB/includes/ucp/ucp_prefs.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 709d2a90b0..4b49d2092d 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -37,6 +37,7 @@ class ucp_prefs
 			case 'personal':
 				add_form_key('ucp_prefs_personal');
 				$data = array(
+					'notifymethod'	=> request_var('notifymethod', $user->data['user_notify_type']),
 					'dateformat'	=> request_var('dateformat', $user->data['user_dateformat'], true),
 					'lang'			=> basename(request_var('lang', $user->data['user_lang'])),
 					'style'			=> request_var('style', (int) $user->data['user_style']),
@@ -48,6 +49,12 @@ class ucp_prefs
 					'allowpm'		=> request_var('allowpm', (bool) $user->data['user_allow_pm']),
 				);
 
+				if ($data['notifymethod'] == NOTIFY_IM && (!$config['jab_enable'] || !$user->data['user_jabber'] || !@extension_loaded('xml')))
+				{
+					// Jabber isnt enabled, or no jabber field filled in. Update the users table to be sure its correct.
+					$data['notifymethod'] = NOTIFY_BOTH;
+				}
+
 				if ($submit)
 				{
 					if ($config['override_user_style'])
@@ -77,6 +84,7 @@ class ucp_prefs
 							'user_allow_viewemail'	=> $data['viewemail'],
 							'user_allow_massemail'	=> $data['massemail'],
 							'user_allow_viewonline'	=> ($auth->acl_get('u_hideonline')) ? !$data['hideonline'] : $user->data['user_allow_viewonline'],
+							'user_notify_type'		=> $data['notifymethod'],
 							'user_options'			=> $user->data['user_options'],
 
 							'user_dateformat'		=> $data['dateformat'],
@@ -122,6 +130,9 @@ class ucp_prefs
 				$template->assign_vars(array(
 					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 
+					'S_NOTIFY_EMAIL'	=> ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false,
+					'S_NOTIFY_IM'		=> ($data['notifymethod'] == NOTIFY_IM) ? true : false,
+					'S_NOTIFY_BOTH'		=> ($data['notifymethod'] == NOTIFY_BOTH) ? true : false,
 					'S_VIEW_EMAIL'		=> $data['viewemail'],
 					'S_MASS_EMAIL'		=> $data['massemail'],
 					'S_ALLOW_PM'		=> $data['allowpm'],
-- 
cgit v1.2.1


From e7a137820bf6ca341df5c0c503e2767451f57c5e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 21 Oct 2012 22:30:20 +0200
Subject: [feature/soft-delete] Use correct language when restoring topics in
 MCP

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_queue.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 554a7c080b..3d36229ee7 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -67,11 +67,11 @@ class mcp_queue
 				{
 					if ($action != 'disapprove')
 					{
-						$this->approve_topics($action, $post_id_list, 'queue', $mode);
+						$this->approve_topics($action, $topic_id_list, 'queue', $mode);
 					}
 					else
 					{
-						$this->disapprove_posts($post_id_list, 'queue', $mode);
+						//@todo: $this->disapprove_posts($post_id_list, 'queue', $mode);
 					}
 				}
 				else
@@ -434,6 +434,7 @@ class mcp_queue
 						'U_POST_AUTHOR'			=> get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
 
 						'POST_ID'		=> $row['post_id'],
+						'TOPIC_ID'		=> $row['topic_id'],
 						'FORUM_NAME'	=> $forum_names[$row['forum_id']],
 						'POST_SUBJECT'	=> ($row['post_subject'] != '') ? $row['post_subject'] : $user->lang['NO_SUBJECT'],
 						'TOPIC_TITLE'	=> $row['topic_title'],
@@ -700,7 +701,7 @@ class mcp_queue
 
 			foreach ($topic_info as $topic_id => $topic_data)
 			{
-				phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
+				phpbb_content_visibility::set_topic_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
 
 				$topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$topic_data['forum_id']}&amp;t={$topic_id}");
 
@@ -711,11 +712,6 @@ class mcp_queue
 				);
 			}
 
-			foreach ($topic_info as $topic_id => $topic_data)
-			{
-				phpbb_content_visibility::set_topic_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
-			}
-
 			if (sizeof($topic_info) >= 1)
 			{
 				$success_msg = (sizeof($topic_info) == 1) ? 'TOPIC_' . strtoupper($action) . 'D_SUCCESS' : 'TOPICS_' . strtoupper($action) . 'D_SUCCESS';
@@ -792,7 +788,7 @@ class mcp_queue
 				'S_' . strtoupper($action)	=> true,
 			));
 
-			confirm_box(false, strtoupper($action) . '_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
+			confirm_box(false, strtoupper($action) . '_TOPIC' . ((sizeof($topic_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
 		}
 
 		$redirect = request_var('redirect', "index.$phpEx");
-- 
cgit v1.2.1


From 6c39563e9f7fad18f1425292dca652861f5e1cb6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 21 Oct 2012 23:38:55 +0200
Subject: [feature/soft-delete] Add a function to calculate the actual
 post/topic count

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 20 ++++++++++++++++++++
 phpBB/includes/functions_display.php  |  5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 8bfdfd2917..2a0cc3c850 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -46,6 +46,26 @@ class phpbb_content_visibility
 		return false;
 	}
 
+	/**
+	* Get the topics post count or the forums post/topic count based on permissions
+	*
+	* @param $mode			string	One of topic_posts, forum_posts or forum_topics
+	* @param $data			array	Array with the topic/forum data to calculate from
+	* @param $forum_id		int		The forum id is used for permission checks
+	* @return int	Number of posts/topics the user can see in the topic/forum
+	*/
+	static public function get_count($mode, $data, $forum_id)
+	{
+		global $auth;
+
+		if (!$auth->acl_get('m_approve', $forum_id))
+		{
+			return (int) $data[$mode];
+		}
+
+		return (int) $data[$mode] + (int) $data[$mode . '_unapproved'] + (int) $data[$mode . '_softdeleted'];
+	}
+
 	/**
 	* Create topic/post visibility SQL for a given forum ID
 	*
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 10f07bfbf1..ed91d9ad1c 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -200,8 +200,9 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		}
 
 		// Count the difference of real to public topics, so we can display an information to moderators
-		$row['forum_id_unapproved_topics'] = ($auth->acl_get('m_approve', $forum_id) && ($row['forum_topics_real'] != $row['forum_topics'])) ? $forum_id : 0;
-		$row['forum_topics'] = ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics'];
+		$row['forum_id_unapproved_topics'] = ($auth->acl_get('m_approve', $forum_id) && $row['forum_topics_unapproved']) ? $forum_id : 0;
+		$row['forum_posts'] = phpbb_content_visibility::get_count('forum_posts', $row, $forum_id);
+		$row['forum_topics'] = phpbb_content_visibility::get_count('forum_topics', $row, $forum_id);
 
 		// Display active topics from this forum?
 		if ($show_active && $row['forum_type'] == FORUM_POST && $auth->acl_get('f_read', $forum_id) && ($row['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS))
-- 
cgit v1.2.1


From 9945561b4b58e4825fd2290ae1fbbb3d49fd3e7c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 22 Oct 2012 11:14:00 +0200
Subject: [feature/soft-delete] Correctly calculate the number of replies
 everywhere

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_forum.php | 5 +++--
 phpBB/includes/mcp/mcp_topic.php | 9 +--------
 phpBB/includes/ucp/ucp_main.php  | 2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 02a1ba6dcc..c04a4d37d4 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -203,7 +203,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 		$row = &$topic_rows[$topic_id];
 
-		$replies = ($auth->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies'];
+		$replies = phpbb_content_visibility::get_count('topic_posts', $row, $forum_id) - 1;
 
 		if ($row['topic_status'] == ITEM_MOVED)
 		{
@@ -220,6 +220,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 		$topic_title = censor_text($row['topic_title']);
 
+		// @todo:
 		$topic_unapproved = ($row['topic_visibility'] == ITEM_UNAPPROVED  && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
 		$posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
 		$topic_deleted = ($row['topic_visibility'] == ITEM_DELETED) ? true : false;
@@ -248,7 +249,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 			'TOPIC_TYPE'		=> $topic_type,
 			'TOPIC_TITLE'		=> $topic_title,
-			'REPLIES'			=> ($auth->acl_get('m_approve', $row['forum_id'])) ? $row['topic_replies_real'] : $row['topic_replies'],
+			'REPLIES'			=> phpbb_content_visibility::get_count('topic_posts', $row, $row['forum_id']) - 1,
 			'LAST_POST_TIME'	=> $user->format_date($row['topic_last_post_time']),
 			'FIRST_POST_TIME'	=> $user->format_date($row['topic_time']),
 			'LAST_POST_SUBJECT'	=> $row['topic_last_post_subject'],
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 8320699a8c..0259a12ca8 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -115,14 +115,7 @@ function mcp_topic_view($id, $mode, $action)
 
 	if ($total == -1)
 	{
-		if ($auth->acl_get('m_approve', $topic_info['forum_id']))
-		{
-			$total = $topic_info['topic_replies_real'] + 1;
-		}
-		else
-		{
-			$total = $topic_info['topic_replies'] + 1;
-		}
+		$total = phpbb_content_visibility::get_count('topic_posts', $topic_info, $topic_info['forum_id']);
 	}
 
 	$posts_per_page = max(0, request_var('posts_per_page', intval($config['posts_per_page'])));
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 94fd59433b..7aa06464b7 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -778,7 +778,7 @@ class ucp_main
 			$unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
 
 			// Replies
-			$replies = ($auth->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies'];
+			$replies = phpbb_content_visibility::get_count('topic_posts', $row, $forum_id) - 1;
 
 			if ($row['topic_status'] == ITEM_MOVED && !empty($row['topic_moved_id']))
 			{
-- 
cgit v1.2.1


From 168dd29f24843e97182c894a5d43a7d38f8a195c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 22 Oct 2012 14:21:44 +0200
Subject: [feature/soft-delete] Fix sync() and some more functions to use the
 new fields

PHPBB3-9567
---
 phpBB/includes/acp/acp_users.php      | 12 +++++----
 phpBB/includes/content_visibility.php |  8 +++---
 phpBB/includes/functions_admin.php    | 49 +++++++++++++++++++++++++----------
 3 files changed, 48 insertions(+), 21 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 304027df45..1a3511bc50 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -621,29 +621,31 @@ class acp_users
 							$topic_id_ary = $move_topic_ary = $move_post_ary = $new_topic_id_ary = array();
 							$forum_id_ary = array($new_forum_id);
 
-							$sql = 'SELECT topic_id, COUNT(post_id) AS total_posts
+							$sql = 'SELECT topic_id, post_visibility, COUNT(post_id) AS total_posts
 								FROM ' . POSTS_TABLE . "
 								WHERE poster_id = $user_id
 									AND forum_id <> $new_forum_id
-								GROUP BY topic_id";
+								GROUP BY topic_id, post_visibility";
 							$result = $db->sql_query($sql);
 
 							while ($row = $db->sql_fetchrow($result))
 							{
-								$topic_id_ary[$row['topic_id']] = $row['total_posts'];
+								$topic_id_ary[$row['topic_id']][$row['post_visibility']] = $row['total_posts'];
 							}
 							$db->sql_freeresult($result);
 
 							if (sizeof($topic_id_ary))
 							{
-								$sql = 'SELECT topic_id, forum_id, topic_title, topic_replies, topic_replies_real, topic_attachment
+								$sql = 'SELECT topic_id, forum_id, topic_title, topic_posts, topic_posts_unapproved, topic_posts_softdeleted, topic_attachment
 									FROM ' . TOPICS_TABLE . '
 									WHERE ' . $db->sql_in_set('topic_id', array_keys($topic_id_ary));
 								$result = $db->sql_query($sql);
 
 								while ($row = $db->sql_fetchrow($result))
 								{
-									if (max($row['topic_replies'], $row['topic_replies_real']) + 1 == $topic_id_ary[$row['topic_id']])
+									if ($topic_id_ary[$row['topic_id']][ITEM_APPROVED] == $row['topic_posts']
+									 && $topic_id_ary[$row['topic_id']][ITEM_UNAPPROVED] == $row['topic_posts_unapproved']
+									 && $topic_id_ary[$row['topic_id']][ITEM_DELETED] == $row['topic_posts_softdeleted'])
 									{
 										$move_topic_ary[] = $row['topic_id'];
 									}
diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 2a0cc3c850..5596fe98df 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -523,7 +523,7 @@ class phpbb_content_visibility
 		// Do we need to grab some topic informations?
 		if (!sizeof($topic_row))
 		{
-			$sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_visibility
+			$sql = 'SELECT topic_type, topic_posts, topic_posts_unapproved, topic_posts_softdeleted, topic_visibility
 				FROM ' . TOPICS_TABLE . '
 				WHERE topic_id = ' . $topic_id;
 			$result = $db->sql_query($sql);
@@ -533,10 +533,12 @@ class phpbb_content_visibility
 
 		// If this is an edited topic or the first post the topic gets completely disapproved later on...
 		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_topics = forum_topics - 1';
-		$sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
+		$sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . $topic_row['topic_posts'];
+		$sql_data[FORUMS_TABLE] .= ', forum_posts_unapproved = forum_posts_unapproved - ' . $topic_row['topic_posts_unapproved'];
+		$sql_data[FORUMS_TABLE] .= ', forum_posts_softdeleted = forum_posts_softdeleted - ' . $topic_row['topic_posts_softdeleted'];
 
 		set_config_count('num_topics', -1, true);
-		set_config_count('num_posts', ($topic_row['topic_replies'] + 1) * (-1), true);
+		set_config_count('num_posts', $topic_row['topic_posts'] * (-1), true);
 
 		// Get user post count information
 		$sql = 'SELECT poster_id, COUNT(post_id) AS num_posts
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index cb84d1cfb1..a38fa2a70f 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1670,8 +1670,11 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				if ($sync_extra)
 				{
 					$forum_data[$forum_id]['posts'] = 0;
+					$forum_data[$forum_id]['posts_unapproved'] = 0;
+					$forum_data[$forum_id]['posts_softdeleted'] = 0;
 					$forum_data[$forum_id]['topics'] = 0;
-					$forum_data[$forum_id]['topics_real'] = 0;
+					$forum_data[$forum_id]['topics_unapproved'] = 0;
+					$forum_data[$forum_id]['topics_softdeleted'] = 0;
 				}
 				$forum_data[$forum_id]['last_post_id'] = 0;
 				$forum_data[$forum_id]['last_post_subject'] = '';
@@ -1692,7 +1695,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			// 2: Get topic counts for each forum (optional)
 			if ($sync_extra)
 			{
-				$sql = 'SELECT forum_id, topic_visibility, COUNT(topic_id) AS forum_topics
+				$sql = 'SELECT forum_id, topic_visibility, COUNT(topic_id) AS total_topics
 					FROM ' . TOPICS_TABLE . '
 					WHERE ' . $db->sql_in_set('forum_id', $forum_ids) . '
 					GROUP BY forum_id, topic_visibility';
@@ -1701,11 +1704,18 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				while ($row = $db->sql_fetchrow($result))
 				{
 					$forum_id = (int) $row['forum_id'];
-					$forum_data[$forum_id]['topics_real'] += $row['forum_topics'];
 
 					if ($row['topic_visibility'] == ITEM_APPROVED)
 					{
-						$forum_data[$forum_id]['topics'] = $row['forum_topics'];
+						$forum_data[$forum_id]['topics'] = $row['total_topics'];
+					}
+					else if ($row['topic_visibility'] == ITEM_UNAPPROVED)
+					{
+						$forum_data[$forum_id]['topics_unapproved'] = $row['total_topics'];
+					}
+					else if ($row['topic_visibility'] == ITEM_DELETED)
+					{
+						$forum_data[$forum_id]['topics_softdeleted'] = $row['total_topics'];
 					}
 				}
 				$db->sql_freeresult($result);
@@ -1716,7 +1726,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			{
 				if (sizeof($forum_ids) == 1)
 				{
-					$sql = 'SELECT SUM(t.topic_replies + 1) AS forum_posts
+					$sql = 'SELECT SUM(t.topic_posts) AS forum_posts, SUM(t.topic_posts_unapproved) AS forum_posts_unapproved, SUM(t.topic_posts_softdeleted) AS forum_posts_softdeleted
 						FROM ' . TOPICS_TABLE . ' t
 						WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
 							AND t.topic_visibility = ' . ITEM_APPROVED . '
@@ -1724,7 +1734,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				}
 				else
 				{
-					$sql = 'SELECT t.forum_id, SUM(t.topic_replies + 1) AS forum_posts
+					$sql = 'SELECT t.forum_id, SUM(t.topic_posts) AS forum_posts, SUM(t.topic_posts_unapproved) AS forum_posts_unapproved, SUM(t.topic_posts_softdeleted) AS forum_posts_softdeleted
 						FROM ' . TOPICS_TABLE . ' t
 						WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
 							AND t.topic_visibility = ' . ITEM_APPROVED . '
@@ -1739,6 +1749,8 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 					$forum_id = (sizeof($forum_ids) == 1) ? (int) $forum_ids[0] : (int) $row['forum_id'];
 
 					$forum_data[$forum_id]['posts'] = (int) $row['forum_posts'];
+					$forum_data[$forum_id]['posts_unapproved'] = (int) $row['forum_posts_unapproved'];
+					$forum_data[$forum_id]['posts_softdeleted'] = (int) $row['forum_posts_softdeleted'];
 				}
 				$db->sql_freeresult($result);
 			}
@@ -1819,7 +1831,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 			if ($sync_extra)
 			{
-				array_push($fieldnames, 'posts', 'topics', 'topics_real');
+				array_push($fieldnames, 'posts', 'posts_unapproved', 'posts_softdeleted', 'topics', 'topics_unapproved', 'topics_softdeleted');
 			}
 
 			foreach ($forum_data as $forum_id => $row)
@@ -1858,7 +1870,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 			$db->sql_transaction('begin');
 
-			$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_visibility, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_replies, t.topic_replies_real, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
+			$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_visibility, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_posts, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
 				FROM ' . TOPICS_TABLE . " t
 				$where_sql";
 			$result = $db->sql_query($sql);
@@ -1874,8 +1886,9 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				$topic_id = (int) $row['topic_id'];
 				$topic_data[$topic_id] = $row;
 				$topic_data[$topic_id]['visibility'] = ITEM_UNAPPROVED;
-				$topic_data[$topic_id]['replies_real'] = -1;
-				$topic_data[$topic_id]['replies'] = 0;
+				$topic_data[$topic_id]['posts'] = 0;
+				$topic_data[$topic_id]['posts_unapproved'] = 0;
+				$topic_data[$topic_id]['posts_softdeleted'] = 0;
 				$topic_data[$topic_id]['first_post_id'] = 0;
 				$topic_data[$topic_id]['last_post_id'] = 0;
 				unset($topic_data[$topic_id]['topic_id']);
@@ -1917,14 +1930,24 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 					// When we'll be done, only topics with no posts will remain
 					unset($delete_topics[$topic_id]);
 
-					$topic_data[$topic_id]['replies_real'] += $row['total_posts'];
+					if ($row['post_visibility'] == ITEM_APPROVED)
+					{
+						$topic_data[$topic_id]['posts'] = $row['total_posts'];
+					}
+					else if ($row['post_visibility'] == ITEM_UNAPPROVED)
+					{
+						$topic_data[$topic_id]['posts_unapproved'] = $row['total_posts'];
+					}
+					else if ($row['post_visibility'] == ITEM_DELETED)
+					{
+						$topic_data[$topic_id]['posts_softdeleted'] = $row['total_posts'];
+					}
 
 					if ($row['post_visibility'] == ITEM_APPROVED)
 					{
 						$topic_data[$topic_id]['visibility'] = ITEM_APPROVED;
 						$topic_data[$topic_id]['first_post_id'] = $row['first_post_id'];
 						$topic_data[$topic_id]['last_post_id'] = $row['last_post_id'];
-						$topic_data[$topic_id]['replies'] = $row['total_posts'] - 1;
 					}
 					else if ($topic_data[$topic_id]['visibility'] != ITEM_APPROVED)
 					{
@@ -2120,7 +2143,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			}
 
 			// These are fields that will be synchronised
-			$fieldnames = array('time', 'visibility', 'replies', 'replies_real', 'poster', 'first_post_id', 'first_poster_name', 'first_poster_colour', 'last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
+			$fieldnames = array('time', 'visibility', 'posts', 'posts_unapproved', 'posts_softdeleted', 'poster', 'first_post_id', 'first_poster_name', 'first_poster_colour', 'last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
 
 			if ($sync_extra)
 			{
-- 
cgit v1.2.1


From 5925a17894cecb9fdf2d5c58dcdeb533fb80e8f7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 22 Oct 2012 14:55:10 +0200
Subject: [feature/soft-delete] Fix some more uses of topic_replies_real

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_forum.php |  2 +-
 phpBB/includes/mcp/mcp_main.php  | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index c04a4d37d4..bacc4c444c 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -222,7 +222,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 		// @todo:
 		$topic_unapproved = ($row['topic_visibility'] == ITEM_UNAPPROVED  && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
-		$posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
+		$posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_posts_unapproved'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
 		$topic_deleted = ($row['topic_visibility'] == ITEM_DELETED) ? true : false;
 		$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? $url . '&amp;i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . '&amp;t=' . $row['topic_id'] : '';
 		$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? $url . 'i=queue&amp;mode=deleted_posts&amp;t=' . $topic_id : $u_mcp_queue;
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index a90fc0891e..3ccd1695ad 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -541,8 +541,9 @@ function mcp_move_topic($topic_ids)
 					'topic_time'			=>	(int) $row['topic_time'],
 					'topic_time_limit'		=>	(int) $row['topic_time_limit'],
 					'topic_views'			=>	(int) $row['topic_views'],
-					'topic_replies'			=>	(int) $row['topic_replies'],
-					'topic_replies_real'	=>	(int) $row['topic_replies_real'],
+					'topic_posts'			=>	(int) $row['topic_posts'],
+					'topic_posts_unapproved'=>	(int) $row['topic_posts_unapproved'],
+					'topic_posts_softdeleted'=>	(int) $row['topic_posts_softdeleted'],
 					'topic_status'			=>	ITEM_MOVED,
 					'topic_type'			=>	POST_NORMAL,
 					'topic_first_post_id'	=>	(int) $row['topic_first_post_id'],
@@ -574,6 +575,7 @@ function mcp_move_topic($topic_ids)
 		}
 		unset($topic_data);
 
+		//@todo: needs fixing
 		if ($topic_posts_removed)
 		{
 			$sync_sql[$forum_id][] = 'forum_posts = forum_posts - ' . $topic_posts_removed;
@@ -937,8 +939,9 @@ function mcp_fork_topic($topic_ids)
 				'topic_title'				=> (string) $topic_row['topic_title'],
 				'topic_poster'				=> (int) $topic_row['topic_poster'],
 				'topic_time'				=> (int) $topic_row['topic_time'],
-				'topic_replies'				=> (int) $topic_row['topic_replies_real'],
-				'topic_replies_real'		=> (int) $topic_row['topic_replies_real'],
+				'topic_posts'				=> (int) $topic_row['topic_posts'],
+				'topic_posts_unapproved'	=> (int) $topic_row['topic_posts_unapproved'],
+				'topic_posts_softdeleted'	=> (int) $topic_row['topic_posts_softdeleted'],
 				'topic_status'				=> (int) $topic_row['topic_status'],
 				'topic_type'				=> (int) $topic_row['topic_type'],
 				'topic_first_poster_name'	=> (string) $topic_row['topic_first_poster_name'],
-- 
cgit v1.2.1


From 90154db1dbe3cd24f5af82ad5f665d607aad97ed Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 22 Oct 2012 16:38:53 +0200
Subject: [feature/soft-delete] Fix submit_post() topic_replies* usage

PHPBB3-9567
---
 phpBB/includes/content_visibility.php |  3 +--
 phpBB/includes/functions_posting.php  | 47 +++++++++++++++++++++++++++--------
 2 files changed, 38 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 5596fe98df..20e743a4c4 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -495,8 +495,7 @@ class phpbb_content_visibility
 	*/
 	static public function remove_post_from_statistic($data, &$sql_data)
 	{
-		$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies = topic_replies - 1';
-
+		$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts = topic_posts - 1';
 		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts - 1';
 
 		if ($data['post_postcount'])
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 1a0fdcee85..02b6b0e697 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1418,7 +1418,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 
 	// Specify our post mode
 	$post_mode = 'delete';
-	if (($data['topic_first_post_id'] === $data['topic_last_post_id']) && $data['topic_replies_real'] == 0)
+	if (($data['topic_first_post_id'] === $data['topic_last_post_id']) && ($data['topic_posts'] + $data['topic_posts_unapproved'] + $data['topic_posts_softdeleted'] == 1))
 	{
 		$post_mode = 'delete_topic';
 	}
@@ -1610,8 +1610,16 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 			{
 				phpbb_content_visibility::remove_post_from_statistic($data, $sql_data);
 			}
-
-			$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies_real = topic_replies_real - 1';
+			else if ($data['post_visibility'] == ITEM_UNAPPROVED)
+			{
+				$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts_unapproved = forum_posts_unapproved - 1';
+				$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts_unapproved = topic_posts_unapproved - 1';
+			}
+			else if ($data['post_visibility'] == ITEM_DELETED)
+			{
+				$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts_deleted = forum_posts_deleted - 1';
+				$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts_deleted = topic_posts_deleted - 1';
+			}
 		}
 
 		$sql = 'SELECT 1 AS has_attachments
@@ -1702,7 +1710,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	}
 	else if ($mode == 'edit')
 	{
-		$post_mode = ($data['topic_replies_real'] == 0) ? 'edit_topic' : (($data['topic_first_post_id'] == $data['post_id']) ? 'edit_first_post' : (($data['topic_last_post_id'] == $data['post_id']) ? 'edit_last_post' : 'edit'));
+		$post_mode = ($data['topic_posts'] + $data['topic_posts_unapproved'] + $data['topic_posts_softdeleted'] == 1) ? 'edit_topic' : (($data['topic_first_post_id'] == $data['post_id']) ? 'edit_first_post' : (($data['topic_last_post_id'] == $data['post_id']) ? 'edit_last_post' : 'edit'));
 	}
 
 	// First of all make sure the subject and topic title are having the correct length.
@@ -1717,7 +1725,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	// Retrieve some additional information if not present
 	if ($mode == 'edit' && (!isset($data['post_visibility']) || !isset($data['topic_visibility']) || $data['post_visibility'] === false || $data['topic_visibility'] === false))
 	{
-		$sql = 'SELECT p.post_visibility, t.topic_type, t.topic_replies, t.topic_replies_real, t.topic_visibility
+		$sql = 'SELECT p.post_visibility, t.topic_type, t.topic_posts, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_visibility
 			FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p
 			WHERE t.topic_id = p.topic_id
 				AND p.post_id = ' . $data['post_id'];
@@ -1900,17 +1908,28 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 
 			if ($post_visibility == ITEM_APPROVED)
 			{
+				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics = forum_topics + 1';
 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
 			}
-			$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real + 1' . (($post_visibility == ITEM_APPROVED) ? ', forum_topics = forum_topics + 1' : '');
+			else if ($post_visibility == ITEM_UNAPPROVED)
+			{
+				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_unapproved = forum_topics_unapproved + 1';
+				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts_unapproved = forum_posts_unapproved + 1';
+			}
+			else if ($post_visibility == ITEM_DELETED)
+			{
+				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_softdeleted = forum_topics_softdeleted + 1';
+				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts_softdeleted = forum_posts_softdeleted + 1';
+			}
 		break;
 
 		case 'reply':
 			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_view_time = ' . $current_time . ',
-				topic_replies_real = topic_replies_real + 1,
 				topic_bumped = 0,
 				topic_bumper = 0' .
-				(($post_visibility == ITEM_APPROVED) ? ', topic_replies = topic_replies + 1' : '') .
+				(($post_visibility == ITEM_APPROVED) ? ', topic_posts = topic_posts + 1' : '') .
+				(($post_visibility == ITEM_UNAPPROVED) ? ', topic_posts_unapproved = topic_posts_unapproved + 1' : '') .
+				(($post_visibility == ITEM_DELETED) ? ', topic_posts_softdeleted = topic_posts_softdeleted + 1' : '') .
 				((!empty($data['attachment_data']) || (isset($data['topic_attachment']) && $data['topic_attachment'])) ? ', topic_attachment = 1' : '');
 
 			$sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($auth->acl_get('f_postcount', $data['forum_id']) && $post_visibility == ITEM_APPROVED) ? ', user_posts = user_posts + 1' : '');
@@ -1919,6 +1938,14 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			{
 				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
 			}
+			else if ($post_visibility == ITEM_UNAPPROVED)
+			{
+				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts_unapproved = forum_posts_unapproved + 1';
+			}
+			else if ($post_visibility == ITEM_DELETED)
+			{
+				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts_softdeleted = forum_posts_softdeleted + 1';
+			}
 		break;
 
 		case 'edit_topic':
@@ -1979,8 +2006,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		if ($post_mode == 'reply')
 		{
 			$sql_data[POSTS_TABLE]['sql'] = array_merge($sql_data[POSTS_TABLE]['sql'], array(
-				'topic_id' => $data['topic_id'])
-			);
+				'topic_id' => $data['topic_id'],
+			));
 		}
 
 		$sql = 'INSERT INTO ' . POSTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_data[POSTS_TABLE]['sql']);
-- 
cgit v1.2.1


From eb9c39971bfe7c11d62466b8fab239a8fcbc8952 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 22 Oct 2012 17:34:37 +0200
Subject: [feature/soft-delete] Fix forum syncing in ACP and deleting posts

PHPBB3-9567
---
 phpBB/includes/acp/acp_forums.php    | 22 +++++++++++++---------
 phpBB/includes/functions_posting.php | 15 ++++++++++++---
 2 files changed, 25 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 7f2539ec8d..8029181f39 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -283,7 +283,7 @@ class acp_forums
 
 				@set_time_limit(0);
 
-				$sql = 'SELECT forum_name, forum_topics_real
+				$sql = 'SELECT forum_name, (forum_topics + forum_topics_unapproved + forum_topics_softdeleted) AS total_topics
 					FROM ' . FORUMS_TABLE . "
 					WHERE forum_id = $forum_id";
 				$result = $db->sql_query($sql);
@@ -295,7 +295,7 @@ class acp_forums
 					trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
 				}
 
-				if ($row['forum_topics_real'])
+				if ($row['total_topics'])
 				{
 					$sql = 'SELECT MIN(topic_id) as min_topic_id, MAX(topic_id) as max_topic_id
 						FROM ' . TOPICS_TABLE . '
@@ -329,15 +329,15 @@ class acp_forums
 
 						$start += $batch_size;
 
-						$url = $this->u_action . "&amp;parent_id={$this->parent_id}&amp;f=$forum_id&amp;action=sync&amp;start=$start&amp;topics_done=$topics_done&amp;total={$row['forum_topics_real']}";
+						$url = $this->u_action . "&amp;parent_id={$this->parent_id}&amp;f=$forum_id&amp;action=sync&amp;start=$start&amp;topics_done=$topics_done&amp;total={$row['total_topics']}";
 
 						meta_refresh(0, $url);
 
 						$template->assign_vars(array(
-							'U_PROGRESS_BAR'		=> $this->u_action . "&amp;action=progress_bar&amp;start=$topics_done&amp;total={$row['forum_topics_real']}",
-							'UA_PROGRESS_BAR'		=> addslashes($this->u_action . "&amp;action=progress_bar&amp;start=$topics_done&amp;total={$row['forum_topics_real']}"),
+							'U_PROGRESS_BAR'		=> $this->u_action . "&amp;action=progress_bar&amp;start=$topics_done&amp;total={$row['total_topics']}",
+							'UA_PROGRESS_BAR'		=> addslashes($this->u_action . "&amp;action=progress_bar&amp;start=$topics_done&amp;total={$row['total_topics']}"),
 							'S_CONTINUE_SYNC'		=> true,
-							'L_PROGRESS_EXPLAIN'	=> sprintf($user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $topics_done, $row['forum_topics_real']))
+							'L_PROGRESS_EXPLAIN'	=> sprintf($user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $topics_done, $row['total_topics']))
 						);
 
 						return;
@@ -351,7 +351,7 @@ class acp_forums
 					'U_PROGRESS_BAR'		=> $this->u_action . '&amp;action=progress_bar',
 					'UA_PROGRESS_BAR'		=> addslashes($this->u_action . '&amp;action=progress_bar'),
 					'S_CONTINUE_SYNC'		=> true,
-					'L_PROGRESS_EXPLAIN'	=> sprintf($user->lang['SYNC_IN_PROGRESS_EXPLAIN'], 0, $row['forum_topics_real']))
+					'L_PROGRESS_EXPLAIN'	=> sprintf($user->lang['SYNC_IN_PROGRESS_EXPLAIN'], 0, $row['total_topics']))
 				);
 
 				return;
@@ -1143,7 +1143,8 @@ class acp_forums
 					return array($user->lang['NO_FORUM_ACTION']);
 				}
 
-				$forum_data_sql['forum_posts'] = $forum_data_sql['forum_topics'] = $forum_data_sql['forum_topics_real'] = $forum_data_sql['forum_last_post_id'] = $forum_data_sql['forum_last_poster_id'] = $forum_data_sql['forum_last_post_time'] = 0;
+				$forum_data_sql['forum_posts'] = $forum_data_sql['forum_posts_unapproved'] = $forum_data_sql['forum_posts_softdeleted'] = $forum_data_sql['forum_topics'] = $forum_data_sql['forum_topics_unapproved'] = $forum_data_sql['forum_topics_softdeleted'] = 0;
+				$forum_data_sql['forum_last_post_id'] = $forum_data_sql['forum_last_poster_id'] = $forum_data_sql['forum_last_post_time'] = 0;
 				$forum_data_sql['forum_last_poster_name'] = $forum_data_sql['forum_last_poster_colour'] = '';
 			}
 			else if ($row['forum_type'] == FORUM_CAT && $forum_data_sql['forum_type'] == FORUM_LINK)
@@ -1264,8 +1265,11 @@ class acp_forums
 			{
 				// Changing a category to a forum? Reset the data (you can't post directly in a cat, you must use a forum)
 				$forum_data_sql['forum_posts'] = 0;
+				$forum_data_sql['forum_posts_unapproved'] = 0;
+				$forum_data_sql['forum_posts_softdeleted'] = 0;
 				$forum_data_sql['forum_topics'] = 0;
-				$forum_data_sql['forum_topics_real'] = 0;
+				$forum_data_sql['forum_topics_unapproved'] = 0;
+				$forum_data_sql['forum_topics_softdeleted'] = 0;
 				$forum_data_sql['forum_last_post_id'] = 0;
 				$forum_data_sql['forum_last_post_subject'] = '';
 				$forum_data_sql['forum_last_post_time'] = 0;
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 02b6b0e697..7962690ca8 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1507,9 +1507,18 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 			{
 				delete_topics('topic_id', array($topic_id), false);
 
-
-				$sql_data[FORUMS_TABLE] .= 'forum_topics_real = forum_topics_real - 1';
-				$sql_data[FORUMS_TABLE] .= ($data['topic_visibility'] == ITEM_APPROVED) ? ', forum_posts = forum_posts - 1, forum_topics = forum_topics - 1' : '';
+				if ($data['topic_visibility'] == ITEM_APPROVED)
+				{
+					$sql_data[FORUMS_TABLE] .= 'forum_posts = forum_posts - 1, forum_topics = forum_topics - 1';
+				}
+				else if ($data['topic_visibility'] == ITEM_UNAPPROVED)
+				{
+					$sql_data[FORUMS_TABLE] .= 'forum_posts_unapproved = forum_posts_unapproved - 1, forum_topics_unapproved = forum_topics_unapproved - 1';
+				}
+				else if ($data['topic_visibility'] == ITEM_DELETED)
+				{
+					$sql_data[FORUMS_TABLE] .= 'forum_posts_softdeleted = forum_posts_softdeleted - 1, forum_topics_softdeleted = forum_topics_softdeleted - 1';
+				}
 
 				$update_sql = update_post_information('forum', $forum_id, true);
 				if (sizeof($update_sql))
-- 
cgit v1.2.1


From fec72c4b782cda044b9a05122530f3a32213b407 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 23 Oct 2012 12:52:31 +0200
Subject: [feature/soft-delete] Fix mcp_move_topic() topic/post count handling

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_main.php | 95 +++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 52 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 3ccd1695ad..6245a1b32b 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -455,59 +455,31 @@ function mcp_move_topic($topic_ids)
 		$forum_sync_data[$forum_id] = current($topic_data);
 		$forum_sync_data[$to_forum_id] = $forum_data;
 
-		// Real topics added to target forum
-		$topics_moved = sizeof($topic_data);
-
-		// Approved topics added to target forum
-		$topics_authed_moved = 0;
-
-		// Posts (topic replies + topic post if approved) added to target forum
-		$topic_posts_added = 0;
-
-		// Posts (topic replies + topic post if approved and not global announcement) removed from source forum
-		$topic_posts_removed = 0;
-
-		// Real topics removed from source forum (all topics without global announcements)
-		$topics_removed = 0;
-
-		// Approved topics removed from source forum (except global announcements)
-		$topics_authed_removed = 0;
+		$topics_moved = $topics_moved_unapproved = $topics_moved_softdeleted = 0;
+		$posts_moved = $posts_moved_unapproved = $posts_moved_softdeleted = 0;
 
 		foreach ($topic_data as $topic_id => $topic_info)
 		{
 			if ($topic_info['topic_visibility'] == ITEM_APPROVED)
 			{
-				$topics_authed_moved++;
-				$topic_posts_added++;
+				$topics_moved++;
 			}
-
-			$topic_posts_added += $topic_info['topic_replies'];
-
-			$topics_removed++;
-			$topic_posts_removed += $topic_info['topic_replies'];
-
-			if ($topic_info['topic_visibility'] == ITEM_APPROVED)
+			elseif ($topic_info['topic_visibility'] == ITEM_UNAPPROVED)
 			{
-				$topics_authed_removed++;
-				$topic_posts_removed++;
+				$topics_moved_unapproved++;
+			}
+			elseif ($topic_info['topic_visibility'] == ITEM_DELETED)
+			{
+				$topics_moved_softdeleted++;
 			}
-		}
-
-		$db->sql_transaction('begin');
-
-		$sync_sql = array();
-
-		if ($topic_posts_added)
-		{
-			$sync_sql[$to_forum_id][] = 'forum_posts = forum_posts + ' . $topic_posts_added;
-		}
 
-		if ($topics_authed_moved)
-		{
-			$sync_sql[$to_forum_id][] = 'forum_topics = forum_topics + ' . (int) $topics_authed_moved;
+			$posts_moved += $topic_info['topic_posts'];
+			$posts_moved_unapproved += $topic_info['topic_posts_unapproved'];
+			$posts_moved_softdeleted += $topic_info['topic_posts_softdeleted'];
 		}
+		$topics_moved = sizeof($topic_data);
 
-		$sync_sql[$to_forum_id][] = 'forum_topics_real = forum_topics_real + ' . (int) $topics_moved;
+		$db->sql_transaction('begin');
 
 		// Move topics, but do not resync yet
 		move_topics($topic_ids, $to_forum_id, false);
@@ -569,26 +541,45 @@ function mcp_move_topic($topic_ids)
 				$db->sql_query('INSERT INTO ' . TOPICS_TABLE . $db->sql_build_array('INSERT', $shadow));
 
 				// Shadow topics only count on new "topics" and not posts... a shadow topic alone has 0 posts
-				$topics_removed--;
-				$topics_authed_removed--;
+				$shadow_topics++;
 			}
 		}
 		unset($topic_data);
 
-		//@todo: needs fixing
-		if ($topic_posts_removed)
+		$sync_sql = array();
+		if ($posts_moved)
 		{
-			$sync_sql[$forum_id][] = 'forum_posts = forum_posts - ' . $topic_posts_removed;
+			$sync_sql[$to_forum_id][] = 'forum_posts = forum_posts + ' . (int) $posts_moved;
+			$sync_sql[$forum_id][] = 'forum_posts = forum_posts - ' . (int) $posts_moved;
 		}
-
-		if ($topics_removed)
+		if ($posts_moved_unapproved)
 		{
-			$sync_sql[$forum_id][]	= 'forum_topics_real = forum_topics_real - ' . (int) $topics_removed;
+			$sync_sql[$to_forum_id][] = 'forum_posts_unapproved = forum_posts_unapproved + ' . (int) $posts_moved_unapproved;
+			$sync_sql[$forum_id][] = 'forum_posts_unapproved = forum_posts_unapproved - ' . (int) $posts_moved_unapproved;
+		}
+		if ($posts_moved_softdeleted)
+		{
+			$sync_sql[$to_forum_id][] = 'forum_posts_softdeleted = forum_posts_softdeleted + ' . (int) $posts_moved_softdeleted;
+			$sync_sql[$forum_id][] = 'forum_posts_softdeleted = forum_posts_softdeleted - ' . (int) $posts_moved_softdeleted;
 		}
 
-		if ($topics_authed_removed)
+		if ($topics_moved)
+		{
+			$sync_sql[$to_forum_id][] = 'forum_topics = forum_topics + ' . (int) $topics_moved;
+			if ($topics_moved - $shadow_topics > 0)
+			{
+				$sync_sql[$forum_id][] = 'forum_topics = forum_topics - ' . (int) ($topics_moved - $shadow_topics);
+			}
+		}
+		if ($topics_moved_unapproved)
+		{
+			$sync_sql[$to_forum_id][] = 'forum_topics_unapproved = forum_topics_unapproved + ' . (int) $topics_moved_unapproved;
+			$sync_sql[$forum_id][] = 'forum_topics_unapproved = forum_topics_unapproved - ' . (int) $topics_moved_unapproved;
+		}
+		if ($topics_moved_softdeleted)
 		{
-			$sync_sql[$forum_id][]	= 'forum_topics = forum_topics - ' . (int) $topics_authed_removed;
+			$sync_sql[$to_forum_id][] = 'forum_topics_softdeleted = forum_topics_softdeleted + ' . (int) $topics_moved_softdeleted;
+			$sync_sql[$forum_id][] = 'forum_topics_softdeleted = forum_topics_softdeleted - ' . (int) $topics_moved_softdeleted;
 		}
 
 		$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_MOVED_SUCCESS' : 'TOPICS_MOVED_SUCCESS';
-- 
cgit v1.2.1


From 43e6b3a921d45150cd5c2a931e3e14758081f321 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 23 Oct 2012 15:30:52 +0200
Subject: [feature/soft-delete] Fix some more topic/post count handling

Only disapproving in queue is missing.

PHPBB3-9567
---
 phpBB/includes/functions_posting.php |  3 +--
 phpBB/includes/mcp/mcp_main.php      | 22 +++++++---------------
 phpBB/includes/mcp/mcp_queue.php     |  2 +-
 3 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 7962690ca8..473149a8ec 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1491,8 +1491,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 				// counting is fun! we only have to do sizeof($forum_ids) number of queries,
 				// even if the topic is moved back to where its shadow lives (we count how many times it is in a forum)
 				$sql = 'UPDATE ' . FORUMS_TABLE . '
-					SET forum_topics_real = forum_topics_real - ' . $topic_count . ',
-						forum_topics = forum_topics - ' . $topic_count . '
+					SET forum_topics = forum_topics - ' . $topic_count . '
 					WHERE forum_id = ' . $updated_forum;
 				$db->sql_query($sql);
 				update_post_information('forum', $updated_forum);
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 6245a1b32b..99b23e9db1 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -1097,23 +1097,15 @@ function mcp_fork_topic($topic_ids)
 		}
 
 		// Sync new topics, parent forums and board stats
-		sync('topic', 'topic_id', $new_topic_id_list);
-
-		$sync_sql = array();
-
-		$sync_sql[$to_forum_id][]	= 'forum_posts = forum_posts + ' . $total_posts;
-		$sync_sql[$to_forum_id][]	= 'forum_topics = forum_topics + ' . sizeof($new_topic_id_list);
-		$sync_sql[$to_forum_id][]	= 'forum_topics_real = forum_topics_real + ' . sizeof($new_topic_id_list);
-
-		foreach ($sync_sql as $forum_id_key => $array)
-		{
-			$sql = 'UPDATE ' . FORUMS_TABLE . '
-				SET ' . implode(', ', $array) . '
-				WHERE forum_id = ' . $forum_id_key;
-			$db->sql_query($sql);
-		}
+		$sql = 'UPDATE ' . FORUMS_TABLE . '
+			SET forum_posts = forum_posts + ' . $total_posts . ',
+				forum_topics = forum_topics + ' . sizeof($new_topic_id_list) . '
+			WHERE forum_id = ' . $to_forum_id;
+		$db->sql_query($sql);
 
+		sync('topic', 'topic_id', $new_topic_id_list);
 		sync('forum', 'forum_id', $to_forum_id);
+
 		set_config_count('num_topics', sizeof($new_topic_id_list), true);
 		set_config_count('num_posts', $total_posts, true);
 
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 3d36229ee7..c954edacb2 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -895,7 +895,7 @@ class mcp_queue
 			$disapprove_log = $disapprove_log_topics = $disapprove_log_posts = array();
 			$topic_replies_real = $post_disapprove_list = array();
 
-			// Build a list of posts to be unapproved and get the related topics real replies count
+			// Build a list of posts to be disapproved and get the related topics real replies count
 			foreach ($post_info as $post_id => $post_data)
 			{
 				$post_disapprove_list[$post_id] = $post_data['topic_id'];
-- 
cgit v1.2.1


From 727759c4d8bda3f1534b1e3366ce0eeeb27c887f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 23 Oct 2012 22:47:57 +0200
Subject: [feature/soft-delete] Fix disapproving posts/topics in queue

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_queue.php | 63 ++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 19 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index c954edacb2..cc6a90390a 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -52,33 +52,48 @@ class mcp_queue
 				$post_id_list = request_var('post_id_list', array(0));
 				$topic_id_list = request_var('topic_id_list', array(0));
 
-				if (!empty($post_id_list))
+				if ($action != 'disapprove')
 				{
-					if ($action != 'disapprove')
+					if (!empty($post_id_list))
 					{
 						$this->approve_posts($action, $post_id_list, 'queue', $mode);
 					}
+					else if (!empty($topic_id_list))
+					{
+						$this->approve_topics($action, $topic_id_list, 'queue', $mode);
+					}
 					else
 					{
-						$this->disapprove_posts($post_id_list, 'queue', $mode);
+						trigger_error('NO_POST_SELECTED');
 					}
 				}
-				else if (!empty($topic_id_list))
+				else
 				{
-					if ($action != 'disapprove')
+					if (!empty($topic_id_list))
 					{
-						$this->approve_topics($action, $topic_id_list, 'queue', $mode);
+						$sql = 'SELECT post_id
+							FROM ' . POSTS_TABLE . '
+							WHERE post_visibility = ' . ITEM_UNAPPROVED . '
+								AND ' . $db->sql_in_set('topic_id', $topic_id_list);
+						$result = $db->sql_query($sql);
+
+						$post_id_list = array();
+						while ($row = $db->sql_fetchrow($result))
+						{
+							$post_id_list[] = (int) $row['post_id'];
+						}
+						$db->sql_freeresult($result);
+					}
+
+					if (!empty($post_id_list))
+					{
+						$this->disapprove_posts($post_id_list, 'queue', $mode);
 					}
 					else
 					{
-						//@todo: $this->disapprove_posts($post_id_list, 'queue', $mode);
+						trigger_error('NO_POST_SELECTED');
 					}
 				}
-				else
-				{
-					trigger_error('NO_POST_SELECTED');
-				}
-
 			break;
 		}
 
@@ -827,7 +842,12 @@ class mcp_queue
 	}
 
 	/**
-	* Disapprove Post/Topic
+	* Disapprove Post
+	*
+	* @param $post_id_list	array	IDs of the posts to approve/restore
+	* @param $id			mixed	Category of the current active module
+	* @param $mode			string	Active module
+	* @return void
 	*/
 	function disapprove_posts($post_id_list, $id, $mode)
 	{
@@ -893,24 +913,29 @@ class mcp_queue
 		if (confirm_box(true))
 		{
 			$disapprove_log = $disapprove_log_topics = $disapprove_log_posts = array();
-			$topic_replies_real = $post_disapprove_list = array();
+			$topic_posts_unapproved = $post_disapprove_list = $topic_information = array();
 
 			// Build a list of posts to be disapproved and get the related topics real replies count
 			foreach ($post_info as $post_id => $post_data)
 			{
 				$post_disapprove_list[$post_id] = $post_data['topic_id'];
-				if (!isset($topic_replies_real[$post_data['topic_id']]))
+				if (!isset($topic_posts_unapproved[$post_data['topic_id']]))
 				{
-					$topic_replies_real[$post_data['topic_id']] = $post_data['topic_replies_real'];
+					$topic_information[$post_data['topic_id']] = $post_data;
+					$topic_posts_unapproved[$post_data['topic_id']] = 0;
 				}
+				$topic_posts_unapproved[$post_data['topic_id']]++;
 			}
 
 			// Now we build the log array
 			foreach ($post_disapprove_list as $post_id => $topic_id)
 			{
-				// If the count of disapproved posts for the topic is greater
-				// than topic's real replies count, the whole topic is disapproved/deleted
-				if (sizeof(array_keys($post_disapprove_list, $topic_id)) > $topic_replies_real[$topic_id])
+				// If the count of disapproved posts for the topic is equal
+				// to the number of unapproved posts in the topic, and there are no different
+				// posts, we disapprove the hole topic
+				if ($topic_information[$topic_id]['topic_posts'] == 0 &&
+					$topic_information[$topic_id]['topic_posts_softdeleted'] == 0 &&
+					$topic_information[$topic_id]['topic_posts_unapproved'] == $topic_posts_unapproved[$topic_id])
 				{
 					// Don't write the log more than once for every topic
 					if (!isset($disapprove_log_topics[$topic_id]))
-- 
cgit v1.2.1


From b3d5f2b4e42404610f5db8dda25859db942fd60e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 23 Oct 2012 23:37:25 +0200
Subject: [feature/soft-delete] Fix unit tests for delete_posts()

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 71 +++++++++++++++++++++++++++--------
 phpBB/includes/functions_admin.php    |  2 -
 2 files changed, 56 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 20e743a4c4..da7e6b9c4f 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -348,34 +348,75 @@ class phpbb_content_visibility
 		// Update the topic's reply count and the forum's post count
 		if ($update_topic_postcount)
 		{
-			$num_posts = 0;
+			$cur_posts = $cur_unapproved_posts = $cur_softdeleted_posts = 0;
 			foreach ($postcount_visibility as $post_visibility => $visibility_posts)
 			{
-				// If we soft delete, we need to substract approved posts from the counters ...
-				if ($post_visibility == ITEM_APPROVED && $visibility == ITEM_DELETED)
+				// We need to substract the posts from the counters ...
+				if ($post_visibility == ITEM_APPROVED)
 				{
-					$num_posts += $visibility_posts;
+					$cur_posts += $visibility_posts;
 				}
-				// ... and when we approve/restore, all others.
-				else if ($post_visibility != ITEM_APPROVED && $visibility == ITEM_APPROVED)
+				else if ($post_visibility == ITEM_UNAPPROVED)
 				{
-					$num_posts += $visibility_posts;
+					$cur_unapproved_posts += $visibility_posts;
+				}
+				else if ($post_visibility == ITEM_DELETED)
+				{
+					$cur_softdeleted_posts += $visibility_posts;
+				}
+			}
+
+			$sql_ary = array();
+			if ($visibility == ITEM_DELETED)
+			{
+				if ($cur_posts)
+				{
+					$sql_ary['posts'] = ' - ' . $cur_posts;
+				}
+				if ($cur_unapproved_posts)
+				{
+					$sql_ary['posts_unapproved'] = ' - ' . $cur_unapproved_posts;
+				}
+				if ($cur_posts + $cur_unapproved_posts)
+				{
+					$sql_ary['posts_softdeleted'] = ' + ' . ($cur_posts + $cur_unapproved_posts);
+				}
+			}
+			else
+			{
+				if ($cur_unapproved_posts)
+				{
+					$sql_ary['posts_unapproved'] = ' - ' . $cur_unapproved_posts;
+				}
+				if ($cur_softdeleted_posts)
+				{
+					$sql_ary['posts_softdeleted'] = ' - ' . $cur_softdeleted_posts;
+				}
+				if ($cur_posts + $cur_unapproved_posts)
+				{
+					$sql_ary['posts'] = ' + ' . ($cur_softdeleted_posts + $cur_unapproved_posts);
 				}
 			}
 
-			if ($num_posts)
+			if (sizeof($sql_ary))
 			{
-				$sql_num_posts = (($visibility == ITEM_DELETED) ? ' - ' : ' + ') . $num_posts;
+				$topic_sql = $forum_sql = array();
+
+				foreach ($sql_ary as $field => $value_change)
+				{
+					$topic_sql[] = 'topic_' . $field . ' = topic_' . $field . $value_change;
+					$forum_sql[] = 'forum_' . $field . ' = forum_' . $field . $value_change;
+				}
 
 				// Update the number for replies and posts
-				$sql = 'UPDATE ' . TOPICS_TABLE . "
-					SET topic_replies = topic_replies $sql_num_posts
-					WHERE topic_id = $topic_id";
+				$sql = 'UPDATE ' . TOPICS_TABLE . '
+					SET ' . implode(', ', $topic_sql) . '
+					WHERE topic_id = ' . $topic_id;
 				$db->sql_query($sql);
 
-				$sql = 'UPDATE ' . FORUMS_TABLE . "
-					SET forum_posts = forum_posts $sql_num_posts
-					WHERE forum_id = $forum_id";
+				$sql = 'UPDATE ' . FORUMS_TABLE . '
+					SET ' . implode(', ', $forum_sql) . '
+					WHERE forum_id = ' . $forum_id;
 				$db->sql_query($sql);
 			}
 		}
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index a38fa2a70f..e2a133270b 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1729,7 +1729,6 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 					$sql = 'SELECT SUM(t.topic_posts) AS forum_posts, SUM(t.topic_posts_unapproved) AS forum_posts_unapproved, SUM(t.topic_posts_softdeleted) AS forum_posts_softdeleted
 						FROM ' . TOPICS_TABLE . ' t
 						WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
-							AND t.topic_visibility = ' . ITEM_APPROVED . '
 							AND t.topic_status <> ' . ITEM_MOVED;
 				}
 				else
@@ -1737,7 +1736,6 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 					$sql = 'SELECT t.forum_id, SUM(t.topic_posts) AS forum_posts, SUM(t.topic_posts_unapproved) AS forum_posts_unapproved, SUM(t.topic_posts_softdeleted) AS forum_posts_softdeleted
 						FROM ' . TOPICS_TABLE . ' t
 						WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
-							AND t.topic_visibility = ' . ITEM_APPROVED . '
 							AND t.topic_status <> ' . ITEM_MOVED . '
 						GROUP BY t.forum_id';
 				}
-- 
cgit v1.2.1


From f21fd469bca3e5c3504a773a96d1a8fab6c374a7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 24 Oct 2012 19:52:16 +0200
Subject: [feature/soft-delete] Handle soft deleting via Delete Icon

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index da7e6b9c4f..6dffe73114 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -225,6 +225,7 @@ class phpbb_content_visibility
 			{
 				$where_sql .= ' AND post_visibility = ' . (int) $limit_visibility;
 			}
+
 			if ($limit_delete_time !== false)
 			{
 				$where_sql .= ' AND post_delete_time = ' . (int) $limit_delete_time;
-- 
cgit v1.2.1


From 4a8d38aab13099fdb4fb7e2a7b72cff1c05fda9c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 27 Oct 2012 17:12:34 +0200
Subject: [feature/soft-delete] Allow soft deleting/restoring topics via
 quickmoderation

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_main.php | 137 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 129 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 99b23e9db1..6756e19078 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -33,7 +33,7 @@ class mcp_main
 	function main($id, $mode)
 	{
 		global $auth, $db, $user, $template, $action;
-		global $config, $phpbb_root_path, $phpEx;
+		global $config, $phpbb_root_path, $phpEx, $request;
 
 		$quickmod = ($mode == 'quickmod') ? true : false;
 
@@ -108,14 +108,18 @@ class mcp_main
 			case 'delete_topic':
 				$user->add_lang('viewtopic');
 
+				// f parameter is not reliable for permission usage, however we just use it to decide
+				// which permission we will check later on. So if it is manipulated, we will still catch it later on.
+				$forum_id = request_var('f', 0);
 				$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
+				$soft_delete = (($auth->acl_get('m_softdelete', $forum_id) && $request->is_set_post('soft_delete')) || !$auth->acl_get('m_delete', $forum_id)) ? true : false;
 
 				if (!sizeof($topic_ids))
 				{
 					trigger_error('NO_TOPIC_SELECTED');
 				}
 
-				mcp_delete_topic($topic_ids);
+				mcp_delete_topic($topic_ids, $soft_delete, ($soft_delete) ? request_var('delete_reason', '', true) : '');
 			break;
 
 			case 'delete_post':
@@ -130,6 +134,19 @@ class mcp_main
 
 				mcp_delete_post($post_ids);
 			break;
+
+			case 'restore_topic':
+				$user->add_lang('posting');
+
+				$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
+
+				if (!sizeof($topic_ids))
+				{
+					trigger_error('NO_TOPIC_SELECTED');
+				}
+
+				mcp_restore_topic($topic_ids);
+			break;
 		}
 
 		switch ($mode)
@@ -628,10 +645,82 @@ function mcp_move_topic($topic_ids)
 	}
 }
 
+/**
+* Restore Topics
+*/
+function mcp_restore_topic($topic_ids)
+{
+	global $auth, $user, $db, $phpEx, $phpbb_root_path;
+
+	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_approve')))
+	{
+		return;
+	}
+
+	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
+	$forum_id = request_var('f', 0);
+
+	$s_hidden_fields = build_hidden_fields(array(
+		'topic_id_list'	=> $topic_ids,
+		'f'				=> $forum_id,
+		'action'		=> 'restore_topic',
+		'redirect'		=> $redirect,
+	));
+	$success_msg = '';
+
+	if (confirm_box(true))
+	{
+		$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_RESTORED_SUCCESS' : 'TOPICS_RESTORED_SUCCESS';
+
+		$data = get_topic_data($topic_ids);
+
+		foreach ($data as $topic_id => $row)
+		{
+			$return = phpbb_content_visibility::set_topic_visibility(ITEM_APPROVED, $topic_id, $row['forum_id'], $user->data['user_id'], time(), '');
+			if (!empty($return))
+			{
+				add_log('mod', $row['forum_id'], $topic_id, 'LOG_RESTORE_TOPIC', $row['topic_title'], $row['topic_first_poster_name']);
+			}
+		}
+	}
+	else
+	{
+		confirm_box(false, (sizeof($topic_ids) == 1) ? 'RESTORE_TOPIC' : 'RESTORE_TOPICS', $s_hidden_fields);
+	}
+
+	$topic_id = request_var('t', 0);
+	if (!isset($_REQUEST['quickmod']))
+	{
+		$redirect = request_var('redirect', "index.$phpEx");
+		$redirect = reapply_sid($redirect);
+		$redirect_message = 'PAGE';
+	}
+	else if ($topic_id)
+	{
+		$redirect = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $topic_id);
+		$redirect_message = 'TOPIC';
+	}
+	else
+	{
+		$redirect = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id);
+		$redirect_message = 'FORUM';
+	}
+
+	if (!$success_msg)
+	{
+		redirect($redirect);
+	}
+	else
+	{
+		meta_refresh(3, $redirect);
+		trigger_error($user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_' . $redirect_message], '<a href="' . $redirect . '">', '</a>'));
+	}
+}
+
 /**
 * Delete Topics
 */
-function mcp_delete_topic($topic_ids)
+function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '')
 {
 	global $auth, $user, $db, $phpEx, $phpbb_root_path;
 
@@ -647,8 +736,8 @@ function mcp_delete_topic($topic_ids)
 		'topic_id_list'	=> $topic_ids,
 		'f'				=> $forum_id,
 		'action'		=> 'delete_topic',
-		'redirect'		=> $redirect)
-	);
+		'redirect'		=> $redirect,
+	));
 	$success_msg = '';
 
 	if (confirm_box(true))
@@ -665,23 +754,55 @@ function mcp_delete_topic($topic_ids)
 			}
 			else
 			{
-				add_log('mod', $row['forum_id'], $topic_id, 'LOG_DELETE_TOPIC', $row['topic_title'], $row['topic_first_poster_name']);
+				// Only soft delete non-shadow topics
+				if ($is_soft)
+				{
+					$return = phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $row['forum_id'], $user->data['user_id'], time(), $soft_delete_reason);
+					if (!empty($return))
+					{
+						add_log('mod', $row['forum_id'], $topic_id, 'LOG_SOFTDELETE_TOPIC', $row['topic_title'], $row['topic_first_poster_name']);
+					}
+				}
+				else
+				{
+					add_log('mod', $row['forum_id'], $topic_id, 'LOG_DELETE_TOPIC', $row['topic_title'], $row['topic_first_poster_name']);
+				}
 			}
 		}
 
-		$return = delete_topics('topic_id', $topic_ids);
+		if (!$is_soft)
+		{
+			$return = delete_topics('topic_id', $topic_ids);
+		}
 	}
 	else
 	{
-		confirm_box(false, (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS', $s_hidden_fields);
+		global $template;
+
+		$user->add_lang('posting');
+
+		$template->assign_vars(array(
+			'S_TOPIC_MODE'			=> true,
+			'S_ALLOWED_DELETE'		=> $auth->acl_get('m_delete', $forum_id),
+			'S_ALLOWED_SOFTDELETE'	=> $auth->acl_get('m_softdelete', $forum_id),
+			'S_DELETE_REASON'		=> $auth->acl_get('m_softdelete', $forum_id),
+		));
+
+		confirm_box(false, (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS', $s_hidden_fields, 'posting_delete_post_body.html');
 	}
 
+	$topic_id = request_var('t', 0);
 	if (!isset($_REQUEST['quickmod']))
 	{
 		$redirect = request_var('redirect', "index.$phpEx");
 		$redirect = reapply_sid($redirect);
 		$redirect_message = 'PAGE';
 	}
+	else if ($is_soft && $topic_id)
+	{
+		$redirect = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $topic_id);
+		$redirect_message = 'TOPIC';
+	}
 	else
 	{
 		$redirect = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id);
-- 
cgit v1.2.1


From ed602857e6c5aee7b9958a3dbc9285c309b33420 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 28 Oct 2012 22:37:00 +0100
Subject: [feature/soft-delete] Correctly increase topics post counts when
 posting

PHPBB3-9567
---
 phpBB/includes/functions_posting.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 473149a8ec..807b178a4c 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1879,6 +1879,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				'topic_last_view_time'		=> $current_time,
 				'forum_id'					=> $data['forum_id'],
 				'icon_id'					=> $data['icon_id'],
+				'topic_posts'				=> ($post_visibility == ITEM_APPROVED) ? 1 : 0,
+				'topic_posts_softdeleted'	=> ($post_visibility != ITEM_APPROVED) ? 1 : 0,
 				'topic_visibility'			=> $post_visibility,
 				'topic_delete_user'			=> ($post_visibility != ITEM_APPROVED) ? (int) $user->data['user_id'] : 0,
 				'topic_title'				=> $subject,
-- 
cgit v1.2.1


From e549b7663da47d7518b93074e513c7e1d034bf52 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Oct 2012 18:09:20 -0500
Subject: [ticket/11103] Set basic notifications to be enabled by default

Now, if there is no row for the user in the user_notifications table,
the user will receive basic notifications. If the user wishes to not
receive notifications, a row must be added with notify = 0.

For other methods besides the basic (e.g. email, jabber) a row must
still be added with notify = 1 for them to receive notifications

PHPBB3-11103
---
 phpBB/includes/notification/manager.php            | 131 +++++++++++++++++----
 phpBB/includes/notification/type/approve_post.php  |  27 +----
 phpBB/includes/notification/type/approve_topic.php |  27 +----
 phpBB/includes/notification/type/base.php          |  54 +++++++--
 phpBB/includes/notification/type/bookmark.php      |  23 +---
 phpBB/includes/notification/type/pm.php            |  28 +----
 phpBB/includes/notification/type/post.php          |  23 +---
 phpBB/includes/notification/type/post_in_queue.php |  27 +----
 phpBB/includes/notification/type/quote.php         |  23 +---
 phpBB/includes/notification/type/report_pm.php     |  27 +----
 phpBB/includes/notification/type/topic.php         |  29 +----
 .../includes/notification/type/topic_in_queue.php  |  27 +----
 phpBB/includes/ucp/ucp_notifications.php           |  25 ++--
 13 files changed, 187 insertions(+), 284 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 75155c5dc3..3e816108f4 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -545,41 +545,57 @@ class phpbb_notification_manager
 	}
 
 	/**
-	* Get subscriptions
+	* Get global subscriptions (item_id = 0)
 	*
 	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
-	* @param bool $only_global True to select only global subscription options (item_id = 0)
 	*
 	* @return array Subscriptions
 	*/
-	public function get_subscriptions($user_id = false, $only_global = false)
+	public function get_global_subscriptions($user_id = false)
 	{
 		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
 		$subscriptions = array();
 
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . '
-			WHERE user_id = ' . (int) $user_id .
-				(($only_global) ? ' AND item_id = 0' : '');
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
+		foreach ($this->get_subscription_types() as $group_name => $types)
 		{
-			if ($only_global)
+			foreach ($types as $id => $type)
 			{
-				if (!isset($subscriptions[$row['item_type']]))
+				$sql = 'SELECT method, notify
+					FROM ' . USER_NOTIFICATIONS_TABLE . '
+					WHERE user_id = ' . (int) $user_id . "
+						AND item_type = '" . $this->db->sql_escape($id) . "'
+						AND item_id = 0";
+				$result = $this->db->sql_query($sql);
+
+				$row = $this->db->sql_fetchrow($result);
+				if (!$row)
 				{
-					$subscriptions[$row['item_type']] = array();
+					// No rows at all, default to ''
+					$subscriptions[$id] = array('');
 				}
+				else
+				{
+					do
+					{
+						if (!$row['notify'])
+						{
+							continue;
+						}
 
-				$subscriptions[$row['item_type']][] = $row['method'];
-			}
-			else
-			{
-				$subscriptions[] = $row;
+						if (!isset($subscriptions[$id]))
+						{
+							$subscriptions[$id] = array();
+						}
+
+						$subscriptions[$id][] = $row['method'];
+					}
+					while ($row = $this->db->sql_fetchrow($result));
+				}
+
+				$this->db->sql_freeresult($result);
 			}
 		}
-		$this->db->sql_freeresult($result);
 
 		return $subscriptions;
 	}
@@ -594,16 +610,45 @@ class phpbb_notification_manager
 	*/
 	public function add_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
 	{
+		if ($method !== '')
+		{
+			$this->add_subscription($item_type, $item_type, '', $user_id);
+		}
+
 		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
-		$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
-			$this->db->sql_build_array('INSERT', array(
-				'item_type'		=> $item_type,
-				'item_id'		=> (int) $item_id,
-				'user_id'		=> (int) $user_id,
-				'method'		=> $method,
-			));
+		$sql = 'SELECT notify
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id . '
+				AND user_id = ' .(int) $user_id . "
+				AND method = '" . $this->db->sql_escape($method) . "'";
 		$this->db->sql_query($sql);
+		$current = $this->db->sql_fetchfield('notify');
+		$this->db->sql_freeresult();
+
+		if ($current === false)
+		{
+			$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
+				$this->db->sql_build_array('INSERT', array(
+					'item_type'		=> $item_type,
+					'item_id'		=> (int) $item_id,
+					'user_id'		=> (int) $user_id,
+					'method'		=> $method,
+					'notify'		=> 1,
+				));
+			$this->db->sql_query($sql);
+		}
+		else if (!$current)
+		{
+			$sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . "
+				SET notify = 1
+				WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+					AND item_id = " . (int) $item_id . '
+					AND user_id = ' .(int) $user_id . "
+					AND method = '" . $this->db->sql_escape($method) . "'";
+			$this->db->sql_query($sql);
+		}
 	}
 
 	/**
@@ -618,12 +663,46 @@ class phpbb_notification_manager
 	{
 		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
-		$sql = 'DELETE FROM ' . USER_NOTIFICATIONS_TABLE . "
+		// If no method, make sure that no other notification methods for this item are selected before deleting
+		if ($method === '')
+		{
+			$sql = 'SELECT COUNT(*) as count
+				FROM ' . USER_NOTIFICATIONS_TABLE . "
+				WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+					AND item_id = " . (int) $item_id . '
+					AND user_id = ' .(int) $user_id . "
+					AND method <> ''
+					AND notify = 1";
+			$this->db->sql_query($sql);
+			$count = $this->db->sql_fetchfield('count');
+			$this->db->sql_freeresult();
+
+			if ($count)
+			{
+				return;
+			}
+		}
+
+		$sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . "
+			SET notify = 0
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 				AND item_id = " . (int) $item_id . '
 				AND user_id = ' .(int) $user_id . "
 				AND method = '" . $this->db->sql_escape($method) . "'";
 		$this->db->sql_query($sql);
+
+		if (!$this->db->sql_affectedrows())
+		{
+			$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
+				$this->db->sql_build_array('INSERT', array(
+					'item_type'		=> $item_type,
+					'item_id'		=> (int) $item_id,
+					'user_id'		=> (int) $user_id,
+					'method'		=> $method,
+					'notify'		=> 0,
+				));
+			$this->db->sql_query($sql);
+		}
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index e08039baa9..26f56e6333 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -73,30 +73,9 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 			return array();
 		}
 
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$this->db->sql_freeresult($result);
-
-		return $notify_users;
+		return $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], array_merge($options, array(
+			'item_type'		=> self::$notification_option['id'],
+		)));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 6d3f8e60ae..78837f643d 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -73,30 +73,9 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 			return array();
 		}
 
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$this->db->sql_freeresult($result);
-
-		return $notify_users;
+		return $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], array_merge($options, array(
+			'item_type'		=> self::$notification_option['id'],
+		)));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index df04dc2a49..c2c52fe8e9 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -310,26 +310,54 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/**
 	* Find the users who want to receive notifications (helper)
 	*
-	* @param array $item_id The item_id to search for
+	* @param array $user_ids User IDs to check if they want to receive notifications
+	* 		(Bool False to check all users besides anonymous and bots (USER_IGNORE))
 	*
 	* @return array
 	*/
-	protected function _find_users_for_notification($item_id, $options)
+	protected function check_user_notification_options($user_ids = false, $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
+			'item_type'			=> get_class($this),
+			'item_id'			=> 0, // Global by default
 		), $options);
 
-		$rowset = array();
+		if ($user_ids === false)
+		{
+			$user_ids = array();
+
+			$sql = 'SELECT user_id
+				FROM ' . USERS_TABLE . '
+				WHERE user_id <> ' . ANONYMOUS . '
+					AND user_type <> ' . USER_IGNORE;
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$user_ids[] = $row['user_id'];
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		if (empty($user_ids))
+		{
+			return array();
+		}
+
+		$rowset = $resulting_user_ids = array();
 
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . get_class($this) . "'
-				AND item_id = " . (int) $item_id;
+		$sql = 'SELECT user_id, method, notify
+			FROM ' . USER_NOTIFICATIONS_TABLE . '
+			WHERE ' . $this->db->sql_in_set('user_id', $user_ids) . "
+				AND item_type = '" . $this->db->sql_escape($options['item_type']) . "'
+				AND item_id = " . (int) $options['item_id'];
 		$result = $this->db->sql_query($sql);
+
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
+			$resulting_user_ids[] = $row['user_id'];
+
+			if (!$row['notify'] || (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']])))
 			{
 				continue;
 			}
@@ -341,8 +369,18 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 			$rowset[$row['user_id']][] = $row['method'];
 		}
+
 		$this->db->sql_freeresult($result);
 
+		foreach ($user_ids as $user_id)
+		{
+			if (!in_array($user_id, $resulting_user_ids) && !isset($options['ignore_users'][$user_id]))
+			{
+				// No rows at all for this user, default to ''
+				$rowset[$user_id] = array('');
+			}
+		}
+
 		return $rowset;
 	}
 
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index 4bbe9bbbf4..6fe00d9dd0 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -87,28 +87,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 			return array();
 		}
 
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . get_class($this) . "'
-				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$this->db->sql_freeresult($result);
+		$notify_users = $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], $options);
 
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index 697feca962..a60d022a12 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -80,33 +80,11 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 			return array();
 		}
 
-		$this->notification_manager->load_users(array_keys($pm['recipients']));
-
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . get_class($this) . "'
-				AND " . $this->db->sql_in_set('user_id', array_keys($pm['recipients'])) . '
-				AND user_id <> ' . $pm['from_user_id'];
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
+		unset($pm['recipients'][$pm['from_user_id']]);
 
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$this->db->sql_freeresult($result);
+		$this->notification_manager->load_users(array_keys($pm['recipients']));
 
-		return $notify_users;
+		return $this->check_user_notification_options(array_keys($pm['recipients']), $options);
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 11202ee6e9..22fb5cd980 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -108,28 +108,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			return array();
 		}
 
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . get_class($this) . "'
-				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$this->db->sql_freeresult($result);
+		$notify_users = $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], $options);
 
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index d0f5f22e0f..e9e7c6120e 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -82,30 +82,9 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 
 		$auth_approve[$post['forum_id']] = array_unique(array_merge($auth_approve[$post['forum_id']], $auth_approve[0]));
 
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $this->db->sql_in_set('user_id', $auth_approve[$post['forum_id']][$this->permission]);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$this->db->sql_freeresult($result);
-
-		return $notify_users;
+		return $this->check_user_notification_options($auth_approve[$post['forum_id']][$this->permission], array_merge($options, array(
+			'item_type'		=> self::$notification_option['id'],
+		)));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 47337b1cda..c9f0f923c1 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -106,28 +106,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 			return array();
 		}
 
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . get_class($this) . "'
-				AND " . $this->db->sql_in_set('user_id', $auth_read[$post['forum_id']]['f_read']);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$this->db->sql_freeresult($result);
+		$notify_users = $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], $options);
 
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index b2f514d483..7cf97402cc 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -96,31 +96,14 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 			return array();
 		}
 
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $this->db->sql_in_set('user_id', $auth_approve[$post['forum_id']][$this->permission]) . '
-				AND user_id <> ' . $this->user->data['user_id'];
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
+		if (($key = array_search($this->user->data['user_id'], $auth_approve[$post['forum_id']][$this->permission])))
 		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
+			unset($auth_approve[$post['forum_id']][$this->permission][$key]);
 		}
-		$this->db->sql_freeresult($result);
 
-		return $notify_users;
+		return $this->check_user_notification_options($auth_approve[$post['forum_id']][$this->permission], array_merge($options, array(
+			'item_type'		=> self::$notification_option['id'],
+		)));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 99f7b5bee4..fbee650ad8 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -82,10 +82,6 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 			'ignore_users'			=> array(),
 		), $options);
 
-		// Let's continue to use the phpBB subscriptions system, at least for now.
-		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
-		//$users = parent::_find_users_for_notification($phpbb_container, $topic['forum_id']);
-
 		$users = array();
 
 		$sql = 'SELECT user_id
@@ -112,30 +108,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 			return array();
 		}
 
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . get_class($this) . "'
-				AND " . $this->db->sql_in_set('user_id', $auth_read[$topic['forum_id']]['f_read']);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$this->db->sql_freeresult($result);
-
-		return $notify_users;
+		return $this->check_user_notification_options($auth_read[$topic['forum_id']]['f_read'], $options);
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index f99fde4c75..66aecb0d05 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -75,30 +75,9 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 
 		$auth_approve[$topic['forum_id']] = array_unique(array_merge($auth_approve[$topic['forum_id']], $auth_approve[0]));
 
-		$notify_users = array();
-
-		$sql = 'SELECT *
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . self::$notification_option['id'] . "'
-				AND " . $this->db->sql_in_set('user_id', $auth_approve[$topic['forum_id']]['m_approve']);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']]))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$notify_users[$row['user_id']] = array();
-			}
-
-			$notify_users[$row['user_id']][] = $row['method'];
-		}
-		$this->db->sql_freeresult($result);
-
-		return $notify_users;
+		return $this->check_user_notification_options($auth_approve[$topic['forum_id']]['m_approve'], array_merge($options, array(
+			'item_type'		=> self::$notification_option['id'],
+		)));
 	}
 
 	/**
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 8749c88ba1..8810ac9ce6 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -32,7 +32,7 @@ class ucp_notifications
 		switch ($mode)
 		{
 			case 'notification_options':
-				$subscriptions = $phpbb_notifications->get_subscriptions(false, true);
+				$subscriptions = $phpbb_notifications->get_global_subscriptions(false);
 
 				// Add/remove subscriptions
 				if ($request->is_set_post('submit'))
@@ -48,15 +48,6 @@ class ucp_notifications
 					{
 						foreach($subscription_types as $type => $data)
 						{
-							if ($request->is_set_post($type . '_notification') && !isset($subscriptions[$type]))
-							{
-								$phpbb_notifications->add_subscription($type);
-							}
-							else if (!$request->is_set_post($type . '_notification') && isset($subscriptions[$type]))
-							{
-								$phpbb_notifications->delete_subscription($type);
-							}
-
 							foreach($notification_methods as $method)
 							{
 								if ($request->is_set_post($type . '_' . $method) && (!isset($subscriptions[$type]) || !in_array($method, $subscriptions[$type])))
@@ -68,6 +59,15 @@ class ucp_notifications
 									$phpbb_notifications->delete_subscription($type, 0, $method);
 								}
 							}
+
+							if ($request->is_set_post($type . '_notification') && !isset($subscriptions[$type]))
+							{
+								$phpbb_notifications->add_subscription($type);
+							}
+							else if (!$request->is_set_post($type . '_notification') && isset($subscriptions[$type]))
+							{
+								$phpbb_notifications->delete_subscription($type);
+							}
 						}
 					}
 
@@ -78,7 +78,7 @@ class ucp_notifications
 
 				$this->output_notification_methods('notification_methods', $phpbb_notifications, $template, $user);
 
-				$this->output_notification_types('notification_types', $phpbb_notifications, $template, $user);
+				$this->output_notification_types($subscriptions, 'notification_types', $phpbb_notifications, $template, $user);
 
 				$this->tpl_name = 'ucp_notifications';
 				$this->page_title = 'UCP_NOTIFICATION_OPTIONS';
@@ -165,10 +165,9 @@ class ucp_notifications
 	* @param phpbb_template $template
 	* @param phpbb_user $user
 	*/
-	public function output_notification_types($block = 'notification_types', phpbb_notification_manager $phpbb_notifications, phpbb_template $template, phpbb_user $user)
+	public function output_notification_types($subscriptions, $block = 'notification_types', phpbb_notification_manager $phpbb_notifications, phpbb_template $template, phpbb_user $user)
 	{
 		$notification_methods = $phpbb_notifications->get_subscription_methods();
-		$subscriptions = $phpbb_notifications->get_subscriptions(false, true);
 
 		foreach($phpbb_notifications->get_subscription_types() as $group => $subscription_types)
 		{
-- 
cgit v1.2.1


From ecf6f1eb8ca34da43b14b2da642cc7f1aa397d36 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Oct 2012 18:15:01 -0500
Subject: [ticket/11103] Code cleanup

PHPBB3-11103
---
 phpBB/includes/notification/manager.php            |  2 +-
 phpBB/includes/notification/type/approve_post.php  | 32 ----------------------
 phpBB/includes/notification/type/approve_topic.php | 30 --------------------
 3 files changed, 1 insertion(+), 63 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 3e816108f4..ffdce2032d 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -231,7 +231,7 @@ class phpbb_notification_manager
 			return;
 		}
 
-		$time = ($time) ?: time();
+		$time = ($time !== false) ? $time : time();
 
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
 			SET unread = 0
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index 26f56e6333..60b66fd4f6 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -78,38 +78,6 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 		)));
 	}
 
-	/**
-	* Pre create insert array function
-	* This allows you to perform certain actions, like run a query
-	* and load data, before create_insert_array() is run. The data
-	* returned from this function will be sent to create_insert_array().
-	*
-	* @param array $post Post data from submit_post
-	* @param array $notify_users Notify users list
-	* 		Formated from find_users_for_notification()
-	* @return array Whatever you want to send to create_insert_array().
-	*/
-	public function pre_create_insert_array($post, $notify_users)
-	{
-		/*if (!sizeof($notify_users))
-		{
-			return array();
-		}
-
-		// Mark the topic unread before the post
-		$sql = 'UPDATE ' . TOPICS_TRACK_TABLE . '
-			SET mark_time = ' . (int) ($post['post_time'] - 1) . '
-			WHERE topic_id = ' . (int) $post['topic_id'] . '
-				AND ' . $this->db->sql_in_set('user_id', array_keys($notify_users));
-		$this->db->sql_query($sql);*/
-
-		// In the parent class, this is used to check if the post is already
-		// read by a user and marks the notification read if it was marked read.
-		// Returning an empty array in effect, forces it to be marked as unread
-		// (and also saves a query)
-		return array();
-	}
-
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 78837f643d..4fd247a789 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -78,36 +78,6 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 		)));
 	}
 
-	/**
-	* Pre create insert array function
-	* This allows you to perform certain actions, like run a query
-	* and load data, before create_insert_array() is run. The data
-	* returned from this function will be sent to create_insert_array().
-	*
-	* @param array $post Post data from submit_post
-	* @param array $notify_users Notify users list
-	* 		Formated from find_users_for_notification()
-	* @return array Whatever you want to send to create_insert_array().
-	*/
-	public function pre_create_insert_array($post, $notify_users)
-	{
-		/*if (!sizeof($notify_users))
-		{
-			return array();
-		}
-
-		// Mark the topic unread
-		$sql = 'DELETE FROM ' . TOPICS_TRACK_TABLE . '
-			WHERE topic_id = ' . (int) $post['topic_id'] . '
-				AND ' . $this->db->sql_in_set('user_id', array_keys($notify_users));
-		$this->db->sql_query($sql*/
-
-		// In the parent class, this is used to check if the post is already
-		// read by a user and marks the notification read if it was marked read.
-		// Returning an empty array in effect, forces it to be marked as unread
-		return array();
-	}
-
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
-- 
cgit v1.2.1


From a811e65147db4d5c98914d201f2e4478f31f64fc Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Oct 2012 18:18:33 -0500
Subject: [ticket/11103] Revert an overwrite that occured on merging from
 develop

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 02c31eb6cc..4df199d72d 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -296,13 +296,15 @@ function posting_gen_topic_icons($mode, $icon_id)
 
 	if (sizeof($icons))
 	{
+		$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
+
 		foreach ($icons as $id => $data)
 		{
 			if ($data['display'])
 			{
 				$template->assign_block_vars('topic_icon', array(
 					'ICON_ID'		=> $id,
-					'ICON_IMG'		=> $phpbb_root_path . $config['icons_path'] . '/' . $data['img'],
+					'ICON_IMG'		=> $root_path . $config['icons_path'] . '/' . $data['img'],
 					'ICON_WIDTH'	=> $data['width'],
 					'ICON_HEIGHT'	=> $data['height'],
 
-- 
cgit v1.2.1


From b60ae30b02c411db5ce3711f25e8f43a019ef9ec Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Oct 2012 18:20:07 -0500
Subject: [ticket/11103] More cleanup

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index ffdce2032d..b8c9c9742e 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -262,7 +262,7 @@ class phpbb_notification_manager
 			return;
 		}
 
-		$time = ($time) ?: time();
+		$time = ($time !== false) ? $time : time();
 
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
 			SET unread = 0
@@ -281,7 +281,7 @@ class phpbb_notification_manager
 	*/
 	public function mark_notifications_read_by_id($notification_id, $time = false)
 	{
-		$time = ($time) ?: time();
+		$time = ($time !== false) ? $time : time();
 
 		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
 			SET unread = 0
-- 
cgit v1.2.1


From b1ba7b27ad611d674ac54f97ea602ea95c8955b0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Oct 2012 18:35:54 -0500
Subject: [ticket/11103] _get_avatar -> get_user_avatar

PHPBB3-11103
---
 phpBB/includes/notification/type/base.php               | 2 +-
 phpBB/includes/notification/type/pm.php                 | 2 +-
 phpBB/includes/notification/type/post.php               | 2 +-
 phpBB/includes/notification/type/report_pm.php          | 2 +-
 phpBB/includes/notification/type/report_pm_closed.php   | 2 +-
 phpBB/includes/notification/type/report_post.php        | 2 +-
 phpBB/includes/notification/type/report_post_closed.php | 2 +-
 phpBB/includes/notification/type/topic.php              | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index c2c52fe8e9..fdd8a5b9cb 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -390,7 +390,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* @param int $user_id
 	* @return string
 	*/
-	protected function _get_avatar($user_id)
+	protected function get_user_avatar($user_id)
 	{
 		$user = $this->notification_manager->get_user($user_id);
 
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index a60d022a12..1c38002892 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -92,7 +92,7 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 	*/
 	public function get_avatar()
 	{
-		return $this->_get_avatar($this->get_data('from_user_id'));
+		return $this->get_user_avatar($this->get_data('from_user_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 22fb5cd980..b1a3ee9a26 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -140,7 +140,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 	*/
 	public function get_avatar()
 	{
-		return $this->_get_avatar($this->get_data('poster_id'));
+		return $this->get_user_avatar($this->get_data('poster_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 7cf97402cc..63d153bd27 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -187,7 +187,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	*/
 	public function get_avatar()
 	{
-		return $this->_get_avatar($this->get_data('reporter_id'));
+		return $this->get_user_avatar($this->get_data('reporter_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index 46bca8d831..c86fe77b0e 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -112,7 +112,7 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
 	*/
 	public function get_avatar()
 	{
-		return $this->_get_avatar($this->get_data('closer_id'));
+		return $this->get_user_avatar($this->get_data('closer_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index 2a493d7f2a..26dd9512bf 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -154,7 +154,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	*/
 	public function get_avatar()
 	{
-		return $this->_get_avatar($this->get_data('reporter_id'));
+		return $this->get_user_avatar($this->get_data('reporter_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index 34b69dbe47..7454760dc0 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -112,7 +112,7 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
 	*/
 	public function get_avatar()
 	{
-		return $this->_get_avatar($this->get_data('closer_id'));
+		return $this->get_user_avatar($this->get_data('closer_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index fbee650ad8..db268fa53e 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -116,7 +116,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 	*/
 	public function get_avatar()
 	{
-		return $this->_get_avatar($this->get_data('poster_id'));
+		return $this->get_user_avatar($this->get_data('poster_id'));
 	}
 
 	/**
-- 
cgit v1.2.1


From 6c213bd5fa4f93875e7771edbf519990580286c4 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Oct 2012 23:20:59 -0500
Subject: [ticket/11103] Make sure post/topic approved notifications are always
 unread

PHPBB3-11103
---
 phpBB/includes/notification/type/approve_post.php  | 20 ++++++++++++++++++++
 phpBB/includes/notification/type/approve_topic.php | 20 ++++++++++++++++++++
 2 files changed, 40 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index 60b66fd4f6..d79bc6ae13 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -78,6 +78,26 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 		)));
 	}
 
+	/**
+	* Pre create insert array function
+	* This allows you to perform certain actions, like run a query
+	* and load data, before create_insert_array() is run. The data
+	* returned from this function will be sent to create_insert_array().
+	*
+	* @param array $post Post data from submit_post
+	* @param array $notify_users Notify users list
+	* 		Formated from find_users_for_notification()
+	* @return array Whatever you want to send to create_insert_array().
+	*/
+	public function pre_create_insert_array($post, $notify_users)
+	{
+		// In the parent class, this is used to check if the post is already
+		// read by a user and marks the notification read if it was marked read.
+		// Returning an empty array in effect, forces it to be marked as unread
+		// (and also saves a query)
+		return array();
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 4fd247a789..605965bf2f 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -78,6 +78,26 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 		)));
 	}
 
+	/**
+	* Pre create insert array function
+	* This allows you to perform certain actions, like run a query
+	* and load data, before create_insert_array() is run. The data
+	* returned from this function will be sent to create_insert_array().
+	*
+	* @param array $post Post data from submit_post
+	* @param array $notify_users Notify users list
+	* 		Formated from find_users_for_notification()
+	* @return array Whatever you want to send to create_insert_array().
+	*/
+	public function pre_create_insert_array($post, $notify_users)
+	{
+		// In the parent class, this is used to check if the post is already
+		// read by a user and marks the notification read if it was marked read.
+		// Returning an empty array in effect, forces it to be marked as unread
+		// (and also saves a query)
+		return array();
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
-- 
cgit v1.2.1


From 05e74b82ac5b65896b1a6aa5b7bca7aa1acd3ada Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Oct 2012 23:34:51 -0500
Subject: [ticket/11103] enable/disable notifications functions

disable_notifications
This should be called when an extension which has notification types
is disabled so that all those notifications are hidden and do not
cause errors

enable_notifications
This should be called when an extension which has notification types
that was disabled is re-enabled so that all those notifications that
were hidden are shown again

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index b8c9c9742e..fef93a30c2 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -705,6 +705,38 @@ class phpbb_notification_manager
 		}
 	}
 
+	/**
+	* Disable all notifications of a certain type
+	* 	This should be called when an extension which has notification types
+	* 	is disabled so that all those notifications are hidden and do not
+	* 	cause errors
+	*
+	* @param string $item_type
+	*/
+	public function disable_notifications($item_type)
+	{
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+			SET is_enabled = 0
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Enable all notifications of a certain type
+	* 	This should be called when an extension which has notification types
+	* 	that was disabled is re-enabled so that all those notifications that
+	*	were hidden are shown again
+	*
+	* @param string $item_type
+	*/
+	public function enable_notifications($item_type)
+	{
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+			SET is_enabled = 1
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
+		$this->db->sql_query($sql);
+	}
+
 	/**
 	* Load user helper
 	*
-- 
cgit v1.2.1


From f0e2d21f8c15544ba59297788cd9e59e743ddbbb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Oct 2012 21:46:04 +0100
Subject: [feature/soft-delete] Allow to soft delete posts in the MCP quick
 moderation

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_main.php  | 90 +++++++++++++++++++++++++++++++++++++---
 phpBB/includes/mcp/mcp_topic.php |  4 +-
 2 files changed, 88 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 6756e19078..bb2dd7d63d 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -125,14 +125,18 @@ class mcp_main
 			case 'delete_post':
 				$user->add_lang('posting');
 
+				// f parameter is not reliable for permission usage, however we just use it to decide
+				// which permission we will check later on. So if it is manipulated, we will still catch it later on.
+				$forum_id = request_var('f', 0);
 				$post_ids = (!$quickmod) ? request_var('post_id_list', array(0)) : array(request_var('p', 0));
+				$soft_delete = (($auth->acl_get('m_softdelete', $forum_id) && $request->is_set_post('soft_delete')) || !$auth->acl_get('m_delete', $forum_id)) ? true : false;
 
 				if (!sizeof($post_ids))
 				{
 					trigger_error('NO_POST_SELECTED');
 				}
 
-				mcp_delete_post($post_ids);
+				mcp_delete_post($post_ids, $soft_delete, ($soft_delete) ? request_var('delete_reason', '', true) : '');
 			break;
 
 			case 'restore_topic':
@@ -823,11 +827,11 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 /**
 * Delete Posts
 */
-function mcp_delete_post($post_ids)
+function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
 {
 	global $auth, $user, $db, $phpEx, $phpbb_root_path;
 
-	if (!check_ids($post_ids, POSTS_TABLE, 'post_id', array('m_delete')))
+	if (!check_ids($post_ids, POSTS_TABLE, 'post_id', array('m_softdelete')))
 	{
 		return;
 	}
@@ -843,7 +847,72 @@ function mcp_delete_post($post_ids)
 	);
 	$success_msg = '';
 
-	if (confirm_box(true))
+	if (confirm_box(true) && $is_soft)
+	{
+		$post_info = get_post_data($post_ids);
+
+		$topic_info = $approve_log = array();
+
+		// Group the posts by topic_id
+		foreach ($post_info as $post_id => $post_data)
+		{
+			if ($post_data['post_visibility'] != ITEM_APPROVED)
+			{
+				continue;
+			}
+			$topic_id = (int) $post_data['topic_id'];
+
+			$topic_info[$topic_id]['posts'][] = (int) $post_id;
+			$topic_info[$topic_id]['forum_id'] = (int) $post_data['forum_id'];
+
+			if ($post_id == $post_data['topic_first_post_id'])
+			{
+				$topic_info[$topic_id]['first_post'] = true;
+			}
+
+			if ($post_id == $post_data['topic_last_post_id'])
+			{
+				$topic_info[$topic_id]['last_post'] = true;
+			}
+
+			$approve_log[] = array(
+				'forum_id'		=> $post_data['forum_id'],
+				'topic_id'		=> $post_data['topic_id'],
+				'post_subject'	=> $post_data['post_subject'],
+				'poster_id'		=> $post_data['poster_id'],
+				'post_username'	=> $post_data['post_username'],
+				'username'		=> $post_data['username'],
+			);
+		}
+
+		foreach ($topic_info as $topic_id => $topic_data)
+		{
+			phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), $soft_delete_reason, isset($topic_data['first_post']), isset($topic_data['last_post']));
+		}
+		$affected_topics = sizeof($topic_info);
+		// None of the topics is really deleted, so a redirect won't hurt much.
+		$deleted_topics = 0;
+
+		$success_msg = (sizeof($post_info) == 1) ? 'POST_DELETED_SUCCESS' : 'POSTS_DELETED_SUCCESS';
+
+		foreach ($approve_log as $row)
+		{
+			$post_username = ($row['poster_id'] == ANONYMOUS && !empty($row['post_username'])) ? $row['post_username'] : $row['username'];
+			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_SOFTDELETE_POST', $row['post_subject'], $post_username);
+		}
+
+		$topic_id = request_var('t', 0);
+
+		// Return links
+		$return_link = array();
+		if ($affected_topics == 1 && $topic_id)
+		{
+			$return_link[] = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id") . '">', '</a>');
+		}
+		$return_link[] = sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) . '">', '</a>');
+
+	}
+	else if (confirm_box(true))
 	{
 		if (!function_exists('delete_posts'))
 		{
@@ -924,7 +993,18 @@ function mcp_delete_post($post_ids)
 	}
 	else
 	{
-		confirm_box(false, (sizeof($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS', $s_hidden_fields);
+		global $template;
+
+		$user->add_lang('posting');
+
+		$template->assign_vars(array(
+			'S_TOPIC_MODE'			=> true,
+			'S_ALLOWED_DELETE'		=> $auth->acl_get('m_delete', $forum_id),
+			'S_ALLOWED_SOFTDELETE'	=> $auth->acl_get('m_softdelete', $forum_id),
+			'S_DELETE_REASON'		=> $auth->acl_get('m_softdelete', $forum_id),
+		));
+
+		confirm_box(false, (sizeof($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS', $s_hidden_fields, 'posting_delete_post_body.html');
 	}
 
 	$redirect = request_var('redirect', "index.$phpEx");
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 0259a12ca8..0d768bcce9 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -242,7 +242,8 @@ function mcp_topic_view($id, $mode, $action)
 			'MINI_POST_IMG'			=> ($post_unread) ? $user->img('icon_post_target_unread', 'UNREAD_POST') : $user->img('icon_post_target', 'POST'),
 
 			'S_POST_REPORTED'	=> ($row['post_reported'] && $auth->acl_get('m_report', $topic_info['forum_id'])),
-			'S_POST_UNAPPROVED'	=> ($row['post_visibility'] != ITEM_APPROVED && $auth->acl_get('m_approve', $topic_info['forum_id'])),
+			'S_POST_UNAPPROVED'	=> ($row['post_visibility'] == ITEM_UNAPPROVED && $auth->acl_get('m_approve', $topic_info['forum_id'])),
+			'S_POST_DELETED'	=> ($row['post_visibility'] == ITEM_DELETED && $auth->acl_get('m_approve', $topic_info['forum_id'])),
 			'S_CHECKED'			=> (($submitted_id_list && !in_array(intval($row['post_id']), $submitted_id_list)) || in_array(intval($row['post_id']), $checked_ids)) ? true : false,
 			'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
 
@@ -318,6 +319,7 @@ function mcp_topic_view($id, $mode, $action)
 
 		'REPORTED_IMG'		=> $user->img('icon_topic_reported', 'POST_REPORTED'),
 		'UNAPPROVED_IMG'	=> $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
+		'DELETED_IMG'	=> $user->img('icon_topic_deleted', 'POST_DELETED'),
 		'INFO_IMG'			=> $user->img('icon_post_info', 'VIEW_INFO'),
 
 		'S_MCP_ACTION'		=> "$url&amp;i=$id&amp;mode=$mode&amp;action=$action&amp;start=$start",
-- 
cgit v1.2.1


From 18dec1026ad8cc5dea6117ca1336ca9eba41aa2a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 31 Oct 2012 14:09:23 +0100
Subject: [feature/soft-delete] Fix restoring/approving posts with mcp
 moderation

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_queue.php | 16 ++++++++--------
 phpBB/includes/mcp/mcp_topic.php | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index cc6a90390a..5fe09a2524 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -25,12 +25,12 @@ class mcp_queue
 	var $p_master;
 	var $u_action;
 
-	function mcp_queue(&$p_master)
+	public function mcp_queue(&$p_master)
 	{
 		$this->p_master = &$p_master;
 	}
 
-	function main($id, $mode)
+	public function main($id, $mode)
 	{
 		global $auth, $db, $user, $template, $cache;
 		global $config, $phpbb_root_path, $phpEx, $action;
@@ -56,11 +56,11 @@ class mcp_queue
 				{
 					if (!empty($post_id_list))
 					{
-						$this->approve_posts($action, $post_id_list, 'queue', $mode);
+						self::approve_posts($action, $post_id_list, 'queue', $mode);
 					}
 					else if (!empty($topic_id_list))
 					{
-						$this->approve_topics($action, $topic_id_list, 'queue', $mode);
+						self::approve_topics($action, $topic_id_list, 'queue', $mode);
 					}
 					else
 					{
@@ -87,7 +87,7 @@ class mcp_queue
 
 					if (!empty($post_id_list))
 					{
-						$this->disapprove_posts($post_id_list, 'queue', $mode);
+						self::disapprove_posts($post_id_list, 'queue', $mode);
 					}
 					else
 					{
@@ -493,7 +493,7 @@ class mcp_queue
 	* @param $mode			string	Active module
 	* @return void
 	*/
-	function approve_posts($action, $post_id_list, $id, $mode)
+	static public function approve_posts($action, $post_id_list, $id, $mode)
 	{
 		global $db, $template, $user, $config;
 		global $phpEx, $phpbb_root_path, $request;
@@ -686,7 +686,7 @@ class mcp_queue
 	* @param $mode			string	Active module
 	* @return void
 	*/
-	function approve_topics($action, $topic_id_list, $id, $mode)
+	static public function approve_topics($action, $topic_id_list, $id, $mode)
 	{
 		global $db, $template, $user, $config;
 		global $phpEx, $phpbb_root_path, $request;
@@ -849,7 +849,7 @@ class mcp_queue
 	* @param $mode			string	Active module
 	* @return void
 	*/
-	function disapprove_posts($post_id_list, $id, $mode)
+	static public function disapprove_posts($post_id_list, $id, $mode)
 	{
 		global $db, $template, $user, $config;
 		global $phpEx, $phpbb_root_path;
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 0d768bcce9..3b13506862 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -84,8 +84,8 @@ function mcp_topic_view($id, $mode, $action)
 		$subject = $topic_info['topic_title'];
 	}
 
-	// Approve posts?
-	if ($action == 'approve' && $auth->acl_get('m_approve', $topic_info['forum_id']))
+	// Restore or pprove posts?
+	if (($action == 'restore' || $action == 'approve') && $auth->acl_get('m_approve', $topic_info['forum_id']))
 	{
 		include($phpbb_root_path . 'includes/mcp/mcp_queue.' . $phpEx);
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
@@ -98,7 +98,7 @@ function mcp_topic_view($id, $mode, $action)
 
 		if (!$sort)
 		{
-			approve_post($post_id_list, $id, $mode);
+			mcp_queue::approve_posts($action, $post_id_list, $id, $mode);
 		}
 	}
 
@@ -175,7 +175,7 @@ function mcp_topic_view($id, $mode, $action)
 		$topic_tracking_info = get_complete_topic_tracking($topic_info['forum_id'], $topic_id);
 	}
 
-	$has_unapproved_posts = false;
+	$has_unapproved_posts = $has_deleted_posts = false;
 
 	// Grab extensions
 	$extensions = $attachments = array();
@@ -225,6 +225,11 @@ function mcp_topic_view($id, $mode, $action)
 			$has_unapproved_posts = true;
 		}
 
+		if ($row['post_visibility'] == ITEM_DELETED)
+		{
+			$has_deleted_posts = true;
+		}
+
 		$post_unread = (isset($topic_tracking_info[$topic_id]) && $row['post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
 
 		$template->assign_block_vars('postrow', array(
@@ -305,7 +310,7 @@ function mcp_topic_view($id, $mode, $action)
 	{
 		phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total, $posts_per_page, $start);
 	}
-	
+
 	$template->assign_vars(array(
 		'TOPIC_TITLE'		=> $topic_info['topic_title'],
 		'U_VIEW_TOPIC'		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_info['forum_id'] . '&amp;t=' . $topic_info['topic_id']),
@@ -319,7 +324,7 @@ function mcp_topic_view($id, $mode, $action)
 
 		'REPORTED_IMG'		=> $user->img('icon_topic_reported', 'POST_REPORTED'),
 		'UNAPPROVED_IMG'	=> $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
-		'DELETED_IMG'	=> $user->img('icon_topic_deleted', 'POST_DELETED'),
+		'DELETED_IMG'		=> $user->img('icon_topic_deleted', 'POST_DELETED'),
 		'INFO_IMG'			=> $user->img('icon_post_info', 'VIEW_INFO'),
 
 		'S_MCP_ACTION'		=> "$url&amp;i=$id&amp;mode=$mode&amp;action=$action&amp;start=$start",
@@ -328,6 +333,7 @@ function mcp_topic_view($id, $mode, $action)
 		'S_CAN_MERGE'		=> ($auth->acl_get('m_merge', $topic_info['forum_id'])) ? true : false,
 		'S_CAN_DELETE'		=> ($auth->acl_get('m_delete', $topic_info['forum_id'])) ? true : false,
 		'S_CAN_APPROVE'		=> ($has_unapproved_posts && $auth->acl_get('m_approve', $topic_info['forum_id'])) ? true : false,
+		'S_CAN_RESTORE'		=> ($has_deleted_posts && $auth->acl_get('m_approve', $topic_info['forum_id'])) ? true : false,
 		'S_CAN_LOCK'		=> ($auth->acl_get('m_lock', $topic_info['forum_id'])) ? true : false,
 		'S_CAN_REPORT'		=> ($auth->acl_get('m_report', $topic_info['forum_id'])) ? true : false,
 		'S_CAN_SYNC'		=> $auth->acl_get('m_', $topic_info['forum_id']),
-- 
cgit v1.2.1


From 8d05dad63471ffbc58feecd1f44cfa5703f0d5f1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 31 Oct 2012 17:29:55 +0100
Subject: [feature/soft-delete] Display message when the posts are already soft
 deleted

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_main.php | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index bb2dd7d63d..c7e2252729 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -785,7 +785,21 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 
 		$user->add_lang('posting');
 
+		$only_softdeleted = false;
+		// If there are only soft deleted topics, we display a message why the option is not available
+		if ($auth->acl_get('m_delete', $forum_id) && $auth->acl_get('m_softdelete', $forum_id))
+		{
+			$sql = 'SELECT topic_id
+				FROM ' . TOPICS_TABLE . '
+				WHERE ' . $db->sql_in_set('topic_id', $topic_ids) . '
+					AND topic_visibility <> ' . ITEM_DELETED;
+			$result = $db->sql_query_limit($sql, 1);
+			$only_softdeleted = (bool) $db->sql_fetchfield('topic_id');
+			$db->sql_freeresult($result);
+		}
+
 		$template->assign_vars(array(
+			'S_SOFTDELETED'			=> $only_softdeleted,
 			'S_TOPIC_MODE'			=> true,
 			'S_ALLOWED_DELETE'		=> $auth->acl_get('m_delete', $forum_id),
 			'S_ALLOWED_SOFTDELETE'	=> $auth->acl_get('m_softdelete', $forum_id),
@@ -997,8 +1011,21 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
 
 		$user->add_lang('posting');
 
+		$only_softdeleted = false;
+		// If there are only soft deleted posts, we display a message why the option is not available
+		if ($auth->acl_get('m_delete', $forum_id) && $auth->acl_get('m_softdelete', $forum_id))
+		{
+			$sql = 'SELECT post_id
+				FROM ' . POSTS_TABLE . '
+				WHERE ' . $db->sql_in_set('post_id', $post_ids) . '
+					AND post_visibility <> ' . ITEM_DELETED;
+			$result = $db->sql_query_limit($sql, 1);
+			$only_softdeleted = (bool) $db->sql_fetchfield('post_id');
+			$db->sql_freeresult($result);
+		}
+
 		$template->assign_vars(array(
-			'S_TOPIC_MODE'			=> true,
+			'S_SOFTDELETED'			=> $only_softdeleted,
 			'S_ALLOWED_DELETE'		=> $auth->acl_get('m_delete', $forum_id),
 			'S_ALLOWED_SOFTDELETE'	=> $auth->acl_get('m_softdelete', $forum_id),
 			'S_DELETE_REASON'		=> $auth->acl_get('m_softdelete', $forum_id),
-- 
cgit v1.2.1


From bed82bf2bd13ca04cc1572d454eee5ef3a9053a6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 1 Nov 2012 22:23:35 +0100
Subject: [feature/soft-delete] Invert the logic on confirm box

Permanent delete is now the checkbox rather then softdelete.

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_main.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index c7e2252729..72c1be95b2 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -806,7 +806,10 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 			'S_DELETE_REASON'		=> $auth->acl_get('m_softdelete', $forum_id),
 		));
 
-		confirm_box(false, (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS', $s_hidden_fields, 'posting_delete_post_body.html');
+		$l_confirm = (sizeof($post_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS';
+		$l_confirm .= ($only_softdeleted) ? '_PERMANENTLY' : '';
+
+		confirm_box(false, $l_confirm, $s_hidden_fields, 'confirm_delete_body.html');
 	}
 
 	$topic_id = request_var('t', 0);
@@ -1031,7 +1034,10 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
 			'S_DELETE_REASON'		=> $auth->acl_get('m_softdelete', $forum_id),
 		));
 
-		confirm_box(false, (sizeof($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS', $s_hidden_fields, 'posting_delete_post_body.html');
+		$l_confirm = (sizeof($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS';
+		$l_confirm .= ($only_softdeleted) ? '_PERMANENTLY' : '';
+
+		confirm_box(false, $l_confirm, $s_hidden_fields, 'confirm_delete_body.html');
 	}
 
 	$redirect = request_var('redirect', "index.$phpEx");
-- 
cgit v1.2.1


From 63e3baf0eb37d1d8f6f0b5b46df56a673eafa6fe Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 2 Nov 2012 12:40:10 +0100
Subject: [feature/soft-delete] Correctly manage softdeleting via posting.php

PHPBB3-9567
---
 phpBB/includes/content_visibility.php | 6 +++---
 phpBB/includes/functions_admin.php    | 2 +-
 phpBB/includes/functions_posting.php  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 6dffe73114..8f7e86cdf5 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -537,12 +537,12 @@ class phpbb_content_visibility
 	*/
 	static public function remove_post_from_statistic($data, &$sql_data)
 	{
-		$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts = topic_posts - 1';
-		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts - 1';
+		$sql_data[TOPICS_TABLE] = ((!empty($sql_data[TOPICS_TABLE])) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts = topic_posts - 1';
+		$sql_data[FORUMS_TABLE] = ((!empty($sql_data[FORUMS_TABLE])) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts - 1';
 
 		if ($data['post_postcount'])
 		{
-			$sql_data[USERS_TABLE] = (($sql_data[USERS_TABLE]) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts - 1';
+			$sql_data[USERS_TABLE] = ((!empty($sql_data[USERS_TABLE])) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts - 1';
 		}
 
 		set_config_count('num_posts', -1, true);
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index e2a133270b..f1c3cf62b1 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -881,7 +881,7 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 		sync('forum', 'forum_id', $forum_ids, true, true);
 	}
 
-	if ($approved_posts)
+	if ($approved_posts && $post_count_sync)
 	{
 		set_config_count('num_posts', $approved_posts * (-1), true);
 	}
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 807b178a4c..8e8e3aac9f 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1467,7 +1467,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 	}
 	else if (!$is_soft)
 	{
-		if (!delete_posts('post_id', array($post_id), false, false))
+		if (!delete_posts('post_id', array($post_id), false, false, false))
 		{
 			// Try to delete topic, we may had an previous error causing inconsistency
 			if ($post_mode == 'delete_topic')
@@ -1625,8 +1625,8 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 			}
 			else if ($data['post_visibility'] == ITEM_DELETED)
 			{
-				$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts_deleted = forum_posts_deleted - 1';
-				$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts_deleted = topic_posts_deleted - 1';
+				$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts_softdeleted = forum_posts_softdeleted - 1';
+				$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts_softdeleted = topic_posts_softdeleted - 1';
 			}
 		}
 
@@ -2030,7 +2030,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				'topic_last_post_id'		=> $data['post_id'],
 				'topic_last_post_time'		=> $current_time,
 				'topic_last_poster_id'		=> $sql_data[POSTS_TABLE]['sql']['poster_id'],
-				'topic_last_poster_name'	=> $sql_data[POSTS_TABLE]['sql']['post_username'],
+				'topic_last_poster_name'	=> ($user->data['user_id'] == ANONYMOUS) ? $sql_data[POSTS_TABLE]['sql']['post_username'] : $user->data['username'],
 				'topic_last_poster_colour'	=> $user->data['user_colour'],
 				'topic_last_post_subject'	=> (string) $subject,
 			);
-- 
cgit v1.2.1


From 6999d776d48831a48fa7f2882c7bbf767308e512 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 2 Nov 2012 14:23:17 +0100
Subject: [feature/soft-delete] Correctly manage soft deleting via MCP

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_main.php | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 72c1be95b2..4a0b6091fe 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -112,7 +112,7 @@ class mcp_main
 				// which permission we will check later on. So if it is manipulated, we will still catch it later on.
 				$forum_id = request_var('f', 0);
 				$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
-				$soft_delete = (($auth->acl_get('m_softdelete', $forum_id) && $request->is_set_post('soft_delete')) || !$auth->acl_get('m_delete', $forum_id)) ? true : false;
+				$soft_delete = (($request->is_set_post('confirm') && !$request->is_set_post('delete_permanent')) || !$auth->acl_get('m_delete', $forum_id)) ? true : false;
 
 				if (!sizeof($topic_ids))
 				{
@@ -129,7 +129,7 @@ class mcp_main
 				// which permission we will check later on. So if it is manipulated, we will still catch it later on.
 				$forum_id = request_var('f', 0);
 				$post_ids = (!$quickmod) ? request_var('post_id_list', array(0)) : array(request_var('p', 0));
-				$soft_delete = (($auth->acl_get('m_softdelete', $forum_id) && $request->is_set_post('soft_delete')) || !$auth->acl_get('m_delete', $forum_id)) ? true : false;
+				$soft_delete = (($request->is_set_post('confirm') && !$request->is_set_post('delete_permanent')) || !$auth->acl_get('m_delete', $forum_id)) ? true : false;
 
 				if (!sizeof($post_ids))
 				{
@@ -736,12 +736,12 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
 	$forum_id = request_var('f', 0);
 
-	$s_hidden_fields = build_hidden_fields(array(
+	$s_hidden_fields = array(
 		'topic_id_list'	=> $topic_ids,
 		'f'				=> $forum_id,
 		'action'		=> 'delete_topic',
 		'redirect'		=> $redirect,
-	));
+	);
 	$success_msg = '';
 
 	if (confirm_box(true))
@@ -807,9 +807,17 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 		));
 
 		$l_confirm = (sizeof($post_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS';
-		$l_confirm .= ($only_softdeleted) ? '_PERMANENTLY' : '';
+		if ($only_softdeleted)
+		{
+			$l_confirm .= '_PERMANENTLY';
+			$s_hidden_fields['delete_permanent'] = '1';
+		}
+		else if (!$auth->acl_get('m_softdelete', $forum_id))
+		{
+			$s_hidden_fields['delete_permanent'] = '1';
+		}
 
-		confirm_box(false, $l_confirm, $s_hidden_fields, 'confirm_delete_body.html');
+		confirm_box(false, $l_confirm, build_hidden_fields($s_hidden_fields), 'confirm_delete_body.html');
 	}
 
 	$topic_id = request_var('t', 0);
@@ -856,11 +864,11 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
 	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
 	$forum_id = request_var('f', 0);
 
-	$s_hidden_fields = build_hidden_fields(array(
+	$s_hidden_fields = array(
 		'post_id_list'	=> $post_ids,
 		'f'				=> $forum_id,
 		'action'		=> 'delete_post',
-		'redirect'		=> $redirect)
+		'redirect'		=> $redirect,
 	);
 	$success_msg = '';
 
@@ -1035,9 +1043,17 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
 		));
 
 		$l_confirm = (sizeof($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS';
-		$l_confirm .= ($only_softdeleted) ? '_PERMANENTLY' : '';
+		if ($only_softdeleted)
+		{
+			$l_confirm .= '_PERMANENTLY';
+			$s_hidden_fields['delete_permanent'] = '1';
+		}
+		else if (!$auth->acl_get('m_softdelete', $forum_id))
+		{
+			$s_hidden_fields['delete_permanent'] = '1';
+		}
 
-		confirm_box(false, $l_confirm, $s_hidden_fields, 'confirm_delete_body.html');
+		confirm_box(false, $l_confirm, build_hidden_fields($s_hidden_fields), 'confirm_delete_body.html');
 	}
 
 	$redirect = request_var('redirect', "index.$phpEx");
-- 
cgit v1.2.1


From fd6ee50e06cb48c9e3a476bf23285875484ff5f7 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 2 Nov 2012 16:05:53 -0400
Subject: [ticket/11162] Extract existing behavior into a function and add a
 test.

PHPBB3-11162
---
 phpBB/includes/functions.php | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 65d8be32ad..8608c6ca4f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1297,6 +1297,28 @@ function tz_select($default = '', $truncate = false)
 	return $tz_select;
 }
 
+/**
+* Updates rows in given table from a set of values to a new value.
+* If this results in rows violating uniqueness constraints, the duplicate
+* rows are eliminated.
+*
+* @param dbal $db Database object
+* @param string $table Table on which to perform the update
+* @param string $column Column whose values to change
+* @param array $from_values An array of values that should be changed
+* @param int $to_value The new value
+* @return null
+*/
+function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_values, $to_value)
+{
+	$db->sql_return_on_error(true);
+	$condition = $db->sql_in_set($column, $from_values);
+	$db->sql_query('UPDATE ' . $table . ' SET ' . $column . ' = ' . (int) $to_value. ' WHERE ' . $condition);
+	$db->sql_return_on_error(false);
+
+	$db->sql_query('DELETE FROM ' . $table . ' WHERE ' . $condition);
+}
+
 // Functions handling topic/post tracking/marking
 
 /**
@@ -3355,7 +3377,7 @@ function parse_cfg_file($filename, $lines = false)
 
 		$parsed_items[$key] = $value;
 	}
-	
+
 	if (isset($parsed_items['inherit_from']) && isset($parsed_items['name']) && $parsed_items['inherit_from'] == $parsed_items['name'])
 	{
 		unset($parsed_items['inherit_from']);
-- 
cgit v1.2.1


From 334265fc839f95d24cce44ec675ae8cef7b4bfaa Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 3 Nov 2012 22:57:49 +0100
Subject: [feature/soft-delete] Fix displaying the button/permission

When the post is already softdeleted the options should only be available if
*_delete is granted.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index ed91d9ad1c..6f166e2a14 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -788,7 +788,7 @@ function gen_forum_auth_level($mode, $forum_id, $forum_status)
 		($auth->acl_get('f_post', $forum_id) && !$locked) ? $user->lang['RULES_POST_CAN'] : $user->lang['RULES_POST_CANNOT'],
 		($auth->acl_get('f_reply', $forum_id) && !$locked) ? $user->lang['RULES_REPLY_CAN'] : $user->lang['RULES_REPLY_CANNOT'],
 		($user->data['is_registered'] && $auth->acl_gets('f_edit', 'm_edit', $forum_id) && !$locked) ? $user->lang['RULES_EDIT_CAN'] : $user->lang['RULES_EDIT_CANNOT'],
-		($user->data['is_registered'] && $auth->acl_gets('f_delete', 'm_delete', $forum_id) && !$locked) ? $user->lang['RULES_DELETE_CAN'] : $user->lang['RULES_DELETE_CANNOT'],
+		($user->data['is_registered'] && ($auth->acl_gets('f_delete', 'm_delete', $forum_id) || $auth->acl_gets('f_softdelete', 'm_softdelete', $forum_id)) && !$locked) ? $user->lang['RULES_DELETE_CAN'] : $user->lang['RULES_DELETE_CANNOT'],
 	);
 
 	if ($config['allow_attachments'])
-- 
cgit v1.2.1


From 269330749f1e456caf5c2e787448820449586ed4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 3 Nov 2012 23:37:35 +0100
Subject: [feature/soft-delete] Fix naming of soft delete (we wont use that in
 the UI)

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 3b13506862..cea5b9db8c 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -324,7 +324,7 @@ function mcp_topic_view($id, $mode, $action)
 
 		'REPORTED_IMG'		=> $user->img('icon_topic_reported', 'POST_REPORTED'),
 		'UNAPPROVED_IMG'	=> $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
-		'DELETED_IMG'		=> $user->img('icon_topic_deleted', 'POST_DELETED'),
+		'DELETED_IMG'		=> $user->img('icon_topic_deleted', 'POST_DELETED_RESTORE'),
 		'INFO_IMG'			=> $user->img('icon_post_info', 'VIEW_INFO'),
 
 		'S_MCP_ACTION'		=> "$url&amp;i=$id&amp;mode=$mode&amp;action=$action&amp;start=$start",
-- 
cgit v1.2.1


From bb173afe3fee816dab9d11764a8b9ff53dc5a1df Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 8 Nov 2012 22:17:59 +0100
Subject: [feature/soft-delete] Fix adding posts to *_posts when restoring soft
 deleted

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 8f7e86cdf5..a1b7c16c2d 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -393,7 +393,7 @@ class phpbb_content_visibility
 				{
 					$sql_ary['posts_softdeleted'] = ' - ' . $cur_softdeleted_posts;
 				}
-				if ($cur_posts + $cur_unapproved_posts)
+				if ($cur_softdeleted_posts + $cur_unapproved_posts)
 				{
 					$sql_ary['posts'] = ' + ' . ($cur_softdeleted_posts + $cur_unapproved_posts);
 				}
-- 
cgit v1.2.1


From 8512543cf490e06e3b3ca95d0ae9be3ee8fb850d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 9 Nov 2012 12:32:27 +0100
Subject: [feature/soft-delete] Use request object instead of direct access

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_main.php  | 50 ++++++++++++++++++++--------------------
 phpBB/includes/mcp/mcp_queue.php | 31 ++++++++++++-------------
 2 files changed, 40 insertions(+), 41 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 4a0b6091fe..945b80ba41 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -110,8 +110,8 @@ class mcp_main
 
 				// f parameter is not reliable for permission usage, however we just use it to decide
 				// which permission we will check later on. So if it is manipulated, we will still catch it later on.
-				$forum_id = request_var('f', 0);
-				$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
+				$forum_id = $request->variable('f', 0);
+				$topic_ids = (!$quickmod) ? $request->variable('topic_id_list', array(0)) : array($request->variable('t', 0));
 				$soft_delete = (($request->is_set_post('confirm') && !$request->is_set_post('delete_permanent')) || !$auth->acl_get('m_delete', $forum_id)) ? true : false;
 
 				if (!sizeof($topic_ids))
@@ -119,7 +119,7 @@ class mcp_main
 					trigger_error('NO_TOPIC_SELECTED');
 				}
 
-				mcp_delete_topic($topic_ids, $soft_delete, ($soft_delete) ? request_var('delete_reason', '', true) : '');
+				mcp_delete_topic($topic_ids, $soft_delete, ($soft_delete) ? $request->variable('delete_reason', '', true) : '');
 			break;
 
 			case 'delete_post':
@@ -127,8 +127,8 @@ class mcp_main
 
 				// f parameter is not reliable for permission usage, however we just use it to decide
 				// which permission we will check later on. So if it is manipulated, we will still catch it later on.
-				$forum_id = request_var('f', 0);
-				$post_ids = (!$quickmod) ? request_var('post_id_list', array(0)) : array(request_var('p', 0));
+				$forum_id = $request->variable('f', 0);
+				$post_ids = (!$quickmod) ? $request->variable('post_id_list', array(0)) : array($request->variable('p', 0));
 				$soft_delete = (($request->is_set_post('confirm') && !$request->is_set_post('delete_permanent')) || !$auth->acl_get('m_delete', $forum_id)) ? true : false;
 
 				if (!sizeof($post_ids))
@@ -136,13 +136,13 @@ class mcp_main
 					trigger_error('NO_POST_SELECTED');
 				}
 
-				mcp_delete_post($post_ids, $soft_delete, ($soft_delete) ? request_var('delete_reason', '', true) : '');
+				mcp_delete_post($post_ids, $soft_delete, ($soft_delete) ? $request->variable('delete_reason', '', true) : '');
 			break;
 
 			case 'restore_topic':
 				$user->add_lang('posting');
 
-				$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
+				$topic_ids = (!$quickmod) ? $request->variable('topic_id_list', array(0)) : array($request->variable('t', 0));
 
 				if (!sizeof($topic_ids))
 				{
@@ -654,15 +654,15 @@ function mcp_move_topic($topic_ids)
 */
 function mcp_restore_topic($topic_ids)
 {
-	global $auth, $user, $db, $phpEx, $phpbb_root_path;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
 
 	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_approve')))
 	{
 		return;
 	}
 
-	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
-	$forum_id = request_var('f', 0);
+	$redirect = $request->variable('redirect', build_url(array('action', 'quickmod')));
+	$forum_id = $request->variable('f', 0);
 
 	$s_hidden_fields = build_hidden_fields(array(
 		'topic_id_list'	=> $topic_ids,
@@ -692,10 +692,10 @@ function mcp_restore_topic($topic_ids)
 		confirm_box(false, (sizeof($topic_ids) == 1) ? 'RESTORE_TOPIC' : 'RESTORE_TOPICS', $s_hidden_fields);
 	}
 
-	$topic_id = request_var('t', 0);
-	if (!isset($_REQUEST['quickmod']))
+	$topic_id = $request->variable('t', 0);
+	if (!$request->is_set('quickmod', phpbb_request_interface::REQUEST))
 	{
-		$redirect = request_var('redirect', "index.$phpEx");
+		$redirect = $request->variable('redirect', "index.$phpEx");
 		$redirect = reapply_sid($redirect);
 		$redirect_message = 'PAGE';
 	}
@@ -726,15 +726,15 @@ function mcp_restore_topic($topic_ids)
 */
 function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '')
 {
-	global $auth, $user, $db, $phpEx, $phpbb_root_path;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
 
 	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_delete')))
 	{
 		return;
 	}
 
-	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
-	$forum_id = request_var('f', 0);
+	$redirect = $request->variable('redirect', build_url(array('action', 'quickmod')));
+	$forum_id = $request->variable('f', 0);
 
 	$s_hidden_fields = array(
 		'topic_id_list'	=> $topic_ids,
@@ -820,10 +820,10 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 		confirm_box(false, $l_confirm, build_hidden_fields($s_hidden_fields), 'confirm_delete_body.html');
 	}
 
-	$topic_id = request_var('t', 0);
-	if (!isset($_REQUEST['quickmod']))
+	$topic_id = $request->variable('t', 0);
+	if (!$request->is_set('quickmod', phpbb_request_interface::REQUEST))
 	{
-		$redirect = request_var('redirect', "index.$phpEx");
+		$redirect = $request->variable('redirect', "index.$phpEx");
 		$redirect = reapply_sid($redirect);
 		$redirect_message = 'PAGE';
 	}
@@ -854,15 +854,15 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 */
 function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
 {
-	global $auth, $user, $db, $phpEx, $phpbb_root_path;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
 
 	if (!check_ids($post_ids, POSTS_TABLE, 'post_id', array('m_softdelete')))
 	{
 		return;
 	}
 
-	$redirect = request_var('redirect', build_url(array('action', 'quickmod')));
-	$forum_id = request_var('f', 0);
+	$redirect = $request->variable('redirect', build_url(array('action', 'quickmod')));
+	$forum_id = $request->variable('f', 0);
 
 	$s_hidden_fields = array(
 		'post_id_list'	=> $post_ids,
@@ -926,7 +926,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
 			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_SOFTDELETE_POST', $row['post_subject'], $post_username);
 		}
 
-		$topic_id = request_var('t', 0);
+		$topic_id = $request->variable('t', 0);
 
 		// Return links
 		$return_link = array();
@@ -980,7 +980,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
 		$deleted_topics = ($row = $db->sql_fetchrow($result)) ? ($affected_topics - $row['topics_left']) : $affected_topics;
 		$db->sql_freeresult($result);
 
-		$topic_id = request_var('t', 0);
+		$topic_id = $request->variable('t', 0);
 
 		// Return links
 		$return_link = array();
@@ -1056,7 +1056,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
 		confirm_box(false, $l_confirm, build_hidden_fields($s_hidden_fields), 'confirm_delete_body.html');
 	}
 
-	$redirect = request_var('redirect', "index.$phpEx");
+	$redirect = $request->variable('redirect', "index.$phpEx");
 	$redirect = reapply_sid($redirect);
 
 	if (!$success_msg)
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 5fe09a2524..b6a36f184a 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -32,7 +32,7 @@ class mcp_queue
 
 	public function main($id, $mode)
 	{
-		global $auth, $db, $user, $template, $cache;
+		global $auth, $db, $user, $template, $cache, $request;
 		global $config, $phpbb_root_path, $phpEx, $action;
 
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
@@ -49,8 +49,8 @@ class mcp_queue
 			case 'restore':
 				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 
-				$post_id_list = request_var('post_id_list', array(0));
-				$topic_id_list = request_var('topic_id_list', array(0));
+				$post_id_list = $request->variable('post_id_list', array(0));
+				$topic_id_list = $request->variable('topic_id_list', array(0));
 
 				if ($action != 'disapprove')
 				{
@@ -213,7 +213,7 @@ class mcp_queue
 					'U_APPROVE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&amp;p=$post_id&amp;f=$forum_id"),
 					'S_CAN_VIEWIP'			=> $auth->acl_get('m_info', $post_info['forum_id']),
 					'S_POST_REPORTED'		=> $post_info['post_reported'],
-					'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED) ,
+					'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED),
 					'S_POST_LOCKED'			=> $post_info['post_edit_locked'],
 					'S_USER_NOTES'			=> true,
 
@@ -263,7 +263,7 @@ class mcp_queue
 
 				$user->add_lang(array('viewtopic', 'viewforum'));
 
-				$topic_id = request_var('t', 0);
+				$topic_id = $request->variable('t', 0);
 				$forum_info = array();
 
 				if ($topic_id)
@@ -503,7 +503,7 @@ class mcp_queue
 			trigger_error('NOT_AUTHORISED');
 		}
 
-		$redirect = request_var('redirect', build_url(array('quickmod')));
+		$redirect = $request->variable('redirect', build_url(array('quickmod')));
 		$success_msg = $post_url = '';
 		$approve_log = array();
 
@@ -519,7 +519,7 @@ class mcp_queue
 
 		if (confirm_box(true))
 		{
-			$notify_poster = ($action == 'approve' && isset($_REQUEST['notify_poster'])) ? true : false;
+			$notify_poster = ($action == 'approve' && isset($_REQUEST['notify_poster']));
 
 			$topic_info = array();
 
@@ -642,7 +642,7 @@ class mcp_queue
 			confirm_box(false, strtoupper($action) . '_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
 		}
 
-		$redirect = request_var('redirect', "index.$phpEx");
+		$redirect = $request->variable('redirect', "index.$phpEx");
 		$redirect = reapply_sid($redirect);
 
 		if (!$success_msg)
@@ -696,7 +696,7 @@ class mcp_queue
 			trigger_error('NOT_AUTHORISED');
 		}
 
-		$redirect = request_var('redirect', build_url(array('quickmod')));
+		$redirect = $request->variable('redirect', build_url(array('quickmod')));
 		$success_msg = $topic_url = '';
 		$approve_log = array();
 
@@ -806,7 +806,7 @@ class mcp_queue
 			confirm_box(false, strtoupper($action) . '_TOPIC' . ((sizeof($topic_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
 		}
 
-		$redirect = request_var('redirect', "index.$phpEx");
+		$redirect = $request->variable('redirect', "index.$phpEx");
 		$redirect = reapply_sid($redirect);
 
 		if (!$success_msg)
@@ -852,17 +852,16 @@ class mcp_queue
 	static public function disapprove_posts($post_id_list, $id, $mode)
 	{
 		global $db, $template, $user, $config;
-		global $phpEx, $phpbb_root_path;
-		global $request;
+		global $phpEx, $phpbb_root_path, $request;
 
 		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 		{
 			trigger_error('NOT_AUTHORISED');
 		}
 
-		$redirect = request_var('redirect', build_url(array('t', 'mode', 'quickmod')) . "&amp;mode=$mode");
-		$reason = utf8_normalize_nfc(request_var('reason', '', true));
-		$reason_id = request_var('reason_id', 0);
+		$redirect = $request->variable('redirect', build_url(array('t', 'mode', 'quickmod')) . "&amp;mode=$mode");
+		$reason = $request->variable('reason', '', true);
+		$reason_id = $request->variable('reason_id', 0);
 		$success_msg = $additional_msg = '';
 
 		$s_hidden_fields = build_hidden_fields(array(
@@ -1097,7 +1096,7 @@ class mcp_queue
 			confirm_box(false, 'DISAPPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
 		}
 
-		$redirect = request_var('redirect', "index.$phpEx");
+		$redirect = $request->variable('redirect', "index.$phpEx");
 		$redirect = reapply_sid($redirect);
 
 		if (!$success_msg)
-- 
cgit v1.2.1


From 9c2a58eff4c2bd164ee3bdb2ec66729d4562963d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 9 Nov 2012 13:37:53 +0100
Subject: [feature/soft-delete] Append _approved to *_posts and *_topics column
 names

PHPBB3-9567
---
 phpBB/includes/acp/acp_forums.php     | 10 +++++-----
 phpBB/includes/content_visibility.php | 14 +++++++-------
 phpBB/includes/functions_admin.php    | 14 +++++++-------
 phpBB/includes/functions_posting.php  |  9 +++++----
 phpBB/includes/mcp/mcp_main.php       |  6 +++---
 phpBB/includes/mcp/mcp_queue.php      |  2 +-
 6 files changed, 28 insertions(+), 27 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 8029181f39..bb91acba74 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -856,8 +856,8 @@ class acp_forums
 					'FORUM_IMAGE_SRC'	=> ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
 					'FORUM_NAME'		=> $row['forum_name'],
 					'FORUM_DESCRIPTION'	=> generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
-					'FORUM_TOPICS'		=> $row['forum_topics'],
-					'FORUM_POSTS'		=> $row['forum_posts'],
+					'FORUM_TOPICS'		=> $row['forum_topics_approved'],
+					'FORUM_POSTS'		=> $row['forum_posts_approved'],
 
 					'S_FORUM_LINK'		=> ($forum_type == FORUM_LINK) ? true : false,
 					'S_FORUM_POST'		=> ($forum_type == FORUM_POST) ? true : false,
@@ -1143,7 +1143,7 @@ class acp_forums
 					return array($user->lang['NO_FORUM_ACTION']);
 				}
 
-				$forum_data_sql['forum_posts'] = $forum_data_sql['forum_posts_unapproved'] = $forum_data_sql['forum_posts_softdeleted'] = $forum_data_sql['forum_topics'] = $forum_data_sql['forum_topics_unapproved'] = $forum_data_sql['forum_topics_softdeleted'] = 0;
+				$forum_data_sql['forum_posts_approved'] = $forum_data_sql['forum_posts_unapproved'] = $forum_data_sql['forum_posts_softdeleted'] = $forum_data_sql['forum_topics_approved'] = $forum_data_sql['forum_topics_unapproved'] = $forum_data_sql['forum_topics_softdeleted'] = 0;
 				$forum_data_sql['forum_last_post_id'] = $forum_data_sql['forum_last_poster_id'] = $forum_data_sql['forum_last_post_time'] = 0;
 				$forum_data_sql['forum_last_poster_name'] = $forum_data_sql['forum_last_poster_colour'] = '';
 			}
@@ -1264,10 +1264,10 @@ class acp_forums
 			else if ($row['forum_type'] == FORUM_CAT && $forum_data_sql['forum_type'] == FORUM_POST)
 			{
 				// Changing a category to a forum? Reset the data (you can't post directly in a cat, you must use a forum)
-				$forum_data_sql['forum_posts'] = 0;
+				$forum_data_sql['forum_posts_approved'] = 0;
 				$forum_data_sql['forum_posts_unapproved'] = 0;
 				$forum_data_sql['forum_posts_softdeleted'] = 0;
-				$forum_data_sql['forum_topics'] = 0;
+				$forum_data_sql['forum_topics_approved'] = 0;
 				$forum_data_sql['forum_topics_unapproved'] = 0;
 				$forum_data_sql['forum_topics_softdeleted'] = 0;
 				$forum_data_sql['forum_last_post_id'] = 0;
diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index a1b7c16c2d..bea70571f9 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -60,10 +60,10 @@ class phpbb_content_visibility
 
 		if (!$auth->acl_get('m_approve', $forum_id))
 		{
-			return (int) $data[$mode];
+			return (int) $data[$mode . '_approved'];
 		}
 
-		return (int) $data[$mode] + (int) $data[$mode . '_unapproved'] + (int) $data[$mode . '_softdeleted'];
+		return (int) $data[$mode . '_approved'] + (int) $data[$mode . '_unapproved'] + (int) $data[$mode . '_softdeleted'];
 	}
 
 	/**
@@ -372,7 +372,7 @@ class phpbb_content_visibility
 			{
 				if ($cur_posts)
 				{
-					$sql_ary['posts'] = ' - ' . $cur_posts;
+					$sql_ary['posts_approved'] = ' - ' . $cur_posts;
 				}
 				if ($cur_unapproved_posts)
 				{
@@ -395,7 +395,7 @@ class phpbb_content_visibility
 				}
 				if ($cur_softdeleted_posts + $cur_unapproved_posts)
 				{
-					$sql_ary['posts'] = ' + ' . ($cur_softdeleted_posts + $cur_unapproved_posts);
+					$sql_ary['posts_approved'] = ' + ' . ($cur_softdeleted_posts + $cur_unapproved_posts);
 				}
 			}
 
@@ -564,7 +564,7 @@ class phpbb_content_visibility
 		// Do we need to grab some topic informations?
 		if (!sizeof($topic_row))
 		{
-			$sql = 'SELECT topic_type, topic_posts, topic_posts_unapproved, topic_posts_softdeleted, topic_visibility
+			$sql = 'SELECT topic_type, topic_posts_approved, topic_posts_unapproved, topic_posts_softdeleted, topic_visibility
 				FROM ' . TOPICS_TABLE . '
 				WHERE topic_id = ' . $topic_id;
 			$result = $db->sql_query($sql);
@@ -573,8 +573,8 @@ class phpbb_content_visibility
 		}
 
 		// If this is an edited topic or the first post the topic gets completely disapproved later on...
-		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_topics = forum_topics - 1';
-		$sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . $topic_row['topic_posts'];
+		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_topics_approved = forum_topics_approved - 1';
+		$sql_data[FORUMS_TABLE] .= ', forum_posts_approved = forum_posts_approved - ' . $topic_row['topic_posts_approved'];
 		$sql_data[FORUMS_TABLE] .= ', forum_posts_unapproved = forum_posts_unapproved - ' . $topic_row['topic_posts_unapproved'];
 		$sql_data[FORUMS_TABLE] .= ', forum_posts_softdeleted = forum_posts_softdeleted - ' . $topic_row['topic_posts_softdeleted'];
 
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index f1c3cf62b1..2bf36d967a 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1669,10 +1669,10 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				$forum_data[$forum_id] = $row;
 				if ($sync_extra)
 				{
-					$forum_data[$forum_id]['posts'] = 0;
+					$forum_data[$forum_id]['posts_approved'] = 0;
 					$forum_data[$forum_id]['posts_unapproved'] = 0;
 					$forum_data[$forum_id]['posts_softdeleted'] = 0;
-					$forum_data[$forum_id]['topics'] = 0;
+					$forum_data[$forum_id]['topics_approved'] = 0;
 					$forum_data[$forum_id]['topics_unapproved'] = 0;
 					$forum_data[$forum_id]['topics_softdeleted'] = 0;
 				}
@@ -1746,7 +1746,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				{
 					$forum_id = (sizeof($forum_ids) == 1) ? (int) $forum_ids[0] : (int) $row['forum_id'];
 
-					$forum_data[$forum_id]['posts'] = (int) $row['forum_posts'];
+					$forum_data[$forum_id]['posts_approved'] = (int) $row['forum_posts'];
 					$forum_data[$forum_id]['posts_unapproved'] = (int) $row['forum_posts_unapproved'];
 					$forum_data[$forum_id]['posts_softdeleted'] = (int) $row['forum_posts_softdeleted'];
 				}
@@ -1829,7 +1829,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 			if ($sync_extra)
 			{
-				array_push($fieldnames, 'posts', 'posts_unapproved', 'posts_softdeleted', 'topics', 'topics_unapproved', 'topics_softdeleted');
+				array_push($fieldnames, 'posts_approved', 'posts_unapproved', 'posts_softdeleted', 'topics_approved', 'topics_unapproved', 'topics_softdeleted');
 			}
 
 			foreach ($forum_data as $forum_id => $row)
@@ -1884,7 +1884,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				$topic_id = (int) $row['topic_id'];
 				$topic_data[$topic_id] = $row;
 				$topic_data[$topic_id]['visibility'] = ITEM_UNAPPROVED;
-				$topic_data[$topic_id]['posts'] = 0;
+				$topic_data[$topic_id]['posts_approved'] = 0;
 				$topic_data[$topic_id]['posts_unapproved'] = 0;
 				$topic_data[$topic_id]['posts_softdeleted'] = 0;
 				$topic_data[$topic_id]['first_post_id'] = 0;
@@ -1930,7 +1930,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 					if ($row['post_visibility'] == ITEM_APPROVED)
 					{
-						$topic_data[$topic_id]['posts'] = $row['total_posts'];
+						$topic_data[$topic_id]['posts_approved'] = $row['total_posts'];
 					}
 					else if ($row['post_visibility'] == ITEM_UNAPPROVED)
 					{
@@ -2141,7 +2141,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			}
 
 			// These are fields that will be synchronised
-			$fieldnames = array('time', 'visibility', 'posts', 'posts_unapproved', 'posts_softdeleted', 'poster', 'first_post_id', 'first_poster_name', 'first_poster_colour', 'last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
+			$fieldnames = array('time', 'visibility', 'posts_approved', 'posts_unapproved', 'posts_softdeleted', 'poster', 'first_post_id', 'first_poster_name', 'first_poster_colour', 'last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour');
 
 			if ($sync_extra)
 			{
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 8e8e3aac9f..62567e302a 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1418,7 +1418,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 
 	// Specify our post mode
 	$post_mode = 'delete';
-	if (($data['topic_first_post_id'] === $data['topic_last_post_id']) && ($data['topic_posts'] + $data['topic_posts_unapproved'] + $data['topic_posts_softdeleted'] == 1))
+	if (($data['topic_first_post_id'] === $data['topic_last_post_id']) && ($data['topic_posts_approved'] + $data['topic_posts_unapproved'] + $data['topic_posts_softdeleted'] == 1))
 	{
 		$post_mode = 'delete_topic';
 	}
@@ -1718,7 +1718,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	}
 	else if ($mode == 'edit')
 	{
-		$post_mode = ($data['topic_posts'] + $data['topic_posts_unapproved'] + $data['topic_posts_softdeleted'] == 1) ? 'edit_topic' : (($data['topic_first_post_id'] == $data['post_id']) ? 'edit_first_post' : (($data['topic_last_post_id'] == $data['post_id']) ? 'edit_last_post' : 'edit'));
+		$post_mode = ($data['topic_posts_approved'] + $data['topic_posts_unapproved'] + $data['topic_posts_softdeleted'] == 1) ? 'edit_topic' : (($data['topic_first_post_id'] == $data['post_id']) ? 'edit_first_post' : (($data['topic_last_post_id'] == $data['post_id']) ? 'edit_last_post' : 'edit'));
 	}
 
 	// First of all make sure the subject and topic title are having the correct length.
@@ -1879,8 +1879,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				'topic_last_view_time'		=> $current_time,
 				'forum_id'					=> $data['forum_id'],
 				'icon_id'					=> $data['icon_id'],
-				'topic_posts'				=> ($post_visibility == ITEM_APPROVED) ? 1 : 0,
-				'topic_posts_softdeleted'	=> ($post_visibility != ITEM_APPROVED) ? 1 : 0,
+				'topic_posts_approved'		=> ($post_visibility == ITEM_APPROVED) ? 1 : 0,
+				'topic_posts_softdeleted'	=> ($post_visibility == ITEM_DELETED) ? 1 : 0,
+				'topic_posts_unapproved'	=> ($post_visibility == ITEM_UNAPPROVED) ? 1 : 0,
 				'topic_visibility'			=> $post_visibility,
 				'topic_delete_user'			=> ($post_visibility != ITEM_APPROVED) ? (int) $user->data['user_id'] : 0,
 				'topic_title'				=> $subject,
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 945b80ba41..aeaa37f4cb 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -494,7 +494,7 @@ function mcp_move_topic($topic_ids)
 				$topics_moved_softdeleted++;
 			}
 
-			$posts_moved += $topic_info['topic_posts'];
+			$posts_moved += $topic_info['topic_posts_approved'];
 			$posts_moved_unapproved += $topic_info['topic_posts_unapproved'];
 			$posts_moved_softdeleted += $topic_info['topic_posts_softdeleted'];
 		}
@@ -534,7 +534,7 @@ function mcp_move_topic($topic_ids)
 					'topic_time'			=>	(int) $row['topic_time'],
 					'topic_time_limit'		=>	(int) $row['topic_time_limit'],
 					'topic_views'			=>	(int) $row['topic_views'],
-					'topic_posts'			=>	(int) $row['topic_posts'],
+					'topic_posts_approved'	=>	(int) $row['topic_posts_approved'],
 					'topic_posts_unapproved'=>	(int) $row['topic_posts_unapproved'],
 					'topic_posts_softdeleted'=>	(int) $row['topic_posts_softdeleted'],
 					'topic_status'			=>	ITEM_MOVED,
@@ -1180,7 +1180,7 @@ function mcp_fork_topic($topic_ids)
 				'topic_title'				=> (string) $topic_row['topic_title'],
 				'topic_poster'				=> (int) $topic_row['topic_poster'],
 				'topic_time'				=> (int) $topic_row['topic_time'],
-				'topic_posts'				=> (int) $topic_row['topic_posts'],
+				'topic_posts_approved'		=> (int) $topic_row['topic_posts_approved'],
 				'topic_posts_unapproved'	=> (int) $topic_row['topic_posts_unapproved'],
 				'topic_posts_softdeleted'	=> (int) $topic_row['topic_posts_softdeleted'],
 				'topic_status'				=> (int) $topic_row['topic_status'],
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index b6a36f184a..ab2d5124af 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -932,7 +932,7 @@ class mcp_queue
 				// If the count of disapproved posts for the topic is equal
 				// to the number of unapproved posts in the topic, and there are no different
 				// posts, we disapprove the hole topic
-				if ($topic_information[$topic_id]['topic_posts'] == 0 &&
+				if ($topic_information[$topic_id]['topic_posts_approved'] == 0 &&
 					$topic_information[$topic_id]['topic_posts_softdeleted'] == 0 &&
 					$topic_information[$topic_id]['topic_posts_unapproved'] == $topic_posts_unapproved[$topic_id])
 				{
-- 
cgit v1.2.1


From f09ee162528d931aabc3f216410d02d3a072c21d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 9 Nov 2012 07:40:08 -0600
Subject: [ticket/11103] Use phpBB Container to load types/methods

PHPBB3-11103
---
 phpBB/includes/notification/manager.php            | 70 +++++++---------------
 phpBB/includes/notification/method/email.php       | 10 ++++
 phpBB/includes/notification/method/interface.php   |  7 +++
 phpBB/includes/notification/method/jabber.php      | 10 ++++
 phpBB/includes/notification/type/approve_post.php  | 10 ++++
 phpBB/includes/notification/type/approve_topic.php | 10 ++++
 phpBB/includes/notification/type/base.php          |  6 +-
 phpBB/includes/notification/type/bookmark.php      | 14 ++++-
 .../includes/notification/type/disapprove_post.php | 10 ++++
 .../notification/type/disapprove_topic.php         | 10 ++++
 phpBB/includes/notification/type/interface.php     |  7 +++
 phpBB/includes/notification/type/pm.php            | 10 ++++
 phpBB/includes/notification/type/post.php          | 14 ++++-
 phpBB/includes/notification/type/post_in_queue.php | 10 ++++
 phpBB/includes/notification/type/quote.php         | 20 +++++--
 phpBB/includes/notification/type/report_pm.php     | 10 ++++
 .../notification/type/report_pm_closed.php         | 10 ++++
 phpBB/includes/notification/type/report_post.php   | 10 ++++
 .../notification/type/report_post_closed.php       | 10 ++++
 phpBB/includes/notification/type/topic.php         | 10 ++++
 .../includes/notification/type/topic_in_queue.php  | 10 ++++
 phpBB/includes/ucp/ucp_notifications.php           | 24 ++++----
 22 files changed, 229 insertions(+), 73 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index fef93a30c2..102623ab93 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -7,6 +7,8 @@
 *
 */
 
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
 /**
 * @ignore
 */
@@ -21,6 +23,9 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_manager
 {
+	/** @var ContainerBuilder */
+	protected $phpbb_container = null;
+	
 	/** @var dbal */
 	protected $db = null;
 
@@ -55,8 +60,9 @@ class phpbb_notification_manager
 	*/
 	protected $users = array();
 
-	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(ContainerBuilder $phpbb_container, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
+		$this->phpbb_container = $phpbb_container;
 		$this->db = $db;
 		$this->cache = $cache;
 		$this->template = $template;
@@ -495,17 +501,17 @@ class phpbb_notification_manager
 	{
 		$subscription_types = array();
 
-		foreach ($this->get_subscription_files('notification/type/') as $class_name)
+		foreach ($this->phpbb_container->findTaggedServiceIds('notification.type') as $type_name => $data)
 		{
-			$class = $this->get_item_type_class($class_name);
+			$type = $this->get_item_type_class($type_name);
 
-			if ($class instanceof phpbb_notification_type_interface && $class->is_available())
+			if ($type instanceof phpbb_notification_type_interface && $type->is_available())
 			{
 				$options = array_merge(array(
-					'id'		=> $class_name,
-					'lang'		=> 'NOTIFICATION_TYPE_' . strtoupper($class_name),
+					'id'		=> $type->get_type(),
+					'lang'		=> 'NOTIFICATION_TYPE_' . strtoupper($type->get_type()),
 					'group'		=> 'NOTIFICATION_GROUP_MISCELLANEOUS',
-				), (($class_name::$notification_option !== false) ? $class_name::$notification_option : array()));
+				), (($type::$notification_option !== false) ? $type::$notification_option : array()));
 
 				$subscription_types[$options['group']][$options['id']] = $options;
 			}
@@ -531,13 +537,16 @@ class phpbb_notification_manager
 	{
 		$subscription_methods = array();
 
-		foreach ($this->get_subscription_files('notification/method/') as $class_name)
+		foreach ($this->phpbb_container->findTaggedServiceIds('notification.method') as $method_name => $data)
 		{
-			$method = $this->get_method_class($class_name);
+			$method = $this->get_method_class($method_name);
 
 			if ($method instanceof phpbb_notification_method_interface && $method->is_available())
 			{
-				$subscription_methods[] = $class_name;
+				$subscription_methods[$method_name] = array(
+					'id'		=> $method->get_type(),
+					'lang'		=> 'NOTIFICATION_METHOD_' . strtoupper($method->get_type()),
+				);
 			}
 		}
 
@@ -783,7 +792,7 @@ class phpbb_notification_manager
 	*/
 	public function get_item_type_class($item_type, $data = array())
 	{
-		$item = new $item_type($this, $this->db, $this->cache, $this->template, $this->extension_manager, $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext);
+		$item = $this->phpbb_container->get($item_type);
 
 		$item->set_initial_data($data);
 
@@ -795,43 +804,6 @@ class phpbb_notification_manager
 	*/
 	public function get_method_class($method_name)
 	{
-		return new $method_name($this, $this->db, $this->cache, $this->template, $this->extension_manager, $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext);
-	}
-
-	/**
-	* Helper to get subscription related files with the finder
-	*/
-	private function get_subscription_files($path)
-	{
-		$finder = $this->extension_manager->get_finder();
-
-		$subscription_files = array();
-
-		$classes = $finder
-			->core_path('includes/' . $path)
-			->extension_directory($path)
-			->get_classes();
-
-		if (array_search('phpbb_notification_type_interface', $classes) !== false)
-		{
-			unset($classes[array_search('phpbb_notification_type_interface', $classes)]);
-		}
-
-		if (array_search('phpbb_notification_type_base', $classes) !== false)
-		{
-			unset($classes[array_search('phpbb_notification_type_base', $classes)]);
-		}
-
-		if (array_search('phpbb_notification_method_interface', $classes) !== false)
-		{
-			unset($classes[array_search('phpbb_notification_method_interface', $classes)]);
-		}
-
-		if (array_search('phpbb_notification_method_base', $classes) !== false)
-		{
-			unset($classes[array_search('phpbb_notification_method_base', $classes)]);
-		}
-
-		return $classes;
+		return $this->phpbb_container->get($method_name);
 	}
 }
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index df7edb13e7..a47284bc61 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_method_email extends phpbb_notification_method_base
 {
+	/**
+	* Get notification method name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'email';
+	}
+
 	/**
 	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
 	*
diff --git a/phpBB/includes/notification/method/interface.php b/phpBB/includes/notification/method/interface.php
index 3c6c757d5c..ef875942cc 100644
--- a/phpBB/includes/notification/method/interface.php
+++ b/phpBB/includes/notification/method/interface.php
@@ -21,6 +21,13 @@ if (!defined('IN_PHPBB'))
 */
 interface phpbb_notification_method_interface
 {
+	/**
+	* Get notification method name
+	*
+	* @return string
+	*/
+	public function get_type();
+
 	/**
 	* Is this method available for the user?
 	* This is checked on the notifications options
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
index 664e387d61..fc43d8d4b9 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/includes/notification/method/jabber.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_method_jabber extends phpbb_notification_method_email
 {
+	/**
+	* Get notification method name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'jabber';
+	}
+
 	/**
 	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
 	*
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index d79bc6ae13..38ff3f1d70 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'approve_post';
+	}
+	
 	/**
 	* Language key used to output the text
 	*
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 605965bf2f..5b9ea409fe 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_approve_topic extends phpbb_notification_type_topic
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'approve_topic';
+	}
+	
 	/**
 	* Language key used to output the text
 	*
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index fdd8a5b9cb..2b201c2752 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -116,7 +116,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 	public function __toString()
 	{
-		return (!empty($this->data)) ? var_export($this->data, true) : get_class($this);
+		return (!empty($this->data)) ? var_export($this->data, true) : $this->get_type();
 	}
 
 	/**
@@ -156,7 +156,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		// Defaults
 		$this->data = array_merge(array(
 			'item_id'				=> static::get_item_id($type_data),
-			'item_type'	   			=> get_class($this),
+			'item_type'	   			=> $this->get_type(),
 			'item_parent_id'		=> static::get_item_parent_id($type_data),
 
 			'time'					=> time(),
@@ -319,7 +319,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
-			'item_type'			=> get_class($this),
+			'item_type'			=> $this->get_type(),
 			'item_id'			=> 0, // Global by default
 		), $options);
 
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index 6fe00d9dd0..e5ad4132fb 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'bookmark';
+	}
+
 	/**
 	* Language key used to output the text
 	*
@@ -93,7 +103,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 		$update_notifications = array();
 		$sql = 'SELECT *
 			FROM ' . NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . get_class($this) . "'
+			WHERE item_type = '" . $this->get_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
 				AND is_enabled = 1';
@@ -103,7 +113,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 			// Do not create a new notification
 			unset($notify_users[$row['user_id']]);
 
-			$notification = $this->notification_manager->get_item_type_class(get_class($this), $row);
+			$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
 			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
 				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
 				WHERE notification_id = ' . $row['notification_id'];
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
index ddacd4d367..d1d56086e7 100644
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ b/phpBB/includes/notification/type/disapprove_post.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_disapprove_post extends phpbb_notification_type_approve_post
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'disapprove_post';
+	}
+
 	/**
 	* Language key used to output the text
 	*
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
index dfda4f8371..7affaa8afa 100644
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ b/phpBB/includes/notification/type/disapprove_topic.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_approve_topic
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'disapprove_topic';
+	}
+
 	/**
 	* Language key used to output the text
 	*
diff --git a/phpBB/includes/notification/type/interface.php b/phpBB/includes/notification/type/interface.php
index 9d9965261e..a40fdafd09 100644
--- a/phpBB/includes/notification/type/interface.php
+++ b/phpBB/includes/notification/type/interface.php
@@ -21,6 +21,13 @@ if (!defined('IN_PHPBB'))
 */
 interface phpbb_notification_type_interface
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type();
+	
 	/**
 	* Set initial data from the database
 	*
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index 1c38002892..fbdf351062 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_pm extends phpbb_notification_type_base
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'pm';
+	}
+
 	/**
 	* Notification option data (for outputting to the user)
 	*
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index b1a3ee9a26..a99558efe7 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_post extends phpbb_notification_type_base
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'post';
+	}
+
 	/**
 	* Language key used to output the text
 	*
@@ -114,7 +124,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		$update_notifications = array();
 		$sql = 'SELECT *
 			FROM ' . NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . get_class($this) . "'
+			WHERE item_type = '" . $this->get_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
 				AND is_enabled = 1';
@@ -124,7 +134,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			// Do not create a new notification
 			unset($notify_users[$row['user_id']]);
 
-			$notification = $this->notification_manager->get_item_type_class(get_class($this), $row);
+			$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
 			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
 				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
 				WHERE notification_id = ' . $row['notification_id'];
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index e9e7c6120e..95e0ce02bb 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'post_in_queue';
+	}
+
 	/**
 	* Language key used to output the text
 	*
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index c9f0f923c1..c3763da229 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_quote extends phpbb_notification_type_post
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'quote';
+	}
+
 	/**
 	* regular expression to match to find usernames
 	*
@@ -112,7 +122,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		$update_notifications = array();
 		$sql = 'SELECT *
 			FROM ' . NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . get_class($this) . "'
+			WHERE item_type = '" . $this->get_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
 				AND is_enabled = 1';
@@ -122,7 +132,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 			// Do not create a new notification
 			unset($notify_users[$row['user_id']]);
 
-			$notification = $this->notification_manager->get_item_type_class(get_class($this), $row);
+			$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
 			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
 				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
 				WHERE notification_id = ' . $row['notification_id'];
@@ -143,7 +153,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		$old_notifications = array();
 		$sql = 'SELECT user_id
 			FROM ' . NOTIFICATIONS_TABLE . "
-			WHERE item_type = '" . get_class($this) . "'
+			WHERE item_type = '" . $this->get_type() . "'
 				AND item_id = " . self::get_item_id($post) . '
 				AND is_enabled = 1';
 		$result = $this->db->sql_query($sql);
@@ -167,13 +177,13 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		}
 
 		// Add the necessary notifications
-		$this->notification_manager->add_notifications_for_users(get_class($this), $post, $add_notifications);
+		$this->notification_manager->add_notifications_for_users($this->get_type(), $post, $add_notifications);
 
 		// Remove the necessary notifications
 		if (!empty($remove_notifications))
 		{
 			$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
-				WHERE item_type = '" . get_class($this) . "'
+				WHERE item_type = '" . $this->get_type() . "'
 					AND item_id = " . self::get_item_id($post) . '
 					AND ' . $this->db->sql_in_set('user_id', $remove_notifications);
 			$this->db->sql_query($sql);
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 63d153bd27..2841468475 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'report_pm';
+	}
+
 	/**
 	* Language key used to output the text
 	*
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index c86fe77b0e..de87c9f760 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_pm
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'report_pm_closed';
+	}
+
 	/**
 	* Email template to use to send notifications
 	*
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index 26dd9512bf..433a5e835d 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_report_post extends phpbb_notification_type_post_in_queue
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'report_post';
+	}
+
 	/**
 	* Language key used to output the text
 	*
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index 7454760dc0..cde0ff85a8 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_report_post_closed extends phpbb_notification_type_post
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'report_post_closed';
+	}
+
 	/**
 	* Email template to use to send notifications
 	*
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index db268fa53e..4eb03194f5 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_topic extends phpbb_notification_type_base
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'topic';
+	}
+
 	/**
 	* Language key used to output the text
 	*
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index 66aecb0d05..38bc2ab58d 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -23,6 +23,16 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_topic
 {
+	/**
+	* Get notification type name
+	*
+	* @return string
+	*/
+	public function get_type()
+	{
+		return 'topic_in_queue';
+	}
+
 	/**
 	* Language key used to output the text
 	*
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 8810ac9ce6..e8ceac3f59 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -48,15 +48,15 @@ class ucp_notifications
 					{
 						foreach($subscription_types as $type => $data)
 						{
-							foreach($notification_methods as $method)
+							foreach($notification_methods as $method => $method_data)
 							{
-								if ($request->is_set_post($type . '_' . $method) && (!isset($subscriptions[$type]) || !in_array($method, $subscriptions[$type])))
+								if ($request->is_set_post($type . '_' . $method_data['id']) && (!isset($subscriptions[$type]) || !in_array($method_data['id'], $subscriptions[$type])))
 								{
-									$phpbb_notifications->add_subscription($type, 0, $method);
+									$phpbb_notifications->add_subscription($type, 0, $method_data['id']);
 								}
-								else if (!$request->is_set_post($type . '_' . $method) && isset($subscriptions[$type]) && in_array($method, $subscriptions[$type]))
+								else if (!$request->is_set_post($type . '_' . $method_data['id']) && isset($subscriptions[$type]) && in_array($method_data['id'], $subscriptions[$type]))
 								{
-									$phpbb_notifications->delete_subscription($type, 0, $method);
+									$phpbb_notifications->delete_subscription($type, 0, $method_data['id']);
 								}
 							}
 
@@ -186,14 +186,14 @@ class ucp_notifications
 					'SUBSCRIBED'		=> (isset($subscriptions[$type])) ? true : false,
 				));
 
-				foreach($notification_methods as $method)
+				foreach($notification_methods as $method => $method_data)
 				{
 					$template->assign_block_vars($block . '.notification_methods', array(
-						'METHOD'			=> $method,
+						'METHOD'			=> $method_data['id'],
 
-						'NAME'				=> $user->lang(strtoupper($method)),
+						'NAME'				=> $user->lang($method_data['lang']),
 
-						'SUBSCRIBED'		=> (isset($subscriptions[$type]) && in_array($method, $subscriptions[$type])) ? true : false,
+						'SUBSCRIBED'		=> (isset($subscriptions[$type]) && in_array($method_data['id'], $subscriptions[$type])) ? true : false,
 					));
 				}
 			}
@@ -212,12 +212,12 @@ class ucp_notifications
 	{
 		$notification_methods = $phpbb_notifications->get_subscription_methods();
 
-		foreach($notification_methods as $method)
+		foreach($notification_methods as $method => $method_data)
 		{
 			$template->assign_block_vars($block, array(
-				'METHOD'			=> $method,
+				'METHOD'			=> $method_data['id'],
 
-				'NAME'				=> $user->lang(strtoupper($method)),
+				'NAME'				=> $user->lang($method_data['lang']),
 			));
 		}
 	}
-- 
cgit v1.2.1


From b8bdcc957bc49b96d43d74077c95a55f4f88e2fa Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 9 Nov 2012 07:45:23 -0600
Subject: [ticket/11103] count is reserved, do not use in a SQL query

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 102623ab93..ca018fbf3b 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -122,25 +122,25 @@ class phpbb_notification_manager
 		if ($options['count_unread'])
 		{
 			// Get the total number of unread notifications
-			$sql = 'SELECT COUNT(*) AS count
+			$sql = 'SELECT COUNT(*) AS unread_count
 				FROM ' . NOTIFICATIONS_TABLE . '
 				WHERE user_id = ' . (int) $options['user_id'] . '
 					AND unread = 1
 					AND is_enabled = 1';
 			$result = $this->db->sql_query($sql);
-			$unread_count = (int) $this->db->sql_fetchfield('count', $result);
+			$unread_count = (int) $this->db->sql_fetchfield('unread_count', $result);
 			$this->db->sql_freeresult($result);
 		}
 
 		if ($options['count_total'])
 		{
 			// Get the total number of notifications
-			$sql = 'SELECT COUNT(*) AS count
+			$sql = 'SELECT COUNT(*) AS total_count
 				FROM ' . NOTIFICATIONS_TABLE . '
 				WHERE user_id = ' . (int) $options['user_id'] . '
 					AND is_enabled = 1';
 			$result = $this->db->sql_query($sql);
-			$total_count = (int) $this->db->sql_fetchfield('count', $result);
+			$total_count = (int) $this->db->sql_fetchfield('total_count', $result);
 			$this->db->sql_freeresult($result);
 		}
 
@@ -675,7 +675,7 @@ class phpbb_notification_manager
 		// If no method, make sure that no other notification methods for this item are selected before deleting
 		if ($method === '')
 		{
-			$sql = 'SELECT COUNT(*) as count
+			$sql = 'SELECT COUNT(*) as num_notifications
 				FROM ' . USER_NOTIFICATIONS_TABLE . "
 				WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 					AND item_id = " . (int) $item_id . '
@@ -683,10 +683,10 @@ class phpbb_notification_manager
 					AND method <> ''
 					AND notify = 1";
 			$this->db->sql_query($sql);
-			$count = $this->db->sql_fetchfield('count');
+			$num_notifications = $this->db->sql_fetchfield('num_notifications');
 			$this->db->sql_freeresult();
 
-			if ($count)
+			if ($num_notifications)
 			{
 				return;
 			}
-- 
cgit v1.2.1


From 6a0f6833e61532d28d7bebcc8ad0ec2b2b722e19 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 9 Nov 2012 07:48:18 -0600
Subject: [ticket/11103] Comment indentation

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index ca018fbf3b..8392928bd2 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -716,9 +716,10 @@ class phpbb_notification_manager
 
 	/**
 	* Disable all notifications of a certain type
-	* 	This should be called when an extension which has notification types
-	* 	is disabled so that all those notifications are hidden and do not
-	* 	cause errors
+	*
+	* This should be called when an extension which has notification types
+	* is disabled so that all those notifications are hidden and do not
+	* cause errors
 	*
 	* @param string $item_type
 	*/
@@ -732,9 +733,10 @@ class phpbb_notification_manager
 
 	/**
 	* Enable all notifications of a certain type
-	* 	This should be called when an extension which has notification types
-	* 	that was disabled is re-enabled so that all those notifications that
-	*	were hidden are shown again
+	*
+	* This should be called when an extension which has notification types
+	* that was disabled is re-enabled so that all those notifications that
+	* were hidden are shown again
 	*
 	* @param string $item_type
 	*/
-- 
cgit v1.2.1


From 6c8c54d4d2575cd40fe873cd2108b031ae5830a6 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 9 Nov 2012 08:48:41 -0600
Subject: [ticket/11103] Inject table prefix to notifications system instead of
 constants

PHPBB3-11103
---
 phpBB/includes/constants.php              |  3 --
 phpBB/includes/notification/manager.php   | 52 ++++++++++++++++++-------------
 phpBB/includes/notification/type/base.php | 12 ++++++-
 3 files changed, 42 insertions(+), 25 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 7a3c73e987..5128321618 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -239,7 +239,6 @@ define('LOG_TABLE',					$table_prefix . 'log');
 define('LOGIN_ATTEMPT_TABLE',		$table_prefix . 'login_attempts');
 define('MODERATOR_CACHE_TABLE',		$table_prefix . 'moderator_cache');
 define('MODULES_TABLE',				$table_prefix . 'modules');
-define('NOTIFICATIONS_TABLE',		$table_prefix . 'notifications');
 define('POLL_OPTIONS_TABLE',		$table_prefix . 'poll_options');
 define('POLL_VOTES_TABLE',			$table_prefix . 'poll_votes');
 define('POSTS_TABLE',				$table_prefix . 'posts');
@@ -273,11 +272,9 @@ define('TOPICS_POSTED_TABLE',		$table_prefix . 'topics_posted');
 define('TOPICS_TRACK_TABLE',		$table_prefix . 'topics_track');
 define('TOPICS_WATCH_TABLE',		$table_prefix . 'topics_watch');
 define('USER_GROUP_TABLE',			$table_prefix . 'user_group');
-define('USER_NOTIFICATIONS_TABLE',	$table_prefix . 'user_notifications');
 define('USERS_TABLE',				$table_prefix . 'users');
 define('WARNINGS_TABLE',			$table_prefix . 'warnings');
 define('WORDS_TABLE',				$table_prefix . 'words');
 define('ZEBRA_TABLE',				$table_prefix . 'zebra');
 
 // Additional tables
-
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 8392928bd2..3d0ada4a43 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -53,6 +53,12 @@ class phpbb_notification_manager
 	/** @var string */
 	protected $php_ext = null;
 
+	/** @var string */
+	protected $notifications_table = null;
+
+	/** @var string */
+	protected $user_notifications_table = null;
+
 	/**
 	* Users loaded from the DB
 	*
@@ -60,7 +66,7 @@ class phpbb_notification_manager
 	*/
 	protected $users = array();
 
-	public function __construct(ContainerBuilder $phpbb_container, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(ContainerBuilder $phpbb_container, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
 	{
 		$this->phpbb_container = $phpbb_container;
 		$this->db = $db;
@@ -70,8 +76,12 @@ class phpbb_notification_manager
 		$this->user = $user;
 		$this->auth = $auth;
 		$this->config = $config;
+
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
+
+		$this->notifications_table = $notifications_table;
+		$this->user_notifications_table = $user_notifications_table;
 	}
 
 	/**
@@ -123,7 +133,7 @@ class phpbb_notification_manager
 		{
 			// Get the total number of unread notifications
 			$sql = 'SELECT COUNT(*) AS unread_count
-				FROM ' . NOTIFICATIONS_TABLE . '
+				FROM ' . $this->notifications_table . '
 				WHERE user_id = ' . (int) $options['user_id'] . '
 					AND unread = 1
 					AND is_enabled = 1';
@@ -136,7 +146,7 @@ class phpbb_notification_manager
 		{
 			// Get the total number of notifications
 			$sql = 'SELECT COUNT(*) AS total_count
-				FROM ' . NOTIFICATIONS_TABLE . '
+				FROM ' . $this->notifications_table . '
 				WHERE user_id = ' . (int) $options['user_id'] . '
 					AND is_enabled = 1';
 			$result = $this->db->sql_query($sql);
@@ -150,7 +160,7 @@ class phpbb_notification_manager
 
 			// Get the main notifications
 			$sql = 'SELECT *
-				FROM ' . NOTIFICATIONS_TABLE . '
+				FROM ' . $this->notifications_table . '
 				WHERE user_id = ' . (int) $options['user_id'] .
 					(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('notification_id', $options['notification_id']) : ' AND notification_id = ' . (int) $options['notification_id']) : '') . '
 			 		AND is_enabled = 1
@@ -167,7 +177,7 @@ class phpbb_notification_manager
 			if ($unread_count && $options['all_unread'] && !empty($rowset))
 			{
 				$sql = 'SELECT *
-					FROM ' . NOTIFICATIONS_TABLE . '
+					FROM ' . $this->notifications_table . '
 					WHERE user_id = ' . (int) $options['user_id'] . '
 						AND unread = 1
 						AND ' . $this->db->sql_in_set('notification_id', array_keys($rowset), true) . '
@@ -239,7 +249,7 @@ class phpbb_notification_manager
 
 		$time = ($time !== false) ? $time : time();
 
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET unread = 0
 			WHERE time <= " . $time .
 				(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
@@ -270,7 +280,7 @@ class phpbb_notification_manager
 
 		$time = ($time !== false) ? $time : time();
 
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET unread = 0
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 				AND time <= " . $time .
@@ -289,7 +299,7 @@ class phpbb_notification_manager
 	{
 		$time = ($time !== false) ? $time : time();
 
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET unread = 0
 			WHERE time <= " . $time . '
 				AND ' . ((is_array($notification_id)) ? $this->db->sql_in_set('notification_id', $notification_id) : 'notification_id = ' . (int) $notification_id);
@@ -365,7 +375,7 @@ class phpbb_notification_manager
 		// Make sure not to send new notifications to users who've already been notified about this item
 		// This may happen when an item was added, but now new users are able to see the item
 		$sql = 'SELECT user_id
-			FROM ' . NOTIFICATIONS_TABLE . "
+			FROM ' . $this->notifications_table . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 				AND item_id = " . (int) $item_id . '
 				AND is_enabled = 1';
@@ -415,7 +425,7 @@ class phpbb_notification_manager
 		}
 
 		// insert into the db
-		$this->db->sql_multi_insert(NOTIFICATIONS_TABLE, $new_rows);
+		$this->db->sql_multi_insert($this->notifications_table, $new_rows);
 
 		// We need to load all of the users to send notifications
 		$this->load_users($user_ids);
@@ -460,7 +470,7 @@ class phpbb_notification_manager
 		$item_id = $item_type::get_item_id($data);
 		$update_array = $notification->create_update_array($data);
 
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+		$sql = 'UPDATE ' . $this->notifications_table . '
 			SET ' . $this->db->sql_build_array('UPDATE', $update_array) . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 				AND item_id = " . (int) $item_id;
@@ -486,7 +496,7 @@ class phpbb_notification_manager
 			return;
 		}
 
-		$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
+		$sql = 'DELETE FROM ' . $this->notifications_table . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 				AND " . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id);
 		$this->db->sql_query($sql);
@@ -571,7 +581,7 @@ class phpbb_notification_manager
 			foreach ($types as $id => $type)
 			{
 				$sql = 'SELECT method, notify
-					FROM ' . USER_NOTIFICATIONS_TABLE . '
+					FROM ' . $this->user_notifications_table . '
 					WHERE user_id = ' . (int) $user_id . "
 						AND item_type = '" . $this->db->sql_escape($id) . "'
 						AND item_id = 0";
@@ -627,7 +637,7 @@ class phpbb_notification_manager
 		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
 		$sql = 'SELECT notify
-			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			FROM ' . $this->user_notifications_table . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 				AND item_id = " . (int) $item_id . '
 				AND user_id = ' .(int) $user_id . "
@@ -638,7 +648,7 @@ class phpbb_notification_manager
 
 		if ($current === false)
 		{
-			$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
+			$sql = 'INSERT INTO ' . $this->user_notifications_table . ' ' .
 				$this->db->sql_build_array('INSERT', array(
 					'item_type'		=> $item_type,
 					'item_id'		=> (int) $item_id,
@@ -650,7 +660,7 @@ class phpbb_notification_manager
 		}
 		else if (!$current)
 		{
-			$sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . "
+			$sql = 'UPDATE ' . $this->user_notifications_table . "
 				SET notify = 1
 				WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 					AND item_id = " . (int) $item_id . '
@@ -676,7 +686,7 @@ class phpbb_notification_manager
 		if ($method === '')
 		{
 			$sql = 'SELECT COUNT(*) as num_notifications
-				FROM ' . USER_NOTIFICATIONS_TABLE . "
+				FROM ' . $this->user_notifications_table . "
 				WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 					AND item_id = " . (int) $item_id . '
 					AND user_id = ' .(int) $user_id . "
@@ -692,7 +702,7 @@ class phpbb_notification_manager
 			}
 		}
 
-		$sql = 'UPDATE ' . USER_NOTIFICATIONS_TABLE . "
+		$sql = 'UPDATE ' . $this->user_notifications_table . "
 			SET notify = 0
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
 				AND item_id = " . (int) $item_id . '
@@ -702,7 +712,7 @@ class phpbb_notification_manager
 
 		if (!$this->db->sql_affectedrows())
 		{
-			$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
+			$sql = 'INSERT INTO ' . $this->user_notifications_table . ' ' .
 				$this->db->sql_build_array('INSERT', array(
 					'item_type'		=> $item_type,
 					'item_id'		=> (int) $item_id,
@@ -725,7 +735,7 @@ class phpbb_notification_manager
 	*/
 	public function disable_notifications($item_type)
 	{
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET is_enabled = 0
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
 		$this->db->sql_query($sql);
@@ -742,7 +752,7 @@ class phpbb_notification_manager
 	*/
 	public function enable_notifications($item_type)
 	{
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET is_enabled = 1
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
 		$this->db->sql_query($sql);
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 2b201c2752..419dce3dd0 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -51,6 +51,12 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/** @var string */
 	protected $php_ext = null;
 
+	/** @var string */
+	protected $notifications_table = null;
+
+	/** @var string */
+	protected $user_notifications_table = null;
+
 	/**
 	* Notification option data (for outputting to the user)
 	*
@@ -78,7 +84,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	private $data = array();
 
-	public function __construct(phpbb_notification_manager $notification_manager, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_notification_manager $notification_manager, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
 	{
 		$this->notification_manager = $notification_manager;
 		$this->db = $db;
@@ -88,8 +94,12 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		$this->user = $user;
 		$this->auth = $auth;
 		$this->config = $config;
+
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
+
+		$this->notifications_table = $notifications_table;
+		$this->user_notifications_table = $user_notifications_table;
 	}
 
 	/**
-- 
cgit v1.2.1


From f77a6eaab5485329a3b13922649fb8902e6e397f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 10 Nov 2012 11:24:52 +0100
Subject: [feature/soft-delete] Fix the rest of *_approved and the delete_post
 unit test

PHPBB3-9567
---
 phpBB/includes/acp/acp_forums.php     |  2 +-
 phpBB/includes/acp/acp_users.php      |  4 ++--
 phpBB/includes/content_visibility.php | 10 +++++-----
 phpBB/includes/functions_admin.php    | 10 +++++-----
 phpBB/includes/functions_posting.php  | 15 +++++++--------
 phpBB/includes/mcp/mcp_forum.php      |  2 +-
 phpBB/includes/mcp/mcp_main.php       | 12 ++++++------
 phpBB/includes/mcp/mcp_queue.php      |  6 +++---
 phpBB/includes/mcp/mcp_reports.php    |  6 +++---
 9 files changed, 33 insertions(+), 34 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index bb91acba74..e8f0a01b2e 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -283,7 +283,7 @@ class acp_forums
 
 				@set_time_limit(0);
 
-				$sql = 'SELECT forum_name, (forum_topics + forum_topics_unapproved + forum_topics_softdeleted) AS total_topics
+				$sql = 'SELECT forum_name, (forum_topics_approved + forum_topics_unapproved + forum_topics_softdeleted) AS total_topics
 					FROM ' . FORUMS_TABLE . "
 					WHERE forum_id = $forum_id";
 				$result = $db->sql_query($sql);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 1a3511bc50..bb5b4a04d5 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -636,14 +636,14 @@ class acp_users
 
 							if (sizeof($topic_id_ary))
 							{
-								$sql = 'SELECT topic_id, forum_id, topic_title, topic_posts, topic_posts_unapproved, topic_posts_softdeleted, topic_attachment
+								$sql = 'SELECT topic_id, forum_id, topic_title, topic_posts_approved, topic_posts_unapproved, topic_posts_softdeleted, topic_attachment
 									FROM ' . TOPICS_TABLE . '
 									WHERE ' . $db->sql_in_set('topic_id', array_keys($topic_id_ary));
 								$result = $db->sql_query($sql);
 
 								while ($row = $db->sql_fetchrow($result))
 								{
-									if ($topic_id_ary[$row['topic_id']][ITEM_APPROVED] == $row['topic_posts']
+									if ($topic_id_ary[$row['topic_id']][ITEM_APPROVED] == $row['topic_posts_approved']
 									 && $topic_id_ary[$row['topic_id']][ITEM_UNAPPROVED] == $row['topic_posts_unapproved']
 									 && $topic_id_ary[$row['topic_id']][ITEM_DELETED] == $row['topic_posts_softdeleted'])
 									{
diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index bea70571f9..3118be6574 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -516,9 +516,9 @@ class phpbb_content_visibility
 	*/
 	static public function add_post_to_statistic($data, &$sql_data)
 	{
-		$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies = topic_replies + 1';
+		$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts_approved = topic_posts_approved + 1';
 
-		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts + 1';
+		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts_approved = forum_posts_approved + 1';
 
 		if ($data['post_postcount'])
 		{
@@ -537,8 +537,8 @@ class phpbb_content_visibility
 	*/
 	static public function remove_post_from_statistic($data, &$sql_data)
 	{
-		$sql_data[TOPICS_TABLE] = ((!empty($sql_data[TOPICS_TABLE])) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts = topic_posts - 1';
-		$sql_data[FORUMS_TABLE] = ((!empty($sql_data[FORUMS_TABLE])) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts - 1';
+		$sql_data[TOPICS_TABLE] = ((!empty($sql_data[TOPICS_TABLE])) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts_approved = topic_posts_approved - 1';
+		$sql_data[FORUMS_TABLE] = ((!empty($sql_data[FORUMS_TABLE])) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts_approved = forum_posts_approved - 1';
 
 		if ($data['post_postcount'])
 		{
@@ -579,7 +579,7 @@ class phpbb_content_visibility
 		$sql_data[FORUMS_TABLE] .= ', forum_posts_softdeleted = forum_posts_softdeleted - ' . $topic_row['topic_posts_softdeleted'];
 
 		set_config_count('num_topics', -1, true);
-		set_config_count('num_posts', $topic_row['topic_posts'] * (-1), true);
+		set_config_count('num_posts', $topic_row['topic_posts_approved'] * (-1), true);
 
 		// Get user post count information
 		$sql = 'SELECT poster_id, COUNT(post_id) AS num_posts
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 2bf36d967a..5cbe234347 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1707,7 +1707,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 					if ($row['topic_visibility'] == ITEM_APPROVED)
 					{
-						$forum_data[$forum_id]['topics'] = $row['total_topics'];
+						$forum_data[$forum_id]['topics_approved'] = $row['total_topics'];
 					}
 					else if ($row['topic_visibility'] == ITEM_UNAPPROVED)
 					{
@@ -1726,14 +1726,14 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			{
 				if (sizeof($forum_ids) == 1)
 				{
-					$sql = 'SELECT SUM(t.topic_posts) AS forum_posts, SUM(t.topic_posts_unapproved) AS forum_posts_unapproved, SUM(t.topic_posts_softdeleted) AS forum_posts_softdeleted
+					$sql = 'SELECT SUM(t.topic_posts_approved) AS forum_posts_approved, SUM(t.topic_posts_unapproved) AS forum_posts_unapproved, SUM(t.topic_posts_softdeleted) AS forum_posts_softdeleted
 						FROM ' . TOPICS_TABLE . ' t
 						WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
 							AND t.topic_status <> ' . ITEM_MOVED;
 				}
 				else
 				{
-					$sql = 'SELECT t.forum_id, SUM(t.topic_posts) AS forum_posts, SUM(t.topic_posts_unapproved) AS forum_posts_unapproved, SUM(t.topic_posts_softdeleted) AS forum_posts_softdeleted
+					$sql = 'SELECT t.forum_id, SUM(t.topic_posts_approved) AS forum_posts_approved, SUM(t.topic_posts_unapproved) AS forum_posts_unapproved, SUM(t.topic_posts_softdeleted) AS forum_posts_softdeleted
 						FROM ' . TOPICS_TABLE . ' t
 						WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . '
 							AND t.topic_status <> ' . ITEM_MOVED . '
@@ -1746,7 +1746,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 				{
 					$forum_id = (sizeof($forum_ids) == 1) ? (int) $forum_ids[0] : (int) $row['forum_id'];
 
-					$forum_data[$forum_id]['posts_approved'] = (int) $row['forum_posts'];
+					$forum_data[$forum_id]['posts_approved'] = (int) $row['forum_posts_approved'];
 					$forum_data[$forum_id]['posts_unapproved'] = (int) $row['forum_posts_unapproved'];
 					$forum_data[$forum_id]['posts_softdeleted'] = (int) $row['forum_posts_softdeleted'];
 				}
@@ -1868,7 +1868,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 
 			$db->sql_transaction('begin');
 
-			$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_visibility, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_posts, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
+			$sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_visibility, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time
 				FROM ' . TOPICS_TABLE . " t
 				$where_sql";
 			$result = $db->sql_query($sql);
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 62567e302a..53beb6ac76 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1491,7 +1491,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 				// counting is fun! we only have to do sizeof($forum_ids) number of queries,
 				// even if the topic is moved back to where its shadow lives (we count how many times it is in a forum)
 				$sql = 'UPDATE ' . FORUMS_TABLE . '
-					SET forum_topics = forum_topics - ' . $topic_count . '
+					SET forum_topics_approved = forum_topics_approved - ' . $topic_count . '
 					WHERE forum_id = ' . $updated_forum;
 				$db->sql_query($sql);
 				update_post_information('forum', $updated_forum);
@@ -1508,7 +1508,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 
 				if ($data['topic_visibility'] == ITEM_APPROVED)
 				{
-					$sql_data[FORUMS_TABLE] .= 'forum_posts = forum_posts - 1, forum_topics = forum_topics - 1';
+					$sql_data[FORUMS_TABLE] .= 'forum_posts_approved = forum_posts_approved - 1, forum_topics_approved = forum_topics_approved - 1';
 				}
 				else if ($data['topic_visibility'] == ITEM_UNAPPROVED)
 				{
@@ -1609,7 +1609,6 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 		break;
 	}
 
-
 	if (($post_mode == 'delete') || ($post_mode == 'delete_last_post') || ($post_mode == 'delete_first_post'))
 	{
 		if (!$is_soft)
@@ -1733,7 +1732,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	// Retrieve some additional information if not present
 	if ($mode == 'edit' && (!isset($data['post_visibility']) || !isset($data['topic_visibility']) || $data['post_visibility'] === false || $data['topic_visibility'] === false))
 	{
-		$sql = 'SELECT p.post_visibility, t.topic_type, t.topic_posts, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_visibility
+		$sql = 'SELECT p.post_visibility, t.topic_type, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_visibility
 			FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p
 			WHERE t.topic_id = p.topic_id
 				AND p.post_id = ' . $data['post_id'];
@@ -1919,8 +1918,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 
 			if ($post_visibility == ITEM_APPROVED)
 			{
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics = forum_topics + 1';
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
+				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_approved = forum_topics_approved + 1';
+				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts_approved = forum_posts_approved + 1';
 			}
 			else if ($post_visibility == ITEM_UNAPPROVED)
 			{
@@ -1938,7 +1937,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			$sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_view_time = ' . $current_time . ',
 				topic_bumped = 0,
 				topic_bumper = 0' .
-				(($post_visibility == ITEM_APPROVED) ? ', topic_posts = topic_posts + 1' : '') .
+				(($post_visibility == ITEM_APPROVED) ? ', topic_posts_approved = topic_posts_approved + 1' : '') .
 				(($post_visibility == ITEM_UNAPPROVED) ? ', topic_posts_unapproved = topic_posts_unapproved + 1' : '') .
 				(($post_visibility == ITEM_DELETED) ? ', topic_posts_softdeleted = topic_posts_softdeleted + 1' : '') .
 				((!empty($data['attachment_data']) || (isset($data['topic_attachment']) && $data['topic_attachment'])) ? ', topic_attachment = 1' : '');
@@ -1947,7 +1946,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 
 			if ($post_visibility == ITEM_APPROVED)
 			{
-				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1';
+				$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts_approved = forum_posts_approved + 1';
 			}
 			else if ($post_visibility == ITEM_UNAPPROVED)
 			{
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index bacc4c444c..7c3bffe717 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -98,7 +98,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 	$sort_by_sql = $sort_order_sql = array();
 	mcp_sorting('viewforum', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id);
 
-	$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total;
+	$forum_topics = ($total == -1) ? $forum_info['forum_topics_approved'] : $total;
 	$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
 
 	$base_url = $url . "&amp;i=$id&amp;action=$action&amp;mode=$mode&amp;sd=$sort_dir&amp;sk=$sort_key&amp;st=$sort_days" . (($merge_select) ? $selected_ids : '');
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index aeaa37f4cb..d8ef3e261b 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -570,8 +570,8 @@ function mcp_move_topic($topic_ids)
 		$sync_sql = array();
 		if ($posts_moved)
 		{
-			$sync_sql[$to_forum_id][] = 'forum_posts = forum_posts + ' . (int) $posts_moved;
-			$sync_sql[$forum_id][] = 'forum_posts = forum_posts - ' . (int) $posts_moved;
+			$sync_sql[$to_forum_id][] = 'forum_posts_approved = forum_posts_approved + ' . (int) $posts_moved;
+			$sync_sql[$forum_id][] = 'forum_posts_approved = forum_posts_approved - ' . (int) $posts_moved;
 		}
 		if ($posts_moved_unapproved)
 		{
@@ -586,10 +586,10 @@ function mcp_move_topic($topic_ids)
 
 		if ($topics_moved)
 		{
-			$sync_sql[$to_forum_id][] = 'forum_topics = forum_topics + ' . (int) $topics_moved;
+			$sync_sql[$to_forum_id][] = 'forum_topics_approved = forum_topics_approved + ' . (int) $topics_moved;
 			if ($topics_moved - $shadow_topics > 0)
 			{
-				$sync_sql[$forum_id][] = 'forum_topics = forum_topics - ' . (int) ($topics_moved - $shadow_topics);
+				$sync_sql[$forum_id][] = 'forum_topics_approved = forum_topics_approved - ' . (int) ($topics_moved - $shadow_topics);
 			}
 		}
 		if ($topics_moved_unapproved)
@@ -1348,8 +1348,8 @@ function mcp_fork_topic($topic_ids)
 
 		// Sync new topics, parent forums and board stats
 		$sql = 'UPDATE ' . FORUMS_TABLE . '
-			SET forum_posts = forum_posts + ' . $total_posts . ',
-				forum_topics = forum_topics + ' . sizeof($new_topic_id_list) . '
+			SET forum_posts_approved = forum_posts_approved + ' . $total_posts . ',
+				forum_topics_approved = forum_topics_approved + ' . sizeof($new_topic_id_list) . '
 			WHERE forum_id = ' . $to_forum_id;
 		$db->sql_query($sql);
 
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index ab2d5124af..e56aa17ee8 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -305,11 +305,11 @@ class mcp_queue
 						trigger_error('NOT_MODERATOR');
 					}
 
-					$sql = 'SELECT SUM(forum_topics) as sum_forum_topics
+					$sql = 'SELECT SUM(forum_topics_approved) as sum_forum_topics
 						FROM ' . FORUMS_TABLE . '
 						WHERE ' . $db->sql_in_set('forum_id', $forum_list);
 					$result = $db->sql_query($sql);
-					$forum_info['forum_topics'] = (int) $db->sql_fetchfield('sum_forum_topics');
+					$forum_info['forum_topics_approved'] = (int) $db->sql_fetchfield('sum_forum_topics');
 					$db->sql_freeresult($result);
 				}
 				else
@@ -336,7 +336,7 @@ class mcp_queue
 				$sort_by_sql = $sort_order_sql = array();
 				mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
 
-				$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total;
+				$forum_topics = ($total == -1) ? $forum_info['forum_topics_approved'] : $total;
 				$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
 
 				$forum_names = array();
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index dc917a25e0..38d2ea48fa 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -295,11 +295,11 @@ class mcp_reports
 
 					$global_id = $forum_list[0];
 
-					$sql = 'SELECT SUM(forum_topics) as sum_forum_topics
+					$sql = 'SELECT SUM(forum_topics_approved) as sum_forum_topics
 						FROM ' . FORUMS_TABLE . '
 						WHERE ' . $db->sql_in_set('forum_id', $forum_list);
 					$result = $db->sql_query($sql);
-					$forum_info['forum_topics'] = (int) $db->sql_fetchfield('sum_forum_topics');
+					$forum_info['forum_topics_approved'] = (int) $db->sql_fetchfield('sum_forum_topics');
 					$db->sql_freeresult($result);
 				}
 				else
@@ -331,7 +331,7 @@ class mcp_reports
 				$sort_by_sql = $sort_order_sql = array();
 				mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id);
 
-				$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total;
+				$forum_topics = ($total == -1) ? $forum_info['forum_topics_approved'] : $total;
 				$limit_time_sql = ($sort_days) ? 'AND r.report_time >= ' . (time() - ($sort_days * 86400)) : '';
 
 				if ($mode == 'reports')
-- 
cgit v1.2.1


From 6e93fee9d2f5951ff85bf658e3da42e4f6d153ec Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 10 Nov 2012 11:55:06 +0100
Subject: [feature/soft-delete] Link to delete_topics module when the topic is
 deleted

PHPBB3-9567
---
 phpBB/includes/mcp/mcp_forum.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 7c3bffe717..e8c5550cb7 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -220,12 +220,11 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 		$topic_title = censor_text($row['topic_title']);
 
-		// @todo:
 		$topic_unapproved = ($row['topic_visibility'] == ITEM_UNAPPROVED  && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
 		$posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_posts_unapproved'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
-		$topic_deleted = ($row['topic_visibility'] == ITEM_DELETED) ? true : false;
+		$topic_deleted = $row['topic_visibility'] == ITEM_DELETED;
 		$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? $url . '&amp;i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . '&amp;t=' . $row['topic_id'] : '';
-		$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? $url . 'i=queue&amp;mode=deleted_posts&amp;t=' . $topic_id : $u_mcp_queue;
+		$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? $url . 'i=queue&amp;mode=deleted_topics&amp;t=' . $topic_id : $u_mcp_queue;
 
 		$topic_row = array(
 			'ATTACH_ICON_IMG'		=> ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
-- 
cgit v1.2.1


From 106daa09ebb5b12bf9892c41f8c1de627cf6b0e9 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 10 Nov 2012 11:20:06 -0600
Subject: [ticket/11103] Fix failed automerge

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 7acc37eb85..54e8ced679 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1142,7 +1142,6 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 function phpbb_delete_user_pms($user_id)
 {
 	global $db, $user, $phpbb_root_path, $phpEx;
-	global $phpbb_notifications;
 
 	$user_id = (int) $user_id;
 
@@ -1164,6 +1163,7 @@ function phpbb_delete_user_pms($user_id)
 function phpbb_delete_users_pms($user_ids)
 {
 	global $db, $user, $phpbb_root_path, $phpEx;
+	global $phpbb_notifications;
 
 	$user_id_sql = $db->sql_in_set('user_id', $user_ids);
 	$author_id_sql = $db->sql_in_set('author_id', $user_ids);
-- 
cgit v1.2.1


From 35089bc0136e019724ee4b6c301fb94da52173cf Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 11 Nov 2012 12:18:04 +0100
Subject: [ticket/10714] Fix some comments

PHPBB3-10714
---
 phpBB/includes/functions.php     | 2 +-
 phpBB/includes/log/interface.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e202273204..93dfb4cd7f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3367,7 +3367,7 @@ function add_log()
 		return false;
 	}
 
-	// no log class set, create a temporary one ourselves to keep backwards compatability
+	// no log class set, create a temporary one ourselves to keep backwards compatibility
 	if ($phpbb_log === null)
 	{
 		$phpbb_log = new phpbb_log(LOG_TABLE);
diff --git a/phpBB/includes/log/interface.php b/phpBB/includes/log/interface.php
index feeab585bf..dd0df236f6 100644
--- a/phpBB/includes/log/interface.php
+++ b/phpBB/includes/log/interface.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 interface phpbb_log_interface
 {
 	/**
-	* This function returns the state of the log-system.
+	* This function returns the state of the log system.
 	*
 	* @param	string	$type	The log type we want to check. Empty to get global log status.
 	*
@@ -32,7 +32,7 @@ interface phpbb_log_interface
 	public function is_enabled($type = '');
 
 	/**
-	* This function allows disable the log-system. When add_log is called, the log will not be added to the database.
+	* This function allows disable the log system. When add_log is called, the log will not be added to the database.
 	*
 	* @param	mixed	$type	The log type we want to disable. Empty to disable all logs.
 	*							Can also be an array of types
@@ -42,7 +42,7 @@ interface phpbb_log_interface
 	public function disable($type = '');
 
 	/**
-	* This function allows re-enable the log-system.
+	* This function allows re-enable the log system.
 	*
 	* @param	mixed	$type	The log type we want to enable. Empty to enable all logs.
 	*							Can also be an array of types
@@ -93,7 +93,7 @@ interface phpbb_log_interface
 	static public function generate_sql_keyword($keywords);
 
 	/**
-	* Determinate whether the user is allowed to read and/or moderate the forum of the topic
+	* Determine whether the user is allowed to read and/or moderate the forum of the topic
 	*
 	* @param	array	$topic_ids	Array with the topic ids
 	*
-- 
cgit v1.2.1


From 72d1cae3f35d6f72f341b06761642545c6c663d2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 11 Nov 2012 12:29:25 +0100
Subject: [ticket/10714] Remove some private functions from the log interface

PHPBB3-10714
---
 phpBB/includes/log/interface.php | 32 -------------------------------
 phpBB/includes/log/log.php       | 41 +++++++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 47 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/interface.php b/phpBB/includes/log/interface.php
index dd0df236f6..b85dc3a474 100644
--- a/phpBB/includes/log/interface.php
+++ b/phpBB/includes/log/interface.php
@@ -83,38 +83,6 @@ interface phpbb_log_interface
 	*/
 	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '');
 
-	/**
-	* Generates a sql condition out of the specified keywords
-	*
-	* @param	string	$keywords	The keywords the user specified to search for
-	*
-	* @return	string		Returns the SQL condition searching for the keywords
-	*/
-	static public function generate_sql_keyword($keywords);
-
-	/**
-	* Determine whether the user is allowed to read and/or moderate the forum of the topic
-	*
-	* @param	array	$topic_ids	Array with the topic ids
-	*
-	* @return	array		Returns an array with two keys 'm_' and 'read_f' which are also an array of topic_id => forum_id sets when the permissions are given. Sample:
-	*						array(
-	*							'permission' => array(
-	*								topic_id => forum_id
-	*							),
-	*						),
-	*/
-	static public function get_topic_auth($topic_ids);
-
-	/**
-	* Get the data for all reportee form the database
-	*
-	* @param	array	$reportee_ids	Array with the user ids of the reportees
-	*
-	* @return	array		Returns an array with the reportee data
-	*/
-	static public function get_reportee_data($reportee_ids);
-
 	/**
 	* Get total log count
 	*
diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 780881ae13..eff084bbd2 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 class phpbb_log implements phpbb_log_interface
 {
 	/**
-	* Keeps the status of the log-system. Is the log enabled or disabled?
+	* Keeps the status of the log system. Is the log enabled or disabled?
 	*/
 	private $disabled_logs;
 
@@ -54,7 +54,7 @@ class phpbb_log implements phpbb_log_interface
 	}
 
 	/**
-	* This function returns the state of the log-system.
+	* This function returns the state of the log system.
 	*
 	* @param	string	$type	The log type we want to check. Empty to get global log status.
 	*
@@ -70,7 +70,7 @@ class phpbb_log implements phpbb_log_interface
 	}
 
 	/**
-	* This function allows disable the log-system. When add_log is called, the log will not be added to the database.
+	* This function allows disable the log system. When add_log is called, the log will not be added to the database.
 	*
 	* @param	mixed	$type	The log type we want to enable. Empty to disable all logs.
 	*							Can also be an array of types
@@ -97,7 +97,7 @@ class phpbb_log implements phpbb_log_interface
 	}
 
 	/**
-	* This function allows re-enable the log-system.
+	* This function allows re-enable the log system.
 	*
 	* @param	mixed	$type	The log type we want to enable. Empty to enable all logs.
 	*
@@ -320,7 +320,7 @@ class phpbb_log implements phpbb_log_interface
 		if (!empty($keywords))
 		{
 			// Get the SQL condition for our keywords
-			$sql_keywords = self::generate_sql_keyword($keywords);
+			$sql_keywords = $this->generate_sql_keyword($keywords);
 		}
 
 		if ($count_logs)
@@ -465,7 +465,7 @@ class phpbb_log implements phpbb_log_interface
 
 		if (sizeof($topic_id_list))
 		{
-			$topic_auth = self::get_topic_auth($topic_id_list);
+			$topic_auth = $this->get_topic_auth($topic_id_list);
 
 			foreach ($log as $key => $row)
 			{
@@ -476,7 +476,7 @@ class phpbb_log implements phpbb_log_interface
 
 		if (sizeof($reportee_id_list))
 		{
-			$reportee_data_list = self::get_reportee_data($reportee_id_list);
+			$reportee_data_list = $this->get_reportee_data($reportee_id_list);
 
 			foreach ($log as $key => $row)
 			{
@@ -496,9 +496,11 @@ class phpbb_log implements phpbb_log_interface
 	/**
 	* Generates a sql condition out of the specified keywords
 	*
-	* {@inheritDoc}
+	* @param	string	$keywords	The keywords the user specified to search for
+	*
+	* @return	string		Returns the SQL condition searching for the keywords
 	*/
-	static public function generate_sql_keyword($keywords)
+	private function generate_sql_keyword($keywords)
 	{
 		global $db, $user;
 
@@ -542,11 +544,18 @@ class phpbb_log implements phpbb_log_interface
 	}
 
 	/**
-	* Determinate whether the user is allowed to read and/or moderate the forum of the topic
+	* Determine whether the user is allowed to read and/or moderate the forum of the topic
 	*
-	* {@inheritDoc}
+	* @param	array	$topic_ids	Array with the topic ids
+	*
+	* @return	array		Returns an array with two keys 'm_' and 'read_f' which are also an array of topic_id => forum_id sets when the permissions are given. Sample:
+	*						array(
+	*							'permission' => array(
+	*								topic_id => forum_id
+	*							),
+	*						),
 	*/
-	static public function get_topic_auth($topic_ids)
+	private function get_topic_auth($topic_ids)
 	{
 		global $auth, $db;
 
@@ -579,11 +588,13 @@ class phpbb_log implements phpbb_log_interface
 	}
 
 	/**
-	* Get the data for all reportee form the database
+	* Get the data for all reportee from the database
 	*
-	* {@inheritDoc}
+	* @param	array	$reportee_ids	Array with the user ids of the reportees
+	*
+	* @return	array		Returns an array with the reportee data
 	*/
-	static public function get_reportee_data($reportee_ids)
+	private function get_reportee_data($reportee_ids)
 	{
 		global $db;
 
-- 
cgit v1.2.1


From 985d234a29b22086a196dca427e6c474229e3d36 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 11 Nov 2012 11:37:14 -0600
Subject: [ticket/11103] Move all email templates to the email/ directory &
 prep short

Prepare short email templates (to be used in jabber)

PHPBB3-11103
---
 phpBB/includes/notification/type/bookmark.php       | 2 +-
 phpBB/includes/notification/type/post_in_queue.php  | 2 +-
 phpBB/includes/notification/type/quote.php          | 2 +-
 phpBB/includes/notification/type/report_pm.php      | 2 +-
 phpBB/includes/notification/type/report_post.php    | 2 +-
 phpBB/includes/notification/type/topic_in_queue.php | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index e5ad4132fb..a40bbde5e4 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -131,6 +131,6 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 	*/
 	public function get_email_template()
 	{
-		return 'notifications/bookmark';
+		return 'bookmark';
 	}
 }
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 95e0ce02bb..3cd9b11283 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -132,6 +132,6 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 	*/
 	public function get_email_template()
 	{
-		return 'notifications/post_in_queue';
+		return 'post_in_queue';
 	}
 }
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index c3763da229..f45bb1ae7d 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -200,7 +200,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 	*/
 	public function get_email_template()
 	{
-		return 'notifications/quote';
+		return 'quote';
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 2841468475..9bdc59a4ef 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -123,7 +123,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	*/
 	public function get_email_template()
 	{
-		return 'notifications/report_pm';
+		return 'report_pm';
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index 433a5e835d..d80c7b754f 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -83,7 +83,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	*/
 	public function get_email_template()
 	{
-		return 'notifications/report_post';
+		return 'report_post';
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index 38bc2ab58d..170a98ca1b 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -125,6 +125,6 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 	*/
 	public function get_email_template()
 	{
-		return 'notifications/topic_in_queue';
+		return 'topic_in_queue';
 	}
 }
-- 
cgit v1.2.1


From 7948aaa78ed7e543a0773ee1a858ef45f5e5a5bf Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 11 Nov 2012 11:41:18 -0600
Subject: [ticket/11103] Make jabber use short/ email template files

PHPBB3-11103
---
 phpBB/includes/notification/method/email.php  | 9 ++++++++-
 phpBB/includes/notification/method/jabber.php | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index a47284bc61..2ff30b177f 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -40,6 +40,13 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 	*/
 	protected $notify_method = NOTIFY_EMAIL;
 
+	/**
+	* Base directory to prepend to the email template name
+	*
+	* @var string
+	*/
+	protected $email_template_base_dir = '';
+
 	/**
 	* Is this method available for the user?
 	* This is checked on the notifications options
@@ -100,7 +107,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 				continue;
 			}
 
-			$messenger->template($notification->get_email_template(), $user['user_lang']);
+			$messenger->template($this->email_template_base_dir . $notification->get_email_template(), $user['user_lang']);
 
 			$messenger->to($user['user_email'], $user['username']);
 
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
index fc43d8d4b9..e3eb571fbc 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/includes/notification/method/jabber.php
@@ -40,6 +40,13 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
 	*/
 	protected $notify_method = NOTIFY_IM;
 
+	/**
+	* Base directory to prepend to the email template name
+	*
+	* @var string
+	*/
+	protected $email_template_base_dir = 'short/';
+
 	/**
 	* Is this method available for the user?
 	* This is checked on the notifications options
-- 
cgit v1.2.1


From 9bc9ac281af9f194d73160ae3545105f24db5395 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 12 Nov 2012 10:38:28 +0100
Subject: [ticket/11015] Remove old dbal classes

PHPBB3-11015
---
 phpBB/includes/db/firebird.php    | 19 -------------------
 phpBB/includes/db/mssql.php       | 19 -------------------
 phpBB/includes/db/mssql_odbc.php  | 19 -------------------
 phpBB/includes/db/mssqlnative.php | 19 -------------------
 phpBB/includes/db/mysql.php       | 19 -------------------
 phpBB/includes/db/mysqli.php      | 19 -------------------
 phpBB/includes/db/oracle.php      | 19 -------------------
 phpBB/includes/db/postgres.php    | 19 -------------------
 phpBB/includes/db/sqlite.php      | 19 -------------------
 9 files changed, 171 deletions(-)
 delete mode 100644 phpBB/includes/db/firebird.php
 delete mode 100644 phpBB/includes/db/mssql.php
 delete mode 100644 phpBB/includes/db/mssql_odbc.php
 delete mode 100644 phpBB/includes/db/mssqlnative.php
 delete mode 100644 phpBB/includes/db/mysql.php
 delete mode 100644 phpBB/includes/db/mysqli.php
 delete mode 100644 phpBB/includes/db/oracle.php
 delete mode 100644 phpBB/includes/db/postgres.php
 delete mode 100644 phpBB/includes/db/sqlite.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
deleted file mode 100644
index 33f4e2ea48..0000000000
--- a/phpBB/includes/db/firebird.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class dbal_firebird extends phpbb_db_driver_firebird {
-}
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
deleted file mode 100644
index a0c3917fcb..0000000000
--- a/phpBB/includes/db/mssql.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class dbal_mssql extends phpbb_db_driver_mssql {
-}
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
deleted file mode 100644
index 2a642b30f5..0000000000
--- a/phpBB/includes/db/mssql_odbc.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-    exit;
-}
-
-class dbal_mssql_odbc extends phpbb_db_driver_mssql_odbc {
-}
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
deleted file mode 100644
index cfbdba66fe..0000000000
--- a/phpBB/includes/db/mssqlnative.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-    exit;
-}
-
-class dbal_mssqlnative extends phpbb_db_driver_mssqlnative {
-}
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
deleted file mode 100644
index dcd69cf51a..0000000000
--- a/phpBB/includes/db/mysql.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class dbal_mysql extends phpbb_db_driver_mysql {
-}
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
deleted file mode 100644
index 040f5adf43..0000000000
--- a/phpBB/includes/db/mysqli.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-    exit;
-}
-
-class dbal_mysqli extends phpbb_db_driver_mysqli {
-}
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
deleted file mode 100644
index fb1484aeb0..0000000000
--- a/phpBB/includes/db/oracle.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-    exit;
-}
-
-class dbal_oracle extends phpbb_db_driver_oracle {
-}
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
deleted file mode 100644
index dc5e95ac57..0000000000
--- a/phpBB/includes/db/postgres.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-    exit;
-}
-
-class dbal_postgres extends phpbb_db_driver_postgres {
-}
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
deleted file mode 100644
index e4396bc97f..0000000000
--- a/phpBB/includes/db/sqlite.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-    exit;
-}
-
-class dbal_sqlite extends phpbb_db_driver_sqlite {
-}
-- 
cgit v1.2.1


From 0fd3bb170b95bc8c99329e47990e38c038629075 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 12 Nov 2012 11:10:25 +0100
Subject: [ticket/11015] Fixup some things from the big merge

PHPBB3-11015
---
 phpBB/includes/cache/driver/file.php      |    2 +-
 phpBB/includes/cache/driver/interface.php |    2 +-
 phpBB/includes/cache/driver/memory.php    |    2 +-
 phpBB/includes/cache/driver/null.php      |    2 +-
 phpBB/includes/cache/service.php          |   40 --
 phpBB/includes/db/dbal.php                | 1049 -----------------------------
 phpBB/includes/db/driver/driver.php       |    8 +-
 phpBB/includes/db/driver/firebird.php     |   16 +-
 phpBB/includes/db/driver/mssql.php        |   16 +-
 phpBB/includes/db/driver/mssql_odbc.php   |   16 +-
 phpBB/includes/db/driver/mssqlnative.php  |   17 +-
 phpBB/includes/db/driver/mysql.php        |   18 +-
 phpBB/includes/db/driver/mysqli.php       |   18 +-
 phpBB/includes/db/driver/oracle.php       |   18 +-
 phpBB/includes/db/driver/postgres.php     |   18 +-
 phpBB/includes/db/driver/sqlite.php       |   18 +-
 16 files changed, 85 insertions(+), 1175 deletions(-)
 delete mode 100644 phpBB/includes/db/dbal.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php
index 23063a1a28..b20c0064ea 100644
--- a/phpBB/includes/cache/driver/file.php
+++ b/phpBB/includes/cache/driver/file.php
@@ -368,7 +368,7 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
 	/**
 	* Save sql query
 	*/
-	function sql_save($query, &$query_result, $ttl)
+	function sql_save($query, $query_result, $ttl)
 	{
 		global $db;
 
diff --git a/phpBB/includes/cache/driver/interface.php b/phpBB/includes/cache/driver/interface.php
index 313a2d4b31..847ba97262 100644
--- a/phpBB/includes/cache/driver/interface.php
+++ b/phpBB/includes/cache/driver/interface.php
@@ -75,7 +75,7 @@ interface phpbb_cache_driver_interface
 	/**
 	* Save sql query
 	*/
-	public function sql_save($query, &$query_result, $ttl);
+	public function sql_save($query, $query_result, $ttl);
 
 	/**
 	* Ceck if a given sql query exist in cache
diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/includes/cache/driver/memory.php
index 623ae44144..98ac02b161 100644
--- a/phpBB/includes/cache/driver/memory.php
+++ b/phpBB/includes/cache/driver/memory.php
@@ -284,7 +284,7 @@ abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base
 	/**
 	* Save sql query
 	*/
-	function sql_save($query, &$query_result, $ttl)
+	function sql_save($query, $query_result, $ttl)
 	{
 		global $db;
 
diff --git a/phpBB/includes/cache/driver/null.php b/phpBB/includes/cache/driver/null.php
index c143803d0e..df2c6c026f 100644
--- a/phpBB/includes/cache/driver/null.php
+++ b/phpBB/includes/cache/driver/null.php
@@ -107,7 +107,7 @@ class phpbb_cache_driver_null extends phpbb_cache_driver_base
 	/**
 	* Save sql query
 	*/
-	function sql_save($query, &$query_result, $ttl)
+	function sql_save($query, $query_result, $ttl)
 	{
 	}
 
diff --git a/phpBB/includes/cache/service.php b/phpBB/includes/cache/service.php
index 7858e27a5c..e63ec6e33a 100644
--- a/phpBB/includes/cache/service.php
+++ b/phpBB/includes/cache/service.php
@@ -58,11 +58,6 @@ class phpbb_cache_service
 		return call_user_func_array(array($this->driver, $method), $arguments);
 	}
 
-	public function __get($var)
-	{
-		return $this->driver->$var;
-	}
-
 	/**
 	* Obtain list of naughty words and build preg style replacement arrays for use by the
 	* calling script
@@ -413,39 +408,4 @@ class phpbb_cache_service
 
 		return $hook_files;
 	}
-
-	public function sql_load()
-	{
-		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
-	}
-
-	public function sql_save($query, &$query_result, $ttl)
-	{
-		return call_user_func_array(array($this->driver, __FUNCTION__), array($query, &$query_result, $ttl));
-	}
-
-	public function sql_exists()
-	{
-		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
-	}
-
-	public function sql_fetchrow()
-	{
-		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
-	}
-
-	public function sql_fetchfield()
-	{
-		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
-	}
-
-	public function sql_rowseek()
-	{
-		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
-	}
-
-	public function sql_freeresult()
-	{
-		return call_user_func_array(array($this->driver, __FUNCTION__), func_get_args());
-	}
 }
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
deleted file mode 100644
index ef1dd7d14d..0000000000
--- a/phpBB/includes/db/dbal.php
+++ /dev/null
@@ -1,1049 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Database Abstraction Layer
-* @package dbal
-*/
-class dbal
-{
-	var $db_connect_id;
-	var $query_result;
-	var $return_on_error = false;
-	var $transaction = false;
-	var $sql_time = 0;
-	var $num_queries = array();
-	var $open_queries = array();
-
-	var $curtime = 0;
-	var $query_hold = '';
-	var $html_hold = '';
-	var $sql_report = '';
-
-	var $persistency = false;
-	var $user = '';
-	var $server = '';
-	var $dbname = '';
-
-	// Set to true if error triggered
-	var $sql_error_triggered = false;
-
-	// Holding the last sql query on sql error
-	var $sql_error_sql = '';
-	// Holding the error information - only populated if sql_error_triggered is set
-	var $sql_error_returned = array();
-
-	// Holding transaction count
-	var $transactions = 0;
-
-	// Supports multi inserts?
-	var $multi_insert = false;
-
-	/**
-	* Current sql layer
-	*/
-	var $sql_layer = '';
-
-	/**
-	* Wildcards for matching any (%) or exactly one (_) character within LIKE expressions
-	*/
-	var $any_char;
-	var $one_char;
-
-	/**
-	* Exact version of the DBAL, directly queried
-	*/
-	var $sql_server_version = false;
-
-	/**
-	* Constructor
-	*/
-	function dbal()
-	{
-		$this->num_queries = array(
-			'cached'		=> 0,
-			'normal'		=> 0,
-			'total'			=> 0,
-		);
-
-		// Fill default sql layer based on the class being called.
-		// This can be changed by the specified layer itself later if needed.
-		$this->sql_layer = substr(get_class($this), 5);
-
-		// Do not change this please! This variable is used to easy the use of it - and is hardcoded.
-		$this->any_char = chr(0) . '%';
-		$this->one_char = chr(0) . '_';
-	}
-
-	/**
-	* return on error or display error message
-	*/
-	function sql_return_on_error($fail = false)
-	{
-		$this->sql_error_triggered = false;
-		$this->sql_error_sql = '';
-
-		$this->return_on_error = $fail;
-	}
-
-	/**
-	* Return number of sql queries and cached sql queries used
-	*/
-	function sql_num_queries($cached = false)
-	{
-		return ($cached) ? $this->num_queries['cached'] : $this->num_queries['normal'];
-	}
-
-	/**
-	* Add to query count
-	*/
-	function sql_add_num_queries($cached = false)
-	{
-		$this->num_queries['cached'] += ($cached !== false) ? 1 : 0;
-		$this->num_queries['normal'] += ($cached !== false) ? 0 : 1;
-		$this->num_queries['total'] += 1;
-	}
-
-	/**
-	* DBAL garbage collection, close sql connection
-	*/
-	function sql_close()
-	{
-		if (!$this->db_connect_id)
-		{
-			return false;
-		}
-
-		if ($this->transaction)
-		{
-			do
-			{
-				$this->sql_transaction('commit');
-			}
-			while ($this->transaction);
-		}
-
-		foreach ($this->open_queries as $query_id)
-		{
-			$this->sql_freeresult($query_id);
-		}
-
-		// Connection closed correctly. Set db_connect_id to false to prevent errors
-		if ($result = $this->_sql_close())
-		{
-			$this->db_connect_id = false;
-		}
-
-		return $result;
-	}
-
-	/**
-	* Build LIMIT query
-	* Doing some validation here.
-	*/
-	function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		if (empty($query))
-		{
-			return false;
-		}
-
-		// Never use a negative total or offset
-		$total = ($total < 0) ? 0 : $total;
-		$offset = ($offset < 0) ? 0 : $offset;
-
-		return $this->_sql_query_limit($query, $total, $offset, $cache_ttl);
-	}
-
-	/**
-	* Fetch all rows
-	*/
-	function sql_fetchrowset($query_id = false)
-	{
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($query_id !== false)
-		{
-			$result = array();
-			while ($row = $this->sql_fetchrow($query_id))
-			{
-				$result[] = $row;
-			}
-
-			return $result;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache->sql_exists($query_id))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$this->sql_freeresult($query_id);
-		$query_id = $this->sql_query($this->last_query_text);
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
-		for ($i = 0; $i < $rownum; $i++)
-		{
-			if (!$this->sql_fetchrow($query_id))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Fetch field
-	* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
-	*/
-	function sql_fetchfield($field, $rownum = false, $query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($query_id !== false)
-		{
-			if ($rownum !== false)
-			{
-				$this->sql_rowseek($rownum, $query_id);
-			}
-
-			if (!is_object($query_id) && $cache->sql_exists($query_id))
-			{
-				return $cache->sql_fetchfield($query_id, $field);
-			}
-
-			$row = $this->sql_fetchrow($query_id);
-			return (isset($row[$field])) ? $row[$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters
-	* Some DBMS are handling them in a different way
-	*
-	* @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char
-	* @return string LIKE expression including the keyword!
-	*/
-	function sql_like_expression($expression)
-	{
-		$expression = utf8_str_replace(array('_', '%'), array("\_", "\%"), $expression);
-		$expression = utf8_str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression);
-
-		return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
-	}
-
-	/**
-	* Build a case expression
-	*
-	* Note: The two statements action_true and action_false must have the same data type (int, vchar, ...) in the database!
-	*
-	* @param	string	$condition		The condition which must be true, to use action_true rather then action_else
-	* @param	string	$action_true	SQL expression that is used, if the condition is true
-	* @param	string	$action_else	SQL expression that is used, if the condition is false, optional
-	* @return	string			CASE expression including the condition and statements
-	*/
-	public function sql_case($condition, $action_true, $action_false = false)
-	{
-		$sql_case = 'CASE WHEN ' . $condition;
-		$sql_case .= ' THEN ' . $action_true;
-		$sql_case .= ($action_false !== false) ? ' ELSE ' . $action_false : '';
-		$sql_case .= ' END';
-		return $sql_case;
-	}
-
-	/**
-	* Build a concatenated expression
-	*
-	* @param	string	$expr1		Base SQL expression where we append the second one
-	* @param	string	$expr2		SQL expression that is appended to the first expression
-	* @return	string		Concatenated string
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return $expr1 . ' || ' . $expr2;
-	}
-
-	/**
-	* Returns whether results of a query need to be buffered to run a transaction while iterating over them.
-	*
-	* @return bool Whether buffering is required.
-	*/
-	function sql_buffer_nested_transactions()
-	{
-		return false;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				// If we are within a transaction we will not open another one, but enclose the current one to not loose data (prevening auto commit)
-				if ($this->transaction)
-				{
-					$this->transactions++;
-					return true;
-				}
-
-				$result = $this->_sql_transaction('begin');
-
-				if (!$result)
-				{
-					$this->sql_error();
-				}
-
-				$this->transaction = true;
-			break;
-
-			case 'commit':
-				// If there was a previously opened transaction we do not commit yet... but count back the number of inner transactions
-				if ($this->transaction && $this->transactions)
-				{
-					$this->transactions--;
-					return true;
-				}
-
-				// Check if there is a transaction (no transaction can happen if there was an error, with a combined rollback and error returning enabled)
-				// This implies we have transaction always set for autocommit db's
-				if (!$this->transaction)
-				{
-					return false;
-				}
-
-				$result = $this->_sql_transaction('commit');
-
-				if (!$result)
-				{
-					$this->sql_error();
-				}
-
-				$this->transaction = false;
-				$this->transactions = 0;
-			break;
-
-			case 'rollback':
-				$result = $this->_sql_transaction('rollback');
-				$this->transaction = false;
-				$this->transactions = 0;
-			break;
-
-			default:
-				$result = $this->_sql_transaction($status);
-			break;
-		}
-
-		return $result;
-	}
-
-	/**
-	* Build sql statement from array for insert/update/select statements
-	*
-	* Idea for this from Ikonboard
-	* Possible query values: INSERT, INSERT_SELECT, UPDATE, SELECT
-	*
-	*/
-	function sql_build_array($query, $assoc_ary = false)
-	{
-		if (!is_array($assoc_ary))
-		{
-			return false;
-		}
-
-		$fields = $values = array();
-
-		if ($query == 'INSERT' || $query == 'INSERT_SELECT')
-		{
-			foreach ($assoc_ary as $key => $var)
-			{
-				$fields[] = $key;
-
-				if (is_array($var) && is_string($var[0]))
-				{
-					// This is used for INSERT_SELECT(s)
-					$values[] = $var[0];
-				}
-				else
-				{
-					$values[] = $this->_sql_validate_value($var);
-				}
-			}
-
-			$query = ($query == 'INSERT') ? ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')' : ' (' . implode(', ', $fields) . ') SELECT ' . implode(', ', $values) . ' ';
-		}
-		else if ($query == 'MULTI_INSERT')
-		{
-			trigger_error('The MULTI_INSERT query value is no longer supported. Please use sql_multi_insert() instead.', E_USER_ERROR);
-		}
-		else if ($query == 'UPDATE' || $query == 'SELECT')
-		{
-			$values = array();
-			foreach ($assoc_ary as $key => $var)
-			{
-				$values[] = "$key = " . $this->_sql_validate_value($var);
-			}
-			$query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values);
-		}
-
-		return $query;
-	}
-
-	/**
-	* Build IN or NOT IN sql comparison string, uses <> or = on single element
-	* arrays to improve comparison speed
-	*
-	* @access public
-	* @param	string	$field				name of the sql column that shall be compared
-	* @param	array	$array				array of values that are allowed (IN) or not allowed (NOT IN)
-	* @param	bool	$negate				true for NOT IN (), false for IN () (default)
-	* @param	bool	$allow_empty_set	If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
-	*/
-	function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
-	{
-		if (!sizeof($array))
-		{
-			if (!$allow_empty_set)
-			{
-				// Print the backtrace to help identifying the location of the problematic code
-				$this->sql_error('No values specified for SQL IN comparison');
-			}
-			else
-			{
-				// NOT IN () actually means everything so use a tautology
-				if ($negate)
-				{
-					return '1=1';
-				}
-				// IN () actually means nothing so use a contradiction
-				else
-				{
-					return '1=0';
-				}
-			}
-		}
-
-		if (!is_array($array))
-		{
-			$array = array($array);
-		}
-
-		if (sizeof($array) == 1)
-		{
-			@reset($array);
-			$var = current($array);
-
-			return $field . ($negate ? ' <> ' : ' = ') . $this->_sql_validate_value($var);
-		}
-		else
-		{
-			return $field . ($negate ? ' NOT IN ' : ' IN ') . '(' . implode(', ', array_map(array($this, '_sql_validate_value'), $array)) . ')';
-		}
-	}
-
-	/**
-	* Run binary AND operator on DB column.
-	* Results in sql statement: "{$column_name} & (1 << {$bit}) {$compare}"
-	*
-	* @param string $column_name The column name to use
-	* @param int $bit The value to use for the AND operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
-	* @param string $compare Any custom SQL code after the check (for example "= 0")
-	*/
-	function sql_bit_and($column_name, $bit, $compare = '')
-	{
-		if (method_exists($this, '_sql_bit_and'))
-		{
-			return $this->_sql_bit_and($column_name, $bit, $compare);
-		}
-
-		return $column_name . ' & ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
-	}
-
-	/**
-	* Run binary OR operator on DB column.
-	* Results in sql statement: "{$column_name} | (1 << {$bit}) {$compare}"
-	*
-	* @param string $column_name The column name to use
-	* @param int $bit The value to use for the OR operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
-	* @param string $compare Any custom SQL code after the check (for example "= 0")
-	*/
-	function sql_bit_or($column_name, $bit, $compare = '')
-	{
-		if (method_exists($this, '_sql_bit_or'))
-		{
-			return $this->_sql_bit_or($column_name, $bit, $compare);
-		}
-
-		return $column_name . ' | ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
-	}
-
-	/**
-	* Returns SQL string to cast a string expression to an int.
-	*
-	* @param  string $expression An expression evaluating to string
-	* @return string             Expression returning an int
-	*/
-	function cast_expr_to_bigint($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Returns SQL string to cast an integer expression to a string.
-	*
-	* @param  string $expression An expression evaluating to int
-	* @return string             Expression returning a string
-	*/
-	function cast_expr_to_string($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Run LOWER() on DB column of type text (i.e. neither varchar nor char).
-	*
-	* @param string $column_name	The column name to use
-	*
-	* @return string				A SQL statement like "LOWER($column_name)"
-	*/
-	function sql_lower_text($column_name)
-	{
-		return "LOWER($column_name)";
-	}
-
-	/**
-	* Run more than one insert statement.
-	*
-	* @param string $table table name to run the statements on
-	* @param array &$sql_ary multi-dimensional array holding the statement data.
-	*
-	* @return bool false if no statements were executed.
-	* @access public
-	*/
-	function sql_multi_insert($table, &$sql_ary)
-	{
-		if (!sizeof($sql_ary))
-		{
-			return false;
-		}
-
-		if ($this->multi_insert)
-		{
-			$ary = array();
-			foreach ($sql_ary as $id => $_sql_ary)
-			{
-				// If by accident the sql array is only one-dimensional we build a normal insert statement
-				if (!is_array($_sql_ary))
-				{
-					return $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $sql_ary));
-				}
-
-				$values = array();
-				foreach ($_sql_ary as $key => $var)
-				{
-					$values[] = $this->_sql_validate_value($var);
-				}
-				$ary[] = '(' . implode(', ', $values) . ')';
-			}
-
-			return $this->sql_query('INSERT INTO ' . $table . ' ' . ' (' . implode(', ', array_keys($sql_ary[0])) . ') VALUES ' . implode(', ', $ary));
-		}
-		else
-		{
-			foreach ($sql_ary as $ary)
-			{
-				if (!is_array($ary))
-				{
-					return false;
-				}
-
-				$result = $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $ary));
-
-				if (!$result)
-				{
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Function for validating values
-	* @access private
-	*/
-	function _sql_validate_value($var)
-	{
-		if (is_null($var))
-		{
-			return 'NULL';
-		}
-		else if (is_string($var))
-		{
-			return "'" . $this->sql_escape($var) . "'";
-		}
-		else
-		{
-			return (is_bool($var)) ? intval($var) : $var;
-		}
-	}
-
-	/**
-	* Build sql statement from array for select and select distinct statements
-	*
-	* Possible query values: SELECT, SELECT_DISTINCT
-	*/
-	function sql_build_query($query, $array)
-	{
-		$sql = '';
-		switch ($query)
-		{
-			case 'SELECT':
-			case 'SELECT_DISTINCT';
-
-				$sql = str_replace('_', ' ', $query) . ' ' . $array['SELECT'] . ' FROM ';
-
-				// Build table array. We also build an alias array for later checks.
-				$table_array = $aliases = array();
-				$used_multi_alias = false;
-
-				foreach ($array['FROM'] as $table_name => $alias)
-				{
-					if (is_array($alias))
-					{
-						$used_multi_alias = true;
-
-						foreach ($alias as $multi_alias)
-						{
-							$table_array[] = $table_name . ' ' . $multi_alias;
-							$aliases[] = $multi_alias;
-						}
-					}
-					else
-					{
-						$table_array[] = $table_name . ' ' . $alias;
-						$aliases[] = $alias;
-					}
-				}
-
-				// We run the following code to determine if we need to re-order the table array. ;)
-				// The reason for this is that for multi-aliased tables (two equal tables) in the FROM statement the last table need to match the first comparison.
-				// DBMS who rely on this: Oracle, PostgreSQL and MSSQL. For all other DBMS it makes absolutely no difference in which order the table is.
-				if (!empty($array['LEFT_JOIN']) && sizeof($array['FROM']) > 1 && $used_multi_alias !== false)
-				{
-					// Take first LEFT JOIN
-					$join = current($array['LEFT_JOIN']);
-
-					// Determine the table used there (even if there are more than one used, we only want to have one
-					preg_match('/(' . implode('|', $aliases) . ')\.[^\s]+/U', str_replace(array('(', ')', 'AND', 'OR', ' '), '', $join['ON']), $matches);
-
-					// If there is a first join match, we need to make sure the table order is correct
-					if (!empty($matches[1]))
-					{
-						$first_join_match = trim($matches[1]);
-						$table_array = $last = array();
-
-						foreach ($array['FROM'] as $table_name => $alias)
-						{
-							if (is_array($alias))
-							{
-								foreach ($alias as $multi_alias)
-								{
-									($multi_alias === $first_join_match) ? $last[] = $table_name . ' ' . $multi_alias : $table_array[] = $table_name . ' ' . $multi_alias;
-								}
-							}
-							else
-							{
-								($alias === $first_join_match) ? $last[] = $table_name . ' ' . $alias : $table_array[] = $table_name . ' ' . $alias;
-							}
-						}
-
-						$table_array = array_merge($table_array, $last);
-					}
-				}
-
-				$sql .= $this->_sql_custom_build('FROM', implode(' CROSS JOIN ', $table_array));
-
-				if (!empty($array['LEFT_JOIN']))
-				{
-					foreach ($array['LEFT_JOIN'] as $join)
-					{
-						$sql .= ' LEFT JOIN ' . key($join['FROM']) . ' ' . current($join['FROM']) . ' ON (' . $join['ON'] . ')';
-					}
-				}
-
-				if (!empty($array['WHERE']))
-				{
-					$sql .= ' WHERE ' . $this->_sql_custom_build('WHERE', $array['WHERE']);
-				}
-
-				if (!empty($array['GROUP_BY']))
-				{
-					$sql .= ' GROUP BY ' . $array['GROUP_BY'];
-				}
-
-				if (!empty($array['ORDER_BY']))
-				{
-					$sql .= ' ORDER BY ' . $array['ORDER_BY'];
-				}
-
-			break;
-		}
-
-		return $sql;
-	}
-
-	/**
-	* display sql error page
-	*/
-	function sql_error($sql = '')
-	{
-		global $auth, $user, $config;
-
-		// Set var to retrieve errored status
-		$this->sql_error_triggered = true;
-		$this->sql_error_sql = $sql;
-
-		$this->sql_error_returned = $this->_sql_error();
-
-		if (!$this->return_on_error)
-		{
-			$message = 'SQL ERROR [ ' . $this->sql_layer . ' ]<br /><br />' . $this->sql_error_returned['message'] . ' [' . $this->sql_error_returned['code'] . ']';
-
-			// Show complete SQL error and path to administrators only
-			// Additionally show complete error on installation or if extended debug mode is enabled
-			// The DEBUG constant is for development only!
-			if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG'))
-			{
-				$message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
-			}
-			else
-			{
-				// If error occurs in initiating the session we need to use a pre-defined language string
-				// This could happen if the connection could not be established for example (then we are not able to grab the default language)
-				if (!isset($user->lang['SQL_ERROR_OCCURRED']))
-				{
-					$message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.';
-				}
-				else
-				{
-					if (!empty($config['board_contact']))
-					{
-						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
-					}
-					else
-					{
-						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', '');
-					}
-				}
-			}
-
-			if ($this->transaction)
-			{
-				$this->sql_transaction('rollback');
-			}
-
-			if (strlen($message) > 1024)
-			{
-				// We need to define $msg_long_text here to circumvent text stripping.
-				global $msg_long_text;
-				$msg_long_text = $message;
-
-				trigger_error(false, E_USER_ERROR);
-			}
-
-			trigger_error($message, E_USER_ERROR);
-		}
-
-		if ($this->transaction)
-		{
-			$this->sql_transaction('rollback');
-		}
-
-		return $this->sql_error_returned;
-	}
-
-	/**
-	* Explain queries
-	*/
-	function sql_report($mode, $query = '')
-	{
-		global $cache, $starttime, $phpbb_root_path, $user;
-		global $request;
-
-		if (is_object($request) && !$request->variable('explain', false))
-		{
-			return false;
-		}
-
-		if (!$query && $this->query_hold != '')
-		{
-			$query = $this->query_hold;
-		}
-
-		switch ($mode)
-		{
-			case 'display':
-				if (!empty($cache))
-				{
-					$cache->unload();
-				}
-				$this->sql_close();
-
-				$mtime = explode(' ', microtime());
-				$totaltime = $mtime[0] + $mtime[1] - $starttime;
-
-				echo '<!DOCTYPE html>
-					<html dir="ltr">
-					<head>
-						<meta charset="utf-8">
-						<title>SQL Report</title>
-						<link href="' . $phpbb_root_path . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-					</head>
-					<body id="errorpage">
-					<div id="wrap">
-						<div id="page-header">
-							<a href="' . build_url('explain') . '">Return to previous page</a>
-						</div>
-						<div id="page-body">
-							<div id="acp">
-							<div class="panel">
-								<span class="corners-top"><span></span></span>
-								<div id="content">
-									<h1>SQL Report</h1>
-									<br />
-									<p><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries['normal']} queries" . (($this->num_queries['cached']) ? " + {$this->num_queries['cached']} " . (($this->num_queries['cached'] == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></p>
-
-									<p>Time spent on ' . $this->sql_layer . ' queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></p>
-
-									<br /><br />
-									' . $this->sql_report . '
-								</div>
-								<span class="corners-bottom"><span></span></span>
-							</div>
-							</div>
-						</div>
-						<div id="page-footer">
-							Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
-						</div>
-					</div>
-					</body>
-					</html>';
-
-				exit_handler();
-
-			break;
-
-			case 'stop':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$this->sql_report .= '
-
-					<table cellspacing="1">
-					<thead>
-					<tr>
-						<th>Query #' . $this->num_queries['total'] . '</th>
-					</tr>
-					</thead>
-					<tbody>
-					<tr>
-						<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td>
-					</tr>
-					</tbody>
-					</table>
-
-					' . $this->html_hold . '
-
-					<p style="text-align: center;">
-				';
-
-				if ($this->query_result)
-				{
-					if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query))
-					{
-						$this->sql_report .= 'Affected rows: <b>' . $this->sql_affectedrows($this->query_result) . '</b> | ';
-					}
-					$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $this->curtime) . 's</b>';
-				}
-				else
-				{
-					$error = $this->sql_error();
-					$this->sql_report .= '<b style="color: red">FAILED</b> - ' . $this->sql_layer . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
-				}
-
-				$this->sql_report .= '</p><br /><br />';
-
-				$this->sql_time += $endtime - $this->curtime;
-			break;
-
-			case 'start':
-				$this->query_hold = $query;
-				$this->html_hold = '';
-
-				$this->_sql_report($mode, $query);
-
-				$this->curtime = explode(' ', microtime());
-				$this->curtime = $this->curtime[0] + $this->curtime[1];
-
-			break;
-
-			case 'add_select_row':
-
-				$html_table = func_get_arg(2);
-				$row = func_get_arg(3);
-
-				if (!$html_table && sizeof($row))
-				{
-					$html_table = true;
-					$this->html_hold .= '<table cellspacing="1"><tr>';
-
-					foreach (array_keys($row) as $val)
-					{
-						$this->html_hold .= '<th>' . (($val) ? ucwords(str_replace('_', ' ', $val)) : '&nbsp;') . '</th>';
-					}
-					$this->html_hold .= '</tr>';
-				}
-				$this->html_hold .= '<tr>';
-
-				$class = 'row1';
-				foreach (array_values($row) as $val)
-				{
-					$class = ($class == 'row1') ? 'row2' : 'row1';
-					$this->html_hold .= '<td class="' . $class . '">' . (($val) ? $val : '&nbsp;') . '</td>';
-				}
-				$this->html_hold .= '</tr>';
-
-				return $html_table;
-
-			break;
-
-			case 'fromcache':
-
-				$this->_sql_report($mode, $query);
-
-			break;
-
-			case 'record_fromcache':
-
-				$endtime = func_get_arg(2);
-				$splittime = func_get_arg(3);
-
-				$time_cache = $endtime - $this->curtime;
-				$time_db = $splittime - $endtime;
-				$color = ($time_db > $time_cache) ? 'green' : 'red';
-
-				$this->sql_report .= '<table cellspacing="1"><thead><tr><th>Query results obtained from the cache</th></tr></thead><tbody><tr>';
-				$this->sql_report .= '<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></tbody></table>';
-				$this->sql_report .= '<p style="text-align: center;">';
-				$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br /><br />';
-
-				// Pad the start time to not interfere with page timing
-				$starttime += $time_db;
-
-			break;
-
-			default:
-
-				$this->_sql_report($mode, $query);
-
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Gets the estimated number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Number of rows in $table_name.
-	*								Prefixed with ~ if estimated (otherwise exact).
-	*
-	* @access public
-	*/
-	function get_estimated_row_count($table_name)
-	{
-		return $this->get_row_count($table_name);
-	}
-
-	/**
-	* Gets the exact number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Exact number of rows in $table_name.
-	*
-	* @access public
-	*/
-	function get_row_count($table_name)
-	{
-		$sql = 'SELECT COUNT(*) AS rows_total
-			FROM ' . $this->sql_escape($table_name);
-		$result = $this->sql_query($sql);
-		$rows_total = $this->sql_fetchfield('rows_total');
-		$this->sql_freeresult($result);
-
-		return $rows_total;
-	}
-}
-
-/**
-* This variable holds the class name to use later
-*/
-$sql_db = (!empty($dbms)) ? 'dbal_' . basename($dbms) : 'dbal';
diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php
index 9692ee71b9..4b831d2f79 100644
--- a/phpBB/includes/db/driver/driver.php
+++ b/phpBB/includes/db/driver/driver.php
@@ -206,7 +206,7 @@ class phpbb_db_driver
             $query_id = $this->query_result;
         }
 
-        if (isset($cache->sql_rowset[$query_id]))
+        if ($cache->sql_exists($query_id))
         {
             return $cache->sql_rowseek($rownum, $query_id);
         }
@@ -256,7 +256,7 @@ class phpbb_db_driver
                 $this->sql_rowseek($rownum, $query_id);
             }
 
-            if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
+            if (!is_object($query_id) && $cache->sql_exists($query_id))
             {
                 return $cache->sql_fetchfield($query_id, $field);
             }
@@ -766,8 +766,8 @@ class phpbb_db_driver
 
             // Show complete SQL error and path to administrators only
             // Additionally show complete error on installation or if extended debug mode is enabled
-            // The DEBUG_EXTRA constant is for development only!
-            if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG_EXTRA'))
+            // The DEBUG constant is for development only!
+            if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG'))
             {
                 $message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
             }
diff --git a/phpBB/includes/db/driver/firebird.php b/phpBB/includes/db/driver/firebird.php
index c793e0a51f..a55175c345 100644
--- a/phpBB/includes/db/driver/firebird.php
+++ b/phpBB/includes/db/driver/firebird.php
@@ -148,13 +148,13 @@ class phpbb_db_driver_firebird extends phpbb_db_driver
 			global $cache;
 
 			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
+			if (defined('DEBUG'))
 			{
 				$this->sql_report('start', $query);
 			}
 
 			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -249,7 +249,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver
 					$this->sql_error($query);
 				}
 
-				if (defined('DEBUG_EXTRA'))
+				if (defined('DEBUG'))
 				{
 					$this->sql_report('stop', $query);
 				}
@@ -267,17 +267,17 @@ class phpbb_db_driver_firebird extends phpbb_db_driver
 					}
 				}
 
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG_EXTRA'))
+			else if (defined('DEBUG'))
 			{
 				$this->sql_report('fromcache', $query);
 			}
@@ -330,7 +330,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -396,7 +396,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/mssql.php b/phpBB/includes/db/driver/mssql.php
index e68738f918..04bb75f5ce 100644
--- a/phpBB/includes/db/driver/mssql.php
+++ b/phpBB/includes/db/driver/mssql.php
@@ -137,12 +137,12 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 			global $cache;
 
 			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
+			if (defined('DEBUG'))
 			{
 				$this->sql_report('start', $query);
 			}
 
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -152,7 +152,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 					$this->sql_error($query);
 				}
 
-				if (defined('DEBUG_EXTRA'))
+				if (defined('DEBUG'))
 				{
 					$this->sql_report('stop', $query);
 				}
@@ -160,14 +160,14 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 				if ($cache_ttl && method_exists($cache, 'sql_save'))
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG_EXTRA'))
+			else if (defined('DEBUG'))
 			{
 				$this->sql_report('fromcache', $query);
 			}
@@ -232,7 +232,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -269,7 +269,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -308,7 +308,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/mssql_odbc.php b/phpBB/includes/db/driver/mssql_odbc.php
index 7b35ce3d11..d1f31a6554 100644
--- a/phpBB/includes/db/driver/mssql_odbc.php
+++ b/phpBB/includes/db/driver/mssql_odbc.php
@@ -155,13 +155,13 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
 			global $cache;
 
 			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
+			if (defined('DEBUG'))
 			{
 				$this->sql_report('start', $query);
 			}
 
 			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -171,22 +171,22 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
 					$this->sql_error($query);
 				}
 
-				if (defined('DEBUG_EXTRA'))
+				if (defined('DEBUG'))
 				{
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG_EXTRA'))
+			else if (defined('DEBUG'))
 			{
 				$this->sql_report('fromcache', $query);
 			}
@@ -252,7 +252,7 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -293,7 +293,7 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/mssqlnative.php b/phpBB/includes/db/driver/mssqlnative.php
index 99b9d7975a..67a019f5a5 100644
--- a/phpBB/includes/db/driver/mssqlnative.php
+++ b/phpBB/includes/db/driver/mssqlnative.php
@@ -216,7 +216,6 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 		$this->server = $sqlserver . (($port) ? $port_delimiter . $port : '');
 
 		//connect to database
-		error_reporting(E_ALL);
 		$this->db_connect_id = sqlsrv_connect($this->server, array(
 			'Database' => $this->dbname,
 			'UID' => $this->user,
@@ -310,13 +309,13 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 			global $cache;
 
 			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
+			if (defined('DEBUG'))
 			{
 				$this->sql_report('start', $query);
 			}
 
 			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -328,22 +327,22 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 				// reset options for next query
 				$this->query_options = array();
 
-				if (defined('DEBUG_EXTRA'))
+				if (defined('DEBUG'))
 				{
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG_EXTRA'))
+			else if (defined('DEBUG'))
 			{
 				$this->sql_report('fromcache', $query);
 			}
@@ -416,7 +415,7 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -476,7 +475,7 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/mysql.php b/phpBB/includes/db/driver/mysql.php
index 987691341a..f8c2be2366 100644
--- a/phpBB/includes/db/driver/mysql.php
+++ b/phpBB/includes/db/driver/mysql.php
@@ -165,12 +165,12 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 			global $cache;
 
 			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
+			if (defined('DEBUG'))
 			{
 				$this->sql_report('start', $query);
 			}
 
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -180,22 +180,22 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 					$this->sql_error($query);
 				}
 
-				if (defined('DEBUG_EXTRA'))
+				if (defined('DEBUG'))
 				{
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG_EXTRA'))
+			else if (defined('DEBUG'))
 			{
 				$this->sql_report('fromcache', $query);
 			}
@@ -247,7 +247,7 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -268,7 +268,7 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -296,7 +296,7 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/includes/db/driver/mysqli.php
index c473c7fe99..0cc3eb359a 100644
--- a/phpBB/includes/db/driver/mysqli.php
+++ b/phpBB/includes/db/driver/mysqli.php
@@ -172,12 +172,12 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 			global $cache;
 
 			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
+			if (defined('DEBUG'))
 			{
 				$this->sql_report('start', $query);
 			}
 
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -187,17 +187,17 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 					$this->sql_error($query);
 				}
 
-				if (defined('DEBUG_EXTRA'))
+				if (defined('DEBUG'))
 				{
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				if ($cache_ttl)
 				{
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
 			}
-			else if (defined('DEBUG_EXTRA'))
+			else if (defined('DEBUG'))
 			{
 				$this->sql_report('fromcache', $query);
 			}
@@ -249,7 +249,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
+		if (!is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -276,7 +276,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
+		if (!is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -304,7 +304,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
+		if (!is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/oracle.php b/phpBB/includes/db/driver/oracle.php
index 25803e57bd..d8474694e3 100644
--- a/phpBB/includes/db/driver/oracle.php
+++ b/phpBB/includes/db/driver/oracle.php
@@ -234,13 +234,13 @@ class phpbb_db_driver_oracle extends phpbb_db_driver
 			global $cache;
 
 			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
+			if (defined('DEBUG'))
 			{
 				$this->sql_report('start', $query);
 			}
 
 			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -411,22 +411,22 @@ class phpbb_db_driver_oracle extends phpbb_db_driver
 					}
 				}
 
-				if (defined('DEBUG_EXTRA'))
+				if (defined('DEBUG'))
 				{
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG_EXTRA'))
+			else if (defined('DEBUG'))
 			{
 				$this->sql_report('fromcache', $query);
 			}
@@ -471,7 +471,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -523,7 +523,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -592,7 +592,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/postgres.php b/phpBB/includes/db/driver/postgres.php
index 3f54936d23..147ecd04d9 100644
--- a/phpBB/includes/db/driver/postgres.php
+++ b/phpBB/includes/db/driver/postgres.php
@@ -187,13 +187,13 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
 			global $cache;
 
 			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
+			if (defined('DEBUG'))
 			{
 				$this->sql_report('start', $query);
 			}
 
 			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -203,22 +203,22 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
 					$this->sql_error($query);
 				}
 
-				if (defined('DEBUG_EXTRA'))
+				if (defined('DEBUG'))
 				{
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG_EXTRA'))
+			else if (defined('DEBUG'))
 			{
 				$this->sql_report('fromcache', $query);
 			}
@@ -278,7 +278,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -299,7 +299,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -348,7 +348,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/sqlite.php b/phpBB/includes/db/driver/sqlite.php
index 363f26da2b..0b09fa758d 100644
--- a/phpBB/includes/db/driver/sqlite.php
+++ b/phpBB/includes/db/driver/sqlite.php
@@ -110,12 +110,12 @@ class phpbb_db_driver_sqlite extends phpbb_db_driver
 			global $cache;
 
 			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG_EXTRA'))
+			if (defined('DEBUG'))
 			{
 				$this->sql_report('start', $query);
 			}
 
-			$this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -125,22 +125,22 @@ class phpbb_db_driver_sqlite extends phpbb_db_driver
 					$this->sql_error($query);
 				}
 
-				if (defined('DEBUG_EXTRA'))
+				if (defined('DEBUG'))
 				{
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 				}
 			}
-			else if (defined('DEBUG_EXTRA'))
+			else if (defined('DEBUG'))
 			{
 				$this->sql_report('fromcache', $query);
 			}
@@ -191,7 +191,7 @@ class phpbb_db_driver_sqlite extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -212,7 +212,7 @@ class phpbb_db_driver_sqlite extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -240,7 +240,7 @@ class phpbb_db_driver_sqlite extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (isset($cache->sql_rowset[$query_id]))
+		if ($cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
-- 
cgit v1.2.1


From 940d768592f811e7509ca651f09de89e474cc359 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 12 Nov 2012 16:27:45 +0100
Subject: [feature/avatars] Fix coding guidelines infractions

---
 phpBB/includes/acp/acp_groups.php           |  3 ++-
 phpBB/includes/avatar/driver/core/local.php |  3 ++-
 phpBB/includes/avatar/manager.php           | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 1109c64d00..656bf1546e 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -330,7 +330,8 @@ class acp_groups
 						$submit_ary['founder_manage'] = isset($_REQUEST['group_founder_manage']) ? 1 : 0;
 					}
 					
-					if ($config['allow_avatar']) {
+					if ($config['allow_avatar'])
+					{
 						// Handle avatar
 						$driver = request_var('avatar_driver', '');
 						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
diff --git a/phpBB/includes/avatar/driver/core/local.php b/phpBB/includes/avatar/driver/core/local.php
index ca82b9c175..a8ed8ad130 100644
--- a/phpBB/includes/avatar/driver/core/local.php
+++ b/phpBB/includes/avatar/driver/core/local.php
@@ -142,7 +142,8 @@ class phpbb_avatar_driver_core_local extends phpbb_avatar_driver
 
 			if ($dh)
 			{
-				while (($cat = readdir($dh)) !== false) {
+				while (($cat = readdir($dh)) !== false)
+				{
 					if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
 					{
 						if ($ch = @opendir("$path/$cat"))
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index c2c3dbbbca..94c7614868 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -72,11 +72,16 @@ class phpbb_avatar_manager
 
 		$r = new ReflectionClass($avatar_type);
 
-		if ($r->isSubClassOf('phpbb_avatar_driver')) {
+		if ($r->isSubClassOf('phpbb_avatar_driver'))
+		{
 			$driver = new $avatar_type($this->config, $this->request, $this->phpbb_root_path, $this->phpEx, $this->cache);
-		} else if ($r->implementsInterface('phpbb_avatar_driver')) {
+		}
+		else if ($r->implementsInterface('phpbb_avatar_driver'))
+		{
 			$driver = new $avatar_type();
-		} else {
+		}
+		else
+		{
 			$message = "Invalid avatar driver class name '%s' provided. It must implement phpbb_avatar_driver_interface.";
 			trigger_error(sprintf($message, $avatar_type));
 		}
-- 
cgit v1.2.1


From ff7465e75f129d23a0f9f4fd6a1c556ec2b7bb13 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Nov 2012 11:22:30 +0100
Subject: [ticket/10411] New class interface and unit tests for legend and
 teampage

PHPBB3-10411
---
 phpBB/includes/groupposition/interface.php | 92 ++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 phpBB/includes/groupposition/interface.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/groupposition/interface.php b/phpBB/includes/groupposition/interface.php
new file mode 100644
index 0000000000..b5d8a6b097
--- /dev/null
+++ b/phpBB/includes/groupposition/interface.php
@@ -0,0 +1,92 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Interface to manage group positions in various places of phpbb
+*
+* The interface provides simple methods to add, delete and move a group
+*
+* @package phpBB3
+*/
+interface phpbb_groupposition_interface
+{
+	/**
+	* Returns the value for a given group, if the group exists.
+	* @param	int		$group_id	group_id of the group to be selected
+	* @return	int			position of the group
+	*/
+	public function get_group_value($group_id);
+
+	/**
+	* Get number of groups displayed 
+	*
+	* @return	int		value of the last item displayed
+	*/
+	public function get_group_count();
+
+	/**
+	* Addes a group by group_id
+	*
+	* @param	int		$group_id	group_id of the group to be added
+	* @return	null
+	*/
+	public function add_group($group_id);
+
+	/**
+	* Deletes a group by setting the field to self::GROUP_DISABLED and closing the gap in the list.
+	*
+	* @param	int		$group_id		group_id of the group to be deleted
+	* @param	bool	$skip_group		Skip setting the group to GROUP_DISABLED, to save the query, when you need to update it anyway.
+	* @return	null
+	*/
+	public function delete_group($group_id, $skip_group = false);
+
+	/**
+	* Moves a group up by group_id
+	*
+	* @param	int		$group_id	group_id of the group to be moved
+	* @return	null
+	*/
+	public function move_up($group_id);
+
+	/**
+	* Moves a group down by group_id
+	*
+	* @param	int		$group_id	group_id of the group to be moved
+	* @return	null
+	*/
+	public function move_down($group_id);
+
+	/**
+	* Moves a group up/down
+	*
+	* @param	int		$group_id	group_id of the group to be moved
+	* @param	int		$delta		number of steps:
+	*								- positive = move up
+	*								- negative = move down
+	* @return	null
+	*/
+	public function move($group_id, $delta);
+
+	/**
+	* Error
+	*
+	* @param	string		$message	Error message to display
+	* @return	null
+	*/
+	public function error($message);
+}
-- 
cgit v1.2.1


From df735f46033a92657dce004c2d5ece6866565208 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Nov 2012 11:29:25 +0100
Subject: [ticket/10411] Add new table for teampage

PHPBB3-10411
---
 phpBB/includes/constants.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 68af41ab20..640616a49d 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -267,6 +267,7 @@ define('STYLES_TEMPLATE_DATA_TABLE',$table_prefix . 'styles_template_data');
 define('STYLES_THEME_TABLE',		$table_prefix . 'styles_theme');
 define('STYLES_IMAGESET_TABLE',		$table_prefix . 'styles_imageset');
 define('STYLES_IMAGESET_DATA_TABLE',$table_prefix . 'styles_imageset_data');
+define('TEAMPAGE_TABLE',			$table_prefix . 'teampage');
 define('TOPICS_TABLE',				$table_prefix . 'topics');
 define('TOPICS_POSTED_TABLE',		$table_prefix . 'topics_posted');
 define('TOPICS_TRACK_TABLE',		$table_prefix . 'topics_track');
-- 
cgit v1.2.1


From 153b99e11c4bf60fb72079cd61e3d27ab7d28055 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Nov 2012 11:33:22 +0100
Subject: [ticket/10411] Add new classes for legend and teampage handling

PHPBB3-10411
---
 phpBB/includes/group_positions.php        | 261 --------------
 phpBB/includes/groupposition/legend.php   | 251 ++++++++++++++
 phpBB/includes/groupposition/teampage.php | 548 ++++++++++++++++++++++++++++++
 3 files changed, 799 insertions(+), 261 deletions(-)
 delete mode 100644 phpBB/includes/group_positions.php
 create mode 100644 phpBB/includes/groupposition/legend.php
 create mode 100644 phpBB/includes/groupposition/teampage.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/group_positions.php b/phpBB/includes/group_positions.php
deleted file mode 100644
index 74de3516cb..0000000000
--- a/phpBB/includes/group_positions.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Group Position class, containing all functions to manage the groups in the teampage and legend.
-*
-* group_teampage/group_legend is an ascending list 1, 2, ..., n for groups which are displayed. 1 is the first group, n the last.
-* If the value is 0 (self::GROUP_DISABLED) the group is not displayed.
-* @package phpBB3
-*/
-class phpbb_group_positions
-{
-	/**
-	* Group is not displayed
-	*/
-	const GROUP_DISABLED = 0;
-
-	/**
-	* phpbb-database object
-	*/
-	public $db = null;
-
-	/**
-	* Name of the field we want to handle: either 'teampage' or 'legend'
-	*/
-	private $field = '';
-
-	/**
-	* URI for the adm_back_link when there was an error.
-	*/
-	private $adm_back_link = '';
-
-	/**
-	* Constructor
-	*/
-	public function __construct ($db, $field, $adm_back_link = '')
-	{
-		$this->adm_back_link = $adm_back_link;
-
-		if (!in_array($field, array('teampage', 'legend')))
-		{
-			$this->error('NO_MODE');
-		}
-
-		$this->db = $db;
-		$this->field = $field;
-	}
-
-	/**
-	* Returns the group_{$this->field} for a given group, if the group exists.
-	* @param	int		$group_id	group_id of the group to be selected
-	* @return	int					position of the group
-	*/
-	public function get_group_value($group_id)
-	{
-		$sql = 'SELECT group_' . $this->field . '
-			FROM ' . GROUPS_TABLE . '
-			WHERE group_id = ' . (int) $group_id;
-		$result = $this->db->sql_query($sql);
-		$current_value = $this->db->sql_fetchfield('group_' . $this->field);
-		$this->db->sql_freeresult($result);
-
-		if ($current_value === false)
-		{
-			// Group not found.
-			$this->error('NO_GROUP');
-		}
-
-		return (int) $current_value;
-	}
-
-	/**
-	* Get number of groups, displayed on the teampage/legend
-	*
-	* @return	int		value of the last group displayed
-	*/
-	public function get_group_count()
-	{
-		$sql = 'SELECT group_' . $this->field . '
-			FROM ' . GROUPS_TABLE . '
-			ORDER BY group_' . $this->field . ' DESC';
-		$result = $this->db->sql_query_limit($sql, 1);
-		$group_count = (int) $this->db->sql_fetchfield('group_' . $this->field);
-		$this->db->sql_freeresult($result);
-
-		return $group_count;
-	}
-
-	/**
-	* Addes a group by group_id
-	*
-	* @param	int		$group_id	group_id of the group to be added
-	* @return	void
-	*/
-	public function add_group($group_id)
-	{
-		$current_value = $this->get_group_value($group_id);
-
-		if ($current_value == self::GROUP_DISABLED)
-		{
-			// Group is currently not displayed, add it at the end.
-			$next_value = 1 + $this->get_group_count();
-
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET group_' . $this->field . ' = ' . $next_value . '
-				WHERE group_' . $this->field . ' = ' . self::GROUP_DISABLED . '
-					AND group_id = ' . (int) $group_id;
-			$this->db->sql_query($sql);
-		}
-	}
-
-	/**
-	* Deletes a group by setting the field to self::GROUP_DISABLED and closing the gap in the list.
-	*
-	* @param	int		$group_id		group_id of the group to be deleted
-	* @param	bool	$skip_group		Skip setting the group to GROUP_DISABLED, to save the query, when you need to update it anyway.
-	* @return	void
-	*/
-	public function delete_group($group_id, $skip_group = false)
-	{
-		$current_value = $this->get_group_value($group_id);
-
-		if ($current_value != self::GROUP_DISABLED)
-		{
-			$this->db->sql_transaction('begin');
-
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET group_' . $this->field . ' = group_' . $this->field . ' - 1
-				WHERE group_' . $this->field . ' > ' . $current_value;
-			$this->db->sql_query($sql);
-
-			if (!$skip_group)
-			{
-				$sql = 'UPDATE ' . GROUPS_TABLE . '
-					SET group_' . $this->field . ' = ' . self::GROUP_DISABLED . '
-					WHERE group_id = ' . (int) $group_id;
-				$this->db->sql_query($sql);
-			}
-
-			$this->db->sql_transaction('commit');
-		}
-	}
-
-	/**
-	* Moves a group up by group_id
-	*
-	* @param	int		$group_id	group_id of the group to be moved
-	* @return	void
-	*/
-	public function move_up($group_id)
-	{
-		$this->move($group_id, 1);
-	}
-
-	/**
-	* Moves a group down by group_id
-	*
-	* @param	int		$group_id	group_id of the group to be moved
-	* @return	void
-	*/
-	public function move_down($group_id)
-	{
-		$this->move($group_id, -1);
-	}
-
-	/**
-	* Moves a group up/down
-	*
-	* @param	int		$group_id	group_id of the group to be moved
-	* @param	int		$delta		number of steps:
-	*								- positive = move up
-	*								- negative = move down
-	* @return	void
-	*/
-	public function move($group_id, $delta)
-	{
-		if (!is_int($delta) || !$delta)
-		{
-			return;
-		}
-
-		$move_up = ($delta > 0) ? true : false;
-		$current_value = $this->get_group_value($group_id);
-
-		if ($current_value != self::GROUP_DISABLED)
-		{
-			$this->db->sql_transaction('begin');
-
-			// First we move all groups between our current value and the target value up/down 1,
-			// so we have a gap for our group to move.
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET group_' . $this->field . ' = group_' . $this->field . (($move_up) ? ' + 1' : ' - 1') . '
-				WHERE group_' . $this->field . ' > ' . self::GROUP_DISABLED . '
-					AND group_' . $this->field . (($move_up) ? ' >= ' : ' <= ') . ($current_value - $delta) . '
-					AND group_' . $this->field . (($move_up) ? ' < ' : ' > ') . $current_value;
-			$this->db->sql_query($sql);
-
-			// Because there might be fewer groups above/below the group than we wanted to move,
-			// we use the number of changed groups, to update the group.
-			$delta = (int) $this->db->sql_affectedrows();
-
-			if ($delta)
-			{
-				// And now finally, when we moved some other groups and built a gap,
-				// we can move the desired group to it.
-				$sql = 'UPDATE ' . GROUPS_TABLE . '
-					SET group_' . $this->field . ' = group_' . $this->field . (($move_up) ? ' - ' : ' + ') . $delta . '
-					WHERE group_id = ' . (int) $group_id;
-				$this->db->sql_query($sql);
-			}
-
-			$this->db->sql_transaction('commit');
-		}
-	}
-
-	/**
-	* Get group type language var
-	*
-	* @param	int		$group_type	group_type from the groups-table
-	* @return	string				name of the language variable for the given group-type.
-	*/
-	static public function group_type_language($group_type)
-	{
-		switch ($group_type)
-		{
-			case GROUP_OPEN:
-				return 'GROUP_REQUEST';
-			case GROUP_CLOSED:
-				return 'GROUP_CLOSED';
-			case GROUP_HIDDEN:
-				return 'GROUP_HIDDEN';
-			case GROUP_SPECIAL:
-				return 'GROUP_SPECIAL';
-			case GROUP_FREE:
-				return 'GROUP_OPEN';
-		}
-	}
-
-	/**
-	* Error
-	*/
-	public function error($message)
-	{
-		global $user;
-		trigger_error($user->lang[$message] . (($this->adm_back_link) ? adm_back_link($this->adm_back_link) : ''), E_USER_WARNING);
-	}
-}
diff --git a/phpBB/includes/groupposition/legend.php b/phpBB/includes/groupposition/legend.php
new file mode 100644
index 0000000000..4bd4d43ece
--- /dev/null
+++ b/phpBB/includes/groupposition/legend.php
@@ -0,0 +1,251 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Legend group position class
+*
+* group_legend is an ascending list 1, 2, ..., n for groups which are displayed. 1 is the first group, n the last.
+* If the value is 0 (self::GROUP_DISABLED) the group is not displayed.
+*
+* @package phpBB3
+*/
+class phpbb_groupposition_legend implements phpbb_groupposition_interface
+{
+	/**
+	* Group is not displayed
+	*/
+	const GROUP_DISABLED = 0;
+
+	/**
+	* phpbb-database object
+	*/
+	private $db = null;
+
+	/**
+	* phpbb-user object
+	*/
+	private $user = null;
+
+	/**
+	* URI for the adm_back_link when there was an error.
+	*/
+	private $adm_back_link = '';
+
+	/**
+	* Constructor
+	*
+	* @param phpbb_dbal	$db				Database object
+	* @param string		$adm_back_link	Return URL to use after an error occured
+	*/
+	public function __construct($db, phpbb_user $user, $adm_back_link = '')
+	{
+		$this->adm_back_link = $adm_back_link;
+		$this->db = $db;
+		$this->user = $user;
+	}
+
+	/**
+	* Returns the group_legend for a given group, if the group exists.
+	*
+	* {@inheritDoc}
+	*/
+	public function get_group_value($group_id)
+	{
+		$sql = 'SELECT group_legend
+			FROM ' . GROUPS_TABLE . '
+			WHERE group_id = ' . (int) $group_id;
+		$result = $this->db->sql_query($sql);
+		$current_value = $this->db->sql_fetchfield('group_legend');
+		$this->db->sql_freeresult($result);
+
+		if ($current_value === false)
+		{
+			// Group not found.
+			$this->error('NO_GROUP');
+		}
+
+		return (int) $current_value;
+	}
+
+	/**
+	* Get number of groups, displayed on the legend
+	*
+	* {@inheritDoc}
+	*/
+	public function get_group_count()
+	{
+		$sql = 'SELECT group_legend
+			FROM ' . GROUPS_TABLE . '
+			ORDER BY group_legend DESC';
+		$result = $this->db->sql_query_limit($sql, 1);
+		$group_count = (int) $this->db->sql_fetchfield('group_legend');
+		$this->db->sql_freeresult($result);
+
+		return $group_count;
+	}
+
+	/**
+	* Adds a group by group_id
+	*
+	* {@inheritDoc}
+	*/
+	public function add_group($group_id)
+	{
+		$current_value = $this->get_group_value($group_id);
+
+		if ($current_value == self::GROUP_DISABLED)
+		{
+			// Group is currently not displayed, add it at the end.
+			$next_value = 1 + $this->get_group_count();
+
+			$sql = 'UPDATE ' . GROUPS_TABLE . '
+				SET group_legend = ' . $next_value . '
+				WHERE group_legend = ' . self::GROUP_DISABLED . '
+					AND group_id = ' . (int) $group_id;
+			$this->db->sql_query($sql);
+		}
+	}
+
+	/**
+	* Deletes a group by setting the field to self::GROUP_DISABLED and closing the gap in the list.
+	*
+	* {@inheritDoc}
+	*/
+	public function delete_group($group_id, $skip_group = false)
+	{
+		$current_value = $this->get_group_value($group_id);
+
+		if ($current_value != self::GROUP_DISABLED)
+		{
+			$this->db->sql_transaction('begin');
+
+			$sql = 'UPDATE ' . GROUPS_TABLE . '
+				SET group_legend = group_legend - 1
+				WHERE group_legend > ' . $current_value;
+			$this->db->sql_query($sql);
+
+			if (!$skip_group)
+			{
+				$sql = 'UPDATE ' . GROUPS_TABLE . '
+					SET group_legend = ' . self::GROUP_DISABLED . '
+					WHERE group_id = ' . (int) $group_id;
+				$this->db->sql_query($sql);
+			}
+
+			$this->db->sql_transaction('commit');
+		}
+	}
+
+	/**
+	* Moves a group up by group_id
+	*
+	* {@inheritDoc}
+	*/
+	public function move_up($group_id)
+	{
+		$this->move($group_id, 1);
+	}
+
+	/**
+	* Moves a group down by group_id
+	*
+	* {@inheritDoc}
+	*/
+	public function move_down($group_id)
+	{
+		$this->move($group_id, -1);
+	}
+
+	/**
+	* Moves a group up/down
+	*
+	* {@inheritDoc}
+	*/
+	public function move($group_id, $delta)
+	{
+		if (!is_int($delta) || !$delta)
+		{
+			return;
+		}
+
+		$move_up = ($delta > 0) ? true : false;
+		$current_value = $this->get_group_value($group_id);
+
+		if ($current_value != self::GROUP_DISABLED)
+		{
+			$this->db->sql_transaction('begin');
+
+			// First we move all groups between our current value and the target value up/down 1,
+			// so we have a gap for our group to move.
+			$sql = 'UPDATE ' . GROUPS_TABLE . '
+				SET group_legend = group_legend' . (($move_up) ? ' + 1' : ' - 1') . '
+				WHERE group_legend > ' . self::GROUP_DISABLED . '
+					AND group_legend' . (($move_up) ? ' >= ' : ' <= ') . ($current_value - $delta) . '
+					AND group_legend' . (($move_up) ? ' < ' : ' > ') . $current_value;
+			$this->db->sql_query($sql);
+
+			// Because there might be fewer groups above/below the group than we wanted to move,
+			// we use the number of changed groups, to update the group.
+			$delta = (int) $this->db->sql_affectedrows();
+
+			if ($delta)
+			{
+				// And now finally, when we moved some other groups and built a gap,
+				// we can move the desired group to it.
+				$sql = 'UPDATE ' . GROUPS_TABLE . '
+					SET group_legend = group_legend ' . (($move_up) ? ' - ' : ' + ') . $delta . '
+					WHERE group_id = ' . (int) $group_id;
+				$this->db->sql_query($sql);
+			}
+
+			$this->db->sql_transaction('commit');
+		}
+	}
+
+	/**
+	* Error
+	*
+	* {@inheritDoc}
+	*/
+	public function error($message)
+	{
+		trigger_error($this->user->lang[$message] . (($this->adm_back_link) ? adm_back_link($this->adm_back_link) : ''), E_USER_WARNING);
+	}
+
+	/**
+	* Get group type language var
+	*
+	* @param	int		$group_type	group_type from the groups-table
+	* @return	string		name of the language variable for the given group-type.
+	*/
+	static public function group_type_language($group_type)
+	{
+		switch ($group_type)
+		{
+			case GROUP_OPEN:
+				return 'GROUP_REQUEST';
+			case GROUP_CLOSED:
+				return 'GROUP_CLOSED';
+			case GROUP_HIDDEN:
+				return 'GROUP_HIDDEN';
+			case GROUP_SPECIAL:
+				return 'GROUP_SPECIAL';
+			case GROUP_FREE:
+				return 'GROUP_OPEN';
+		}
+	}
+}
diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/includes/groupposition/teampage.php
new file mode 100644
index 0000000000..60e07f650e
--- /dev/null
+++ b/phpBB/includes/groupposition/teampage.php
@@ -0,0 +1,548 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Teampage group position class
+*
+* Teampage position is an ascending list 1, 2, ..., n for items which are displayed. 1 is the first item, n the last.
+*
+* @package phpBB3
+*/
+class phpbb_groupposition_teampage implements phpbb_groupposition_interface
+{
+	/**
+	* Group is not displayed
+	*/
+	const GROUP_DISABLED = 0;
+
+	/**
+	* No parent item
+	*/
+	const NO_PARENT = 0;
+
+	/**
+	* phpbb-database object
+	*/
+	private $db = null;
+
+	/**
+	* phpbb-user object
+	*/
+	private $user = null;
+
+	/**
+	* URI for the adm_back_link when there was an error.
+	*/
+	private $adm_back_link = '';
+
+	/**
+	* Constructor
+	*
+	* @param phpbb_dbal	$db				Database object
+	* @param string		$adm_back_link	Return URL to use after an error occured
+	*/
+	public function __construct($db, phpbb_user $user, $adm_back_link = '')
+	{
+		$this->adm_back_link = $adm_back_link;
+		$this->db = $db;
+		$this->user = $user;
+	}
+
+	/**
+	* Returns the teampage position for a given group, if the group exists.
+	*
+	* {@inheritDoc}
+	*/
+	public function get_group_value($group_id)
+	{
+		$sql = 'SELECT g.group_id, t.teampage_position
+			FROM ' . GROUPS_TABLE . ' g
+			LEFT JOIN ' . TEAMPAGE_TABLE . ' t
+				ON (t.group_id = g.group_id)
+			WHERE g.group_id = ' . (int) $group_id;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row === false)
+		{
+			// Group not found.
+			$this->error('NO_GROUP');
+		}
+
+		return (int) $row['teampage_position'];
+	}
+
+	/**
+	* Returns the row for a given group, if the group exists.
+	*
+	* @param	int		$group_id	group_id of the group to be selected
+	* @return	array			Data row of the group
+	*/
+	public function get_group_values($group_id)
+	{
+		$sql = 'SELECT *
+			FROM ' . GROUPS_TABLE . ' g
+			LEFT JOIN ' . TEAMPAGE_TABLE . ' t
+				ON (t.group_id = g.group_id)
+			WHERE g.group_id = ' . (int) $group_id;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row === false)
+		{
+			// Group not found.
+			$this->error('NO_GROUP');
+		}
+
+		return $row;
+	}
+
+	/**
+	* Returns the teampage position for a given teampage item, if the item exists.
+	*
+	* @param	int		$teampage_id	Teampage_id of the selected item
+	* @return	int			Teampage position of the item
+	*/
+	public function get_teampage_value($teampage_id)
+	{
+		$sql = 'SELECT teampage_position
+			FROM ' . TEAMPAGE_TABLE . '
+			WHERE teampage_id = ' . (int) $teampage_id;
+		$result = $this->db->sql_query($sql);
+		$current_value = $this->db->sql_fetchfield('teampage_position');
+		$this->db->sql_freeresult($result);
+
+		if ($current_value === false)
+		{
+			// Group not found.
+			$this->error('NO_GROUP');
+		}
+
+		return (int) $current_value;
+	}
+
+	/**
+	* Returns the teampage row for a given teampage item, if the item exists.
+	*
+	* @param	int		$teampage_id	Teampage_id of the selected item
+	* @return	array			Teampage row of the item
+	*/
+	public function get_teampage_values($teampage_id)
+	{
+		$sql = 'SELECT teampage_position, teampage_parent
+			FROM ' . TEAMPAGE_TABLE . '
+			WHERE teampage_id = ' . (int) $teampage_id;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row === false)
+		{
+			// Group not found.
+			$this->error('NO_GROUP');
+		}
+
+		return $row;
+	}
+
+
+	/**
+	* Get number of items displayed
+	*
+	* {@inheritDoc}
+	*/
+	public function get_group_count()
+	{
+		$sql = 'SELECT teampage_position
+			FROM ' . TEAMPAGE_TABLE . '
+			ORDER BY teampage_position DESC';
+		$result = $this->db->sql_query_limit($sql, 1);
+		$group_count = (int) $this->db->sql_fetchfield('teampage_position');
+		$this->db->sql_freeresult($result);
+
+		return $group_count;
+	}
+
+	/**
+	* Adds a group by group_id
+	*
+	* {@inheritDoc}
+	*/
+	public function add_group($group_id)
+	{
+		$this->add_group_teampage($group_id, self::NO_PARENT);
+	}
+
+	/**
+	* Adds a group by group_id
+	*
+	* @param	int		$group_id	group_id of the group to be added
+	* @param	int		$parent_id	Teampage ID of the parent item
+	* @return	null
+	*/
+	public function add_group_teampage($group_id, $parent_id)
+	{
+		$current_value = $this->get_group_value($group_id);
+
+		if ($current_value == self::GROUP_DISABLED)
+		{
+			if ($parent_id != self::NO_PARENT)
+			{
+				// Get value of last child from this parent and add group there
+				$sql = 'SELECT teampage_position
+					FROM ' . TEAMPAGE_TABLE . '
+					WHERE teampage_parent = ' . (int) $parent_id . '
+						OR teampage_id = ' . (int) $parent_id . '
+					ORDER BY teampage_position DESC';
+				$result = $this->db->sql_query_limit($sql, 1);
+				$new_position = (int) $this->db->sql_fetchfield('teampage_position');
+				$this->db->sql_freeresult($result);
+
+				$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
+					SET teampage_position = teampage_position + 1
+					WHERE teampage_position > ' . $new_position;
+				$this->db->sql_query($sql);
+
+			}
+			else
+			{
+				// Add group at the end
+				$new_position = $this->get_group_count();
+			}
+
+			$sql_ary = array(
+				'group_id'			=> $group_id,
+				'teampage_position'	=> $new_position + 1,
+				'teampage_parent'	=> $parent_id,
+			);
+
+			$sql = 'INSERT INTO ' . TEAMPAGE_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+			$this->db->sql_query($sql);
+		}
+	}
+
+	/**
+	* Adds a new category
+	*
+	* @param	string	$category_name	Name of the category to be added
+	* @return	null
+	*/
+	public function add_category_teampage($category_name)
+	{
+		$num_entries = $this->get_group_count();
+
+		$sql_ary = array(
+			'group_id'			=> 0,
+			'teampage_position'	=> $num_entries + 1,
+			'teampage_parent'	=> 0,
+			'teampage_name'		=> $category_name,
+		);
+
+		$sql = 'INSERT INTO ' . TEAMPAGE_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Deletes a group from the list and closes the gap in the position list.
+	*
+	* {@inheritDoc}
+	*/
+	public function delete_group($group_id, $skip_group = false)
+	{
+		$current_value = $this->get_group_value($group_id);
+
+		if ($current_value != self::GROUP_DISABLED)
+		{
+			$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
+				SET teampage_position = teampage_position - 1
+				WHERE teampage_position > ' . $current_value;
+			$this->db->sql_query($sql);
+
+			$sql = 'DELETE FROM ' . TEAMPAGE_TABLE . '
+				WHERE group_id = ' . $group_id;
+			$this->db->sql_query($sql);
+		}
+	}
+
+	/**
+	* Deletes an item from the list and closes the gap in the position list.
+	*
+	* @param	int		$teampage_id	teampage_id of the item to be deleted
+	* @param	bool	$skip_group		Skip setting the group to GROUP_DISABLED, to save the query, when you need to update it anyway.
+	* @return	null
+	*/
+	public function delete_teampage($teampage_id, $skip_group = false)
+	{
+		$current_value = $this->get_teampage_value($teampage_id);
+
+		if ($current_value != self::GROUP_DISABLED)
+		{
+			$sql = 'DELETE FROM ' . TEAMPAGE_TABLE . '
+				WHERE teampage_id = ' . $teampage_id . '
+					OR teampage_parent = ' . $teampage_id;
+			$this->db->sql_query($sql);
+
+			$delta = (int) $this->db->sql_affectedrows();
+
+			$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
+				SET teampage_position = teampage_position - ' . $delta . '
+				WHERE teampage_position > ' . $current_value;
+			$this->db->sql_query($sql);
+		}
+	}
+
+	/**
+	* Moves a group up by group_id
+	*
+	* {@inheritDoc}
+	*/
+	public function move_up($group_id)
+	{
+		$this->move($group_id, 1);
+	}
+
+	/**
+	* Moves an item up by teampage_id
+	*
+	* @param	int		$group_id	group_id of the group to be moved
+	* @return	null
+	*/
+	public function move_up_teampage($teampage_id)
+	{
+		$this->move_teampage($teampage_id, 1);
+	}
+
+	/**
+	* Moves a group down by group_id
+	*
+	* {@inheritDoc}
+	*/
+	public function move_down($group_id)
+	{
+		$this->move($group_id, -1);
+	}
+
+	/**
+	* Movesan item down by teampage_id
+	*
+	* @param	int		$group_id	group_id of the group to be moved
+	* @return	null
+	*/
+	public function move_down_teampage($teampage_id)
+	{
+		$this->move_teampage($teampage_id, -1);
+	}
+
+	/**
+	* Moves a group up/down
+	*
+	* {@inheritDoc}
+	*/
+	public function move($group_id, $delta)
+	{
+		if (!is_int($delta) || !$delta)
+		{
+			return;
+		}
+
+		$move_up = ($delta > 0) ? true : false;
+		$data = $this->get_group_values($group_id);
+
+		$current_value = (int) $data['teampage_position'];
+		if ($current_value != self::GROUP_DISABLED)
+		{
+			$this->db->sql_transaction('begin');
+
+			if (!$move_up && $data['teampage_parent'] == self::NO_PARENT)
+			{
+				// If we move items down, we need to grab the one sibling more,
+				// so we do not ignore the children of the previous sibling.
+				// We will remove the additional sibling later on.
+				$delta = abs($delta) + 1;
+			}
+
+			$sql = 'SELECT teampage_position
+				FROM ' . TEAMPAGE_TABLE . '
+				WHERE teampage_parent = ' . (int) $data['teampage_parent'] . '
+					AND teampage_position' . (($move_up) ? ' < ' : ' > ') . $current_value . '
+				ORDER BY teampage_position' . (($move_up) ? ' DESC' : ' ASC');
+			$result = $this->db->sql_query_limit($sql, $delta);
+
+			// Reset the delta, as we recalculate the new real delta
+			$delta = 0;
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$delta = $current_value - $row['teampage_position'];
+				if (!$move_up && $data['teampage_parent'] == self::NO_PARENT)
+				{
+					// Remove the additional sibling we added previously
+					$delta++;
+				}
+			}
+			$this->db->sql_freeresult($result);
+
+			if ($delta)
+			{
+				// First we move all items between our current value and the target value up/down 1,
+				// so we have a gap for our item to move.
+				$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
+					SET teampage_position = teampage_position' . (($move_up) ? ' + 1' : ' - 1') . '
+					WHERE teampage_position' . (($move_up) ? ' >= ' : ' <= ') . ($current_value - $delta) . '
+						AND teampage_position' . (($move_up) ? ' < ' : ' > ') . $current_value;
+				$this->db->sql_query($sql);
+
+				// And now finally, when we moved some other items and built a gap,
+				// we can move the desired item to it.
+				$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
+					SET teampage_position = teampage_position ' . (($move_up) ? ' - ' : ' + ') . abs($delta) . '
+					WHERE group_id = ' . (int) $group_id;
+				$this->db->sql_query($sql);
+			}
+
+			$this->db->sql_transaction('commit');
+		}
+	}
+
+	/**
+	* Moves an item up/down
+	*
+	* @param	int		$teampage_id	teampage_id of the item to be moved
+	* @param	int		$delta		number of steps:
+	*								- positive = move up
+	*								- negative = move down
+	* @return	null
+	*/
+	public function move_teampage($teampage_id, $delta)
+	{
+		if (!is_int($delta) || !$delta)
+		{
+			return;
+		}
+
+		$move_up = ($delta > 0) ? true : false;
+		$data = $this->get_teampage_values($teampage_id);
+
+		$current_value = (int) $data['teampage_position'];
+		if ($current_value != self::GROUP_DISABLED)
+		{
+			$this->db->sql_transaction('begin');
+
+			if (!$move_up && $data['teampage_parent'] == self::NO_PARENT)
+			{
+				// If we move items down, we need to grab the one sibling more,
+				// so we do not ignore the children of the previous sibling.
+				// We will remove the additional sibling later on.
+				$delta = abs($delta) + 1;
+			}
+
+			$sql = 'SELECT teampage_id, teampage_position
+				FROM ' . TEAMPAGE_TABLE . '
+				WHERE teampage_parent = ' . (int) $data['teampage_parent'] . '
+					AND teampage_position' . (($move_up) ? ' < ' : ' > ') . $current_value . '
+				ORDER BY teampage_position' . (($move_up) ? ' DESC' : ' ASC');
+			$result = $this->db->sql_query_limit($sql, $delta);
+
+			$sibling_count = 0;
+			$sibling_limit = $delta;
+
+			// Reset the delta, as we recalculate the new real delta
+			$delta = 0;
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$sibling_count++;
+				$delta = $current_value - $row['teampage_position'];
+
+				// Remove the additional sibling we added previously
+				// But only, if we included it, this is not be the case
+				// when we reached the end of our list
+				if (!$move_up && $data['teampage_parent'] == self::NO_PARENT && $sibling_count == $sibling_limit)
+				{
+					$delta++;
+				}
+			}
+			$this->db->sql_freeresult($result);
+
+			if ($delta)
+			{
+				$sql = 'SELECT COUNT(teampage_id) as num_items
+					FROM ' . TEAMPAGE_TABLE . '
+					WHERE teampage_id = ' . (int) $teampage_id . '
+						OR teampage_parent = ' . (int) $teampage_id;
+				$result = $this->db->sql_query($sql);
+				$num_items = (int) $this->db->sql_fetchfield('num_items');
+				$this->db->sql_freeresult($result);
+
+				// First we move all items between our current value and the target value up/down 1,
+				// so we have a gap for our item to move.
+				$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
+					SET teampage_position = teampage_position' . (($move_up) ? ' + ' : ' - ') . $num_items . '
+					WHERE teampage_position' . (($move_up) ? ' >= ' : ' <= ') . ($current_value - $delta) . '
+						AND teampage_position' . (($move_up) ? ' < ' : ' > ') . $current_value . '
+						AND NOT (teampage_id = ' . (int) $teampage_id . '
+							OR teampage_parent = ' . (int) $teampage_id . ')';
+				$this->db->sql_query($sql);
+
+				$delta = (!$move_up && $data['teampage_parent'] == self::NO_PARENT) ? (abs($delta) - ($num_items - 1)) : abs($delta);
+
+				// And now finally, when we moved some other items and built a gap,
+				// we can move the desired item to it.
+				$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
+					SET teampage_position = teampage_position ' . (($move_up) ? ' - ' : ' + ') . $delta . '
+					WHERE teampage_id = ' . (int) $teampage_id . '
+						OR teampage_parent = ' . (int) $teampage_id;
+				$this->db->sql_query($sql);
+			}
+
+			$this->db->sql_transaction('commit');
+		}
+	}
+
+	/**
+	* Error
+	*
+	* {@inheritDoc}
+	*/
+	public function error($message)
+	{
+		trigger_error($this->user->lang[$message] . (($this->adm_back_link) ? adm_back_link($this->adm_back_link) : ''), E_USER_WARNING);
+	}
+
+	/**
+	* Get group type language var
+	*
+	* @param	int		$group_type	group_type from the groups-table
+	* @return	string		name of the language variable for the given group-type.
+	*/
+	static public function group_type_language($group_type)
+	{
+		switch ($group_type)
+		{
+			case GROUP_OPEN:
+				return 'GROUP_REQUEST';
+			case GROUP_CLOSED:
+				return 'GROUP_CLOSED';
+			case GROUP_HIDDEN:
+				return 'GROUP_HIDDEN';
+			case GROUP_SPECIAL:
+				return 'GROUP_SPECIAL';
+			case GROUP_FREE:
+				return 'GROUP_OPEN';
+		}
+	}
+}
-- 
cgit v1.2.1


From b91702665a2ad555a172d09429d9beaac7ba88a7 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 13 Nov 2012 20:06:44 +0100
Subject: [feature/avatars] Add barebone gravatar driver

PHPBB3-10018
---
 phpBB/includes/avatar/driver/core/gravatar.php | 148 +++++++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 phpBB/includes/avatar/driver/core/gravatar.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/core/gravatar.php b/phpBB/includes/avatar/driver/core/gravatar.php
new file mode 100644
index 0000000000..a9e4d6c491
--- /dev/null
+++ b/phpBB/includes/avatar/driver/core/gravatar.php
@@ -0,0 +1,148 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars hosted at gravatar.com
+* @package avatars
+*/
+// @todo: rename classes to phpbb_ext_foo_avatar_driver_foo and similar
+class phpbb_avatar_driver_core_gravatar extends phpbb_avatar_driver
+{
+	/**
+	* We'll need to create a different type of avatar for gravatar
+	*/
+	public $custom_html = true;
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_data($row, $ignore_config = false)
+	{
+		// @todo: add allow_avatar_gravatar to database_update.php etc.
+		if ($ignore_config || $this->config['allow_avatar_gravatar'])
+		{
+			return array(
+				'src' => $row['avatar'],
+				'width' => $row['avatar_width'],
+				'height' => $row['avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+	
+	/**
+	* @inheritdoc
+	*/
+	public function get_custom_html($row, $ignore_config = false, $alt = '')
+	{
+		$html = '<img src="http://www.gravatar.com/avatar/' . md5(strtolower(trim($row['avatar']))) .  
+			(($row['avatar_width'] || $row['avatar_height']) ? ('?s=' . max($row['avatar_width'], $row['avatar_height'])) : '') . '" ' .
+			($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') .
+			($row['avatar_height'] ? ('height="' . $row['avatar_height'] . '" ') : '') .
+			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
+		return $html;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function prepare_form($template, $row, &$error)
+	{
+		$template->assign_vars(array(
+			'AV_GRAVATAR_WIDTH' => (($row['avatar_type'] == __CLASS__ || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
+			'AV_GRAVATAR_HEIGHT' => (($row['avatar_type'] == __CLASS__ || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
+			'AV_GRAVATAR_EMAIL' => (($row['avatar_type'] == __CLASS__ || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
+		));
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function process_form($template, $row, &$error)
+	{
+		$email = $this->request->variable('av_gravatar_email', '');
+		$width = $this->request->variable('av_gravatar_width', 0);
+		$height = $this->request->variable('av_gravatar_height', 0);
+		var_dump($width, $height);
+
+		/*
+		if (!preg_match('#^(http|https|ftp)://#i', $email))
+		{
+			$url = 'http://' . $url;
+		}*/
+		// @todo: check if we need to check emails
+
+		require_once($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
+
+		$error = array_merge($error, validate_data(array(
+			'email' => $email,
+		), array(
+			'email' => array(
+				array('string', false, 6, 60),
+				array('email')),
+		)));
+
+		if (!empty($error))
+		{
+			return false;
+		}
+
+		// Make sure getimagesize works...
+		if (function_exists('getimagesize'))
+		{
+			// build URL
+			// @todo: add https support
+			$url = 'http://www.gravatar.com/avatar/' . md5(strtolower(trim($email)));
+
+			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
+			{
+				$error[] = 'UNABLE_GET_IMAGE_SIZE';
+				return false;
+			}
+
+			if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
+			{
+				$error[] = 'AVATAR_NO_SIZE';
+				return false;
+			}
+
+			$width = ($width && $height) ? $width : $image_data[0];
+			$height = ($width && $height) ? $height : $image_data[1];
+		}
+
+		if ($width <= 0 || $height <= 0)
+		{
+			$error[] = 'AVATAR_NO_SIZE';
+			return false;
+		}
+
+		return array(
+			'avatar' => $email,
+			'avatar_width' => $width,
+			'avatar_height' => $height,
+		);
+	}
+}
-- 
cgit v1.2.1


From 53cb148d70b8ab89f8f8e6fba98a63f290ebf21b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Nov 2012 15:29:54 +0100
Subject: [ticket/10411] Fix comment in interface and some problems in teampage

Category names on the teampage can not be empty.
Also fixing a problem with the delta when moving a category.

PHPBB3-10411
---
 phpBB/includes/groupposition/interface.php |  4 +--
 phpBB/includes/groupposition/teampage.php  | 47 +++++++++++++++++++++---------
 2 files changed, 36 insertions(+), 15 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/groupposition/interface.php b/phpBB/includes/groupposition/interface.php
index b5d8a6b097..9eadb049c8 100644
--- a/phpBB/includes/groupposition/interface.php
+++ b/phpBB/includes/groupposition/interface.php
@@ -47,10 +47,10 @@ interface phpbb_groupposition_interface
 	public function add_group($group_id);
 
 	/**
-	* Deletes a group by setting the field to self::GROUP_DISABLED and closing the gap in the list.
+	* Deletes a group by group_id
 	*
 	* @param	int		$group_id		group_id of the group to be deleted
-	* @param	bool	$skip_group		Skip setting the group to GROUP_DISABLED, to save the query, when you need to update it anyway.
+	* @param	bool	$skip_group		Skip setting the value for this group, to save the query, when you need to update it anyway.
 	* @return	null
 	*/
 	public function delete_group($group_id, $skip_group = false);
diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/includes/groupposition/teampage.php
index 60e07f650e..374d33e987 100644
--- a/phpBB/includes/groupposition/teampage.php
+++ b/phpBB/includes/groupposition/teampage.php
@@ -204,21 +204,32 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		{
 			if ($parent_id != self::NO_PARENT)
 			{
-				// Get value of last child from this parent and add group there
-				$sql = 'SELECT teampage_position
+				// Check, whether the given parent is a category
+				$sql = 'SELECT teampage_id
 					FROM ' . TEAMPAGE_TABLE . '
-					WHERE teampage_parent = ' . (int) $parent_id . '
-						OR teampage_id = ' . (int) $parent_id . '
-					ORDER BY teampage_position DESC';
+					WHERE group_id = 0
+						AND teampage_id = ' . (int) $parent_id;
 				$result = $this->db->sql_query_limit($sql, 1);
-				$new_position = (int) $this->db->sql_fetchfield('teampage_position');
+				$parent_is_category = (bool) $this->db->sql_fetchfield('teampage_id');
 				$this->db->sql_freeresult($result);
 
-				$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
-					SET teampage_position = teampage_position + 1
-					WHERE teampage_position > ' . $new_position;
-				$this->db->sql_query($sql);
-
+				if ($parent_is_category)
+				{
+					// Get value of last child from this parent and add group there
+					$sql = 'SELECT teampage_position
+						FROM ' . TEAMPAGE_TABLE . '
+						WHERE teampage_parent = ' . (int) $parent_id . '
+							OR teampage_id = ' . (int) $parent_id . '
+						ORDER BY teampage_position DESC';
+					$result = $this->db->sql_query_limit($sql, 1);
+					$new_position = (int) $this->db->sql_fetchfield('teampage_position');
+					$this->db->sql_freeresult($result);
+
+					$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
+						SET teampage_position = teampage_position + 1
+						WHERE teampage_position > ' . $new_position;
+					$this->db->sql_query($sql);
+				}
 			}
 			else
 			{
@@ -245,13 +256,18 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	*/
 	public function add_category_teampage($category_name)
 	{
+		if ($category_name === '')
+		{
+			return;
+		}
+
 		$num_entries = $this->get_group_count();
 
 		$sql_ary = array(
 			'group_id'			=> 0,
 			'teampage_position'	=> $num_entries + 1,
 			'teampage_parent'	=> 0,
-			'teampage_name'		=> $category_name,
+			'teampage_name'		=> truncate_string($category_name, 255, 255),
 		);
 
 		$sql = 'INSERT INTO ' . TEAMPAGE_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
@@ -384,12 +400,17 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 				ORDER BY teampage_position' . (($move_up) ? ' DESC' : ' ASC');
 			$result = $this->db->sql_query_limit($sql, $delta);
 
+			$sibling_count = 0;
+			$sibling_limit = $delta;
+
 			// Reset the delta, as we recalculate the new real delta
 			$delta = 0;
 			while ($row = $this->db->sql_fetchrow($result))
 			{
+				$sibling_count++;
 				$delta = $current_value - $row['teampage_position'];
-				if (!$move_up && $data['teampage_parent'] == self::NO_PARENT)
+
+				if (!$move_up && $data['teampage_parent'] == self::NO_PARENT && $sibling_count == $sibling_limit)
 				{
 					// Remove the additional sibling we added previously
 					$delta++;
-- 
cgit v1.2.1


From 6a27a95f30f7dafffe994aceb75a3cf769d13221 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Nov 2012 15:32:35 +0100
Subject: [ticket/10411] Use new teampage and legend class in ACP and
 memberlist

PHPBB3-10411
---
 phpBB/includes/acp/acp_groups.php | 166 ++++++++++++++++++++++++++++----------
 1 file changed, 122 insertions(+), 44 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index b604e20094..dbdc044f7f 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -811,7 +811,7 @@ class acp_groups
 
 	public function manage_position()
 	{
-		global $config, $db, $template, $user;
+		global $config, $db, $template, $user, $request;
 
 		$this->tpl_name = 'acp_groups_position';
 		$this->page_title = 'ACP_GROUPS_POSITION';
@@ -819,48 +819,90 @@ class acp_groups
 		$field = request_var('field', '');
 		$action = request_var('action', '');
 		$group_id = request_var('g', 0);
+		$teampage_id = request_var('t', 0);
+		$category_id = request_var('c', 0);
 
 		if ($field && !in_array($field, array('legend', 'teampage')))
 		{
 			// Invalid mode
 			trigger_error($user->lang['NO_MODE'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
-		else if ($field)
+		else if ($field == 'legend')
 		{
-			$group_position = new phpbb_group_positions($db, $field, $this->u_action);
+			$group_position = new phpbb_groupposition_legend($db, $user, $this->u_action);
+		}
+		else if ($field == 'teampage')
+		{
+			$group_position = new phpbb_groupposition_teampage($db, $user, $this->u_action);
 		}
 
-		switch ($action)
+		if ($field == 'teampage')
 		{
-			case 'set_config_legend':
-				set_config('legend_sort_groupname', request_var('legend_sort_groupname', 0));
-			break;
+			switch ($action)
+			{
+				case 'add':
+					$group_position->add_group_teampage($group_id, $category_id);
+				break;
 
-			case 'set_config_teampage':
-				set_config('teampage_forums', request_var('teampage_forums', 0));
-				set_config('teampage_memberships', request_var('teampage_memberships', 0));
-			break;
+				case 'add_category':
+					$group_position->add_category_teampage($request->variable('category_name', '', true));
+				break;
 
-			case 'add':
-				$group_position->add_group($group_id);
-			break;
+				case 'delete':
+					$group_position->delete_teampage($teampage_id);
+				break;
 
-			case 'delete':
-				$group_position->delete_group($group_id);
-			break;
+				case 'move_up':
+					$group_position->move_up_teampage($teampage_id);
+				break;
 
-			case 'move_up':
-				$group_position->move_up($group_id);
-			break;
+				case 'move_down':
+					$group_position->move_down_teampage($teampage_id);
+				break;
+			}
 
-			case 'move_down':
-				$group_position->move_down($group_id);
-			break;
+			global $cache;
+			$cache->destroy('sql', TEAMPAGE_TABLE);
+		}
+		else if ($field == 'legend')
+		{
+			switch ($action)
+			{
+				case 'add':
+					$group_position->add_group($group_id);
+				break;
+
+				case 'delete':
+					$group_position->delete_group($group_id);
+				break;
+
+				case 'move_up':
+					$group_position->move_up($group_id);
+				break;
+
+				case 'move_down':
+					$group_position->move_down($group_id);
+				break;
+			}
+		}
+		else
+		{
+			switch ($action)
+			{
+				case 'set_config_teampage':
+					set_config('teampage_forums', $request->variable('teampage_forums', 0));
+					set_config('teampage_memberships', $request->variable('teampage_memberships', 0));
+				break;
+
+				case 'set_config_legend':
+					set_config('legend_sort_groupname', $request->variable('legend_sort_groupname', 0));
+				break;
+			}
 		}
 
 		$sql = 'SELECT group_id, group_name, group_colour, group_type, group_legend
 			FROM ' . GROUPS_TABLE . '
-			ORDER BY group_legend, group_name ASC';
+			ORDER BY group_legend ASC, group_type DESC, group_name ASC';
 		$result = $db->sql_query($sql);
 
 		$s_group_select_legend = '';
@@ -872,7 +914,7 @@ class acp_groups
 				$template->assign_block_vars('legend', array(
 					'GROUP_NAME' => $group_name,
 					'GROUP_COLOUR' => ($row['group_colour']) ? ' style="color: #' . $row['group_colour'] . '"' : '',
-					'GROUP_TYPE' => $user->lang[phpbb_group_positions::group_type_language($row['group_type'])],
+					'GROUP_TYPE' => $user->lang[phpbb_groupposition_legend::group_type_language($row['group_type'])],
 
 					'U_MOVE_DOWN' => "{$this->u_action}&amp;field=legend&amp;action=move_down&amp;g=" . $row['group_id'],
 					'U_MOVE_UP' => "{$this->u_action}&amp;field=legend&amp;action=move_up&amp;g=" . $row['group_id'],
@@ -881,46 +923,82 @@ class acp_groups
 			}
 			else
 			{
-				$s_group_select_legend .= '<option value="' . (int) $row['group_id'] . '">' . $group_name . '</option>';
+				$s_group_select_legend .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . (int) $row['group_id'] . '">' . $group_name . '</option>';
 			}
 		}
 		$db->sql_freeresult($result);
 
-		$sql = 'SELECT group_id, group_name, group_colour, group_type, group_teampage
-			FROM ' . GROUPS_TABLE . '
-			ORDER BY group_teampage, group_name ASC';
+		$category_url_param = (($category_id) ? '&amp;c=' . $category_id : '');
+
+		$sql = 'SELECT t.*, g.group_name, g.group_colour, g.group_type
+			FROM ' . TEAMPAGE_TABLE . ' t
+			LEFT JOIN ' . GROUPS_TABLE . ' g
+				ON (t.group_id = g.group_id)
+			WHERE t.teampage_parent = ' . $category_id . '
+				OR t.teampage_id = ' . $category_id . '
+			ORDER BY t.teampage_position ASC';
 		$result = $db->sql_query($sql);
 
-		$s_group_select_teampage = '';
+		$category_data = array();
 		while ($row = $db->sql_fetchrow($result))
 		{
-			$group_name = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
-			if ($row['group_teampage'])
+			if ($row['teampage_id'] == $category_id)
 			{
-				$template->assign_block_vars('teampage', array(
-					'GROUP_NAME' => $group_name,
-					'GROUP_COLOUR' => ($row['group_colour']) ? ' style="color: #' . $row['group_colour'] . '"' : '',
-					'GROUP_TYPE' => $user->lang[phpbb_group_positions::group_type_language($row['group_type'])],
-
-					'U_MOVE_DOWN' => "{$this->u_action}&amp;field=teampage&amp;action=move_down&amp;g=" . $row['group_id'],
-					'U_MOVE_UP' => "{$this->u_action}&amp;field=teampage&amp;action=move_up&amp;g=" . $row['group_id'],
-					'U_DELETE' => "{$this->u_action}&amp;field=teampage&amp;action=delete&amp;g=" . $row['group_id'],
+				$template->assign_vars(array(
+					'CUR_CATEGORY_NAME'		=> $row['teampage_name'],
 				));
+				continue;
+			}
+
+			if ($row['group_id'])
+			{
+				$group_name = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
+				$group_type = $user->lang[phpbb_groupposition_teampage::group_type_language($row['group_type'])];
 			}
 			else
 			{
-				$s_group_select_teampage .= '<option value="' . (int) $row['group_id'] . '">' . $group_name . '</option>';
+				$group_name = $row['teampage_name'];
+				$group_type = '';
 			}
+
+			$template->assign_block_vars('teampage', array(
+				'GROUP_NAME'	=> $group_name,
+				'GROUP_COLOUR'	=> ($row['group_colour']) ? ' style="color: #' . $row['group_colour'] . '"' : '',
+				'GROUP_TYPE'	=> $group_type,
+
+				'U_CATEGORY'	=> (!$row['group_id']) ? "{$this->u_action}&amp;c=" . $row['teampage_id'] : '',
+				'U_MOVE_DOWN'	=> "{$this->u_action}&amp;field=teampage&amp;action=move_down{$category_url_param}&amp;t=" . $row['teampage_id'],
+				'U_MOVE_UP'		=> "{$this->u_action}&amp;field=teampage&amp;action=move_up{$category_url_param}&amp;t=" . $row['teampage_id'],
+				'U_DELETE'		=> "{$this->u_action}&amp;field=teampage&amp;action=delete{$category_url_param}&amp;t=" . $row['teampage_id'],
+			));
+		}
+		$db->sql_freeresult($result);
+
+		$sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type
+			FROM ' . GROUPS_TABLE . ' g
+			LEFT JOIN ' . TEAMPAGE_TABLE . ' t
+				ON (t.group_id = g.group_id)
+			WHERE t.teampage_id IS NULL
+			ORDER BY g.group_type DESC, g.group_name ASC';
+		$result = $db->sql_query($sql);
+
+		$s_group_select_teampage = '';
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$group_name = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
+			$s_group_select_teampage .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . (int) $row['group_id'] . '">' . $group_name . '</option>';
 		}
 		$db->sql_freeresult($result);
 
 		$template->assign_vars(array(
-			'U_ACTION' => $this->u_action,
-			'U_ACTION_LEGEND' => $this->u_action . '&amp;field=legend',
-			'U_ACTION_TEAMPAGE' => $this->u_action . '&amp;field=teampage',
+			'U_ACTION'					=> $this->u_action,
+			'U_ACTION_LEGEND'			=> $this->u_action . '&amp;field=legend',
+			'U_ACTION_TEAMPAGE'			=> $this->u_action . '&amp;field=teampage' . $category_url_param,
+			'U_ACTION_TEAMPAGE_CAT'		=> $this->u_action . '&amp;field=teampage_cat',
 
 			'S_GROUP_SELECT_LEGEND'		=> $s_group_select_legend,
 			'S_GROUP_SELECT_TEAMPAGE'	=> $s_group_select_teampage,
+			'S_TEAMPAGE_CATEGORY'		=> $category_id,
 			'DISPLAY_FORUMS'			=> ($config['teampage_forums']) ? true : false,
 			'DISPLAY_MEMBERSHIPS'		=> $config['teampage_memberships'],
 			'LEGEND_SORT_GROUPNAME'		=> ($config['legend_sort_groupname']) ? true : false,
-- 
cgit v1.2.1


From 6e286218ec51487e036c9dc74876f90f1db9b6d1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 13 Nov 2012 16:10:21 +0100
Subject: [ticket/10411] Fix create_group and delete_group functions

PHPBB3-10411
---
 phpBB/includes/acp/acp_groups.php |  9 ++++--
 phpBB/includes/functions_user.php | 64 +++++++++++++++++----------------------
 2 files changed, 34 insertions(+), 39 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index dbdc044f7f..59f84f8c48 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -61,9 +61,11 @@ class acp_groups
 		// Grab basic data for group, if group_id is set and exists
 		if ($group_id)
 		{
-			$sql = 'SELECT *
-				FROM ' . GROUPS_TABLE . "
-				WHERE group_id = $group_id";
+			$sql = 'SELECT g.*, t.teampage_position AS group_teampage
+				FROM ' . GROUPS_TABLE . ' g
+				LEFT JOIN ' . TEAMPAGE_TABLE . ' t
+					ON (t.group_id = g.group_id)
+				WHERE g.group_id = ' . $group_id;
 			$result = $db->sql_query($sql);
 			$group_row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
@@ -497,6 +499,7 @@ class acp_groups
 							}
 
 							$cache->destroy('sql', GROUPS_TABLE);
+							$cache->destroy('sql', TEAMPAGE_TABLE);
 
 							$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
 							trigger_error($user->lang[$message] . adm_back_link($this->u_action));
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 8f9c9198f4..2a38010f2b 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2594,13 +2594,16 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 		$error[] = $user->lang['GROUP_ERR_TYPE'];
 	}
 
+	$group_teampage = !empty($group_attributes['group_teampage']);
+	unset($group_attributes['group_teampage']);
+
 	if (!sizeof($error))
 	{
-		$current_legend = phpbb_group_positions::GROUP_DISABLED;
-		$current_teampage = phpbb_group_positions::GROUP_DISABLED;
+		$current_legend = phpbb_groupposition_legend::GROUP_DISABLED;
+		$current_teampage = phpbb_groupposition_teampage::GROUP_DISABLED;
 
-		$legend = new phpbb_group_positions($db, 'legend');
-		$teampage = new phpbb_group_positions($db, 'teampage');
+		$legend = new phpbb_groupposition_legend($db, $user, '');
+		$teampage = new phpbb_groupposition_teampage($db, $user, '');
 		if ($group_id)
 		{
 			$current_legend = $legend->get_group_value($group_id);
@@ -2609,7 +2612,7 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 
 		if (!empty($group_attributes['group_legend']))
 		{
-			if (($group_id && ($current_legend == phpbb_group_positions::GROUP_DISABLED)) || !$group_id)
+			if (($group_id && ($current_legend == phpbb_groupposition_legend::GROUP_DISABLED)) || !$group_id)
 			{
 				// Old group currently not in the legend or new group, add at the end.
 				$group_attributes['group_legend'] = 1 + $legend->get_group_count();
@@ -2620,44 +2623,19 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 				$group_attributes['group_legend'] = $current_legend;
 			}
 		}
-		else if ($group_id && ($current_legend > phpbb_group_positions::GROUP_DISABLED))
+		else if ($group_id && ($current_legend > phpbb_groupposition_legend::GROUP_DISABLED))
 		{
 			// Group is removed from the legend
 			$legend->delete_group($group_id, true);
-			$group_attributes['group_legend'] = phpbb_group_positions::GROUP_DISABLED;
-		}
-		else
-		{
-			$group_attributes['group_legend'] = phpbb_group_positions::GROUP_DISABLED;
-		}
-
-		if (!empty($group_attributes['group_teampage']))
-		{
-			if (($group_id && ($current_teampage == phpbb_group_positions::GROUP_DISABLED)) || !$group_id)
-			{
-				// Old group currently not on the teampage or new group, add at the end.
-				$group_attributes['group_teampage'] = 1 + $teampage->get_group_count();
-			}
-			else
-			{
-				// Group stayes on the teampage
-				$group_attributes['group_teampage'] = $current_teampage;
-			}
-		}
-		else if ($group_id && ($current_teampage > phpbb_group_positions::GROUP_DISABLED))
-		{
-			// Group is removed from the teampage
-			$teampage->delete_group($group_id, true);
-			$group_attributes['group_teampage'] = phpbb_group_positions::GROUP_DISABLED;
+			$group_attributes['group_legend'] = phpbb_groupposition_legend::GROUP_DISABLED;
 		}
 		else
 		{
-			$group_attributes['group_teampage'] = phpbb_group_positions::GROUP_DISABLED;
+			$group_attributes['group_legend'] = phpbb_groupposition_legend::GROUP_DISABLED;
 		}
 
 		// Unset the objects, we don't need them anymore.
 		unset($legend);
-		unset($teampage);
 
 		$user_ary = array();
 		$sql_ary = array(
@@ -2761,6 +2739,19 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 			}
 		}
 
+		if ($group_teampage)
+		{
+			if ($current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED)
+			{
+				$teampage->add_group($group_id);
+			}
+		}
+		else if ($group_id && ($current_teampage > phpbb_groupposition_teampage::GROUP_DISABLED))
+		{
+			$teampage->delete_group($group_id);
+		}
+		unset($teampage);
+
 		// Set user attributes
 		$sql_ary = array();
 		if (sizeof($group_attributes))
@@ -2842,7 +2833,7 @@ function avatar_remove_db($avatar_name)
 */
 function group_delete($group_id, $group_name = false)
 {
-	global $db, $phpbb_root_path, $phpEx, $phpbb_dispatcher;
+	global $db, $user, $phpbb_root_path, $phpEx, $phpbb_dispatcher;
 
 	if (!$group_name)
 	{
@@ -2884,10 +2875,11 @@ function group_delete($group_id, $group_name = false)
 	while ($start);
 
 	// Delete group from legend and teampage
-	$legend = new phpbb_group_positions($db, 'legend');
+	$legend = new phpbb_groupposition_legend($db, $user, '');
 	$legend->delete_group($group_id);
 	unset($legend);
-	$teampage = new phpbb_group_positions($db, 'teampage');
+
+	$teampage = new phpbb_groupposition_teampage($db, $user, '');
 	$teampage->delete_group($group_id);
 	unset($teampage);
 
-- 
cgit v1.2.1


From 79eea0ccac1bc6dd5d39b4d47e973ef522cf7781 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Nov 2012 15:31:16 +0100
Subject: [ticket/10411] Use DIC to get the groupposition classes

PHPBB3-10411
---
 phpBB/includes/acp/acp_groups.php          | 14 ++++------
 phpBB/includes/functions_user.php          | 16 ++++++-----
 phpBB/includes/groupposition/interface.php |  8 ------
 phpBB/includes/groupposition/legend.php    | 25 ++++++++++++-----
 phpBB/includes/groupposition/teampage.php  | 44 +++++++++++++++++++++++++-----
 5 files changed, 69 insertions(+), 38 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 59f84f8c48..e0ce456a62 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -830,13 +830,12 @@ class acp_groups
 			// Invalid mode
 			trigger_error($user->lang['NO_MODE'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
-		else if ($field == 'legend')
-		{
-			$group_position = new phpbb_groupposition_legend($db, $user, $this->u_action);
-		}
-		else if ($field == 'teampage')
+		else if ($field)
 		{
-			$group_position = new phpbb_groupposition_teampage($db, $user, $this->u_action);
+			global $phpbb_container;
+
+			$group_position = $phpbb_container->get('groupposition.' . $field);
+			$group_position->set_admin_back_link($this->u_action);
 		}
 
 		if ($field == 'teampage')
@@ -863,9 +862,6 @@ class acp_groups
 					$group_position->move_down_teampage($teampage_id);
 				break;
 			}
-
-			global $cache;
-			$cache->destroy('sql', TEAMPAGE_TABLE);
 		}
 		else if ($field == 'legend')
 		{
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 2a38010f2b..3005f5efda 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2602,8 +2602,10 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 		$current_legend = phpbb_groupposition_legend::GROUP_DISABLED;
 		$current_teampage = phpbb_groupposition_teampage::GROUP_DISABLED;
 
-		$legend = new phpbb_groupposition_legend($db, $user, '');
-		$teampage = new phpbb_groupposition_teampage($db, $user, '');
+		global $phpbb_container;
+
+		$legend = $phpbb_container->get('groupposition.legend');
+		$teampage = $phpbb_container->get('groupposition.teampage');
 		if ($group_id)
 		{
 			$current_legend = $legend->get_group_value($group_id);
@@ -2623,7 +2625,7 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 				$group_attributes['group_legend'] = $current_legend;
 			}
 		}
-		else if ($group_id && ($current_legend > phpbb_groupposition_legend::GROUP_DISABLED))
+		else if ($group_id && ($current_legend != phpbb_groupposition_legend::GROUP_DISABLED))
 		{
 			// Group is removed from the legend
 			$legend->delete_group($group_id, true);
@@ -2746,7 +2748,7 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 				$teampage->add_group($group_id);
 			}
 		}
-		else if ($group_id && ($current_teampage > phpbb_groupposition_teampage::GROUP_DISABLED))
+		else if ($group_id && ($current_teampage != phpbb_groupposition_teampage::GROUP_DISABLED))
 		{
 			$teampage->delete_group($group_id);
 		}
@@ -2833,7 +2835,7 @@ function avatar_remove_db($avatar_name)
 */
 function group_delete($group_id, $group_name = false)
 {
-	global $db, $user, $phpbb_root_path, $phpEx, $phpbb_dispatcher;
+	global $db, $user, $phpbb_root_path, $phpEx, $phpbb_dispatcher, $phpbb_container;
 
 	if (!$group_name)
 	{
@@ -2875,11 +2877,11 @@ function group_delete($group_id, $group_name = false)
 	while ($start);
 
 	// Delete group from legend and teampage
-	$legend = new phpbb_groupposition_legend($db, $user, '');
+	$legend = $phpbb_container->get('groupposition.legend');
 	$legend->delete_group($group_id);
 	unset($legend);
 
-	$teampage = new phpbb_groupposition_teampage($db, $user, '');
+	$teampage = $phpbb_container->get('groupposition.teampage');
 	$teampage->delete_group($group_id);
 	unset($teampage);
 
diff --git a/phpBB/includes/groupposition/interface.php b/phpBB/includes/groupposition/interface.php
index 9eadb049c8..749ad61071 100644
--- a/phpBB/includes/groupposition/interface.php
+++ b/phpBB/includes/groupposition/interface.php
@@ -81,12 +81,4 @@ interface phpbb_groupposition_interface
 	* @return	null
 	*/
 	public function move($group_id, $delta);
-
-	/**
-	* Error
-	*
-	* @param	string		$message	Error message to display
-	* @return	null
-	*/
-	public function error($message);
 }
diff --git a/phpBB/includes/groupposition/legend.php b/phpBB/includes/groupposition/legend.php
index 4bd4d43ece..4dcf31ff06 100644
--- a/phpBB/includes/groupposition/legend.php
+++ b/phpBB/includes/groupposition/legend.php
@@ -31,12 +31,14 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 	const GROUP_DISABLED = 0;
 
 	/**
-	* phpbb-database object
+	* Database object
+	* @var dbal
 	*/
 	private $db = null;
 
 	/**
-	* phpbb-user object
+	* User object
+	* @var phpbb_user
 	*/
 	private $user = null;
 
@@ -48,16 +50,25 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 	/**
 	* Constructor
 	*
-	* @param phpbb_dbal	$db				Database object
-	* @param string		$adm_back_link	Return URL to use after an error occured
+	* @param dbal		$db		Database object
+	* @param phpbb_user	$user	User object
 	*/
-	public function __construct($db, phpbb_user $user, $adm_back_link = '')
+	public function __construct(dbal $db, phpbb_user $user)
 	{
-		$this->adm_back_link = $adm_back_link;
 		$this->db = $db;
 		$this->user = $user;
 	}
 
+	/**
+	* Set the back link for error messages
+	*
+	* @param string		$adm_back_link	Return URL to use after an error occured
+	*/
+	public function set_admin_back_link($adm_back_link)
+	{
+		$this->adm_back_link = $adm_back_link;
+	}
+
 	/**
 	* Returns the group_legend for a given group, if the group exists.
 	*
@@ -221,7 +232,7 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 	*
 	* {@inheritDoc}
 	*/
-	public function error($message)
+	private function error($message)
 	{
 		trigger_error($this->user->lang[$message] . (($this->adm_back_link) ? adm_back_link($this->adm_back_link) : ''), E_USER_WARNING);
 	}
diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/includes/groupposition/teampage.php
index 374d33e987..ab23dd0420 100644
--- a/phpBB/includes/groupposition/teampage.php
+++ b/phpBB/includes/groupposition/teampage.php
@@ -35,15 +35,23 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	const NO_PARENT = 0;
 
 	/**
-	* phpbb-database object
+	* Database object
+	* @var dbal
 	*/
 	private $db = null;
 
 	/**
-	* phpbb-user object
+	* User object
+	* @var phpbb_user
 	*/
 	private $user = null;
 
+	/**
+	* Cache object
+	* @var phpbb_cache_driver_interface
+	*/
+	private $cache = null;
+
 	/**
 	* URI for the adm_back_link when there was an error.
 	*/
@@ -52,14 +60,24 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	/**
 	* Constructor
 	*
-	* @param phpbb_dbal	$db				Database object
-	* @param string		$adm_back_link	Return URL to use after an error occured
+	* @param dbal		$db		Database object
+	* @param phpbb_user	$user	User object
 	*/
-	public function __construct($db, phpbb_user $user, $adm_back_link = '')
+	public function __construct(dbal $db, phpbb_user $user, phpbb_cache_driver_interface $cache)
 	{
-		$this->adm_back_link = $adm_back_link;
 		$this->db = $db;
 		$this->user = $user;
+		$this->cache = $cache;
+	}
+
+	/**
+	* Set the back link for error messages
+	*
+	* @param string		$adm_back_link	Return URL to use after an error occured
+	*/
+	public function set_admin_back_link($adm_back_link)
+	{
+		$this->adm_back_link = $adm_back_link;
 	}
 
 	/**
@@ -246,6 +264,8 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 			$sql = 'INSERT INTO ' . TEAMPAGE_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
 			$this->db->sql_query($sql);
 		}
+
+		$this->cache->destroy('sql', TEAMPAGE_TABLE);
 	}
 
 	/**
@@ -272,6 +292,8 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 
 		$sql = 'INSERT INTO ' . TEAMPAGE_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
 		$this->db->sql_query($sql);
+
+		$this->cache->destroy('sql', TEAMPAGE_TABLE);
 	}
 
 	/**
@@ -294,6 +316,8 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 				WHERE group_id = ' . $group_id;
 			$this->db->sql_query($sql);
 		}
+
+		$this->cache->destroy('sql', TEAMPAGE_TABLE);
 	}
 
 	/**
@@ -321,6 +345,8 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 				WHERE teampage_position > ' . $current_value;
 			$this->db->sql_query($sql);
 		}
+
+		$this->cache->destroy('sql', TEAMPAGE_TABLE);
 	}
 
 	/**
@@ -438,6 +464,8 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 
 			$this->db->sql_transaction('commit');
 		}
+
+		$this->cache->destroy('sql', TEAMPAGE_TABLE);
 	}
 
 	/**
@@ -532,6 +560,8 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 
 			$this->db->sql_transaction('commit');
 		}
+
+		$this->cache->destroy('sql', TEAMPAGE_TABLE);
 	}
 
 	/**
@@ -539,7 +569,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	*
 	* {@inheritDoc}
 	*/
-	public function error($message)
+	private function error($message)
 	{
 		trigger_error($this->user->lang[$message] . (($this->adm_back_link) ? adm_back_link($this->adm_back_link) : ''), E_USER_WARNING);
 	}
-- 
cgit v1.2.1


From a9ed479e148fe801df6c928a34d84438d9b68cf2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Nov 2012 15:55:51 +0100
Subject: [ticket/10411] Use AJAX to move items up/down and delete them

PHPBB3-10411
---
 phpBB/includes/acp/acp_groups.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index e0ce456a62..d696b99680 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -899,6 +899,12 @@ class acp_groups
 			}
 		}
 
+		if (($action == 'move_up' || $action == 'move_down') && $request->is_ajax())
+		{
+			$json_response = new phpbb_json_response;
+			$json_response->send(array('success' => true));
+		}
+
 		$sql = 'SELECT group_id, group_name, group_colour, group_type, group_legend
 			FROM ' . GROUPS_TABLE . '
 			ORDER BY group_legend ASC, group_type DESC, group_name ASC';
@@ -911,13 +917,13 @@ class acp_groups
 			if ($row['group_legend'])
 			{
 				$template->assign_block_vars('legend', array(
-					'GROUP_NAME' => $group_name,
-					'GROUP_COLOUR' => ($row['group_colour']) ? ' style="color: #' . $row['group_colour'] . '"' : '',
-					'GROUP_TYPE' => $user->lang[phpbb_groupposition_legend::group_type_language($row['group_type'])],
+					'GROUP_NAME'	=> $group_name,
+					'GROUP_COLOUR'	=> ($row['group_colour']) ? ' style="color: #' . $row['group_colour'] . '"' : '',
+					'GROUP_TYPE'	=> $user->lang[phpbb_groupposition_legend::group_type_language($row['group_type'])],
 
-					'U_MOVE_DOWN' => "{$this->u_action}&amp;field=legend&amp;action=move_down&amp;g=" . $row['group_id'],
-					'U_MOVE_UP' => "{$this->u_action}&amp;field=legend&amp;action=move_up&amp;g=" . $row['group_id'],
-					'U_DELETE' => "{$this->u_action}&amp;field=legend&amp;action=delete&amp;g=" . $row['group_id'],
+					'U_MOVE_DOWN'	=> "{$this->u_action}&amp;field=legend&amp;action=move_down&amp;g=" . $row['group_id'],
+					'U_MOVE_UP'		=> "{$this->u_action}&amp;field=legend&amp;action=move_up&amp;g=" . $row['group_id'],
+					'U_DELETE'		=> "{$this->u_action}&amp;field=legend&amp;action=delete&amp;g=" . $row['group_id'],
 				));
 			}
 			else
-- 
cgit v1.2.1


From e417882af1629e1fea1dd9e1924ce5163bee5eb3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Nov 2012 19:01:52 +0100
Subject: [ticket/10411] Use the objects instead of the deprecated wrappers

PHPBB3-10411
---
 phpBB/includes/acp/acp_groups.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index d696b99680..456f385079 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -819,11 +819,11 @@ class acp_groups
 		$this->tpl_name = 'acp_groups_position';
 		$this->page_title = 'ACP_GROUPS_POSITION';
 
-		$field = request_var('field', '');
-		$action = request_var('action', '');
-		$group_id = request_var('g', 0);
-		$teampage_id = request_var('t', 0);
-		$category_id = request_var('c', 0);
+		$field = $request->variable('field', '');
+		$action = $request->variable('action', '');
+		$group_id = $request->variable('g', 0);
+		$teampage_id = $request->variable('t', 0);
+		$category_id = $request->variable('c', 0);
 
 		if ($field && !in_array($field, array('legend', 'teampage')))
 		{
@@ -889,12 +889,12 @@ class acp_groups
 			switch ($action)
 			{
 				case 'set_config_teampage':
-					set_config('teampage_forums', $request->variable('teampage_forums', 0));
-					set_config('teampage_memberships', $request->variable('teampage_memberships', 0));
+					$config->set('teampage_forums', $request->variable('teampage_forums', 0));
+					$config->set('teampage_memberships', $request->variable('teampage_memberships', 0));
 				break;
 
 				case 'set_config_legend':
-					set_config('legend_sort_groupname', $request->variable('legend_sort_groupname', 0));
+					$config->set('legend_sort_groupname', $request->variable('legend_sort_groupname', 0));
 				break;
 			}
 		}
-- 
cgit v1.2.1


From 59bb498de7025a54c28f0442d994ab1d23e1cce7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Nov 2012 19:03:24 +0100
Subject: [ticket/10411] Fix docs and remove empty sql array parts

PHPBB3-10411
---
 phpBB/includes/groupposition/teampage.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/includes/groupposition/teampage.php
index ab23dd0420..a189d5def9 100644
--- a/phpBB/includes/groupposition/teampage.php
+++ b/phpBB/includes/groupposition/teampage.php
@@ -60,8 +60,9 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	/**
 	* Constructor
 	*
-	* @param dbal		$db		Database object
-	* @param phpbb_user	$user	User object
+	* @param dbal							$db		Database object
+	* @param phpbb_user						$user	User object
+	* @param phpbb_cache_driver_interface	$cache	Cache object
 	*/
 	public function __construct(dbal $db, phpbb_user $user, phpbb_cache_driver_interface $cache)
 	{
-- 
cgit v1.2.1


From 60d831c392a78fceb4ae737a3141573c4b2427d8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 14 Nov 2012 19:06:42 +0100
Subject: [ticket/10411] Fix logic error when editing/creating a group

PHPBB3-10411
---
 phpBB/includes/functions_user.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 3005f5efda..33b62fe8b8 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2570,7 +2570,7 @@ function phpbb_avatar_explanation_string()
 */
 function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false)
 {
-	global $phpbb_root_path, $config, $db, $user, $file_upload;
+	global $phpbb_root_path, $config, $db, $user, $file_upload, $phpbb_container;
 
 	$error = array();
 
@@ -2602,8 +2602,6 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 		$current_legend = phpbb_groupposition_legend::GROUP_DISABLED;
 		$current_teampage = phpbb_groupposition_teampage::GROUP_DISABLED;
 
-		global $phpbb_container;
-
 		$legend = $phpbb_container->get('groupposition.legend');
 		$teampage = $phpbb_container->get('groupposition.teampage');
 		if ($group_id)
@@ -2731,6 +2729,13 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 			$db->sql_query($sql);
 		}
 
+		// Remove the group from the teampage, only if unselected and we are editing a group,
+		// which is currently displayed.
+		if (!$group_teampage && $group_id && $current_teampage != phpbb_groupposition_teampage::GROUP_DISABLED)
+		{
+			$teampage->delete_group($group_id);
+		}
+
 		if (!$group_id)
 		{
 			$group_id = $db->sql_nextid();
@@ -2741,6 +2746,11 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 			}
 		}
 
+		if ($group_teampage && $current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED)
+		{
+			$teampage->add_group($group_id);
+		}
+
 		if ($group_teampage)
 		{
 			if ($current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED)
-- 
cgit v1.2.1


From 076785d76a1412394636095f0b296964419e2a4f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 14 Nov 2012 20:04:02 +0100
Subject: [feature/avatars] Add support for custom avatar HTML code

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php    | 2 +-
 phpBB/includes/avatar/driver/interface.php | 2 +-
 phpBB/includes/functions_display.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 5cebd1533d..d0f77d2094 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -91,7 +91,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	/**
 	* @inheritdoc
 	*/
-	public function get_custom_html($row, $ignore_config = false)
+	public function get_custom_html($row, $ignore_config = false, $alt = '')
 	{
 		return '';
 	}
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 4f1c1f73cf..16fef58e7a 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -41,7 +41,7 @@ interface phpbb_avatar_driver_interface
 	*        the avatar anyways. Useful for the ACP.
 	* @return string HTML
 	*/
-	public function get_custom_html($row, $ignore_config = false);
+	public function get_custom_html($row, $ignore_config = false, $alt = '');
 
 	/**
 	* @TODO
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index f84652fc50..bf1611a5de 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1372,7 +1372,7 @@ function get_avatar($row, $alt, $ignore_config = false)
 	{
 		if ($avatar->custom_html)
 		{
-			return $avatar->get_html($row, $ignore_config);
+			return $avatar->get_custom_html($row, $ignore_config, $alt);
 		}
 
 		$avatar_data = $avatar->get_data($row, $ignore_config);
-- 
cgit v1.2.1


From f8841b7f521684eab6fda7fd3487540fa4560249 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 15 Nov 2012 03:09:57 +0100
Subject: [ticket/11015] Fix line endings of phpbb_db_driver to LF

PHPBB3-11015
---
 phpBB/includes/db/driver/driver.php | 2042 +++++++++++++++++------------------
 1 file changed, 1021 insertions(+), 1021 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php
index 4b831d2f79..49bfcb8007 100644
--- a/phpBB/includes/db/driver/driver.php
+++ b/phpBB/includes/db/driver/driver.php
@@ -12,7 +12,7 @@
 */
 if (!defined('IN_PHPBB'))
 {
-    exit;
+	exit;
 }
 
 /**
@@ -21,1024 +21,1024 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_db_driver
 {
-    var $db_connect_id;
-    var $query_result;
-    var $return_on_error = false;
-    var $transaction = false;
-    var $sql_time = 0;
-    var $num_queries = array();
-    var $open_queries = array();
-
-    var $curtime = 0;
-    var $query_hold = '';
-    var $html_hold = '';
-    var $sql_report = '';
-
-    var $persistency = false;
-    var $user = '';
-    var $server = '';
-    var $dbname = '';
-
-    // Set to true if error triggered
-    var $sql_error_triggered = false;
-
-    // Holding the last sql query on sql error
-    var $sql_error_sql = '';
-    // Holding the error information - only populated if sql_error_triggered is set
-    var $sql_error_returned = array();
-
-    // Holding transaction count
-    var $transactions = 0;
-
-    // Supports multi inserts?
-    var $multi_insert = false;
-
-    /**
-    * Current sql layer
-    */
-    var $sql_layer = '';
-
-    /**
-    * Wildcards for matching any (%) or exactly one (_) character within LIKE expressions
-    */
-    var $any_char;
-    var $one_char;
-
-    /**
-    * Exact version of the DBAL, directly queried
-    */
-    var $sql_server_version = false;
-
-    /**
-    * Constructor
-    */
-    function __construct()
-    {
-        $this->num_queries = array(
-            'cached'        => 0,
-            'normal'        => 0,
-            'total'         => 0,
-        );
-
-        // Fill default sql layer based on the class being called.
-        // This can be changed by the specified layer itself later if needed.
-        $this->sql_layer = substr(get_class($this), strlen('phpbb_db_driver_'));
-
-        // Do not change this please! This variable is used to easy the use of it - and is hardcoded.
-        $this->any_char = chr(0) . '%';
-        $this->one_char = chr(0) . '_';
-    }
-
-    /**
-    * return on error or display error message
-    */
-    function sql_return_on_error($fail = false)
-    {
-        $this->sql_error_triggered = false;
-        $this->sql_error_sql = '';
-
-        $this->return_on_error = $fail;
-    }
-
-    /**
-    * Return number of sql queries and cached sql queries used
-    */
-    function sql_num_queries($cached = false)
-    {
-        return ($cached) ? $this->num_queries['cached'] : $this->num_queries['normal'];
-    }
-
-    /**
-    * Add to query count
-    */
-    function sql_add_num_queries($cached = false)
-    {
-        $this->num_queries['cached'] += ($cached !== false) ? 1 : 0;
-        $this->num_queries['normal'] += ($cached !== false) ? 0 : 1;
-        $this->num_queries['total'] += 1;
-    }
-
-    /**
-    * DBAL garbage collection, close sql connection
-    */
-    function sql_close()
-    {
-        if (!$this->db_connect_id)
-        {
-            return false;
-        }
-
-        if ($this->transaction)
-        {
-            do
-            {
-                $this->sql_transaction('commit');
-            }
-            while ($this->transaction);
-        }
-
-        foreach ($this->open_queries as $query_id)
-        {
-            $this->sql_freeresult($query_id);
-        }
-
-        // Connection closed correctly. Set db_connect_id to false to prevent errors
-        if ($result = $this->_sql_close())
-        {
-            $this->db_connect_id = false;
-        }
-
-        return $result;
-    }
-
-    /**
-    * Build LIMIT query
-    * Doing some validation here.
-    */
-    function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-    {
-        if (empty($query))
-        {
-            return false;
-        }
-
-        // Never use a negative total or offset
-        $total = ($total < 0) ? 0 : $total;
-        $offset = ($offset < 0) ? 0 : $offset;
-
-        return $this->_sql_query_limit($query, $total, $offset, $cache_ttl);
-    }
-
-    /**
-    * Fetch all rows
-    */
-    function sql_fetchrowset($query_id = false)
-    {
-        if ($query_id === false)
-        {
-            $query_id = $this->query_result;
-        }
-
-        if ($query_id !== false)
-        {
-            $result = array();
-            while ($row = $this->sql_fetchrow($query_id))
-            {
-                $result[] = $row;
-            }
-
-            return $result;
-        }
-
-        return false;
-    }
-
-    /**
-    * Seek to given row number
-    * rownum is zero-based
-    */
-    function sql_rowseek($rownum, &$query_id)
-    {
-        global $cache;
-
-        if ($query_id === false)
-        {
-            $query_id = $this->query_result;
-        }
-
-        if ($cache->sql_exists($query_id))
-        {
-            return $cache->sql_rowseek($rownum, $query_id);
-        }
-
-        if ($query_id === false)
-        {
-            return false;
-        }
-
-        $this->sql_freeresult($query_id);
-        $query_id = $this->sql_query($this->last_query_text);
-
-        if ($query_id === false)
-        {
-            return false;
-        }
-
-        // We do not fetch the row for rownum == 0 because then the next resultset would be the second row
-        for ($i = 0; $i < $rownum; $i++)
-        {
-            if (!$this->sql_fetchrow($query_id))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-    * Fetch field
-    * if rownum is false, the current row is used, else it is pointing to the row (zero-based)
-    */
-    function sql_fetchfield($field, $rownum = false, $query_id = false)
-    {
-        global $cache;
-
-        if ($query_id === false)
-        {
-            $query_id = $this->query_result;
-        }
-
-        if ($query_id !== false)
-        {
-            if ($rownum !== false)
-            {
-                $this->sql_rowseek($rownum, $query_id);
-            }
-
-            if (!is_object($query_id) && $cache->sql_exists($query_id))
-            {
-                return $cache->sql_fetchfield($query_id, $field);
-            }
-
-            $row = $this->sql_fetchrow($query_id);
-            return (isset($row[$field])) ? $row[$field] : false;
-        }
-
-        return false;
-    }
-
-    /**
-    * Correctly adjust LIKE expression for special characters
-    * Some DBMS are handling them in a different way
-    *
-    * @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char
-    * @return string LIKE expression including the keyword!
-    */
-    function sql_like_expression($expression)
-    {
-        $expression = utf8_str_replace(array('_', '%'), array("\_", "\%"), $expression);
-        $expression = utf8_str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression);
-
-        return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
-    }
-
-    /**
-    * Build a case expression
-    *
-    * Note: The two statements action_true and action_false must have the same data type (int, vchar, ...) in the database!
-    *
-    * @param    string  $condition      The condition which must be true, to use action_true rather then action_else
-    * @param    string  $action_true    SQL expression that is used, if the condition is true
-    * @param    string  $action_else    SQL expression that is used, if the condition is false, optional
-    * @return   string          CASE expression including the condition and statements
-    */
-    public function sql_case($condition, $action_true, $action_false = false)
-    {
-        $sql_case = 'CASE WHEN ' . $condition;
-        $sql_case .= ' THEN ' . $action_true;
-        $sql_case .= ($action_false !== false) ? ' ELSE ' . $action_false : '';
-        $sql_case .= ' END';
-        return $sql_case;
-    }
-
-    /**
-    * Build a concatenated expression
-    *
-    * @param    string  $expr1      Base SQL expression where we append the second one
-    * @param    string  $expr2      SQL expression that is appended to the first expression
-    * @return   string      Concatenated string
-    */
-    public function sql_concatenate($expr1, $expr2)
-    {
-        return $expr1 . ' || ' . $expr2;
-    }
-
-    /**
-    * Returns whether results of a query need to be buffered to run a transaction while iterating over them.
-    *
-    * @return bool Whether buffering is required.
-    */
-    function sql_buffer_nested_transactions()
-    {
-        return false;
-    }
-
-    /**
-    * SQL Transaction
-    * @access private
-    */
-    function sql_transaction($status = 'begin')
-    {
-        switch ($status)
-        {
-            case 'begin':
-                // If we are within a transaction we will not open another one, but enclose the current one to not loose data (prevening auto commit)
-                if ($this->transaction)
-                {
-                    $this->transactions++;
-                    return true;
-                }
-
-                $result = $this->_sql_transaction('begin');
-
-                if (!$result)
-                {
-                    $this->sql_error();
-                }
-
-                $this->transaction = true;
-            break;
-
-            case 'commit':
-                // If there was a previously opened transaction we do not commit yet... but count back the number of inner transactions
-                if ($this->transaction && $this->transactions)
-                {
-                    $this->transactions--;
-                    return true;
-                }
-
-                // Check if there is a transaction (no transaction can happen if there was an error, with a combined rollback and error returning enabled)
-                // This implies we have transaction always set for autocommit db's
-                if (!$this->transaction)
-                {
-                    return false;
-                }
-
-                $result = $this->_sql_transaction('commit');
-
-                if (!$result)
-                {
-                    $this->sql_error();
-                }
-
-                $this->transaction = false;
-                $this->transactions = 0;
-            break;
-
-            case 'rollback':
-                $result = $this->_sql_transaction('rollback');
-                $this->transaction = false;
-                $this->transactions = 0;
-            break;
-
-            default:
-                $result = $this->_sql_transaction($status);
-            break;
-        }
-
-        return $result;
-    }
-
-    /**
-    * Build sql statement from array for insert/update/select statements
-    *
-    * Idea for this from Ikonboard
-    * Possible query values: INSERT, INSERT_SELECT, UPDATE, SELECT
-    *
-    */
-    function sql_build_array($query, $assoc_ary = false)
-    {
-        if (!is_array($assoc_ary))
-        {
-            return false;
-        }
-
-        $fields = $values = array();
-
-        if ($query == 'INSERT' || $query == 'INSERT_SELECT')
-        {
-            foreach ($assoc_ary as $key => $var)
-            {
-                $fields[] = $key;
-
-                if (is_array($var) && is_string($var[0]))
-                {
-                    // This is used for INSERT_SELECT(s)
-                    $values[] = $var[0];
-                }
-                else
-                {
-                    $values[] = $this->_sql_validate_value($var);
-                }
-            }
-
-            $query = ($query == 'INSERT') ? ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')' : ' (' . implode(', ', $fields) . ') SELECT ' . implode(', ', $values) . ' ';
-        }
-        else if ($query == 'MULTI_INSERT')
-        {
-            trigger_error('The MULTI_INSERT query value is no longer supported. Please use sql_multi_insert() instead.', E_USER_ERROR);
-        }
-        else if ($query == 'UPDATE' || $query == 'SELECT')
-        {
-            $values = array();
-            foreach ($assoc_ary as $key => $var)
-            {
-                $values[] = "$key = " . $this->_sql_validate_value($var);
-            }
-            $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values);
-        }
-
-        return $query;
-    }
-
-    /**
-    * Build IN or NOT IN sql comparison string, uses <> or = on single element
-    * arrays to improve comparison speed
-    *
-    * @access public
-    * @param    string  $field              name of the sql column that shall be compared
-    * @param    array   $array              array of values that are allowed (IN) or not allowed (NOT IN)
-    * @param    bool    $negate             true for NOT IN (), false for IN () (default)
-    * @param    bool    $allow_empty_set    If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
-    */
-    function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
-    {
-        if (!sizeof($array))
-        {
-            if (!$allow_empty_set)
-            {
-                // Print the backtrace to help identifying the location of the problematic code
-                $this->sql_error('No values specified for SQL IN comparison');
-            }
-            else
-            {
-                // NOT IN () actually means everything so use a tautology
-                if ($negate)
-                {
-                    return '1=1';
-                }
-                // IN () actually means nothing so use a contradiction
-                else
-                {
-                    return '1=0';
-                }
-            }
-        }
-
-        if (!is_array($array))
-        {
-            $array = array($array);
-        }
-
-        if (sizeof($array) == 1)
-        {
-            @reset($array);
-            $var = current($array);
-
-            return $field . ($negate ? ' <> ' : ' = ') . $this->_sql_validate_value($var);
-        }
-        else
-        {
-            return $field . ($negate ? ' NOT IN ' : ' IN ') . '(' . implode(', ', array_map(array($this, '_sql_validate_value'), $array)) . ')';
-        }
-    }
-
-    /**
-    * Run binary AND operator on DB column.
-    * Results in sql statement: "{$column_name} & (1 << {$bit}) {$compare}"
-    *
-    * @param string $column_name The column name to use
-    * @param int $bit The value to use for the AND operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
-    * @param string $compare Any custom SQL code after the check (for example "= 0")
-    */
-    function sql_bit_and($column_name, $bit, $compare = '')
-    {
-        if (method_exists($this, '_sql_bit_and'))
-        {
-            return $this->_sql_bit_and($column_name, $bit, $compare);
-        }
-
-        return $column_name . ' & ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
-    }
-
-    /**
-    * Run binary OR operator on DB column.
-    * Results in sql statement: "{$column_name} | (1 << {$bit}) {$compare}"
-    *
-    * @param string $column_name The column name to use
-    * @param int $bit The value to use for the OR operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
-    * @param string $compare Any custom SQL code after the check (for example "= 0")
-    */
-    function sql_bit_or($column_name, $bit, $compare = '')
-    {
-        if (method_exists($this, '_sql_bit_or'))
-        {
-            return $this->_sql_bit_or($column_name, $bit, $compare);
-        }
-
-        return $column_name . ' | ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
-    }
-
-    /**
-    * Returns SQL string to cast a string expression to an int.
-    *
-    * @param  string $expression An expression evaluating to string
-    * @return string             Expression returning an int
-    */
-    function cast_expr_to_bigint($expression)
-    {
-        return $expression;
-    }
-
-    /**
-    * Returns SQL string to cast an integer expression to a string.
-    *
-    * @param  string $expression An expression evaluating to int
-    * @return string             Expression returning a string
-    */
-    function cast_expr_to_string($expression)
-    {
-        return $expression;
-    }
-
-    /**
-    * Run LOWER() on DB column of type text (i.e. neither varchar nor char).
-    *
-    * @param string $column_name    The column name to use
-    *
-    * @return string                A SQL statement like "LOWER($column_name)"
-    */
-    function sql_lower_text($column_name)
-    {
-        return "LOWER($column_name)";
-    }
-
-    /**
-    * Run more than one insert statement.
-    *
-    * @param string $table table name to run the statements on
-    * @param array &$sql_ary multi-dimensional array holding the statement data.
-    *
-    * @return bool false if no statements were executed.
-    * @access public
-    */
-    function sql_multi_insert($table, &$sql_ary)
-    {
-        if (!sizeof($sql_ary))
-        {
-            return false;
-        }
-
-        if ($this->multi_insert)
-        {
-            $ary = array();
-            foreach ($sql_ary as $id => $_sql_ary)
-            {
-                // If by accident the sql array is only one-dimensional we build a normal insert statement
-                if (!is_array($_sql_ary))
-                {
-                    return $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $sql_ary));
-                }
-
-                $values = array();
-                foreach ($_sql_ary as $key => $var)
-                {
-                    $values[] = $this->_sql_validate_value($var);
-                }
-                $ary[] = '(' . implode(', ', $values) . ')';
-            }
-
-            return $this->sql_query('INSERT INTO ' . $table . ' ' . ' (' . implode(', ', array_keys($sql_ary[0])) . ') VALUES ' . implode(', ', $ary));
-        }
-        else
-        {
-            foreach ($sql_ary as $ary)
-            {
-                if (!is_array($ary))
-                {
-                    return false;
-                }
-
-                $result = $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $ary));
-
-                if (!$result)
-                {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-    * Function for validating values
-    * @access private
-    */
-    function _sql_validate_value($var)
-    {
-        if (is_null($var))
-        {
-            return 'NULL';
-        }
-        else if (is_string($var))
-        {
-            return "'" . $this->sql_escape($var) . "'";
-        }
-        else
-        {
-            return (is_bool($var)) ? intval($var) : $var;
-        }
-    }
-
-    /**
-    * Build sql statement from array for select and select distinct statements
-    *
-    * Possible query values: SELECT, SELECT_DISTINCT
-    */
-    function sql_build_query($query, $array)
-    {
-        $sql = '';
-        switch ($query)
-        {
-            case 'SELECT':
-            case 'SELECT_DISTINCT';
-
-                $sql = str_replace('_', ' ', $query) . ' ' . $array['SELECT'] . ' FROM ';
-
-                // Build table array. We also build an alias array for later checks.
-                $table_array = $aliases = array();
-                $used_multi_alias = false;
-
-                foreach ($array['FROM'] as $table_name => $alias)
-                {
-                    if (is_array($alias))
-                    {
-                        $used_multi_alias = true;
-
-                        foreach ($alias as $multi_alias)
-                        {
-                            $table_array[] = $table_name . ' ' . $multi_alias;
-                            $aliases[] = $multi_alias;
-                        }
-                    }
-                    else
-                    {
-                        $table_array[] = $table_name . ' ' . $alias;
-                        $aliases[] = $alias;
-                    }
-                }
-
-                // We run the following code to determine if we need to re-order the table array. ;)
-                // The reason for this is that for multi-aliased tables (two equal tables) in the FROM statement the last table need to match the first comparison.
-                // DBMS who rely on this: Oracle, PostgreSQL and MSSQL. For all other DBMS it makes absolutely no difference in which order the table is.
-                if (!empty($array['LEFT_JOIN']) && sizeof($array['FROM']) > 1 && $used_multi_alias !== false)
-                {
-                    // Take first LEFT JOIN
-                    $join = current($array['LEFT_JOIN']);
-
-                    // Determine the table used there (even if there are more than one used, we only want to have one
-                    preg_match('/(' . implode('|', $aliases) . ')\.[^\s]+/U', str_replace(array('(', ')', 'AND', 'OR', ' '), '', $join['ON']), $matches);
-
-                    // If there is a first join match, we need to make sure the table order is correct
-                    if (!empty($matches[1]))
-                    {
-                        $first_join_match = trim($matches[1]);
-                        $table_array = $last = array();
-
-                        foreach ($array['FROM'] as $table_name => $alias)
-                        {
-                            if (is_array($alias))
-                            {
-                                foreach ($alias as $multi_alias)
-                                {
-                                    ($multi_alias === $first_join_match) ? $last[] = $table_name . ' ' . $multi_alias : $table_array[] = $table_name . ' ' . $multi_alias;
-                                }
-                            }
-                            else
-                            {
-                                ($alias === $first_join_match) ? $last[] = $table_name . ' ' . $alias : $table_array[] = $table_name . ' ' . $alias;
-                            }
-                        }
-
-                        $table_array = array_merge($table_array, $last);
-                    }
-                }
-
-                $sql .= $this->_sql_custom_build('FROM', implode(' CROSS JOIN ', $table_array));
-
-                if (!empty($array['LEFT_JOIN']))
-                {
-                    foreach ($array['LEFT_JOIN'] as $join)
-                    {
-                        $sql .= ' LEFT JOIN ' . key($join['FROM']) . ' ' . current($join['FROM']) . ' ON (' . $join['ON'] . ')';
-                    }
-                }
-
-                if (!empty($array['WHERE']))
-                {
-                    $sql .= ' WHERE ' . $this->_sql_custom_build('WHERE', $array['WHERE']);
-                }
-
-                if (!empty($array['GROUP_BY']))
-                {
-                    $sql .= ' GROUP BY ' . $array['GROUP_BY'];
-                }
-
-                if (!empty($array['ORDER_BY']))
-                {
-                    $sql .= ' ORDER BY ' . $array['ORDER_BY'];
-                }
-
-            break;
-        }
-
-        return $sql;
-    }
-
-    /**
-    * display sql error page
-    */
-    function sql_error($sql = '')
-    {
-        global $auth, $user, $config;
-
-        // Set var to retrieve errored status
-        $this->sql_error_triggered = true;
-        $this->sql_error_sql = $sql;
-
-        $this->sql_error_returned = $this->_sql_error();
-
-        if (!$this->return_on_error)
-        {
-            $message = 'SQL ERROR [ ' . $this->sql_layer . ' ]<br /><br />' . $this->sql_error_returned['message'] . ' [' . $this->sql_error_returned['code'] . ']';
-
-            // Show complete SQL error and path to administrators only
-            // Additionally show complete error on installation or if extended debug mode is enabled
-            // The DEBUG constant is for development only!
-            if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG'))
-            {
-                $message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
-            }
-            else
-            {
-                // If error occurs in initiating the session we need to use a pre-defined language string
-                // This could happen if the connection could not be established for example (then we are not able to grab the default language)
-                if (!isset($user->lang['SQL_ERROR_OCCURRED']))
-                {
-                    $message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.';
-                }
-                else
-                {
-                    if (!empty($config['board_contact']))
-                    {
-                        $message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
-                    }
-                    else
-                    {
-                        $message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', '');
-                    }
-                }
-            }
-
-            if ($this->transaction)
-            {
-                $this->sql_transaction('rollback');
-            }
-
-            if (strlen($message) > 1024)
-            {
-                // We need to define $msg_long_text here to circumvent text stripping.
-                global $msg_long_text;
-                $msg_long_text = $message;
-
-                trigger_error(false, E_USER_ERROR);
-            }
-
-            trigger_error($message, E_USER_ERROR);
-        }
-
-        if ($this->transaction)
-        {
-            $this->sql_transaction('rollback');
-        }
-
-        return $this->sql_error_returned;
-    }
-
-    /**
-    * Explain queries
-    */
-    function sql_report($mode, $query = '')
-    {
-        global $cache, $starttime, $phpbb_root_path, $user;
-        global $request;
-
-        if (is_object($request) && !$request->variable('explain', false))
-        {
-            return false;
-        }
-
-        if (!$query && $this->query_hold != '')
-        {
-            $query = $this->query_hold;
-        }
-
-        switch ($mode)
-        {
-            case 'display':
-                if (!empty($cache))
-                {
-                    $cache->unload();
-                }
-                $this->sql_close();
-
-                $mtime = explode(' ', microtime());
-                $totaltime = $mtime[0] + $mtime[1] - $starttime;
-
-                echo '<!DOCTYPE html>
-                    <html dir="ltr">
-                    <head>
-                        <meta charset="utf-8">
-                        <title>SQL Report</title>
-                        <link href="' . $phpbb_root_path . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-                    </head>
-                    <body id="errorpage">
-                    <div id="wrap">
-                        <div id="page-header">
-                            <a href="' . build_url('explain') . '">Return to previous page</a>
-                        </div>
-                        <div id="page-body">
-                            <div id="acp">
-                            <div class="panel">
-                                <span class="corners-top"><span></span></span>
-                                <div id="content">
-                                    <h1>SQL Report</h1>
-                                    <br />
-                                    <p><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries['normal']} queries" . (($this->num_queries['cached']) ? " + {$this->num_queries['cached']} " . (($this->num_queries['cached'] == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></p>
-
-                                    <p>Time spent on ' . $this->sql_layer . ' queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></p>
-
-                                    <br /><br />
-                                    ' . $this->sql_report . '
-                                </div>
-                                <span class="corners-bottom"><span></span></span>
-                            </div>
-                            </div>
-                        </div>
-                        <div id="page-footer">
-                            Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
-                        </div>
-                    </div>
-                    </body>
-                    </html>';
-
-                exit_handler();
-
-            break;
-
-            case 'stop':
-                $endtime = explode(' ', microtime());
-                $endtime = $endtime[0] + $endtime[1];
-
-                $this->sql_report .= '
-
-                    <table cellspacing="1">
-                    <thead>
-                    <tr>
-                        <th>Query #' . $this->num_queries['total'] . '</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td>
-                    </tr>
-                    </tbody>
-                    </table>
-
-                    ' . $this->html_hold . '
-
-                    <p style="text-align: center;">
-                ';
-
-                if ($this->query_result)
-                {
-                    if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query))
-                    {
-                        $this->sql_report .= 'Affected rows: <b>' . $this->sql_affectedrows($this->query_result) . '</b> | ';
-                    }
-                    $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $this->curtime) . 's</b>';
-                }
-                else
-                {
-                    $error = $this->sql_error();
-                    $this->sql_report .= '<b style="color: red">FAILED</b> - ' . $this->sql_layer . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
-                }
-
-                $this->sql_report .= '</p><br /><br />';
-
-                $this->sql_time += $endtime - $this->curtime;
-            break;
-
-            case 'start':
-                $this->query_hold = $query;
-                $this->html_hold = '';
-
-                $this->_sql_report($mode, $query);
-
-                $this->curtime = explode(' ', microtime());
-                $this->curtime = $this->curtime[0] + $this->curtime[1];
-
-            break;
-
-            case 'add_select_row':
-
-                $html_table = func_get_arg(2);
-                $row = func_get_arg(3);
-
-                if (!$html_table && sizeof($row))
-                {
-                    $html_table = true;
-                    $this->html_hold .= '<table cellspacing="1"><tr>';
-
-                    foreach (array_keys($row) as $val)
-                    {
-                        $this->html_hold .= '<th>' . (($val) ? ucwords(str_replace('_', ' ', $val)) : '&nbsp;') . '</th>';
-                    }
-                    $this->html_hold .= '</tr>';
-                }
-                $this->html_hold .= '<tr>';
-
-                $class = 'row1';
-                foreach (array_values($row) as $val)
-                {
-                    $class = ($class == 'row1') ? 'row2' : 'row1';
-                    $this->html_hold .= '<td class="' . $class . '">' . (($val) ? $val : '&nbsp;') . '</td>';
-                }
-                $this->html_hold .= '</tr>';
-
-                return $html_table;
-
-            break;
-
-            case 'fromcache':
-
-                $this->_sql_report($mode, $query);
-
-            break;
-
-            case 'record_fromcache':
-
-                $endtime = func_get_arg(2);
-                $splittime = func_get_arg(3);
-
-                $time_cache = $endtime - $this->curtime;
-                $time_db = $splittime - $endtime;
-                $color = ($time_db > $time_cache) ? 'green' : 'red';
-
-                $this->sql_report .= '<table cellspacing="1"><thead><tr><th>Query results obtained from the cache</th></tr></thead><tbody><tr>';
-                $this->sql_report .= '<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></tbody></table>';
-                $this->sql_report .= '<p style="text-align: center;">';
-                $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br /><br />';
-
-                // Pad the start time to not interfere with page timing
-                $starttime += $time_db;
-
-            break;
-
-            default:
-
-                $this->_sql_report($mode, $query);
-
-            break;
-        }
-
-        return true;
-    }
-
-    /**
-    * Gets the estimated number of rows in a specified table.
-    *
-    * @param string $table_name     Table name
-    *
-    * @return string                Number of rows in $table_name.
-    *                               Prefixed with ~ if estimated (otherwise exact).
-    *
-    * @access public
-    */
-    function get_estimated_row_count($table_name)
-    {
-        return $this->get_row_count($table_name);
-    }
-
-    /**
-    * Gets the exact number of rows in a specified table.
-    *
-    * @param string $table_name     Table name
-    *
-    * @return string                Exact number of rows in $table_name.
-    *
-    * @access public
-    */
-    function get_row_count($table_name)
-    {
-        $sql = 'SELECT COUNT(*) AS rows_total
-            FROM ' . $this->sql_escape($table_name);
-        $result = $this->sql_query($sql);
-        $rows_total = $this->sql_fetchfield('rows_total');
-        $this->sql_freeresult($result);
-
-        return $rows_total;
-    }
+	var $db_connect_id;
+	var $query_result;
+	var $return_on_error = false;
+	var $transaction = false;
+	var $sql_time = 0;
+	var $num_queries = array();
+	var $open_queries = array();
+
+	var $curtime = 0;
+	var $query_hold = '';
+	var $html_hold = '';
+	var $sql_report = '';
+
+	var $persistency = false;
+	var $user = '';
+	var $server = '';
+	var $dbname = '';
+
+	// Set to true if error triggered
+	var $sql_error_triggered = false;
+
+	// Holding the last sql query on sql error
+	var $sql_error_sql = '';
+	// Holding the error information - only populated if sql_error_triggered is set
+	var $sql_error_returned = array();
+
+	// Holding transaction count
+	var $transactions = 0;
+
+	// Supports multi inserts?
+	var $multi_insert = false;
+
+	/**
+	* Current sql layer
+	*/
+	var $sql_layer = '';
+
+	/**
+	* Wildcards for matching any (%) or exactly one (_) character within LIKE expressions
+	*/
+	var $any_char;
+	var $one_char;
+
+	/**
+	* Exact version of the DBAL, directly queried
+	*/
+	var $sql_server_version = false;
+
+	/**
+	* Constructor
+	*/
+	function __construct()
+	{
+		$this->num_queries = array(
+			'cached'        => 0,
+			'normal'        => 0,
+			'total'         => 0,
+		);
+
+		// Fill default sql layer based on the class being called.
+		// This can be changed by the specified layer itself later if needed.
+		$this->sql_layer = substr(get_class($this), strlen('phpbb_db_driver_'));
+
+		// Do not change this please! This variable is used to easy the use of it - and is hardcoded.
+		$this->any_char = chr(0) . '%';
+		$this->one_char = chr(0) . '_';
+	}
+
+	/**
+	* return on error or display error message
+	*/
+	function sql_return_on_error($fail = false)
+	{
+		$this->sql_error_triggered = false;
+		$this->sql_error_sql = '';
+
+		$this->return_on_error = $fail;
+	}
+
+	/**
+	* Return number of sql queries and cached sql queries used
+	*/
+	function sql_num_queries($cached = false)
+	{
+		return ($cached) ? $this->num_queries['cached'] : $this->num_queries['normal'];
+	}
+
+	/**
+	* Add to query count
+	*/
+	function sql_add_num_queries($cached = false)
+	{
+		$this->num_queries['cached'] += ($cached !== false) ? 1 : 0;
+		$this->num_queries['normal'] += ($cached !== false) ? 0 : 1;
+		$this->num_queries['total'] += 1;
+	}
+
+	/**
+	* DBAL garbage collection, close sql connection
+	*/
+	function sql_close()
+	{
+		if (!$this->db_connect_id)
+		{
+			return false;
+		}
+
+		if ($this->transaction)
+		{
+			do
+			{
+				$this->sql_transaction('commit');
+			}
+			while ($this->transaction);
+		}
+
+		foreach ($this->open_queries as $query_id)
+		{
+			$this->sql_freeresult($query_id);
+		}
+
+		// Connection closed correctly. Set db_connect_id to false to prevent errors
+		if ($result = $this->_sql_close())
+		{
+			$this->db_connect_id = false;
+		}
+
+		return $result;
+	}
+
+	/**
+	* Build LIMIT query
+	* Doing some validation here.
+	*/
+	function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		if (empty($query))
+		{
+			return false;
+		}
+
+		// Never use a negative total or offset
+		$total = ($total < 0) ? 0 : $total;
+		$offset = ($offset < 0) ? 0 : $offset;
+
+		return $this->_sql_query_limit($query, $total, $offset, $cache_ttl);
+	}
+
+	/**
+	* Fetch all rows
+	*/
+	function sql_fetchrowset($query_id = false)
+	{
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if ($query_id !== false)
+		{
+			$result = array();
+			while ($row = $this->sql_fetchrow($query_id))
+			{
+				$result[] = $row;
+			}
+
+			return $result;
+		}
+
+		return false;
+	}
+
+	/**
+	* Seek to given row number
+	* rownum is zero-based
+	*/
+	function sql_rowseek($rownum, &$query_id)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if ($cache->sql_exists($query_id))
+		{
+			return $cache->sql_rowseek($rownum, $query_id);
+		}
+
+		if ($query_id === false)
+		{
+			return false;
+		}
+
+		$this->sql_freeresult($query_id);
+		$query_id = $this->sql_query($this->last_query_text);
+
+		if ($query_id === false)
+		{
+			return false;
+		}
+
+		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
+		for ($i = 0; $i < $rownum; $i++)
+		{
+			if (!$this->sql_fetchrow($query_id))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	* Fetch field
+	* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
+	*/
+	function sql_fetchfield($field, $rownum = false, $query_id = false)
+	{
+		global $cache;
+
+		if ($query_id === false)
+		{
+			$query_id = $this->query_result;
+		}
+
+		if ($query_id !== false)
+		{
+			if ($rownum !== false)
+			{
+				$this->sql_rowseek($rownum, $query_id);
+			}
+
+			if (!is_object($query_id) && $cache->sql_exists($query_id))
+			{
+				return $cache->sql_fetchfield($query_id, $field);
+			}
+
+			$row = $this->sql_fetchrow($query_id);
+			return (isset($row[$field])) ? $row[$field] : false;
+		}
+
+		return false;
+	}
+
+	/**
+	* Correctly adjust LIKE expression for special characters
+	* Some DBMS are handling them in a different way
+	*
+	* @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char
+	* @return string LIKE expression including the keyword!
+	*/
+	function sql_like_expression($expression)
+	{
+		$expression = utf8_str_replace(array('_', '%'), array("\_", "\%"), $expression);
+		$expression = utf8_str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression);
+
+		return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
+	}
+
+	/**
+	* Build a case expression
+	*
+	* Note: The two statements action_true and action_false must have the same data type (int, vchar, ...) in the database!
+	*
+	* @param    string  $condition      The condition which must be true, to use action_true rather then action_else
+	* @param    string  $action_true    SQL expression that is used, if the condition is true
+	* @param    string  $action_else    SQL expression that is used, if the condition is false, optional
+	* @return   string          CASE expression including the condition and statements
+	*/
+	public function sql_case($condition, $action_true, $action_false = false)
+	{
+		$sql_case = 'CASE WHEN ' . $condition;
+		$sql_case .= ' THEN ' . $action_true;
+		$sql_case .= ($action_false !== false) ? ' ELSE ' . $action_false : '';
+		$sql_case .= ' END';
+		return $sql_case;
+	}
+
+	/**
+	* Build a concatenated expression
+	*
+	* @param    string  $expr1      Base SQL expression where we append the second one
+	* @param    string  $expr2      SQL expression that is appended to the first expression
+	* @return   string      Concatenated string
+	*/
+	public function sql_concatenate($expr1, $expr2)
+	{
+		return $expr1 . ' || ' . $expr2;
+	}
+
+	/**
+	* Returns whether results of a query need to be buffered to run a transaction while iterating over them.
+	*
+	* @return bool Whether buffering is required.
+	*/
+	function sql_buffer_nested_transactions()
+	{
+		return false;
+	}
+
+	/**
+	* SQL Transaction
+	* @access private
+	*/
+	function sql_transaction($status = 'begin')
+	{
+		switch ($status)
+		{
+			case 'begin':
+				// If we are within a transaction we will not open another one, but enclose the current one to not loose data (prevening auto commit)
+				if ($this->transaction)
+				{
+					$this->transactions++;
+					return true;
+				}
+
+				$result = $this->_sql_transaction('begin');
+
+				if (!$result)
+				{
+					$this->sql_error();
+				}
+
+				$this->transaction = true;
+			break;
+
+			case 'commit':
+				// If there was a previously opened transaction we do not commit yet... but count back the number of inner transactions
+				if ($this->transaction && $this->transactions)
+				{
+					$this->transactions--;
+					return true;
+				}
+
+				// Check if there is a transaction (no transaction can happen if there was an error, with a combined rollback and error returning enabled)
+				// This implies we have transaction always set for autocommit db's
+				if (!$this->transaction)
+				{
+					return false;
+				}
+
+				$result = $this->_sql_transaction('commit');
+
+				if (!$result)
+				{
+					$this->sql_error();
+				}
+
+				$this->transaction = false;
+				$this->transactions = 0;
+			break;
+
+			case 'rollback':
+				$result = $this->_sql_transaction('rollback');
+				$this->transaction = false;
+				$this->transactions = 0;
+			break;
+
+			default:
+				$result = $this->_sql_transaction($status);
+			break;
+		}
+
+		return $result;
+	}
+
+	/**
+	* Build sql statement from array for insert/update/select statements
+	*
+	* Idea for this from Ikonboard
+	* Possible query values: INSERT, INSERT_SELECT, UPDATE, SELECT
+	*
+	*/
+	function sql_build_array($query, $assoc_ary = false)
+	{
+		if (!is_array($assoc_ary))
+		{
+			return false;
+		}
+
+		$fields = $values = array();
+
+		if ($query == 'INSERT' || $query == 'INSERT_SELECT')
+		{
+			foreach ($assoc_ary as $key => $var)
+			{
+				$fields[] = $key;
+
+				if (is_array($var) && is_string($var[0]))
+				{
+					// This is used for INSERT_SELECT(s)
+					$values[] = $var[0];
+				}
+				else
+				{
+					$values[] = $this->_sql_validate_value($var);
+				}
+			}
+
+			$query = ($query == 'INSERT') ? ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')' : ' (' . implode(', ', $fields) . ') SELECT ' . implode(', ', $values) . ' ';
+		}
+		else if ($query == 'MULTI_INSERT')
+		{
+			trigger_error('The MULTI_INSERT query value is no longer supported. Please use sql_multi_insert() instead.', E_USER_ERROR);
+		}
+		else if ($query == 'UPDATE' || $query == 'SELECT')
+		{
+			$values = array();
+			foreach ($assoc_ary as $key => $var)
+			{
+				$values[] = "$key = " . $this->_sql_validate_value($var);
+			}
+			$query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values);
+		}
+
+		return $query;
+	}
+
+	/**
+	* Build IN or NOT IN sql comparison string, uses <> or = on single element
+	* arrays to improve comparison speed
+	*
+	* @access public
+	* @param    string  $field              name of the sql column that shall be compared
+	* @param    array   $array              array of values that are allowed (IN) or not allowed (NOT IN)
+	* @param    bool    $negate             true for NOT IN (), false for IN () (default)
+	* @param    bool    $allow_empty_set    If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
+	*/
+	function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
+	{
+		if (!sizeof($array))
+		{
+			if (!$allow_empty_set)
+			{
+				// Print the backtrace to help identifying the location of the problematic code
+				$this->sql_error('No values specified for SQL IN comparison');
+			}
+			else
+			{
+				// NOT IN () actually means everything so use a tautology
+				if ($negate)
+				{
+					return '1=1';
+				}
+				// IN () actually means nothing so use a contradiction
+				else
+				{
+					return '1=0';
+				}
+			}
+		}
+
+		if (!is_array($array))
+		{
+			$array = array($array);
+		}
+
+		if (sizeof($array) == 1)
+		{
+			@reset($array);
+			$var = current($array);
+
+			return $field . ($negate ? ' <> ' : ' = ') . $this->_sql_validate_value($var);
+		}
+		else
+		{
+			return $field . ($negate ? ' NOT IN ' : ' IN ') . '(' . implode(', ', array_map(array($this, '_sql_validate_value'), $array)) . ')';
+		}
+	}
+
+	/**
+	* Run binary AND operator on DB column.
+	* Results in sql statement: "{$column_name} & (1 << {$bit}) {$compare}"
+	*
+	* @param string $column_name The column name to use
+	* @param int $bit The value to use for the AND operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
+	* @param string $compare Any custom SQL code after the check (for example "= 0")
+	*/
+	function sql_bit_and($column_name, $bit, $compare = '')
+	{
+		if (method_exists($this, '_sql_bit_and'))
+		{
+			return $this->_sql_bit_and($column_name, $bit, $compare);
+		}
+
+		return $column_name . ' & ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
+	}
+
+	/**
+	* Run binary OR operator on DB column.
+	* Results in sql statement: "{$column_name} | (1 << {$bit}) {$compare}"
+	*
+	* @param string $column_name The column name to use
+	* @param int $bit The value to use for the OR operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
+	* @param string $compare Any custom SQL code after the check (for example "= 0")
+	*/
+	function sql_bit_or($column_name, $bit, $compare = '')
+	{
+		if (method_exists($this, '_sql_bit_or'))
+		{
+			return $this->_sql_bit_or($column_name, $bit, $compare);
+		}
+
+		return $column_name . ' | ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
+	}
+
+	/**
+	* Returns SQL string to cast a string expression to an int.
+	*
+	* @param  string $expression An expression evaluating to string
+	* @return string             Expression returning an int
+	*/
+	function cast_expr_to_bigint($expression)
+	{
+		return $expression;
+	}
+
+	/**
+	* Returns SQL string to cast an integer expression to a string.
+	*
+	* @param  string $expression An expression evaluating to int
+	* @return string             Expression returning a string
+	*/
+	function cast_expr_to_string($expression)
+	{
+		return $expression;
+	}
+
+	/**
+	* Run LOWER() on DB column of type text (i.e. neither varchar nor char).
+	*
+	* @param string $column_name    The column name to use
+	*
+	* @return string                A SQL statement like "LOWER($column_name)"
+	*/
+	function sql_lower_text($column_name)
+	{
+		return "LOWER($column_name)";
+	}
+
+	/**
+	* Run more than one insert statement.
+	*
+	* @param string $table table name to run the statements on
+	* @param array &$sql_ary multi-dimensional array holding the statement data.
+	*
+	* @return bool false if no statements were executed.
+	* @access public
+	*/
+	function sql_multi_insert($table, &$sql_ary)
+	{
+		if (!sizeof($sql_ary))
+		{
+			return false;
+		}
+
+		if ($this->multi_insert)
+		{
+			$ary = array();
+			foreach ($sql_ary as $id => $_sql_ary)
+			{
+				// If by accident the sql array is only one-dimensional we build a normal insert statement
+				if (!is_array($_sql_ary))
+				{
+					return $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $sql_ary));
+				}
+
+				$values = array();
+				foreach ($_sql_ary as $key => $var)
+				{
+					$values[] = $this->_sql_validate_value($var);
+				}
+				$ary[] = '(' . implode(', ', $values) . ')';
+			}
+
+			return $this->sql_query('INSERT INTO ' . $table . ' ' . ' (' . implode(', ', array_keys($sql_ary[0])) . ') VALUES ' . implode(', ', $ary));
+		}
+		else
+		{
+			foreach ($sql_ary as $ary)
+			{
+				if (!is_array($ary))
+				{
+					return false;
+				}
+
+				$result = $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $ary));
+
+				if (!$result)
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	* Function for validating values
+	* @access private
+	*/
+	function _sql_validate_value($var)
+	{
+		if (is_null($var))
+		{
+			return 'NULL';
+		}
+		else if (is_string($var))
+		{
+			return "'" . $this->sql_escape($var) . "'";
+		}
+		else
+		{
+			return (is_bool($var)) ? intval($var) : $var;
+		}
+	}
+
+	/**
+	* Build sql statement from array for select and select distinct statements
+	*
+	* Possible query values: SELECT, SELECT_DISTINCT
+	*/
+	function sql_build_query($query, $array)
+	{
+		$sql = '';
+		switch ($query)
+		{
+			case 'SELECT':
+			case 'SELECT_DISTINCT';
+
+				$sql = str_replace('_', ' ', $query) . ' ' . $array['SELECT'] . ' FROM ';
+
+				// Build table array. We also build an alias array for later checks.
+				$table_array = $aliases = array();
+				$used_multi_alias = false;
+
+				foreach ($array['FROM'] as $table_name => $alias)
+				{
+					if (is_array($alias))
+					{
+						$used_multi_alias = true;
+
+						foreach ($alias as $multi_alias)
+						{
+							$table_array[] = $table_name . ' ' . $multi_alias;
+							$aliases[] = $multi_alias;
+						}
+					}
+					else
+					{
+						$table_array[] = $table_name . ' ' . $alias;
+						$aliases[] = $alias;
+					}
+				}
+
+				// We run the following code to determine if we need to re-order the table array. ;)
+				// The reason for this is that for multi-aliased tables (two equal tables) in the FROM statement the last table need to match the first comparison.
+				// DBMS who rely on this: Oracle, PostgreSQL and MSSQL. For all other DBMS it makes absolutely no difference in which order the table is.
+				if (!empty($array['LEFT_JOIN']) && sizeof($array['FROM']) > 1 && $used_multi_alias !== false)
+				{
+					// Take first LEFT JOIN
+					$join = current($array['LEFT_JOIN']);
+
+					// Determine the table used there (even if there are more than one used, we only want to have one
+					preg_match('/(' . implode('|', $aliases) . ')\.[^\s]+/U', str_replace(array('(', ')', 'AND', 'OR', ' '), '', $join['ON']), $matches);
+
+					// If there is a first join match, we need to make sure the table order is correct
+					if (!empty($matches[1]))
+					{
+						$first_join_match = trim($matches[1]);
+						$table_array = $last = array();
+
+						foreach ($array['FROM'] as $table_name => $alias)
+						{
+							if (is_array($alias))
+							{
+								foreach ($alias as $multi_alias)
+								{
+									($multi_alias === $first_join_match) ? $last[] = $table_name . ' ' . $multi_alias : $table_array[] = $table_name . ' ' . $multi_alias;
+								}
+							}
+							else
+							{
+								($alias === $first_join_match) ? $last[] = $table_name . ' ' . $alias : $table_array[] = $table_name . ' ' . $alias;
+							}
+						}
+
+						$table_array = array_merge($table_array, $last);
+					}
+				}
+
+				$sql .= $this->_sql_custom_build('FROM', implode(' CROSS JOIN ', $table_array));
+
+				if (!empty($array['LEFT_JOIN']))
+				{
+					foreach ($array['LEFT_JOIN'] as $join)
+					{
+						$sql .= ' LEFT JOIN ' . key($join['FROM']) . ' ' . current($join['FROM']) . ' ON (' . $join['ON'] . ')';
+					}
+				}
+
+				if (!empty($array['WHERE']))
+				{
+					$sql .= ' WHERE ' . $this->_sql_custom_build('WHERE', $array['WHERE']);
+				}
+
+				if (!empty($array['GROUP_BY']))
+				{
+					$sql .= ' GROUP BY ' . $array['GROUP_BY'];
+				}
+
+				if (!empty($array['ORDER_BY']))
+				{
+					$sql .= ' ORDER BY ' . $array['ORDER_BY'];
+				}
+
+			break;
+		}
+
+		return $sql;
+	}
+
+	/**
+	* display sql error page
+	*/
+	function sql_error($sql = '')
+	{
+		global $auth, $user, $config;
+
+		// Set var to retrieve errored status
+		$this->sql_error_triggered = true;
+		$this->sql_error_sql = $sql;
+
+		$this->sql_error_returned = $this->_sql_error();
+
+		if (!$this->return_on_error)
+		{
+			$message = 'SQL ERROR [ ' . $this->sql_layer . ' ]<br /><br />' . $this->sql_error_returned['message'] . ' [' . $this->sql_error_returned['code'] . ']';
+
+			// Show complete SQL error and path to administrators only
+			// Additionally show complete error on installation or if extended debug mode is enabled
+			// The DEBUG constant is for development only!
+			if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG'))
+			{
+				$message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
+			}
+			else
+			{
+				// If error occurs in initiating the session we need to use a pre-defined language string
+				// This could happen if the connection could not be established for example (then we are not able to grab the default language)
+				if (!isset($user->lang['SQL_ERROR_OCCURRED']))
+				{
+					$message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.';
+				}
+				else
+				{
+					if (!empty($config['board_contact']))
+					{
+						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
+					}
+					else
+					{
+						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', '');
+					}
+				}
+			}
+
+			if ($this->transaction)
+			{
+				$this->sql_transaction('rollback');
+			}
+
+			if (strlen($message) > 1024)
+			{
+				// We need to define $msg_long_text here to circumvent text stripping.
+				global $msg_long_text;
+				$msg_long_text = $message;
+
+				trigger_error(false, E_USER_ERROR);
+			}
+
+			trigger_error($message, E_USER_ERROR);
+		}
+
+		if ($this->transaction)
+		{
+			$this->sql_transaction('rollback');
+		}
+
+		return $this->sql_error_returned;
+	}
+
+	/**
+	* Explain queries
+	*/
+	function sql_report($mode, $query = '')
+	{
+		global $cache, $starttime, $phpbb_root_path, $user;
+		global $request;
+
+		if (is_object($request) && !$request->variable('explain', false))
+		{
+			return false;
+		}
+
+		if (!$query && $this->query_hold != '')
+		{
+			$query = $this->query_hold;
+		}
+
+		switch ($mode)
+		{
+			case 'display':
+				if (!empty($cache))
+				{
+					$cache->unload();
+				}
+				$this->sql_close();
+
+				$mtime = explode(' ', microtime());
+				$totaltime = $mtime[0] + $mtime[1] - $starttime;
+
+				echo '<!DOCTYPE html>
+					<html dir="ltr">
+					<head>
+						<meta charset="utf-8">
+						<title>SQL Report</title>
+						<link href="' . $phpbb_root_path . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+					</head>
+					<body id="errorpage">
+					<div id="wrap">
+						<div id="page-header">
+							<a href="' . build_url('explain') . '">Return to previous page</a>
+						</div>
+						<div id="page-body">
+							<div id="acp">
+							<div class="panel">
+								<span class="corners-top"><span></span></span>
+								<div id="content">
+									<h1>SQL Report</h1>
+									<br />
+									<p><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries['normal']} queries" . (($this->num_queries['cached']) ? " + {$this->num_queries['cached']} " . (($this->num_queries['cached'] == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></p>
+
+									<p>Time spent on ' . $this->sql_layer . ' queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></p>
+
+									<br /><br />
+									' . $this->sql_report . '
+								</div>
+								<span class="corners-bottom"><span></span></span>
+							</div>
+							</div>
+						</div>
+						<div id="page-footer">
+							Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+						</div>
+					</div>
+					</body>
+					</html>';
+
+				exit_handler();
+
+			break;
+
+			case 'stop':
+				$endtime = explode(' ', microtime());
+				$endtime = $endtime[0] + $endtime[1];
+
+				$this->sql_report .= '
+
+					<table cellspacing="1">
+					<thead>
+					<tr>
+						<th>Query #' . $this->num_queries['total'] . '</th>
+					</tr>
+					</thead>
+					<tbody>
+					<tr>
+						<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td>
+					</tr>
+					</tbody>
+					</table>
+
+					' . $this->html_hold . '
+
+					<p style="text-align: center;">
+				';
+
+				if ($this->query_result)
+				{
+					if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query))
+					{
+						$this->sql_report .= 'Affected rows: <b>' . $this->sql_affectedrows($this->query_result) . '</b> | ';
+					}
+					$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $this->curtime) . 's</b>';
+				}
+				else
+				{
+					$error = $this->sql_error();
+					$this->sql_report .= '<b style="color: red">FAILED</b> - ' . $this->sql_layer . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
+				}
+
+				$this->sql_report .= '</p><br /><br />';
+
+				$this->sql_time += $endtime - $this->curtime;
+			break;
+
+			case 'start':
+				$this->query_hold = $query;
+				$this->html_hold = '';
+
+				$this->_sql_report($mode, $query);
+
+				$this->curtime = explode(' ', microtime());
+				$this->curtime = $this->curtime[0] + $this->curtime[1];
+
+			break;
+
+			case 'add_select_row':
+
+				$html_table = func_get_arg(2);
+				$row = func_get_arg(3);
+
+				if (!$html_table && sizeof($row))
+				{
+					$html_table = true;
+					$this->html_hold .= '<table cellspacing="1"><tr>';
+
+					foreach (array_keys($row) as $val)
+					{
+						$this->html_hold .= '<th>' . (($val) ? ucwords(str_replace('_', ' ', $val)) : '&nbsp;') . '</th>';
+					}
+					$this->html_hold .= '</tr>';
+				}
+				$this->html_hold .= '<tr>';
+
+				$class = 'row1';
+				foreach (array_values($row) as $val)
+				{
+					$class = ($class == 'row1') ? 'row2' : 'row1';
+					$this->html_hold .= '<td class="' . $class . '">' . (($val) ? $val : '&nbsp;') . '</td>';
+				}
+				$this->html_hold .= '</tr>';
+
+				return $html_table;
+
+			break;
+
+			case 'fromcache':
+
+				$this->_sql_report($mode, $query);
+
+			break;
+
+			case 'record_fromcache':
+
+				$endtime = func_get_arg(2);
+				$splittime = func_get_arg(3);
+
+				$time_cache = $endtime - $this->curtime;
+				$time_db = $splittime - $endtime;
+				$color = ($time_db > $time_cache) ? 'green' : 'red';
+
+				$this->sql_report .= '<table cellspacing="1"><thead><tr><th>Query results obtained from the cache</th></tr></thead><tbody><tr>';
+				$this->sql_report .= '<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></tbody></table>';
+				$this->sql_report .= '<p style="text-align: center;">';
+				$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br /><br />';
+
+				// Pad the start time to not interfere with page timing
+				$starttime += $time_db;
+
+			break;
+
+			default:
+
+				$this->_sql_report($mode, $query);
+
+			break;
+		}
+
+		return true;
+	}
+
+	/**
+	* Gets the estimated number of rows in a specified table.
+	*
+	* @param string $table_name     Table name
+	*
+	* @return string                Number of rows in $table_name.
+	*                               Prefixed with ~ if estimated (otherwise exact).
+	*
+	* @access public
+	*/
+	function get_estimated_row_count($table_name)
+	{
+		return $this->get_row_count($table_name);
+	}
+
+	/**
+	* Gets the exact number of rows in a specified table.
+	*
+	* @param string $table_name     Table name
+	*
+	* @return string                Exact number of rows in $table_name.
+	*
+	* @access public
+	*/
+	function get_row_count($table_name)
+	{
+		$sql = 'SELECT COUNT(*) AS rows_total
+			FROM ' . $this->sql_escape($table_name);
+		$result = $this->sql_query($sql);
+		$rows_total = $this->sql_fetchfield('rows_total');
+		$this->sql_freeresult($result);
+
+		return $rows_total;
+	}
 }
-- 
cgit v1.2.1


From 9cc7680965ae8091fd488b8210ae66c790c83978 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 15 Nov 2012 03:24:08 +0100
Subject: [ticket/11015] Fix some more whitespace in the driver

PHPBB3-11015
---
 phpBB/includes/db/driver/driver.php | 42 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php
index 49bfcb8007..25daa7243d 100644
--- a/phpBB/includes/db/driver/driver.php
+++ b/phpBB/includes/db/driver/driver.php
@@ -75,9 +75,9 @@ class phpbb_db_driver
 	function __construct()
 	{
 		$this->num_queries = array(
-			'cached'        => 0,
-			'normal'        => 0,
-			'total'         => 0,
+			'cached'	=> 0,
+			'normal'	=> 0,
+			'total'		=> 0,
 		);
 
 		// Fill default sql layer based on the class being called.
@@ -288,10 +288,10 @@ class phpbb_db_driver
 	*
 	* Note: The two statements action_true and action_false must have the same data type (int, vchar, ...) in the database!
 	*
-	* @param    string  $condition      The condition which must be true, to use action_true rather then action_else
-	* @param    string  $action_true    SQL expression that is used, if the condition is true
-	* @param    string  $action_else    SQL expression that is used, if the condition is false, optional
-	* @return   string          CASE expression including the condition and statements
+	* @param	string	$condition		The condition which must be true, to use action_true rather then action_else
+	* @param	string	$action_true	SQL expression that is used, if the condition is true
+	* @param	string	$action_else	SQL expression that is used, if the condition is false, optional
+	* @return	string			CASE expression including the condition and statements
 	*/
 	public function sql_case($condition, $action_true, $action_false = false)
 	{
@@ -305,9 +305,9 @@ class phpbb_db_driver
 	/**
 	* Build a concatenated expression
 	*
-	* @param    string  $expr1      Base SQL expression where we append the second one
-	* @param    string  $expr2      SQL expression that is appended to the first expression
-	* @return   string      Concatenated string
+	* @param	string	$expr1		Base SQL expression where we append the second one
+	* @param	string	$expr2		SQL expression that is appended to the first expression
+	* @return	string		Concatenated string
 	*/
 	public function sql_concatenate($expr1, $expr2)
 	{
@@ -447,10 +447,10 @@ class phpbb_db_driver
 	* arrays to improve comparison speed
 	*
 	* @access public
-	* @param    string  $field              name of the sql column that shall be compared
-	* @param    array   $array              array of values that are allowed (IN) or not allowed (NOT IN)
-	* @param    bool    $negate             true for NOT IN (), false for IN () (default)
-	* @param    bool    $allow_empty_set    If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
+	* @param	string	$field				name of the sql column that shall be compared
+	* @param	array	$array				array of values that are allowed (IN) or not allowed (NOT IN)
+	* @param	bool	$negate				true for NOT IN (), false for IN () (default)
+	* @param	bool	$allow_empty_set	If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
 	*/
 	function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
 	{
@@ -555,9 +555,9 @@ class phpbb_db_driver
 	/**
 	* Run LOWER() on DB column of type text (i.e. neither varchar nor char).
 	*
-	* @param string $column_name    The column name to use
+	* @param string $column_name	The column name to use
 	*
-	* @return string                A SQL statement like "LOWER($column_name)"
+	* @return string				A SQL statement like "LOWER($column_name)"
 	*/
 	function sql_lower_text($column_name)
 	{
@@ -1010,10 +1010,10 @@ class phpbb_db_driver
 	/**
 	* Gets the estimated number of rows in a specified table.
 	*
-	* @param string $table_name     Table name
+	* @param string $table_name		Table name
 	*
-	* @return string                Number of rows in $table_name.
-	*                               Prefixed with ~ if estimated (otherwise exact).
+	* @return string				Number of rows in $table_name.
+	*								Prefixed with ~ if estimated (otherwise exact).
 	*
 	* @access public
 	*/
@@ -1025,9 +1025,9 @@ class phpbb_db_driver
 	/**
 	* Gets the exact number of rows in a specified table.
 	*
-	* @param string $table_name     Table name
+	* @param string $table_name		Table name
 	*
-	* @return string                Exact number of rows in $table_name.
+	* @return string				Exact number of rows in $table_name.
 	*
 	* @access public
 	*/
-- 
cgit v1.2.1


From 60b4c907b292a46b40cad1c0330e76b897a2309b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 14 Nov 2012 23:14:41 +0100
Subject: [feature/avatars] Add service containers for avatars

PHPBB3-10018
---
 phpBB/includes/avatar/driver/core/gravatar.php | 16 +++------
 phpBB/includes/avatar/driver/core/remote.php   | 10 +++---
 phpBB/includes/avatar/driver/core/upload.php   |  2 +-
 phpBB/includes/avatar/driver/driver.php        | 22 ++++++++++++
 phpBB/includes/avatar/driver/interface.php     |  7 ++++
 phpBB/includes/avatar/manager.php              | 46 +++++++++-----------------
 phpBB/includes/ucp/ucp_profile.php             |  7 ++--
 7 files changed, 58 insertions(+), 52 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/core/gravatar.php b/phpBB/includes/avatar/driver/core/gravatar.php
index a9e4d6c491..34aa0fa27f 100644
--- a/phpBB/includes/avatar/driver/core/gravatar.php
+++ b/phpBB/includes/avatar/driver/core/gravatar.php
@@ -70,9 +70,9 @@ class phpbb_avatar_driver_core_gravatar extends phpbb_avatar_driver
 	public function prepare_form($template, $row, &$error)
 	{
 		$template->assign_vars(array(
-			'AV_GRAVATAR_WIDTH' => (($row['avatar_type'] == __CLASS__ || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
-			'AV_GRAVATAR_HEIGHT' => (($row['avatar_type'] == __CLASS__ || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
-			'AV_GRAVATAR_EMAIL' => (($row['avatar_type'] == __CLASS__ || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
+			'AV_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
+			'AV_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
+			'AV_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
 		));
 
 		return true;
@@ -86,16 +86,8 @@ class phpbb_avatar_driver_core_gravatar extends phpbb_avatar_driver
 		$email = $this->request->variable('av_gravatar_email', '');
 		$width = $this->request->variable('av_gravatar_width', 0);
 		$height = $this->request->variable('av_gravatar_height', 0);
-		var_dump($width, $height);
 
-		/*
-		if (!preg_match('#^(http|https|ftp)://#i', $email))
-		{
-			$url = 'http://' . $url;
-		}*/
-		// @todo: check if we need to check emails
-
-		require_once($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
+		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx);
 
 		$error = array_merge($error, validate_data(array(
 			'email' => $email,
diff --git a/phpBB/includes/avatar/driver/core/remote.php b/phpBB/includes/avatar/driver/core/remote.php
index 9f5a58e75a..8b315b80a8 100644
--- a/phpBB/includes/avatar/driver/core/remote.php
+++ b/phpBB/includes/avatar/driver/core/remote.php
@@ -50,9 +50,9 @@ class phpbb_avatar_driver_core_remote extends phpbb_avatar_driver
 	public function prepare_form($template, $row, &$error)
 	{
 		$template->assign_vars(array(
-			'AV_REMOTE_WIDTH' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
-			'AV_REMOTE_HEIGHT' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
-			'AV_REMOTE_URL' => (($row['avatar_type'] == AVATAR_REMOTE || $row['avatar_type'] == 'remote') && $row['avatar']) ? $row['avatar'] : '',
+			'AV_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
+			'AV_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
+			'AV_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '',
 		));
 
 		return true;
@@ -72,7 +72,7 @@ class phpbb_avatar_driver_core_remote extends phpbb_avatar_driver
 			$url = 'http://' . $url;
 		}
 
-		require_once($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
+		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx);
 
 		$error = array_merge($error, validate_data(array(
 			'url' => $url,
@@ -118,7 +118,7 @@ class phpbb_avatar_driver_core_remote extends phpbb_avatar_driver
 			return false;
 		}
 
-		include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
+		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->phpEx);
 		$types = fileupload::image_types();
 		$extension = strtolower(filespec::get_extension($url));
 
diff --git a/phpBB/includes/avatar/driver/core/upload.php b/phpBB/includes/avatar/driver/core/upload.php
index d0ce856dbe..1ad1133bff 100644
--- a/phpBB/includes/avatar/driver/core/upload.php
+++ b/phpBB/includes/avatar/driver/core/upload.php
@@ -72,7 +72,7 @@ class phpbb_avatar_driver_core_upload extends phpbb_avatar_driver
 			return false;
 		}
 
-		include_once($this->phpbb_root_path . 'includes/functions_upload.' . $this->phpEx);
+		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->phpEx);
 
 		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index d0f77d2094..cce0a8db0f 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -21,6 +21,28 @@ if (!defined('IN_PHPBB'))
 */
 abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 {
+	private $name;
+
+	/**
+	* Returns the name of the driver.
+	*
+	* @return string		Name of wrapped driver.
+	*/
+	public function get_name()
+	{
+		return $this->name;
+	}
+
+	/**
+	* Sets the name of the driver.
+	*
+	* @param string	$name The driver name
+	*/
+	public function set_name($name)
+	{
+		$this->name = $name;
+	}
+
 	/**
 	* Current board configuration
 	* @type phpbb_config
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 16fef58e7a..f066470174 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -21,6 +21,13 @@ if (!defined('IN_PHPBB'))
 */
 interface phpbb_avatar_driver_interface
 {
+	/**
+	* Returns the name of the driver.
+	*
+	* @return string		Name of wrapped driver.
+	*/
+	public function get_name();
+
 	/**
 	* Get the avatar url and dimensions
 	*
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 94c7614868..4256188f0a 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -24,21 +24,23 @@ class phpbb_avatar_manager
 	private $phpEx;
 	private $config;
 	private $request;
-	private $extension_manager;
 	private $cache;
 	private static $valid_drivers = false;
+	private $tasks;
+	private $container;
 
 	/**
 	* @TODO
 	**/
-	public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_request $request, phpbb_extension_manager $extension_manager, phpbb_cache_driver_interface $cache = null)
+	public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_request $request, phpbb_cache_driver_interface $cache, $tasks, $container)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->phpEx = $phpEx;
 		$this->config = $config;
 		$this->request = $request;
-		$this->extension_manager = $extension_manager;
 		$this->cache = $cache;
+		$this->tasks = $tasks;
+		$this->container = $container;
 	}
 
 	/**
@@ -55,13 +57,13 @@ class phpbb_avatar_manager
 		switch ($avatar_type)
 		{
 			case AVATAR_GALLERY:
-				$avatar_type = 'phpbb_avatar_driver_local';
+				$avatar_type = 'avatar.driver.core.local';
 				break;
 			case AVATAR_UPLOAD:
-				$avatar_type = 'phpbb_avatar_driver_upload';
+				$avatar_type = 'avatar.driver.core.upload';
 				break;
 			case AVATAR_REMOTE:
-				$avatar_type = 'phpbb_avatar_driver_remote';
+				$avatar_type = 'avatar.driver.core.remote';
 				break;
 		}
 
@@ -70,19 +72,14 @@ class phpbb_avatar_manager
 			return null;
 		}
 
-		$r = new ReflectionClass($avatar_type);
-
-		if ($r->isSubClassOf('phpbb_avatar_driver'))
-		{
-			$driver = new $avatar_type($this->config, $this->request, $this->phpbb_root_path, $this->phpEx, $this->cache);
-		}
-		else if ($r->implementsInterface('phpbb_avatar_driver'))
+		$driver = $this->container->get($avatar_type);
+		if ($driver !== false)
 		{
-			$driver = new $avatar_type();
+			return $driver;
 		}
 		else
 		{
-			$message = "Invalid avatar driver class name '%s' provided. It must implement phpbb_avatar_driver_interface.";
+			$message = "Invalid avatar driver class name '%s' provided.";
 			trigger_error(sprintf($message, $avatar_type));
 		}
 
@@ -94,25 +91,12 @@ class phpbb_avatar_manager
 	**/
 	private function load_valid_drivers()
 	{
-		if ($this->cache)
-		{
-			self::$valid_drivers = $this->cache->get('avatar_drivers');
-		}
-
-		if (empty($this->valid_drivers))
+		if (!empty($this->tasks))
 		{
 			self::$valid_drivers = array();
-
-			$finder = $this->extension_manager->get_finder();
-
-			self::$valid_drivers = $finder
-				->extension_directory('/avatar/driver/')
-				->core_path('includes/avatar/driver/core/')
-				->get_classes();
-
-			if ($this->cache)
+			foreach ($this->tasks as $driver)
 			{
-				$this->cache->put('avatar_drivers', self::$valid_drivers);
+				self::$valid_drivers[] = $driver->get_name();
 			}
 		}
 	}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 4b0e59b9e8..aa5e279ce2 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -563,8 +563,9 @@ class ucp_profile
 					{
 						if (check_form_key('ucp_avatar'))
 						{
-							$driver = request_var('avatar_driver', '');
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
+							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
+							$config_name = preg_replace('#^avatar.driver.core.#', '', $driver);
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"])
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);
@@ -643,7 +644,7 @@ class ucp_profile
 									'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values
 									'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
 
-									'DRIVER' => $driver,
+									'DRIVER' => str_replace('.', '_', $driver),
 									'SELECTED' => ($driver == $focused_driver),
 									'OUTPUT' => $template->assign_display('avatar'),
 								));
-- 
cgit v1.2.1


From 0d4a289778893d44288d9f586852038f6b52d4db Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 16 Nov 2012 01:26:36 +0100
Subject: [ticket/11015] Remove strange method_exists call

PHPBB3-11015
---
 phpBB/includes/db/driver/mssql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/driver/mssql.php b/phpBB/includes/db/driver/mssql.php
index 04bb75f5ce..2e9debf84f 100644
--- a/phpBB/includes/db/driver/mssql.php
+++ b/phpBB/includes/db/driver/mssql.php
@@ -157,7 +157,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl && method_exists($cache, 'sql_save'))
+				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
-- 
cgit v1.2.1


From fc5385c2a58833af2929c75d132903a3a0918da9 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 16 Nov 2012 01:48:03 +0100
Subject: [ticket/11015] Allow full dbms class name in config.php

PHPBB3-11015
---
 phpBB/includes/di/extension/config.php | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/di/extension/config.php b/phpBB/includes/di/extension/config.php
index 5b2df93ff2..85ab7ab28d 100644
--- a/phpBB/includes/di/extension/config.php
+++ b/phpBB/includes/di/extension/config.php
@@ -43,8 +43,8 @@ class phpbb_di_extension_config extends Extension
 		require($this->config_file);
 
 		$container->setParameter('core.table_prefix', $table_prefix);
-		$container->setParameter('cache.driver.class', $this->fix_acm_type($acm_type));
-		$container->setParameter('dbal.driver.class', 'phpbb_db_driver_'.$dbms);
+		$container->setParameter('cache.driver.class', $this->convert_30_acm_type($acm_type));
+		$container->setParameter('dbal.driver.class', $this->convert_30_dbms($dbms));
 		$container->setParameter('dbal.dbhost', $dbhost);
 		$container->setParameter('dbal.dbuser', $dbuser);
 		$container->setParameter('dbal.dbpasswd', $dbpasswd);
@@ -66,12 +66,12 @@ class phpbb_di_extension_config extends Extension
 	}
 
 	/**
-	* Convert old (3.0) values to 3.1 class names
+	* Convert 3.0 ACM type to 3.1 cache driver class name
 	*
-	* @param style $acm_type ACM type
-	* @return ACM type class
+	* @param string $acm_type ACM type
+	* @return cache driver class
 	*/
-	protected function fix_acm_type($acm_type)
+	protected function convert_30_acm_type($acm_type)
 	{
 		if (preg_match('#^[a-z]+$#', $acm_type))
 		{
@@ -80,4 +80,20 @@ class phpbb_di_extension_config extends Extension
 
 		return $acm_type;
 	}
+
+	/**
+	* Convert 3.0 dbms to 3.1 db driver class name
+	*
+	* @param string $dbms dbms parameter
+	* @return db driver class
+	*/
+	protected function convert_30_dbms($dbms)
+	{
+		if (!preg_match('#^phpbb_db_driver_#', $dbms))
+		{
+			return 'phpbb_db_driver_'.$dbms;
+		}
+
+		return $dbms;
+	}
 }
-- 
cgit v1.2.1


From 98092add9e1f7fd03e347831b7d0b8db6c92939f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 16 Nov 2012 11:48:41 +0100
Subject: [ticket/10411] Move globals to the top and use array for cache
 destroy

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 456f385079..3784e5c169 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -498,8 +498,7 @@ class acp_groups
 								}
 							}
 
-							$cache->destroy('sql', GROUPS_TABLE);
-							$cache->destroy('sql', TEAMPAGE_TABLE);
+							$cache->destroy('sql', array(GROUPS_TABLE, TEAMPAGE_TABLE));
 
 							$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
 							trigger_error($user->lang[$message] . adm_back_link($this->u_action));
@@ -814,7 +813,7 @@ class acp_groups
 
 	public function manage_position()
 	{
-		global $config, $db, $template, $user, $request;
+		global $config, $db, $template, $user, $request, $phpbb_container;
 
 		$this->tpl_name = 'acp_groups_position';
 		$this->page_title = 'ACP_GROUPS_POSITION';
@@ -832,7 +831,6 @@ class acp_groups
 		}
 		else if ($field)
 		{
-			global $phpbb_container;
 
 			$group_position = $phpbb_container->get('groupposition.' . $field);
 			$group_position->set_admin_back_link($this->u_action);
-- 
cgit v1.2.1


From cc86bd9267b854003628b33ccb21557c88049734 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 16 Nov 2012 14:29:35 +0100
Subject: [feature/avatars] Shorten needed language variable for avatar title

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index aa5e279ce2..afa8c99b34 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -638,13 +638,14 @@ class ucp_profile
 
 							if ($avatar->prepare_form($template, $avatar_data, $error))
 							{
-								$driver_u = strtoupper($driver);
+								$driver_n = str_replace('.', '_', $driver);
+								$driver_u = strtoupper($driver_n);
 
 								$template->assign_block_vars('avatar_drivers', array(
-									'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values
-									'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
+									'L_TITLE' => $user->lang($driver_u . '_TITLE'), // @TODO add lang values
+									'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
 
-									'DRIVER' => str_replace('.', '_', $driver),
+									'DRIVER' => $driver_n,
 									'SELECTED' => ($driver == $focused_driver),
 									'OUTPUT' => $template->assign_display('avatar'),
 								));
-- 
cgit v1.2.1


From 0a5d54cc9b4ece668ba59d41a281c147874f3c5c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 16 Nov 2012 17:19:04 +0100
Subject: [feature/avatars] Shorten avatar driver's class name

The addition of "core_" that was used until now would require additional
avatar drivers (e.g. in extensions) to also include that in their class
name which would be incorrect.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/core/gravatar.php | 140 ------------------
 phpBB/includes/avatar/driver/core/local.php    | 190 -------------------------
 phpBB/includes/avatar/driver/core/remote.php   | 163 ---------------------
 phpBB/includes/avatar/driver/core/upload.php   | 147 -------------------
 phpBB/includes/avatar/driver/driver.php        |   4 +-
 phpBB/includes/avatar/driver/gravatar.php      | 140 ++++++++++++++++++
 phpBB/includes/avatar/driver/local.php         | 190 +++++++++++++++++++++++++
 phpBB/includes/avatar/driver/remote.php        | 163 +++++++++++++++++++++
 phpBB/includes/avatar/driver/upload.php        | 147 +++++++++++++++++++
 phpBB/includes/avatar/manager.php              |   6 +-
 phpBB/includes/ucp/ucp_profile.php             |   2 +-
 11 files changed, 646 insertions(+), 646 deletions(-)
 delete mode 100644 phpBB/includes/avatar/driver/core/gravatar.php
 delete mode 100644 phpBB/includes/avatar/driver/core/local.php
 delete mode 100644 phpBB/includes/avatar/driver/core/remote.php
 delete mode 100644 phpBB/includes/avatar/driver/core/upload.php
 create mode 100644 phpBB/includes/avatar/driver/gravatar.php
 create mode 100644 phpBB/includes/avatar/driver/local.php
 create mode 100644 phpBB/includes/avatar/driver/remote.php
 create mode 100644 phpBB/includes/avatar/driver/upload.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/core/gravatar.php b/phpBB/includes/avatar/driver/core/gravatar.php
deleted file mode 100644
index 34aa0fa27f..0000000000
--- a/phpBB/includes/avatar/driver/core/gravatar.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
-*
-* @package avatar
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars hosted at gravatar.com
-* @package avatars
-*/
-// @todo: rename classes to phpbb_ext_foo_avatar_driver_foo and similar
-class phpbb_avatar_driver_core_gravatar extends phpbb_avatar_driver
-{
-	/**
-	* We'll need to create a different type of avatar for gravatar
-	*/
-	public $custom_html = true;
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row, $ignore_config = false)
-	{
-		// @todo: add allow_avatar_gravatar to database_update.php etc.
-		if ($ignore_config || $this->config['allow_avatar_gravatar'])
-		{
-			return array(
-				'src' => $row['avatar'],
-				'width' => $row['avatar_width'],
-				'height' => $row['avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
-	}
-	
-	/**
-	* @inheritdoc
-	*/
-	public function get_custom_html($row, $ignore_config = false, $alt = '')
-	{
-		$html = '<img src="http://www.gravatar.com/avatar/' . md5(strtolower(trim($row['avatar']))) .  
-			(($row['avatar_width'] || $row['avatar_height']) ? ('?s=' . max($row['avatar_width'], $row['avatar_height'])) : '') . '" ' .
-			($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') .
-			($row['avatar_height'] ? ('height="' . $row['avatar_height'] . '" ') : '') .
-			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
-		return $html;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($template, $row, &$error)
-	{
-		$template->assign_vars(array(
-			'AV_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
-			'AV_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
-			'AV_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
-		));
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($template, $row, &$error)
-	{
-		$email = $this->request->variable('av_gravatar_email', '');
-		$width = $this->request->variable('av_gravatar_width', 0);
-		$height = $this->request->variable('av_gravatar_height', 0);
-
-		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx);
-
-		$error = array_merge($error, validate_data(array(
-			'email' => $email,
-		), array(
-			'email' => array(
-				array('string', false, 6, 60),
-				array('email')),
-		)));
-
-		if (!empty($error))
-		{
-			return false;
-		}
-
-		// Make sure getimagesize works...
-		if (function_exists('getimagesize'))
-		{
-			// build URL
-			// @todo: add https support
-			$url = 'http://www.gravatar.com/avatar/' . md5(strtolower(trim($email)));
-
-			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
-			{
-				$error[] = 'UNABLE_GET_IMAGE_SIZE';
-				return false;
-			}
-
-			if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
-			{
-				$error[] = 'AVATAR_NO_SIZE';
-				return false;
-			}
-
-			$width = ($width && $height) ? $width : $image_data[0];
-			$height = ($width && $height) ? $height : $image_data[1];
-		}
-
-		if ($width <= 0 || $height <= 0)
-		{
-			$error[] = 'AVATAR_NO_SIZE';
-			return false;
-		}
-
-		return array(
-			'avatar' => $email,
-			'avatar_width' => $width,
-			'avatar_height' => $height,
-		);
-	}
-}
diff --git a/phpBB/includes/avatar/driver/core/local.php b/phpBB/includes/avatar/driver/core/local.php
deleted file mode 100644
index a8ed8ad130..0000000000
--- a/phpBB/includes/avatar/driver/core/local.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
-*
-* @package avatar
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars selected from the board gallery
-* @package avatars
-*/
-class phpbb_avatar_driver_core_local extends phpbb_avatar_driver
-{
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row, $ignore_config = false)
-	{
-		if ($ignore_config || $this->config['allow_avatar_local'])
-		{
-			return array(
-				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
-				'width' => $row['avatar_width'],
-				'height' => $row['avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($template, $row, &$error)
-	{
-		$avatar_list = $this->get_avatar_list();
-		$category = $this->request->variable('av_local_cat', '');
-
-		$categories = array_keys($avatar_list);
-
-		foreach ($categories as $cat)
-		{
-			if (!empty($avatar_list[$cat]))
-			{
-				$template->assign_block_vars('av_local_cats', array(
-					'NAME' => $cat,
-					'SELECTED' => ($cat == $category),
-				));
-			}
-		}
-
-		if (!empty($avatar_list[$category]))
-		{
-			$template->assign_vars(array(
-				'AV_LOCAL_SHOW' => true,
-			));
-
-			$table_cols = isset($row['av_gallery_cols']) ? $row['av_gallery_cols'] : 4;
-			$row_count = $col_count = $av_pos = 0;
-			$av_count = sizeof($avatar_list[$category]);
-
-			reset($avatar_list[$category]);
-
-			while ($av_pos < $av_count)
-			{
-				$img = current($avatar_list[$category]);
-				next($avatar_list[$category]);
-
-				if ($col_count == 0)
-				{
-					++$row_count;
-					$template->assign_block_vars('av_local_row', array(
-					));
-				}
-
-				$template->assign_block_vars('av_local_row.av_local_col', array(
-					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
-					'AVATAR_NAME' => $img['name'],
-					'AVATAR_FILE' => $img['filename'],
-				));
-
-				$col_count = ($col_count + 1) % $table_cols;
-
-				++$av_pos;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($template, $row, &$error)
-	{
-		$avatar_list = $this->get_avatar_list();
-		$category = $this->request->variable('av_local_cat', '');
-
-		$file = $this->request->variable('av_local_file', '');
-		if (!isset($avatar_list[$category][urldecode($file)]))
-		{
-			$error[] = 'AVATAR_URL_NOT_FOUND';
-			return false;
-		}
-
-		return array(
-			'avatar' => $category . '/' . $file,
-			'avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
-			'avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
-		);
-	}
-
-	/**
-	* @TODO
-	*/
-	private function get_avatar_list()
-	{
-		$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list');
-
-		if (!$avatar_list)
-		{
-			$avatar_list = array();
-			$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
-
-			$dh = @opendir($path);
-
-			if ($dh)
-			{
-				while (($cat = readdir($dh)) !== false)
-				{
-					if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
-					{
-						if ($ch = @opendir("$path/$cat"))
-						{
-							while (($image = readdir($ch)) !== false)
-							{
-								// Match all images in the gallery folder
-								if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
-								{
-									if (function_exists('getimagesize'))
-									{
-										$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
-									}
-									else
-									{
-										$dims = array(0, 0);
-									}
-									$avatar_list[$cat][$image] = array(
-										'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
-										'filename'  => rawurlencode($image),
-										'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
-										'width'     => $dims[0],
-										'height'    => $dims[1],
-									);
-								}
-							}
-							@closedir($ch);
-						}
-					}
-				}
-				@closedir($dh);
-			}
-
-			@ksort($avatar_list);
-
-			if ($this->cache != null)
-			{
-				$this->cache->put('av_local_list', $avatar_list);
-			}
-		}
-
-		return $avatar_list;
-	}
-}
diff --git a/phpBB/includes/avatar/driver/core/remote.php b/phpBB/includes/avatar/driver/core/remote.php
deleted file mode 100644
index 8b315b80a8..0000000000
--- a/phpBB/includes/avatar/driver/core/remote.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
-*
-* @package avatar
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars hosted remotely
-* @package avatars
-*/
-class phpbb_avatar_driver_core_remote extends phpbb_avatar_driver
-{
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row, $ignore_config = false)
-	{
-		if ($ignore_config || $this->config['allow_avatar_remote'])
-		{
-			return array(
-				'src' => $row['avatar'],
-				'width' => $row['avatar_width'],
-				'height' => $row['avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($template, $row, &$error)
-	{
-		$template->assign_vars(array(
-			'AV_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
-			'AV_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
-			'AV_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '',
-		));
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($template, $row, &$error)
-	{
-		$url = $this->request->variable('av_remote_url', '');
-		$width = $this->request->variable('av_remote_width', 0);
-		$height = $this->request->variable('av_remote_height', 0);
-
-		if (!preg_match('#^(http|https|ftp)://#i', $url))
-		{
-			$url = 'http://' . $url;
-		}
-
-		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx);
-
-		$error = array_merge($error, validate_data(array(
-			'url' => $url,
-		), array(
-			'url' => array('string', true, 5, 255),
-		)));
-
-		if (!empty($error))
-		{
-			return false;
-		}
-
-		// Check if this url looks alright
-		// This isn't perfect, but it's what phpBB 3.0 did, and might as well make sure everything is compatible
-		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $url))
-		{
-			$error[] = 'AVATAR_URL_INVALID';
-			return false;
-		}
-
-		// Make sure getimagesize works...
-		if (function_exists('getimagesize'))
-		{
-			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
-			{
-				$error[] = 'UNABLE_GET_IMAGE_SIZE';
-				return false;
-			}
-
-			if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
-			{
-				$error[] = 'AVATAR_NO_SIZE';
-				return false;
-			}
-
-			$width = ($width && $height) ? $width : $image_data[0];
-			$height = ($width && $height) ? $height : $image_data[1];
-		}
-
-		if ($width <= 0 || $height <= 0)
-		{
-			$error[] = 'AVATAR_NO_SIZE';
-			return false;
-		}
-
-		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->phpEx);
-		$types = fileupload::image_types();
-		$extension = strtolower(filespec::get_extension($url));
-
-		if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
-		{
-			if (!isset($types[$image_data[2]]))
-			{
-				$error[] = 'UNABLE_GET_IMAGE_SIZE';
-			}
-			else
-			{
-				$error[] = array('IMAGE_FILETYPE_MISMATCH', $types[$image_data[2]][0], $extension);
-			}
-
-			return false;
-		}
-
-		if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
-		{
-			if ($width > $this->config['avatar_max_width'] || $height > $this->config['avatar_max_height'])
-			{
-				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
-				return false;
-			}
-		}
-
-		if ($this->config['avatar_min_width'] || $this->config['avatar_min_height'])
-		{
-			if ($width < $this->config['avatar_min_width'] || $height < $this->config['avatar_min_height'])
-			{
-				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
-				return false;
-			}
-		}
-
-		return array(
-			'avatar' => $url,
-			'avatar_width' => $width,
-			'avatar_height' => $height,
-		);
-	}
-}
diff --git a/phpBB/includes/avatar/driver/core/upload.php b/phpBB/includes/avatar/driver/core/upload.php
deleted file mode 100644
index 1ad1133bff..0000000000
--- a/phpBB/includes/avatar/driver/core/upload.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
-*
-* @package avatar
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars uploaded to the board
-* @package avatars
-*/
-class phpbb_avatar_driver_core_upload extends phpbb_avatar_driver
-{
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row, $ignore_config = false)
-	{
-		if ($ignore_config || $this->config['allow_avatar_upload'])
-		{
-			return array(
-				'src' => $this->phpbb_root_path . 'download/file.' . $this->phpEx . '?avatar=' . $row['avatar'],
-				'width' => $row['avatar_width'],
-				'height' => $row['avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($template, $row, &$error)
-	{
-		if (!$this->can_upload())
-		{
-			return false;
-		}
-
-		$template->assign_vars(array(
-			'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
-			'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
-		));
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($template, $row, &$error)
-	{
-		if (!$this->can_upload())
-		{
-			return false;
-		}
-
-		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->phpEx);
-
-		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
-
-		$url = $this->request->variable('av_upload_url', '');
-
-		if (!empty($_FILES['av_upload_file']['name']))
-		{
-			$file = $upload->form_upload('av_upload_file');
-		}
-		else
-		{
-			$file = $upload->remote_upload($url);
-		}
-
-		$prefix = $this->config['avatar_salt'] . '_';
-		$file->clean_filename('avatar', $prefix, $row['id']);
-
-		$destination = $this->config['avatar_path'];
-
-		// Adjust destination path (no trailing slash)
-		if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
-		{
-			$destination = substr($destination, 0, -1);
-		}
-
-		$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
-		if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
-		{
-			$destination = '';
-		}
-
-		// Move file and overwrite any existing image
-		$file->move_file($destination, true);
-
-		if (sizeof($file->error))
-		{
-			$file->remove();
-			$error = array_merge($error, $file->error);
-			return false;
-		}
-
-		return array(
-			'avatar' => $row['id'] . '_' . time() . '.' . $file->get('extension'),
-			'avatar_width' => $file->get('width'),
-			'avatar_height' => $file->get('height'),
-		);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function delete($row)
-	{
-		$ext = substr(strrchr($row['avatar'], '.'), 1);
-		$filename = $this->phpbb_root_path . $this->config['avatar_path'] . '/' . $this->config['avatar_salt'] . '_' . $row['id'] . '.' . $ext;
-
-		if (file_exists($filename))
-		{
-			@unlink($filename);
-		}
-
-		return true;
-	}
-
-	/**
-	* @TODO
-	*/
-	private function can_upload()
-	{
-		return (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on'));
-	}
-}
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index cce0a8db0f..9a213ce730 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -147,7 +147,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	**/
 	public function is_enabled()
 	{
-		$driver = preg_replace('#^phpbb_avatar_driver_core_#', '', get_class($this));
+		$driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this));
 
 		return $this->config["allow_avatar_$driver"];
 	}
@@ -157,7 +157,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	**/
 	public function get_template_name()
 	{
-		$driver = preg_replace('#^phpbb_avatar_driver_core_#', '', get_class($this));
+		$driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this));
 		$template = "ucp_avatar_options_$driver.html";
 
 		return $template;
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
new file mode 100644
index 0000000000..0ac7d71bef
--- /dev/null
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -0,0 +1,140 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars hosted at gravatar.com
+* @package avatars
+*/
+// @todo: rename classes to phpbb_ext_foo_avatar_driver_foo and similar
+class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
+{
+	/**
+	* We'll need to create a different type of avatar for gravatar
+	*/
+	public $custom_html = true;
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_data($row, $ignore_config = false)
+	{
+		// @todo: add allow_avatar_gravatar to database_update.php etc.
+		if ($ignore_config || $this->config['allow_avatar_gravatar'])
+		{
+			return array(
+				'src' => $row['avatar'],
+				'width' => $row['avatar_width'],
+				'height' => $row['avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+	
+	/**
+	* @inheritdoc
+	*/
+	public function get_custom_html($row, $ignore_config = false, $alt = '')
+	{
+		$html = '<img src="http://www.gravatar.com/avatar/' . md5(strtolower(trim($row['avatar']))) .  
+			(($row['avatar_width'] || $row['avatar_height']) ? ('?s=' . max($row['avatar_width'], $row['avatar_height'])) : '') . '" ' .
+			($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') .
+			($row['avatar_height'] ? ('height="' . $row['avatar_height'] . '" ') : '') .
+			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
+		return $html;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function prepare_form($template, $row, &$error)
+	{
+		$template->assign_vars(array(
+			'AV_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
+			'AV_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
+			'AV_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
+		));
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function process_form($template, $row, &$error)
+	{
+		$email = $this->request->variable('av_gravatar_email', '');
+		$width = $this->request->variable('av_gravatar_width', 0);
+		$height = $this->request->variable('av_gravatar_height', 0);
+
+		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx);
+
+		$error = array_merge($error, validate_data(array(
+			'email' => $email,
+		), array(
+			'email' => array(
+				array('string', false, 6, 60),
+				array('email')),
+		)));
+
+		if (!empty($error))
+		{
+			return false;
+		}
+
+		// Make sure getimagesize works...
+		if (function_exists('getimagesize'))
+		{
+			// build URL
+			// @todo: add https support
+			$url = 'http://www.gravatar.com/avatar/' . md5(strtolower(trim($email)));
+
+			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
+			{
+				$error[] = 'UNABLE_GET_IMAGE_SIZE';
+				return false;
+			}
+
+			if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
+			{
+				$error[] = 'AVATAR_NO_SIZE';
+				return false;
+			}
+
+			$width = ($width && $height) ? $width : $image_data[0];
+			$height = ($width && $height) ? $height : $image_data[1];
+		}
+
+		if ($width <= 0 || $height <= 0)
+		{
+			$error[] = 'AVATAR_NO_SIZE';
+			return false;
+		}
+
+		return array(
+			'avatar' => $email,
+			'avatar_width' => $width,
+			'avatar_height' => $height,
+		);
+	}
+}
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
new file mode 100644
index 0000000000..e4648381c2
--- /dev/null
+++ b/phpBB/includes/avatar/driver/local.php
@@ -0,0 +1,190 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars selected from the board gallery
+* @package avatars
+*/
+class phpbb_avatar_driver_local extends phpbb_avatar_driver
+{
+	/**
+	* @inheritdoc
+	*/
+	public function get_data($row, $ignore_config = false)
+	{
+		if ($ignore_config || $this->config['allow_avatar_local'])
+		{
+			return array(
+				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
+				'width' => $row['avatar_width'],
+				'height' => $row['avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function prepare_form($template, $row, &$error)
+	{
+		$avatar_list = $this->get_avatar_list();
+		$category = $this->request->variable('av_local_cat', '');
+
+		$categories = array_keys($avatar_list);
+
+		foreach ($categories as $cat)
+		{
+			if (!empty($avatar_list[$cat]))
+			{
+				$template->assign_block_vars('av_local_cats', array(
+					'NAME' => $cat,
+					'SELECTED' => ($cat == $category),
+				));
+			}
+		}
+
+		if (!empty($avatar_list[$category]))
+		{
+			$template->assign_vars(array(
+				'AV_LOCAL_SHOW' => true,
+			));
+
+			$table_cols = isset($row['av_gallery_cols']) ? $row['av_gallery_cols'] : 4;
+			$row_count = $col_count = $av_pos = 0;
+			$av_count = sizeof($avatar_list[$category]);
+
+			reset($avatar_list[$category]);
+
+			while ($av_pos < $av_count)
+			{
+				$img = current($avatar_list[$category]);
+				next($avatar_list[$category]);
+
+				if ($col_count == 0)
+				{
+					++$row_count;
+					$template->assign_block_vars('av_local_row', array(
+					));
+				}
+
+				$template->assign_block_vars('av_local_row.av_local_col', array(
+					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
+					'AVATAR_NAME' => $img['name'],
+					'AVATAR_FILE' => $img['filename'],
+				));
+
+				$col_count = ($col_count + 1) % $table_cols;
+
+				++$av_pos;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function process_form($template, $row, &$error)
+	{
+		$avatar_list = $this->get_avatar_list();
+		$category = $this->request->variable('av_local_cat', '');
+
+		$file = $this->request->variable('av_local_file', '');
+		if (!isset($avatar_list[$category][urldecode($file)]))
+		{
+			$error[] = 'AVATAR_URL_NOT_FOUND';
+			return false;
+		}
+
+		return array(
+			'avatar' => $category . '/' . $file,
+			'avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
+			'avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
+		);
+	}
+
+	/**
+	* @TODO
+	*/
+	private function get_avatar_list()
+	{
+		$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list');
+
+		if (!$avatar_list)
+		{
+			$avatar_list = array();
+			$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
+
+			$dh = @opendir($path);
+
+			if ($dh)
+			{
+				while (($cat = readdir($dh)) !== false)
+				{
+					if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
+					{
+						if ($ch = @opendir("$path/$cat"))
+						{
+							while (($image = readdir($ch)) !== false)
+							{
+								// Match all images in the gallery folder
+								if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
+								{
+									if (function_exists('getimagesize'))
+									{
+										$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
+									}
+									else
+									{
+										$dims = array(0, 0);
+									}
+									$avatar_list[$cat][$image] = array(
+										'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
+										'filename'  => rawurlencode($image),
+										'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
+										'width'     => $dims[0],
+										'height'    => $dims[1],
+									);
+								}
+							}
+							@closedir($ch);
+						}
+					}
+				}
+				@closedir($dh);
+			}
+
+			@ksort($avatar_list);
+
+			if ($this->cache != null)
+			{
+				$this->cache->put('av_local_list', $avatar_list);
+			}
+		}
+
+		return $avatar_list;
+	}
+}
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
new file mode 100644
index 0000000000..fbe158d200
--- /dev/null
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -0,0 +1,163 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars hosted remotely
+* @package avatars
+*/
+class phpbb_avatar_driver_remote extends phpbb_avatar_driver
+{
+	/**
+	* @inheritdoc
+	*/
+	public function get_data($row, $ignore_config = false)
+	{
+		if ($ignore_config || $this->config['allow_avatar_remote'])
+		{
+			return array(
+				'src' => $row['avatar'],
+				'width' => $row['avatar_width'],
+				'height' => $row['avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function prepare_form($template, $row, &$error)
+	{
+		$template->assign_vars(array(
+			'AV_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
+			'AV_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
+			'AV_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '',
+		));
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function process_form($template, $row, &$error)
+	{
+		$url = $this->request->variable('av_remote_url', '');
+		$width = $this->request->variable('av_remote_width', 0);
+		$height = $this->request->variable('av_remote_height', 0);
+
+		if (!preg_match('#^(http|https|ftp)://#i', $url))
+		{
+			$url = 'http://' . $url;
+		}
+
+		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx);
+
+		$error = array_merge($error, validate_data(array(
+			'url' => $url,
+		), array(
+			'url' => array('string', true, 5, 255),
+		)));
+
+		if (!empty($error))
+		{
+			return false;
+		}
+
+		// Check if this url looks alright
+		// This isn't perfect, but it's what phpBB 3.0 did, and might as well make sure everything is compatible
+		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $url))
+		{
+			$error[] = 'AVATAR_URL_INVALID';
+			return false;
+		}
+
+		// Make sure getimagesize works...
+		if (function_exists('getimagesize'))
+		{
+			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
+			{
+				$error[] = 'UNABLE_GET_IMAGE_SIZE';
+				return false;
+			}
+
+			if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
+			{
+				$error[] = 'AVATAR_NO_SIZE';
+				return false;
+			}
+
+			$width = ($width && $height) ? $width : $image_data[0];
+			$height = ($width && $height) ? $height : $image_data[1];
+		}
+
+		if ($width <= 0 || $height <= 0)
+		{
+			$error[] = 'AVATAR_NO_SIZE';
+			return false;
+		}
+
+		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->phpEx);
+		$types = fileupload::image_types();
+		$extension = strtolower(filespec::get_extension($url));
+
+		if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
+		{
+			if (!isset($types[$image_data[2]]))
+			{
+				$error[] = 'UNABLE_GET_IMAGE_SIZE';
+			}
+			else
+			{
+				$error[] = array('IMAGE_FILETYPE_MISMATCH', $types[$image_data[2]][0], $extension);
+			}
+
+			return false;
+		}
+
+		if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
+		{
+			if ($width > $this->config['avatar_max_width'] || $height > $this->config['avatar_max_height'])
+			{
+				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
+				return false;
+			}
+		}
+
+		if ($this->config['avatar_min_width'] || $this->config['avatar_min_height'])
+		{
+			if ($width < $this->config['avatar_min_width'] || $height < $this->config['avatar_min_height'])
+			{
+				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
+				return false;
+			}
+		}
+
+		return array(
+			'avatar' => $url,
+			'avatar_width' => $width,
+			'avatar_height' => $height,
+		);
+	}
+}
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
new file mode 100644
index 0000000000..a86cc44d2f
--- /dev/null
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -0,0 +1,147 @@
+<?php
+/**
+*
+* @package avatar
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Handles avatars uploaded to the board
+* @package avatars
+*/
+class phpbb_avatar_driver_upload extends phpbb_avatar_driver
+{
+	/**
+	* @inheritdoc
+	*/
+	public function get_data($row, $ignore_config = false)
+	{
+		if ($ignore_config || $this->config['allow_avatar_upload'])
+		{
+			return array(
+				'src' => $this->phpbb_root_path . 'download/file.' . $this->phpEx . '?avatar=' . $row['avatar'],
+				'width' => $row['avatar_width'],
+				'height' => $row['avatar_height'],
+			);
+		}
+		else
+		{
+			return array(
+				'src' => '',
+				'width' => 0,
+				'height' => 0,
+			);
+		}
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function prepare_form($template, $row, &$error)
+	{
+		if (!$this->can_upload())
+		{
+			return false;
+		}
+
+		$template->assign_vars(array(
+			'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
+			'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
+		));
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function process_form($template, $row, &$error)
+	{
+		if (!$this->can_upload())
+		{
+			return false;
+		}
+
+		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->phpEx);
+
+		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
+
+		$url = $this->request->variable('av_upload_url', '');
+
+		if (!empty($_FILES['av_upload_file']['name']))
+		{
+			$file = $upload->form_upload('av_upload_file');
+		}
+		else
+		{
+			$file = $upload->remote_upload($url);
+		}
+
+		$prefix = $this->config['avatar_salt'] . '_';
+		$file->clean_filename('avatar', $prefix, $row['id']);
+
+		$destination = $this->config['avatar_path'];
+
+		// Adjust destination path (no trailing slash)
+		if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
+		{
+			$destination = substr($destination, 0, -1);
+		}
+
+		$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
+		if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
+		{
+			$destination = '';
+		}
+
+		// Move file and overwrite any existing image
+		$file->move_file($destination, true);
+
+		if (sizeof($file->error))
+		{
+			$file->remove();
+			$error = array_merge($error, $file->error);
+			return false;
+		}
+
+		return array(
+			'avatar' => $row['id'] . '_' . time() . '.' . $file->get('extension'),
+			'avatar_width' => $file->get('width'),
+			'avatar_height' => $file->get('height'),
+		);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function delete($row)
+	{
+		$ext = substr(strrchr($row['avatar'], '.'), 1);
+		$filename = $this->phpbb_root_path . $this->config['avatar_path'] . '/' . $this->config['avatar_salt'] . '_' . $row['id'] . '.' . $ext;
+
+		if (file_exists($filename))
+		{
+			@unlink($filename);
+		}
+
+		return true;
+	}
+
+	/**
+	* @TODO
+	*/
+	private function can_upload()
+	{
+		return (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on'));
+	}
+}
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 4256188f0a..546cdcdc05 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -57,13 +57,13 @@ class phpbb_avatar_manager
 		switch ($avatar_type)
 		{
 			case AVATAR_GALLERY:
-				$avatar_type = 'avatar.driver.core.local';
+				$avatar_type = 'avatar.driver.local';
 				break;
 			case AVATAR_UPLOAD:
-				$avatar_type = 'avatar.driver.core.upload';
+				$avatar_type = 'avatar.driver.upload';
 				break;
 			case AVATAR_REMOTE:
-				$avatar_type = 'avatar.driver.core.remote';
+				$avatar_type = 'avatar.driver.remote';
 				break;
 		}
 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index afa8c99b34..b0d4946bd4 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -564,7 +564,7 @@ class ucp_profile
 						if (check_form_key('ucp_avatar'))
 						{
 							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
-							$config_name = preg_replace('#^avatar.driver.core.#', '', $driver);
+							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
 							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"])
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
-- 
cgit v1.2.1


From 517d3f56ac72a686522e5eb0685952c44e889b79 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 16 Nov 2012 17:39:32 +0100
Subject: [feature/avatars] Use correct names of input fields

The name of the avatar input fields seem to have been copied from the local
avatar (gallery avatar). Since the input fields have different names in
the template files of the remote and gravatar avatars this will not
properly default to the entered values.
Additionally, the focused driver wasn't correctly filtered causing use to
always default to no avatar.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/gravatar.php | 4 ++--
 phpBB/includes/avatar/driver/remote.php   | 4 ++--
 phpBB/includes/ucp/ucp_profile.php        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 0ac7d71bef..b07af59366 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -70,8 +70,8 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	public function prepare_form($template, $row, &$error)
 	{
 		$template->assign_vars(array(
-			'AV_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
-			'AV_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
+			'AV_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_gravatar_width', 0),
+			'AV_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_gravatar_width', 0),
 			'AV_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
 		));
 
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index fbe158d200..3c06209352 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -50,8 +50,8 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	public function prepare_form($template, $row, &$error)
 	{
 		$template->assign_vars(array(
-			'AV_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_local_width', 0),
-			'AV_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_local_width', 0),
+			'AV_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_remote_width', 0),
+			'AV_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_remote_width', 0),
 			'AV_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '',
 		));
 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index b0d4946bd4..40b8f5271d 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -623,7 +623,7 @@ class ucp_profile
 						}
 					}
 
-					$focused_driver = request_var('avatar_driver', $user->data['user_avatar_type']);
+					$focused_driver = str_replace('_', '.', request_var('avatar_driver', $user->data['user_avatar_type']));
 
 					foreach ($avatar_drivers as $driver)
 					{
-- 
cgit v1.2.1


From ca30135391ef6b6c8149b7bb41aa840cf27d0a01 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 16 Nov 2012 22:59:29 +0100
Subject: [feature/avatars] Add gravatar to avatar settings

PHPBB3-10018
---
 phpBB/includes/acp/acp_board.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 322e1c55d8..4ad0b38708 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -118,6 +118,7 @@ class acp_board
 						'avatar_max_height'		=> array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false),
 
 						'allow_avatar'			=> array('lang' => 'ALLOW_AVATARS',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'allow_avatar_gravatar'	=> array('lang' => 'ALLOW_GRAVATAR',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
 						'allow_avatar_local'	=> array('lang' => 'ALLOW_LOCAL',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
 						'allow_avatar_remote'	=> array('lang' => 'ALLOW_REMOTE',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'allow_avatar_upload'	=> array('lang' => 'ALLOW_UPLOAD',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-- 
cgit v1.2.1


From ac7c3d2b8d6d2701cf01858b4d483d0d22d54864 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 16 Nov 2012 23:04:09 +0100
Subject: [feature/avatars] Check for gravatar when checking the avatar
 module_auth

PHPBB3-10018
---
 phpBB/includes/ucp/info/ucp_profile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/info/ucp_profile.php b/phpBB/includes/ucp/info/ucp_profile.php
index 201216e9fd..a0f9598e93 100644
--- a/phpBB/includes/ucp/info/ucp_profile.php
+++ b/phpBB/includes/ucp/info/ucp_profile.php
@@ -21,7 +21,7 @@ class ucp_profile_info
 			'modes'		=> array(
 				'profile_info'	=> array('title' => 'UCP_PROFILE_PROFILE_INFO', 'auth' => '', 'cat' => array('UCP_PROFILE')),
 				'signature'		=> array('title' => 'UCP_PROFILE_SIGNATURE', 'auth' => 'acl_u_sig', 'cat' => array('UCP_PROFILE')),
-				'avatar'		=> array('title' => 'UCP_PROFILE_AVATAR', 'auth' => 'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)', 'cat' => array('UCP_PROFILE')),
+				'avatar'		=> array('title' => 'UCP_PROFILE_AVATAR', 'auth' => 'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload || cfg_allow_avatar_gravatar)', 'cat' => array('UCP_PROFILE')),
 				'reg_details'	=> array('title' => 'UCP_PROFILE_REG_DETAILS', 'auth' => '', 'cat' => array('UCP_PROFILE')),
 				'autologin_keys'=> array('title' => 'UCP_PROFILE_AUTOLOGIN_KEYS', 'auth' => '', 'cat' => array('UCP_PROFILE')),
 			),
-- 
cgit v1.2.1


From 5bc0f4b3d49ed1bea45464beece42906646eb026 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 17 Nov 2012 00:24:32 +0100
Subject: [ticket/11015] Move db driver class name fixing to function

PHPBB3-11015
---
 phpBB/includes/di/extension/config.php         | 18 +-----------------
 phpBB/includes/functions.php                   | 16 ++++++++++++++++
 phpBB/includes/questionnaire/questionnaire.php |  2 ++
 3 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/di/extension/config.php b/phpBB/includes/di/extension/config.php
index 85ab7ab28d..97a6290066 100644
--- a/phpBB/includes/di/extension/config.php
+++ b/phpBB/includes/di/extension/config.php
@@ -44,7 +44,7 @@ class phpbb_di_extension_config extends Extension
 
 		$container->setParameter('core.table_prefix', $table_prefix);
 		$container->setParameter('cache.driver.class', $this->convert_30_acm_type($acm_type));
-		$container->setParameter('dbal.driver.class', $this->convert_30_dbms($dbms));
+		$container->setParameter('dbal.driver.class', phpbb_convert_30_dbms_to_31($dbms));
 		$container->setParameter('dbal.dbhost', $dbhost);
 		$container->setParameter('dbal.dbuser', $dbuser);
 		$container->setParameter('dbal.dbpasswd', $dbpasswd);
@@ -80,20 +80,4 @@ class phpbb_di_extension_config extends Extension
 
 		return $acm_type;
 	}
-
-	/**
-	* Convert 3.0 dbms to 3.1 db driver class name
-	*
-	* @param string $dbms dbms parameter
-	* @return db driver class
-	*/
-	protected function convert_30_dbms($dbms)
-	{
-		if (!preg_match('#^phpbb_db_driver_#', $dbms))
-		{
-			return 'phpbb_db_driver_'.$dbms;
-		}
-
-		return $dbms;
-	}
 }
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 804d89d1a2..045a28672b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5412,3 +5412,19 @@ function phpbb_to_numeric($input)
 {
 	return ($input > PHP_INT_MAX) ? (float) $input : (int) $input;
 }
+
+/**
+* Convert 3.0 dbms to 3.1 db driver class name
+*
+* @param string $dbms dbms parameter
+* @return db driver class
+*/
+function phpbb_convert_30_dbms_to_31($dbms)
+{
+	if (!preg_match('#^phpbb_db_driver_#', $dbms))
+	{
+		return 'phpbb_db_driver_'.$dbms;
+	}
+
+	return $dbms;
+}
diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php
index f0fb8c3c06..6bbedacbe2 100644
--- a/phpBB/includes/questionnaire/questionnaire.php
+++ b/phpBB/includes/questionnaire/questionnaire.php
@@ -260,6 +260,8 @@ class phpbb_questionnaire_phpbb_data_provider
 		include("{$phpbb_root_path}config.$phpEx");
 		unset($dbhost, $dbport, $dbname, $dbuser, $dbpasswd); // Just a precaution
 
+		$dbms = phpbb_convert_30_dbms_to_31($dbms);
+
 		// Only send certain config vars
 		$config_vars = array(
 			'active_sessions' => true,
-- 
cgit v1.2.1


From c70cbfac4339529e196934405d0eb2f9672121d5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 17 Nov 2012 00:50:23 +0100
Subject: [feature/avatars] Fix acp front-end of user and group avatars

Due to the changes to the avatar manager etc. these had to be updated.

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php  | 37 ++++++++++++++++++-------------------
 phpBB/includes/acp/acp_users.php   | 26 +++++++++++++++-----------
 phpBB/includes/ucp/ucp_profile.php |  2 +-
 3 files changed, 34 insertions(+), 31 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 656bf1546e..7be58b6df1 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -333,26 +333,23 @@ class acp_groups
 					if ($config['allow_avatar'])
 					{
 						// Handle avatar
-						$driver = request_var('avatar_driver', '');
-						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
+						$driver = str_replace('_', '.', request_var('avatar_driver', ''));
+						$config_name = preg_replace('#^avatar.driver.#', '', $driver);
+						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"])
 						{
 							$avatar = $phpbb_avatar_manager->get_driver($driver);
 							$result = $avatar->process_form($template, $avatar_data, $avatar_error);
 
 							if ($result && empty($avatar_error))
 							{
-								// Success! Lets save the result
-								
-								/*
 								$result = array(
-									'avatar' => ...,
-									'avatar_width' => ...,
-									'avatar_height' => ...,
+									'avatar_type'		=> $driver,
+									'avatar' 			=> $result['avatar'],
+									'avatar_width' 	=> $result['avatar_width'],
+									'avatar_height' 	=> $result['avatar_height'],
 								);
-								*/
 								
 								$submit_ary = array_merge($submit_ary, $result);
-								$submit_ary['avatar_type'] = $driver;
 							}
 						}
 						else
@@ -522,27 +519,29 @@ class acp_groups
 				if ($config['allow_avatar'])
 				{
 					$avatars_enabled = false;
-					$focused_driver = request_var('avatar_driver', $avatar_data['avatar_type']);
+					$focused_driver = str_replace('_', '.', request_var('avatar_driver', $avatar_data['avatar_type']));
 
 					foreach ($avatar_drivers as $driver)
 					{
-						if ($config["allow_avatar_$driver"])
+						$avatar = $phpbb_avatar_manager->get_driver($driver);
+
+						if ($avatar->is_enabled())
 						{
 							$avatars_enabled = true;
+							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
 							$template->set_filenames(array(
-								'avatar' => "acp_avatar_options_$driver.html",
+								'avatar' => "acp_avatar_options_$config_name.html",
 							));
 
-							$avatar = $phpbb_avatar_manager->get_driver($driver);
-
 							if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
 							{
-								$driver_u = strtoupper($driver);
+								$driver_n = str_replace('.', '_', $driver);
+								$driver_u = strtoupper($driver_n);
 								$template->assign_block_vars('avatar_drivers', array(
-									'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values
-									'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
+									'L_TITLE' => $user->lang($driver_u . '_TITLE'),
+									'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
 
-									'DRIVER' => $driver,
+									'DRIVER' => $driver_n,
 									'SELECTED' => ($driver == $focused_driver),
 									'OUTPUT' => $template->assign_display('avatar'),
 								));
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 83c19b3ba6..562353b229 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1744,8 +1744,9 @@ class acp_users
 					{
 						if (check_form_key($form_name))
 						{
-							$driver = request_var('avatar_driver', '');
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$driver"])
+							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
+							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"])
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);
@@ -1791,27 +1792,30 @@ class acp_users
 						}
 					}
 
-					$focused_driver = request_var('avatar_driver', $user_row['user_avatar_type']);
+					$focused_driver = str_replace('_', '.', request_var('avatar_driver', $user_row['user_avatar_type']));
 
 					foreach ($avatar_drivers as $driver)
 					{
-						if ($config["allow_avatar_$driver"])
+						$avatar = $phpbb_avatar_manager->get_driver($driver);
+
+						if ($avatar->is_enabled())
 						{
 							$avatars_enabled = true;
+							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
 							$template->set_filenames(array(
-								'avatar' => "acp_avatar_options_$driver.html",
+								'avatar' => "acp_avatar_options_$config_name.html",
 							));
 
-							$avatar = $phpbb_avatar_manager->get_driver($driver);
-
 							if ($avatar->prepare_form($template, $avatar_data, $error))
 							{
-								$driver_u = strtoupper($driver);
+								$driver_n = str_replace('.', '_', $driver);
+								$driver_u = strtoupper($driver_n);
+
 								$template->assign_block_vars('avatar_drivers', array(
-									'L_TITLE' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_TITLE'), // @TODO add lang values
-									'L_EXPLAIN' => $user->lang('AVATAR_DRIVER_' . $driver_u . '_EXPLAIN'),
+									'L_TITLE' => $user->lang($driver_u . '_TITLE'),
+									'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
 
-									'DRIVER' => $driver,
+									'DRIVER' => $driver_n,
 									'SELECTED' => ($driver == $focused_driver),
 									'OUTPUT' => $template->assign_display('avatar'),
 								));
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 40b8f5271d..6a1ad33ceb 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -642,7 +642,7 @@ class ucp_profile
 								$driver_u = strtoupper($driver_n);
 
 								$template->assign_block_vars('avatar_drivers', array(
-									'L_TITLE' => $user->lang($driver_u . '_TITLE'), // @TODO add lang values
+									'L_TITLE' => $user->lang($driver_u . '_TITLE'),
 									'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
 
 									'DRIVER' => $driver_n,
-- 
cgit v1.2.1


From 0372ecf14141ba2c174782f29d4fb079b4dd56c3 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 17 Nov 2012 01:40:32 +0100
Subject: [ticket/11015] Make phpbb_convert_30_dbms_to_31 more future proof

It should allow any class name in the future, as long as that class
exists. And it should give a useful error message otherwise.

PHPBB3-11015
---
 phpBB/includes/functions.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 045a28672b..57136a43ff 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5421,10 +5421,15 @@ function phpbb_to_numeric($input)
 */
 function phpbb_convert_30_dbms_to_31($dbms)
 {
-	if (!preg_match('#^phpbb_db_driver_#', $dbms))
+	if (class_exists($dbms))
 	{
-		return 'phpbb_db_driver_'.$dbms;
+		return $dbms;
 	}
 
-	return $dbms;
+	if (class_exists('phpbb_db_driver_' . $dbms))
+	{
+		return 'phpbb_db_driver_' . $dbms;
+	}
+
+	throw new \RuntimeException('You have specified an invalid dbms driver.');
 }
-- 
cgit v1.2.1


From 0a8d1220a39266d3805590fe2067934adc257c95 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 17 Nov 2012 13:53:24 +0100
Subject: [feature/avatars] Small fixes after transition to service containers

PHPBB3-10018
---
 phpBB/includes/avatar/driver/upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index a86cc44d2f..0d551efa07 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -29,7 +29,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 		if ($ignore_config || $this->config['allow_avatar_upload'])
 		{
 			return array(
-				'src' => $this->phpbb_root_path . 'download/file.' . $this->phpEx . '?avatar=' . $row['avatar'],
+				'src' => $this->phpbb_root_path . 'download/file' . $this->phpEx . '?avatar=' . $row['avatar'],
 				'width' => $row['avatar_width'],
 				'height' => $row['avatar_height'],
 			);
-- 
cgit v1.2.1


From 072615dc6e6c1ccc47e43957c24ec211e7ca971e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 17 Nov 2012 13:55:47 +0100
Subject: [feature/avatars] Use request class in upload avatar

PHPBB3-10018
---
 phpBB/includes/avatar/driver/upload.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 0d551efa07..8f044ca37f 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -77,8 +77,9 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
 		$url = $this->request->variable('av_upload_url', '');
+		$upload_file = $this->request->file('av_upload_file');
 
-		if (!empty($_FILES['av_upload_file']['name']))
+		if (!empty($upload_file['name']))
 		{
 			$file = $upload->form_upload('av_upload_file');
 		}
-- 
cgit v1.2.1


From ed548ae8ff0e87035c0c173d40212a96fa642135 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 23 Apr 2011 16:43:55 -0400
Subject: [feature/template-events] Outline for RUNHOOKS template tag.

Ported to the new develop, hopefully this is still sensible.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 66d28242a3..fc99ba5917 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -317,6 +317,12 @@ class phpbb_template_filter extends php_user_filter
 				return '<!-- ENDPHP -->';
 			break;
 
+			case 'RUNHOOKS':
+				// return value here will be compiled code (html with embedded php).
+				// we don't want to wrap it in php tags here.
+				return '<?php ' . $this->compile_tag_run_hooks($matches[2]) . '?>';
+				break;
+
 			default:
 				return $matches[0];
 			break;
@@ -835,6 +841,27 @@ class phpbb_template_filter extends php_user_filter
 		return "\$_template->_php_include('$tag_args');";
 	}
 
+	/**
+	* Compile RUNHOOKS tag.
+	*
+	* $tag_args should be a single string identifying hook location.
+	*/
+	private function compile_tag_run_hooks($tag_args)
+	{
+		if (!preg_match('/^\w+$/', $tag_args))
+		{
+			// do something
+			var_dump($tag_args);
+		}
+		$location = $tag_args;
+		// 1. find all mods defining hooks for location
+		// 2. obtain mods' template fragments
+		// 3. compile template fragments
+		// 4. return compiled code
+		// note: need to make sure we get fragments in the right order
+		return 'echo "test";';
+	}
+
 	/**
 	* parse expression
 	* This is from Smarty
-- 
cgit v1.2.1


From d6c881d0c67de80f0b60eab6be0c1dda33296657 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 27 Nov 2011 00:46:36 -0500
Subject: [feature/template-events] Inject extension manager into template
 class.

Template class passes extension manager to template compiler.

Template compiler passes extension manager to template filter.

Template filter will use extension manager to locate hooks
as it is compiling templates.

All extension manager arguments are optional. If an extension
manager is not given, template hooks will not be invoked.

PHPBB3-9550
---
 phpBB/includes/bbcode.php              |  2 +-
 phpBB/includes/functions_messenger.php |  2 +-
 phpBB/includes/template/compile.php    |  8 +++++---
 phpBB/includes/template/filter.php     |  8 ++++++++
 phpBB/includes/template/template.php   | 13 +++++++++++--
 5 files changed, 26 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index b9ffa8091c..e8681420d4 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -134,7 +134,7 @@ class bbcode
 
 			$style_resource_locator = new phpbb_style_resource_locator();
 			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
-			$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context());
+			$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template);
 			$style->set_style();
 			$template->set_filenames(array('bbcode.html' => 'bbcode.html'));
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index cf03de08c4..55884caedb 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -210,7 +210,7 @@ class messenger
 		{
 			$style_resource_locator = new phpbb_style_resource_locator();
 			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
-			$tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context());
+			$tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $extension_manager);
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
 
 			$this->tpl_msg[$template_lang . $template_file] = $tpl;
diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/template/compile.php
index 82b301c1a2..fb7d146701 100644
--- a/phpBB/includes/template/compile.php
+++ b/phpBB/includes/template/compile.php
@@ -35,16 +35,18 @@ class phpbb_template_compile
 	/**
 	* Constructor.
 	*
-	* @param bool @allow_php Whether PHP code will be allowed in templates (inline PHP code, PHP tag and INCLUDEPHP tag)
+	* @param bool $allow_php Whether PHP code will be allowed in templates (inline PHP code, PHP tag and INCLUDEPHP tag)
 	* @param phpbb_style_resource_locator $locator Resource locator
 	* @param string $phpbb_root_path Path to phpBB root directory
+	* @param phpbb_extension_manager $extension_manager Extension manager to use for finding template fragments in extensions; if null, template hooks will not be invoked
 	*/
-	public function __construct($allow_php, $locator, $phpbb_root_path)
+	public function __construct($allow_php, $locator, $phpbb_root_path, $extension_manager = null)
 	{
 		$this->filter_params = array(
 			'allow_php'	=> $allow_php,
 			'locator'	=> $locator,
-			'phpbb_root_path'	=> $phpbb_root_path
+			'phpbb_root_path'	=> $phpbb_root_path,
+			'extension_manager'	=> $extension_manager,
 		);
 	}
 
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index fc99ba5917..911f21ef00 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -87,6 +87,13 @@ class phpbb_template_filter extends php_user_filter
 	*/
 	private $phpbb_root_path;
 
+	/**
+	* Extension manager.
+	*
+	* @var phpbb_extension_manager
+	*/
+	private $extension_manager;
+
 	/**
 	* Stream filter
 	*
@@ -148,6 +155,7 @@ class phpbb_template_filter extends php_user_filter
 		$this->allow_php = $this->params['allow_php'];
 		$this->locator = $this->params['locator'];
 		$this->phpbb_root_path = $this->params['phpbb_root_path'];
+		$this->extension_manager = $this->params['extension_manager'];
 		return true;
 	}
 
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 5396ddbfad..96a16fee77 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -74,6 +74,13 @@ class phpbb_template
 	*/
 	private $locator;
 
+	/**
+	* Extension manager.
+	*
+	* @var phpbb_extension_manager
+	*/
+	private $extension_manager;
+
 	/**
 	* Constructor.
 	*
@@ -81,8 +88,9 @@ class phpbb_template
 	* @param user $user current user
 	* @param phpbb_template_locator $locator template locator
 	* @param phpbb_template_context $context template context
+	* @param phpbb_extension_manager $extension_manager extension manager, if null then template hooks will not be invoked
 	*/
-	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_locator $locator, phpbb_template_context $context)
+	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_locator $locator, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
@@ -90,6 +98,7 @@ class phpbb_template
 		$this->user = $user;
 		$this->locator = $locator;
 		$this->context = $context;
+		$this->extension_manager = $extension_manager;
 	}
 
 	/**
@@ -282,7 +291,7 @@ class phpbb_template
 			return new phpbb_template_renderer_include($output_file, $this);
 		}
 
-		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->locator, $this->phpbb_root_path);
+		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->locator, $this->phpbb_root_path, $this->extension_manager);
 
 		if ($compile->compile_file_to_file($source_file, $output_file) !== false)
 		{
-- 
cgit v1.2.1


From 09aae1ea30b199630c3972bdc483db476bda9a7e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 3 Dec 2011 21:08:31 -0500
Subject: [feature/template-events] Inject template compile into template
 filter.

This is needed for hooks in order for the filter to compile
template files from extensions.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 911f21ef00..3d39b3b4ed 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -94,6 +94,13 @@ class phpbb_template_filter extends php_user_filter
 	*/
 	private $extension_manager;
 
+	/**
+	* Template compiler.
+	*
+	* @var phpbb_template_compile
+	*/
+	private $template_compile;
+
 	/**
 	* Stream filter
 	*
@@ -156,6 +163,7 @@ class phpbb_template_filter extends php_user_filter
 		$this->locator = $this->params['locator'];
 		$this->phpbb_root_path = $this->params['phpbb_root_path'];
 		$this->extension_manager = $this->params['extension_manager'];
+		$this->template_compile = $this->params['template_compile'];
 		return true;
 	}
 
-- 
cgit v1.2.1


From 66232031e4c69a0f5ba25699ba908946bd445967 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 27 Nov 2011 00:49:39 -0500
Subject: [feature/template-events] Really basic template hook implementation.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 3d39b3b4ed..6151983be0 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -870,6 +870,26 @@ class phpbb_template_filter extends php_user_filter
 			var_dump($tag_args);
 		}
 		$location = $tag_args;
+
+		if ($this->phpbb_extension_manager)
+		{
+			$finder = $this->phpbb_extension_manager->get_finder();
+
+			$files = $finder
+				->extension_prefix($location)
+				->extension_suffix('.html')
+				->extension_directory("/styles/universal/template")
+				->get_files();
+
+			$all_compiled = '';
+			foreach ($files as $file)
+			{
+				$compiled = $this->template_compile->compile_file($file);
+				$all_compiled .= $compiled;
+			}
+			return '?>' . $all_compiled . '<?php';
+		}
+
 		// 1. find all mods defining hooks for location
 		// 2. obtain mods' template fragments
 		// 3. compile template fragments
-- 
cgit v1.2.1


From b6f6add9d43a7f5e37b07b3ba5eeffd0fa02924c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 3 Feb 2012 02:21:37 -0500
Subject: [feature/template-events] Fix property name for extension manager.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 6151983be0..ea5b17c11a 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -871,9 +871,9 @@ class phpbb_template_filter extends php_user_filter
 		}
 		$location = $tag_args;
 
-		if ($this->phpbb_extension_manager)
+		if ($this->extension_manager)
 		{
-			$finder = $this->phpbb_extension_manager->get_finder();
+			$finder = $this->extension_manager->get_finder();
 
 			$files = $finder
 				->extension_prefix($location)
-- 
cgit v1.2.1


From ea094dd91af624c72ac41fde6073dd8918620e68 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 6 Mar 2012 19:45:13 -0500
Subject: [feature/template-events] Rename universal to all (for template
 fragments).

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index ea5b17c11a..08eb9bdd97 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -878,7 +878,7 @@ class phpbb_template_filter extends php_user_filter
 			$files = $finder
 				->extension_prefix($location)
 				->extension_suffix('.html')
-				->extension_directory("/styles/universal/template")
+				->extension_directory("/styles/all/template")
 				->get_files();
 
 			$all_compiled = '';
-- 
cgit v1.2.1


From dd7c5183fbc5401c85f530a304b70fbb0b5d7fbe Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 19 Apr 2012 00:21:54 -0400
Subject: [feature/template-events] Add template_compile to template filter
 params.

PHPBB3-9550
---
 phpBB/includes/template/compile.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/template/compile.php
index fb7d146701..b63da05394 100644
--- a/phpBB/includes/template/compile.php
+++ b/phpBB/includes/template/compile.php
@@ -47,6 +47,7 @@ class phpbb_template_compile
 			'locator'	=> $locator,
 			'phpbb_root_path'	=> $phpbb_root_path,
 			'extension_manager'	=> $extension_manager,
+			'template_compile'	=> $this,
 		);
 	}
 
-- 
cgit v1.2.1


From a6c7fbc59d02ed44ef90e340c4f957a8c5ac9ca5 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 16 Mar 2012 00:22:42 -0400
Subject: [feature/template-events] Pass top-level template name to template
 filter.

This will be used to invoke template-specific hooks.

PHPBB3-9550
---
 phpBB/includes/template/compile.php  |  4 +++-
 phpBB/includes/template/filter.php   | 13 ++++++++++++-
 phpBB/includes/template/template.php | 12 +++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/template/compile.php
index b63da05394..06ff60387a 100644
--- a/phpBB/includes/template/compile.php
+++ b/phpBB/includes/template/compile.php
@@ -36,14 +36,16 @@ class phpbb_template_compile
 	* Constructor.
 	*
 	* @param bool $allow_php Whether PHP code will be allowed in templates (inline PHP code, PHP tag and INCLUDEPHP tag)
+	* @param string $template_name Name of top-level template being compiled
 	* @param phpbb_style_resource_locator $locator Resource locator
 	* @param string $phpbb_root_path Path to phpBB root directory
 	* @param phpbb_extension_manager $extension_manager Extension manager to use for finding template fragments in extensions; if null, template hooks will not be invoked
 	*/
-	public function __construct($allow_php, $locator, $phpbb_root_path, $extension_manager = null)
+	public function __construct($allow_php, $template_name, $locator, $phpbb_root_path, $extension_manager = null)
 	{
 		$this->filter_params = array(
 			'allow_php'	=> $allow_php,
+			'template_name'	=> $template_name,
 			'locator'	=> $locator,
 			'phpbb_root_path'	=> $phpbb_root_path,
 			'extension_manager'	=> $extension_manager,
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 08eb9bdd97..eca9a0d48c 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -87,6 +87,16 @@ class phpbb_template_filter extends php_user_filter
 	*/
 	private $phpbb_root_path;
 
+	/**
+	* Name of the top-level template being compiled and/or rendered.
+	*
+	* This is used by hooks implementation to invoke template-specific
+	* template hooks.
+	*
+	* @var string
+	*/
+	private $template_name;
+
 	/**
 	* Extension manager.
 	*
@@ -152,7 +162,7 @@ class phpbb_template_filter extends php_user_filter
 	/**
 	* Initializer, called on creation.
 	*
-	* Get the allow_php option, root directory and locator from params,
+	* Get the allow_php option, template_name, root directory and locator from params,
 	* which are passed to stream_filter_append.
 	*/
 	public function onCreate()
@@ -162,6 +172,7 @@ class phpbb_template_filter extends php_user_filter
 		$this->allow_php = $this->params['allow_php'];
 		$this->locator = $this->params['locator'];
 		$this->phpbb_root_path = $this->params['phpbb_root_path'];
+		$this->template_name = $this->params['template_name'];
 		$this->extension_manager = $this->params['extension_manager'];
 		$this->template_compile = $this->params['template_compile'];
 		return true;
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 96a16fee77..c43c1ddf99 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -81,6 +81,16 @@ class phpbb_template
 	*/
 	private $extension_manager;
 
+	/**
+	* Name of the top-level template being compiled and/or rendered.
+	*
+	* This is used by hooks implementation to invoke template-specific
+	* template hooks.
+	*
+	* @var string
+	*/
+	private $template_name;
+
 	/**
 	* Constructor.
 	*
@@ -291,7 +301,7 @@ class phpbb_template
 			return new phpbb_template_renderer_include($output_file, $this);
 		}
 
-		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->locator, $this->phpbb_root_path, $this->extension_manager);
+		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->template_name, $this->locator, $this->phpbb_root_path, $this->extension_manager);
 
 		if ($compile->compile_file_to_file($source_file, $output_file) !== false)
 		{
-- 
cgit v1.2.1


From bdbb382a26efb4194e2eb1b6ee5f3913829fc9d1 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 16 Mar 2012 00:54:09 -0400
Subject: [feature/template-events] Invoke template hooks that are
 template-specific.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index eca9a0d48c..a158dd4074 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -892,6 +892,13 @@ class phpbb_template_filter extends php_user_filter
 				->extension_directory("/styles/all/template")
 				->get_files();
 
+			$files = array_merge($files, $finder
+				->extension_prefix($location)
+				->extension_suffix('.html')
+				// XXX is this safe?
+				->extension_directory("/styles/" . $this->template_name . "/template")
+				->get_files());
+
 			$all_compiled = '';
 			foreach ($files as $file)
 			{
-- 
cgit v1.2.1


From ecdb54fc048a0805f724d7a3931373f99744923a Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 16 Mar 2012 02:09:46 -0400
Subject: [feature/template-events] PHP does not parse <?php?>, avoid
 generating it.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index a158dd4074..5129618f03 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -905,7 +905,9 @@ class phpbb_template_filter extends php_user_filter
 				$compiled = $this->template_compile->compile_file($file);
 				$all_compiled .= $compiled;
 			}
-			return '?>' . $all_compiled . '<?php';
+			// Need spaces inside php tags as php cannot grok
+			// < ?php? > sans the spaces
+			return ' ?>' . $all_compiled . '<?php ';
 		}
 
 		// 1. find all mods defining hooks for location
-- 
cgit v1.2.1


From 8d58e69ed38d834a94f7dd424f29554cb672310f Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 20 Mar 2012 06:53:48 +0000
Subject: [feature/template-events] Rename RUNHOOKS to EVENT

Rename the way to add template events

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 5129618f03..2c0057b64c 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -344,10 +344,10 @@ class phpbb_template_filter extends php_user_filter
 				return '<!-- ENDPHP -->';
 			break;
 
-			case 'RUNHOOKS':
+			case 'EVENT':
 				// return value here will be compiled code (html with embedded php).
 				// we don't want to wrap it in php tags here.
-				return '<?php ' . $this->compile_tag_run_hooks($matches[2]) . '?>';
+				return '<?php ' . $this->compile_tag_event($matches[2]) . '?>';
 				break;
 
 			default:
@@ -873,7 +873,7 @@ class phpbb_template_filter extends php_user_filter
 	*
 	* $tag_args should be a single string identifying hook location.
 	*/
-	private function compile_tag_run_hooks($tag_args)
+	private function compile_tag_event($tag_args)
 	{
 		if (!preg_match('/^\w+$/', $tag_args))
 		{
-- 
cgit v1.2.1


From 04f55ba3066d4713b6189062f8a61f12ca02ea34 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 18 Oct 2012 17:21:08 -0500
Subject: [feature/template-events] Correct indentation

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 2c0057b64c..39317c6bf3 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -348,7 +348,7 @@ class phpbb_template_filter extends php_user_filter
 				// return value here will be compiled code (html with embedded php).
 				// we don't want to wrap it in php tags here.
 				return '<?php ' . $this->compile_tag_event($matches[2]) . '?>';
-				break;
+			break;
 
 			default:
 				return $matches[0];
-- 
cgit v1.2.1


From f83627763839e601db6b077e4f2f76436c263cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Thu, 19 Apr 2012 13:06:28 +0200
Subject: [feature/template-events] RUNHOOKS -> EVENT

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 39317c6bf3..f3e0f6017c 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -869,7 +869,7 @@ class phpbb_template_filter extends php_user_filter
 	}
 
 	/**
-	* Compile RUNHOOKS tag.
+	* Compile EVENT tag.
 	*
 	* $tag_args should be a single string identifying hook location.
 	*/
-- 
cgit v1.2.1


From 132bbede2b5ca5e1bbb371bdaef0bb3041c67316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Wed, 18 Apr 2012 15:35:09 +0200
Subject: [feature/template-events] Handle incorrect template event identifiers

If the template event identifier is wrongly formatted phpBB will
triggern an `E_USER_NOTICE` if the `DEBUG` constant is set, otherwise
the location is ignored.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index f3e0f6017c..50882b2855 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -877,8 +877,16 @@ class phpbb_template_filter extends php_user_filter
 	{
 		if (!preg_match('/^\w+$/', $tag_args))
 		{
-			// do something
-			var_dump($tag_args);
+			// The hook location is wrongly formatted,
+			// if the `DEBUG` constant is set then trigger a waring,
+			// otherwise drop the hook and continue
+			if (defined('DEBUG'))
+			{
+				global $user;
+				trigger_error($user->lang('ERR_TEMPLATE_EVENT_LOCATION', $tag_args), E_USER_NOTICE);
+			}
+
+			return;
 		}
 		$location = $tag_args;
 
-- 
cgit v1.2.1


From 6fc0c889fd714945613be1c51316b1386f3c88f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Thu, 19 Apr 2012 13:57:11 +0200
Subject: [feature/template-events] Remove comment

Remove comment per Nils in the PR.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 50882b2855..798cadaa2a 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -903,7 +903,6 @@ class phpbb_template_filter extends php_user_filter
 			$files = array_merge($files, $finder
 				->extension_prefix($location)
 				->extension_suffix('.html')
-				// XXX is this safe?
 				->extension_directory("/styles/" . $this->template_name . "/template")
 				->get_files());
 
-- 
cgit v1.2.1


From 2add66c0ebd49bb2f8beee538676fe34f969b33e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Thu, 19 Apr 2012 13:58:41 +0200
Subject: [feature/template-events] Add additional space for editors

Use `' ?'. '>'` rather than `' ?>'` as the latter causes problems
in some editors.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 798cadaa2a..1ec1467c09 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -914,7 +914,7 @@ class phpbb_template_filter extends php_user_filter
 			}
 			// Need spaces inside php tags as php cannot grok
 			// < ?php? > sans the spaces
-			return ' ?>' . $all_compiled . '<?php ';
+			return ' ?' . '>' . $all_compiled . '<?php ';
 		}
 
 		// 1. find all mods defining hooks for location
-- 
cgit v1.2.1


From 7bd5f7641f3be1d3f8a4ceb71508656c72718ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Thu, 19 Apr 2012 14:00:42 +0200
Subject: [feature/template-events] Fix typo (waring -> warning)

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 1ec1467c09..453e2a05ce 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -878,7 +878,7 @@ class phpbb_template_filter extends php_user_filter
 		if (!preg_match('/^\w+$/', $tag_args))
 		{
 			// The hook location is wrongly formatted,
-			// if the `DEBUG` constant is set then trigger a waring,
+			// if the `DEBUG` constant is set then trigger a warning,
 			// otherwise drop the hook and continue
 			if (defined('DEBUG'))
 			{
-- 
cgit v1.2.1


From f46f48a2cfbc923f4e4734dfd200cc6ddbfd689e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 10 May 2012 04:22:39 -0400
Subject: [feature/template-events] Chase template/style renames and changes.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index c43c1ddf99..19ee59323a 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -301,7 +301,7 @@ class phpbb_template
 			return new phpbb_template_renderer_include($output_file, $this);
 		}
 
-		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->template_name, $this->locator, $this->phpbb_root_path, $this->extension_manager);
+		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->template_name, $this->locator, $this->phpbb_root_path, $this->extension_manager, $this->user);
 
 		if ($compile->compile_file_to_file($source_file, $output_file) !== false)
 		{
-- 
cgit v1.2.1


From 45a1219886b039fbb4bda740accbfbbdbf971022 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 10 May 2012 03:53:30 -0400
Subject: [feature/template-events] Always commit suicide for invalid event
 names.

Note: suicide happens for syntactically invalid event names,
e.g. event names containing punctuation.

Event names for which there are no events are silently dropped.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 453e2a05ce..2706eb9040 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -878,15 +878,8 @@ class phpbb_template_filter extends php_user_filter
 		if (!preg_match('/^\w+$/', $tag_args))
 		{
 			// The hook location is wrongly formatted,
-			// if the `DEBUG` constant is set then trigger a warning,
-			// otherwise drop the hook and continue
-			if (defined('DEBUG'))
-			{
-				global $user;
-				trigger_error($user->lang('ERR_TEMPLATE_EVENT_LOCATION', $tag_args), E_USER_NOTICE);
-			}
-
-			return;
+			global $user;
+			trigger_error($user->lang('ERR_TEMPLATE_EVENT_LOCATION', $tag_args), E_USER_ERROR);
 		}
 		$location = $tag_args;
 
-- 
cgit v1.2.1


From 1b36fc3a6074a661a1b32c015fb9931f3470c61c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 10 May 2012 04:23:18 -0400
Subject: [feature/template-events] Handle user access correctly.

Pass through $user from template to filter.

Allow $user to be null for standalone usage of the template engine.

PHPBB3-9550
---
 phpBB/includes/template/compile.php |  4 +++-
 phpBB/includes/template/filter.php  | 20 ++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/template/compile.php
index 06ff60387a..e2e9a095dc 100644
--- a/phpBB/includes/template/compile.php
+++ b/phpBB/includes/template/compile.php
@@ -40,8 +40,9 @@ class phpbb_template_compile
 	* @param phpbb_style_resource_locator $locator Resource locator
 	* @param string $phpbb_root_path Path to phpBB root directory
 	* @param phpbb_extension_manager $extension_manager Extension manager to use for finding template fragments in extensions; if null, template hooks will not be invoked
+	* @param phpbb_user $user Current user
 	*/
-	public function __construct($allow_php, $template_name, $locator, $phpbb_root_path, $extension_manager = null)
+	public function __construct($allow_php, $template_name, $locator, $phpbb_root_path, $extension_manager = null, $user = null)
 	{
 		$this->filter_params = array(
 			'allow_php'	=> $allow_php,
@@ -49,6 +50,7 @@ class phpbb_template_compile
 			'locator'	=> $locator,
 			'phpbb_root_path'	=> $phpbb_root_path,
 			'extension_manager'	=> $extension_manager,
+			'user'          => $user,
 			'template_compile'	=> $this,
 		);
 	}
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 2706eb9040..ed81c4cd8a 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -104,6 +104,12 @@ class phpbb_template_filter extends php_user_filter
 	*/
 	private $extension_manager;
 
+	/**
+	* Current user
+	* @var phpbb_user
+	*/
+	private $user;
+
 	/**
 	* Template compiler.
 	*
@@ -174,6 +180,10 @@ class phpbb_template_filter extends php_user_filter
 		$this->phpbb_root_path = $this->params['phpbb_root_path'];
 		$this->template_name = $this->params['template_name'];
 		$this->extension_manager = $this->params['extension_manager'];
+		if (isset($this->params['user']))
+		{
+			$this->user = $this->params['user'];
+		}
 		$this->template_compile = $this->params['template_compile'];
 		return true;
 	}
@@ -878,8 +888,14 @@ class phpbb_template_filter extends php_user_filter
 		if (!preg_match('/^\w+$/', $tag_args))
 		{
 			// The hook location is wrongly formatted,
-			global $user;
-			trigger_error($user->lang('ERR_TEMPLATE_EVENT_LOCATION', $tag_args), E_USER_ERROR);
+			if ($this->user)
+			{
+				trigger_error($this->user->lang('ERR_TEMPLATE_EVENT_LOCATION', $tag_args), E_USER_ERROR);
+			}
+			else
+			{
+				trigger_error(sprintf('The specified template event location <em>[%s]</em> is wrongly formatted.', $tag_args), E_USER_ERROR);
+			}
 		}
 		$location = $tag_args;
 
-- 
cgit v1.2.1


From bd63b17d0030706e080188ab6bf3bdec8466ae82 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 10 May 2012 05:06:00 -0400
Subject: [feature/template-events] Move comment to the function docblock.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index ed81c4cd8a..9f77c4a1b7 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -266,7 +266,9 @@ class phpbb_template_filter extends php_user_filter
 	}
 
 	/**
-	* Callback for replacing matched tokens with PHP code
+	* Callback for replacing matched tokens with compiled template code.
+	*
+	* Compiled template code is an HTML stream with embedded PHP.
 	*
 	* @param array $matches Regular expression matches
 	* @return string compiled template code
@@ -355,8 +357,6 @@ class phpbb_template_filter extends php_user_filter
 			break;
 
 			case 'EVENT':
-				// return value here will be compiled code (html with embedded php).
-				// we don't want to wrap it in php tags here.
 				return '<?php ' . $this->compile_tag_event($matches[2]) . '?>';
 			break;
 
-- 
cgit v1.2.1


From faf96a1b4017c2bdceb4458c1d84959cb07da9bb Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 10 May 2012 05:11:45 -0400
Subject: [feature/template-events] Delete old comments/test code.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 9f77c4a1b7..cb0b2b0cd9 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -925,13 +925,6 @@ class phpbb_template_filter extends php_user_filter
 			// < ?php? > sans the spaces
 			return ' ?' . '>' . $all_compiled . '<?php ';
 		}
-
-		// 1. find all mods defining hooks for location
-		// 2. obtain mods' template fragments
-		// 3. compile template fragments
-		// 4. return compiled code
-		// note: need to make sure we get fragments in the right order
-		return 'echo "test";';
 	}
 
 	/**
-- 
cgit v1.2.1


From 4b28b413f2ccaa45ab354f48b0015e544dd249da Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 10 May 2012 05:23:54 -0400
Subject: [feature/template-events] Update EVENT tag documentation.

It should now fairly closely reflect what actually happens.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index cb0b2b0cd9..9f814f5c5f 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -881,7 +881,27 @@ class phpbb_template_filter extends php_user_filter
 	/**
 	* Compile EVENT tag.
 	*
-	* $tag_args should be a single string identifying hook location.
+	* $tag_args should be a single string identifying the event.
+	* The event name can contain letters, numbers and underscores only.
+	* If an invalid event name is specified, an E_USER_ERROR will be
+	* triggered.
+	*
+	* Event tags are only functional when the template engine has
+	* an instance of the extension manager. Extension manager would
+	* be called upon to find all extensions listening for the specified
+	* event, and to obtain additional template fragments. All such
+	* template fragments will be compiled and included in the generated
+	* compiled template code for the current template being compiled.
+	*
+	* The above means that whenever an extension is enabled or disabled,
+	* template cache should be cleared in order to update the compiled
+	* template code for the active set of template event listeners.
+	*
+	* This also means that extensions cannot return different template
+	* fragments at different times. Once templates are compiled, changing
+	* such template fragments would have no effect.
+	*
+	* @param string $tag_args EVENT tag arguments, as a string - for EVENT this is the event name
 	*/
 	private function compile_tag_event($tag_args)
 	{
-- 
cgit v1.2.1


From 09b4cf2f4c6df4d967f4df66f2bb29e38ee10a1d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 11 May 2012 13:38:10 -0400
Subject: [feature/template-events] Report when templates cannot be compiled.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 9f814f5c5f..385612b094 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -939,6 +939,10 @@ class phpbb_template_filter extends php_user_filter
 			foreach ($files as $file)
 			{
 				$compiled = $this->template_compile->compile_file($file);
+				if ($compiled === false)
+				{
+					trigger_error(sprintf('The file could not be compiled: %s', phpbb_filter_root_path($file)), E_USER_ERROR);
+				}
 				$all_compiled .= $compiled;
 			}
 			// Need spaces inside php tags as php cannot grok
-- 
cgit v1.2.1


From 9c31a0ffc785e30c4ff87e8d9d66e7989b55d8ef Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 11 May 2012 14:10:45 -0400
Subject: [feature/template-events] Rename template_name to style_name.

"Style name" makes a lot more sense and should be in line with
recent style/template changes.

PHPBB3-9550
---
 phpBB/includes/template/compile.php  |  6 +++---
 phpBB/includes/template/filter.php   | 20 ++++++++++----------
 phpBB/includes/template/template.php |  9 +++++----
 3 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/template/compile.php
index e2e9a095dc..c2762bfd59 100644
--- a/phpBB/includes/template/compile.php
+++ b/phpBB/includes/template/compile.php
@@ -36,17 +36,17 @@ class phpbb_template_compile
 	* Constructor.
 	*
 	* @param bool $allow_php Whether PHP code will be allowed in templates (inline PHP code, PHP tag and INCLUDEPHP tag)
-	* @param string $template_name Name of top-level template being compiled
+	* @param string $style_name Name of style to which the template being compiled belongs
 	* @param phpbb_style_resource_locator $locator Resource locator
 	* @param string $phpbb_root_path Path to phpBB root directory
 	* @param phpbb_extension_manager $extension_manager Extension manager to use for finding template fragments in extensions; if null, template hooks will not be invoked
 	* @param phpbb_user $user Current user
 	*/
-	public function __construct($allow_php, $template_name, $locator, $phpbb_root_path, $extension_manager = null, $user = null)
+	public function __construct($allow_php, $style_name, $locator, $phpbb_root_path, $extension_manager = null, $user = null)
 	{
 		$this->filter_params = array(
 			'allow_php'	=> $allow_php,
-			'template_name'	=> $template_name,
+			'style_name'	=> $style_name,
 			'locator'	=> $locator,
 			'phpbb_root_path'	=> $phpbb_root_path,
 			'extension_manager'	=> $extension_manager,
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 385612b094..a87bfaef34 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -88,14 +88,15 @@ class phpbb_template_filter extends php_user_filter
 	private $phpbb_root_path;
 
 	/**
-	* Name of the top-level template being compiled and/or rendered.
+	* Name of the style that the template being compiled and/or rendered
+        * belongs to.
 	*
-	* This is used by hooks implementation to invoke template-specific
+	* This is used by hooks implementation to invoke style-specific
 	* template hooks.
 	*
 	* @var string
 	*/
-	private $template_name;
+	private $style_name;
 
 	/**
 	* Extension manager.
@@ -168,7 +169,7 @@ class phpbb_template_filter extends php_user_filter
 	/**
 	* Initializer, called on creation.
 	*
-	* Get the allow_php option, template_name, root directory and locator from params,
+	* Get the allow_php option, style_name, root directory and locator from params,
 	* which are passed to stream_filter_append.
 	*/
 	public function onCreate()
@@ -178,7 +179,7 @@ class phpbb_template_filter extends php_user_filter
 		$this->allow_php = $this->params['allow_php'];
 		$this->locator = $this->params['locator'];
 		$this->phpbb_root_path = $this->params['phpbb_root_path'];
-		$this->template_name = $this->params['template_name'];
+		$this->style_name = $this->params['style_name'];
 		$this->extension_manager = $this->params['extension_manager'];
 		if (isset($this->params['user']))
 		{
@@ -932,17 +933,16 @@ class phpbb_template_filter extends php_user_filter
 			$files = array_merge($files, $finder
 				->extension_prefix($location)
 				->extension_suffix('.html')
-				->extension_directory("/styles/" . $this->template_name . "/template")
+				->extension_directory("/styles/" . $this->style_name . "/template")
 				->get_files());
 
 			$all_compiled = '';
 			foreach ($files as $file)
 			{
 				$compiled = $this->template_compile->compile_file($file);
-				if ($compiled === false)
-				{
-					trigger_error(sprintf('The file could not be compiled: %s', phpbb_filter_root_path($file)), E_USER_ERROR);
-				}
+                                if ($compiled === false) {
+                                        trigger_error(sprintf('The file could not be compiled: %s', phpbb_filter_root_path($file)), E_USER_ERROR);
+                                }
 				$all_compiled .= $compiled;
 			}
 			// Need spaces inside php tags as php cannot grok
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 19ee59323a..3de5cd45a5 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -82,14 +82,15 @@ class phpbb_template
 	private $extension_manager;
 
 	/**
-	* Name of the top-level template being compiled and/or rendered.
+	* Name of the style that the template being compiled and/or rendered
+        * belongs to.
 	*
-	* This is used by hooks implementation to invoke template-specific
+	* This is used by hooks implementation to invoke style-specific
 	* template hooks.
 	*
 	* @var string
 	*/
-	private $template_name;
+	private $style_name;
 
 	/**
 	* Constructor.
@@ -301,7 +302,7 @@ class phpbb_template
 			return new phpbb_template_renderer_include($output_file, $this);
 		}
 
-		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->template_name, $this->locator, $this->phpbb_root_path, $this->extension_manager, $this->user);
+		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->style_name, $this->locator, $this->phpbb_root_path, $this->extension_manager, $this->user);
 
 		if ($compile->compile_file_to_file($source_file, $output_file) !== false)
 		{
-- 
cgit v1.2.1


From 2fb40060562dc7efcfda06cde05c2abb78a2c3c2 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 31 Oct 2012 11:10:40 -0400
Subject: [feature/template-events] Indentation fix.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index a87bfaef34..8c102ea0fe 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -89,7 +89,7 @@ class phpbb_template_filter extends php_user_filter
 
 	/**
 	* Name of the style that the template being compiled and/or rendered
-        * belongs to.
+	* belongs to.
 	*
 	* This is used by hooks implementation to invoke style-specific
 	* template hooks.
-- 
cgit v1.2.1


From 4ed9e4124e592ddb7fe2696e45261e74edb89ddd Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 31 Oct 2012 11:11:33 -0400
Subject: [feature/template-events] Wording: wrongly -> improperly.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 8c102ea0fe..8df43e5b01 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -908,14 +908,14 @@ class phpbb_template_filter extends php_user_filter
 	{
 		if (!preg_match('/^\w+$/', $tag_args))
 		{
-			// The hook location is wrongly formatted,
+			// The hook location is improperly formatted,
 			if ($this->user)
 			{
 				trigger_error($this->user->lang('ERR_TEMPLATE_EVENT_LOCATION', $tag_args), E_USER_ERROR);
 			}
 			else
 			{
-				trigger_error(sprintf('The specified template event location <em>[%s]</em> is wrongly formatted.', $tag_args), E_USER_ERROR);
+				trigger_error(sprintf('The specified template event location <em>[%s]</em> is improperly formatted.', $tag_args), E_USER_ERROR);
 			}
 		}
 		$location = $tag_args;
-- 
cgit v1.2.1


From 6c7f1f7bdeba88fdef27fab537f973464bba6183 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 2 Nov 2012 19:58:01 -0400
Subject: [feature/template-events] Cosmetic changes.

PHPBB3-9550
---
 phpBB/includes/template/locator.php  | 4 ++--
 phpBB/includes/template/template.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/locator.php b/phpBB/includes/template/locator.php
index 42db91efb2..f6fd20bcc2 100644
--- a/phpBB/includes/template/locator.php
+++ b/phpBB/includes/template/locator.php
@@ -39,7 +39,7 @@ interface phpbb_template_locator
 	* Sets the template filenames for handles. $filename_array
 	* should be a hash of handle => filename pairs.
 	*
-	* @param array $filname_array Should be a hash of handle => filename pairs.
+	* @param array $filename_array Should be a hash of handle => filename pairs.
 	*/
 	public function set_filenames(array $filename_array);
 
@@ -66,7 +66,7 @@ interface phpbb_template_locator
 	* returns actually exists, it is faster than get_source_file_for_handle.
 	*
 	* Use get_source_file_for_handle to obtain the actual path that is
-	* guaranteed to exist (which might come from the parent style 
+	* guaranteed to exist (which might come from the parent style
 	* directory if primary style has parent styles).
 	*
 	* This function will trigger an error if the handle was never
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 3de5cd45a5..52c08326d5 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -83,7 +83,7 @@ class phpbb_template
 
 	/**
 	* Name of the style that the template being compiled and/or rendered
-        * belongs to.
+	* belongs to.
 	*
 	* This is used by hooks implementation to invoke style-specific
 	* template hooks.
@@ -115,7 +115,7 @@ class phpbb_template
 	/**
 	* Sets the template filenames for handles.
 	*
-	* @param array $filname_array Should be a hash of handle => filename pairs.
+	* @param array $filename_array Should be a hash of handle => filename pairs.
 	*/
 	public function set_filenames(array $filename_array)
 	{
-- 
cgit v1.2.1


From 0141154ceb58702a308c76b45242cc47f51d3e01 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 31 Oct 2012 12:03:22 -0400
Subject: [feature/template-events] Indentation fix.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 8df43e5b01..5d9e00553f 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -940,9 +940,12 @@ class phpbb_template_filter extends php_user_filter
 			foreach ($files as $file)
 			{
 				$compiled = $this->template_compile->compile_file($file);
-                                if ($compiled === false) {
-                                        trigger_error(sprintf('The file could not be compiled: %s', phpbb_filter_root_path($file)), E_USER_ERROR);
-                                }
+
+				if ($compiled === false)
+				{
+					trigger_error(sprintf('The file could not be compiled: %s', phpbb_filter_root_path($file)), E_USER_ERROR);
+				}
+
 				$all_compiled .= $compiled;
 			}
 			// Need spaces inside php tags as php cannot grok
-- 
cgit v1.2.1


From 44d6dc4c4ccf969fd3d84f3b39bfd24ecd3a3f9d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 8 Nov 2012 12:21:06 -0500
Subject: [feature/template-events] Convert a single style name to array of
 them.

This allows template code to know the entire style hierarchy for
templates being rendered.

PHPBB3-9550
---
 phpBB/includes/functions_messenger.php |  2 +-
 phpBB/includes/style/style.php         | 11 ++++++++++-
 phpBB/includes/template/compile.php    |  6 +++---
 phpBB/includes/template/filter.php     | 13 ++++++-------
 phpBB/includes/template/template.php   | 11 +++++------
 5 files changed, 25 insertions(+), 18 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 55884caedb..2043e2f7be 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -231,7 +231,7 @@ class messenger
 				}
 			}
 
-			$style->set_custom_style($template_lang . '_email', array($template_path, $fallback_template_path), '');
+			$style->set_custom_style($template_lang . '_email', array($template_path, $fallback_template_path), array(), '');
 
 			$tpl->set_filenames(array(
 				'body'		=> $template_file . '.txt',
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index effd496fb9..9ce96c5da5 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -110,18 +110,27 @@ class phpbb_style
 	*
 	* @param string $name Name of style, used for cache prefix. Examples: "admin", "prosilver"
 	* @param array or string $paths Array of style paths, relative to current root directory
+	* @param array $names Array of names of templates in inheritance tree order, used by extensions. If empty, $name will be used.
 	* @param string $template_path Path to templates, relative to style directory. False if path should be set to default (templates/).
 	*/
-	public function set_custom_style($name, $paths, $template_path = false)
+	public function set_custom_style($name, $paths, $names = array(), $template_path = false)
 	{
 		if (is_string($paths))
 		{
 			$paths = array($paths);
 		}
 
+		if (empty($names))
+		{
+			$names = array($name);
+		}
+		$this->names = $names;
+
 		$this->provider->set_styles($paths);
 		$this->locator->set_paths($this->provider);
 
+		$this->template->style_names = $names;
+
 		if ($template_path !== false)
 		{
 			$this->locator->set_template_path($template_path);
diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/template/compile.php
index c2762bfd59..76ad2317c9 100644
--- a/phpBB/includes/template/compile.php
+++ b/phpBB/includes/template/compile.php
@@ -36,17 +36,17 @@ class phpbb_template_compile
 	* Constructor.
 	*
 	* @param bool $allow_php Whether PHP code will be allowed in templates (inline PHP code, PHP tag and INCLUDEPHP tag)
-	* @param string $style_name Name of style to which the template being compiled belongs
+	* @param array $style_names Name of style to which the template being compiled belongs and parents in style tree order
 	* @param phpbb_style_resource_locator $locator Resource locator
 	* @param string $phpbb_root_path Path to phpBB root directory
 	* @param phpbb_extension_manager $extension_manager Extension manager to use for finding template fragments in extensions; if null, template hooks will not be invoked
 	* @param phpbb_user $user Current user
 	*/
-	public function __construct($allow_php, $style_name, $locator, $phpbb_root_path, $extension_manager = null, $user = null)
+	public function __construct($allow_php, $style_names, $locator, $phpbb_root_path, $extension_manager = null, $user = null)
 	{
 		$this->filter_params = array(
 			'allow_php'	=> $allow_php,
-			'style_name'	=> $style_name,
+			'style_names'	=> $style_names,
 			'locator'	=> $locator,
 			'phpbb_root_path'	=> $phpbb_root_path,
 			'extension_manager'	=> $extension_manager,
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 5d9e00553f..a5a0865569 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -89,14 +89,13 @@ class phpbb_template_filter extends php_user_filter
 
 	/**
 	* Name of the style that the template being compiled and/or rendered
-	* belongs to.
+	* belongs to, and its parents, in inheritance tree order.
 	*
-	* This is used by hooks implementation to invoke style-specific
-	* template hooks.
+	* Used to invoke style-specific template events.
 	*
-	* @var string
+	* @var array
 	*/
-	private $style_name;
+	private $style_names;
 
 	/**
 	* Extension manager.
@@ -169,7 +168,7 @@ class phpbb_template_filter extends php_user_filter
 	/**
 	* Initializer, called on creation.
 	*
-	* Get the allow_php option, style_name, root directory and locator from params,
+	* Get the allow_php option, style_names, root directory and locator from params,
 	* which are passed to stream_filter_append.
 	*/
 	public function onCreate()
@@ -179,7 +178,7 @@ class phpbb_template_filter extends php_user_filter
 		$this->allow_php = $this->params['allow_php'];
 		$this->locator = $this->params['locator'];
 		$this->phpbb_root_path = $this->params['phpbb_root_path'];
-		$this->style_name = $this->params['style_name'];
+		$this->style_names = $this->params['style_names'];
 		$this->extension_manager = $this->params['extension_manager'];
 		if (isset($this->params['user']))
 		{
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 52c08326d5..4d257d2510 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -83,14 +83,13 @@ class phpbb_template
 
 	/**
 	* Name of the style that the template being compiled and/or rendered
-	* belongs to.
+	* belongs to, and its parents, in inheritance tree order.
 	*
-	* This is used by hooks implementation to invoke style-specific
-	* template hooks.
+	* Used to invoke style-specific template events.
 	*
-	* @var string
+	* @var array
 	*/
-	private $style_name;
+	public $style_names;
 
 	/**
 	* Constructor.
@@ -302,7 +301,7 @@ class phpbb_template
 			return new phpbb_template_renderer_include($output_file, $this);
 		}
 
-		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->style_name, $this->locator, $this->phpbb_root_path, $this->extension_manager, $this->user);
+		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->style_names, $this->locator, $this->phpbb_root_path, $this->extension_manager, $this->user);
 
 		if ($compile->compile_file_to_file($source_file, $output_file) !== false)
 		{
-- 
cgit v1.2.1


From 729eeef2bf4aad74c8170a54098e6679a1e9fadb Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 8 Nov 2012 12:22:15 -0500
Subject: [feature/template-events] Generate style names array in set_style.

PHPBB3-9550
---
 phpBB/includes/style/style.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 9ce96c5da5..6aec5c6ba4 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -91,16 +91,22 @@ class phpbb_style
 	{
 		$style_path = $this->user->style['style_path'];
 		$style_dirs = ($this->user->style['style_parent_id']) ? array_reverse(explode('/', $this->user->style['style_parent_tree'])) : array();
-		$paths = array($this->get_style_path($style_path));
+
+		$names = array($style_path);
 		foreach ($style_dirs as $dir)
 		{
-			$paths[] = $this->get_style_path($dir);
+			$names[] = $dir;
 		}
-
 		// Add 'all' path, used as last fallback path by hooks and extensions
-		$paths[] = $this->get_style_path('all');
+		//$names[] = 'all';
+
+		$paths = array();
+		foreach ($names as $name)
+		{
+			$paths[] = $this->get_style_path($name);
+		}
 
-		return $this->set_custom_style($style_path, $paths);
+		return $this->set_custom_style($style_path, $names, $paths);
 	}
 
 	/**
-- 
cgit v1.2.1


From af47779f51e44d34a78087327a3958fb35c50936 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 8 Nov 2012 12:22:39 -0500
Subject: [feature/template-events] Use style names array in template filter.

This provides a straightforward way of iterating over all styles
looking for templates in extensions.

PHPBB3-9550
---
 phpBB/includes/template/filter.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index a5a0865569..fd2ce9d859 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -929,11 +929,19 @@ class phpbb_template_filter extends php_user_filter
 				->extension_directory("/styles/all/template")
 				->get_files();
 
-			$files = array_merge($files, $finder
-				->extension_prefix($location)
-				->extension_suffix('.html')
-				->extension_directory("/styles/" . $this->style_name . "/template")
-				->get_files());
+			foreach ($this->style_names as $style_name)
+			{
+				$more_files = $finder
+					->extension_prefix($location)
+					->extension_suffix('.html')
+					->extension_directory("/styles/" . $style_name . "/template")
+					->get_files();
+				if (!empty($more_files))
+				{
+					$files = array_merge($files, $more_files);
+					break;
+				}
+			}
 
 			$all_compiled = '';
 			foreach ($files as $file)
-- 
cgit v1.2.1


From da7d888448cba2160b16010b982f886be9cb1bcb Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 8 Nov 2012 21:02:02 -0500
Subject: [feature/template-events] Make style names private on template.

PHPBB3-9550
---
 phpBB/includes/style/style.php       |  2 +-
 phpBB/includes/template/template.php | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 6aec5c6ba4..7d31df9886 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -135,7 +135,7 @@ class phpbb_style
 		$this->provider->set_styles($paths);
 		$this->locator->set_paths($this->provider);
 
-		$this->template->style_names = $names;
+		$this->template->set_style_names($names);
 
 		if ($template_path !== false)
 		{
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 4d257d2510..97e23f34e0 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -89,7 +89,7 @@ class phpbb_template
 	*
 	* @var array
 	*/
-	public $style_names;
+	private $style_names;
 
 	/**
 	* Constructor.
@@ -123,6 +123,18 @@ class phpbb_template
 		return true;
 	}
 
+	/**
+	* Sets the style names corresponding to style hierarchy being compiled
+	* and/or rendered.
+	*
+	* @param array $style_names List of style names in inheritance tree order
+	* @return null
+	*/
+	public function set_style_names(array $style_names)
+	{
+		$this->style_names = $style_names;
+	}
+
 	/**
 	* Clears all variables and blocks assigned to this template.
 	*/
-- 
cgit v1.2.1


From 47a90f815d210d84f0c70ae678cb129e69963436 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 14 Nov 2012 17:31:05 -0500
Subject: [feature/template-events] Changes per imkingdavid's review.

PHPBB3-9550
---
 phpBB/includes/style/style.php       |  2 +-
 phpBB/includes/template/compile.php  |  2 +-
 phpBB/includes/template/filter.php   | 15 +++++++++++++--
 phpBB/includes/template/template.php |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 7d31df9886..7c91edd034 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -97,7 +97,7 @@ class phpbb_style
 		{
 			$names[] = $dir;
 		}
-		// Add 'all' path, used as last fallback path by hooks and extensions
+		// Add 'all' path, used as last fallback path by events and extensions
 		//$names[] = 'all';
 
 		$paths = array();
diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/template/compile.php
index 76ad2317c9..ba7f45e41d 100644
--- a/phpBB/includes/template/compile.php
+++ b/phpBB/includes/template/compile.php
@@ -39,7 +39,7 @@ class phpbb_template_compile
 	* @param array $style_names Name of style to which the template being compiled belongs and parents in style tree order
 	* @param phpbb_style_resource_locator $locator Resource locator
 	* @param string $phpbb_root_path Path to phpBB root directory
-	* @param phpbb_extension_manager $extension_manager Extension manager to use for finding template fragments in extensions; if null, template hooks will not be invoked
+	* @param phpbb_extension_manager $extension_manager Extension manager to use for finding template fragments in extensions; if null, template events will not be invoked
 	* @param phpbb_user $user Current user
 	*/
 	public function __construct($allow_php, $style_names, $locator, $phpbb_root_path, $extension_manager = null, $user = null)
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index fd2ce9d859..f73ad28ba1 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -106,6 +106,7 @@ class phpbb_template_filter extends php_user_filter
 
 	/**
 	* Current user
+	*
 	* @var phpbb_user
 	*/
 	private $user;
@@ -170,6 +171,8 @@ class phpbb_template_filter extends php_user_filter
 	*
 	* Get the allow_php option, style_names, root directory and locator from params,
 	* which are passed to stream_filter_append.
+	*
+	* @return boolean Returns true
 	*/
 	public function onCreate()
 	{
@@ -902,12 +905,13 @@ class phpbb_template_filter extends php_user_filter
 	* such template fragments would have no effect.
 	*
 	* @param string $tag_args EVENT tag arguments, as a string - for EVENT this is the event name
+	* @return string compiled template code
 	*/
 	private function compile_tag_event($tag_args)
 	{
 		if (!preg_match('/^\w+$/', $tag_args))
 		{
-			// The hook location is improperly formatted,
+			// The event location is improperly formatted,
 			if ($this->user)
 			{
 				trigger_error($this->user->lang('ERR_TEMPLATE_EVENT_LOCATION', $tag_args), E_USER_ERROR);
@@ -950,7 +954,14 @@ class phpbb_template_filter extends php_user_filter
 
 				if ($compiled === false)
 				{
-					trigger_error(sprintf('The file could not be compiled: %s', phpbb_filter_root_path($file)), E_USER_ERROR);
+					if ($this->user)
+					{
+						trigger_error($this->user->lang('ERR_TEMPLATE_COMPILATION', phpbb_filter_root_path($file)), E_USER_ERROR);
+					}
+					else
+					{
+						trigger_error(sprintf('The file could not be compiled: %s', phpbb_filter_root_path($file)), E_USER_ERROR);
+					}
 				}
 
 				$all_compiled .= $compiled;
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 97e23f34e0..bbec768613 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -98,7 +98,7 @@ class phpbb_template
 	* @param user $user current user
 	* @param phpbb_template_locator $locator template locator
 	* @param phpbb_template_context $context template context
-	* @param phpbb_extension_manager $extension_manager extension manager, if null then template hooks will not be invoked
+	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
 	*/
 	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_locator $locator, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null)
 	{
-- 
cgit v1.2.1


From 1c3b3621db7eda526388c0343946fa30c0223653 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 18 Nov 2012 20:45:51 +0100
Subject: [feature/avatars] Add missing assign_block_vars() for avatar options

This is needed for selecting the gallery avatar while using subsilver2.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/local.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index e4648381c2..080921c325 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -95,6 +95,10 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 					'AVATAR_FILE' => $img['filename'],
 				));
 
+				$template->assign_block_vars('av_local_row.av_local_option', array(
+					'S_OPTIONS_AVATAR'	=> $img['filename']
+				));
+
 				$col_count = ($col_count + 1) % $table_cols;
 
 				++$av_pos;
-- 
cgit v1.2.1


From 959bc183bf21e77c694ac0b68cbda5b93ae79cd0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 18 Nov 2012 23:09:09 +0100
Subject: [feature/avatars] Handle deletion of avatars

Previously this wasn't handled correctly if at all.

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php  | 8 +++++++-
 phpBB/includes/acp/acp_users.php   | 8 +++++++-
 phpBB/includes/ucp/ucp_profile.php | 4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 7be58b6df1..f461555056 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -335,7 +335,8 @@ class acp_groups
 						// Handle avatar
 						$driver = str_replace('_', '.', request_var('avatar_driver', ''));
 						$config_name = preg_replace('#^avatar.driver.#', '', $driver);
-						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"])
+						$av_delete = $request->variable('av_delete', '');
+						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete))
 						{
 							$avatar = $phpbb_avatar_manager->get_driver($driver);
 							$result = $avatar->process_form($template, $avatar_data, $avatar_error);
@@ -354,6 +355,11 @@ class acp_groups
 						}
 						else
 						{
+							if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
+							{
+								$avatar->delete($avatar_data);
+							}
+
 							// Removing the avatar
 							$submit_ary['avatar_type'] = '';
 							$submit_ary['avatar'] = '';
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 562353b229..fdad1df0fd 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1746,7 +1746,8 @@ class acp_users
 						{
 							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
 							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"])
+							$av_delete = $request->variable('av_delete', '');
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete))
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);
@@ -1770,6 +1771,11 @@ class acp_users
 							}
 							else
 							{
+								if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
+								{
+									$avatar->delete($avatar_data);
+								}
+
 								// Removing the avatar
 								$result = array(
 									'user_avatar' => '',
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 6a1ad33ceb..77b2dc7054 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -565,7 +565,8 @@ class ucp_profile
 						{
 							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
 							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"])
+							$av_delete = $request->variable('av_delete', '');
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete))
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);
@@ -593,7 +594,6 @@ class ucp_profile
 							}
 							else
 							{
-								// They are removing their avatar or are trying to play games with us
 								if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
 								{
 									$avatar->delete($avatar_data);
-- 
cgit v1.2.1


From c2ba24558ff79174af9aaf2bee274529c794cac8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 18 Nov 2012 23:11:40 +0100
Subject: [feature/avatars] Fix local and upload avatar in the ACP

PHPBB3-10018
---
 phpBB/includes/avatar/driver/local.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 080921c325..cdee983d9e 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -91,11 +91,12 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 				$template->assign_block_vars('av_local_row.av_local_col', array(
 					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
-					'AVATAR_NAME' => $img['name'],
-					'AVATAR_FILE' => $img['filename'],
+					'AVATAR_NAME' 	=> $img['name'],
+					'AVATAR_FILE' 	=> $img['filename'],
 				));
 
 				$template->assign_block_vars('av_local_row.av_local_option', array(
+					'AVATAR_FILE' 		=> $img['filename'],
 					'S_OPTIONS_AVATAR'	=> $img['filename']
 				));
 
-- 
cgit v1.2.1


From bea6e845d3c0c25f5f84ad13fcf22f42f1249561 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 19 Nov 2012 00:27:22 +0100
Subject: [feature/avatars] Use https for gravatar

PHPBB3-10018
---
 phpBB/includes/avatar/driver/gravatar.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index b07af59366..b8f23b04a9 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -56,7 +56,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	*/
 	public function get_custom_html($row, $ignore_config = false, $alt = '')
 	{
-		$html = '<img src="http://www.gravatar.com/avatar/' . md5(strtolower(trim($row['avatar']))) .  
+		$html = '<img src="https://secure.gravatar.com/avatar/' . md5(strtolower(trim($row['avatar']))) .  
 			(($row['avatar_width'] || $row['avatar_height']) ? ('?s=' . max($row['avatar_width'], $row['avatar_height'])) : '') . '" ' .
 			($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') .
 			($row['avatar_height'] ? ('height="' . $row['avatar_height'] . '" ') : '') .
@@ -106,8 +106,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 		if (function_exists('getimagesize'))
 		{
 			// build URL
-			// @todo: add https support
-			$url = 'http://www.gravatar.com/avatar/' . md5(strtolower(trim($email)));
+			$url = 'https://secure.gravatar.com/' . md5(strtolower(trim($email)));
 
 			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
 			{
-- 
cgit v1.2.1


From 8d0c667dcec08fb506dcf19203ded3c699339d6e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 19 Nov 2012 00:30:18 +0100
Subject: [feature/avatars] Fix the docs and small naming fixes

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php    |  2 +-
 phpBB/includes/avatar/driver/gravatar.php  |  4 +---
 phpBB/includes/avatar/driver/interface.php | 34 ++++++++++++++++++++++----
 phpBB/includes/avatar/driver/local.php     |  4 +++-
 phpBB/includes/avatar/driver/upload.php    |  4 +++-
 phpBB/includes/avatar/manager.php          | 38 +++++++++++++++++++++++-------
 6 files changed, 66 insertions(+), 20 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 9a213ce730..1e899b7c50 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -81,7 +81,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	public $custom_html = false;
 
 	/**
-	* Construct an driver object
+	* Construct a driver object
 	*
 	* @param $config The phpBB configuration
 	* @param $request The request object
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index b8f23b04a9..036800fd45 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -19,11 +19,10 @@ if (!defined('IN_PHPBB'))
 * Handles avatars hosted at gravatar.com
 * @package avatars
 */
-// @todo: rename classes to phpbb_ext_foo_avatar_driver_foo and similar
 class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 {
 	/**
-	* We'll need to create a different type of avatar for gravatar
+	* @inheritdoc
 	*/
 	public $custom_html = true;
 
@@ -32,7 +31,6 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	*/
 	public function get_data($row, $ignore_config = false)
 	{
-		// @todo: add allow_avatar_gravatar to database_update.php etc.
 		if ($ignore_config || $this->config['allow_avatar_gravatar'])
 		{
 			return array(
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index f066470174..11dbffa65d 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -51,27 +51,51 @@ interface phpbb_avatar_driver_interface
 	public function get_custom_html($row, $ignore_config = false, $alt = '');
 
 	/**
-	* @TODO
+	* Prepare form for changing the settings of this avatar
+	*
+	* @param object	$template The template object
+	* @param array	$row The user data or group data that has been cleaned with 
+	*        phpbb_avatar_manager::clean_row
+	* @param array	&$error The reference to an error array
+	*
+	* @return bool Returns true if form has been successfully prepared
 	**/
 	public function prepare_form($template, $row, &$error);
 
 	/**
-	* @TODO
+	* Process form data
+	*
+	* @param object	$template The template object
+	* @param array	$row The user data or group data that has been cleaned with 
+	*        phpbb_avatar_manager::clean_row
+	* @param array	&$error The reference to an error array
+	*
+	* @return array An array containing the avatar data as follows:
+	*        ['avatar'], ['avatar_width'], ['avatar_height']
 	**/
 	public function process_form($template, $row, &$error);
 
 	/**
-	* @TODO
+	* Delete avatar
+	*
+	* @param array $row The user data or group data that has been cleaned with 
+	*        phpbb_avatar_manager::clean_row
+	*
+	* @return bool True if avatar has been deleted or there is no need to delete
 	**/
 	public function delete($row);
 
 	/**
-	* @TODO
+	* Check if avatar is enabled
+	*
+	* @return bool True if avatar is enabled, false if it's disabled
 	**/
 	public function is_enabled();
 
 	/**
-	* @TODO
+	* Get the avatars template name
+	*
+	* @return string The avatars template name
 	**/
 	public function get_template_name();
 }
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index cdee983d9e..9b3807ee4b 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -132,7 +132,9 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	}
 
 	/**
-	* @TODO
+	* Get a list of avatars that are locally available
+	*
+	* @return array An array containing the locally available avatars
 	*/
 	private function get_avatar_list()
 	{
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 8f044ca37f..c9913548fc 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -139,7 +139,9 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	}
 
 	/**
-	* @TODO
+	* Check if user is able to upload an avatar
+	*
+	* @return bool True if user can upload, false if not
 	*/
 	private function can_upload()
 	{
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 546cdcdc05..7c7bd6c7ba 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -26,25 +26,37 @@ class phpbb_avatar_manager
 	private $request;
 	private $cache;
 	private static $valid_drivers = false;
-	private $tasks;
+	private $avatar_drivers;
 	private $container;
 
 	/**
-	* @TODO
+	* Construct an avatar manager object
+	*
+	* @param $phpbb_root_path The path to the phpBB root
+	* @param $phpEx The php file extension
+	* @param $config The phpBB configuration
+	* @param $request The request object
+	* @param $cache A cache driver
+	* @param $avatar_drivers The avatars drivers passed via the service container
+	* @param $container The container object
 	**/
-	public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_request $request, phpbb_cache_driver_interface $cache, $tasks, $container)
+	public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_request $request, phpbb_cache_driver_interface $cache, $avatar_drivers, $container)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->phpEx = $phpEx;
 		$this->config = $config;
 		$this->request = $request;
 		$this->cache = $cache;
-		$this->tasks = $tasks;
+		$this->avatar_drivers = $avatar_drivers;
 		$this->container = $container;
 	}
 
 	/**
-	* @TODO
+	* Get the driver object specified by the avatar type
+	*
+	* @param string The avatar type; by default an avatar's service container name
+	*
+	* @return object The avatar driver object
 	**/
 	public function get_driver($avatar_type)
 	{
@@ -87,14 +99,15 @@ class phpbb_avatar_manager
 	}
 
 	/**
-	* @TODO
+	* Load the list of valid drivers
+	* This is executed once and fills self::$valid_drivers
 	**/
 	private function load_valid_drivers()
 	{
-		if (!empty($this->tasks))
+		if (!empty($this->avatar_drivers))
 		{
 			self::$valid_drivers = array();
-			foreach ($this->tasks as $driver)
+			foreach ($this->avatar_drivers as $driver)
 			{
 				self::$valid_drivers[] = $driver->get_name();
 			}
@@ -102,7 +115,9 @@ class phpbb_avatar_manager
 	}
 
 	/**
-	* @TODO
+	* Get a list of valid avatar drivers
+	*
+	* @return array An array containing a list of the valid avatar drivers
 	**/
 	public function get_valid_drivers()
 	{
@@ -116,6 +131,11 @@ class phpbb_avatar_manager
 
 	/**
 	* Strip out user_ and group_ prefixes from keys
+	*
+	* @param array	$row The user data or group data
+	*
+	* @return array The user data or group data with keys that have been
+	*        stripped from the preceding "user_" or "group_"
 	**/
 	public static function clean_row($row)
 	{
-- 
cgit v1.2.1


From 858c59279c0f8b07412dec676c96d9b291d91897 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 19 Nov 2012 23:50:34 +0100
Subject: [feature/avatars] Use protected instead of private

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php |  2 +-
 phpBB/includes/avatar/driver/local.php  |  2 +-
 phpBB/includes/avatar/driver/upload.php |  2 +-
 phpBB/includes/avatar/manager.php       | 18 +++++++++---------
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 1e899b7c50..ef0c8ce44e 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 */
 abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 {
-	private $name;
+	protected $name;
 
 	/**
 	* Returns the name of the driver.
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 9b3807ee4b..d0ad8708b0 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -136,7 +136,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	*
 	* @return array An array containing the locally available avatars
 	*/
-	private function get_avatar_list()
+	protected function get_avatar_list()
 	{
 		$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list');
 
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index c9913548fc..9475cad7a1 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -143,7 +143,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	*
 	* @return bool True if user can upload, false if not
 	*/
-	private function can_upload()
+	protected function can_upload()
 	{
 		return (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on'));
 	}
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 7c7bd6c7ba..0d36118dbc 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -20,14 +20,14 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_avatar_manager
 {
-	private $phpbb_root_path;
-	private $phpEx;
-	private $config;
-	private $request;
-	private $cache;
-	private static $valid_drivers = false;
-	private $avatar_drivers;
-	private $container;
+	protected $phpbb_root_path;
+	protected $phpEx;
+	protected $config;
+	protected $request;
+	protected $cache;
+	protected static $valid_drivers = false;
+	protected $avatar_drivers;
+	protected $container;
 
 	/**
 	* Construct an avatar manager object
@@ -102,7 +102,7 @@ class phpbb_avatar_manager
 	* Load the list of valid drivers
 	* This is executed once and fills self::$valid_drivers
 	**/
-	private function load_valid_drivers()
+	protected function load_valid_drivers()
 	{
 		if (!empty($this->avatar_drivers))
 		{
-- 
cgit v1.2.1


From 2afb8b9df873c3f9572a32ab7a62ea8ba8d8a45b Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 20 Nov 2012 18:14:48 -0600
Subject: [ticket/11103] Create user loader class, update for DIC

Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
---
 phpBB/includes/functions.php                       |  36 +++---
 phpBB/includes/functions_admin.php                 |  16 +--
 phpBB/includes/functions_posting.php               |  30 ++---
 phpBB/includes/functions_privmsgs.php              |  14 +--
 phpBB/includes/mcp/mcp_pm_reports.php              |   2 +-
 phpBB/includes/mcp/mcp_queue.php                   |  28 ++---
 phpBB/includes/mcp/mcp_reports.php                 |  10 +-
 phpBB/includes/notification/manager.php            | 127 ++++++++-------------
 phpBB/includes/notification/method/base.php        |  14 ++-
 phpBB/includes/notification/method/email.php       |   4 +-
 phpBB/includes/notification/type/base.php          |  39 ++-----
 phpBB/includes/notification/type/bookmark.php      |   4 +-
 phpBB/includes/notification/type/pm.php            |   8 +-
 phpBB/includes/notification/type/post.php          |  10 +-
 phpBB/includes/notification/type/quote.php         |  10 +-
 phpBB/includes/notification/type/report_pm.php     |   4 +-
 .../notification/type/report_pm_closed.php         |   2 +-
 phpBB/includes/notification/type/report_post.php   |   4 +-
 .../notification/type/report_post_closed.php       |   4 +-
 phpBB/includes/notification/type/topic.php         |   6 +-
 phpBB/includes/user_loader.php                     | 118 +++++++++++++++++++
 21 files changed, 284 insertions(+), 206 deletions(-)
 create mode 100644 phpBB/includes/user_loader.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4e26d2c642..283ed4a657 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1331,12 +1331,12 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 
 			// Mark all topic notifications read for this user
 			$phpbb_notifications->mark_notifications_read(array(
-				'phpbb_notification_type_topic',
-				'phpbb_notification_type_quote',
-				'phpbb_notification_type_bookmark',
-				'phpbb_notification_type_post',
-				'phpbb_notification_type_approve_topic',
-				'phpbb_notification_type_approve_post',
+				'topic',
+				'quote',
+				'bookmark',
+				'post',
+				'approve_topic',
+				'approve_post',
 			), false, $user->data['user_id'], $post_time);
 
 			if ($config['load_db_lastread'] && $user->data['is_registered'])
@@ -1394,8 +1394,8 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		}
 
 		$phpbb_notifications->mark_notifications_read_by_parent(array(
-			'phpbb_notification_type_topic',
-			'phpbb_notification_type_approve_topic',
+			'topic',
+			'approve_topic',
 		), $forum_id, $user->data['user_id'], $post_time);
 
 		// Mark all post/quote notifications read for this user in this forum
@@ -1411,10 +1411,10 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		$db->sql_freeresult($result);
 
 		$phpbb_notifications->mark_notifications_read_by_parent(array(
-			'phpbb_notification_type_quote',
-			'phpbb_notification_type_bookmark',
-			'phpbb_notification_type_post',
-			'phpbb_notification_type_approve_post',
+			'quote',
+			'bookmark',
+			'post',
+			'approve_post',
 		), $topic_ids, $user->data['user_id'], $post_time);
 
 		// Add 0 to forums array to mark global announcements correctly
@@ -1516,14 +1516,14 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 
 		// Mark post notifications read for this user in this topic
 		$phpbb_notifications->mark_notifications_read(array(
-			'phpbb_notification_type_topic',
-			'phpbb_notification_type_approve_topic',
+			'topic',
+			'approve_topic',
 		), $topic_id, $user->data['user_id'], $post_time);
 		$phpbb_notifications->mark_notifications_read_by_parent(array(
-			'phpbb_notification_type_quote',
-			'phpbb_notification_type_bookmark',
-			'phpbb_notification_type_post',
-			'phpbb_notification_type_approve_post',
+			'quote',
+			'bookmark',
+			'post',
+			'approve_post',
 		), $topic_id, $user->data['user_id'], $post_time);
 
 		if ($config['load_db_lastread'] && $user->data['is_registered'])
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index fdae1905a0..e15bf12279 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -717,9 +717,9 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 	}
 
 	$phpbb_notifications->delete_notifications(array(
-		'phpbb_notification_type_topic',
-		'phpbb_notification_type_approve_topic',
-		'phpbb_notification_type_topic_in_queue',
+		'topic',
+		'approve_topic',
+		'topic_in_queue',
 	), $topic_ids);
 
 	return $return;
@@ -901,11 +901,11 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 	}
 
 	$phpbb_notifications->delete_notifications(array(
-		'phpbb_notification_type_quote',
-		'phpbb_notification_type_bookmark',
-		'phpbb_notification_type_post',
-		'phpbb_notification_type_approve_post',
-		'phpbb_notification_type_post_in_queue',
+		'quote',
+		'bookmark',
+		'post',
+		'approve_post',
+		'post_in_queue',
 	), $post_ids);
 
 	return sizeof($post_ids);
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 4df199d72d..8ba1fed6a7 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2237,17 +2237,17 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		{
 			case 'post':
 				$phpbb_notifications->add_notifications(array(
-					'phpbb_notification_type_quote',
-					'phpbb_notification_type_topic',
+					'quote',
+					'topic',
 				), $notification_data);
 			break;
 
 			case 'reply':
 			case 'quote':
 				$phpbb_notifications->add_notifications(array(
-					'phpbb_notification_type_quote',
-					'phpbb_notification_type_bookmark',
-					'phpbb_notification_type_post',
+					'quote',
+					'bookmark',
+					'post',
 				), $notification_data);
 			break;
 
@@ -2256,10 +2256,10 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			case 'edit':
 			case 'edit_last_post':
 				$phpbb_notifications->update_notifications(array(
-					'phpbb_notification_type_quote',
-					'phpbb_notification_type_bookmark',
-					'phpbb_notification_type_topic',
-					'phpbb_notification_type_post',
+					'quote',
+					'bookmark',
+					'topic',
+					'post',
 				), $notification_data);
 			break;
 		}
@@ -2269,23 +2269,23 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post':
-				$phpbb_notifications->add_notifications('phpbb_notification_type_topic_in_queue', $notification_data);
+				$phpbb_notifications->add_notifications('topic_in_queue', $notification_data);
 			break;
 
 			case 'reply':
 			case 'quote':
-				$phpbb_notifications->add_notifications('phpbb_notification_type_post_in_queue', $notification_data);
+				$phpbb_notifications->add_notifications('post_in_queue', $notification_data);
 			break;
 
 			case 'edit_topic':
 			case 'edit_first_post':
 			case 'edit':
 			case 'edit_last_post':
-				$phpbb_notifications->delete_notifications('phpbb_notification_type_topic', $data['topic_id']);
+				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
 				$phpbb_notifications->delete_notifications(array(
-					'phpbb_notification_type_quote',
-					'phpbb_notification_type_bookmark',
-					'phpbb_notification_type_post',
+					'quote',
+					'bookmark',
+					'post',
 				), $data['post_id']);
 			break;
 		}
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 54e8ced679..ae8ffbe90e 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -878,7 +878,7 @@ function update_unread_status($unread, $msg_id, $user_id, $folder_id)
 
 	global $db, $user, $phpbb_notifications;
 
-	$phpbb_notifications->mark_notifications_read('phpbb_notification_type_pm', $msg_id, $user_id);
+	$phpbb_notifications->mark_notifications_read('pm', $msg_id, $user_id);
 
 	$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . "
 		SET pm_unread = 0
@@ -1096,7 +1096,7 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 		$user->data['user_unread_privmsg'] -= $num_unread;
 	}
 
-	$phpbb_notifications->delete_notifications('phpbb_notification_type_pm', array_keys($delete_rows));
+	$phpbb_notifications->delete_notifications('pm', array_keys($delete_rows));
 
 	// Now we have to check which messages we can delete completely
 	$sql = 'SELECT msg_id
@@ -1277,7 +1277,7 @@ function phpbb_delete_users_pms($user_ids)
 					AND ' . $db->sql_in_set('msg_id', $delivered_msg);
 			$db->sql_query($sql);
 
-			$phpbb_notifications->delete_notifications('phpbb_notification_type_pm', $delivered_msg);
+			$phpbb_notifications->delete_notifications('pm', $delivered_msg);
 		}
 
 		if (!empty($undelivered_msg))
@@ -1290,7 +1290,7 @@ function phpbb_delete_users_pms($user_ids)
 				WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg);
 			$db->sql_query($sql);
 
-			$phpbb_notifications->delete_notifications('phpbb_notification_type_pm', $undelivered_msg);
+			$phpbb_notifications->delete_notifications('pm', $undelivered_msg);
 		}
 	}
 
@@ -1334,7 +1334,7 @@ function phpbb_delete_users_pms($user_ids)
 				WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
 			$db->sql_query($sql);
 
-			$phpbb_notifications->delete_notifications('phpbb_notification_type_pm', $delete_ids);
+			$phpbb_notifications->delete_notifications('pm', $delete_ids);
 		}
 	}
 
@@ -1879,11 +1879,11 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 
 	if ($mode == 'edit')
 	{
-		$phpbb_notifications->update_notifications('phpbb_notification_type_pm', $pm_data);
+		$phpbb_notifications->update_notifications('pm', $pm_data);
 	}
 	else
 	{
-		$phpbb_notifications->add_notifications('phpbb_notification_type_pm', $pm_data);
+		$phpbb_notifications->add_notifications('pm', $pm_data);
 	}
 
 	return $data['msg_id'];
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index 2a52a0b4fd..4ba1b2fd0c 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -90,7 +90,7 @@ class mcp_pm_reports
 					trigger_error('NO_REPORT');
 				}
 
-				$phpbb_notifications->mark_notifications_read_by_parent('phpbb_notification_type_report_pm', $report_id, $user->data['user_id']);
+				$phpbb_notifications->mark_notifications_read_by_parent('report_pm', $report_id, $user->data['user_id']);
 
 				$pm_id = $report['pm_id'];
 				$report_id = $report['report_id'];
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index f13ce914bf..4a3d443006 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -86,7 +86,7 @@ class mcp_queue
 					{
 						$post_id = (int) $topic_info[$topic_id]['topic_first_post_id'];
 
-						$phpbb_notifications->mark_notifications_read('phpbb_notification_type_topic_in_queue', $topic_id, $user->data['user_id']);
+						$phpbb_notifications->mark_notifications_read('topic_in_queue', $topic_id, $user->data['user_id']);
 					}
 					else
 					{
@@ -94,7 +94,7 @@ class mcp_queue
 					}
 				}
 
-				$phpbb_notifications->mark_notifications_read('phpbb_notification_type_post_in_queue', $post_id, $user->data['user_id']);
+				$phpbb_notifications->mark_notifications_read('post_in_queue', $post_id, $user->data['user_id']);
 
 				$post_info = get_post_data(array($post_id), 'm_approve', true);
 
@@ -610,28 +610,28 @@ function approve_post($post_id_list, $id, $mode)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
 			{
-				$phpbb_notifications->delete_notifications('phpbb_notification_type_topic_in_queue', $post_data['topic_id']);
+				$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
 
-				$phpbb_notifications->add_notifications('phpbb_notification_type_topic', $post_data);
+				$phpbb_notifications->add_notifications('topic', $post_data);
 
 				if ($notify_poster)
 				{
-					$phpbb_notifications->add_notifications('phpbb_notification_type_approve_topic', $post_data);
+					$phpbb_notifications->add_notifications('approve_topic', $post_data);
 				}
 			}
 			else
 			{
-				$phpbb_notifications->delete_notifications('phpbb_notification_type_post_in_queue', $post_id);
+				$phpbb_notifications->delete_notifications('post_in_queue', $post_id);
 
 				$phpbb_notifications->add_notifications(array(
-					'phpbb_notification_type_quote',
-					'phpbb_notification_type_bookmark',
-					'phpbb_notification_type_post',
+					'quote',
+					'bookmark',
+					'post',
 				), $post_data);
 
 				if ($notify_poster)
 				{
-					$phpbb_notifications->add_notifications('phpbb_notification_type_approve_post', $post_data);
+					$phpbb_notifications->add_notifications('approve_post', $post_data);
 				}
 			}
 		}
@@ -859,11 +859,11 @@ function disapprove_post($post_id_list, $id, $mode)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
 			{
-				$phpbb_notifications->delete_notifications('phpbb_notification_type_topic_in_queue', $post_data['topic_id']);
+				$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
 			}
 			else
 			{
-				$phpbb_notifications->delete_notifications('phpbb_notification_type_post_in_queue', $post_id);
+				$phpbb_notifications->delete_notifications('post_in_queue', $post_id);
 			}
 		}
 
@@ -909,14 +909,14 @@ function disapprove_post($post_id_list, $id, $mode)
 				{
 					if ($notify_poster)
 					{
-						$phpbb_notifications->add_notifications('phpbb_notification_type_disapprove_topic', $post_data);
+						$phpbb_notifications->add_notifications('disapprove_topic', $post_data);
 					}
 				}
 				else
 				{
 					if ($notify_poster)
 					{
-						$phpbb_notifications->add_notifications('phpbb_notification_type_disapprove_post', $post_data);
+						$phpbb_notifications->add_notifications('disapprove_post', $post_data);
 					}
 				}
 			}
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 41cdbc75d6..85723ab3f7 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -88,7 +88,7 @@ class mcp_reports
 					trigger_error('NO_REPORT');
 				}
 
-				$phpbb_notifications->mark_notifications_read('phpbb_notification_type_report_post', $post_id, $user->data['user_id']);
+				$phpbb_notifications->mark_notifications_read('report_post', $post_id, $user->data['user_id']);
 
 				if (!$report_id && $report['report_closed'])
 				{
@@ -647,20 +647,20 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 
 				if ($pm)
 				{
-					$phpbb_notifications->add_notifications('phpbb_notification_type_report_pm_closed', array_merge($post_info[$post_id], array(
+					$phpbb_notifications->add_notifications('report_pm_closed', array_merge($post_info[$post_id], array(
 						'reporter'			=> $reporter['user_id'],
 						'closer_id'			=> $user->data['user_id'],
 						'from_user_id'		=> $post_info[$post_id]['author_id'],
 					)));
-					$phpbb_notifications->delete_notifications('phpbb_notification_type_report_pm', $post_id);
+					$phpbb_notifications->delete_notifications('report_pm', $post_id);
 				}
 				else
 				{
-					$phpbb_notifications->add_notifications('phpbb_notification_type_report_post_closed', array_merge($post_info[$post_id], array(
+					$phpbb_notifications->add_notifications('report_post_closed', array_merge($post_info[$post_id], array(
 						'reporter'			=> $reporter['user_id'],
 						'closer_id'			=> $user->data['user_id'],
 					)));
-					$phpbb_notifications->delete_notifications('phpbb_notification_type_report_post', $post_id);
+					$phpbb_notifications->delete_notifications('report_post', $post_id);
 				}
 			}
 		}
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 3d0ada4a43..fbfe388c80 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -7,8 +7,6 @@
 *
 */
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
 /**
 * @ignore
 */
@@ -23,30 +21,24 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_notification_manager
 {
+	/** @var array */
+	protected $notification_types = null;
+
+	/** @var array */
+	protected $notification_methods = null;
+
 	/** @var ContainerBuilder */
 	protected $phpbb_container = null;
-	
-	/** @var dbal */
-	protected $db = null;
-
-	/** @var phpbb_cache_service */
-	protected $cache = null;
 
-	/** @var phpbb_template */
-	protected $template = null;
+	/** @var phpbb_user_loader */
+	protected $user_loader = null;
 
-	/** @var phpbb_extension_manager */
-	protected $extension_manager = null;
+	/** @var dbal */
+	protected $db = null;
 
 	/** @var phpbb_user */
 	protected $user = null;
 
-	/** @var phpbb_auth */
-	protected $auth = null;
-
-	/** @var phpbb_config */
-	protected $config = null;
-
 	/** @var string */
 	protected $phpbb_root_path = null;
 
@@ -59,23 +51,15 @@ class phpbb_notification_manager
 	/** @var string */
 	protected $user_notifications_table = null;
 
-	/**
-	* Users loaded from the DB
-	*
-	* @var array Array of user data that we've loaded from the DB
-	*/
-	protected $users = array();
-
-	public function __construct(ContainerBuilder $phpbb_container, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
+	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, dbal $db, $user, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
 	{
+		$this->notification_types = $notification_types;
+		$this->notification_methods = $notification_methods;
 		$this->phpbb_container = $phpbb_container;
+
+		$this->user_loader = $user_loader;
 		$this->db = $db;
-		$this->cache = $cache;
-		$this->template = $template;
-		$this->extension_manager = $extension_manager;
 		$this->user = $user;
-		$this->auth = $auth;
-		$this->config = $config;
 
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
@@ -209,7 +193,7 @@ class phpbb_notification_manager
 				$notifications[$row['notification_id']] = $notification;
 			}
 
-			$this->load_users($user_ids);
+			$this->user_loader->load_users($user_ids);
 
 			// Allow each type to load its own special items
 			foreach ($load_special as $item_type => $data)
@@ -334,7 +318,7 @@ class phpbb_notification_manager
 			return $notified_users;
 		}
 
-		$item_id = $item_type::get_item_id($data);
+		$item_id = $this->get_item_type_class($item_type)->get_item_id($data);
 
 		// find out which users want to receive this type of notification
 		$notify_users = $this->get_item_type_class($item_type)->find_users_for_notification($data, $options);
@@ -363,7 +347,7 @@ class phpbb_notification_manager
 			return;
 		}
 
-		$item_id = $item_type::get_item_id($data);
+		$item_id = $this->get_item_type_class($item_type)->get_item_id($data);
 
 		$user_ids = array();
 		$notification_objects = $notification_methods = array();
@@ -428,7 +412,7 @@ class phpbb_notification_manager
 		$this->db->sql_multi_insert($this->notifications_table, $new_rows);
 
 		// We need to load all of the users to send notifications
-		$this->load_users($user_ids);
+		$this->user_loader->load_users($user_ids);
 
 		// run the queue for each method to send notifications
 		foreach ($notification_methods as $method)
@@ -467,7 +451,7 @@ class phpbb_notification_manager
 			}
 		}
 
-		$item_id = $item_type::get_item_id($data);
+		$item_id = $notification->get_item_id($data);
 		$update_array = $notification->create_update_array($data);
 
 		$sql = 'UPDATE ' . $this->notifications_table . '
@@ -511,7 +495,7 @@ class phpbb_notification_manager
 	{
 		$subscription_types = array();
 
-		foreach ($this->phpbb_container->findTaggedServiceIds('notification.type') as $type_name => $data)
+		foreach ($this->notification_types as $type_name => $data)
 		{
 			$type = $this->get_item_type_class($type_name);
 
@@ -547,7 +531,7 @@ class phpbb_notification_manager
 	{
 		$subscription_methods = array();
 
-		foreach ($this->phpbb_container->findTaggedServiceIds('notification.method') as $method_name => $data)
+		foreach ($this->notification_methods as $method_name => $data)
 		{
 			$method = $this->get_method_class($method_name);
 
@@ -759,63 +743,48 @@ class phpbb_notification_manager
 	}
 
 	/**
-	* Load user helper
-	*
-	* @param array $user_ids
+	* Helper to get the notifications item type class and set it up
 	*/
-	public function load_users($user_ids)
+	public function get_item_type_class($item_type, $data = array())
 	{
-		$user_ids[] = ANONYMOUS;
-
-		// Load the users
-		$user_ids = array_unique($user_ids);
-
-		// Do not load users we already have in $this->users
-		$user_ids = array_diff($user_ids, array_keys($this->users));
+		$item = $this->load_object('notification.type.' . $item_type);
 
-		if (sizeof($user_ids))
-		{
-			$sql = 'SELECT *
-				FROM ' . USERS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
-			$result = $this->db->sql_query($sql);
+		$item->set_initial_data($data);
 
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$this->users[$row['user_id']] = $row;
-			}
-			$this->db->sql_freeresult($result);
-		}
+		return $item;
 	}
 
 	/**
-	* Get a user row from our users cache
-	*
-	* @param int $user_id
-	* @return array
+	* Helper to get the notifications method class and set it up
 	*/
-	public function get_user($user_id)
+	public function get_method_class($method_name)
 	{
-		return (isset($this->users[$user_id])) ? $this->users[$user_id] : $this->users[ANONYMOUS];
+		return $this->load_object('notification.method.' . $method_name);
 	}
 
 	/**
-	* Helper to get the notifications item type class and set it up
+	* Helper to load objects (notification types/methods)
 	*/
-	public function get_item_type_class($item_type, $data = array())
+	protected function load_object($object_name)
 	{
-		$item = $this->phpbb_container->get($item_type);
+		// Here we cannot just use ContainerBuilder->get(name)
+		// The reason for this is because get handles services
+		// which are initialized once and shared. Here we need
+		// separate new objects because we pass around objects
+		// that store row data in each object, which would lead
+		// to over-writing of data if we used get()
 
-		$item->set_initial_data($data);
+		$parameterBag = $this->phpbb_container->getParameterBag();
+		$definition = $this->phpbb_container->getDefinition($object_name);
+        $arguments = $this->phpbb_container->resolveServices(
+            $parameterBag->unescapeValue($parameterBag->resolveValue($definition->getArguments()))
+        );
+		$r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass()));
 
-		return $item;
-	}
+		$object = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
 
-	/**
-	* Helper to get the notifications method class and set it up
-	*/
-	public function get_method_class($method_name)
-	{
-		return $this->phpbb_container->get($method_name);
+		$object->set_notification_manager($this);
+
+		return $object;
 	}
 }
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index 88ec2674be..3f85d62a09 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -24,6 +24,9 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	/** @var phpbb_notification_manager */
 	protected $notification_manager = null;
 
+	/** @var phpbb_user_loader */
+	protected $user_loader = null;
+
 	/** @var dbal */
 	protected $db = null;
 
@@ -58,13 +61,11 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	*/
 	protected $queue = array();
 
-	public function __construct(phpbb_notification_manager $notification_manager, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_user_loader $user_loader, dbal $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
-		$this->notification_manager = $notification_manager;
+		$this->user_loader = $user_loader;
 		$this->db = $db;
 		$this->cache = $cache;
-		$this->template = $template;
-		$this->extension_manager = $extension_manager;
 		$this->user = $user;
 		$this->auth = $auth;
 		$this->config = $config;
@@ -72,6 +73,11 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 		$this->php_ext = $php_ext;
 	}
 
+	public function set_notification_manager(phpbb_notification_manager $notification_manager)
+	{
+		$this->notification_manager = $notification_manager;
+	}
+
 	/**
 	* Add a notification to the queue
 	*
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index 2ff30b177f..429dfda2ba 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -82,7 +82,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 		$banned_users = phpbb_get_banned_user_ids($user_ids);
 
 		// Load all the users we need
-		$this->notification_manager->load_users($user_ids);
+		$this->user_loader->load_users($user_ids);
 
 		// Load the messenger
 		if (!class_exists('messenger'))
@@ -100,7 +100,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 				continue;
 			}
 
-			$user = $this->notification_manager->get_user($notification->user_id);
+			$user = $this->user_loader->get_user($notification->user_id);
 
 			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
 			{
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 419dce3dd0..d596c06167 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -24,6 +24,9 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/** @var phpbb_notification_manager */
 	protected $notification_manager = null;
 
+	/** @var phpbb_user_loader */
+	protected $user_loader = null;
+
 	/** @var dbal */
 	protected $db = null;
 
@@ -33,9 +36,6 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/** @var phpbb_template */
 	protected $template = null;
 
-	/** @var phpbb_extension_manager */
-	protected $extension_manager = null;
-
 	/** @var phpbb_user */
 	protected $user = null;
 
@@ -84,13 +84,11 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	private $data = array();
 
-	public function __construct(phpbb_notification_manager $notification_manager, dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, phpbb_extension_manager $extension_manager, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
+	public function __construct(phpbb_user_loader $user_loader, dbal $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
 	{
-		$this->notification_manager = $notification_manager;
+		$this->user_loader = $user_loader;
 		$this->db = $db;
 		$this->cache = $cache;
-		$this->template = $template;
-		$this->extension_manager = $extension_manager;
 		$this->user = $user;
 		$this->auth = $auth;
 		$this->config = $config;
@@ -102,6 +100,11 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		$this->user_notifications_table = $user_notifications_table;
 	}
 
+	public function set_notification_manager(phpbb_notification_manager $notification_manager)
+	{
+		$this->notification_manager = $notification_manager;
+	}
+
 	/**
 	* Set initial data from the database
 	*
@@ -357,7 +360,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		$rowset = $resulting_user_ids = array();
 
 		$sql = 'SELECT user_id, method, notify
-			FROM ' . USER_NOTIFICATIONS_TABLE . '
+			FROM ' . $this->user_notifications_table . '
 			WHERE ' . $this->db->sql_in_set('user_id', $user_ids) . "
 				AND item_type = '" . $this->db->sql_escape($options['item_type']) . "'
 				AND item_id = " . (int) $options['item_id'];
@@ -394,24 +397,6 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		return $rowset;
 	}
 
-	/**
-	* Get avatar helper
-	*
-	* @param int $user_id
-	* @return string
-	*/
-	protected function get_user_avatar($user_id)
-	{
-		$user = $this->notification_manager->get_user($user_id);
-
-		if (!function_exists('get_user_avatar'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
-		}
-
-		return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height'], $user['username'], false, 'notifications-avatar');
-	}
-
 	/**
 	* Mark this item read/unread helper
 	*
@@ -435,7 +420,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 			return $where;
 		}
 
-		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+		$sql = 'UPDATE ' . $this->notifications_table . '
 			SET unread = ' . (int) $this->unread . '
 			WHERE ' . $where;
 		$this->db->sql_query($sql);
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index a40bbde5e4..a17d8f5db7 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -102,7 +102,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
 		$sql = 'SELECT *
-			FROM ' . NOTIFICATIONS_TABLE . "
+			FROM ' . $this->notifications_table . "
 			WHERE item_type = '" . $this->get_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
@@ -114,7 +114,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 			unset($notify_users[$row['user_id']]);
 
 			$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
-			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+			$sql = 'UPDATE ' . $this->notifications_table . '
 				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
 				WHERE notification_id = ' . $row['notification_id'];
 			$this->db->sql_query($sql);
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index fbdf351062..1eaeb1a250 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -92,7 +92,7 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 
 		unset($pm['recipients'][$pm['from_user_id']]);
 
-		$this->notification_manager->load_users(array_keys($pm['recipients']));
+		$this->user_loader->load_users(array_keys($pm['recipients']));
 
 		return $this->check_user_notification_options(array_keys($pm['recipients']), $options);
 	}
@@ -102,7 +102,7 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 	*/
 	public function get_avatar()
 	{
-		return $this->get_user_avatar($this->get_data('from_user_id'));
+		return $this->user_loader->get_avatar($this->get_data('from_user_id'));
 	}
 
 	/**
@@ -112,7 +112,7 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 	*/
 	public function get_title()
 	{
-		$user_data = $this->notification_manager->get_user($this->get_data('from_user_id'));
+		$user_data = $this->user_loader->get_user($this->get_data('from_user_id'));
 
 		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 
@@ -136,7 +136,7 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 	*/
 	public function get_email_template_variables()
 	{
-		$user_data = $this->notification_manager->get_user($this->get_data('from_user_id'));
+		$user_data = $this->user_loader->get_user($this->get_data('from_user_id'));
 
 		return array(
 			'AUTHOR_NAME'				=> htmlspecialchars_decode($user_data['username']),
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index a99558efe7..7e06779982 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -123,7 +123,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
 		$sql = 'SELECT *
-			FROM ' . NOTIFICATIONS_TABLE . "
+			FROM ' . $this->notifications_table . "
 			WHERE item_type = '" . $this->get_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
@@ -135,7 +135,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			unset($notify_users[$row['user_id']]);
 
 			$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
-			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+			$sql = 'UPDATE ' . $this->notifications_table . '
 				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
 				WHERE notification_id = ' . $row['notification_id'];
 			$this->db->sql_query($sql);
@@ -150,7 +150,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 	*/
 	public function get_avatar()
 	{
-		return $this->get_user_avatar($this->get_data('poster_id'));
+		return $this->user_loader->get_avatar($this->get_data('poster_id'));
 	}
 
 	/**
@@ -181,7 +181,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			}
 			else
 			{
-				$user_data = $this->notification_manager->get_user($responder['poster_id']);
+				$user_data = $this->user_loader->get_user($responder['poster_id']);
 
 				$usernames[] = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 			}
@@ -217,7 +217,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		}
 		else
 		{
-			$user_data = $this->notification_manager->get_user($this->get_data('poster_id'));
+			$user_data = $this->user_loader->get_user($this->get_data('poster_id'));
 
 			$username = get_username_string('username', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 		}
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index f45bb1ae7d..1796343a0e 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -121,7 +121,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
 		$sql = 'SELECT *
-			FROM ' . NOTIFICATIONS_TABLE . "
+			FROM ' . $this->notifications_table . "
 			WHERE item_type = '" . $this->get_type() . "'
 				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
 				AND unread = 1
@@ -133,7 +133,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 			unset($notify_users[$row['user_id']]);
 
 			$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
-			$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+			$sql = 'UPDATE ' . $this->notifications_table . '
 				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
 				WHERE notification_id = ' . $row['notification_id'];
 			$this->db->sql_query($sql);
@@ -152,7 +152,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 	{
 		$old_notifications = array();
 		$sql = 'SELECT user_id
-			FROM ' . NOTIFICATIONS_TABLE . "
+			FROM ' . $this->notifications_table . "
 			WHERE item_type = '" . $this->get_type() . "'
 				AND item_id = " . self::get_item_id($post) . '
 				AND is_enabled = 1';
@@ -182,7 +182,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		// Remove the necessary notifications
 		if (!empty($remove_notifications))
 		{
-			$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
+			$sql = 'DELETE FROM ' . $this->notifications_table . "
 				WHERE item_type = '" . $this->get_type() . "'
 					AND item_id = " . self::get_item_id($post) . '
 					AND ' . $this->db->sql_in_set('user_id', $remove_notifications);
@@ -210,7 +210,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 	*/
 	public function get_email_template_variables()
 	{
-		$user_data = $this->notification_manager->get_user($this->get_data('poster_id'));
+		$user_data = $this->user_loader->get_user($this->get_data('poster_id'));
 
 		return array_merge(parent::get_email_template_variables(), array(
 			'AUTHOR_NAME'		=> htmlspecialchars_decode($user_data['username']),
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 9bdc59a4ef..73e22dc83b 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -160,7 +160,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	{
 		$this->user->add_lang('mcp');
 
-		$user_data = $this->notification_manager->get_user($this->get_data('reporter_id'));
+		$user_data = $this->user_loader->get_user($this->get_data('reporter_id'));
 
 		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 
@@ -197,7 +197,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	*/
 	public function get_avatar()
 	{
-		return $this->get_user_avatar($this->get_data('reporter_id'));
+		return $this->user_loader->get_avatar($this->get_data('reporter_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index de87c9f760..51e5204304 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -106,7 +106,7 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
 	*/
 	public function get_title()
 	{
-		$user_data = $this->notification_manager->get_user($this->get_data('closer_id'));
+		$user_data = $this->user_loader->get_user($this->get_data('closer_id'));
 
 		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index d80c7b754f..2508644b0b 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -127,7 +127,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	{
 		$this->user->add_lang('mcp');
 
-		$user_data = $this->notification_manager->get_user($this->get_data('reporter_id'));
+		$user_data = $this->user_loader->get_user($this->get_data('reporter_id'));
 
 		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 
@@ -164,7 +164,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	*/
 	public function get_avatar()
 	{
-		return $this->get_user_avatar($this->get_data('reporter_id'));
+		return $this->user_loader->get_avatar($this->get_data('reporter_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index cde0ff85a8..a7016a8f3d 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -106,7 +106,7 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
 	*/
 	public function get_title()
 	{
-		$user_data = $this->notification_manager->get_user($this->get_data('closer_id'));
+		$user_data = $this->user_loader->get_user($this->get_data('closer_id'));
 
 		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 
@@ -122,7 +122,7 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
 	*/
 	public function get_avatar()
 	{
-		return $this->get_user_avatar($this->get_data('closer_id'));
+		return $this->user_loader->get_avatar($this->get_data('closer_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 4eb03194f5..6e9347d4a8 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -126,7 +126,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 	*/
 	public function get_avatar()
 	{
-		return $this->get_user_avatar($this->get_data('poster_id'));
+		return $this->user_loader->get_avatar($this->get_data('poster_id'));
 	}
 
 	/**
@@ -142,7 +142,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		}
 		else
 		{
-			$user_data = $this->notification_manager->get_user($this->get_data('poster_id'));
+			$user_data = $this->user_loader->get_user($this->get_data('poster_id'));
 
 			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 		}
@@ -178,7 +178,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		}
 		else
 		{
-			$user_data = $this->notification_manager->get_user($this->get_data('poster_id'));
+			$user_data = $this->user_loader->get_user($this->get_data('poster_id'));
 
 			$username = get_username_string('username', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
 		}
diff --git a/phpBB/includes/user_loader.php b/phpBB/includes/user_loader.php
new file mode 100644
index 0000000000..a530f21f75
--- /dev/null
+++ b/phpBB/includes/user_loader.php
@@ -0,0 +1,118 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* User loader class
+*
+* This handles loading users from the database and
+* storing in them in a temporary cache so we do not
+* have to query the same user multiple times in
+* different services.
+*/
+class phpbb_user_loader
+{
+	/** @var dbal */
+	protected $db = null;
+
+	/** @var string */
+	protected $phpbb_root_path = null;
+
+	/** @var string */
+	protected $php_ext = null;
+
+	/** @var string */
+	protected $users_table = null;
+
+	/**
+	* Users loaded from the DB
+	*
+	* @var array Array of user data that we've loaded from the DB
+	*/
+	protected $users = array();
+
+	public function __construct(dbal $db, $phpbb_root_path, $php_ext, $users_table)
+	{
+		$this->db = $db;
+
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+
+		$this->users_table = $users_table;
+	}
+
+	/**
+	* Load user helper
+	*
+	* @param array $user_ids
+	*/
+	public function load_users(array $user_ids)
+	{
+		$user_ids[] = ANONYMOUS;
+
+		// Load the users
+		$user_ids = array_unique($user_ids);
+
+		// Do not load users we already have in $this->users
+		$user_ids = array_diff($user_ids, array_keys($this->users));
+
+		if (sizeof($user_ids))
+		{
+			$sql = 'SELECT *
+				FROM ' . $this->users_table . '
+				WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$this->users[$row['user_id']] = $row;
+			}
+			$this->db->sql_freeresult($result);
+		}
+	}
+
+	/**
+	* Get a user row from our users cache
+	*
+	* @param int $user_id
+	* @return array|bool Row from the database of the user or Anonymous if the user wasn't loaded/does not exist
+	* 						or bool False if the anonymous user was not loaded
+	*/
+	public function get_user($user_id)
+	{
+		return (isset($this->users[$user_id])) ? $this->users[$user_id] : (isset($this->users[ANONYMOUS]) ? $this->users[ANONYMOUS] : false);
+	}
+
+	/**
+	* Get avatar
+	*
+	* @param int $user_id
+	* @return string
+	*/
+	public function get_avatar($user_id)
+	{
+		if (!($user = $this->get_user($user_id)))
+		{
+			return '';
+		}
+
+		if (!function_exists('get_user_avatar'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+		}
+
+		return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height']);
+	}
+}
\ No newline at end of file
-- 
cgit v1.2.1


From 570c5ad3c08378f377385aaff7d3810ccb8db3ff Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 20 Nov 2012 23:12:37 -0600
Subject: [ticket/11103] Some comments

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index fbfe388c80..ea91496fb9 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -78,10 +78,15 @@ class phpbb_notification_manager
 	*				order_dir			Order direction (Default: DESC)
 	* 				limit				Number of notifications to load (Default: 5)
 	* 				start				Notifications offset (Default: 0)
-	* 				all_unread			Load all unread messages? If set to true, count_unread is set to true (Default: false)
-	* 				count_unread		Count all unread messages? (Default: false)
+	* 				all_unread			Load all unread notifications? If set to true, count_unread is set to true (Default: false)
+	* 				count_unread		Count all unread notifications? (Default: false)
+	* 				count_total			Count all notifications? (Default: false)
+	* @return array Array of information based on the request with keys:
+	*	'notifications'		array of notification type objects
+	*	'unread_count'		number of unread notifications the user has if count_unread is true in the options
+	*	'total_count'		number of notifications the user has if count_total is true in the options
 	*/
-	public function load_notifications($options = array())
+	public function load_notifications(array $options = array())
 	{
 		// Merge default options
 		$options = array_merge(array(
@@ -297,8 +302,11 @@ class phpbb_notification_manager
 	*			Note: If you send an array of types, any user who could receive multiple notifications from this single item will only receive
 	* 			a single notification. If they MUST receive multiple notifications, call this function multiple times instead of sending an array
 	* @param array $data Data specific for this type that will be inserted
+	* @param array $options Optional options to control what notifications are loaded
+	* 			ignore_users	array of data to specify which users should not receive certain types of notifications
+	* @return array Information about what users were notified and how they were notified
 	*/
-	public function add_notifications($item_type, $data, $options = array())
+	public function add_notifications($item_type, $data, array $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
-- 
cgit v1.2.1


From b7b14f9a056190c6a01c98f6eec9e60ad73d7564 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 21 Nov 2012 16:20:14 +0100
Subject: [feature/avatars] Use constant for URL and fix usage of getimagesize

We now use a constant for the gravatar URL. Additionally the usage of
getimagesize() was reduced. It should only be run if the user didn't
specify both the width and height of the avatar.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/gravatar.php | 55 ++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 036800fd45..a73a28a234 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -21,6 +21,8 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 {
+	const GRAVATAR_URL = 'https://secure.gravatar.com/avatar/';
+
 	/**
 	* @inheritdoc
 	*/
@@ -54,8 +56,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	*/
 	public function get_custom_html($row, $ignore_config = false, $alt = '')
 	{
-		$html = '<img src="https://secure.gravatar.com/avatar/' . md5(strtolower(trim($row['avatar']))) .  
-			(($row['avatar_width'] || $row['avatar_height']) ? ('?s=' . max($row['avatar_width'], $row['avatar_height'])) : '') . '" ' .
+		$html = '<img src="' . $this->get_gravatar_url($row) . '" ' .
 			($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') .
 			($row['avatar_height'] ? ('height="' . $row['avatar_height'] . '" ') : '') .
 			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
@@ -81,14 +82,14 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	*/
 	public function process_form($template, $row, &$error)
 	{
-		$email = $this->request->variable('av_gravatar_email', '');
-		$width = $this->request->variable('av_gravatar_width', 0);
-		$height = $this->request->variable('av_gravatar_height', 0);
+		$row['avatar'] = $this->request->variable('av_gravatar_email', '');
+		$row['avatar_width'] = $this->request->variable('av_gravatar_width', 0);
+		$row['avatar_height'] = $this->request->variable('av_gravatar_height', 0);
 
 		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx);
 
 		$error = array_merge($error, validate_data(array(
-			'email' => $email,
+			'email' => $row['avatar'],
 		), array(
 			'email' => array(
 				array('string', false, 6, 60),
@@ -101,12 +102,16 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 		}
 
 		// Make sure getimagesize works...
-		if (function_exists('getimagesize'))
+		if (function_exists('getimagesize') && ($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0))
 		{
-			// build URL
-			$url = 'https://secure.gravatar.com/' . md5(strtolower(trim($email)));
+			/**
+			* default to the minimum of the maximum allowed avatar size if the size
+			* is not or only partially entered
+			*/
+			$row['avatar_width'] = $row['avatar_height'] = min($this->config['avatar_max_width'], $this->config['avatar_max_height']);
+			$url = $this->get_gravatar_url($row);
 
-			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
+			if (($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0) && (($image_data = @getimagesize($url)) === false))
 			{
 				$error[] = 'UNABLE_GET_IMAGE_SIZE';
 				return false;
@@ -118,20 +123,38 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 				return false;
 			}
 
-			$width = ($width && $height) ? $width : $image_data[0];
-			$height = ($width && $height) ? $height : $image_data[1];
+			$row['avatar_width'] = ($row['avatar_width'] && $row['avatar_height']) ? $row['avatar_width'] : $image_data[0];
+			$row['avatar_height'] = ($row['avatar_width'] && $row['avatar_height']) ? $row['avatar_height'] : $image_data[1];
 		}
 
-		if ($width <= 0 || $height <= 0)
+		if ($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0)
 		{
 			$error[] = 'AVATAR_NO_SIZE';
 			return false;
 		}
 
 		return array(
-			'avatar' => $email,
-			'avatar_width' => $width,
-			'avatar_height' => $height,
+			'avatar' => $row['avatar'],
+			'avatar_width' => $row['avatar_width'],
+			'avatar_height' => $row['avatar_height'],
 		);
 	}
+
+	/**
+	* Build gravatar URL for output on page
+	*
+	* @return string The gravatar URL
+	*/
+	protected function get_gravatar_url($row)
+	{
+		$url = self::GRAVATAR_URL;
+		$url .=  md5(strtolower(trim($row['avatar'])));
+
+		if ($row['avatar_width'] || $row['avatar_height'])
+		{
+			$url .= '?s=' . max($row['avatar_width'], $row['avatar_height']);
+		}
+
+		return $url;
+	}
 }
-- 
cgit v1.2.1


From 9b61204a17386742d3d3ec579ee8dcfe50cbf5a4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 21 Nov 2012 16:27:20 +0100
Subject: [feature/avatars] Check if gravatar is within min/max width/height

PHPBB3-10018
---
 phpBB/includes/avatar/driver/gravatar.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index a73a28a234..f0ab2ab548 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -132,6 +132,24 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 			$error[] = 'AVATAR_NO_SIZE';
 			return false;
 		}
+		
+		if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
+		{
+			if ($row['avatar_width'] > $this->config['avatar_max_width'] || $row['avatar_height'] > $this->config['avatar_max_height'])
+			{
+				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $row['avatar_width'], $row['avatar_height']);
+				return false;
+			}
+		}
+
+		if ($this->config['avatar_min_width'] || $this->config['avatar_min_height'])
+		{
+			if ($row['avatar_width'] < $this->config['avatar_min_width'] || $row['avatar_height'] < $this->config['avatar_min_height'])
+			{
+				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $row['avatar_width'], $row['avatar_height']);
+				return false;
+			}
+		}
 
 		return array(
 			'avatar' => $row['avatar'],
-- 
cgit v1.2.1


From 726d1a16d704630a9a028010c7420bea837738d4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 21 Nov 2012 17:15:35 +0100
Subject: [feature/avatars] Move avatar specific settings to drivers

PHPBB3-10018
---
 phpBB/includes/acp/acp_board.php           | 24 +++++++++++++++---------
 phpBB/includes/avatar/driver/driver.php    |  8 ++++++++
 phpBB/includes/avatar/driver/gravatar.php  | 10 ++++++++++
 phpBB/includes/avatar/driver/interface.php |  7 +++++++
 phpBB/includes/avatar/driver/local.php     | 11 +++++++++++
 phpBB/includes/avatar/driver/remote.php    | 10 ++++++++++
 phpBB/includes/avatar/driver/upload.php    | 15 +++++++++++++++
 7 files changed, 76 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 4ad0b38708..5852f512cd 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -28,7 +28,7 @@ class acp_board
 	{
 		global $db, $user, $auth, $template;
 		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
-		global $cache;
+		global $cache, $phpbb_avatar_manager;
 
 		$user->add_lang('acp/board');
 
@@ -107,6 +107,15 @@ class acp_board
 			break;
 
 			case 'avatar':
+				$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
+				sort($avatar_drivers);
+				$avatar_vars = array();
+				foreach ($avatar_drivers as $driver)
+				{
+					$avatar = $phpbb_avatar_manager->get_driver($driver);
+					$avatar_vars += $avatar->prepare_form_acp();
+				}
+
 				$display_vars = array(
 					'title'	=> 'ACP_AVATAR_SETTINGS',
 					'vars'	=> array(
@@ -118,18 +127,15 @@ class acp_board
 						'avatar_max_height'		=> array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false),
 
 						'allow_avatar'			=> array('lang' => 'ALLOW_AVATARS',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'allow_avatar_gravatar'	=> array('lang' => 'ALLOW_GRAVATAR',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_avatar_local'	=> array('lang' => 'ALLOW_LOCAL',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_avatar_remote'	=> array('lang' => 'ALLOW_REMOTE',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'allow_avatar_upload'	=> array('lang' => 'ALLOW_UPLOAD',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-						'allow_avatar_remote_upload'=> array('lang' => 'ALLOW_REMOTE_UPLOAD', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'avatar_filesize'		=> array('lang' => 'MAX_FILESIZE',			'validate' => 'int:0',	'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
 						'avatar_min'			=> array('lang' => 'MIN_AVATAR_SIZE',		'validate' => 'int:0',	'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 						'avatar_max'			=> array('lang' => 'MAX_AVATAR_SIZE',		'validate' => 'int:0',	'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'avatar_path'			=> array('lang' => 'AVATAR_STORAGE_PATH',	'validate' => 'rwpath',	'type' => 'text:20:255', 'explain' => true),
-						'avatar_gallery_path'	=> array('lang' => 'AVATAR_GALLERY_PATH',	'validate' => 'rpath',	'type' => 'text:20:255', 'explain' => true),
 					)
 				);
+
+				if (sizeof($avatar_vars))
+				{
+					$display_vars['vars'] += $avatar_vars;
+				}
 			break;
 
 			case 'message':
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index ef0c8ce44e..710d3dfe20 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -126,6 +126,14 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 		return false;
 	}
 
+	/**
+	* @inheritdoc
+	**/
+	public function prepare_form_acp()
+	{
+		return array();
+	}
+
 	/**
 	* @inheritdoc
 	**/
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index f0ab2ab548..58ac535e6b 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -77,6 +77,16 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 		return true;
 	}
 
+	/**
+	* @inheritdoc
+	**/
+	public function prepare_form_acp()
+	{
+		return array(
+			'allow_avatar_gravatar'	=> array('lang' => 'ALLOW_GRAVATAR',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
+		);
+	}
+
 	/**
 	* @inheritdoc
 	*/
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 11dbffa65d..28220d79f2 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -62,6 +62,13 @@ interface phpbb_avatar_driver_interface
 	**/
 	public function prepare_form($template, $row, &$error);
 
+	/**
+	* Prepare form for changing the acp settings of this avatar
+	*
+	* @return array Return the array containing the acp settings
+	**/
+	public function prepare_form_acp();
+
 	/**
 	* Process form data
 	*
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index d0ad8708b0..f3c0d516af 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -109,6 +109,17 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 		return true;
 	}
 
+	/**
+	* @inheritdoc
+	**/
+	public function prepare_form_acp()
+	{
+		return array(
+			'allow_avatar_local'	=> array('lang' => 'ALLOW_LOCAL',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
+			'avatar_gallery_path'	=> array('lang' => 'AVATAR_GALLERY_PATH',	'validate' => 'rpath',	'type' => 'text:20:255', 'explain' => true),
+		);
+	}
+
 	/**
 	* @inheritdoc
 	*/
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 3c06209352..61ea0ebaf0 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -58,6 +58,16 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 		return true;
 	}
 
+	/**
+	* @inheritdoc
+	**/
+	public function prepare_form_acp()
+	{
+		return array(
+			'allow_avatar_remote'	=> array('lang' => 'ALLOW_REMOTE',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+		);
+	}
+
 	/**
 	* @inheritdoc
 	*/
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 9475cad7a1..77cd81c8c9 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -122,6 +122,21 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 		);
 	}
 
+	/**
+	* @inheritdoc
+	**/
+	public function prepare_form_acp()
+	{
+		global $user;
+
+		return array(
+			'allow_avatar_upload'	=> array('lang' => 'ALLOW_UPLOAD',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
+			'allow_avatar_remote_upload'=> array('lang' => 'ALLOW_REMOTE_UPLOAD', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+			'avatar_filesize'		=> array('lang' => 'MAX_FILESIZE',			'validate' => 'int:0',	'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
+			'avatar_path'			=> array('lang' => 'AVATAR_STORAGE_PATH',	'validate' => 'rwpath',	'type' => 'text:20:255', 'explain' => true),
+		);
+	}
+
 	/**
 	* @inheritdoc
 	*/
-- 
cgit v1.2.1


From 8c782122c1bafe6f232af6d9f395aa534c4d7dc1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 21 Nov 2012 17:24:02 +0100
Subject: [feature/avatars] Use in_array() and fix tabbing

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 0d36118dbc..8255fb0759 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -70,16 +70,16 @@ class phpbb_avatar_manager
 		{
 			case AVATAR_GALLERY:
 				$avatar_type = 'avatar.driver.local';
-				break;
+			break;
 			case AVATAR_UPLOAD:
 				$avatar_type = 'avatar.driver.upload';
-				break;
+			break;
 			case AVATAR_REMOTE:
 				$avatar_type = 'avatar.driver.remote';
-				break;
+			break;
 		}
 
-		if (false === array_search($avatar_type, self::$valid_drivers))
+		if (!in_array($avatar_type, self::$valid_drivers))
 		{
 			return null;
 		}
-- 
cgit v1.2.1


From 01b313ea262dc7c7a3399c03758ffd1ba24d1ff4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 21 Nov 2012 19:20:39 +0100
Subject: [feature/avatars] Use isset() instead of in_array()

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 8255fb0759..da9d843947 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -79,7 +79,7 @@ class phpbb_avatar_manager
 			break;
 		}
 
-		if (!in_array($avatar_type, self::$valid_drivers))
+		if (!isset(self::$valid_drivers[$avatar_type]))
 		{
 			return null;
 		}
@@ -109,7 +109,7 @@ class phpbb_avatar_manager
 			self::$valid_drivers = array();
 			foreach ($this->avatar_drivers as $driver)
 			{
-				self::$valid_drivers[] = $driver->get_name();
+				self::$valid_drivers[$driver->get_name()] = $driver->get_name();
 			}
 		}
 	}
-- 
cgit v1.2.1


From 24ac0393360aed07a17b7acaca0add6083cf8ddd Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 21 Nov 2012 19:51:46 +0100
Subject: [feature/avatars] Get rid of array_keys() in gallery avatar

PHPBB3-10018
---
 phpBB/includes/avatar/driver/local.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index f3c0d516af..a206f5b1b0 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -52,9 +52,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 		$avatar_list = $this->get_avatar_list();
 		$category = $this->request->variable('av_local_cat', '');
 
-		$categories = array_keys($avatar_list);
-
-		foreach ($categories as $cat)
+		foreach ($avatar_list as $cat => $null)
 		{
 			if (!empty($avatar_list[$cat]))
 			{
@@ -63,6 +61,11 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 					'SELECTED' => ($cat == $category),
 				));
 			}
+			
+			if ($cat != $category)
+			{
+				unset($avatar_list[$cat]);
+			}
 		}
 
 		if (!empty($avatar_list[$category]))
-- 
cgit v1.2.1


From 8a01bc171837be40818f285035ccefa5ac819213 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 21 Nov 2012 21:42:42 +0100
Subject: [feature/avatars] Use RecursiveDirectoryIterator for gallery avatar

RecursiveDirectoryIterator is now used for populating the avatar list
array of the gallery avatar.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/local.php | 54 +++++++++++++---------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index a206f5b1b0..8ac511f909 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -159,45 +159,33 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 			$avatar_list = array();
 			$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
 
-			$dh = @opendir($path);
-
-			if ($dh)
+			$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS | FilesystemIterator::UNIX_PATHS), RecursiveIteratorIterator::SELF_FIRST);
+			foreach ($iterator as $file_info)
 			{
-				while (($cat = readdir($dh)) !== false)
+				$file_path = $file_info->getPath();
+				$image = $file_info->getFilename();
+
+				// Match all images in the gallery folder
+				if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image) && is_file($file_path . '/' . $image))
 				{
-					if ($cat[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $cat) && is_dir("$path/$cat"))
+					if (function_exists('getimagesize'))
 					{
-						if ($ch = @opendir("$path/$cat"))
-						{
-							while (($image = readdir($ch)) !== false)
-							{
-								// Match all images in the gallery folder
-								if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image))
-								{
-									if (function_exists('getimagesize'))
-									{
-										$dims = getimagesize($this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $cat . '/' . $image);
-									}
-									else
-									{
-										$dims = array(0, 0);
-									}
-									$avatar_list[$cat][$image] = array(
-										'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
-										'filename'  => rawurlencode($image),
-										'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
-										'width'     => $dims[0],
-										'height'    => $dims[1],
-									);
-								}
-							}
-							@closedir($ch);
-						}
+						$dims = getimagesize($file_path . '/' . $image);
 					}
+					else
+					{
+						$dims = array(0, 0);
+					}
+					$cat = str_replace("$path/", '', $file_path);
+					$avatar_list[$cat][$image] = array(
+						'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
+						'filename'  => rawurlencode($image),
+						'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
+						'width'     => $dims[0],
+						'height'    => $dims[1],
+					);
 				}
-				@closedir($dh);
 			}
-
 			@ksort($avatar_list);
 
 			if ($this->cache != null)
-- 
cgit v1.2.1


From c911a34b5b7541b46ee2408da366d2dc7c302090 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 21 Nov 2012 16:04:01 -0600
Subject: [ticket/11103] Do not prepend notification.(type|method) unless
 necessary

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index ea91496fb9..4c25fa72f0 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -755,7 +755,9 @@ class phpbb_notification_manager
 	*/
 	public function get_item_type_class($item_type, $data = array())
 	{
-		$item = $this->load_object('notification.type.' . $item_type);
+		$item_type = (strpos($item_type, 'notification.type.') === 0) ? $item_type : 'notification.type.' . $item_type;
+
+		$item = $this->load_object($item_type);
 
 		$item->set_initial_data($data);
 
@@ -767,7 +769,9 @@ class phpbb_notification_manager
 	*/
 	public function get_method_class($method_name)
 	{
-		return $this->load_object('notification.method.' . $method_name);
+		$method_name = (strpos($method_name, 'notification.method.') === 0) ? $method_name : 'notification.method.' . $method_name;
+
+		return $this->load_object($method_name);
 	}
 
 	/**
-- 
cgit v1.2.1


From 5289dc52a322f760b6a2108f5fed1b4ff365e1d4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 22 Nov 2012 00:00:45 +0100
Subject: [feature/avatars] Add support for modularized avatars to ucp groups

This seems to be the last component where the new avatars system was still
missing.

PHPBB3-10018
---
 phpBB/includes/ucp/ucp_groups.php | 184 +++++++++++++++++++-------------------
 1 file changed, 91 insertions(+), 93 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 3aa6146081..1d469814b6 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -27,7 +27,7 @@ class ucp_groups
 	{
 		global $config, $phpbb_root_path, $phpEx;
 		global $db, $user, $auth, $cache, $template;
-		global $request;
+		global $request, $phpbb_avatar_manager;
 
 		$user->add_lang('groups');
 
@@ -438,7 +438,7 @@ class ucp_groups
 					$group_name = $group_row['group_name'];
 					$group_type = $group_row['group_type'];
 
-					$avatar_img = (!empty($group_row['group_avatar'])) ? get_group_avatar($group_row) : '<img src="' . $phpbb_root_path . 'adm/images/no_avatar.gif" alt="" />';
+					$avatar = get_group_avatar($group_row, 'GROUP_AVATAR', true);
 
 					$template->assign_vars(array(
 						'GROUP_NAME'			=> ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name,
@@ -447,8 +447,8 @@ class ucp_groups
 						'GROUP_DESC_DISP'		=> generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']),
 						'GROUP_TYPE'			=> $group_row['group_type'],
 
-						'AVATAR'				=> $avatar_img,
-						'AVATAR_IMAGE'			=> $avatar_img,
+						'AVATAR'				=> (empty($avatar) ? '<img src="' . $phpbb_root_path . 'adm/images/no_avatar.gif" alt="" />' : $avatar),
+						'AVATAR_IMAGE'			=> (empty($avatar) ? '<img src="' . $phpbb_root_path . 'adm/images/no_avatar.gif" alt="" />' : $avatar),
 						'AVATAR_WIDTH'			=> (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '',
 						'AVATAR_HEIGHT'			=> (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '',
 					));
@@ -483,10 +483,20 @@ class ucp_groups
 
 						$error = array();
 
-						$avatar_select = basename(request_var('avatar_select', ''));
-						$category = basename(request_var('category', ''));
+						// Setup avatar data for later
+						$avatars_enabled = false;
+						$avatar_drivers = null;
+						$avatar_data = null;
+						$avatar_error = array();
 
-						$can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_is_writable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false;
+						if ($config['allow_avatar'])
+						{
+							$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
+							sort($avatar_drivers);
+
+							// This is normalised data, without the group_ prefix
+							$avatar_data = phpbb_avatar_manager::clean_row($group_row);
+						}
 
 						// Did we submit?
 						if ($update)
@@ -507,87 +517,41 @@ class ucp_groups
 								'max_recipients'=> request_var('group_max_recipients', 0),
 							);
 
-							$data['uploadurl']	= request_var('uploadurl', '');
-							$data['remotelink'] = request_var('remotelink', '');
-							$data['width']		= request_var('width', '');
-							$data['height']		= request_var('height', '');
-							$delete				= request_var('delete', '');
-
-							$uploadfile = $request->file('uploadfile');
-							if (!empty($uploadfile['tmp_name']) || $data['uploadurl'] || $data['remotelink'])
+							if ($config['allow_avatar'])
 							{
-								// Avatar stuff
-								$var_ary = array(
-									'uploadurl'		=> array('string', true, 5, 255),
-									'remotelink'	=> array('string', true, 5, 255),
-									'width'			=> array('string', true, 1, 3),
-									'height'		=> array('string', true, 1, 3),
-								);
-
-								if (!($error = validate_data($data, $var_ary)))
+								// Handle avatar
+								$driver = str_replace('_', '.', request_var('avatar_driver', ''));
+								$config_name = preg_replace('#^avatar.driver.#', '', $driver);
+								$av_delete = $request->variable('av_delete', '');
+								if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete))
 								{
-									$data['user_id'] = "g$group_id";
+									$avatar = $phpbb_avatar_manager->get_driver($driver);
+									$result = $avatar->process_form($template, $avatar_data, $avatar_error);
 
-									if ((!empty($uploadfile['tmp_name']) || $data['uploadurl']) && $can_upload)
+									if ($result && empty($avatar_error))
 									{
-										list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_upload($data, $error);
-									}
-									else if ($data['remotelink'])
-									{
-										list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_remote($data, $error);
+										$result = array(
+											'avatar_type'		=> $driver,
+											'avatar' 			=> $result['avatar'],
+											'avatar_width' 	=> $result['avatar_width'],
+											'avatar_height' 	=> $result['avatar_height'],
+										);
+										
+										$submit_ary = array_merge($submit_ary, $result);
 									}
 								}
-							}
-							else if ($avatar_select && $config['allow_avatar_local'])
-							{
-								// check avatar gallery
-								if (is_dir($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category))
-								{
-									$submit_ary['avatar_type'] = AVATAR_GALLERY;
-
-									list($submit_ary['avatar_width'], $submit_ary['avatar_height']) = getimagesize($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_select);
-									$submit_ary['avatar'] = $category . '/' . $avatar_select;
-								}
-							}
-							else if ($delete)
-							{
-								$submit_ary['avatar'] = '';
-								$submit_ary['avatar_type'] = $submit_ary['avatar_width'] = $submit_ary['avatar_height'] = 0;
-							}
-							else if ($data['width'] && $data['height'])
-							{
-								// Only update the dimensions?
-								if ($config['avatar_max_width'] || $config['avatar_max_height'])
+								else
 								{
-									if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height'])
+									if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
 									{
-										$error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
+										$avatar->delete($avatar_data);
 									}
-								}
 
-								if (!sizeof($error))
-								{
-									if ($config['avatar_min_width'] || $config['avatar_min_height'])
-									{
-										if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height'])
-										{
-											$error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
-										}
-									}
-								}
-
-								if (!sizeof($error))
-								{
-									$submit_ary['avatar_width'] = $data['width'];
-									$submit_ary['avatar_height'] = $data['height'];
-								}
-							}
-
-							if ((isset($submit_ary['avatar']) && $submit_ary['avatar'] && (!isset($group_row['group_avatar']))) || $delete)
-							{
-								if (isset($group_row['group_avatar']) && $group_row['group_avatar'])
-								{
-									avatar_delete('group', $group_row, true);
+									// Removing the avatar
+									$submit_ary['avatar_type'] = '';
+									$submit_ary['avatar'] = '';
+									$submit_ary['avatar_width'] = 0;
+									$submit_ary['avatar_height'] = 0;
 								}
 							}
 
@@ -607,7 +571,7 @@ class ucp_groups
 									'rank'			=> 'int',
 									'colour'		=> 'string',
 									'avatar'		=> 'string',
-									'avatar_type'	=> 'int',
+									'avatar_type'	=> 'string',
 									'avatar_width'	=> 'int',
 									'avatar_height'	=> 'int',
 									'receive_pm'	=> 'int',
@@ -683,28 +647,63 @@ class ucp_groups
 						$type_closed	= ($group_type == GROUP_CLOSED) ? ' checked="checked"' : '';
 						$type_hidden	= ($group_type == GROUP_HIDDEN) ? ' checked="checked"' : '';
 
-						$display_gallery = (isset($_POST['display_gallery'])) ? true : false;
-
-						if ($config['allow_avatar'] && $config['allow_avatar_local'] && $display_gallery)
+						// Load up stuff for avatars
+						if ($config['allow_avatar'])
 						{
-							avatar_gallery($category, $avatar_select, 4);
+							$avatars_enabled = false;
+							$focused_driver = str_replace('_', '.', request_var('avatar_driver', $avatar_data['avatar_type']));
+
+							foreach ($avatar_drivers as $driver)
+							{
+								$avatar = $phpbb_avatar_manager->get_driver($driver);
+
+								if ($avatar->is_enabled())
+								{
+									$avatars_enabled = true;
+									$template->set_filenames(array(
+										'avatar' => $avatar->get_template_name(),
+									));
+
+									if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
+									{
+										$driver_n = str_replace('.', '_', $driver);
+										$driver_u = strtoupper($driver_n);
+										$template->assign_block_vars('avatar_drivers', array(
+											'L_TITLE' => $user->lang($driver_u . '_TITLE'),
+											'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
+
+											'DRIVER' => $driver_n,
+											'SELECTED' => ($driver == $focused_driver),
+											'OUTPUT' => $template->assign_display('avatar'),
+										));
+									}
+								}
+							}
 						}
 
-						$avatars_enabled = ($config['allow_avatar'] && (($can_upload && ($config['allow_avatar_upload'] || $config['allow_avatar_remote_upload'])) || ($config['allow_avatar_local'] || $config['allow_avatar_remote']))) ? true : false;
+						// Merge any avatars errors into the primary error array
+						// Drivers use lang constants, so we need to map to the actual strings
+						foreach ($avatar_error as $e)
+						{
+							if (is_array($e))
+							{
+								$key = array_shift($e);
+								$error[] = vsprintf($user->lang($key), $e);
+							}
+							else
+							{
+								$error[] = $user->lang((string) $e);
+							}
+						}
 
 						$template->assign_vars(array(
 							'S_EDIT'			=> true,
 							'S_INCLUDE_SWATCH'	=> true,
-							'S_FORM_ENCTYPE'	=> ($config['allow_avatar'] && $can_upload && ($config['allow_avatar_upload'] || $config['allow_avatar_remote_upload'])) ? ' enctype="multipart/form-data"' : '',
+							'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
 							'S_ERROR'			=> (sizeof($error)) ? true : false,
 							'S_SPECIAL_GROUP'	=> ($group_type == GROUP_SPECIAL) ? true : false,
-							'S_AVATARS_ENABLED'	=> $avatars_enabled,
-							'S_DISPLAY_GALLERY'	=> ($config['allow_avatar'] && $config['allow_avatar_local'] && !$display_gallery) ? true : false,
-							'S_IN_GALLERY'		=> ($config['allow_avatar_local'] && $display_gallery) ? true : false,
-
-							'S_UPLOAD_AVATAR_FILE'	=> ($config['allow_avatar'] && $config['allow_avatar_upload'] && $can_upload) ? true : false,
-							'S_UPLOAD_AVATAR_URL'	=> ($config['allow_avatar'] && $config['allow_avatar_remote_upload'] && $can_upload) ? true : false,
-							'S_LINK_AVATAR'			=> ($config['allow_avatar'] && $config['allow_avatar_remote']) ? true : false,
+							'S_AVATARS_ENABLED'	=> ($config['allow_avatar'] && $avatars_enabled),
+							'S_GROUP_MANAGE'	=> true,
 
 							'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 							'GROUP_RECEIVE_PM'		=> (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '',
@@ -717,7 +716,6 @@ class ucp_groups
 							'S_DESC_SMILIES_CHECKED'=> $group_desc_data['allow_smilies'],
 
 							'S_RANK_OPTIONS'		=> $rank_options,
-							'AVATAR_MAX_FILESIZE'	=> $config['avatar_filesize'],
 
 							'GROUP_TYPE_FREE'		=> GROUP_FREE,
 							'GROUP_TYPE_OPEN'		=> GROUP_OPEN,
-- 
cgit v1.2.1


From 211abe2ac9722f23d2f86b6172452e9d9d1bff38 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 22 Nov 2012 00:39:02 +0100
Subject: [feature/avatars] Remove obsolete functions from functions_user.php

The removed functions are no longer needed due to the new avatar system.

PHPBB3-10018
---
 phpBB/includes/functions_user.php | 466 --------------------------------------
 1 file changed, 466 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 7cac0fb34f..3b11147a3a 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2058,134 +2058,6 @@ function avatar_delete($mode, $row, $clean_db = false)
 	return false;
 }
 
-/**
-* Remote avatar linkage
-*/
-function avatar_remote($data, &$error)
-{
-	global $config, $db, $user, $phpbb_root_path, $phpEx;
-
-	if (!preg_match('#^(http|https|ftp)://#i', $data['remotelink']))
-	{
-		$data['remotelink'] = 'http://' . $data['remotelink'];
-	}
-	if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $data['remotelink']))
-	{
-		$error[] = $user->lang['AVATAR_URL_INVALID'];
-		return false;
-	}
-
-	// Make sure getimagesize works...
-	if (($image_data = @getimagesize($data['remotelink'])) === false && (empty($data['width']) || empty($data['height'])))
-	{
-		$error[] = $user->lang['UNABLE_GET_IMAGE_SIZE'];
-		return false;
-	}
-
-	if (!empty($image_data) && ($image_data[0] < 2 || $image_data[1] < 2))
-	{
-		$error[] = $user->lang['AVATAR_NO_SIZE'];
-		return false;
-	}
-
-	$width = ($data['width'] && $data['height']) ? $data['width'] : $image_data[0];
-	$height = ($data['width'] && $data['height']) ? $data['height'] : $image_data[1];
-
-	if ($width < 2 || $height < 2)
-	{
-		$error[] = $user->lang['AVATAR_NO_SIZE'];
-		return false;
-	}
-
-	// Check image type
-	include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
-	$types = fileupload::image_types();
-	$extension = strtolower(filespec::get_extension($data['remotelink']));
-
-	if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
-	{
-		if (!isset($types[$image_data[2]]))
-		{
-			$error[] = $user->lang['UNABLE_GET_IMAGE_SIZE'];
-		}
-		else
-		{
-			$error[] = sprintf($user->lang['IMAGE_FILETYPE_MISMATCH'], $types[$image_data[2]][0], $extension);
-		}
-		return false;
-	}
-
-	if ($config['avatar_max_width'] || $config['avatar_max_height'])
-	{
-		if ($width > $config['avatar_max_width'] || $height > $config['avatar_max_height'])
-		{
-			$error[] = phpbb_avatar_error_wrong_size($width, $height);
-			return false;
-		}
-	}
-
-	if ($config['avatar_min_width'] || $config['avatar_min_height'])
-	{
-		if ($width < $config['avatar_min_width'] || $height < $config['avatar_min_height'])
-		{
-			$error[] = phpbb_avatar_error_wrong_size($width, $height);
-			return false;
-		}
-	}
-
-	return array(AVATAR_REMOTE, $data['remotelink'], $width, $height);
-}
-
-/**
-* Avatar upload using the upload class
-*/
-function avatar_upload($data, &$error)
-{
-	global $phpbb_root_path, $config, $db, $user, $phpEx, $request;
-
-	// Init upload class
-	include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx);
-	$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $config['avatar_filesize'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], (isset($config['mime_triggers']) ? explode('|', $config['mime_triggers']) : false));
-
-	$uploadfile = $request->file('uploadfile');
-	if (!empty($uploadfile['name']))
-	{
-		$file = $upload->form_upload('uploadfile');
-	}
-	else
-	{
-		$file = $upload->remote_upload($data['uploadurl']);
-	}
-
-	$prefix = $config['avatar_salt'] . '_';
-	$file->clean_filename('avatar', $prefix, $data['user_id']);
-
-	$destination = $config['avatar_path'];
-
-	// Adjust destination path (no trailing slash)
-	if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
-	{
-		$destination = substr($destination, 0, -1);
-	}
-
-	$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
-	if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
-	{
-		$destination = '';
-	}
-
-	// Move file and overwrite any existing image
-	$file->move_file($destination, true);
-
-	if (sizeof($file->error))
-	{
-		$file->remove();
-		$error = array_merge($error, $file->error);
-	}
-
-	return array(AVATAR_UPLOAD, $data['user_id'] . '_' . time() . '.' . $file->get('extension'), $file->get('width'), $file->get('height'));
-}
-
 /**
 * Generates avatar filename from the database entry
 */
@@ -2208,344 +2080,6 @@ function get_avatar_filename($avatar_entry)
 	return $config['avatar_salt'] . '_' . (($avatar_group) ? 'g' : '') . $avatar_entry . '.' . $ext;
 }
 
-/**
-* Avatar Gallery
-*/
-function avatar_gallery($category, $avatar_select, $items_per_column, $block_var = 'avatar_row')
-{
-	global $user, $cache, $template;
-	global $config, $phpbb_root_path;
-
-	$avatar_list = array();
-
-	$path = $phpbb_root_path . $config['avatar_gallery_path'];
-
-	if (!file_exists($path) || !is_dir($path))
-	{
-		$avatar_list = array($user->lang['NO_AVATAR_CATEGORY'] => array());
-	}
-	else
-	{
-		// Collect images
-		$dp = @opendir($path);
-
-		if (!$dp)
-		{
-			return array($user->lang['NO_AVATAR_CATEGORY'] => array());
-		}
-
-		while (($file = readdir($dp)) !== false)
-		{
-			if ($file[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $file) && is_dir("$path/$file"))
-			{
-				$avatar_row_count = $avatar_col_count = 0;
-
-				if ($dp2 = @opendir("$path/$file"))
-				{
-					while (($sub_file = readdir($dp2)) !== false)
-					{
-						if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $sub_file))
-						{
-							$avatar_list[$file][$avatar_row_count][$avatar_col_count] = array(
-								'file'		=> rawurlencode($file) . '/' . rawurlencode($sub_file),
-								'filename'	=> rawurlencode($sub_file),
-								'name'		=> ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $sub_file))),
-							);
-							$avatar_col_count++;
-							if ($avatar_col_count == $items_per_column)
-							{
-								$avatar_row_count++;
-								$avatar_col_count = 0;
-							}
-						}
-					}
-					closedir($dp2);
-				}
-			}
-		}
-		closedir($dp);
-	}
-
-	if (!sizeof($avatar_list))
-	{
-		$avatar_list = array($user->lang['NO_AVATAR_CATEGORY'] => array());
-	}
-
-	@ksort($avatar_list);
-
-	$category = (!$category) ? key($avatar_list) : $category;
-	$avatar_categories = array_keys($avatar_list);
-
-	$s_category_options = '';
-	foreach ($avatar_categories as $cat)
-	{
-		$s_category_options .= '<option value="' . $cat . '"' . (($cat == $category) ? ' selected="selected"' : '') . '>' . $cat . '</option>';
-	}
-
-	$template->assign_vars(array(
-		'S_AVATARS_ENABLED'		=> true,
-		'S_IN_AVATAR_GALLERY'	=> true,
-		'S_CAT_OPTIONS'			=> $s_category_options)
-	);
-
-	$avatar_list = (isset($avatar_list[$category])) ? $avatar_list[$category] : array();
-
-	foreach ($avatar_list as $avatar_row_ary)
-	{
-		$template->assign_block_vars($block_var, array());
-
-		foreach ($avatar_row_ary as $avatar_col_ary)
-		{
-			$template->assign_block_vars($block_var . '.avatar_column', array(
-				'AVATAR_IMAGE'	=> $phpbb_root_path . $config['avatar_gallery_path'] . '/' . $avatar_col_ary['file'],
-				'AVATAR_NAME'	=> $avatar_col_ary['name'],
-				'AVATAR_FILE'	=> $avatar_col_ary['filename'])
-			);
-
-			$template->assign_block_vars($block_var . '.avatar_option_column', array(
-				'AVATAR_IMAGE'	=> $phpbb_root_path . $config['avatar_gallery_path'] . '/' . $avatar_col_ary['file'],
-				'S_OPTIONS_AVATAR'	=> $avatar_col_ary['filename'])
-			);
-		}
-	}
-
-	return $avatar_list;
-}
-
-
-/**
-* Tries to (re-)establish avatar dimensions
-*/
-function avatar_get_dimensions($avatar, $avatar_type, &$error, $current_x = 0, $current_y = 0)
-{
-	global $config, $phpbb_root_path, $user;
-
-	switch ($avatar_type)
-	{
-		case AVATAR_REMOTE :
-			break;
-
-		case AVATAR_UPLOAD :
-			$avatar = $phpbb_root_path . $config['avatar_path'] . '/' . get_avatar_filename($avatar);
-			break;
-
-		case AVATAR_GALLERY :
-			$avatar = $phpbb_root_path . $config['avatar_gallery_path'] . '/' . $avatar ;
-			break;
-	}
-
-	// Make sure getimagesize works...
-	if (($image_data = @getimagesize($avatar)) === false)
-	{
-		$error[] = $user->lang['UNABLE_GET_IMAGE_SIZE'];
-		return false;
-	}
-
-	if ($image_data[0] < 2 || $image_data[1] < 2)
-	{
-		$error[] = $user->lang['AVATAR_NO_SIZE'];
-		return false;
-	}
-
-	// try to maintain ratio
-	if (!(empty($current_x) && empty($current_y)))
-	{
-		if ($current_x != 0)
-		{
-			$image_data[1] = (int) floor(($current_x / $image_data[0]) * $image_data[1]);
-			$image_data[1] = min($config['avatar_max_height'], $image_data[1]);
-			$image_data[1] = max($config['avatar_min_height'], $image_data[1]);
-		}
-		if ($current_y != 0)
-		{
-			$image_data[0] = (int) floor(($current_y / $image_data[1]) * $image_data[0]);
-			$image_data[0] = min($config['avatar_max_width'], $image_data[1]);
-			$image_data[0] = max($config['avatar_min_width'], $image_data[1]);
-		}
-	}
-	return array($image_data[0], $image_data[1]);
-}
-
-/**
-* Uploading/Changing user avatar
-*/
-function avatar_process_user(&$error, $custom_userdata = false, $can_upload = null)
-{
-	global $config, $phpbb_root_path, $auth, $user, $db, $request;
-
-	$data = array(
-		'uploadurl'		=> request_var('uploadurl', ''),
-		'remotelink'	=> request_var('remotelink', ''),
-		'width'			=> request_var('width', 0),
-		'height'		=> request_var('height', 0),
-	);
-
-	$error = validate_data($data, array(
-		'uploadurl'		=> array('string', true, 5, 255),
-		'remotelink'	=> array('string', true, 5, 255),
-		'width'			=> array('string', true, 1, 3),
-		'height'		=> array('string', true, 1, 3),
-	));
-
-	if (sizeof($error))
-	{
-		return false;
-	}
-
-	$sql_ary = array();
-
-	if ($custom_userdata === false)
-	{
-		$userdata = &$user->data;
-	}
-	else
-	{
-		$userdata = &$custom_userdata;
-	}
-
-	$data['user_id'] = $userdata['user_id'];
-	$change_avatar = ($custom_userdata === false) ? $auth->acl_get('u_chgavatar') : true;
-	$avatar_select = basename(request_var('avatar_select', ''));
-
-	// Can we upload?
-	if (is_null($can_upload))
-	{
-		$can_upload = ($config['allow_avatar_upload'] && file_exists($phpbb_root_path . $config['avatar_path']) && phpbb_is_writable($phpbb_root_path . $config['avatar_path']) && $change_avatar && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
-	}
-
-	$uploadfile = $request->file('uploadfile');
-	if ((!empty($uploadfile['name']) || $data['uploadurl']) && $can_upload)
-	{
-		list($sql_ary['user_avatar_type'], $sql_ary['user_avatar'], $sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = avatar_upload($data, $error);
-	}
-	else if ($data['remotelink'] && $change_avatar && $config['allow_avatar_remote'])
-	{
-		list($sql_ary['user_avatar_type'], $sql_ary['user_avatar'], $sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = avatar_remote($data, $error);
-	}
-	else if ($avatar_select && $change_avatar && $config['allow_avatar_local'])
-	{
-		$category = basename(request_var('category', ''));
-
-		$sql_ary['user_avatar_type'] = AVATAR_GALLERY;
-		$sql_ary['user_avatar'] = $avatar_select;
-
-		// check avatar gallery
-		if (!is_dir($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category))
-		{
-			$sql_ary['user_avatar'] = '';
-			$sql_ary['user_avatar_type'] = $sql_ary['user_avatar_width'] = $sql_ary['user_avatar_height'] = 0;
-		}
-		else
-		{
-			list($sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = getimagesize($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category . '/' . urldecode($sql_ary['user_avatar']));
-			$sql_ary['user_avatar'] = $category . '/' . $sql_ary['user_avatar'];
-		}
-	}
-	else if (isset($_POST['delete']) && $change_avatar)
-	{
-		$sql_ary['user_avatar'] = '';
-		$sql_ary['user_avatar_type'] = $sql_ary['user_avatar_width'] = $sql_ary['user_avatar_height'] = 0;
-	}
-	else if (!empty($userdata['user_avatar']))
-	{
-		// Only update the dimensions
-
-		if (empty($data['width']) || empty($data['height']))
-		{
-			if ($dims = avatar_get_dimensions($userdata['user_avatar'], $userdata['user_avatar_type'], $error, $data['width'], $data['height']))
-			{
-				list($guessed_x, $guessed_y) = $dims;
-				if (empty($data['width']))
-				{
-					$data['width'] = $guessed_x;
-				}
-				if (empty($data['height']))
-				{
-					$data['height'] = $guessed_y;
-				}
-			}
-		}
-		if (($config['avatar_max_width'] || $config['avatar_max_height']) &&
-			(($data['width'] != $userdata['user_avatar_width']) || $data['height'] != $userdata['user_avatar_height']))
-		{
-			if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height'])
-			{
-				$error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
-			}
-		}
-
-		if (!sizeof($error))
-		{
-			if ($config['avatar_min_width'] || $config['avatar_min_height'])
-			{
-				if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height'])
-				{
-					$error[] = phpbb_avatar_error_wrong_size($data['width'], $data['height']);
-				}
-			}
-		}
-
-		if (!sizeof($error))
-		{
-			$sql_ary['user_avatar_width'] = $data['width'];
-			$sql_ary['user_avatar_height'] = $data['height'];
-		}
-	}
-
-	if (!sizeof($error))
-	{
-		// Do we actually have any data to update?
-		if (sizeof($sql_ary))
-		{
-			$ext_new = $ext_old = '';
-			if (isset($sql_ary['user_avatar']))
-			{
-				$userdata = ($custom_userdata === false) ? $user->data : $custom_userdata;
-				$ext_new = (empty($sql_ary['user_avatar'])) ? '' : substr(strrchr($sql_ary['user_avatar'], '.'), 1);
-				$ext_old = (empty($userdata['user_avatar'])) ? '' : substr(strrchr($userdata['user_avatar'], '.'), 1);
-
-				if ($userdata['user_avatar_type'] == AVATAR_UPLOAD)
-				{
-					// Delete old avatar if present
-					if ((!empty($userdata['user_avatar']) && empty($sql_ary['user_avatar']))
-					   || ( !empty($userdata['user_avatar']) && !empty($sql_ary['user_avatar']) && $ext_new !== $ext_old))
-					{
-						avatar_delete('user', $userdata);
-					}
-				}
-			}
-
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE user_id = ' . (($custom_userdata === false) ? $user->data['user_id'] : $custom_userdata['user_id']);
-			$db->sql_query($sql);
-
-		}
-	}
-
-	return (sizeof($error)) ? false : true;
-}
-
-/**
-* Returns a language string with the avatar size of the new avatar and the allowed maximum and minimum
-*
-* @param $width		int		The width of the new uploaded/selected avatar
-* @param $height	int		The height of the new uploaded/selected avatar
-* @return string
-*/
-function phpbb_avatar_error_wrong_size($width, $height)
-{
-	global $config, $user;
-
-	return $user->lang('AVATAR_WRONG_SIZE',
-		$user->lang('PIXELS', (int) $config['avatar_min_width']),
-		$user->lang('PIXELS', (int) $config['avatar_min_height']),
-		$user->lang('PIXELS', (int) $config['avatar_max_width']),
-		$user->lang('PIXELS', (int) $config['avatar_max_height']),
-		$user->lang('PIXELS', (int) $width),
-		$user->lang('PIXELS', (int) $height));
-}
-
 /**
 * Returns an explanation string with maximum avatar settings
 *
-- 
cgit v1.2.1


From ce44e3908eef5166e5e3e43d2642c5372379b6a6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 00:54:34 +0100
Subject: [feature/avatars] Remove unnecessary abbreviations

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php         | 16 ++++++++--------
 phpBB/includes/acp/acp_users.php          | 16 ++++++++--------
 phpBB/includes/avatar/driver/gravatar.php | 12 ++++++------
 phpBB/includes/avatar/driver/local.php    | 30 +++++++++++++++---------------
 phpBB/includes/avatar/driver/remote.php   | 12 ++++++------
 phpBB/includes/avatar/driver/upload.php   |  8 ++++----
 phpBB/includes/ucp/ucp_groups.php         | 16 ++++++++--------
 phpBB/includes/ucp/ucp_profile.php        | 16 ++++++++--------
 8 files changed, 63 insertions(+), 63 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index f461555056..3a49ac8ff8 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -335,8 +335,8 @@ class acp_groups
 						// Handle avatar
 						$driver = str_replace('_', '.', request_var('avatar_driver', ''));
 						$config_name = preg_replace('#^avatar.driver.#', '', $driver);
-						$av_delete = $request->variable('av_delete', '');
-						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete))
+						$avatar_delete = $request->variable('avatar_delete', '');
+						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
 						{
 							$avatar = $phpbb_avatar_manager->get_driver($driver);
 							$result = $avatar->process_form($template, $avatar_data, $avatar_error);
@@ -541,14 +541,14 @@ class acp_groups
 
 							if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
 							{
-								$driver_n = str_replace('.', '_', $driver);
-								$driver_u = strtoupper($driver_n);
+								$driver_name = str_replace('.', '_', $driver);
+								$driver_upper = strtoupper($driver_name);
 								$template->assign_block_vars('avatar_drivers', array(
-									'L_TITLE' => $user->lang($driver_u . '_TITLE'),
-									'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
+									'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
+									'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
-									'DRIVER' => $driver_n,
-									'SELECTED' => ($driver == $focused_driver),
+									'DRIVER' => $driver_name,
+									'SELECTED' => $driver == $focused_driver,
 									'OUTPUT' => $template->assign_display('avatar'),
 								));
 							}
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index fdad1df0fd..2f7662982a 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1746,8 +1746,8 @@ class acp_users
 						{
 							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
 							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
-							$av_delete = $request->variable('av_delete', '');
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete))
+							$avatar_delete = $request->variable('avatar_delete', '');
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);
@@ -1814,15 +1814,15 @@ class acp_users
 
 							if ($avatar->prepare_form($template, $avatar_data, $error))
 							{
-								$driver_n = str_replace('.', '_', $driver);
-								$driver_u = strtoupper($driver_n);
+								$driver_name = str_replace('.', '_', $driver);
+								$driver_upper = strtoupper($driver_name);
 
 								$template->assign_block_vars('avatar_drivers', array(
-									'L_TITLE' => $user->lang($driver_u . '_TITLE'),
-									'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
+									'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
+									'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
-									'DRIVER' => $driver_n,
-									'SELECTED' => ($driver == $focused_driver),
+									'DRIVER' => $driver_name,
+									'SELECTED' => $driver == $focused_driver,
 									'OUTPUT' => $template->assign_display('avatar'),
 								));
 							}
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 58ac535e6b..d873f7ba41 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -69,9 +69,9 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	public function prepare_form($template, $row, &$error)
 	{
 		$template->assign_vars(array(
-			'AV_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_gravatar_width', 0),
-			'AV_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_gravatar_width', 0),
-			'AV_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
+			'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('avatar_gravatar_width', 0),
+			'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('avatar_gravatar_width', 0),
+			'AVATAR_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
 		));
 
 		return true;
@@ -92,9 +92,9 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	*/
 	public function process_form($template, $row, &$error)
 	{
-		$row['avatar'] = $this->request->variable('av_gravatar_email', '');
-		$row['avatar_width'] = $this->request->variable('av_gravatar_width', 0);
-		$row['avatar_height'] = $this->request->variable('av_gravatar_height', 0);
+		$row['avatar'] = $this->request->variable('avatar_gravatar_email', '');
+		$row['avatar_width'] = $this->request->variable('avatar_gravatar_width', 0);
+		$row['avatar_height'] = $this->request->variable('avatar_gravatar_height', 0);
 
 		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx);
 
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 8ac511f909..c231206d8e 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -50,13 +50,13 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	public function prepare_form($template, $row, &$error)
 	{
 		$avatar_list = $this->get_avatar_list();
-		$category = $this->request->variable('av_local_cat', '');
+		$category = $this->request->variable('avatar_local_cat', '');
 
 		foreach ($avatar_list as $cat => $null)
 		{
 			if (!empty($avatar_list[$cat]))
 			{
-				$template->assign_block_vars('av_local_cats', array(
+				$template->assign_block_vars('avatar_local_cats', array(
 					'NAME' => $cat,
 					'SELECTED' => ($cat == $category),
 				));
@@ -71,16 +71,16 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 		if (!empty($avatar_list[$category]))
 		{
 			$template->assign_vars(array(
-				'AV_LOCAL_SHOW' => true,
+				'AVATAR_LOCAL_SHOW' => true,
 			));
 
-			$table_cols = isset($row['av_gallery_cols']) ? $row['av_gallery_cols'] : 4;
-			$row_count = $col_count = $av_pos = 0;
-			$av_count = sizeof($avatar_list[$category]);
+			$table_cols = isset($row['avatar_gallery_cols']) ? $row['avatar_gallery_cols'] : 4;
+			$row_count = $col_count = $avatar_pos = 0;
+			$avatar_count = sizeof($avatar_list[$category]);
 
 			reset($avatar_list[$category]);
 
-			while ($av_pos < $av_count)
+			while ($avatar_pos < $avatar_count)
 			{
 				$img = current($avatar_list[$category]);
 				next($avatar_list[$category]);
@@ -88,24 +88,24 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 				if ($col_count == 0)
 				{
 					++$row_count;
-					$template->assign_block_vars('av_local_row', array(
+					$template->assign_block_vars('avatar_local_row', array(
 					));
 				}
 
-				$template->assign_block_vars('av_local_row.av_local_col', array(
+				$template->assign_block_vars('avatar_local_row.avatar_local_col', array(
 					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
 					'AVATAR_NAME' 	=> $img['name'],
 					'AVATAR_FILE' 	=> $img['filename'],
 				));
 
-				$template->assign_block_vars('av_local_row.av_local_option', array(
+				$template->assign_block_vars('avatar_local_row.avatar_local_option', array(
 					'AVATAR_FILE' 		=> $img['filename'],
 					'S_OPTIONS_AVATAR'	=> $img['filename']
 				));
 
 				$col_count = ($col_count + 1) % $table_cols;
 
-				++$av_pos;
+				++$avatar_pos;
 			}
 		}
 
@@ -129,9 +129,9 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	public function process_form($template, $row, &$error)
 	{
 		$avatar_list = $this->get_avatar_list();
-		$category = $this->request->variable('av_local_cat', '');
+		$category = $this->request->variable('avatar_local_cat', '');
 
-		$file = $this->request->variable('av_local_file', '');
+		$file = $this->request->variable('avatar_local_file', '');
 		if (!isset($avatar_list[$category][urldecode($file)]))
 		{
 			$error[] = 'AVATAR_URL_NOT_FOUND';
@@ -152,7 +152,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	*/
 	protected function get_avatar_list()
 	{
-		$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list');
+		$avatar_list = ($this->cache == null) ? false : $this->cache->get('avatar_local_list');
 
 		if (!$avatar_list)
 		{
@@ -190,7 +190,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 			if ($this->cache != null)
 			{
-				$this->cache->put('av_local_list', $avatar_list);
+				$this->cache->put('avatar_local_list', $avatar_list);
 			}
 		}
 
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 61ea0ebaf0..c2ae88cc02 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -50,9 +50,9 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	public function prepare_form($template, $row, &$error)
 	{
 		$template->assign_vars(array(
-			'AV_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_remote_width', 0),
-			'AV_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_remote_width', 0),
-			'AV_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '',
+			'AVATAR_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('avatar_remote_width', 0),
+			'AVATAR_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('avatar_remote_width', 0),
+			'AVATAR_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '',
 		));
 
 		return true;
@@ -73,9 +73,9 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	*/
 	public function process_form($template, $row, &$error)
 	{
-		$url = $this->request->variable('av_remote_url', '');
-		$width = $this->request->variable('av_remote_width', 0);
-		$height = $this->request->variable('av_remote_height', 0);
+		$url = $this->request->variable('avatar_remote_url', '');
+		$width = $this->request->variable('avatar_remote_width', 0);
+		$height = $this->request->variable('avatar_remote_height', 0);
 
 		if (!preg_match('#^(http|https|ftp)://#i', $url))
 		{
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 77cd81c8c9..9035b5364e 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -56,7 +56,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 
 		$template->assign_vars(array(
 			'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
-			'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'],
+			'AVATAR_UPLOAD_SIZE' => $this->config['avatar_filesize'],
 		));
 
 		return true;
@@ -76,12 +76,12 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 
 		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
-		$url = $this->request->variable('av_upload_url', '');
-		$upload_file = $this->request->file('av_upload_file');
+		$url = $this->request->variable('avatar_upload_url', '');
+		$upload_file = $this->request->file('avatar_upload_file');
 
 		if (!empty($upload_file['name']))
 		{
-			$file = $upload->form_upload('av_upload_file');
+			$file = $upload->form_upload('avatar_upload_file');
 		}
 		else
 		{
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 1d469814b6..2a388d17f8 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -522,8 +522,8 @@ class ucp_groups
 								// Handle avatar
 								$driver = str_replace('_', '.', request_var('avatar_driver', ''));
 								$config_name = preg_replace('#^avatar.driver.#', '', $driver);
-								$av_delete = $request->variable('av_delete', '');
-								if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete))
+								$avatar_delete = $request->variable('avatar_delete', '');
+								if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
 								{
 									$avatar = $phpbb_avatar_manager->get_driver($driver);
 									$result = $avatar->process_form($template, $avatar_data, $avatar_error);
@@ -666,14 +666,14 @@ class ucp_groups
 
 									if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
 									{
-										$driver_n = str_replace('.', '_', $driver);
-										$driver_u = strtoupper($driver_n);
+										$driver_name = str_replace('.', '_', $driver);
+										$driver_upper = strtoupper($driver_name);
 										$template->assign_block_vars('avatar_drivers', array(
-											'L_TITLE' => $user->lang($driver_u . '_TITLE'),
-											'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
+											'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
+											'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
-											'DRIVER' => $driver_n,
-											'SELECTED' => ($driver == $focused_driver),
+											'DRIVER' => $driver_name,
+											'SELECTED' => $driver == $focused_driver,
 											'OUTPUT' => $template->assign_display('avatar'),
 										));
 									}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 77b2dc7054..ab49a11f99 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -565,8 +565,8 @@ class ucp_profile
 						{
 							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
 							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
-							$av_delete = $request->variable('av_delete', '');
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete))
+							$avatar_delete = $request->variable('avatar_delete', '');
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);
@@ -638,15 +638,15 @@ class ucp_profile
 
 							if ($avatar->prepare_form($template, $avatar_data, $error))
 							{
-								$driver_n = str_replace('.', '_', $driver);
-								$driver_u = strtoupper($driver_n);
+								$driver_name = str_replace('.', '_', $driver);
+								$driver_upper = strtoupper($driver_name);
 
 								$template->assign_block_vars('avatar_drivers', array(
-									'L_TITLE' => $user->lang($driver_u . '_TITLE'),
-									'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'),
+									'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
+									'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
-									'DRIVER' => $driver_n,
-									'SELECTED' => ($driver == $focused_driver),
+									'DRIVER' => $driver_name,
+									'SELECTED' => $driver == $focused_driver,
 									'OUTPUT' => $template->assign_display('avatar'),
 								));
 							}
-- 
cgit v1.2.1


From ce5e2f16777ae5319fcb902ee58005a4caced7e6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 01:18:27 +0100
Subject: [feature/avatars] Miscellaneous fixes

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php         | 14 ++++++++------
 phpBB/includes/acp/acp_users.php          | 12 +++++++-----
 phpBB/includes/avatar/driver/gravatar.php |  5 ++---
 phpBB/includes/avatar/driver/remote.php   |  2 +-
 phpBB/includes/ucp/ucp_groups.php         |  2 +-
 phpBB/includes/ucp/ucp_profile.php        |  2 +-
 6 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 3a49ac8ff8..7a66f993b0 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -334,7 +334,7 @@ class acp_groups
 					{
 						// Handle avatar
 						$driver = str_replace('_', '.', request_var('avatar_driver', ''));
-						$config_name = preg_replace('#^avatar.driver.#', '', $driver);
+						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
 						$avatar_delete = $request->variable('avatar_delete', '');
 						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
 						{
@@ -534,7 +534,7 @@ class acp_groups
 						if ($avatar->is_enabled())
 						{
 							$avatars_enabled = true;
-							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
+							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
 							$template->set_filenames(array(
 								'avatar' => "acp_avatar_options_$config_name.html",
 							));
@@ -558,8 +558,10 @@ class acp_groups
 				
 				$avatar = get_group_avatar($group_row, 'GROUP_AVATAR', true);
 				
-				// Merge any avatars errors into the primary error array
-				// Drivers use lang constants, so we need to map to the actual strings
+				/*
+				* Merge any avatar errors into the primary error array
+				* Drivers use language constants, so we need to map to the actual strings
+				*/
 				foreach ($avatar_error as $e)
 				{
 					if (is_array($e))
@@ -569,7 +571,7 @@ class acp_groups
 					}
 					else
 					{
-						$error[] = $user->lang((string) $e);
+						$error[] = $user->lang("$e");
 					}
 				}
 
@@ -615,7 +617,7 @@ class acp_groups
 
 					'S_RANK_OPTIONS'		=> $rank_options,
 					'S_GROUP_OPTIONS'		=> group_select_options(false, false, (($user->data['user_type'] == USER_FOUNDER) ? false : 0)),
-					'AVATAR'				=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar),
+					'AVATAR'				=> empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar,
 					'AVATAR_MAX_FILESIZE'	=> $config['avatar_filesize'],
 					'AVATAR_WIDTH'			=> (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '',
 					'AVATAR_HEIGHT'			=> (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '',
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 2f7662982a..8e194dc91d 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -454,7 +454,7 @@ class acp_users
 							{
 								trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
 							}
-							
+
 							$sql_ary = array(
 								'user_avatar'			=> '',
 								'user_avatar_type'		=> '',
@@ -1745,7 +1745,7 @@ class acp_users
 						if (check_form_key($form_name))
 						{
 							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
-							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
+							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
 							$avatar_delete = $request->variable('avatar_delete', '');
 							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
 							{
@@ -1761,6 +1761,7 @@ class acp_users
 										'user_avatar_width' => $result['avatar_width'],
 										'user_avatar_height' => $result['avatar_height'],
 									);
+
 									$sql = 'UPDATE ' . USERS_TABLE . '
 										SET ' . $db->sql_build_array('UPDATE', $result) . '
 										WHERE user_id = ' . $user_id;
@@ -1771,7 +1772,8 @@ class acp_users
 							}
 							else
 							{
-								if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
+								$avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
+								if ($avatar)
 								{
 									$avatar->delete($avatar_data);
 								}
@@ -1786,7 +1788,7 @@ class acp_users
 								
 								$sql = 'UPDATE ' . USERS_TABLE . '
 									SET ' . $db->sql_build_array('UPDATE', $result) . '
-									WHERE user_id = ' . $user_id;
+									WHERE user_id = ' . (int) $user_id;
 
 								$db->sql_query($sql);
 								trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
@@ -1807,7 +1809,7 @@ class acp_users
 						if ($avatar->is_enabled())
 						{
 							$avatars_enabled = true;
-							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
+							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
 							$template->set_filenames(array(
 								'avatar' => "acp_avatar_options_$config_name.html",
 							));
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index d873f7ba41..cca7289275 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -56,11 +56,10 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	*/
 	public function get_custom_html($row, $ignore_config = false, $alt = '')
 	{
-		$html = '<img src="' . $this->get_gravatar_url($row) . '" ' .
+		return '<img src="' . $this->get_gravatar_url($row) . '" ' .
 			($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') .
 			($row['avatar_height'] ? ('height="' . $row['avatar_height'] . '" ') : '') .
 			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
-		return $html;
 	}
 
 	/**
@@ -121,7 +120,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 			$row['avatar_width'] = $row['avatar_height'] = min($this->config['avatar_max_width'], $this->config['avatar_max_height']);
 			$url = $this->get_gravatar_url($row);
 
-			if (($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0) && (($image_data = @getimagesize($url)) === false))
+			if (($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0) && (($image_data = getimagesize($url)) === false))
 			{
 				$error[] = 'UNABLE_GET_IMAGE_SIZE';
 				return false;
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index c2ae88cc02..f47b0d33f4 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -106,7 +106,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 		// Make sure getimagesize works...
 		if (function_exists('getimagesize'))
 		{
-			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
+			if (($width <= 0 || $height <= 0) && (($image_data = getimagesize($url)) === false))
 			{
 				$error[] = 'UNABLE_GET_IMAGE_SIZE';
 				return false;
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 2a388d17f8..5289a95e6d 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -521,7 +521,7 @@ class ucp_groups
 							{
 								// Handle avatar
 								$driver = str_replace('_', '.', request_var('avatar_driver', ''));
-								$config_name = preg_replace('#^avatar.driver.#', '', $driver);
+								$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
 								$avatar_delete = $request->variable('avatar_delete', '');
 								if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
 								{
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index ab49a11f99..402db86c1d 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -564,7 +564,7 @@ class ucp_profile
 						if (check_form_key('ucp_avatar'))
 						{
 							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
-							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
+							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
 							$avatar_delete = $request->variable('avatar_delete', '');
 							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
 							{
-- 
cgit v1.2.1


From 67c2e48d15d6e4ddd244dd2e126f906ed25be1ef Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 14:33:13 +0100
Subject: [feature/avatars] Only create avatar objects if necessary

PHPBB3-10018
---
 phpBB/includes/acp/acp_board.php     | 3 ++-
 phpBB/includes/acp/acp_groups.php    | 3 ++-
 phpBB/includes/acp/acp_users.php     | 5 ++++-
 phpBB/includes/functions_display.php | 3 ++-
 phpBB/includes/ucp/ucp_groups.php    | 3 ++-
 phpBB/includes/ucp/ucp_profile.php   | 3 ++-
 6 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 5852f512cd..95da62dedf 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -28,7 +28,7 @@ class acp_board
 	{
 		global $db, $user, $auth, $template;
 		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
-		global $cache, $phpbb_avatar_manager;
+		global $cache, $phpbb_container;
 
 		$user->add_lang('acp/board');
 
@@ -107,6 +107,7 @@ class acp_board
 			break;
 
 			case 'avatar':
+				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 				$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
 				sort($avatar_drivers);
 				$avatar_vars = array();
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 7a66f993b0..c09f447f76 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -26,7 +26,7 @@ class acp_groups
 	{
 		global $config, $db, $user, $auth, $template, $cache;
 		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads;
-		global $request, $phpbb_avatar_manager;
+		global $request, $phpbb_container;
 
 		$user->add_lang('acp/groups');
 		$this->tpl_name = 'acp_groups';
@@ -282,6 +282,7 @@ class acp_groups
 				$user->add_lang('ucp');
 
 				// Setup avatar data for later
+				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 				$avatars_enabled = false;
 				$avatar_drivers = null;
 				$avatar_data = null;
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 8e194dc91d..885233bbd3 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -33,7 +33,7 @@ class acp_users
 		global $config, $db, $user, $auth, $template, $cache;
 		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads;
 		global $phpbb_dispatcher, $request;
-		global $phpbb_avatar_manager;
+		global $phpbb_container;
 
 		$user->add_lang(array('posting', 'ucp', 'acp/users'));
 		$this->tpl_name = 'acp_users';
@@ -468,6 +468,7 @@ class acp_users
 							$db->sql_query($sql);
 
 							// Delete old avatar if present
+							$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 							$driver = $phpbb_avatar_manager->get_driver($user_row['user_avatar_type']);
 							if ($driver)
 							{
@@ -1732,6 +1733,8 @@ class acp_users
 				include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 
 				$avatars_enabled = false;
+				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
+
 				if ($config['allow_avatar'])
 				{
 					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index bf1611a5de..669641de70 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1353,7 +1353,7 @@ function get_avatar($row, $alt, $ignore_config = false)
 {
 	global $user, $config, $cache, $phpbb_root_path, $phpEx;
 	global $request;
-	global $phpbb_avatar_manager;
+	global $phpbb_container;
 
 	if (!$config['allow_avatar'] && !$ignore_config)
 	{
@@ -1366,6 +1366,7 @@ function get_avatar($row, $alt, $ignore_config = false)
 		'height' => $row['avatar_height'],
 	);
 
+	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 	$avatar = $phpbb_avatar_manager->get_driver($row['avatar_type']);
 
 	if ($avatar)
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 5289a95e6d..33f147a47e 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -27,7 +27,7 @@ class ucp_groups
 	{
 		global $config, $phpbb_root_path, $phpEx;
 		global $db, $user, $auth, $cache, $template;
-		global $request, $phpbb_avatar_manager;
+		global $request, $phpbb_container;
 
 		$user->add_lang('groups');
 
@@ -484,6 +484,7 @@ class ucp_groups
 						$error = array();
 
 						// Setup avatar data for later
+						$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 						$avatars_enabled = false;
 						$avatar_drivers = null;
 						$avatar_data = null;
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 402db86c1d..3945fc537a 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -30,7 +30,7 @@ class ucp_profile
 	{
 		global $cache, $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
 		global $request;
-		global $phpbb_avatar_manager;
+		global $phpbb_container;
 
 		$user->add_lang('posting');
 
@@ -549,6 +549,7 @@ class ucp_profile
 
 				add_form_key('ucp_avatar');
 
+				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 				$avatars_enabled = false;
 
 				if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
-- 
cgit v1.2.1


From 6d061304afaa703a5305a06a903356d1c48ff2ee Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 15:03:35 +0100
Subject: [feature/avatars] Small fixes

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index c09f447f76..136ceeff3c 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -337,6 +337,7 @@ class acp_groups
 						$driver = str_replace('_', '.', request_var('avatar_driver', ''));
 						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
 						$avatar_delete = $request->variable('avatar_delete', '');
+
 						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
 						{
 							$avatar = $phpbb_avatar_manager->get_driver($driver);
@@ -344,19 +345,15 @@ class acp_groups
 
 							if ($result && empty($avatar_error))
 							{
-								$result = array(
-									'avatar_type'		=> $driver,
-									'avatar' 			=> $result['avatar'],
-									'avatar_width' 	=> $result['avatar_width'],
-									'avatar_height' 	=> $result['avatar_height'],
-								);
+								$result['avatar_type'] = $driver;
 								
 								$submit_ary = array_merge($submit_ary, $result);
 							}
 						}
 						else
 						{
-							if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
+							$avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type'])
+							if ($avatar)
 							{
 								$avatar->delete($avatar_data);
 							}
-- 
cgit v1.2.1


From 06639729ea2da6d0025da74ae7d4f3e88f211b67 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 16:04:59 +0100
Subject: [feature/avatars] Add static methods for handling driver names

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php  |  6 +++---
 phpBB/includes/acp/acp_users.php   |  6 +++---
 phpBB/includes/avatar/manager.php  | 26 ++++++++++++++++++++++++++
 phpBB/includes/ucp/ucp_groups.php  |  6 +++---
 phpBB/includes/ucp/ucp_profile.php |  6 +++---
 5 files changed, 38 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 136ceeff3c..2969f34b24 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -334,7 +334,7 @@ class acp_groups
 					if ($config['allow_avatar'])
 					{
 						// Handle avatar
-						$driver = str_replace('_', '.', request_var('avatar_driver', ''));
+						$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
 						$avatar_delete = $request->variable('avatar_delete', '');
 
@@ -523,7 +523,7 @@ class acp_groups
 				if ($config['allow_avatar'])
 				{
 					$avatars_enabled = false;
-					$focused_driver = str_replace('_', '.', request_var('avatar_driver', $avatar_data['avatar_type']));
+					$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
 
 					foreach ($avatar_drivers as $driver)
 					{
@@ -539,7 +539,7 @@ class acp_groups
 
 							if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
 							{
-								$driver_name = str_replace('.', '_', $driver);
+								$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
 								$driver_upper = strtoupper($driver_name);
 								$template->assign_block_vars('avatar_drivers', array(
 									'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 885233bbd3..44e4f14ae2 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1747,7 +1747,7 @@ class acp_users
 					{
 						if (check_form_key($form_name))
 						{
-							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
+							$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
 							$avatar_delete = $request->variable('avatar_delete', '');
 							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
@@ -1803,7 +1803,7 @@ class acp_users
 						}
 					}
 
-					$focused_driver = str_replace('_', '.', request_var('avatar_driver', $user_row['user_avatar_type']));
+					$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type']));
 
 					foreach ($avatar_drivers as $driver)
 					{
@@ -1819,7 +1819,7 @@ class acp_users
 
 							if ($avatar->prepare_form($template, $avatar_data, $error))
 							{
-								$driver_name = str_replace('.', '_', $driver);
+								$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
 								$driver_upper = strtoupper($driver_name);
 
 								$template->assign_block_vars('avatar_drivers', array(
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index da9d843947..51727f242a 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -152,4 +152,30 @@ class phpbb_avatar_manager
 
 		return array_combine($keys, $values);
 	}
+
+	/**
+	* Clean driver names that are returned from template files
+	* Underscores are replaced with dots
+	*
+	* @param string $name Driver name
+	*
+	* @return string Cleaned driver name
+	*/
+	public static function clean_driver_name($name)
+	{
+		return str_replace('_', '.', $name);
+	}
+
+	/**
+	* Prepare driver names for use in template files
+	* Dots are replaced with underscores
+	*
+	* @param string $name Clean driver name
+	*
+	* @return string Prepared driver name
+	*/
+	public static function prepare_driver_name($name)
+	{
+		return str_replace('.', '_', $name);
+	}
 }
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 33f147a47e..df6915711c 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -521,7 +521,7 @@ class ucp_groups
 							if ($config['allow_avatar'])
 							{
 								// Handle avatar
-								$driver = str_replace('_', '.', request_var('avatar_driver', ''));
+								$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 								$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
 								$avatar_delete = $request->variable('avatar_delete', '');
 								if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
@@ -652,7 +652,7 @@ class ucp_groups
 						if ($config['allow_avatar'])
 						{
 							$avatars_enabled = false;
-							$focused_driver = str_replace('_', '.', request_var('avatar_driver', $avatar_data['avatar_type']));
+							$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
 
 							foreach ($avatar_drivers as $driver)
 							{
@@ -667,7 +667,7 @@ class ucp_groups
 
 									if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
 									{
-										$driver_name = str_replace('.', '_', $driver);
+										$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
 										$driver_upper = strtoupper($driver_name);
 										$template->assign_block_vars('avatar_drivers', array(
 											'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 3945fc537a..36ac227bc8 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -564,7 +564,7 @@ class ucp_profile
 					{
 						if (check_form_key('ucp_avatar'))
 						{
-							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
+							$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
 							$avatar_delete = $request->variable('avatar_delete', '');
 							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
@@ -624,7 +624,7 @@ class ucp_profile
 						}
 					}
 
-					$focused_driver = str_replace('_', '.', request_var('avatar_driver', $user->data['user_avatar_type']));
+					$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));
 
 					foreach ($avatar_drivers as $driver)
 					{
@@ -639,7 +639,7 @@ class ucp_profile
 
 							if ($avatar->prepare_form($template, $avatar_data, $error))
 							{
-								$driver_name = str_replace('.', '_', $driver);
+								$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
 								$driver_upper = strtoupper($driver_name);
 
 								$template->assign_block_vars('avatar_drivers', array(
-- 
cgit v1.2.1


From f8256ed00f5ecc95fbf9f69fd2e8de2a92bccec6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 16:18:51 +0100
Subject: [feature/avatars] Small cosmetic changes

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php  |  3 +--
 phpBB/includes/acp/acp_users.php   |  4 ++--
 phpBB/includes/ucp/ucp_groups.php  | 13 ++++---------
 phpBB/includes/ucp/ucp_profile.php |  4 ++--
 4 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 2969f34b24..a55087adce 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -336,9 +336,8 @@ class acp_groups
 						// Handle avatar
 						$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
-						$avatar_delete = $request->variable('avatar_delete', '');
 
-						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
+						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
 						{
 							$avatar = $phpbb_avatar_manager->get_driver($driver);
 							$result = $avatar->process_form($template, $avatar_data, $avatar_error);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 44e4f14ae2..823f001fe0 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1749,8 +1749,8 @@ class acp_users
 						{
 							$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
-							$avatar_delete = $request->variable('avatar_delete', '');
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
+
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index df6915711c..dd03f332ff 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -523,21 +523,16 @@ class ucp_groups
 								// Handle avatar
 								$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 								$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
-								$avatar_delete = $request->variable('avatar_delete', '');
-								if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
+
+								if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
 								{
 									$avatar = $phpbb_avatar_manager->get_driver($driver);
 									$result = $avatar->process_form($template, $avatar_data, $avatar_error);
 
 									if ($result && empty($avatar_error))
 									{
-										$result = array(
-											'avatar_type'		=> $driver,
-											'avatar' 			=> $result['avatar'],
-											'avatar_width' 	=> $result['avatar_width'],
-											'avatar_height' 	=> $result['avatar_height'],
-										);
-										
+										$result['avatar_type'] = $driver;
+
 										$submit_ary = array_merge($submit_ary, $result);
 									}
 								}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 36ac227bc8..88820beac1 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -566,8 +566,8 @@ class ucp_profile
 						{
 							$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
-							$avatar_delete = $request->variable('avatar_delete', '');
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
+
+							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
 								$result = $avatar->process_form($template, $avatar_data, $error);
-- 
cgit v1.2.1


From a77fcdb5f93ed291c223c445a46a5641cfdb27ea Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 17:01:21 +0100
Subject: [feature/avatars] Implement better treatment of avatar errors

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php  | 10 +++++-----
 phpBB/includes/acp/acp_users.php   | 14 ++++++--------
 phpBB/includes/ucp/ucp_groups.php  | 10 +++++-----
 phpBB/includes/ucp/ucp_profile.php | 12 +++++-------
 4 files changed, 21 insertions(+), 25 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index a55087adce..19006df306 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -559,16 +559,16 @@ class acp_groups
 				* Merge any avatar errors into the primary error array
 				* Drivers use language constants, so we need to map to the actual strings
 				*/
-				foreach ($avatar_error as $e)
+				foreach ($avatar_error as $lang)
 				{
-					if (is_array($e))
+					if (is_array($lang))
 					{
-						$key = array_shift($e);
-						$error[] = vsprintf($user->lang($key), $e);
+						$key = array_shift($lang);
+						$error[] = vsprintf($user->lang($key), $lang);
 					}
 					else
 					{
-						$error[] = $user->lang("$e");
+						$error[] = $user->lang("$lang");
 					}
 				}
 
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 823f001fe0..e0dcea6d58 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1836,21 +1836,19 @@ class acp_users
 				}
 
 				// Replace "error" strings with their real, localised form
-				$err = $error;
-				$error = array();
-				foreach ($err as $e)
+				foreach ($error as $key => $lang)
 				{
-					if (is_array($e))
+					if (is_array($lang))
 					{
-						$key = array_shift($e);
-						$error[] = vsprintf($user->lang($key), $e);
+						$lang_key = array_shift($lang);
+						$error[$key] = vsprintf($user->lang($lang_key), $lang);
 					}
 					else
 					{
-						$error[] = $user->lang((string) $e);
+						$error[$key] = $user->lang("$lang");
 					}
 				}
-				
+
 				$avatar = get_user_avatar($user_row, 'USER_AVATAR', true);
 
 				$template->assign_vars(array(
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index dd03f332ff..3860d22917 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -679,16 +679,16 @@ class ucp_groups
 
 						// Merge any avatars errors into the primary error array
 						// Drivers use lang constants, so we need to map to the actual strings
-						foreach ($avatar_error as $e)
+						foreach ($avatar_error as $lang)
 						{
-							if (is_array($e))
+							if (is_array($lang))
 							{
-								$key = array_shift($e);
-								$error[] = vsprintf($user->lang($key), $e);
+								$key = array_shift($lang);
+								$error[] = vsprintf($user->lang($key), $lang);
 							}
 							else
 							{
-								$error[] = $user->lang((string) $e);
+								$error[] = $user->lang("$lang");
 							}
 						}
 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 88820beac1..c05105eaff 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -656,18 +656,16 @@ class ucp_profile
 				}
 
 				// Replace "error" strings with their real, localised form
-				$err = $error;
-				$error = array();
-				foreach ($err as $e)
+				foreach ($error as $key => $lang)
 				{
-					if (is_array($e))
+					if (is_array($lang))
 					{
-						$key = array_shift($e);
-						$error[] = vsprintf($user->lang($key), $e);
+						$key = array_shift($lang);
+						$error[$key] = vsprintf($user->lang($key), $lang);
 					}
 					else
 					{
-						$error[] = $user->lang((string) $e);
+						$error[$key] = $user->lang("$lang");
 					}
 				}
 				
-- 
cgit v1.2.1


From 6522190ff1b7a7b4384389f23c1229911c1a58d2 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 20:50:31 +0100
Subject: [feature/avatars] Docblock fixes and small change for php_ext

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php   | 60 +++++++++++++++----------------
 phpBB/includes/avatar/driver/gravatar.php |  2 +-
 phpBB/includes/avatar/driver/remote.php   |  4 +--
 phpBB/includes/avatar/driver/upload.php   |  4 +--
 4 files changed, 34 insertions(+), 36 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 710d3dfe20..c6b864bc9f 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -23,26 +23,6 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 {
 	protected $name;
 
-	/**
-	* Returns the name of the driver.
-	*
-	* @return string		Name of wrapped driver.
-	*/
-	public function get_name()
-	{
-		return $this->name;
-	}
-
-	/**
-	* Sets the name of the driver.
-	*
-	* @param string	$name The driver name
-	*/
-	public function set_name($name)
-	{
-		$this->name = $name;
-	}
-
 	/**
 	* Current board configuration
 	* @type phpbb_config
@@ -50,8 +30,8 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	protected $config;
 
 	/**
-	* Current board configuration
-	* @type phpbb_config
+	* Request object
+	* @type phpbb_request
 	*/
 	protected $request;
 
@@ -62,10 +42,10 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	protected $phpbb_root_path;
 
 	/**
-	* Current $phpEx
+	* Current $php_ext
 	* @type string
 	*/
-	protected $phpEx;
+	protected $php_ext;
 
 	/**
 	* A cache driver
@@ -83,18 +63,18 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	/**
 	* Construct a driver object
 	*
-	* @param $config The phpBB configuration
-	* @param $request The request object
-	* @param $phpbb_root_path The path to the phpBB root
-	* @param $phpEx The php file extension
-	* @param $cache A cache driver
+	* @param phpbb_config $config The phpBB configuration
+	* @param phpbb_request $request The request object
+	* @param string $phpbb_root_path The path to the phpBB root
+	* @param string $php_ext The php file extension
+	* @param phpbb_cache_driver_interface $cache A cache driver
 	*/
-	public function __construct(phpbb_config $config, phpbb_request $request, $phpbb_root_path, $phpEx, phpbb_cache_driver_interface $cache = null)
+	public function __construct(phpbb_config $config, phpbb_request $request, $phpbb_root_path, $php_ext, phpbb_cache_driver_interface $cache = null)
 	{
 		$this->config = $config;
 		$this->request = $request;
 		$this->phpbb_root_path = $phpbb_root_path;
-		$this->phpEx = $phpEx;
+		$this->php_ext = $php_ext;
 		$this->cache = $cache;
 	}
 
@@ -170,4 +150,22 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 
 		return $template;
 	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_name()
+	{
+		return $this->name;
+	}
+
+	/**
+	* Sets the name of the driver.
+	*
+	* @param string	$name The driver name
+	*/
+	public function set_name($name)
+	{
+		$this->name = $name;
+	}
 }
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index cca7289275..e21743242f 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -95,7 +95,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 		$row['avatar_width'] = $this->request->variable('avatar_gravatar_width', 0);
 		$row['avatar_height'] = $this->request->variable('avatar_gravatar_height', 0);
 
-		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx);
+		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
 
 		$error = array_merge($error, validate_data(array(
 			'email' => $row['avatar'],
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index f47b0d33f4..134bf070e5 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -82,7 +82,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 			$url = 'http://' . $url;
 		}
 
-		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx);
+		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
 
 		$error = array_merge($error, validate_data(array(
 			'url' => $url,
@@ -128,7 +128,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 			return false;
 		}
 
-		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->phpEx);
+		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
 		$types = fileupload::image_types();
 		$extension = strtolower(filespec::get_extension($url));
 
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 9035b5364e..91de47e66d 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -29,7 +29,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 		if ($ignore_config || $this->config['allow_avatar_upload'])
 		{
 			return array(
-				'src' => $this->phpbb_root_path . 'download/file' . $this->phpEx . '?avatar=' . $row['avatar'],
+				'src' => $this->phpbb_root_path . 'download/file' . $this->php_ext . '?avatar=' . $row['avatar'],
 				'width' => $row['avatar_width'],
 				'height' => $row['avatar_height'],
 			);
@@ -72,7 +72,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 			return false;
 		}
 
-		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->phpEx);
+		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
 
 		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
-- 
cgit v1.2.1


From f851d763f9997b896219d1068dd23f6de7dbfc36 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 25 Nov 2012 21:14:05 +0100
Subject: [feature/avatars] Even more fixes to docblocks

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php    | 42 ++++++++++++++++--------------
 phpBB/includes/avatar/driver/gravatar.php  |  4 +--
 phpBB/includes/avatar/driver/interface.php | 38 +++++++++++++--------------
 phpBB/includes/avatar/driver/local.php     |  4 +--
 phpBB/includes/avatar/driver/remote.php    |  2 +-
 phpBB/includes/avatar/driver/upload.php    |  2 +-
 phpBB/includes/avatar/manager.php          | 34 ++++++++++++------------
 7 files changed, 65 insertions(+), 61 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index c6b864bc9f..234186215b 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -21,53 +21,57 @@ if (!defined('IN_PHPBB'))
 */
 abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 {
+	/**
+	* Avatar driver name
+	* @var string
+	*/
 	protected $name;
 
 	/**
 	* Current board configuration
-	* @type phpbb_config
+	* @var phpbb_config
 	*/
 	protected $config;
 
 	/**
 	* Request object
-	* @type phpbb_request
+	* @var phpbb_request
 	*/
 	protected $request;
 
 	/**
 	* Current $phpbb_root_path
-	* @type string
+	* @var string
 	*/
 	protected $phpbb_root_path;
 
 	/**
 	* Current $php_ext
-	* @type string
+	* @var string
 	*/
 	protected $php_ext;
 
 	/**
-	* A cache driver
-	* @type phpbb_cache_driver_interface
+	* Cache driver
+	* @var phpbb_cache_driver_interface
 	*/
 	protected $cache;
 
 	/**
 	* This flag should be set to true if the avatar requires a nonstandard image
 	* tag, and will generate the html itself.
-	* @type boolean
+	* @var boolean
 	*/
 	public $custom_html = false;
 
 	/**
 	* Construct a driver object
 	*
-	* @param phpbb_config $config The phpBB configuration
-	* @param phpbb_request $request The request object
-	* @param string $phpbb_root_path The path to the phpBB root
-	* @param string $php_ext The php file extension
-	* @param phpbb_cache_driver_interface $cache A cache driver
+	* @param phpbb_config $config phpBB configuration
+	* @param phpbb_request $request Request object
+	* @param string $phpbb_root_path Path to the phpBB root
+	* @param string $php_ext PHP file extension
+	* @param phpbb_cache_driver_interface $cache Cache driver
 	*/
 	public function __construct(phpbb_config $config, phpbb_request $request, $phpbb_root_path, $php_ext, phpbb_cache_driver_interface $cache = null)
 	{
@@ -100,7 +104,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 
 	/**
 	* @inheritdoc
-	**/
+	*/
 	public function prepare_form($template, $row, &$error)
 	{
 		return false;
@@ -108,7 +112,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 
 	/**
 	* @inheritdoc
-	**/
+	*/
 	public function prepare_form_acp()
 	{
 		return array();
@@ -116,7 +120,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 
 	/**
 	* @inheritdoc
-	**/
+	*/
 	public function process_form($template, $row, &$error)
 	{
 		return false;
@@ -124,7 +128,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 
 	/**
 	* @inheritdoc
-	**/
+	*/
 	public function delete($row)
 	{
 		return true;
@@ -132,7 +136,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 
 	/**
 	* @inheritdoc
-	**/
+	*/
 	public function is_enabled()
 	{
 		$driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this));
@@ -142,7 +146,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 
 	/**
 	* @inheritdoc
-	**/
+	*/
 	public function get_template_name()
 	{
 		$driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this));
@@ -162,7 +166,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	/**
 	* Sets the name of the driver.
 	*
-	* @param string	$name The driver name
+	* @param string	$name Driver name
 	*/
 	public function set_name($name)
 	{
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index e21743242f..a90c0e3ce1 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -78,7 +78,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 
 	/**
 	* @inheritdoc
-	**/
+	*/
 	public function prepare_form_acp()
 	{
 		return array(
@@ -170,7 +170,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	/**
 	* Build gravatar URL for output on page
 	*
-	* @return string The gravatar URL
+	* @return string Gravatar URL
 	*/
 	protected function get_gravatar_url($row)
 	{
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 28220d79f2..cc6b7edd17 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -24,7 +24,7 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Returns the name of the driver.
 	*
-	* @return string		Name of wrapped driver.
+	* @return string	Name of wrapped driver.
 	*/
 	public function get_name();
 
@@ -43,7 +43,7 @@ interface phpbb_avatar_driver_interface
 	* Returns custom html for displaying this avatar.
 	* Only called if $custom_html is true.
 	*
-	* @param $ignore_config Whether this function should respect the users prefs
+	* @param bool $ignore_config Whether this function should respect the users prefs
 	*        and board configuration configuration option, or should just render
 	*        the avatar anyways. Useful for the ACP.
 	* @return string HTML
@@ -53,56 +53,56 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Prepare form for changing the settings of this avatar
 	*
-	* @param object	$template The template object
-	* @param array	$row The user data or group data that has been cleaned with 
+	* @param object	$template Template object
+	* @param array	$row User data or group data that has been cleaned with 
 	*        phpbb_avatar_manager::clean_row
-	* @param array	&$error The reference to an error array
+	* @param array	&$error Reference to an error array
 	*
-	* @return bool Returns true if form has been successfully prepared
-	**/
+	* @return bool True if form has been successfully prepared
+	*/
 	public function prepare_form($template, $row, &$error);
 
 	/**
 	* Prepare form for changing the acp settings of this avatar
 	*
-	* @return array Return the array containing the acp settings
-	**/
+	* @return array Array containing the acp settings
+	*/
 	public function prepare_form_acp();
 
 	/**
 	* Process form data
 	*
-	* @param object	$template The template object
-	* @param array	$row The user data or group data that has been cleaned with 
+	* @param object	$template Template object
+	* @param array	$row User data or group data that has been cleaned with 
 	*        phpbb_avatar_manager::clean_row
-	* @param array	&$error The reference to an error array
+	* @param array	&$error Reference to an error array
 	*
-	* @return array An array containing the avatar data as follows:
+	* @return array Array containing the avatar data as follows:
 	*        ['avatar'], ['avatar_width'], ['avatar_height']
-	**/
+	*/
 	public function process_form($template, $row, &$error);
 
 	/**
 	* Delete avatar
 	*
-	* @param array $row The user data or group data that has been cleaned with 
+	* @param array $row User data or group data that has been cleaned with 
 	*        phpbb_avatar_manager::clean_row
 	*
 	* @return bool True if avatar has been deleted or there is no need to delete
-	**/
+	*/
 	public function delete($row);
 
 	/**
 	* Check if avatar is enabled
 	*
 	* @return bool True if avatar is enabled, false if it's disabled
-	**/
+	*/
 	public function is_enabled();
 
 	/**
 	* Get the avatars template name
 	*
-	* @return string The avatars template name
-	**/
+	* @return string Avatar's template name
+	*/
 	public function get_template_name();
 }
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index c231206d8e..d46ac79d11 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -114,7 +114,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 	/**
 	* @inheritdoc
-	**/
+	*/
 	public function prepare_form_acp()
 	{
 		return array(
@@ -148,7 +148,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* Get a list of avatars that are locally available
 	*
-	* @return array An array containing the locally available avatars
+	* @return array Array containing the locally available avatars
 	*/
 	protected function get_avatar_list()
 	{
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 134bf070e5..b7522ac3e1 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -60,7 +60,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 
 	/**
 	* @inheritdoc
-	**/
+	*/
 	public function prepare_form_acp()
 	{
 		return array(
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 91de47e66d..f00033d6bd 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -124,7 +124,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 
 	/**
 	* @inheritdoc
-	**/
+	*/
 	public function prepare_form_acp()
 	{
 		global $user;
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 51727f242a..ae628f0ce2 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -32,14 +32,14 @@ class phpbb_avatar_manager
 	/**
 	* Construct an avatar manager object
 	*
-	* @param $phpbb_root_path The path to the phpBB root
-	* @param $phpEx The php file extension
-	* @param $config The phpBB configuration
-	* @param $request The request object
-	* @param $cache A cache driver
-	* @param $avatar_drivers The avatars drivers passed via the service container
-	* @param $container The container object
-	**/
+	* @param string $phpbb_root_path Path to the phpBB root
+	* @param string $phpEx PHP file extension
+	* @param phpbb_config $config phpBB configuration
+	* @param phpbb_request $request Request object
+	* @param phpbb_cache_driver_interface $cache Cache driver
+	* @param array $avatar_drivers Avatar drivers passed via the service container
+	* @param object $container Container object
+	*/
 	public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_request $request, phpbb_cache_driver_interface $cache, $avatar_drivers, $container)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
@@ -54,10 +54,10 @@ class phpbb_avatar_manager
 	/**
 	* Get the driver object specified by the avatar type
 	*
-	* @param string The avatar type; by default an avatar's service container name
+	* @param string Avatar type; by default an avatar's service container name
 	*
-	* @return object The avatar driver object
-	**/
+	* @return object Avatar driver object
+	*/
 	public function get_driver($avatar_type)
 	{
 		if (self::$valid_drivers === false)
@@ -101,7 +101,7 @@ class phpbb_avatar_manager
 	/**
 	* Load the list of valid drivers
 	* This is executed once and fills self::$valid_drivers
-	**/
+	*/
 	protected function load_valid_drivers()
 	{
 		if (!empty($this->avatar_drivers))
@@ -117,8 +117,8 @@ class phpbb_avatar_manager
 	/**
 	* Get a list of valid avatar drivers
 	*
-	* @return array An array containing a list of the valid avatar drivers
-	**/
+	* @return array Array containing a list of the valid avatar drivers
+	*/
 	public function get_valid_drivers()
 	{
 		if (self::$valid_drivers === false)
@@ -132,11 +132,11 @@ class phpbb_avatar_manager
 	/**
 	* Strip out user_ and group_ prefixes from keys
 	*
-	* @param array	$row The user data or group data
+	* @param array	$row User data or group data
 	*
-	* @return array The user data or group data with keys that have been
+	* @return array User data or group data with keys that have been
 	*        stripped from the preceding "user_" or "group_"
-	**/
+	*/
 	public static function clean_row($row)
 	{
 		$keys = array_keys($row);
-- 
cgit v1.2.1


From cb1d98ab7f588a38fcae680aca839b805caf2a23 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 26 Nov 2012 23:06:38 +0100
Subject: [feature/avatars] Check for existing functions rather than using
 _once

PHPBB3-10018
---
 phpBB/includes/avatar/driver/gravatar.php |  5 ++++-
 phpBB/includes/avatar/driver/remote.php   | 11 +++++++++--
 phpBB/includes/avatar/driver/upload.php   |  5 ++++-
 phpBB/includes/ucp/ucp_profile.php        |  5 ++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index a90c0e3ce1..7e21a737a1 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -95,7 +95,10 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 		$row['avatar_width'] = $this->request->variable('avatar_gravatar_width', 0);
 		$row['avatar_height'] = $this->request->variable('avatar_gravatar_height', 0);
 
-		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
+		if (!function_exists('user_add'))
+		{
+			require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
+		}
 
 		$error = array_merge($error, validate_data(array(
 			'email' => $row['avatar'],
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index b7522ac3e1..1da5fc16e8 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -82,7 +82,10 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 			$url = 'http://' . $url;
 		}
 
-		require_once($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
+		if (!function_exists('user_add'))
+		{
+			require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
+		}
 
 		$error = array_merge($error, validate_data(array(
 			'url' => $url,
@@ -128,7 +131,11 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 			return false;
 		}
 
-		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+		if (!class_exists('fileupload'))
+		{
+			include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+		}
+
 		$types = fileupload::image_types();
 		$extension = strtolower(filespec::get_extension($url));
 
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index f00033d6bd..497dd8ad19 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -72,7 +72,10 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 			return false;
 		}
 
-		include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+		if (!class_exists('fileupload'))
+		{
+			include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+		}
 
 		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index c05105eaff..c8547e48d8 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -545,7 +545,10 @@ class ucp_profile
 			break;
 
 			case 'avatar':
-				include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+				if (!function_exists('display_forums'))
+				{
+					include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+				}
 
 				add_form_key('ucp_avatar');
 
-- 
cgit v1.2.1


From 9c0a03f1d56d069a5ca5092de8e0f3e4e6ee9c1d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 29 Nov 2012 12:05:52 -0500
Subject: [ticket/11095] Python quoteattr port.

PHPBB3-11095
---
 phpBB/includes/functions.php | 47 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d7088ac129..5d8a92b63b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4893,6 +4893,53 @@ function phpbb_http_login($param)
 	trigger_error('NOT_AUTHORISED');
 }
 
+/**
+* Escapes and quotes a string for use as an HTML/XML attribute value.
+*
+* This is a port of Python xml.sax.saxutils quoteattr.
+*
+* The function will attempt to choose a quote character in such a way as to
+* avoid escaping quotes in the string. If this is not possible the string will
+* be wrapped in double quotes and double quotes will be escaped.
+*
+* @param string $data The string to be escaped
+* @param array $entities Associative array of additional entities to be escaped
+* @return string Escaped and quoted string
+*/
+function phpbb_quoteattr($data, $entities = null)
+{
+	$data = str_replace('&', '&amp;', $data);
+	$data = str_replace('>', '&gt;', $data);
+	$data = str_replace('<', '&lt;', $data);
+
+	$data = str_replace("\n", '&#10;', $data);
+	$data = str_replace("\r", '&#13;', $data);
+	$data = str_replace("\t", '&#9;', $data);
+
+	if (!empty($entities))
+	{
+		$data = str_replace(array_keys($entities), array_values($entities), $data);
+	}
+
+	if (strpos($data, '"') !== false)
+	{
+		if (strpos($data, "'") !== false)
+		{
+			$data = '"' . str_replace('"', '&quot;', $data) . '"';
+		}
+		else
+		{
+			$data = "'" . $data . "'";
+		}
+	}
+	else
+	{
+		$data = '"' . $data . '"';
+	}
+
+	return $data;
+}
+
 /**
 * Generate page header
 */
-- 
cgit v1.2.1


From 2a39df1a53ae4d9798bcba9ceee610190702cc4b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 29 Nov 2012 13:36:00 -0500
Subject: [ticket/11095] Forward GET parameters into hidden fields for jumpbox.

PHPBB3-11095
---
 phpBB/includes/functions.php | 42 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 5d8a92b63b..ee5a1afd30 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4940,13 +4940,47 @@ function phpbb_quoteattr($data, $entities = null)
 	return $data;
 }
 
+function phpbb_build_hidden_fields_for_query_params($request, $exclude = null)
+{
+	$names = $request->variable_names(phpbb_request_interface::GET);
+	$hidden = '';
+	foreach ($names as $name)
+	{
+		// Sessions are dealt with elsewhere, omit sid always
+		if ($name == 'sid')
+		{
+			continue;
+		}
+
+		// Omit any additional parameters requested
+		if (!empty($exclude) && in_array($name, $exclude))
+		{
+			continue;
+		}
+
+		$escaped_name = phpbb_quoteattr($name);
+
+		// Note: we might retrieve the variable from POST or cookies
+		// here. To avoid exposing cookies, skip variables that are
+		// overwritten somewhere other than GET entirely.
+		$value = $request->variable($name, '', true);
+		$get_value = $request->variable($name, '', true, phpbb_request_interface::GET);
+		if ($value === $get_value)
+		{
+			$escaped_value = phpbb_quoteattr($value);
+			$hidden .= "<input type='hidden' name=$escaped_name value=$escaped_value />";
+		}
+	}
+	return $hidden;
+}
+
 /**
 * Generate page header
 */
 function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum')
 {
 	global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path;
-	global $phpbb_dispatcher;
+	global $phpbb_dispatcher, $request;
 
 	if (defined('HEADER_INC'))
 	{
@@ -5135,6 +5169,8 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		$timezone_name = $user->lang['timezones'][$timezone_name];
 	}
 
+	$hidden_fields_for_jumpbox = phpbb_build_hidden_fields_for_query_params($request, array('f'));
+
 	// The following assigns all _common_ variables that may be used at any point in a template.
 	$template->assign_vars(array(
 		'SITENAME'						=> $config['sitename'],
@@ -5149,6 +5185,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'RECORD_USERS'					=> $l_online_record,
 		'PRIVATE_MESSAGE_INFO'			=> $l_privmsgs_text,
 		'PRIVATE_MESSAGE_INFO_UNREAD'	=> $l_privmsgs_text_unread,
+		'HIDDEN_FIELDS_FOR_JUMPBOX'	=> $hidden_fields_for_jumpbox,
 
 		'S_USER_NEW_PRIVMSG'			=> $user->data['user_new_privmsg'],
 		'S_USER_UNREAD_PRIVMSG'			=> $user->data['user_unread_privmsg'],
@@ -5507,7 +5544,8 @@ function phpbb_to_numeric($input)
 function phpbb_create_symfony_request(phpbb_request $request)
 {
 	// This function is meant to sanitize the global input arrays
-	$sanitizer = function(&$value, $key) {
+	$sanitizer = function(&$value, $key)
+	{
 		$type_cast_helper = new phpbb_request_type_cast_helper();
 		$type_cast_helper->set_var($value, $value, gettype($value), true);
 	};
-- 
cgit v1.2.1


From 3e907265d5782c535d43e503c32390cfde8dc4a8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 29 Nov 2012 14:41:48 -0500
Subject: [ticket/11095] Docs and tests for
 phpbb_build_hidden_fields_for_query_params.

PHPBB3-11095
---
 phpBB/includes/functions.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index ee5a1afd30..9c92adb0ec 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4940,6 +4940,20 @@ function phpbb_quoteattr($data, $entities = null)
 	return $data;
 }
 
+/**
+* Converts query string (GET) parameters in request into hidden fields.
+*
+* Useful for forwarding GET parameters when submitting forms with GET method.
+*
+* It is possible to omit some of the GET parameters, which is useful if
+* they are specified in the form being submitted.
+*
+* sid is always omitted.
+*
+* @param phpbb_request $request Request object
+* @param array $exclude A list of variable names that should not be forwarded
+* @return string HTML with hidden fields
+*/
 function phpbb_build_hidden_fields_for_query_params($request, $exclude = null)
 {
 	$names = $request->variable_names(phpbb_request_interface::GET);
-- 
cgit v1.2.1


From 11ca272692ed1b46d4ff208705cb30636c98704f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 29 Nov 2012 14:42:56 -0500
Subject: [ticket/11095] Restore brace on previous line.

PHPBB3-11095
---
 phpBB/includes/functions.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9c92adb0ec..8df40b26f6 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5558,8 +5558,7 @@ function phpbb_to_numeric($input)
 function phpbb_create_symfony_request(phpbb_request $request)
 {
 	// This function is meant to sanitize the global input arrays
-	$sanitizer = function(&$value, $key)
-	{
+	$sanitizer = function(&$value, $key) {
 		$type_cast_helper = new phpbb_request_type_cast_helper();
 		$type_cast_helper->set_var($value, $value, gettype($value), true);
 	};
-- 
cgit v1.2.1


From 81a1a21185abfc230097a355216d6c6b99511b20 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 29 Nov 2012 23:08:29 +0100
Subject: [feature/avatars] Properly implement custom HTML in the interface

Previously the driver class added a variable that defined wether an avatar
driver would return custom HTML. The existence of this variable was
implied in the interface. It's also not needed which is why it has been
removed.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php    | 7 -------
 phpBB/includes/avatar/driver/gravatar.php  | 6 ++----
 phpBB/includes/avatar/driver/interface.php | 3 +--
 phpBB/includes/functions_display.php       | 8 ++++----
 4 files changed, 7 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 234186215b..6710f1f153 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -57,13 +57,6 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	*/
 	protected $cache;
 
-	/**
-	* This flag should be set to true if the avatar requires a nonstandard image
-	* tag, and will generate the html itself.
-	* @var boolean
-	*/
-	public $custom_html = false;
-
 	/**
 	* Construct a driver object
 	*
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 7e21a737a1..6ceac1a149 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -21,12 +21,10 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 {
-	const GRAVATAR_URL = 'https://secure.gravatar.com/avatar/';
-
 	/**
-	* @inheritdoc
+	* The URL for the gravatar service
 	*/
-	public $custom_html = true;
+	const GRAVATAR_URL = 'https://secure.gravatar.com/avatar/';
 
 	/**
 	* @inheritdoc
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index cc6b7edd17..d2f25a989f 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -40,8 +40,7 @@ interface phpbb_avatar_driver_interface
 	public function get_data($row, $ignore_config = false);
 
 	/**
-	* Returns custom html for displaying this avatar.
-	* Only called if $custom_html is true.
+	* Returns custom html if it is needed for displaying this avatar
 	*
 	* @param bool $ignore_config Whether this function should respect the users prefs
 	*        and board configuration configuration option, or should just render
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 669641de70..a7b28acac1 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1368,12 +1368,14 @@ function get_avatar($row, $alt, $ignore_config = false)
 
 	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 	$avatar = $phpbb_avatar_manager->get_driver($row['avatar_type']);
+	$html = '';
 
 	if ($avatar)
 	{
-		if ($avatar->custom_html)
+		$html = $avatar->get_custom_html($row, $ignore_config, $alt);
+		if (!empty($html))
 		{
-			return $avatar->get_custom_html($row, $ignore_config, $alt);
+			return $html;
 		}
 
 		$avatar_data = $avatar->get_data($row, $ignore_config);
@@ -1383,8 +1385,6 @@ function get_avatar($row, $alt, $ignore_config = false)
 		$avatar_data['src'] = '';
 	}
 
-	$html = '';
-
 	if (!empty($avatar_data['src']))
 	{
 		$html = '<img src="' . $avatar_data['src'] . '" ' .
-- 
cgit v1.2.1


From f4ad60e2cf18771200d99bc953449d6229a74818 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 29 Nov 2012 23:50:17 +0100
Subject: [feature/avatars] Get list of enabled drivers from avatar manager

This shouldn't be done in the avatar drivers. We need to force the
display all avatar drivers in the ACP or it won't be possible to enable
avatars after they have been disabled.

PHPBB3-10018
---
 phpBB/includes/acp/acp_board.php           |  2 +-
 phpBB/includes/acp/acp_groups.php          | 35 ++++++++++++++----------------
 phpBB/includes/acp/acp_users.php           | 35 ++++++++++++++----------------
 phpBB/includes/avatar/driver/driver.php    | 10 ---------
 phpBB/includes/avatar/driver/interface.php |  7 ------
 phpBB/includes/avatar/manager.php          | 29 +++++++++++++++++++++----
 phpBB/includes/ucp/ucp_groups.php          | 33 +++++++++++++---------------
 phpBB/includes/ucp/ucp_profile.php         | 33 +++++++++++++---------------
 8 files changed, 88 insertions(+), 96 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 95da62dedf..c3bdf89866 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -108,7 +108,7 @@ class acp_board
 
 			case 'avatar':
 				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-				$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
+				$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers(true);
 				sort($avatar_drivers);
 				$avatar_vars = array();
 				foreach ($avatar_drivers as $driver)
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 19006df306..a15a1b9a78 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -528,27 +528,24 @@ class acp_groups
 					{
 						$avatar = $phpbb_avatar_manager->get_driver($driver);
 
-						if ($avatar->is_enabled())
+						$avatars_enabled = true;
+						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+						$template->set_filenames(array(
+							'avatar' => "acp_avatar_options_$config_name.html",
+						));
+
+						if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
 						{
-							$avatars_enabled = true;
-							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
-							$template->set_filenames(array(
-								'avatar' => "acp_avatar_options_$config_name.html",
+							$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+							$driver_upper = strtoupper($driver_name);
+							$template->assign_block_vars('avatar_drivers', array(
+								'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
+								'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
+
+								'DRIVER' => $driver_name,
+								'SELECTED' => $driver == $focused_driver,
+								'OUTPUT' => $template->assign_display('avatar'),
 							));
-
-							if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
-							{
-								$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
-								$driver_upper = strtoupper($driver_name);
-								$template->assign_block_vars('avatar_drivers', array(
-									'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
-									'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
-
-									'DRIVER' => $driver_name,
-									'SELECTED' => $driver == $focused_driver,
-									'OUTPUT' => $template->assign_display('avatar'),
-								));
-							}
 						}
 					}
 				}
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index e0dcea6d58..d5532e35b6 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1809,28 +1809,25 @@ class acp_users
 					{
 						$avatar = $phpbb_avatar_manager->get_driver($driver);
 
-						if ($avatar->is_enabled())
-						{
-							$avatars_enabled = true;
-							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
-							$template->set_filenames(array(
-								'avatar' => "acp_avatar_options_$config_name.html",
-							));
+						$avatars_enabled = true;
+						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+						$template->set_filenames(array(
+							'avatar' => "acp_avatar_options_$config_name.html",
+						));
 
-							if ($avatar->prepare_form($template, $avatar_data, $error))
-							{
-								$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
-								$driver_upper = strtoupper($driver_name);
+						if ($avatar->prepare_form($template, $avatar_data, $error))
+						{
+							$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+							$driver_upper = strtoupper($driver_name);
 
-								$template->assign_block_vars('avatar_drivers', array(
-									'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
-									'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
+							$template->assign_block_vars('avatar_drivers', array(
+								'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
+								'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
-									'DRIVER' => $driver_name,
-									'SELECTED' => $driver == $focused_driver,
-									'OUTPUT' => $template->assign_display('avatar'),
-								));
-							}
+								'DRIVER' => $driver_name,
+								'SELECTED' => $driver == $focused_driver,
+								'OUTPUT' => $template->assign_display('avatar'),
+							));
 						}
 					}
 				}
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 6710f1f153..cde4fd95a6 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -127,16 +127,6 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 		return true;
 	}
 
-	/**
-	* @inheritdoc
-	*/
-	public function is_enabled()
-	{
-		$driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this));
-
-		return $this->config["allow_avatar_$driver"];
-	}
-
 	/**
 	* @inheritdoc
 	*/
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index d2f25a989f..7a58a40b0c 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -91,13 +91,6 @@ interface phpbb_avatar_driver_interface
 	*/
 	public function delete($row);
 
-	/**
-	* Check if avatar is enabled
-	*
-	* @return bool True if avatar is enabled, false if it's disabled
-	*/
-	public function is_enabled();
-
 	/**
 	* Get the avatars template name
 	*
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index ae628f0ce2..8953557acb 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -101,15 +101,20 @@ class phpbb_avatar_manager
 	/**
 	* Load the list of valid drivers
 	* This is executed once and fills self::$valid_drivers
+	*
+	* @param bool $force_all Force showing all avatar drivers
 	*/
-	protected function load_valid_drivers()
+	protected function load_valid_drivers($force_all = false)
 	{
 		if (!empty($this->avatar_drivers))
 		{
 			self::$valid_drivers = array();
 			foreach ($this->avatar_drivers as $driver)
 			{
-				self::$valid_drivers[$driver->get_name()] = $driver->get_name();
+				if ($force_all || $this->is_enabled($driver))
+				{
+					self::$valid_drivers[$driver->get_name()] = $driver->get_name();
+				}
 			}
 		}
 	}
@@ -117,13 +122,15 @@ class phpbb_avatar_manager
 	/**
 	* Get a list of valid avatar drivers
 	*
+	* @param bool $force_all Force showing all avatar drivers
+	*
 	* @return array Array containing a list of the valid avatar drivers
 	*/
-	public function get_valid_drivers()
+	public function get_valid_drivers($force_all = false)
 	{
 		if (self::$valid_drivers === false)
 		{
-			$this->load_valid_drivers();
+			$this->load_valid_drivers($force_all);
 		}
 
 		return self::$valid_drivers;
@@ -178,4 +185,18 @@ class phpbb_avatar_manager
 	{
 		return str_replace('.', '_', $name);
 	}
+
+	/**
+	* Check if avatar is enabled
+	*
+	* @param object $driver Avatar driver object
+	*
+	* @return bool True if avatar is enabled, false if it's disabled
+	*/
+	public function is_enabled($driver)
+	{
+		$config_name = preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
+
+		return $this->config["allow_avatar_{$config_name}"];
+	}
 }
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 3860d22917..f17e535b0c 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -653,26 +653,23 @@ class ucp_groups
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);
 
-								if ($avatar->is_enabled())
+								$avatars_enabled = true;
+								$template->set_filenames(array(
+									'avatar' => $avatar->get_template_name(),
+								));
+
+								if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
 								{
-									$avatars_enabled = true;
-									$template->set_filenames(array(
-										'avatar' => $avatar->get_template_name(),
+									$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+									$driver_upper = strtoupper($driver_name);
+									$template->assign_block_vars('avatar_drivers', array(
+										'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
+										'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
+
+										'DRIVER' => $driver_name,
+										'SELECTED' => $driver == $focused_driver,
+										'OUTPUT' => $template->assign_display('avatar'),
 									));
-
-									if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
-									{
-										$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
-										$driver_upper = strtoupper($driver_name);
-										$template->assign_block_vars('avatar_drivers', array(
-											'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
-											'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
-
-											'DRIVER' => $driver_name,
-											'SELECTED' => $driver == $focused_driver,
-											'OUTPUT' => $template->assign_display('avatar'),
-										));
-									}
 								}
 							}
 						}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index c8547e48d8..f5c04bb432 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -633,27 +633,24 @@ class ucp_profile
 					{
 						$avatar = $phpbb_avatar_manager->get_driver($driver);
 
-						if ($avatar->is_enabled())
-						{
-							$avatars_enabled = true;
-							$template->set_filenames(array(
-								'avatar' => $avatar->get_template_name(),
-							));
+						$avatars_enabled = true;
+						$template->set_filenames(array(
+							'avatar' => $avatar->get_template_name(),
+						));
 
-							if ($avatar->prepare_form($template, $avatar_data, $error))
-							{
-								$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
-								$driver_upper = strtoupper($driver_name);
+						if ($avatar->prepare_form($template, $avatar_data, $error))
+						{
+							$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+							$driver_upper = strtoupper($driver_name);
 
-								$template->assign_block_vars('avatar_drivers', array(
-									'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
-									'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
+							$template->assign_block_vars('avatar_drivers', array(
+								'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
+								'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
-									'DRIVER' => $driver_name,
-									'SELECTED' => $driver == $focused_driver,
-									'OUTPUT' => $template->assign_display('avatar'),
-								));
-							}
+								'DRIVER' => $driver_name,
+								'SELECTED' => $driver == $focused_driver,
+								'OUTPUT' => $template->assign_display('avatar'),
+							));
 						}
 					}
 				}
-- 
cgit v1.2.1


From d5cbedaaa28312c107ec562c78ffaa034595f336 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 30 Nov 2012 15:12:34 +0100
Subject: [feature/avatars] Let avatar manager handle $ignore_config

The avatar manager already handles if avatars are enabled. It should also
handle ignoring the config settings.

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php          |  2 +-
 phpBB/includes/avatar/driver/driver.php    |  4 ++--
 phpBB/includes/avatar/driver/gravatar.php  | 25 +++++++------------------
 phpBB/includes/avatar/driver/interface.php | 16 +++++++---------
 phpBB/includes/avatar/driver/local.php     | 23 ++++++-----------------
 phpBB/includes/avatar/driver/remote.php    | 23 ++++++-----------------
 phpBB/includes/avatar/manager.php          |  9 +++++----
 phpBB/includes/functions_display.php       |  2 +-
 8 files changed, 35 insertions(+), 69 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index a15a1b9a78..75956736f7 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -351,7 +351,7 @@ class acp_groups
 						}
 						else
 						{
-							$avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type'])
+							$avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
 							if ($avatar)
 							{
 								$avatar->delete($avatar_data);
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index cde4fd95a6..317fe91b83 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -78,7 +78,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	/**
 	* @inheritdoc
 	*/
-	public function get_data($row, $ignore_config = false)
+	public function get_data($row)
 	{
 		return array(
 			'src' => '',
@@ -90,7 +90,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	/**
 	* @inheritdoc
 	*/
-	public function get_custom_html($row, $ignore_config = false, $alt = '')
+	public function get_custom_html($row, $alt = '')
 	{
 		return '';
 	}
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 6ceac1a149..001a741c3f 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -29,30 +29,19 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function get_data($row, $ignore_config = false)
+	public function get_data($row)
 	{
-		if ($ignore_config || $this->config['allow_avatar_gravatar'])
-		{
-			return array(
-				'src' => $row['avatar'],
-				'width' => $row['avatar_width'],
-				'height' => $row['avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
+		return array(
+			'src' => $row['avatar'],
+			'width' => $row['avatar_width'],
+			'height' => $row['avatar_height'],
+		);
 	}
 	
 	/**
 	* @inheritdoc
 	*/
-	public function get_custom_html($row, $ignore_config = false, $alt = '')
+	public function get_custom_html($row, $alt = '')
 	{
 		return '<img src="' . $this->get_gravatar_url($row) . '" ' .
 			($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') .
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 7a58a40b0c..bba4bd102e 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -31,23 +31,21 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Get the avatar url and dimensions
 	*
-	* @param $ignore_config Whether this function should respect the users prefs
-	*        and board configuration configuration option, or should just render
-	*        the avatar anyways. Useful for the ACP.
+	* @param array	$row User data or group data that has been cleaned with 
+	*        phpbb_avatar_manager::clean_row
 	* @return array Avatar data, must have keys src, width and height, e.g.
-	*         ['src' => '', 'width' => 0, 'height' => 0]
+	*        ['src' => '', 'width' => 0, 'height' => 0]
 	*/
-	public function get_data($row, $ignore_config = false);
+	public function get_data($row);
 
 	/**
 	* Returns custom html if it is needed for displaying this avatar
 	*
-	* @param bool $ignore_config Whether this function should respect the users prefs
-	*        and board configuration configuration option, or should just render
-	*        the avatar anyways. Useful for the ACP.
+	* @param string $alt Alternate text for avatar image
+	*
 	* @return string HTML
 	*/
-	public function get_custom_html($row, $ignore_config = false, $alt = '');
+	public function get_custom_html($row, $alt = '');
 
 	/**
 	* Prepare form for changing the settings of this avatar
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index d46ac79d11..479ee3712a 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -24,24 +24,13 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function get_data($row, $ignore_config = false)
+	public function get_data($row)
 	{
-		if ($ignore_config || $this->config['allow_avatar_local'])
-		{
-			return array(
-				'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
-				'width' => $row['avatar_width'],
-				'height' => $row['avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
+		return array(
+			'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
+			'width' => $row['avatar_width'],
+			'height' => $row['avatar_height'],
+		);
 	}
 
 	/**
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 1da5fc16e8..344275a251 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -24,24 +24,13 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function get_data($row, $ignore_config = false)
+	public function get_data($row)
 	{
-		if ($ignore_config || $this->config['allow_avatar_remote'])
-		{
-			return array(
-				'src' => $row['avatar'],
-				'width' => $row['avatar_width'],
-				'height' => $row['avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
+		return array(
+			'src' => $row['avatar'],
+			'width' => $row['avatar_width'],
+			'height' => $row['avatar_height'],
+		);
 	}
 
 	/**
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 8953557acb..a0e1070322 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -54,15 +54,16 @@ class phpbb_avatar_manager
 	/**
 	* Get the driver object specified by the avatar type
 	*
-	* @param string Avatar type; by default an avatar's service container name
+	* @param string $avatar_type Avatar type; by default an avatar's service container name
+	* @param bool $force_all Grab all avatar drivers, no matter if enabled or not
 	*
 	* @return object Avatar driver object
 	*/
-	public function get_driver($avatar_type)
+	public function get_driver($avatar_type, $force_all = false)
 	{
-		if (self::$valid_drivers === false)
+		if (self::$valid_drivers === false || $force_all)
 		{
-			$this->load_valid_drivers();
+			$this->load_valid_drivers($force_all);
 		}
 
 		// Legacy stuff...
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index a7b28acac1..f88d8c9054 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1367,7 +1367,7 @@ function get_avatar($row, $alt, $ignore_config = false)
 	);
 
 	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-	$avatar = $phpbb_avatar_manager->get_driver($row['avatar_type']);
+	$avatar = $phpbb_avatar_manager->get_driver($row['avatar_type'], $ignore_config);
 	$html = '';
 
 	if ($avatar)
-- 
cgit v1.2.1


From 33b98dc5ba0b690fdae72acfd676dae5a897cb6a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 30 Nov 2012 16:46:11 +0100
Subject: [feature/avatars] Fix variable names

PHPBB3-10018
---
 phpBB/includes/acp/acp_board.php     |  2 +-
 phpBB/includes/acp/acp_groups.php    | 24 +++++++++++-------------
 phpBB/includes/acp/acp_users.php     | 34 ++++++++++++++++------------------
 phpBB/includes/avatar/manager.php    |  1 +
 phpBB/includes/functions_display.php |  8 ++++----
 phpBB/includes/ucp/ucp_groups.php    | 31 +++++++++++++++----------------
 phpBB/includes/ucp/ucp_profile.php   | 30 ++++++++++++++----------------
 7 files changed, 62 insertions(+), 68 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index c3bdf89866..0467cc7c35 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -109,7 +109,7 @@ class acp_board
 			case 'avatar':
 				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 				$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers(true);
-				sort($avatar_drivers);
+
 				$avatar_vars = array();
 				foreach ($avatar_drivers as $driver)
 				{
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 75956736f7..23f6d775ef 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -282,7 +282,6 @@ class acp_groups
 				$user->add_lang('ucp');
 
 				// Setup avatar data for later
-				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 				$avatars_enabled = false;
 				$avatar_drivers = null;
 				$avatar_data = null;
@@ -290,8 +289,8 @@ class acp_groups
 
 				if ($config['allow_avatar'])
 				{
+					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
-					sort($avatar_drivers);
 
 					// This is normalised data, without the group_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($group_row);
@@ -334,27 +333,26 @@ class acp_groups
 					if ($config['allow_avatar'])
 					{
 						// Handle avatar
-						$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
-						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+						$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 
-						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
+						if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 						{
-							$avatar = $phpbb_avatar_manager->get_driver($driver);
-							$result = $avatar->process_form($template, $avatar_data, $avatar_error);
+							$driver = $phpbb_avatar_manager->get_driver($driver_name);
+							$result = $driver->process_form($template, $avatar_data, $avatar_error);
 
 							if ($result && empty($avatar_error))
 							{
-								$result['avatar_type'] = $driver;
+								$result['avatar_type'] = $driver_name;
 								
 								$submit_ary = array_merge($submit_ary, $result);
 							}
 						}
 						else
 						{
-							$avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
-							if ($avatar)
+							$driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
+							if ($driver)
 							{
-								$avatar->delete($avatar_data);
+								$driver->delete($avatar_data);
 							}
 
 							// Removing the avatar
@@ -526,7 +524,7 @@ class acp_groups
 
 					foreach ($avatar_drivers as $driver)
 					{
-						$avatar = $phpbb_avatar_manager->get_driver($driver);
+						$driver = $phpbb_avatar_manager->get_driver($driver);
 
 						$avatars_enabled = true;
 						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
@@ -534,7 +532,7 @@ class acp_groups
 							'avatar' => "acp_avatar_options_$config_name.html",
 						));
 
-						if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
+						if ($driver->prepare_form($template, $avatar_data, $avatar_error))
 						{
 							$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
 							$driver_upper = strtoupper($driver_name);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index d5532e35b6..3df373a7d4 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1733,12 +1733,11 @@ class acp_users
 				include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 
 				$avatars_enabled = false;
-				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 
 				if ($config['allow_avatar'])
 				{
+					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
-					sort($avatar_drivers);
 
 					// This is normalised data, without the user_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($user_row);
@@ -1747,19 +1746,18 @@ class acp_users
 					{
 						if (check_form_key($form_name))
 						{
-							$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
-							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+							$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
+							if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 							{
-								$avatar = $phpbb_avatar_manager->get_driver($driver);
-								$result = $avatar->process_form($template, $avatar_data, $error);
+								$driver = $phpbb_avatar_manager->get_driver($driver_name);
+								$result = $driver->process_form($template, $avatar_data, $error);
 
 								if ($result && empty($error))
 								{
 									// Success! Lets save the result in the database
 									$result = array(
-										'user_avatar_type' => $driver,
+										'user_avatar_type' => $driver_name,
 										'user_avatar' => $result['avatar'],
 										'user_avatar_width' => $result['avatar_width'],
 										'user_avatar_height' => $result['avatar_height'],
@@ -1775,10 +1773,10 @@ class acp_users
 							}
 							else
 							{
-								$avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
-								if ($avatar)
+								$driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
+								if ($driver)
 								{
-									$avatar->delete($avatar_data);
+									$driver->delete($avatar_data);
 								}
 
 								// Removing the avatar
@@ -1805,19 +1803,19 @@ class acp_users
 
 					$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type']));
 
-					foreach ($avatar_drivers as $driver)
+					foreach ($avatar_drivers as $current_driver)
 					{
-						$avatar = $phpbb_avatar_manager->get_driver($driver);
+						$driver = $phpbb_avatar_manager->get_driver($current_driver);
 
 						$avatars_enabled = true;
-						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+						$config_name = preg_replace('#^avatar\.driver.#', '', $current_driver);
 						$template->set_filenames(array(
 							'avatar' => "acp_avatar_options_$config_name.html",
 						));
 
-						if ($avatar->prepare_form($template, $avatar_data, $error))
+						if ($driver->prepare_form($template, $avatar_data, $error))
 						{
-							$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+							$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 							$driver_upper = strtoupper($driver_name);
 
 							$template->assign_block_vars('avatar_drivers', array(
@@ -1825,7 +1823,7 @@ class acp_users
 								'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
 								'DRIVER' => $driver_name,
-								'SELECTED' => $driver == $focused_driver,
+								'SELECTED' => $current_driver == $focused_driver,
 								'OUTPUT' => $template->assign_display('avatar'),
 							));
 						}
@@ -1842,7 +1840,7 @@ class acp_users
 					}
 					else
 					{
-						$error[$key] = $user->lang("$lang");
+						$error[$key] = $user->lang($lang);
 					}
 				}
 
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index a0e1070322..176d0d659d 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -117,6 +117,7 @@ class phpbb_avatar_manager
 					self::$valid_drivers[$driver->get_name()] = $driver->get_name();
 				}
 			}
+			asort(self::$valid_drivers);
 		}
 	}
 
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index f88d8c9054..6b267bc901 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1367,18 +1367,18 @@ function get_avatar($row, $alt, $ignore_config = false)
 	);
 
 	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-	$avatar = $phpbb_avatar_manager->get_driver($row['avatar_type'], $ignore_config);
+	$driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], $ignore_config);
 	$html = '';
 
-	if ($avatar)
+	if ($driver)
 	{
-		$html = $avatar->get_custom_html($row, $ignore_config, $alt);
+		$html = $driver->get_custom_html($row, $ignore_config, $alt);
 		if (!empty($html))
 		{
 			return $html;
 		}
 
-		$avatar_data = $avatar->get_data($row, $ignore_config);
+		$avatar_data = $driver->get_data($row, $ignore_config);
 	}
 	else
 	{
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index f17e535b0c..c1ddaccb75 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -484,7 +484,6 @@ class ucp_groups
 						$error = array();
 
 						// Setup avatar data for later
-						$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 						$avatars_enabled = false;
 						$avatar_drivers = null;
 						$avatar_data = null;
@@ -492,8 +491,8 @@ class ucp_groups
 
 						if ($config['allow_avatar'])
 						{
+							$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 							$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
-							sort($avatar_drivers);
 
 							// This is normalised data, without the group_ prefix
 							$avatar_data = phpbb_avatar_manager::clean_row($group_row);
@@ -521,26 +520,26 @@ class ucp_groups
 							if ($config['allow_avatar'])
 							{
 								// Handle avatar
-								$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
-								$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+								$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
+								$config_name = preg_replace('#^avatar\.driver.#', '', $driver_name);
 
-								if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
+								if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 								{
-									$avatar = $phpbb_avatar_manager->get_driver($driver);
-									$result = $avatar->process_form($template, $avatar_data, $avatar_error);
+									$driver = $phpbb_avatar_manager->get_driver($driver_name);
+									$result = $driver->process_form($template, $avatar_data, $avatar_error);
 
 									if ($result && empty($avatar_error))
 									{
-										$result['avatar_type'] = $driver;
+										$result['avatar_type'] = $driver_name;
 
 										$submit_ary = array_merge($submit_ary, $result);
 									}
 								}
 								else
 								{
-									if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
+									if ($driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
 									{
-										$avatar->delete($avatar_data);
+										$driver->delete($avatar_data);
 									}
 
 									// Removing the avatar
@@ -649,25 +648,25 @@ class ucp_groups
 							$avatars_enabled = false;
 							$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
 
-							foreach ($avatar_drivers as $driver)
+							foreach ($avatar_drivers as $current_driver)
 							{
-								$avatar = $phpbb_avatar_manager->get_driver($driver);
+								$driver = $phpbb_avatar_manager->get_driver($current_driver);
 
 								$avatars_enabled = true;
 								$template->set_filenames(array(
-									'avatar' => $avatar->get_template_name(),
+									'avatar' => $driver->get_template_name(),
 								));
 
-								if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
+								if ($driver->prepare_form($template, $avatar_data, $avatar_error))
 								{
-									$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+									$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 									$driver_upper = strtoupper($driver_name);
 									$template->assign_block_vars('avatar_drivers', array(
 										'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
 										'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
 										'DRIVER' => $driver_name,
-										'SELECTED' => $driver == $focused_driver,
+										'SELECTED' => $current_driver == $focused_driver,
 										'OUTPUT' => $template->assign_display('avatar'),
 									));
 								}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index f5c04bb432..71a4d4e67b 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -552,13 +552,12 @@ class ucp_profile
 
 				add_form_key('ucp_avatar');
 
-				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 				$avatars_enabled = false;
 
 				if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
 				{
+					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
-					sort($avatar_drivers);
 
 					// This is normalised data, without the user_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($user->data);
@@ -567,19 +566,18 @@ class ucp_profile
 					{
 						if (check_form_key('ucp_avatar'))
 						{
-							$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
-							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+							$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
+							if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 							{
-								$avatar = $phpbb_avatar_manager->get_driver($driver);
-								$result = $avatar->process_form($template, $avatar_data, $error);
+								$driver = $phpbb_avatar_manager->get_driver($driver_name);
+								$result = $driver->process_form($template, $avatar_data, $error);
 
 								if ($result && empty($error))
 								{
 									// Success! Lets save the result in the database
 									$result = array(
-										'user_avatar_type' => $driver,
+										'user_avatar_type' => $driver_name,
 										'user_avatar' => $result['avatar'],
 										'user_avatar_width' => $result['avatar_width'],
 										'user_avatar_height' => $result['avatar_height'],
@@ -598,9 +596,9 @@ class ucp_profile
 							}
 							else
 							{
-								if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
+								if ($driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
 								{
-									$avatar->delete($avatar_data);
+									$driver->delete($avatar_data);
 								}
 
 								$result = array(
@@ -629,18 +627,18 @@ class ucp_profile
 
 					$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));
 
-					foreach ($avatar_drivers as $driver)
+					foreach ($avatar_drivers as $current_driver)
 					{
-						$avatar = $phpbb_avatar_manager->get_driver($driver);
+						$driver = $phpbb_avatar_manager->get_driver($current_driver);
 
 						$avatars_enabled = true;
 						$template->set_filenames(array(
-							'avatar' => $avatar->get_template_name(),
+							'avatar' => $driver->get_template_name(),
 						));
 
-						if ($avatar->prepare_form($template, $avatar_data, $error))
+						if ($driver->prepare_form($template, $avatar_data, $error))
 						{
-							$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+							$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 							$driver_upper = strtoupper($driver_name);
 
 							$template->assign_block_vars('avatar_drivers', array(
@@ -648,7 +646,7 @@ class ucp_profile
 								'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
 								'DRIVER' => $driver_name,
-								'SELECTED' => $driver == $focused_driver,
+								'SELECTED' => $current_driver == $focused_driver,
 								'OUTPUT' => $template->assign_display('avatar'),
 							));
 						}
-- 
cgit v1.2.1


From 081440f6c4bd6b7c2838dd0587ed6a4dffc87d52 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 30 Nov 2012 23:11:44 +0100
Subject: [feature/avatars] Create setting for enabling avatar in manager

PHPBB3-10018
---
 phpBB/includes/acp/acp_board.php          | 13 ++++++++++---
 phpBB/includes/avatar/driver/driver.php   | 28 ----------------------------
 phpBB/includes/avatar/driver/gravatar.php | 10 ----------
 phpBB/includes/avatar/driver/local.php    |  1 -
 phpBB/includes/avatar/driver/remote.php   | 10 ----------
 phpBB/includes/avatar/driver/upload.php   | 22 +++++-----------------
 phpBB/includes/avatar/manager.php         | 16 ++++++++++++++++
 7 files changed, 31 insertions(+), 69 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 0467cc7c35..bb90918a46 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -111,10 +111,17 @@ class acp_board
 				$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers(true);
 
 				$avatar_vars = array();
-				foreach ($avatar_drivers as $driver)
+				foreach ($avatar_drivers as $current_driver)
 				{
-					$avatar = $phpbb_avatar_manager->get_driver($driver);
-					$avatar_vars += $avatar->prepare_form_acp();
+					$driver = $phpbb_avatar_manager->get_driver($current_driver);
+
+					/*
+					* First grab the settings for enabling/disabling the avatar
+					* driver and afterwards grab additional settings the driver
+					* might have.
+					*/
+					$avatar_vars += $phpbb_avatar_manager->get_avatar_settings($driver);
+					$avatar_vars += $driver->prepare_form_acp();
 				}
 
 				$display_vars = array(
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 317fe91b83..ab89cfbffe 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -75,18 +75,6 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 		$this->cache = $cache;
 	}
 
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row)
-	{
-		return array(
-			'src' => '',
-			'width' => 0,
-			'height' => 0,
-		);
-	}
-
 	/**
 	* @inheritdoc
 	*/
@@ -95,14 +83,6 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 		return '';
 	}
 
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($template, $row, &$error)
-	{
-		return false;
-	}
-
 	/**
 	* @inheritdoc
 	*/
@@ -111,14 +91,6 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 		return array();
 	}
 
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($template, $row, &$error)
-	{
-		return false;
-	}
-
 	/**
 	* @inheritdoc
 	*/
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 001a741c3f..8fa95bf937 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -63,16 +63,6 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 		return true;
 	}
 
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form_acp()
-	{
-		return array(
-			'allow_avatar_gravatar'	=> array('lang' => 'ALLOW_GRAVATAR',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-		);
-	}
-
 	/**
 	* @inheritdoc
 	*/
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 479ee3712a..4593161a76 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -107,7 +107,6 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	public function prepare_form_acp()
 	{
 		return array(
-			'allow_avatar_local'	=> array('lang' => 'ALLOW_LOCAL',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
 			'avatar_gallery_path'	=> array('lang' => 'AVATAR_GALLERY_PATH',	'validate' => 'rpath',	'type' => 'text:20:255', 'explain' => true),
 		);
 	}
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 344275a251..e96cb35684 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -47,16 +47,6 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 		return true;
 	}
 
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form_acp()
-	{
-		return array(
-			'allow_avatar_remote'	=> array('lang' => 'ALLOW_REMOTE',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-		);
-	}
-
 	/**
 	* @inheritdoc
 	*/
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 497dd8ad19..38627baacf 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -26,22 +26,11 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	*/
 	public function get_data($row, $ignore_config = false)
 	{
-		if ($ignore_config || $this->config['allow_avatar_upload'])
-		{
-			return array(
-				'src' => $this->phpbb_root_path . 'download/file' . $this->php_ext . '?avatar=' . $row['avatar'],
-				'width' => $row['avatar_width'],
-				'height' => $row['avatar_height'],
-			);
-		}
-		else
-		{
-			return array(
-				'src' => '',
-				'width' => 0,
-				'height' => 0,
-			);
-		}
+		return array(
+			'src' => $this->phpbb_root_path . 'download/file' . $this->php_ext . '?avatar=' . $row['avatar'],
+			'width' => $row['avatar_width'],
+			'height' => $row['avatar_height'],
+		);
 	}
 
 	/**
@@ -133,7 +122,6 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 		global $user;
 
 		return array(
-			'allow_avatar_upload'	=> array('lang' => 'ALLOW_UPLOAD',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
 			'allow_avatar_remote_upload'=> array('lang' => 'ALLOW_REMOTE_UPLOAD', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 			'avatar_filesize'		=> array('lang' => 'MAX_FILESIZE',			'validate' => 'int:0',	'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
 			'avatar_path'			=> array('lang' => 'AVATAR_STORAGE_PATH',	'validate' => 'rwpath',	'type' => 'text:20:255', 'explain' => true),
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 176d0d659d..267ba24dc8 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -201,4 +201,20 @@ class phpbb_avatar_manager
 
 		return $this->config["allow_avatar_{$config_name}"];
 	}
+
+	/**
+	* Get the settings array for enabling/disabling an avatar driver
+	*
+	* @param string $driver Avatar driver object
+	*
+	* @return array Array of configuration options as consumed by acp_board
+	*/
+	public function get_avatar_settings($driver)
+	{
+		$config_name = preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
+
+		return array(
+			'allow_avatar_' . $config_name	=> array('lang' => 'ALLOW_' . strtoupper($config_name),		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
+		);
+	}
 }
-- 
cgit v1.2.1


From d439f477105903ceb29652f23bcb7812d0f34d4d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 1 Dec 2012 00:27:52 +0100
Subject: [feature/avatars] Fix docblocks and minor cosmetic issues

PHPBB3-10018
---
 phpBB/includes/avatar/driver/gravatar.php  |  2 +-
 phpBB/includes/avatar/driver/interface.php | 27 ++++++++++++++++++---------
 phpBB/includes/avatar/driver/local.php     |  2 +-
 phpBB/includes/avatar/driver/remote.php    |  2 +-
 phpBB/includes/avatar/manager.php          | 13 ++++---------
 phpBB/includes/ucp/ucp_profile.php         |  2 +-
 6 files changed, 26 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 8fa95bf937..11996ca561 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -72,7 +72,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 		$row['avatar_width'] = $this->request->variable('avatar_gravatar_width', 0);
 		$row['avatar_height'] = $this->request->variable('avatar_gravatar_height', 0);
 
-		if (!function_exists('user_add'))
+		if (!function_exists('validate_data'))
 		{
 			require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
 		}
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index bba4bd102e..e8f529f3c4 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -24,7 +24,7 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Returns the name of the driver.
 	*
-	* @return string	Name of wrapped driver.
+	* @return string	Name of driver.
 	*/
 	public function get_name();
 
@@ -50,10 +50,13 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Prepare form for changing the settings of this avatar
 	*
-	* @param object	$template Template object
+	* @param phpbb_template	$template Template object
 	* @param array	$row User data or group data that has been cleaned with 
 	*        phpbb_avatar_manager::clean_row
-	* @param array	&$error Reference to an error array
+	* @param array	&$error Reference to an error array that is filled by this
+	*        function. Key values can either be a string with a language key or
+	*        an array that will be passed to vsprintf() with the language key in
+	*        the first array key.
 	*
 	* @return bool True if form has been successfully prepared
 	*/
@@ -62,17 +65,22 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Prepare form for changing the acp settings of this avatar
 	*
-	* @return array Array containing the acp settings
+	* @return array Array of configuration options as consumed by acp_board.
+	*        The setting for enabling/disabling the avatar will be handled by
+	*        the avatar manager.
 	*/
 	public function prepare_form_acp();
 
 	/**
 	* Process form data
 	*
-	* @param object	$template Template object
+	* @param phpbb_template	$template Template object
 	* @param array	$row User data or group data that has been cleaned with 
 	*        phpbb_avatar_manager::clean_row
-	* @param array	&$error Reference to an error array
+	* @param array	&$error Reference to an error array that is filled by this
+	*        function. Key values can either be a string with a language key or
+	*        an array that will be passed to vsprintf() with the language key in
+	*        the first array key.
 	*
 	* @return array Array containing the avatar data as follows:
 	*        ['avatar'], ['avatar_width'], ['avatar_height']
@@ -85,14 +93,15 @@ interface phpbb_avatar_driver_interface
 	* @param array $row User data or group data that has been cleaned with 
 	*        phpbb_avatar_manager::clean_row
 	*
-	* @return bool True if avatar has been deleted or there is no need to delete
+	* @return bool True if avatar has been deleted or there is no need to delete,
+	*        i.e. when the avatar is not hosted locally.
 	*/
 	public function delete($row);
 
 	/**
-	* Get the avatars template name
+	* Get the avatar driver's template name
 	*
-	* @return string Avatar's template name
+	* @return string Avatar driver's template name
 	*/
 	public function get_template_name();
 }
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 4593161a76..d7611b903a 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -174,7 +174,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 					);
 				}
 			}
-			@ksort($avatar_list);
+			ksort($avatar_list);
 
 			if ($this->cache != null)
 			{
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index e96cb35684..9135a62eac 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -61,7 +61,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 			$url = 'http://' . $url;
 		}
 
-		if (!function_exists('user_add'))
+		if (!function_exists('validate_data'))
 		{
 			require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
 		}
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 267ba24dc8..409d0d4eea 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -85,16 +85,11 @@ class phpbb_avatar_manager
 			return null;
 		}
 
+		/*
+		* There is no need to handle invalid avatar types as the following code
+		* will cause a ServiceNotFoundException if the type does not exist
+		*/
 		$driver = $this->container->get($avatar_type);
-		if ($driver !== false)
-		{
-			return $driver;
-		}
-		else
-		{
-			$message = "Invalid avatar driver class name '%s' provided.";
-			trigger_error(sprintf($message, $avatar_type));
-		}
 
 		return $driver;
 	}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 71a4d4e67b..ecd828c6dc 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -545,7 +545,7 @@ class ucp_profile
 			break;
 
 			case 'avatar':
-				if (!function_exists('display_forums'))
+				if (!function_exists('get_user_avatar'))
 				{
 					include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 				}
-- 
cgit v1.2.1


From 215ac6a0daa51881dc6abb987baf10e682fc9972 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 1 Dec 2012 21:28:44 +0100
Subject: [feature/avatars] Removed unneeded dependencies

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 409d0d4eea..e7ee323624 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -20,11 +20,7 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_avatar_manager
 {
-	protected $phpbb_root_path;
-	protected $phpEx;
 	protected $config;
-	protected $request;
-	protected $cache;
 	protected static $valid_drivers = false;
 	protected $avatar_drivers;
 	protected $container;
@@ -40,13 +36,9 @@ class phpbb_avatar_manager
 	* @param array $avatar_drivers Avatar drivers passed via the service container
 	* @param object $container Container object
 	*/
-	public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_request $request, phpbb_cache_driver_interface $cache, $avatar_drivers, $container)
+	public function __construct(phpbb_config $config, $avatar_drivers, $container)
 	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->phpEx = $phpEx;
 		$this->config = $config;
-		$this->request = $request;
-		$this->cache = $cache;
 		$this->avatar_drivers = $avatar_drivers;
 		$this->container = $container;
 	}
-- 
cgit v1.2.1


From d0338531cb2a3a386a3894a1b1b081025f53ea05 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 20:12:31 -0500
Subject: [ticket/11162] An implementation that actually works.

PHPBB3-11162
---
 phpBB/includes/functions.php | 73 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 68 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 8608c6ca4f..13690e79bb 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1311,12 +1311,75 @@ function tz_select($default = '', $truncate = false)
 */
 function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_values, $to_value)
 {
-	$db->sql_return_on_error(true);
-	$condition = $db->sql_in_set($column, $from_values);
-	$db->sql_query('UPDATE ' . $table . ' SET ' . $column . ' = ' . (int) $to_value. ' WHERE ' . $condition);
-	$db->sql_return_on_error(false);
+	$sql = "SELECT $column, user_id
+		FROM $table
+		WHERE " . $db->sql_in_set($column, $from_values);
+	$result = $db->sql_query($sql);
+
+	$old_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$old_user_ids[$row[$column]][] = $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$sql = "SELECT $column, user_id
+		FROM $table
+		WHERE $column = '" . (int) $to_value . "'";
+	$result = $db->sql_query($sql);
+
+	$new_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$new_user_ids[$row[$column]][] = $row['user_id'];
+	}
+	$db->sql_freeresult($result);
 
-	$db->sql_query('DELETE FROM ' . $table . ' WHERE ' . $condition);
+	$queries = array();
+	$any_found = false;
+	foreach ($from_values as $from_value)
+	{
+		if (!isset($old_user_ids[$from_value]))
+		{
+			continue;
+		}
+		$any_found = true;
+		if (empty($new_user_ids))
+		{
+			$sql = "UPDATE $table
+				SET $column = " . (int) $to_value. "
+				WHERE $column = '" . $db->sql_escape($from_value) . "'";
+			$queries[] = $sql;
+		}
+		else
+		{
+			$different_user_ids = array_diff($old_user_ids[$from_value], $new_user_ids[$to_value]);
+			if (!empty($different_user_ids))
+			{
+				$sql = "UPDATE $table
+					SET $column = " . (int) $to_value. "
+					WHERE $column = '" . $db->sql_escape($from_value) . "'
+					AND " . $db->sql_in_set('user_id', $different_user_ids);
+				$queries[] = $sql;
+			}
+		}
+	}
+
+	if ($any_found)
+	{
+		//$db->sql_transaction('begin');
+
+		foreach ($queries as $sql)
+		{
+			$db->sql_query($sql);
+		}
+
+		$sql = "DELETE FROM $table
+			WHERE " . $db->sql_in_set($column, $from_values);
+		$db->sql_query($sql);
+
+		//$db->sql_transaction('commit');
+	}
 }
 
 // Functions handling topic/post tracking/marking
-- 
cgit v1.2.1


From 2e947334e563f122c597d7072eddd962453a84ef Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 20:17:01 -0500
Subject: [ticket/11162] Uncomment transactions.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 13690e79bb..a24dcfdf5b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1367,7 +1367,7 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
 
 	if ($any_found)
 	{
-		//$db->sql_transaction('begin');
+		$db->sql_transaction('begin');
 
 		foreach ($queries as $sql)
 		{
@@ -1378,7 +1378,7 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
 			WHERE " . $db->sql_in_set($column, $from_values);
 		$db->sql_query($sql);
 
-		//$db->sql_transaction('commit');
+		$db->sql_transaction('commit');
 	}
 }
 
-- 
cgit v1.2.1


From c2c105df9ff1d8fd48afa1d3abdf23a39584d7ed Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 20:21:29 -0500
Subject: [ticket/11162] Clarify that only the two tables actually work.

PHPBB3-11162
---
 phpBB/includes/functions.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index a24dcfdf5b..09487ce10d 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1302,6 +1302,8 @@ function tz_select($default = '', $truncate = false)
 * If this results in rows violating uniqueness constraints, the duplicate
 * rows are eliminated.
 *
+* The only supported tables are bookmarks and topics_watch.
+*
 * @param dbal $db Database object
 * @param string $table Table on which to perform the update
 * @param string $column Column whose values to change
-- 
cgit v1.2.1


From 69225bd0a6005e81b7cb58631eb5de7c3d175697 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 20:21:51 -0500
Subject: [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.

PHPBB3-11162
---
 phpBB/includes/mcp/mcp_forum.php | 7 +------
 phpBB/includes/mcp/mcp_topic.php | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index b70601b479..913c55a9d1 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -415,12 +415,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		$success_msg = 'POSTS_MERGED_SUCCESS';
 
 		// If the topic no longer exist, we will update the topic watch table.
-		// To not let it error out on users watching both topics, we just return on an error...
-		$db->sql_return_on_error(true);
-		$db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
-		$db->sql_return_on_error(false);
-
-		$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
+		phpbb_update_rows_avoiding_duplicates($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
 		// Link to the new topic
 		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 7d4edaf362..f40a4bc044 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -620,12 +620,7 @@ function merge_posts($topic_id, $to_topic_id)
 		else
 		{
 			// If the topic no longer exist, we will update the topic watch table.
-			// To not let it error out on users watching both topics, we just return on an error...
-			$db->sql_return_on_error(true);
-			$db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id);
-			$db->sql_return_on_error(false);
-
-			$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE topic_id = ' . (int) $topic_id);
+			phpbb_update_rows_avoiding_duplicates($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 		}
 
 		// Link to the new topic
-- 
cgit v1.2.1


From 05053dacd350c6bacd529df803bdc9876104a278 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 20:24:25 -0500
Subject: [ticket/11162] Fix inaccurately copy pasted comment.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 913c55a9d1..e392bef157 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -414,7 +414,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		// Message and return links
 		$success_msg = 'POSTS_MERGED_SUCCESS';
 
-		// If the topic no longer exist, we will update the topic watch table.
+		// Update the topic watch table.
 		phpbb_update_rows_avoiding_duplicates($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
 		// Link to the new topic
-- 
cgit v1.2.1


From 2fc43e6ed71e4b9abdb76aa179b4e64efaa47ffa Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 23:11:14 -0500
Subject: [ticket/11162] No whitespace changes in olympus.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 09487ce10d..e3feb59d41 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3442,7 +3442,7 @@ function parse_cfg_file($filename, $lines = false)
 
 		$parsed_items[$key] = $value;
 	}
-
+	
 	if (isset($parsed_items['inherit_from']) && isset($parsed_items['name']) && $parsed_items['inherit_from'] == $parsed_items['name'])
 	{
 		unset($parsed_items['inherit_from']);
-- 
cgit v1.2.1


From b42ca792fd7765eb415536c49b77c53c0897367e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 4 Dec 2012 00:49:37 +0100
Subject: [feature/avatars] Minor variable naming fixes

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php  | 4 ++--
 phpBB/includes/acp/acp_users.php   | 4 ++--
 phpBB/includes/ucp/ucp_groups.php  | 4 ++--
 phpBB/includes/ucp/ucp_profile.php | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 23f6d775ef..b425b9d374 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -520,7 +520,7 @@ class acp_groups
 				if ($config['allow_avatar'])
 				{
 					$avatars_enabled = false;
-					$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
+					$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
 
 					foreach ($avatar_drivers as $driver)
 					{
@@ -541,7 +541,7 @@ class acp_groups
 								'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
 								'DRIVER' => $driver_name,
-								'SELECTED' => $driver == $focused_driver,
+								'SELECTED' => $driver == $selected_driver,
 								'OUTPUT' => $template->assign_display('avatar'),
 							));
 						}
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 3df373a7d4..5c485b5996 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1801,7 +1801,7 @@ class acp_users
 						}
 					}
 
-					$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type']));
+					$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type']));
 
 					foreach ($avatar_drivers as $current_driver)
 					{
@@ -1823,7 +1823,7 @@ class acp_users
 								'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
 								'DRIVER' => $driver_name,
-								'SELECTED' => $current_driver == $focused_driver,
+								'SELECTED' => $current_driver == $selected_driver,
 								'OUTPUT' => $template->assign_display('avatar'),
 							));
 						}
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index c1ddaccb75..262e7b238f 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -646,7 +646,7 @@ class ucp_groups
 						if ($config['allow_avatar'])
 						{
 							$avatars_enabled = false;
-							$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
+							$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
 
 							foreach ($avatar_drivers as $current_driver)
 							{
@@ -666,7 +666,7 @@ class ucp_groups
 										'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
 										'DRIVER' => $driver_name,
-										'SELECTED' => $current_driver == $focused_driver,
+										'SELECTED' => $current_driver == $selected_driver,
 										'OUTPUT' => $template->assign_display('avatar'),
 									));
 								}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index ecd828c6dc..7b4dddf12b 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -625,7 +625,7 @@ class ucp_profile
 						}
 					}
 
-					$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));
+					$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));
 
 					foreach ($avatar_drivers as $current_driver)
 					{
@@ -646,7 +646,7 @@ class ucp_profile
 								'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
 								'DRIVER' => $driver_name,
-								'SELECTED' => $current_driver == $focused_driver,
+								'SELECTED' => $current_driver == $selected_driver,
 								'OUTPUT' => $template->assign_display('avatar'),
 							));
 						}
-- 
cgit v1.2.1


From fc4069f81df54630a5ac8c1373c38f4834553012 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 4 Dec 2012 00:59:37 +0100
Subject: [feature/avatars] Use seperate function for retrieving all drivers

PHPBB3-10018
---
 phpBB/includes/acp/acp_board.php  |  2 +-
 phpBB/includes/avatar/manager.php | 25 ++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index bb90918a46..9e63e59403 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -108,7 +108,7 @@ class acp_board
 
 			case 'avatar':
 				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-				$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers(true);
+				$avatar_drivers = $phpbb_avatar_manager->get_all_drivers();
 
 				$avatar_vars = array();
 				foreach ($avatar_drivers as $current_driver)
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index e7ee323624..279278b71c 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -109,13 +109,32 @@ class phpbb_avatar_manager
 	}
 
 	/**
-	* Get a list of valid avatar drivers
+	* Get a list of all avatar drivers
 	*
-	* @param bool $force_all Force showing all avatar drivers
+	* @return array Array containing a list of all avatar drivers
+	*/
+	public function get_all_drivers()
+	{
+		$drivers = array();
+
+		if (!empty($this->avatar_drivers))
+		{
+			foreach ($this->avatar_drivers as $driver)
+			{
+				$drivers[$driver->get_name()] = $driver->get_name();
+			}
+			asort($drivers);
+		}
+
+		return $drivers;
+	}
+
+	/**
+	* Get a list of valid avatar drivers
 	*
 	* @return array Array containing a list of the valid avatar drivers
 	*/
-	public function get_valid_drivers($force_all = false)
+	public function get_valid_drivers()
 	{
 		if (self::$valid_drivers === false)
 		{
-- 
cgit v1.2.1


From e765ccd075a19be7ec9c60970677d62dc75f0845 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 04:22:10 -0500
Subject: [ticket/11015] Include dbms name in exception message.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 57136a43ff..501257956a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5431,5 +5431,5 @@ function phpbb_convert_30_dbms_to_31($dbms)
 		return 'phpbb_db_driver_' . $dbms;
 	}
 
-	throw new \RuntimeException('You have specified an invalid dbms driver.');
+	throw new \RuntimeException("You have specified an invalid dbms driver: $dbms");
 }
-- 
cgit v1.2.1


From 3687febdacc9b1629fd6f09e15305d61eacc9b78 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 04:29:31 -0500
Subject: [ticket/11015] Change more docblocks.

PHPBB3-11015
---
 phpBB/includes/db/db_tools.php                | 2 +-
 phpBB/includes/extension/manager.php          | 2 +-
 phpBB/includes/extension/metadata_manager.php | 2 +-
 phpBB/includes/functions_download.php         | 8 ++++----
 phpBB/includes/lock/db.php                    | 4 ++--
 phpBB/includes/search/fulltext_mysql.php      | 4 ++--
 phpBB/includes/search/fulltext_native.php     | 4 ++--
 phpBB/includes/search/fulltext_postgres.php   | 4 ++--
 phpBB/includes/search/fulltext_sphinx.php     | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 6df3aac9ce..2bb016cebd 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -300,7 +300,7 @@ class phpbb_db_tools
 	/**
 	* Constructor. Set DB Object and set {@link $return_statements return_statements}.
 	*
-	* @param phpbb_dbal	$db					DBAL object
+	* @param phpbb_db_driver	$db					Database connection
 	* @param bool		$return_statements	True if only statements should be returned and no SQL being executed
 	*/
 	function phpbb_db_tools(&$db, $return_statements = false)
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 862bca1855..67cc81e407 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -34,7 +34,7 @@ class phpbb_extension_manager
 	/**
 	* Creates a manager and loads information from database
 	*
-	* @param dbal $db A database connection
+	* @param phpbb_db_driver $db A database connection
 	* @param phpbb_config $config phpbb_config
 	* @param string $extension_table The name of the table holding extensions
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php
index 813459eb67..36b0f8b184 100644
--- a/phpBB/includes/extension/metadata_manager.php
+++ b/phpBB/includes/extension/metadata_manager.php
@@ -34,7 +34,7 @@ class phpbb_extension_metadata_manager
 	/**
 	* Creates the metadata manager
 	*
-	* @param dbal $db A database connection
+	* @param phpbb_db_driver $db A database connection
 	* @param string $extension_manager An instance of the phpbb extension manager
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
 	* @param string $phpEx php file extension
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php
index b6371dbecc..89bcf7c8d9 100644
--- a/phpBB/includes/functions_download.php
+++ b/phpBB/includes/functions_download.php
@@ -596,7 +596,7 @@ function phpbb_parse_range_request($request_array, $filesize)
 /**
 * Increments the download count of all provided attachments
 *
-* @param dbal $db The database object
+* @param phpbb_db_driver $db The database object
 * @param array|int $ids The attach_id of each attachment
 *
 * @return null
@@ -617,7 +617,7 @@ function phpbb_increment_downloads($db, $ids)
 /**
 * Handles authentication when downloading attachments from a post or topic
 *
-* @param dbal $db The database object
+* @param phpbb_db_driver $db The database object
 * @param phpbb_auth $auth The authentication object
 * @param int $topic_id The id of the topic that we are downloading from
 *
@@ -651,7 +651,7 @@ function phpbb_download_handle_forum_auth($db, $auth, $topic_id)
 /**
 * Handles authentication when downloading attachments from PMs
 *
-* @param dbal $db The database object
+* @param phpbb_db_driver $db The database object
 * @param phpbb_auth $auth The authentication object
 * @param int $user_id The user id
 * @param int $msg_id The id of the PM that we are downloading from
@@ -678,7 +678,7 @@ function phpbb_download_handle_pm_auth($db, $auth, $user_id, $msg_id)
 /**
 * Checks whether a user can download from a particular PM
 *
-* @param dbal $db The database object
+* @param phpbb_db_driver $db The database object
 * @param int $user_id The user id
 * @param int $msg_id The id of the PM that we are downloading from
 *
diff --git a/phpBB/includes/lock/db.php b/phpBB/includes/lock/db.php
index 40690144b1..2bb2e25f97 100644
--- a/phpBB/includes/lock/db.php
+++ b/phpBB/includes/lock/db.php
@@ -48,7 +48,7 @@ class phpbb_lock_db
 
 	/**
 	* A database connection
-	* @var dbal
+	* @var phpbb_db_driver
 	*/
 	private $db;
 
@@ -59,7 +59,7 @@ class phpbb_lock_db
 	*
 	* @param	string	$config_name	A config variable to be used for locking
 	* @param	array	$config			The phpBB configuration
-	* @param	dbal	$db				A database connection
+	* @param	phpbb_db_driver	$db				A database connection
 	*/
 	public function __construct($config_name, phpbb_config $config, phpbb_db_driver $db)
 	{
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 58a4dd7d6a..693f663f23 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -41,8 +41,8 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	protected $config;
 	
 	/**
-	 * DBAL object
-	 * @var dbal
+	 * Database connection
+	 * @var phpbb_db_driver
 	 */
 	protected $db;
 	
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 4623326fc7..53df8348ae 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -85,8 +85,8 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	protected $config;
 
 	/**
-	 * DBAL object
-	 * @var dbal
+	 * Database connection
+	 * @var phpbb_db_driver
 	 */
 	protected $db;
 
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index 08f64735b6..cf613076d0 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -66,8 +66,8 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	protected $config;
 
 	/**
-	 * DBAL object
-	 * @var dbal
+	 * Database connection
+	 * @var phpbb_db_driver
 	 */
 	protected $db;
 
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index dd5634b623..a84a64825c 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -84,8 +84,8 @@ class phpbb_search_fulltext_sphinx
 	protected $config;
 
 	/**
-	 * DBAL object
-	 * @var dbal
+	 * Database connection
+	 * @var phpbb_db_driver
 	 */
 	protected $db;
 
-- 
cgit v1.2.1


From 025a95ea909d449e14cb22564983fb005e3f8c06 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 9 Mar 2011 21:50:45 -0500
Subject: [ticket/10205] Account for potentially missing extensions in dbal.

PHPBB3-10205
---
 phpBB/includes/db/mssql_odbc.php | 20 +++++++++++++++++++-
 phpBB/includes/db/mysql.php      | 20 +++++++++++++++++++-
 phpBB/includes/db/mysqli.php     |  7 +++++++
 phpBB/includes/db/oracle.php     | 29 ++++++++++++++++++++++++++++-
 phpBB/includes/db/sqlite.php     | 21 ++++++++++++++++++++-
 5 files changed, 93 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index 2ecc42cadf..dabdbd1a44 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -32,6 +32,7 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
 class dbal_mssql_odbc extends dbal
 {
 	var $last_query_text = '';
+	var $connect_error = '';
 
 	/**
 	* Connect to server
@@ -68,7 +69,24 @@ class dbal_mssql_odbc extends dbal
 			@ini_set('odbc.defaultlrl', $max_size);
 		}
 
-		$this->db_connect_id = ($this->persistency) ? @odbc_pconnect($this->server, $this->user, $sqlpassword) : @odbc_connect($this->server, $this->user, $sqlpassword);
+		if ($this->persistency)
+		{
+			if (!function_exists('odbc_pconnect'))
+			{
+				$this->connect_error = 'odbc_pconnect function does not exist, is odbc extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @odbc_pconnect($this->server, $this->user, $sqlpassword);
+		}
+		else
+		{
+			if (!function_exists('odbc_connect'))
+			{
+				$this->connect_error = 'odbc_connect function does not exist, is odbc extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @odbc_connect($this->server, $this->user, $sqlpassword);
+		}
 
 		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
 	}
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 1ccb785150..ae36fe6425 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -30,6 +30,7 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
 class dbal_mysql extends dbal
 {
 	var $multi_insert = true;
+	var $connect_error = '';
 
 	/**
 	* Connect to server
@@ -44,7 +45,24 @@ class dbal_mysql extends dbal
 
 		$this->sql_layer = 'mysql4';
 
-		$this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link);
+		if ($this->persistency)
+		{
+			if (!function_exists('mysql_pconnect'))
+			{
+				$this->connect_error = 'mysql_pconnect function does not exist, is mysql extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @mysql_pconnect($this->server, $this->user, $sqlpassword);
+		}
+		else
+		{
+			if (!function_exists('mysql_connect'))
+			{
+				$this->connect_error = 'mysql_connect function does not exist, is mysql extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @mysql_connect($this->server, $this->user, $sqlpassword, $new_link);
+		}
 
 		if ($this->db_connect_id && $this->dbname != '')
 		{
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index a311b8cda6..98b659723f 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -27,12 +27,19 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
 class dbal_mysqli extends dbal
 {
 	var $multi_insert = true;
+	var $connect_error = '';
 
 	/**
 	* Connect to server
 	*/
 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false)
 	{
+		if (!function_exists('mysqli_connect'))
+		{
+			$this->connect_error = 'mysqli_connect function does not exist, is mysqli extension installed?';
+			return $this->sql_error('');
+		}
+
 		// Mysqli extension supports persistent connection since PHP 5.3.0
 		$this->persistency = (version_compare(PHP_VERSION, '5.3.0', '>=')) ? $persistency : false;
 		$this->user = $sqluser;
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index 62b36aa8bf..42f5de1b24 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -25,6 +25,7 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
 class dbal_oracle extends dbal
 {
 	var $last_query_text = '';
+	var $connect_error = '';
 
 	/**
 	* Connect to server
@@ -48,7 +49,33 @@ class dbal_oracle extends dbal
 			$connect = $sqlserver . (($port) ? ':' . $port : '') . '/' . $database;
 		}
 
-		$this->db_connect_id = ($new_link) ? @ocinlogon($this->user, $sqlpassword, $connect, 'UTF8') : (($this->persistency) ? @ociplogon($this->user, $sqlpassword, $connect, 'UTF8') : @ocilogon($this->user, $sqlpassword, $connect, 'UTF8'));
+		if ($new_link)
+		{
+			if (!function_exists('ocinlogon'))
+			{
+				$this->connect_error = 'ocinlogon function does not exist, is oci extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @ocinlogon($this->user, $sqlpassword, $connect, 'UTF8');
+		}
+		else if ($this->persistency)
+		{
+			if (!function_exists('ociplogon'))
+			{
+				$this->connect_error = 'ociplogon function does not exist, is oci extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @ociplogon($this->user, $sqlpassword, $connect, 'UTF8');
+		}
+		else
+		{
+			if (!function_exists('ocilogon'))
+			{
+				$this->connect_error = 'ocilogon function does not exist, is oci extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @ocilogon($this->user, $sqlpassword, $connect, 'UTF8'));
+		}
 
 		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
 	}
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 8de72fd394..be0ad4fc8f 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -25,6 +25,8 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
 */
 class dbal_sqlite extends dbal
 {
+	var $connect_error = '';
+
 	/**
 	* Connect to server
 	*/
@@ -36,7 +38,24 @@ class dbal_sqlite extends dbal
 		$this->dbname = $database;
 
 		$error = '';
-		$this->db_connect_id = ($this->persistency) ? @sqlite_popen($this->server, 0666, $error) : @sqlite_open($this->server, 0666, $error);
+		if ($this->persistency)
+		{
+			if (!function_exists('sqlite_popen'))
+			{
+				$this->connect_error = 'sqlite_popen function does not exist, is sqlite extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @sqlite_popen($this->server, 0666, $error);
+		}
+		else
+		{
+			if (!function_exists('sqlite_open'))
+			{
+				$this->connect_error = 'sqlite_open function does not exist, is sqlite extension installed?';
+				return $this->sql_error('');
+			}
+			$this->db_connect_id = @sqlite_open($this->server, 0666, $error);
+		}
 
 		if ($this->db_connect_id)
 		{
-- 
cgit v1.2.1


From 1a7e2211c35218094e30ddc399d4aa6b45fe75f4 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 04:06:30 -0500
Subject: [ticket/10205] Avoid calling mysqli functions when mysqli is missing.

PHPBB3-10205
---
 phpBB/includes/db/mysqli.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 98b659723f..cd82a12b58 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -425,10 +425,20 @@ class dbal_mysqli extends dbal
 	{
 		if (!$this->db_connect_id)
 		{
-			return array(
-				'message'	=> @mysqli_connect_error(),
-				'code'		=> @mysqli_connect_errno()
-			);
+			if (function_exists('mysqli_connect_error'))
+			{
+				return array(
+					'message'	=> @mysqli_connect_error(),
+					'code'		=> @mysqli_connect_errno(),
+				);
+			}
+			else
+			{
+				return array(
+					'message'	=> $this->connect_error,
+					'code'		=> '',
+				);
+			}
 		}
 
 		return array(
-- 
cgit v1.2.1


From 9f549e8249acbd82b68e961a6e0a31de47d9ca32 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 04:50:41 -0500
Subject: [ticket/10205] Fix remaining db drivers.

PHPBB3-10205
---
 phpBB/includes/db/mssql.php      | 58 +++++++++++++++++++++++-----------------
 phpBB/includes/db/mssql_odbc.php | 18 ++++++++++---
 phpBB/includes/db/mysql.php      | 18 ++++++++++---
 phpBB/includes/db/oracle.php     | 24 ++++++++++++-----
 phpBB/includes/db/sqlite.php     | 18 ++++++++++---
 5 files changed, 93 insertions(+), 43 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index b7178593dc..bc0a870885 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -355,34 +355,44 @@ class dbal_mssql extends dbal
 	*/
 	function _sql_error()
 	{
-		$error = array(
-			'message'	=> @mssql_get_last_message(),
-			'code'		=> ''
-		);
-
-		// Get error code number
-		$result_id = @mssql_query('SELECT @@ERROR as code', $this->db_connect_id);
-		if ($result_id)
+		if (function_exists('mssql_get_last_message'))
 		{
-			$row = @mssql_fetch_assoc($result_id);
-			$error['code'] = $row['code'];
-			@mssql_free_result($result_id);
-		}
+			$error = array(
+				'message'	=> @mssql_get_last_message(),
+				'code'		=> ''
+			);
 
-		// Get full error message if possible
-		$sql = 'SELECT CAST(description as varchar(255)) as message
-			FROM master.dbo.sysmessages
-			WHERE error = ' . $error['code'];
-		$result_id = @mssql_query($sql);
-		
-		if ($result_id)
-		{
-			$row = @mssql_fetch_assoc($result_id);
-			if (!empty($row['message']))
+			// Get error code number
+			$result_id = @mssql_query('SELECT @@ERROR as code', $this->db_connect_id);
+			if ($result_id)
 			{
-				$error['message'] .= '<br />' . $row['message'];
+				$row = @mssql_fetch_assoc($result_id);
+				$error['code'] = $row['code'];
+				@mssql_free_result($result_id);
 			}
-			@mssql_free_result($result_id);
+
+			// Get full error message if possible
+			$sql = 'SELECT CAST(description as varchar(255)) as message
+				FROM master.dbo.sysmessages
+				WHERE error = ' . $error['code'];
+			$result_id = @mssql_query($sql);
+
+			if ($result_id)
+			{
+				$row = @mssql_fetch_assoc($result_id);
+				if (!empty($row['message']))
+				{
+					$error['message'] .= '<br />' . $row['message'];
+				}
+				@mssql_free_result($result_id);
+			}
+		}
+		else
+		{
+			$error = array(
+				'message'	=> $this->connect_error,
+				'code'		=> '',
+			);
 		}
 
 		return $error;
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index dabdbd1a44..e1234389df 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -360,10 +360,20 @@ class dbal_mssql_odbc extends dbal
 	*/
 	function _sql_error()
 	{
-		return array(
-			'message'	=> @odbc_errormsg(),
-			'code'		=> @odbc_error()
-		);
+		if (function_exists('odbc_errormsg'))
+		{
+			return array(
+				'message'	=> @odbc_errormsg(),
+				'code'		=> @odbc_error()
+			);
+		}
+		else
+		{
+			return array(
+				'message'	=> $this->connect_error,
+				'code'		=> '',
+			);
+		}
 	}
 
 	/**
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index ae36fe6425..7314e92087 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -439,10 +439,20 @@ class dbal_mysql extends dbal
 	{
 		if (!$this->db_connect_id)
 		{
-			return array(
-				'message'	=> @mysql_error(),
-				'code'		=> @mysql_errno()
-			);
+			if (function_exists('mysql_error'))
+			{
+				return array(
+					'message'	=> @mysql_error(),
+					'code'		=> @mysql_errno()
+				);
+			}
+			else
+			{
+				return array(
+					'message'	=> $this->connect_error,
+					'code'		=> '',
+				);
+			}
 		}
 
 		return array(
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index 42f5de1b24..b234d8b45e 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -674,17 +674,27 @@ class dbal_oracle extends dbal
 	*/
 	function _sql_error()
 	{
-		$error = @ocierror();
-		$error = (!$error) ? @ocierror($this->query_result) : $error;
-		$error = (!$error) ? @ocierror($this->db_connect_id) : $error;
-
-		if ($error)
+		if (function_exists('ocierror'))
 		{
-			$this->last_error_result = $error;
+			$error = @ocierror();
+			$error = (!$error) ? @ocierror($this->query_result) : $error;
+			$error = (!$error) ? @ocierror($this->db_connect_id) : $error;
+
+			if ($error)
+			{
+				$this->last_error_result = $error;
+			}
+			else
+			{
+				$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
+			}
 		}
 		else
 		{
-			$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
+			$error = array(
+				'message'	=> $this->connect_error,
+				'code'		=> '',
+			);
 		}
 
 		return $error;
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index be0ad4fc8f..3c9b2cce34 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -300,10 +300,20 @@ class dbal_sqlite extends dbal
 	*/
 	function _sql_error()
 	{
-		return array(
-			'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
-			'code'		=> @sqlite_last_error($this->db_connect_id)
-		);
+		if (function_exists('sqlite_error_string'))
+		{
+			return array(
+				'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
+				'code'		=> @sqlite_last_error($this->db_connect_id)
+			);
+		}
+		else
+		{
+			return array(
+				'message'	=> $this->connect_error,
+				'code'		=> '',
+			);
+		}
 	}
 
 	/**
-- 
cgit v1.2.1


From 8aaa3e055fdc50faeea6f590408a7bcbb03a8d92 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 4 Dec 2012 15:11:14 +0100
Subject: [feature/avatars] Use seperate function for retrieving the config
 name

PHPBB3-10018
---
 phpBB/includes/acp/acp_users.php  |  2 +-
 phpBB/includes/avatar/manager.php | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 5c485b5996..b3cfd81949 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1808,7 +1808,7 @@ class acp_users
 						$driver = $phpbb_avatar_manager->get_driver($current_driver);
 
 						$avatars_enabled = true;
-						$config_name = preg_replace('#^avatar\.driver.#', '', $current_driver);
+						$config_name = $phpbb_avatar_manager->get_driver_config_name($driver);
 						$template->set_filenames(array(
 							'avatar' => "acp_avatar_options_$config_name.html",
 						));
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 279278b71c..81a135b46f 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -203,7 +203,7 @@ class phpbb_avatar_manager
 	*/
 	public function is_enabled($driver)
 	{
-		$config_name = preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
+		$config_name = $this->get_driver_config_name($driver);
 
 		return $this->config["allow_avatar_{$config_name}"];
 	}
@@ -211,16 +211,28 @@ class phpbb_avatar_manager
 	/**
 	* Get the settings array for enabling/disabling an avatar driver
 	*
-	* @param string $driver Avatar driver object
+	* @param object $driver Avatar driver object
 	*
 	* @return array Array of configuration options as consumed by acp_board
 	*/
 	public function get_avatar_settings($driver)
 	{
-		$config_name = preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
+		$config_name = $this->get_driver_config_name($driver);
 
 		return array(
 			'allow_avatar_' . $config_name	=> array('lang' => 'ALLOW_' . strtoupper($config_name),		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
 		);
 	}
+
+	/**
+	* Get the config name of an avatar driver
+	*
+	* @param object $driver Avatar driver object
+	*
+	* @return string Avatar driver config name
+	*/
+	public function get_driver_config_name($driver)
+	{
+		return preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
+	}
 }
-- 
cgit v1.2.1


From fb139a88203fb5475712c2bc39e653996cd9103f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 4 Dec 2012 15:12:04 +0100
Subject: [feature/avatars] Fix behavior of avatar manager and variables

The $force_all variable was only partially removed and the behavior was
not consistent in all files.

PHPBB3-10018
---
 phpBB/includes/acp/acp_board.php  |  2 +-
 phpBB/includes/acp/acp_groups.php | 10 +++++-----
 phpBB/includes/avatar/manager.php | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 9e63e59403..a48d6eda83 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -113,7 +113,7 @@ class acp_board
 				$avatar_vars = array();
 				foreach ($avatar_drivers as $current_driver)
 				{
-					$driver = $phpbb_avatar_manager->get_driver($current_driver);
+					$driver = $phpbb_avatar_manager->get_driver($current_driver, false);
 
 					/*
 					* First grab the settings for enabling/disabling the avatar
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index b425b9d374..ae0abdd139 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -522,26 +522,26 @@ class acp_groups
 					$avatars_enabled = false;
 					$selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
 
-					foreach ($avatar_drivers as $driver)
+					foreach ($avatar_drivers as $current_driver)
 					{
-						$driver = $phpbb_avatar_manager->get_driver($driver);
+						$driver = $phpbb_avatar_manager->get_driver($current_driver);
 
 						$avatars_enabled = true;
-						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+						$config_name = $phpbb_avatar_manager->get_driver_config_name($driver);
 						$template->set_filenames(array(
 							'avatar' => "acp_avatar_options_$config_name.html",
 						));
 
 						if ($driver->prepare_form($template, $avatar_data, $avatar_error))
 						{
-							$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+							$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 							$driver_upper = strtoupper($driver_name);
 							$template->assign_block_vars('avatar_drivers', array(
 								'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
 								'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
 								'DRIVER' => $driver_name,
-								'SELECTED' => $driver == $selected_driver,
+								'SELECTED' => $current_driver == $selected_driver,
 								'OUTPUT' => $template->assign_display('avatar'),
 							));
 						}
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 81a135b46f..2789158de5 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -47,17 +47,19 @@ class phpbb_avatar_manager
 	* Get the driver object specified by the avatar type
 	*
 	* @param string $avatar_type Avatar type; by default an avatar's service container name
-	* @param bool $force_all Grab all avatar drivers, no matter if enabled or not
+	* @param bool $load_valid Load only valid avatars
 	*
 	* @return object Avatar driver object
 	*/
-	public function get_driver($avatar_type, $force_all = false)
+	public function get_driver($avatar_type, $load_valid = true)
 	{
-		if (self::$valid_drivers === false || $force_all)
+		if (self::$valid_drivers === false)
 		{
-			$this->load_valid_drivers($force_all);
+			$this->load_valid_drivers();
 		}
 
+		$avatar_drivers = ($load_valid) ? self::$valid_drivers : $this->get_all_drivers();
+
 		// Legacy stuff...
 		switch ($avatar_type)
 		{
@@ -72,7 +74,7 @@ class phpbb_avatar_manager
 			break;
 		}
 
-		if (!isset(self::$valid_drivers[$avatar_type]))
+		if (!isset($avatar_drivers[$avatar_type]))
 		{
 			return null;
 		}
@@ -89,17 +91,15 @@ class phpbb_avatar_manager
 	/**
 	* Load the list of valid drivers
 	* This is executed once and fills self::$valid_drivers
-	*
-	* @param bool $force_all Force showing all avatar drivers
 	*/
-	protected function load_valid_drivers($force_all = false)
+	protected function load_valid_drivers()
 	{
 		if (!empty($this->avatar_drivers))
 		{
 			self::$valid_drivers = array();
 			foreach ($this->avatar_drivers as $driver)
 			{
-				if ($force_all || $this->is_enabled($driver))
+				if ($this->is_enabled($driver))
 				{
 					self::$valid_drivers[$driver->get_name()] = $driver->get_name();
 				}
@@ -138,7 +138,7 @@ class phpbb_avatar_manager
 	{
 		if (self::$valid_drivers === false)
 		{
-			$this->load_valid_drivers($force_all);
+			$this->load_valid_drivers();
 		}
 
 		return self::$valid_drivers;
-- 
cgit v1.2.1


From 40db60e45f3d7af01a96f9da6b36db2606b3d147 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 16:07:02 -0500
Subject: [ticket/10205] Fix a parse error in oracle driver.

PHPBB3-10205
---
 phpBB/includes/db/oracle.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index b234d8b45e..4a7a4ecc8c 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -74,7 +74,7 @@ class dbal_oracle extends dbal
 				$this->connect_error = 'ocilogon function does not exist, is oci extension installed?';
 				return $this->sql_error('');
 			}
-			$this->db_connect_id = @ocilogon($this->user, $sqlpassword, $connect, 'UTF8'));
+			$this->db_connect_id = @ocilogon($this->user, $sqlpassword, $connect, 'UTF8');
 		}
 
 		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-- 
cgit v1.2.1


From de2fe1a308b08af868f22d6d9c0b7007f66de676 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 16:12:31 -0500
Subject: [ticket/10205] Convert mssqlnative driver to the same logic.

PHPBB3-10205
---
 phpBB/includes/db/mssqlnative.php | 52 ++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 20 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 3ad0ff3e11..e5de30faf6 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -199,16 +199,18 @@ class dbal_mssqlnative extends dbal
 	var $m_insert_id = NULL;
 	var $last_query_text = '';
 	var $query_options = array();
+	var $connect_error = '';
 
 	/**
 	* Connect to server
 	*/
 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
 	{
-		# Test for driver support, to avoid suppressed fatal error
+		// Test for driver support, to avoid suppressed fatal error
 		if (!function_exists('sqlsrv_connect'))
 		{
-			trigger_error('Native MS SQL Server driver for PHP is missing or needs to be updated. Version 1.1 or later is required to install phpBB3. You can download the driver from: http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx\n', E_USER_ERROR);
+			$this->connect_error = 'Native MS SQL Server driver for PHP is missing or needs to be updated. Version 1.1 or later is required to install phpBB3. You can download the driver from: http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx';
+			return $this->sql_error('');
 		}
 
 		//set up connection variables
@@ -514,31 +516,41 @@ class dbal_mssqlnative extends dbal
 	*/
 	function _sql_error()
 	{
-		$errors = @sqlsrv_errors(SQLSRV_ERR_ERRORS);
-		$error_message = '';
-		$code = 0;
-
-		if ($errors != null)
+		if (function_exists('sqlsrv_errors'))
 		{
-			foreach ($errors as $error)
+			$errors = @sqlsrv_errors(SQLSRV_ERR_ERRORS);
+			$error_message = '';
+			$code = 0;
+
+			if ($errors != null)
 			{
-				$error_message .= "SQLSTATE: ".$error[ 'SQLSTATE']."\n";
-				$error_message .= "code: ".$error[ 'code']."\n";
-				$code = $error['code'];
-				$error_message .= "message: ".$error[ 'message']."\n";
+				foreach ($errors as $error)
+				{
+					$error_message .= "SQLSTATE: ".$error[ 'SQLSTATE']."\n";
+					$error_message .= "code: ".$error[ 'code']."\n";
+					$code = $error['code'];
+					$error_message .= "message: ".$error[ 'message']."\n";
+				}
+				$this->last_error_result = $error_message;
+				$error = $this->last_error_result;
 			}
-			$this->last_error_result = $error_message;
-			$error = $this->last_error_result;
+			else
+			{
+				$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
+			}
+
+			return array(
+				'message'	=> $error,
+				'code'		=> $code,
+			);
 		}
 		else
 		{
-			$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
+			return array(
+				'message'	=> $this->connect_error,
+				'code'		=> '',
+			);
 		}
-
-		return array(
-			'message'	=> $error,
-			'code'		=> $code,
-		);
 	}
 
 	/**
-- 
cgit v1.2.1


From dc521692f3c6d65b842a42f68bc727c8a36c9042 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 16:14:39 -0500
Subject: [ticket/10205] Check for function existence in mssql connect method.

PHPBB3-10205
---
 phpBB/includes/db/mssql.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index bc0a870885..3792e82aa0 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -25,11 +25,19 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
 */
 class dbal_mssql extends dbal
 {
+	var $connect_error = '';
+
 	/**
 	* Connect to server
 	*/
 	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
 	{
+		if (!function_exists('mssql_connect'))
+		{
+			$this->connect_error = 'mssql_connect function does not exist, is mssql extension installed?';
+			return $this->sql_error('');
+		}
+
 		$this->persistency = $persistency;
 		$this->user = $sqluser;
 		$this->dbname = $database;
-- 
cgit v1.2.1


From 89c9c9d4b0daa7308fd015e8a6fca6386a8b8016 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 21:22:33 -0500
Subject: [ticket/10205] Cosmetic changes.

PHPBB3-10205
---
 phpBB/includes/db/mssql.php       | 2 +-
 phpBB/includes/db/mssql_odbc.php  | 2 +-
 phpBB/includes/db/mssqlnative.php | 6 +++---
 phpBB/includes/db/mysql.php       | 4 ++--
 phpBB/includes/db/sqlite.php      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index 3792e82aa0..2dd95c2508 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -367,7 +367,7 @@ class dbal_mssql extends dbal
 		{
 			$error = array(
 				'message'	=> @mssql_get_last_message(),
-				'code'		=> ''
+				'code'		=> '',
 			);
 
 			// Get error code number
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index e1234389df..47792d74ab 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -364,7 +364,7 @@ class dbal_mssql_odbc extends dbal
 		{
 			return array(
 				'message'	=> @odbc_errormsg(),
-				'code'		=> @odbc_error()
+				'code'		=> @odbc_error(),
 			);
 		}
 		else
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index e5de30faf6..41ac0a1784 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -526,10 +526,10 @@ class dbal_mssqlnative extends dbal
 			{
 				foreach ($errors as $error)
 				{
-					$error_message .= "SQLSTATE: ".$error[ 'SQLSTATE']."\n";
-					$error_message .= "code: ".$error[ 'code']."\n";
+					$error_message .= "SQLSTATE: " . $error[ 'SQLSTATE'] . "\n";
+					$error_message .= "code: " . $error[ 'code'] . "\n";
 					$code = $error['code'];
-					$error_message .= "message: ".$error[ 'message']."\n";
+					$error_message .= "message: " . $error[ 'message'] . "\n";
 				}
 				$this->last_error_result = $error_message;
 				$error = $this->last_error_result;
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 7314e92087..0125be0917 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -443,7 +443,7 @@ class dbal_mysql extends dbal
 			{
 				return array(
 					'message'	=> @mysql_error(),
-					'code'		=> @mysql_errno()
+					'code'		=> @mysql_errno(),
 				);
 			}
 			else
@@ -457,7 +457,7 @@ class dbal_mysql extends dbal
 
 		return array(
 			'message'	=> @mysql_error($this->db_connect_id),
-			'code'		=> @mysql_errno($this->db_connect_id)
+			'code'		=> @mysql_errno($this->db_connect_id),
 		);
 	}
 
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 3c9b2cce34..199b4eed23 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -304,7 +304,7 @@ class dbal_sqlite extends dbal
 		{
 			return array(
 				'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
-				'code'		=> @sqlite_last_error($this->db_connect_id)
+				'code'		=> @sqlite_last_error($this->db_connect_id),
 			);
 		}
 		else
-- 
cgit v1.2.1


From 597dea1e047b94f0a862f7f6e650771ffc780141 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 21:32:02 -0500
Subject: [ticket/10205] Rewrite _sql_error implementations to have a single
 return.

PHPBB3-10205
---
 phpBB/includes/db/mssql_odbc.php  |  6 ++++--
 phpBB/includes/db/mssqlnative.php |  6 ++++--
 phpBB/includes/db/mysql.php       | 18 +++++++++++-------
 phpBB/includes/db/mysqli.php      | 18 +++++++++++-------
 phpBB/includes/db/sqlite.php      |  6 ++++--
 5 files changed, 34 insertions(+), 20 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index 47792d74ab..04501cce8b 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -362,18 +362,20 @@ class dbal_mssql_odbc extends dbal
 	{
 		if (function_exists('odbc_errormsg'))
 		{
-			return array(
+			$error = array(
 				'message'	=> @odbc_errormsg(),
 				'code'		=> @odbc_error(),
 			);
 		}
 		else
 		{
-			return array(
+			$error = array(
 				'message'	=> $this->connect_error,
 				'code'		=> '',
 			);
 		}
+
+		return $error;
 	}
 
 	/**
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index 41ac0a1784..b91372ac61 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -539,18 +539,20 @@ class dbal_mssqlnative extends dbal
 				$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
 			}
 
-			return array(
+			$error = array(
 				'message'	=> $error,
 				'code'		=> $code,
 			);
 		}
 		else
 		{
-			return array(
+			$error = array(
 				'message'	=> $this->connect_error,
 				'code'		=> '',
 			);
 		}
+
+		return $error;
 	}
 
 	/**
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 0125be0917..e638531f51 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -437,28 +437,32 @@ class dbal_mysql extends dbal
 	*/
 	function _sql_error()
 	{
-		if (!$this->db_connect_id)
+		if ($this->db_connect_id)
+		{
+			$error = array(
+				'message'	=> @mysql_error($this->db_connect_id),
+				'code'		=> @mysql_errno($this->db_connect_id),
+			);
+		}
+		else
 		{
 			if (function_exists('mysql_error'))
 			{
-				return array(
+				$error = array(
 					'message'	=> @mysql_error(),
 					'code'		=> @mysql_errno(),
 				);
 			}
 			else
 			{
-				return array(
+				$error = array(
 					'message'	=> $this->connect_error,
 					'code'		=> '',
 				);
 			}
 		}
 
-		return array(
-			'message'	=> @mysql_error($this->db_connect_id),
-			'code'		=> @mysql_errno($this->db_connect_id),
-		);
+		return $error;
 	}
 
 	/**
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index cd82a12b58..b2a43d35f9 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -423,28 +423,32 @@ class dbal_mysqli extends dbal
 	*/
 	function _sql_error()
 	{
-		if (!$this->db_connect_id)
+		if ($this->db_connect_id)
+		{
+			$error = array(
+				'message'	=> @mysqli_error($this->db_connect_id),
+				'code'		=> @mysqli_errno($this->db_connect_id)
+			);
+		}
+		else
 		{
 			if (function_exists('mysqli_connect_error'))
 			{
-				return array(
+				$error = array(
 					'message'	=> @mysqli_connect_error(),
 					'code'		=> @mysqli_connect_errno(),
 				);
 			}
 			else
 			{
-				return array(
+				$error = array(
 					'message'	=> $this->connect_error,
 					'code'		=> '',
 				);
 			}
 		}
 
-		return array(
-			'message'	=> @mysqli_error($this->db_connect_id),
-			'code'		=> @mysqli_errno($this->db_connect_id)
-		);
+		return $error;
 	}
 
 	/**
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 199b4eed23..557b057cce 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -302,18 +302,20 @@ class dbal_sqlite extends dbal
 	{
 		if (function_exists('sqlite_error_string'))
 		{
-			return array(
+			$error = array(
 				'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
 				'code'		=> @sqlite_last_error($this->db_connect_id),
 			);
 		}
 		else
 		{
-			return array(
+			$error = array(
 				'message'	=> $this->connect_error,
 				'code'		=> '',
 			);
 		}
+
+		return $error;
 	}
 
 	/**
-- 
cgit v1.2.1


From 5120f36a258ffcbffd5c10e9a1056d64ea794a16 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 21:33:13 -0500
Subject: [ticket/10205] Reduce nesting in mysql drivers.

PHPBB3-10205
---
 phpBB/includes/db/mysql.php  | 25 +++++++++++--------------
 phpBB/includes/db/mysqli.php | 25 +++++++++++--------------
 2 files changed, 22 insertions(+), 28 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index e638531f51..252cb20bd4 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -444,22 +444,19 @@ class dbal_mysql extends dbal
 				'code'		=> @mysql_errno($this->db_connect_id),
 			);
 		}
+		else if (function_exists('mysql_error'))
+		{
+			$error = array(
+				'message'	=> @mysql_error(),
+				'code'		=> @mysql_errno(),
+			);
+		}
 		else
 		{
-			if (function_exists('mysql_error'))
-			{
-				$error = array(
-					'message'	=> @mysql_error(),
-					'code'		=> @mysql_errno(),
-				);
-			}
-			else
-			{
-				$error = array(
-					'message'	=> $this->connect_error,
-					'code'		=> '',
-				);
-			}
+			$error = array(
+				'message'	=> $this->connect_error,
+				'code'		=> '',
+			);
 		}
 
 		return $error;
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index b2a43d35f9..69f1d26a40 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -430,22 +430,19 @@ class dbal_mysqli extends dbal
 				'code'		=> @mysqli_errno($this->db_connect_id)
 			);
 		}
+		else if (function_exists('mysqli_connect_error'))
+		{
+			$error = array(
+				'message'	=> @mysqli_connect_error(),
+				'code'		=> @mysqli_connect_errno(),
+			);
+		}
 		else
 		{
-			if (function_exists('mysqli_connect_error'))
-			{
-				$error = array(
-					'message'	=> @mysqli_connect_error(),
-					'code'		=> @mysqli_connect_errno(),
-				);
-			}
-			else
-			{
-				$error = array(
-					'message'	=> $this->connect_error,
-					'code'		=> '',
-				);
-			}
+			$error = array(
+				'message'	=> $this->connect_error,
+				'code'		=> '',
+			);
 		}
 
 		return $error;
-- 
cgit v1.2.1


From 0f96b1aad378b1fc40620ea57df5ee89224fd5eb Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 23:35:34 -0500
Subject: [ticket/11162] Move to a separate file to avoid blowing out
 functions.php.

PHPBB3-11162
---
 phpBB/includes/functions.php               |  87 ------------------------
 phpBB/includes/functions_tricky_update.php | 103 +++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 87 deletions(-)
 create mode 100644 phpBB/includes/functions_tricky_update.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e3feb59d41..65d8be32ad 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1297,93 +1297,6 @@ function tz_select($default = '', $truncate = false)
 	return $tz_select;
 }
 
-/**
-* Updates rows in given table from a set of values to a new value.
-* If this results in rows violating uniqueness constraints, the duplicate
-* rows are eliminated.
-*
-* The only supported tables are bookmarks and topics_watch.
-*
-* @param dbal $db Database object
-* @param string $table Table on which to perform the update
-* @param string $column Column whose values to change
-* @param array $from_values An array of values that should be changed
-* @param int $to_value The new value
-* @return null
-*/
-function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_values, $to_value)
-{
-	$sql = "SELECT $column, user_id
-		FROM $table
-		WHERE " . $db->sql_in_set($column, $from_values);
-	$result = $db->sql_query($sql);
-
-	$old_user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$old_user_ids[$row[$column]][] = $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	$sql = "SELECT $column, user_id
-		FROM $table
-		WHERE $column = '" . (int) $to_value . "'";
-	$result = $db->sql_query($sql);
-
-	$new_user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$new_user_ids[$row[$column]][] = $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	$queries = array();
-	$any_found = false;
-	foreach ($from_values as $from_value)
-	{
-		if (!isset($old_user_ids[$from_value]))
-		{
-			continue;
-		}
-		$any_found = true;
-		if (empty($new_user_ids))
-		{
-			$sql = "UPDATE $table
-				SET $column = " . (int) $to_value. "
-				WHERE $column = '" . $db->sql_escape($from_value) . "'";
-			$queries[] = $sql;
-		}
-		else
-		{
-			$different_user_ids = array_diff($old_user_ids[$from_value], $new_user_ids[$to_value]);
-			if (!empty($different_user_ids))
-			{
-				$sql = "UPDATE $table
-					SET $column = " . (int) $to_value. "
-					WHERE $column = '" . $db->sql_escape($from_value) . "'
-					AND " . $db->sql_in_set('user_id', $different_user_ids);
-				$queries[] = $sql;
-			}
-		}
-	}
-
-	if ($any_found)
-	{
-		$db->sql_transaction('begin');
-
-		foreach ($queries as $sql)
-		{
-			$db->sql_query($sql);
-		}
-
-		$sql = "DELETE FROM $table
-			WHERE " . $db->sql_in_set($column, $from_values);
-		$db->sql_query($sql);
-
-		$db->sql_transaction('commit');
-	}
-}
-
 // Functions handling topic/post tracking/marking
 
 /**
diff --git a/phpBB/includes/functions_tricky_update.php b/phpBB/includes/functions_tricky_update.php
new file mode 100644
index 0000000000..a5b9fdacd0
--- /dev/null
+++ b/phpBB/includes/functions_tricky_update.php
@@ -0,0 +1,103 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Updates rows in given table from a set of values to a new value.
+* If this results in rows violating uniqueness constraints, the duplicate
+* rows are eliminated.
+*
+* The only supported tables are bookmarks and topics_watch.
+*
+* @param dbal $db Database object
+* @param string $table Table on which to perform the update
+* @param string $column Column whose values to change
+* @param array $from_values An array of values that should be changed
+* @param int $to_value The new value
+* @return null
+*/
+function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_values, $to_value)
+{
+	$sql = "SELECT $column, user_id
+		FROM $table
+		WHERE " . $db->sql_in_set($column, $from_values);
+	$result = $db->sql_query($sql);
+
+	$old_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$old_user_ids[$row[$column]][] = $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$sql = "SELECT $column, user_id
+		FROM $table
+		WHERE $column = '" . (int) $to_value . "'";
+	$result = $db->sql_query($sql);
+
+	$new_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$new_user_ids[$row[$column]][] = $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$queries = array();
+	$any_found = false;
+	foreach ($from_values as $from_value)
+	{
+		if (!isset($old_user_ids[$from_value]))
+		{
+			continue;
+		}
+		$any_found = true;
+		if (empty($new_user_ids))
+		{
+			$sql = "UPDATE $table
+				SET $column = " . (int) $to_value. "
+				WHERE $column = '" . $db->sql_escape($from_value) . "'";
+			$queries[] = $sql;
+		}
+		else
+		{
+			$different_user_ids = array_diff($old_user_ids[$from_value], $new_user_ids[$to_value]);
+			if (!empty($different_user_ids))
+			{
+				$sql = "UPDATE $table
+					SET $column = " . (int) $to_value. "
+					WHERE $column = '" . $db->sql_escape($from_value) . "'
+					AND " . $db->sql_in_set('user_id', $different_user_ids);
+				$queries[] = $sql;
+			}
+		}
+	}
+
+	if ($any_found)
+	{
+		$db->sql_transaction('begin');
+
+		foreach ($queries as $sql)
+		{
+			$db->sql_query($sql);
+		}
+
+		$sql = "DELETE FROM $table
+			WHERE " . $db->sql_in_set($column, $from_values);
+		$db->sql_query($sql);
+
+		$db->sql_transaction('commit');
+	}
+}
-- 
cgit v1.2.1


From abca64b1dfbe11f73675a3e5457fb9f0038f1cb6 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 23:37:14 -0500
Subject: [ticket/11162] Add includes.

PHPBB3-11162
---
 phpBB/includes/mcp/mcp_forum.php | 4 ++++
 phpBB/includes/mcp/mcp_topic.php | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index e392bef157..3603224735 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -415,6 +415,10 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		$success_msg = 'POSTS_MERGED_SUCCESS';
 
 		// Update the topic watch table.
+		if (!function_exists('phpbb_update_rows_avoiding_duplicates'))
+		{
+			include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx);
+		}
 		phpbb_update_rows_avoiding_duplicates($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
 		// Link to the new topic
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index f40a4bc044..1fb3cb9d73 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -620,6 +620,10 @@ function merge_posts($topic_id, $to_topic_id)
 		else
 		{
 			// If the topic no longer exist, we will update the topic watch table.
+			if (!function_exists('phpbb_update_rows_avoiding_duplicates'))
+			{
+				include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx);
+			}
 			phpbb_update_rows_avoiding_duplicates($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 		}
 
-- 
cgit v1.2.1


From 6872104aa95a9f2aad565189e25bbf54abc3ca2c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 5 Dec 2012 00:07:01 -0500
Subject: [ticket/11162] Account for notify_status.

PHPBB3-11162
---
 phpBB/includes/functions_tricky_update.php | 111 ++++++++++++++++++++++++++++-
 1 file changed, 108 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_tricky_update.php b/phpBB/includes/functions_tricky_update.php
index a5b9fdacd0..cf922d7014 100644
--- a/phpBB/includes/functions_tricky_update.php
+++ b/phpBB/includes/functions_tricky_update.php
@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
 * If this results in rows violating uniqueness constraints, the duplicate
 * rows are eliminated.
 *
-* The only supported tables are bookmarks and topics_watch.
+* The only supported table is bookmarks.
 *
 * @param dbal $db Database object
 * @param string $table Table on which to perform the update
@@ -67,7 +67,7 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
 		if (empty($new_user_ids))
 		{
 			$sql = "UPDATE $table
-				SET $column = " . (int) $to_value. "
+				SET $column = " . (int) $to_value . "
 				WHERE $column = '" . $db->sql_escape($from_value) . "'";
 			$queries[] = $sql;
 		}
@@ -77,7 +77,7 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
 			if (!empty($different_user_ids))
 			{
 				$sql = "UPDATE $table
-					SET $column = " . (int) $to_value. "
+					SET $column = " . (int) $to_value . "
 					WHERE $column = '" . $db->sql_escape($from_value) . "'
 					AND " . $db->sql_in_set('user_id', $different_user_ids);
 				$queries[] = $sql;
@@ -101,3 +101,108 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
 		$db->sql_transaction('commit');
 	}
 }
+
+/**
+* Updates rows in given table from a set of values to a new value.
+* If this results in rows violating uniqueness constraints, the duplicate
+* rows are merged respecting notify_status (0 takes precedence over 1).
+*
+* The only supported table is topics_watch.
+*
+* @param dbal $db Database object
+* @param string $table Table on which to perform the update
+* @param string $column Column whose values to change
+* @param array $from_values An array of values that should be changed
+* @param int $to_value The new value
+* @return null
+*/
+function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $column, $from_values, $to_value)
+{
+	$sql = "SELECT $column, user_id, notify_status
+		FROM $table
+		WHERE " . $db->sql_in_set($column, $from_values);
+	$result = $db->sql_query($sql);
+
+	$old_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$old_user_ids[(int) $row['notify_status']][$row[$column]][] = $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$sql = "SELECT $column, user_id
+		FROM $table
+		WHERE $column = '" . (int) $to_value . "'";
+	$result = $db->sql_query($sql);
+
+	$new_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$new_user_ids[$row[$column]][] = $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$queries = array();
+	$any_found = false;
+	$extra_updates = array(
+		0 => 'notify_status = 0',
+		1 => '',
+	);
+	foreach ($from_values as $from_value)
+	{
+		foreach ($extra_updates as $notify_status => $extra_update) {
+			if (!isset($old_user_ids[$notify_status][$from_value]))
+			{
+				continue;
+			}
+			$any_found = true;
+			if (empty($new_user_ids))
+			{
+				$sql = "UPDATE $table
+					SET $column = " . (int) $to_value . "
+					WHERE $column = '" . $db->sql_escape($from_value) . "'";
+				$queries[] = $sql;
+			}
+			else
+			{
+				$different_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $new_user_ids[$to_value]);
+				if (!empty($different_user_ids))
+				{
+					$sql = "UPDATE $table
+						SET $column = " . (int) $to_value . "
+						WHERE $column = '" . $db->sql_escape($from_value) . "'
+						AND " . $db->sql_in_set('user_id', $different_user_ids);
+					$queries[] = $sql;
+				}
+				
+				if ($extra_update) {
+					$same_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $different_user_ids);
+					if (!empty($same_user_ids))
+					{
+						$sql = "UPDATE $table
+							SET $extra_update
+							WHERE $column = '" . (int) $to_value . "'
+							AND " . $db->sql_in_set('user_id', $same_user_ids);
+						$queries[] = $sql;
+					}
+				}
+			}
+		}
+	}
+
+	if ($any_found)
+	{
+		$db->sql_transaction('begin');
+
+		foreach ($queries as $sql)
+		{
+			$db->sql_query($sql);
+		}
+
+		$sql = "DELETE FROM $table
+			WHERE " . $db->sql_in_set($column, $from_values);
+		$db->sql_query($sql);
+
+		$db->sql_transaction('commit');
+	}
+}
-- 
cgit v1.2.1


From 1a411c5658da769e28b03332ed618d5e701dab79 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 5 Dec 2012 00:10:02 -0500
Subject: [ticket/11162] Use correct functions.

PHPBB3-11162
---
 phpBB/includes/mcp/mcp_forum.php | 4 ++--
 phpBB/includes/mcp/mcp_topic.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 3603224735..cd938e83a0 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -415,11 +415,11 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		$success_msg = 'POSTS_MERGED_SUCCESS';
 
 		// Update the topic watch table.
-		if (!function_exists('phpbb_update_rows_avoiding_duplicates'))
+		if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status'))
 		{
 			include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx);
 		}
-		phpbb_update_rows_avoiding_duplicates($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
+		phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
 		// Link to the new topic
 		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 1fb3cb9d73..29dabdd2a2 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -620,11 +620,11 @@ function merge_posts($topic_id, $to_topic_id)
 		else
 		{
 			// If the topic no longer exist, we will update the topic watch table.
-			if (!function_exists('phpbb_update_rows_avoiding_duplicates'))
+			if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status'))
 			{
 				include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx);
 			}
-			phpbb_update_rows_avoiding_duplicates($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
+			phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 		}
 
 		// Link to the new topic
-- 
cgit v1.2.1


From 94ebc5707836d931e24e77f5ce1b3a16d0410fb8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 5 Dec 2012 10:40:42 -0500
Subject: [ticket/11162] Newlines to LF.

PHPBB3-11162
---
 phpBB/includes/functions_tricky_update.php | 416 ++++++++++++++---------------
 1 file changed, 208 insertions(+), 208 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_tricky_update.php b/phpBB/includes/functions_tricky_update.php
index cf922d7014..c8fcb9b6f0 100644
--- a/phpBB/includes/functions_tricky_update.php
+++ b/phpBB/includes/functions_tricky_update.php
@@ -1,208 +1,208 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Updates rows in given table from a set of values to a new value.
-* If this results in rows violating uniqueness constraints, the duplicate
-* rows are eliminated.
-*
-* The only supported table is bookmarks.
-*
-* @param dbal $db Database object
-* @param string $table Table on which to perform the update
-* @param string $column Column whose values to change
-* @param array $from_values An array of values that should be changed
-* @param int $to_value The new value
-* @return null
-*/
-function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_values, $to_value)
-{
-	$sql = "SELECT $column, user_id
-		FROM $table
-		WHERE " . $db->sql_in_set($column, $from_values);
-	$result = $db->sql_query($sql);
-
-	$old_user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$old_user_ids[$row[$column]][] = $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	$sql = "SELECT $column, user_id
-		FROM $table
-		WHERE $column = '" . (int) $to_value . "'";
-	$result = $db->sql_query($sql);
-
-	$new_user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$new_user_ids[$row[$column]][] = $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	$queries = array();
-	$any_found = false;
-	foreach ($from_values as $from_value)
-	{
-		if (!isset($old_user_ids[$from_value]))
-		{
-			continue;
-		}
-		$any_found = true;
-		if (empty($new_user_ids))
-		{
-			$sql = "UPDATE $table
-				SET $column = " . (int) $to_value . "
-				WHERE $column = '" . $db->sql_escape($from_value) . "'";
-			$queries[] = $sql;
-		}
-		else
-		{
-			$different_user_ids = array_diff($old_user_ids[$from_value], $new_user_ids[$to_value]);
-			if (!empty($different_user_ids))
-			{
-				$sql = "UPDATE $table
-					SET $column = " . (int) $to_value . "
-					WHERE $column = '" . $db->sql_escape($from_value) . "'
-					AND " . $db->sql_in_set('user_id', $different_user_ids);
-				$queries[] = $sql;
-			}
-		}
-	}
-
-	if ($any_found)
-	{
-		$db->sql_transaction('begin');
-
-		foreach ($queries as $sql)
-		{
-			$db->sql_query($sql);
-		}
-
-		$sql = "DELETE FROM $table
-			WHERE " . $db->sql_in_set($column, $from_values);
-		$db->sql_query($sql);
-
-		$db->sql_transaction('commit');
-	}
-}
-
-/**
-* Updates rows in given table from a set of values to a new value.
-* If this results in rows violating uniqueness constraints, the duplicate
-* rows are merged respecting notify_status (0 takes precedence over 1).
-*
-* The only supported table is topics_watch.
-*
-* @param dbal $db Database object
-* @param string $table Table on which to perform the update
-* @param string $column Column whose values to change
-* @param array $from_values An array of values that should be changed
-* @param int $to_value The new value
-* @return null
-*/
-function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $column, $from_values, $to_value)
-{
-	$sql = "SELECT $column, user_id, notify_status
-		FROM $table
-		WHERE " . $db->sql_in_set($column, $from_values);
-	$result = $db->sql_query($sql);
-
-	$old_user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$old_user_ids[(int) $row['notify_status']][$row[$column]][] = $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	$sql = "SELECT $column, user_id
-		FROM $table
-		WHERE $column = '" . (int) $to_value . "'";
-	$result = $db->sql_query($sql);
-
-	$new_user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$new_user_ids[$row[$column]][] = $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	$queries = array();
-	$any_found = false;
-	$extra_updates = array(
-		0 => 'notify_status = 0',
-		1 => '',
-	);
-	foreach ($from_values as $from_value)
-	{
-		foreach ($extra_updates as $notify_status => $extra_update) {
-			if (!isset($old_user_ids[$notify_status][$from_value]))
-			{
-				continue;
-			}
-			$any_found = true;
-			if (empty($new_user_ids))
-			{
-				$sql = "UPDATE $table
-					SET $column = " . (int) $to_value . "
-					WHERE $column = '" . $db->sql_escape($from_value) . "'";
-				$queries[] = $sql;
-			}
-			else
-			{
-				$different_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $new_user_ids[$to_value]);
-				if (!empty($different_user_ids))
-				{
-					$sql = "UPDATE $table
-						SET $column = " . (int) $to_value . "
-						WHERE $column = '" . $db->sql_escape($from_value) . "'
-						AND " . $db->sql_in_set('user_id', $different_user_ids);
-					$queries[] = $sql;
-				}
-				
-				if ($extra_update) {
-					$same_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $different_user_ids);
-					if (!empty($same_user_ids))
-					{
-						$sql = "UPDATE $table
-							SET $extra_update
-							WHERE $column = '" . (int) $to_value . "'
-							AND " . $db->sql_in_set('user_id', $same_user_ids);
-						$queries[] = $sql;
-					}
-				}
-			}
-		}
-	}
-
-	if ($any_found)
-	{
-		$db->sql_transaction('begin');
-
-		foreach ($queries as $sql)
-		{
-			$db->sql_query($sql);
-		}
-
-		$sql = "DELETE FROM $table
-			WHERE " . $db->sql_in_set($column, $from_values);
-		$db->sql_query($sql);
-
-		$db->sql_transaction('commit');
-	}
-}
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Updates rows in given table from a set of values to a new value.
+* If this results in rows violating uniqueness constraints, the duplicate
+* rows are eliminated.
+*
+* The only supported table is bookmarks.
+*
+* @param dbal $db Database object
+* @param string $table Table on which to perform the update
+* @param string $column Column whose values to change
+* @param array $from_values An array of values that should be changed
+* @param int $to_value The new value
+* @return null
+*/
+function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_values, $to_value)
+{
+	$sql = "SELECT $column, user_id
+		FROM $table
+		WHERE " . $db->sql_in_set($column, $from_values);
+	$result = $db->sql_query($sql);
+
+	$old_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$old_user_ids[$row[$column]][] = $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$sql = "SELECT $column, user_id
+		FROM $table
+		WHERE $column = '" . (int) $to_value . "'";
+	$result = $db->sql_query($sql);
+
+	$new_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$new_user_ids[$row[$column]][] = $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$queries = array();
+	$any_found = false;
+	foreach ($from_values as $from_value)
+	{
+		if (!isset($old_user_ids[$from_value]))
+		{
+			continue;
+		}
+		$any_found = true;
+		if (empty($new_user_ids))
+		{
+			$sql = "UPDATE $table
+				SET $column = " . (int) $to_value . "
+				WHERE $column = '" . $db->sql_escape($from_value) . "'";
+			$queries[] = $sql;
+		}
+		else
+		{
+			$different_user_ids = array_diff($old_user_ids[$from_value], $new_user_ids[$to_value]);
+			if (!empty($different_user_ids))
+			{
+				$sql = "UPDATE $table
+					SET $column = " . (int) $to_value . "
+					WHERE $column = '" . $db->sql_escape($from_value) . "'
+					AND " . $db->sql_in_set('user_id', $different_user_ids);
+				$queries[] = $sql;
+			}
+		}
+	}
+
+	if ($any_found)
+	{
+		$db->sql_transaction('begin');
+
+		foreach ($queries as $sql)
+		{
+			$db->sql_query($sql);
+		}
+
+		$sql = "DELETE FROM $table
+			WHERE " . $db->sql_in_set($column, $from_values);
+		$db->sql_query($sql);
+
+		$db->sql_transaction('commit');
+	}
+}
+
+/**
+* Updates rows in given table from a set of values to a new value.
+* If this results in rows violating uniqueness constraints, the duplicate
+* rows are merged respecting notify_status (0 takes precedence over 1).
+*
+* The only supported table is topics_watch.
+*
+* @param dbal $db Database object
+* @param string $table Table on which to perform the update
+* @param string $column Column whose values to change
+* @param array $from_values An array of values that should be changed
+* @param int $to_value The new value
+* @return null
+*/
+function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $column, $from_values, $to_value)
+{
+	$sql = "SELECT $column, user_id, notify_status
+		FROM $table
+		WHERE " . $db->sql_in_set($column, $from_values);
+	$result = $db->sql_query($sql);
+
+	$old_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$old_user_ids[(int) $row['notify_status']][$row[$column]][] = $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$sql = "SELECT $column, user_id
+		FROM $table
+		WHERE $column = '" . (int) $to_value . "'";
+	$result = $db->sql_query($sql);
+
+	$new_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$new_user_ids[$row[$column]][] = $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$queries = array();
+	$any_found = false;
+	$extra_updates = array(
+		0 => 'notify_status = 0',
+		1 => '',
+	);
+	foreach ($from_values as $from_value)
+	{
+		foreach ($extra_updates as $notify_status => $extra_update) {
+			if (!isset($old_user_ids[$notify_status][$from_value]))
+			{
+				continue;
+			}
+			$any_found = true;
+			if (empty($new_user_ids))
+			{
+				$sql = "UPDATE $table
+					SET $column = " . (int) $to_value . "
+					WHERE $column = '" . $db->sql_escape($from_value) . "'";
+				$queries[] = $sql;
+			}
+			else
+			{
+				$different_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $new_user_ids[$to_value]);
+				if (!empty($different_user_ids))
+				{
+					$sql = "UPDATE $table
+						SET $column = " . (int) $to_value . "
+						WHERE $column = '" . $db->sql_escape($from_value) . "'
+						AND " . $db->sql_in_set('user_id', $different_user_ids);
+					$queries[] = $sql;
+				}
+				
+				if ($extra_update) {
+					$same_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $different_user_ids);
+					if (!empty($same_user_ids))
+					{
+						$sql = "UPDATE $table
+							SET $extra_update
+							WHERE $column = '" . (int) $to_value . "'
+							AND " . $db->sql_in_set('user_id', $same_user_ids);
+						$queries[] = $sql;
+					}
+				}
+			}
+		}
+	}
+
+	if ($any_found)
+	{
+		$db->sql_transaction('begin');
+
+		foreach ($queries as $sql)
+		{
+			$db->sql_query($sql);
+		}
+
+		$sql = "DELETE FROM $table
+			WHERE " . $db->sql_in_set($column, $from_values);
+		$db->sql_query($sql);
+
+		$db->sql_transaction('commit');
+	}
+}
-- 
cgit v1.2.1


From 16966f52d37e4ebdca4f3846c81dfa85b193501e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 5 Dec 2012 10:41:08 -0500
Subject: [ticket/11162] Reformat.

PHPBB3-11162
---
 phpBB/includes/functions_tricky_update.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_tricky_update.php b/phpBB/includes/functions_tricky_update.php
index c8fcb9b6f0..10321618b2 100644
--- a/phpBB/includes/functions_tricky_update.php
+++ b/phpBB/includes/functions_tricky_update.php
@@ -150,7 +150,8 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum
 	);
 	foreach ($from_values as $from_value)
 	{
-		foreach ($extra_updates as $notify_status => $extra_update) {
+		foreach ($extra_updates as $notify_status => $extra_update)
+		{
 			if (!isset($old_user_ids[$notify_status][$from_value]))
 			{
 				continue;
@@ -174,8 +175,9 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum
 						AND " . $db->sql_in_set('user_id', $different_user_ids);
 					$queries[] = $sql;
 				}
-				
-				if ($extra_update) {
+
+				if ($extra_update)
+				{
 					$same_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $different_user_ids);
 					if (!empty($same_user_ids))
 					{
-- 
cgit v1.2.1


From fe87d441eeb54bf5efb56a0f69f42848d9ef53d5 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 5 Dec 2012 10:44:36 -0500
Subject: [ticket/11162] Review comments fixed.

PHPBB3-11162
---
 phpBB/includes/functions_tricky_update.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_tricky_update.php b/phpBB/includes/functions_tricky_update.php
index 10321618b2..05cb65e68d 100644
--- a/phpBB/includes/functions_tricky_update.php
+++ b/phpBB/includes/functions_tricky_update.php
@@ -39,19 +39,19 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
 	$old_user_ids = array();
 	while ($row = $db->sql_fetchrow($result))
 	{
-		$old_user_ids[$row[$column]][] = $row['user_id'];
+		$old_user_ids[$row[$column]][] = (int) $row['user_id'];
 	}
 	$db->sql_freeresult($result);
 
 	$sql = "SELECT $column, user_id
 		FROM $table
-		WHERE $column = '" . (int) $to_value . "'";
+		WHERE $column = " . (int) $to_value;
 	$result = $db->sql_query($sql);
 
 	$new_user_ids = array();
 	while ($row = $db->sql_fetchrow($result))
 	{
-		$new_user_ids[$row[$column]][] = $row['user_id'];
+		$new_user_ids[$row[$column]][] = (int) $row['user_id'];
 	}
 	$db->sql_freeresult($result);
 
@@ -126,19 +126,19 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum
 	$old_user_ids = array();
 	while ($row = $db->sql_fetchrow($result))
 	{
-		$old_user_ids[(int) $row['notify_status']][$row[$column]][] = $row['user_id'];
+		$old_user_ids[(int) $row['notify_status']][$row[$column]][] = (int) $row['user_id'];
 	}
 	$db->sql_freeresult($result);
 
 	$sql = "SELECT $column, user_id
 		FROM $table
-		WHERE $column = '" . (int) $to_value . "'";
+		WHERE $column = " . (int) $to_value;
 	$result = $db->sql_query($sql);
 
 	$new_user_ids = array();
 	while ($row = $db->sql_fetchrow($result))
 	{
-		$new_user_ids[$row[$column]][] = $row['user_id'];
+		$new_user_ids[$row[$column]][] = (int) $row['user_id'];
 	}
 	$db->sql_freeresult($result);
 
-- 
cgit v1.2.1


From f5de11438c471a76fc5c5f3a4b8c4c29d07ed734 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 5 Dec 2012 10:47:26 -0500
Subject: [ticket/11162] Use empty($queries).

PHPBB3-11162
---
 phpBB/includes/functions_tricky_update.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_tricky_update.php b/phpBB/includes/functions_tricky_update.php
index 05cb65e68d..664c246888 100644
--- a/phpBB/includes/functions_tricky_update.php
+++ b/phpBB/includes/functions_tricky_update.php
@@ -56,14 +56,12 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
 	$db->sql_freeresult($result);
 
 	$queries = array();
-	$any_found = false;
 	foreach ($from_values as $from_value)
 	{
 		if (!isset($old_user_ids[$from_value]))
 		{
 			continue;
 		}
-		$any_found = true;
 		if (empty($new_user_ids))
 		{
 			$sql = "UPDATE $table
@@ -85,7 +83,7 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
 		}
 	}
 
-	if ($any_found)
+	if (!empty($queries))
 	{
 		$db->sql_transaction('begin');
 
@@ -143,7 +141,6 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum
 	$db->sql_freeresult($result);
 
 	$queries = array();
-	$any_found = false;
 	$extra_updates = array(
 		0 => 'notify_status = 0',
 		1 => '',
@@ -156,7 +153,6 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum
 			{
 				continue;
 			}
-			$any_found = true;
 			if (empty($new_user_ids))
 			{
 				$sql = "UPDATE $table
@@ -192,7 +188,7 @@ function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $colum
 		}
 	}
 
-	if ($any_found)
+	if (!empty($queries))
 	{
 		$db->sql_transaction('begin');
 
-- 
cgit v1.2.1


From 780a8c98aca5dc54e1b85a79f8ff0f04ce49c5e4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Dec 2012 14:28:52 +0100
Subject: [ticket/10411] Rename template variable CUR_ to CURRENT_

PHPBB3-10411
---
 phpBB/includes/acp/acp_groups.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 3784e5c169..81ae567a8c 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -948,7 +948,7 @@ class acp_groups
 			if ($row['teampage_id'] == $category_id)
 			{
 				$template->assign_vars(array(
-					'CUR_CATEGORY_NAME'		=> $row['teampage_name'],
+					'CURRENT_CATEGORY_NAME'		=> $row['teampage_name'],
 				));
 				continue;
 			}
-- 
cgit v1.2.1


From 83a71a2e777dcc9d1c717b6bf438b9aaf41dffba Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sun, 2 Dec 2012 23:01:29 +0000
Subject: [ticket/11171] Use the options stored to decide how to show it

Added what's needed so that the post in the report is parsed the
same way as it was being parsed when the post was reported

PHPBB3-11171
---
 phpBB/includes/mcp/mcp_reports.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 3426d62cdb..ca730f7728 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -71,7 +71,7 @@ class mcp_reports
 				// closed reports are accessed by report id
 				$report_id = request_var('r', 0);
 
-				$sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, r.reported_post_text, r.reported_post_uid, r.reported_post_bitfield, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour
+				$sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, r.reported_post_text, r.reported_post_uid, r.reported_post_bitfield, r.reported_post_enable_magic_url, r.reported_post_enable_smilies, r.reported_post_enable_bbcode, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour
 					FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . ' u
 					WHERE ' . (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id") . '
 						AND rr.reason_id = r.reason_id
@@ -94,6 +94,10 @@ class mcp_reports
 
 				$post_id = $report['post_id'];
 				$report_id = $report['report_id'];
+				
+				$parse_post_flags = $report['reported_post_enable_bbcode'] ? OPTION_FLAG_BBCODE : 0;
+				$parse_post_flags += $report['reported_post_enable_smilies'] ? OPTION_FLAG_SMILIES : 0;
+				$parse_post_flags += $report['reported_post_enable_magic_url'] ? OPTION_FLAG_LINKS : 0; 
 
 				$post_info = get_post_data(array($post_id), 'm_report', true);
 
@@ -227,7 +231,7 @@ class mcp_reports
 					'REPORTER_NAME'				=> get_username_string('username', $report['user_id'], $report['username'], $report['user_colour']),
 					'U_VIEW_REPORTER_PROFILE'	=> get_username_string('profile', $report['user_id'], $report['username'], $report['user_colour']),
 
-					'POST_PREVIEW'			=> generate_text_for_display($report['reported_post_text'], $report['reported_post_uid'], $report['reported_post_bitfield'], OPTION_FLAG_BBCODE | OPTION_FLAG_SMILIES, false),
+					'POST_PREVIEW'			=> generate_text_for_display($report['reported_post_text'], $report['reported_post_uid'], $report['reported_post_bitfield'], $parse_post_flags, false),
 					'POST_SUBJECT'			=> ($post_info['post_subject']) ? $post_info['post_subject'] : $user->lang['NO_SUBJECT'],
 					'POST_DATE'				=> $user->format_date($post_info['post_time']),
 					'POST_IP'				=> $post_info['poster_ip'],
-- 
cgit v1.2.1


From 73971ef0fa2a53b056847a524bb84f8b2d3e5a4b Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sun, 2 Dec 2012 23:19:59 +0000
Subject: [ticket/11171] Cleanup of leftovers

I didn't notice that there were actually leftovers from the other
PR. Anyway, this will remove all the leftovers I noticed from the
other PR.

PHPBB3-11171
---
 phpBB/includes/mcp/mcp_reports.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index ca730f7728..8da303f6e3 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -140,18 +140,7 @@ class mcp_reports
 
 				$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;
 
-				// Process message, leave it uncensored
-				$message = $post_info['post_text'];
 
-				if ($post_info['bbcode_bitfield'])
-				{
-					include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
-					$bbcode = new bbcode($post_info['bbcode_bitfield']);
-					$bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']);
-				}
-
-				$message = bbcode_nl2br($message);
-				$message = smiley_text($message);
 				$report['report_text'] = make_clickable(bbcode_nl2br($report['report_text']));
 
 				if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
@@ -172,7 +161,7 @@ class mcp_reports
 					if (sizeof($attachments))
 					{
 						$update_count = array();
-						parse_attachments($post_info['forum_id'], $message, $attachments, $update_count);
+						parse_attachments($post_info['forum_id'], $report['reported_post_text'], $attachments, $update_count);
 					}
 
 					// Display not already displayed Attachments for this post, we already parsed them. ;)
-- 
cgit v1.2.1


From 5213ee1829c0ca4689d6137ac011cc759a727c59 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 7 Dec 2012 14:39:57 +0100
Subject: [ticket/10714] Make attributed protected rather then private

PHPBB3-10714
---
 phpBB/includes/log/log.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index eff084bbd2..b6f275835c 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -25,22 +25,22 @@ class phpbb_log implements phpbb_log_interface
 	/**
 	* Keeps the status of the log system. Is the log enabled or disabled?
 	*/
-	private $disabled_logs;
+	protected $disabled_logs;
 
 	/**
 	* Keeps the total log count of the last call to get_logs()
 	*/
-	private $logs_total;
+	protected $logs_total;
 
 	/**
 	* Keeps the offset of the last valid page of the last call to get_logs()
 	*/
-	private $logs_offset;
+	protected $logs_offset;
 
 	/**
 	* The table we use to store our logs.
 	*/
-	private $log_table;
+	protected $log_table;
 
 	/**
 	* Constructor
-- 
cgit v1.2.1


From 70d23380aa55c2aab33c1c2e5cea57f186314584 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 7 Dec 2012 15:11:56 +0100
Subject: [ticket/10714] Rely on global instead of creating an instance

PHPBB3-10714
---
 phpBB/includes/functions.php       | 6 ------
 phpBB/includes/functions_admin.php | 6 ------
 2 files changed, 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 93dfb4cd7f..7c1a48f913 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3367,12 +3367,6 @@ function add_log()
 		return false;
 	}
 
-	// no log class set, create a temporary one ourselves to keep backwards compatibility
-	if ($phpbb_log === null)
-	{
-		$phpbb_log = new phpbb_log(LOG_TABLE);
-	}
-
 	$mode = array_shift($args);
 
 	// This looks kind of dirty, but add_log has some additional data before the log_operation
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 2a87feed51..8a1f34e76d 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2490,12 +2490,6 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 {
 	global $phpbb_log;
 
-	// no log class set, create a temporary one ourselves to keep backwards compatability
-	if ($phpbb_log === null)
-	{
-		$phpbb_log = new phpbb_log(LOG_TABLE);
-	}
-
 	$count_logs = ($log_count !== false);
 
 	$log = $phpbb_log->get_logs($mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $limit_days, $sort_by, $keywords);
-- 
cgit v1.2.1


From 7f1b0eeb711c57de82235d7893d793969ed0cfdd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 7 Dec 2012 16:28:46 +0100
Subject: [ticket/10714] Compare log_type to false, rather then null

PHPBB3-10714
---
 phpBB/includes/log/log.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index b6f275835c..c2ebedd6f2 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -278,14 +278,14 @@ class phpbb_log implements phpbb_log_interface
 			break;
 
 			default:
-				$log_type = null;
+				$log_type = false;
 				$sql_additional = '';
 		}
 
 		/**
 		* Overwrite log type and limitations before we count and get the logs
 		*
-		* NOTE: if log_type is not set, no entries will be returned.
+		* NOTE: if log_type is false, no entries will be returned.
 		*
 		* @event core.get_logs_modify_type
 		* @var	string	mode		Mode of the entries we display
@@ -302,7 +302,7 @@ class phpbb_log implements phpbb_log_interface
 		*							keywords in log_operation or log_data
 		* @var	string	profile_url	URL to the users profile
 		* @var	int		log_type	Limit logs to a certain type. If log_type
-		*							is not set, no entries will be returned.
+		*							is false, no entries will be returned.
 		* @var	string	sql_additional	Additional conditions for the entries,
 		*								e.g.: 'AND l.forum_id = 1'
 		* @since 3.1-A1
@@ -310,7 +310,7 @@ class phpbb_log implements phpbb_log_interface
 		$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
 		extract($phpbb_dispatcher->trigger_event('core.get_logs_modify_type', $vars));
 
-		if (!isset($log_type))
+		if ($log_type === false)
 		{
 			$this->logs_offset = 0;
 			return array();
-- 
cgit v1.2.1


From 03d2c6413c25b1faf7f37ff20625ce986b19eb88 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 7 Dec 2012 21:57:33 -0500
Subject: [ticket/11248] Convert line endings to LF - develop edition.

PHPBB3-11248
---
 phpBB/includes/sphinxapi.php | 3424 +++++++++++++++++++++---------------------
 1 file changed, 1712 insertions(+), 1712 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/sphinxapi.php b/phpBB/includes/sphinxapi.php
index bd83b1d2e0..6c3b66710c 100644
--- a/phpBB/includes/sphinxapi.php
+++ b/phpBB/includes/sphinxapi.php
@@ -1,1712 +1,1712 @@
-<?php
-
-//
-// $Id: sphinxapi.php 3087 2012-01-30 23:07:35Z shodan $
-//
-
-//
-// Copyright (c) 2001-2012, Andrew Aksyonoff
-// Copyright (c) 2008-2012, Sphinx Technologies Inc
-// All rights reserved
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License. You should have
-// received a copy of the GPL license along with this program; if you
-// did not, you can find it at http://www.gnu.org/
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// PHP version of Sphinx searchd client (PHP API)
-/////////////////////////////////////////////////////////////////////////////
-
-/// known searchd commands
-define ( "SEARCHD_COMMAND_SEARCH",		0 );
-define ( "SEARCHD_COMMAND_EXCERPT",		1 );
-define ( "SEARCHD_COMMAND_UPDATE",		2 );
-define ( "SEARCHD_COMMAND_KEYWORDS",	3 );
-define ( "SEARCHD_COMMAND_PERSIST",		4 );
-define ( "SEARCHD_COMMAND_STATUS",		5 );
-define ( "SEARCHD_COMMAND_FLUSHATTRS",	7 );
-
-/// current client-side command implementation versions
-define ( "VER_COMMAND_SEARCH",		0x119 );
-define ( "VER_COMMAND_EXCERPT",		0x104 );
-define ( "VER_COMMAND_UPDATE",		0x102 );
-define ( "VER_COMMAND_KEYWORDS",	0x100 );
-define ( "VER_COMMAND_STATUS",		0x100 );
-define ( "VER_COMMAND_QUERY",		0x100 );
-define ( "VER_COMMAND_FLUSHATTRS",	0x100 );
-
-/// known searchd status codes
-define ( "SEARCHD_OK",				0 );
-define ( "SEARCHD_ERROR",			1 );
-define ( "SEARCHD_RETRY",			2 );
-define ( "SEARCHD_WARNING",			3 );
-
-/// known match modes
-define ( "SPH_MATCH_ALL",			0 );
-define ( "SPH_MATCH_ANY",			1 );
-define ( "SPH_MATCH_PHRASE",		2 );
-define ( "SPH_MATCH_BOOLEAN",		3 );
-define ( "SPH_MATCH_EXTENDED",		4 );
-define ( "SPH_MATCH_FULLSCAN",		5 );
-define ( "SPH_MATCH_EXTENDED2",		6 );	// extended engine V2 (TEMPORARY, WILL BE REMOVED)
-
-/// known ranking modes (ext2 only)
-define ( "SPH_RANK_PROXIMITY_BM25",	0 );	///< default mode, phrase proximity major factor and BM25 minor one
-define ( "SPH_RANK_BM25",			1 );	///< statistical mode, BM25 ranking only (faster but worse quality)
-define ( "SPH_RANK_NONE",			2 );	///< no ranking, all matches get a weight of 1
-define ( "SPH_RANK_WORDCOUNT",		3 );	///< simple word-count weighting, rank is a weighted sum of per-field keyword occurence counts
-define ( "SPH_RANK_PROXIMITY",		4 );
-define ( "SPH_RANK_MATCHANY",		5 );
-define ( "SPH_RANK_FIELDMASK",		6 );
-define ( "SPH_RANK_SPH04",			7 );
-define ( "SPH_RANK_EXPR",			8 );
-define ( "SPH_RANK_TOTAL",			9 );
-
-/// known sort modes
-define ( "SPH_SORT_RELEVANCE",		0 );
-define ( "SPH_SORT_ATTR_DESC",		1 );
-define ( "SPH_SORT_ATTR_ASC",		2 );
-define ( "SPH_SORT_TIME_SEGMENTS", 	3 );
-define ( "SPH_SORT_EXTENDED", 		4 );
-define ( "SPH_SORT_EXPR", 			5 );
-
-/// known filter types
-define ( "SPH_FILTER_VALUES",		0 );
-define ( "SPH_FILTER_RANGE",		1 );
-define ( "SPH_FILTER_FLOATRANGE",	2 );
-
-/// known attribute types
-define ( "SPH_ATTR_INTEGER",		1 );
-define ( "SPH_ATTR_TIMESTAMP",		2 );
-define ( "SPH_ATTR_ORDINAL",		3 );
-define ( "SPH_ATTR_BOOL",			4 );
-define ( "SPH_ATTR_FLOAT",			5 );
-define ( "SPH_ATTR_BIGINT",			6 );
-define ( "SPH_ATTR_STRING",			7 );
-define ( "SPH_ATTR_MULTI",			0x40000001 );
-define ( "SPH_ATTR_MULTI64",			0x40000002 );
-
-/// known grouping functions
-define ( "SPH_GROUPBY_DAY",			0 );
-define ( "SPH_GROUPBY_WEEK",		1 );
-define ( "SPH_GROUPBY_MONTH",		2 );
-define ( "SPH_GROUPBY_YEAR",		3 );
-define ( "SPH_GROUPBY_ATTR",		4 );
-define ( "SPH_GROUPBY_ATTRPAIR",	5 );
-
-// important properties of PHP's integers:
-//  - always signed (one bit short of PHP_INT_SIZE)
-//  - conversion from string to int is saturated
-//  - float is double
-//  - div converts arguments to floats
-//  - mod converts arguments to ints
-
-// the packing code below works as follows:
-//  - when we got an int, just pack it
-//    if performance is a problem, this is the branch users should aim for
-//
-//  - otherwise, we got a number in string form
-//    this might be due to different reasons, but we assume that this is
-//    because it didn't fit into PHP int
-//
-//  - factor the string into high and low ints for packing
-//    - if we have bcmath, then it is used
-//    - if we don't, we have to do it manually (this is the fun part)
-//
-//    - x64 branch does factoring using ints
-//    - x32 (ab)uses floats, since we can't fit unsigned 32-bit number into an int
-//
-// unpacking routines are pretty much the same.
-//  - return ints if we can
-//  - otherwise format number into a string
-
-/// pack 64-bit signed
-function sphPackI64 ( $v )
-{
-	assert ( is_numeric($v) );
-	
-	// x64
-	if ( PHP_INT_SIZE>=8 )
-	{
-		$v = (int)$v;
-		return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
-	}
-
-	// x32, int
-	if ( is_int($v) )
-		return pack ( "NN", $v < 0 ? -1 : 0, $v );
-
-	// x32, bcmath	
-	if ( function_exists("bcmul") )
-	{
-		if ( bccomp ( $v, 0 ) == -1 )
-			$v = bcadd ( "18446744073709551616", $v );
-		$h = bcdiv ( $v, "4294967296", 0 );
-		$l = bcmod ( $v, "4294967296" );
-		return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
-	}
-
-	// x32, no-bcmath
-	$p = max(0, strlen($v) - 13);
-	$lo = abs((float)substr($v, $p));
-	$hi = abs((float)substr($v, 0, $p));
-
-	$m = $lo + $hi*1316134912.0; // (10 ^ 13) % (1 << 32) = 1316134912
-	$q = floor($m/4294967296.0);
-	$l = $m - ($q*4294967296.0);
-	$h = $hi*2328.0 + $q; // (10 ^ 13) / (1 << 32) = 2328
-
-	if ( $v<0 )
-	{
-		if ( $l==0 )
-			$h = 4294967296.0 - $h;
-		else
-		{
-			$h = 4294967295.0 - $h;
-			$l = 4294967296.0 - $l;
-		}
-	}
-	return pack ( "NN", $h, $l );
-}
-
-/// pack 64-bit unsigned
-function sphPackU64 ( $v )
-{
-	assert ( is_numeric($v) );
-	
-	// x64
-	if ( PHP_INT_SIZE>=8 )
-	{
-		assert ( $v>=0 );
-		
-		// x64, int
-		if ( is_int($v) )
-			return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
-						  
-		// x64, bcmath
-		if ( function_exists("bcmul") )
-		{
-			$h = bcdiv ( $v, 4294967296, 0 );
-			$l = bcmod ( $v, 4294967296 );
-			return pack ( "NN", $h, $l );
-		}
-		
-		// x64, no-bcmath
-		$p = max ( 0, strlen($v) - 13 );
-		$lo = (int)substr ( $v, $p );
-		$hi = (int)substr ( $v, 0, $p );
-	
-		$m = $lo + $hi*1316134912;
-		$l = $m % 4294967296;
-		$h = $hi*2328 + (int)($m/4294967296);
-
-		return pack ( "NN", $h, $l );
-	}
-
-	// x32, int
-	if ( is_int($v) )
-		return pack ( "NN", 0, $v );
-	
-	// x32, bcmath
-	if ( function_exists("bcmul") )
-	{
-		$h = bcdiv ( $v, "4294967296", 0 );
-		$l = bcmod ( $v, "4294967296" );
-		return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
-	}
-
-	// x32, no-bcmath
-	$p = max(0, strlen($v) - 13);
-	$lo = (float)substr($v, $p);
-	$hi = (float)substr($v, 0, $p);
-	
-	$m = $lo + $hi*1316134912.0;
-	$q = floor($m / 4294967296.0);
-	$l = $m - ($q * 4294967296.0);
-	$h = $hi*2328.0 + $q;
-
-	return pack ( "NN", $h, $l );
-}
-
-// unpack 64-bit unsigned
-function sphUnpackU64 ( $v )
-{
-	list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
-
-	if ( PHP_INT_SIZE>=8 )
-	{
-		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-		if ( $lo<0 ) $lo += (1<<32);
-
-		// x64, int
-		if ( $hi<=2147483647 )
-			return ($hi<<32) + $lo;
-
-		// x64, bcmath
-		if ( function_exists("bcmul") )
-			return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
-
-		// x64, no-bcmath
-		$C = 100000;
-		$h = ((int)($hi / $C) << 32) + (int)($lo / $C);
-		$l = (($hi % $C) << 32) + ($lo % $C);
-		if ( $l>$C )
-		{
-			$h += (int)($l / $C);
-			$l  = $l % $C;
-		}
-
-		if ( $h==0 )
-			return $l;
-		return sprintf ( "%d%05d", $h, $l );
-	}
-
-	// x32, int
-	if ( $hi==0 )
-	{
-		if ( $lo>0 )
-			return $lo;
-		return sprintf ( "%u", $lo );
-	}
-
-	$hi = sprintf ( "%u", $hi );
-	$lo = sprintf ( "%u", $lo );
-
-	// x32, bcmath
-	if ( function_exists("bcmul") )
-		return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
-	
-	// x32, no-bcmath
-	$hi = (float)$hi;
-	$lo = (float)$lo;
-	
-	$q = floor($hi/10000000.0);
-	$r = $hi - $q*10000000.0;
-	$m = $lo + $r*4967296.0;
-	$mq = floor($m/10000000.0);
-	$l = $m - $mq*10000000.0;
-	$h = $q*4294967296.0 + $r*429.0 + $mq;
-
-	$h = sprintf ( "%.0f", $h );
-	$l = sprintf ( "%07.0f", $l );
-	if ( $h=="0" )
-		return sprintf( "%.0f", (float)$l );
-	return $h . $l;
-}
-
-// unpack 64-bit signed
-function sphUnpackI64 ( $v )
-{
-	list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
-
-	// x64
-	if ( PHP_INT_SIZE>=8 )
-	{
-		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
-		if ( $lo<0 ) $lo += (1<<32);
-
-		return ($hi<<32) + $lo;
-	}
-
-	// x32, int
-	if ( $hi==0 )
-	{
-		if ( $lo>0 )
-			return $lo;
-		return sprintf ( "%u", $lo );
-	}
-	// x32, int
-	elseif ( $hi==-1 )
-	{
-		if ( $lo<0 )
-			return $lo;
-		return sprintf ( "%.0f", $lo - 4294967296.0 );
-	}
-	
-	$neg = "";
-	$c = 0;
-	if ( $hi<0 )
-	{
-		$hi = ~$hi;
-		$lo = ~$lo;
-		$c = 1;
-		$neg = "-";
-	}	
-
-	$hi = sprintf ( "%u", $hi );
-	$lo = sprintf ( "%u", $lo );
-
-	// x32, bcmath
-	if ( function_exists("bcmul") )
-		return $neg . bcadd ( bcadd ( $lo, bcmul ( $hi, "4294967296" ) ), $c );
-
-	// x32, no-bcmath
-	$hi = (float)$hi;
-	$lo = (float)$lo;
-	
-	$q = floor($hi/10000000.0);
-	$r = $hi - $q*10000000.0;
-	$m = $lo + $r*4967296.0;
-	$mq = floor($m/10000000.0);
-	$l = $m - $mq*10000000.0 + $c;
-	$h = $q*4294967296.0 + $r*429.0 + $mq;
-	if ( $l==10000000 )
-	{
-		$l = 0;
-		$h += 1;
-	}
-
-	$h = sprintf ( "%.0f", $h );
-	$l = sprintf ( "%07.0f", $l );
-	if ( $h=="0" )
-		return $neg . sprintf( "%.0f", (float)$l );
-	return $neg . $h . $l;
-}
-
-
-function sphFixUint ( $value )
-{
-	if ( PHP_INT_SIZE>=8 )
-	{
-		// x64 route, workaround broken unpack() in 5.2.2+
-		if ( $value<0 ) $value += (1<<32);
-		return $value;
-	}
-	else
-	{
-		// x32 route, workaround php signed/unsigned braindamage
-		return sprintf ( "%u", $value );
-	}
-}
-
-
-/// sphinx searchd client class
-class SphinxClient
-{
-	var $_host;			///< searchd host (default is "localhost")
-	var $_port;			///< searchd port (default is 9312)
-	var $_offset;		///< how many records to seek from result-set start (default is 0)
-	var $_limit;		///< how many records to return from result-set starting at offset (default is 20)
-	var $_mode;			///< query matching mode (default is SPH_MATCH_ALL)
-	var $_weights;		///< per-field weights (default is 1 for all fields)
-	var $_sort;			///< match sorting mode (default is SPH_SORT_RELEVANCE)
-	var $_sortby;		///< attribute to sort by (defualt is "")
-	var $_min_id;		///< min ID to match (default is 0, which means no limit)
-	var $_max_id;		///< max ID to match (default is 0, which means no limit)
-	var $_filters;		///< search filters
-	var $_groupby;		///< group-by attribute name
-	var $_groupfunc;	///< group-by function (to pre-process group-by attribute value with)
-	var $_groupsort;	///< group-by sorting clause (to sort groups in result set with)
-	var $_groupdistinct;///< group-by count-distinct attribute
-	var $_maxmatches;	///< max matches to retrieve
-	var $_cutoff;		///< cutoff to stop searching at (default is 0)
-	var $_retrycount;	///< distributed retries count
-	var $_retrydelay;	///< distributed retries delay
-	var $_anchor;		///< geographical anchor point
-	var $_indexweights;	///< per-index weights
-	var $_ranker;		///< ranking mode (default is SPH_RANK_PROXIMITY_BM25)
-	var $_rankexpr;		///< ranking mode expression (for SPH_RANK_EXPR)
-	var $_maxquerytime;	///< max query time, milliseconds (default is 0, do not limit)
-	var $_fieldweights;	///< per-field-name weights
-	var $_overrides;	///< per-query attribute values overrides
-	var $_select;		///< select-list (attributes or expressions, with optional aliases)
-
-	var $_error;		///< last error message
-	var $_warning;		///< last warning message
-	var $_connerror;		///< connection error vs remote error flag
-
-	var $_reqs;			///< requests array for multi-query
-	var $_mbenc;		///< stored mbstring encoding
-	var $_arrayresult;	///< whether $result["matches"] should be a hash or an array
-	var $_timeout;		///< connect timeout
-
-	/////////////////////////////////////////////////////////////////////////////
-	// common stuff
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// create a new client object and fill defaults
-	function SphinxClient ()
-	{
-		// per-client-object settings
-		$this->_host		= "localhost";
-		$this->_port		= 9312;
-		$this->_path		= false;
-		$this->_socket		= false;
-
-		// per-query settings
-		$this->_offset		= 0;
-		$this->_limit		= 20;
-		$this->_mode		= SPH_MATCH_ALL;
-		$this->_weights		= array ();
-		$this->_sort		= SPH_SORT_RELEVANCE;
-		$this->_sortby		= "";
-		$this->_min_id		= 0;
-		$this->_max_id		= 0;
-		$this->_filters		= array ();
-		$this->_groupby		= "";
-		$this->_groupfunc	= SPH_GROUPBY_DAY;
-		$this->_groupsort	= "@group desc";
-		$this->_groupdistinct= "";
-		$this->_maxmatches	= 1000;
-		$this->_cutoff		= 0;
-		$this->_retrycount	= 0;
-		$this->_retrydelay	= 0;
-		$this->_anchor		= array ();
-		$this->_indexweights= array ();
-		$this->_ranker		= SPH_RANK_PROXIMITY_BM25;
-		$this->_rankexpr	= "";
-		$this->_maxquerytime= 0;
-		$this->_fieldweights= array();
-		$this->_overrides 	= array();
-		$this->_select		= "*";
-
-		$this->_error		= ""; // per-reply fields (for single-query case)
-		$this->_warning		= "";
-		$this->_connerror	= false;
-
-		$this->_reqs		= array ();	// requests storage (for multi-query case)
-		$this->_mbenc		= "";
-		$this->_arrayresult	= false;
-		$this->_timeout		= 0;
-	}
-
-	function __destruct()
-	{
-		if ( $this->_socket !== false )
-			fclose ( $this->_socket );
-	}
-
-	/// get last error message (string)
-	function GetLastError ()
-	{
-		return $this->_error;
-	}
-
-	/// get last warning message (string)
-	function GetLastWarning ()
-	{
-		return $this->_warning;
-	}
-
-	/// get last error flag (to tell network connection errors from searchd errors or broken responses)
-	function IsConnectError()
-	{
-		return $this->_connerror;
-	}
-
-	/// set searchd host name (string) and port (integer)
-	function SetServer ( $host, $port = 0 )
-	{
-		assert ( is_string($host) );
-		if ( $host[0] == '/')
-		{
-			$this->_path = 'unix://' . $host;
-			return;
-		}
-		if ( substr ( $host, 0, 7 )=="unix://" )
-		{
-			$this->_path = $host;
-			return;
-		}
-				
-		assert ( is_int($port) );
-		$this->_host = $host;
-		$this->_port = $port;
-		$this->_path = '';
-
-	}
-
-	/// set server connection timeout (0 to remove)
-	function SetConnectTimeout ( $timeout )
-	{
-		assert ( is_numeric($timeout) );
-		$this->_timeout = $timeout;
-	}
-
-
-	function _Send ( $handle, $data, $length )
-	{
-		if ( feof($handle) || fwrite ( $handle, $data, $length ) !== $length )
-		{
-			$this->_error = 'connection unexpectedly closed (timed out?)';
-			$this->_connerror = true;
-			return false;
-		}
-		return true;
-	}
-
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// enter mbstring workaround mode
-	function _MBPush ()
-	{
-		$this->_mbenc = "";
-		if ( ini_get ( "mbstring.func_overload" ) & 2 )
-		{
-			$this->_mbenc = mb_internal_encoding();
-			mb_internal_encoding ( "latin1" );
-		}
-    }
-
-	/// leave mbstring workaround mode
-	function _MBPop ()
-	{
-		if ( $this->_mbenc )
-			mb_internal_encoding ( $this->_mbenc );
-	}
-
-	/// connect to searchd server
-	function _Connect ()
-	{
-		if ( $this->_socket!==false )
-		{
-			// we are in persistent connection mode, so we have a socket
-			// however, need to check whether it's still alive
-			if ( !@feof ( $this->_socket ) )
-				return $this->_socket;
-
-			// force reopen
-			$this->_socket = false;
-		}
-
-		$errno = 0;
-		$errstr = "";
-		$this->_connerror = false;
-
-		if ( $this->_path )
-		{
-			$host = $this->_path;
-			$port = 0;
-		}
-		else
-		{
-			$host = $this->_host;
-			$port = $this->_port;
-		}
-
-		if ( $this->_timeout<=0 )
-			$fp = @fsockopen ( $host, $port, $errno, $errstr );
-		else
-			$fp = @fsockopen ( $host, $port, $errno, $errstr, $this->_timeout );
-		
-		if ( !$fp )
-		{
-			if ( $this->_path )
-				$location = $this->_path;
-			else
-				$location = "{$this->_host}:{$this->_port}";
-			
-			$errstr = trim ( $errstr );
-			$this->_error = "connection to $location failed (errno=$errno, msg=$errstr)";
-			$this->_connerror = true;
-			return false;
-		}
-
-		// send my version
-		// this is a subtle part. we must do it before (!) reading back from searchd.
-		// because otherwise under some conditions (reported on FreeBSD for instance)
-		// TCP stack could throttle write-write-read pattern because of Nagle.
-		if ( !$this->_Send ( $fp, pack ( "N", 1 ), 4 ) )
-		{
-			fclose ( $fp );
-			$this->_error = "failed to send client protocol version";
-			return false;
-		}
-
-		// check version
-		list(,$v) = unpack ( "N*", fread ( $fp, 4 ) );
-		$v = (int)$v;
-		if ( $v<1 )
-		{
-			fclose ( $fp );
-			$this->_error = "expected searchd protocol version 1+, got version '$v'";
-			return false;
-		}
-
-		return $fp;
-	}
-
-	/// get and check response packet from searchd server
-	function _GetResponse ( $fp, $client_ver )
-	{
-		$response = "";
-		$len = 0;
-
-		$header = fread ( $fp, 8 );
-		if ( strlen($header)==8 )
-		{
-			list ( $status, $ver, $len ) = array_values ( unpack ( "n2a/Nb", $header ) );
-			$left = $len;
-			while ( $left>0 && !feof($fp) )
-			{
-				$chunk = fread ( $fp, min ( 8192, $left ) );
-				if ( $chunk )
-				{
-					$response .= $chunk;
-					$left -= strlen($chunk);
-				}
-			}
-		}
-		if ( $this->_socket === false )
-			fclose ( $fp );
-
-		// check response
-		$read = strlen ( $response );
-		if ( !$response || $read!=$len )
-		{
-			$this->_error = $len
-				? "failed to read searchd response (status=$status, ver=$ver, len=$len, read=$read)"
-				: "received zero-sized searchd response";
-			return false;
-		}
-
-		// check status
-		if ( $status==SEARCHD_WARNING )
-		{
-			list(,$wlen) = unpack ( "N*", substr ( $response, 0, 4 ) );
-			$this->_warning = substr ( $response, 4, $wlen );
-			return substr ( $response, 4+$wlen );
-		}
-		if ( $status==SEARCHD_ERROR )
-		{
-			$this->_error = "searchd error: " . substr ( $response, 4 );
-			return false;
-		}
-		if ( $status==SEARCHD_RETRY )
-		{
-			$this->_error = "temporary searchd error: " . substr ( $response, 4 );
-			return false;
-		}
-		if ( $status!=SEARCHD_OK )
-		{
-			$this->_error = "unknown status code '$status'";
-			return false;
-		}
-
-		// check version
-		if ( $ver<$client_ver )
-		{
-			$this->_warning = sprintf ( "searchd command v.%d.%d older than client's v.%d.%d, some options might not work",
-				$ver>>8, $ver&0xff, $client_ver>>8, $client_ver&0xff );
-		}
-
-		return $response;
-	}
-
-	/////////////////////////////////////////////////////////////////////////////
-	// searching
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// set offset and count into result set,
-	/// and optionally set max-matches and cutoff limits
-	function SetLimits ( $offset, $limit, $max=0, $cutoff=0 )
-	{
-		assert ( is_int($offset) );
-		assert ( is_int($limit) );
-		assert ( $offset>=0 );
-		assert ( $limit>0 );
-		assert ( $max>=0 );
-		$this->_offset = $offset;
-		$this->_limit = $limit;
-		if ( $max>0 )
-			$this->_maxmatches = $max;
-		if ( $cutoff>0 )
-			$this->_cutoff = $cutoff;
-	}
-
-	/// set maximum query time, in milliseconds, per-index
-	/// integer, 0 means "do not limit"
-	function SetMaxQueryTime ( $max )
-	{
-		assert ( is_int($max) );
-		assert ( $max>=0 );
-		$this->_maxquerytime = $max;
-	}
-
-	/// set matching mode
-	function SetMatchMode ( $mode )
-	{
-		assert ( $mode==SPH_MATCH_ALL
-			|| $mode==SPH_MATCH_ANY
-			|| $mode==SPH_MATCH_PHRASE
-			|| $mode==SPH_MATCH_BOOLEAN
-			|| $mode==SPH_MATCH_EXTENDED
-			|| $mode==SPH_MATCH_FULLSCAN
-			|| $mode==SPH_MATCH_EXTENDED2 );
-		$this->_mode = $mode;
-	}
-
-	/// set ranking mode
-	function SetRankingMode ( $ranker, $rankexpr="" )
-	{
-		assert ( $ranker>=0 && $ranker<SPH_RANK_TOTAL );
-		assert ( is_string($rankexpr) );
-		$this->_ranker = $ranker;
-		$this->_rankexpr = $rankexpr;
-	}
-
-	/// set matches sorting mode
-	function SetSortMode ( $mode, $sortby="" )
-	{
-		assert (
-			$mode==SPH_SORT_RELEVANCE ||
-			$mode==SPH_SORT_ATTR_DESC ||
-			$mode==SPH_SORT_ATTR_ASC ||
-			$mode==SPH_SORT_TIME_SEGMENTS ||
-			$mode==SPH_SORT_EXTENDED ||
-			$mode==SPH_SORT_EXPR );
-		assert ( is_string($sortby) );
-		assert ( $mode==SPH_SORT_RELEVANCE || strlen($sortby)>0 );
-
-		$this->_sort = $mode;
-		$this->_sortby = $sortby;
-	}
-
-	/// bind per-field weights by order
-	/// DEPRECATED; use SetFieldWeights() instead
-	function SetWeights ( $weights )
-	{
-		assert ( is_array($weights) );
-		foreach ( $weights as $weight )
-			assert ( is_int($weight) );
-
-		$this->_weights = $weights;
-	}
-
-	/// bind per-field weights by name
-	function SetFieldWeights ( $weights )
-	{
-		assert ( is_array($weights) );
-		foreach ( $weights as $name=>$weight )
-		{
-			assert ( is_string($name) );
-			assert ( is_int($weight) );
-		}
-		$this->_fieldweights = $weights;
-	}
-
-	/// bind per-index weights by name
-	function SetIndexWeights ( $weights )
-	{
-		assert ( is_array($weights) );
-		foreach ( $weights as $index=>$weight )
-		{
-			assert ( is_string($index) );
-			assert ( is_int($weight) );
-		}
-		$this->_indexweights = $weights;
-	}
-
-	/// set IDs range to match
-	/// only match records if document ID is beetwen $min and $max (inclusive)
-	function SetIDRange ( $min, $max )
-	{
-		assert ( is_numeric($min) );
-		assert ( is_numeric($max) );
-		assert ( $min<=$max );
-		$this->_min_id = $min;
-		$this->_max_id = $max;
-	}
-
-	/// set values set filter
-	/// only match records where $attribute value is in given set
-	function SetFilter ( $attribute, $values, $exclude=false )
-	{
-		assert ( is_string($attribute) );
-		assert ( is_array($values) );
-		assert ( count($values) );
-
-		if ( is_array($values) && count($values) )
-		{
-			foreach ( $values as $value )
-				assert ( is_numeric($value) );
-
-			$this->_filters[] = array ( "type"=>SPH_FILTER_VALUES, "attr"=>$attribute, "exclude"=>$exclude, "values"=>$values );
-		}
-	}
-
-	/// set range filter
-	/// only match records if $attribute value is beetwen $min and $max (inclusive)
-	function SetFilterRange ( $attribute, $min, $max, $exclude=false )
-	{
-		assert ( is_string($attribute) );
-		assert ( is_numeric($min) );
-		assert ( is_numeric($max) );
-		assert ( $min<=$max );
-
-		$this->_filters[] = array ( "type"=>SPH_FILTER_RANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max );
-	}
-
-	/// set float range filter
-	/// only match records if $attribute value is beetwen $min and $max (inclusive)
-	function SetFilterFloatRange ( $attribute, $min, $max, $exclude=false )
-	{
-		assert ( is_string($attribute) );
-		assert ( is_float($min) );
-		assert ( is_float($max) );
-		assert ( $min<=$max );
-
-		$this->_filters[] = array ( "type"=>SPH_FILTER_FLOATRANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max );
-	}
-
-	/// setup anchor point for geosphere distance calculations
-	/// required to use @geodist in filters and sorting
-	/// latitude and longitude must be in radians
-	function SetGeoAnchor ( $attrlat, $attrlong, $lat, $long )
-	{
-		assert ( is_string($attrlat) );
-		assert ( is_string($attrlong) );
-		assert ( is_float($lat) );
-		assert ( is_float($long) );
-
-		$this->_anchor = array ( "attrlat"=>$attrlat, "attrlong"=>$attrlong, "lat"=>$lat, "long"=>$long );
-	}
-
-	/// set grouping attribute and function
-	function SetGroupBy ( $attribute, $func, $groupsort="@group desc" )
-	{
-		assert ( is_string($attribute) );
-		assert ( is_string($groupsort) );
-		assert ( $func==SPH_GROUPBY_DAY
-			|| $func==SPH_GROUPBY_WEEK
-			|| $func==SPH_GROUPBY_MONTH
-			|| $func==SPH_GROUPBY_YEAR
-			|| $func==SPH_GROUPBY_ATTR
-			|| $func==SPH_GROUPBY_ATTRPAIR );
-
-		$this->_groupby = $attribute;
-		$this->_groupfunc = $func;
-		$this->_groupsort = $groupsort;
-	}
-
-	/// set count-distinct attribute for group-by queries
-	function SetGroupDistinct ( $attribute )
-	{
-		assert ( is_string($attribute) );
-		$this->_groupdistinct = $attribute;
-	}
-
-	/// set distributed retries count and delay
-	function SetRetries ( $count, $delay=0 )
-	{
-		assert ( is_int($count) && $count>=0 );
-		assert ( is_int($delay) && $delay>=0 );
-		$this->_retrycount = $count;
-		$this->_retrydelay = $delay;
-	}
-
-	/// set result set format (hash or array; hash by default)
-	/// PHP specific; needed for group-by-MVA result sets that may contain duplicate IDs
-	function SetArrayResult ( $arrayresult )
-	{
-		assert ( is_bool($arrayresult) );
-		$this->_arrayresult = $arrayresult;
-	}
-
-	/// set attribute values override
-	/// there can be only one override per attribute
-	/// $values must be a hash that maps document IDs to attribute values
-	function SetOverride ( $attrname, $attrtype, $values )
-	{
-		assert ( is_string ( $attrname ) );
-		assert ( in_array ( $attrtype, array ( SPH_ATTR_INTEGER, SPH_ATTR_TIMESTAMP, SPH_ATTR_BOOL, SPH_ATTR_FLOAT, SPH_ATTR_BIGINT ) ) );
-		assert ( is_array ( $values ) );
-
-		$this->_overrides[$attrname] = array ( "attr"=>$attrname, "type"=>$attrtype, "values"=>$values );
-	}
-
-	/// set select-list (attributes or expressions), SQL-like syntax
-	function SetSelect ( $select )
-	{
-		assert ( is_string ( $select ) );
-		$this->_select = $select;
-	}
-
-	//////////////////////////////////////////////////////////////////////////////
-
-	/// clear all filters (for multi-queries)
-	function ResetFilters ()
-	{
-		$this->_filters = array();
-		$this->_anchor = array();
-	}
-
-	/// clear groupby settings (for multi-queries)
-	function ResetGroupBy ()
-	{
-		$this->_groupby		= "";
-		$this->_groupfunc	= SPH_GROUPBY_DAY;
-		$this->_groupsort	= "@group desc";
-		$this->_groupdistinct= "";
-	}
-
-	/// clear all attribute value overrides (for multi-queries)
-	function ResetOverrides ()
-    {
-    	$this->_overrides = array ();
-    }
-
-	//////////////////////////////////////////////////////////////////////////////
-
-	/// connect to searchd server, run given search query through given indexes,
-	/// and return the search results
-	function Query ( $query, $index="*", $comment="" )
-	{
-		assert ( empty($this->_reqs) );
-
-		$this->AddQuery ( $query, $index, $comment );
-		$results = $this->RunQueries ();
-		$this->_reqs = array (); // just in case it failed too early
-
-		if ( !is_array($results) )
-			return false; // probably network error; error message should be already filled
-
-		$this->_error = $results[0]["error"];
-		$this->_warning = $results[0]["warning"];
-		if ( $results[0]["status"]==SEARCHD_ERROR )
-			return false;
-		else
-			return $results[0];
-	}
-
-	/// helper to pack floats in network byte order
-	function _PackFloat ( $f )
-	{
-		$t1 = pack ( "f", $f ); // machine order
-		list(,$t2) = unpack ( "L*", $t1 ); // int in machine order
-		return pack ( "N", $t2 );
-	}
-
-	/// add query to multi-query batch
-	/// returns index into results array from RunQueries() call
-	function AddQuery ( $query, $index="*", $comment="" )
-	{
-		// mbstring workaround
-		$this->_MBPush ();
-
-		// build request
-		$req = pack ( "NNNN", $this->_offset, $this->_limit, $this->_mode, $this->_ranker );
-		if ( $this->_ranker==SPH_RANK_EXPR )
-			$req .= pack ( "N", strlen($this->_rankexpr) ) . $this->_rankexpr;
-		$req .= pack ( "N", $this->_sort ); // (deprecated) sort mode
-		$req .= pack ( "N", strlen($this->_sortby) ) . $this->_sortby;
-		$req .= pack ( "N", strlen($query) ) . $query; // query itself
-		$req .= pack ( "N", count($this->_weights) ); // weights
-		foreach ( $this->_weights as $weight )
-			$req .= pack ( "N", (int)$weight );
-		$req .= pack ( "N", strlen($index) ) . $index; // indexes
-		$req .= pack ( "N", 1 ); // id64 range marker
-		$req .= sphPackU64 ( $this->_min_id ) . sphPackU64 ( $this->_max_id ); // id64 range
-
-		// filters
-		$req .= pack ( "N", count($this->_filters) );
-		foreach ( $this->_filters as $filter )
-		{
-			$req .= pack ( "N", strlen($filter["attr"]) ) . $filter["attr"];
-			$req .= pack ( "N", $filter["type"] );
-			switch ( $filter["type"] )
-			{
-				case SPH_FILTER_VALUES:
-					$req .= pack ( "N", count($filter["values"]) );
-					foreach ( $filter["values"] as $value )
-						$req .= sphPackI64 ( $value );
-					break;
-
-				case SPH_FILTER_RANGE:
-					$req .= sphPackI64 ( $filter["min"] ) . sphPackI64 ( $filter["max"] );
-					break;
-
-				case SPH_FILTER_FLOATRANGE:
-					$req .= $this->_PackFloat ( $filter["min"] ) . $this->_PackFloat ( $filter["max"] );
-					break;
-
-				default:
-					assert ( 0 && "internal error: unhandled filter type" );
-			}
-			$req .= pack ( "N", $filter["exclude"] );
-		}
-
-		// group-by clause, max-matches count, group-sort clause, cutoff count
-		$req .= pack ( "NN", $this->_groupfunc, strlen($this->_groupby) ) . $this->_groupby;
-		$req .= pack ( "N", $this->_maxmatches );
-		$req .= pack ( "N", strlen($this->_groupsort) ) . $this->_groupsort;
-		$req .= pack ( "NNN", $this->_cutoff, $this->_retrycount, $this->_retrydelay );
-		$req .= pack ( "N", strlen($this->_groupdistinct) ) . $this->_groupdistinct;
-
-		// anchor point
-		if ( empty($this->_anchor) )
-		{
-			$req .= pack ( "N", 0 );
-		} else
-		{
-			$a =& $this->_anchor;
-			$req .= pack ( "N", 1 );
-			$req .= pack ( "N", strlen($a["attrlat"]) ) . $a["attrlat"];
-			$req .= pack ( "N", strlen($a["attrlong"]) ) . $a["attrlong"];
-			$req .= $this->_PackFloat ( $a["lat"] ) . $this->_PackFloat ( $a["long"] );
-		}
-
-		// per-index weights
-		$req .= pack ( "N", count($this->_indexweights) );
-		foreach ( $this->_indexweights as $idx=>$weight )
-			$req .= pack ( "N", strlen($idx) ) . $idx . pack ( "N", $weight );
-
-		// max query time
-		$req .= pack ( "N", $this->_maxquerytime );
-
-		// per-field weights
-		$req .= pack ( "N", count($this->_fieldweights) );
-		foreach ( $this->_fieldweights as $field=>$weight )
-			$req .= pack ( "N", strlen($field) ) . $field . pack ( "N", $weight );
-
-		// comment
-		$req .= pack ( "N", strlen($comment) ) . $comment;
-
-		// attribute overrides
-		$req .= pack ( "N", count($this->_overrides) );
-		foreach ( $this->_overrides as $key => $entry )
-		{
-			$req .= pack ( "N", strlen($entry["attr"]) ) . $entry["attr"];
-			$req .= pack ( "NN", $entry["type"], count($entry["values"]) );
-			foreach ( $entry["values"] as $id=>$val )
-			{
-				assert ( is_numeric($id) );
-				assert ( is_numeric($val) );
-
-				$req .= sphPackU64 ( $id );
-				switch ( $entry["type"] )
-				{
-					case SPH_ATTR_FLOAT:	$req .= $this->_PackFloat ( $val ); break;
-					case SPH_ATTR_BIGINT:	$req .= sphPackI64 ( $val ); break;
-					default:				$req .= pack ( "N", $val ); break;
-				}
-			}
-		}
-
-		// select-list
-		$req .= pack ( "N", strlen($this->_select) ) . $this->_select;
-
-		// mbstring workaround
-		$this->_MBPop ();
-
-		// store request to requests array
-		$this->_reqs[] = $req;
-		return count($this->_reqs)-1;
-	}
-
-	/// connect to searchd, run queries batch, and return an array of result sets
-	function RunQueries ()
-	{
-		if ( empty($this->_reqs) )
-		{
-			$this->_error = "no queries defined, issue AddQuery() first";
-			return false;
-		}
-
-		// mbstring workaround
-		$this->_MBPush ();
-
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop ();
-			return false;
-		}
-
-		// send query, get response
-		$nreqs = count($this->_reqs);
-		$req = join ( "", $this->_reqs );
-		$len = 8+strlen($req);
-		$req = pack ( "nnNNN", SEARCHD_COMMAND_SEARCH, VER_COMMAND_SEARCH, $len, 0, $nreqs ) . $req; // add header
-
-		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_SEARCH ) ) )
-		{
-			$this->_MBPop ();
-			return false;
-		}
-
-		// query sent ok; we can reset reqs now
-		$this->_reqs = array ();
-
-		// parse and return response
-		return $this->_ParseSearchResponse ( $response, $nreqs );
-	}
-
-	/// parse and return search query (or queries) response
-	function _ParseSearchResponse ( $response, $nreqs )
-	{
-		$p = 0; // current position
-		$max = strlen($response); // max position for checks, to protect against broken responses
-
-		$results = array ();
-		for ( $ires=0; $ires<$nreqs && $p<$max; $ires++ )
-		{
-			$results[] = array();
-			$result =& $results[$ires];
-
-			$result["error"] = "";
-			$result["warning"] = "";
-
-			// extract status
-			list(,$status) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			$result["status"] = $status;
-			if ( $status!=SEARCHD_OK )
-			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$message = substr ( $response, $p, $len ); $p += $len;
-
-				if ( $status==SEARCHD_WARNING )
-				{
-					$result["warning"] = $message;
-				} else
-				{
-					$result["error"] = $message;
-					continue;
-				}
-			}
-
-			// read schema
-			$fields = array ();
-			$attrs = array ();
-
-			list(,$nfields) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			while ( $nfields-->0 && $p<$max )
-			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$fields[] = substr ( $response, $p, $len ); $p += $len;
-			}
-			$result["fields"] = $fields;
-
-			list(,$nattrs) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			while ( $nattrs-->0 && $p<$max  )
-			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$attr = substr ( $response, $p, $len ); $p += $len;
-				list(,$type) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$attrs[$attr] = $type;
-			}
-			$result["attrs"] = $attrs;
-
-			// read match count
-			list(,$count) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			list(,$id64) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-
-			// read matches
-			$idx = -1;
-			while ( $count-->0 && $p<$max )
-			{
-				// index into result array
-				$idx++;
-
-				// parse document id and weight
-				if ( $id64 )
-				{
-					$doc = sphUnpackU64 ( substr ( $response, $p, 8 ) ); $p += 8;
-					list(,$weight) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				}
-				else
-				{
-					list ( $doc, $weight ) = array_values ( unpack ( "N*N*",
-						substr ( $response, $p, 8 ) ) );
-					$p += 8;
-					$doc = sphFixUint($doc);
-				}
-				$weight = sprintf ( "%u", $weight );
-
-				// create match entry
-				if ( $this->_arrayresult )
-					$result["matches"][$idx] = array ( "id"=>$doc, "weight"=>$weight );
-				else
-					$result["matches"][$doc]["weight"] = $weight;
-
-				// parse and create attributes
-				$attrvals = array ();
-				foreach ( $attrs as $attr=>$type )
-				{
-					// handle 64bit ints
-					if ( $type==SPH_ATTR_BIGINT )
-					{
-						$attrvals[$attr] = sphUnpackI64 ( substr ( $response, $p, 8 ) ); $p += 8;
-						continue;
-					}
-
-					// handle floats
-					if ( $type==SPH_ATTR_FLOAT )
-					{
-						list(,$uval) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-						list(,$fval) = unpack ( "f*", pack ( "L", $uval ) ); 
-						$attrvals[$attr] = $fval;
-						continue;
-					}
-
-					// handle everything else as unsigned ints
-					list(,$val) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-					if ( $type==SPH_ATTR_MULTI )
-					{
-						$attrvals[$attr] = array ();
-						$nvalues = $val;
-						while ( $nvalues-->0 && $p<$max )
-						{
-							list(,$val) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-							$attrvals[$attr][] = sphFixUint($val);
-						}
-					} else if ( $type==SPH_ATTR_MULTI64 )
-					{
-						$attrvals[$attr] = array ();
-						$nvalues = $val;
-						while ( $nvalues>0 && $p<$max )
-						{
-							$attrvals[$attr][] = sphUnpackU64 ( substr ( $response, $p, 8 ) ); $p += 8;
-							$nvalues -= 2;
-						}
-					} else if ( $type==SPH_ATTR_STRING )
-					{
-						$attrvals[$attr] = substr ( $response, $p, $val );
-						$p += $val;						
-					} else
-					{
-						$attrvals[$attr] = sphFixUint($val);
-					}
-				}
-
-				if ( $this->_arrayresult )
-					$result["matches"][$idx]["attrs"] = $attrvals;
-				else
-					$result["matches"][$doc]["attrs"] = $attrvals;
-			}
-
-			list ( $total, $total_found, $msecs, $words ) =
-				array_values ( unpack ( "N*N*N*N*", substr ( $response, $p, 16 ) ) );
-			$result["total"] = sprintf ( "%u", $total );
-			$result["total_found"] = sprintf ( "%u", $total_found );
-			$result["time"] = sprintf ( "%.3f", $msecs/1000 );
-			$p += 16;
-
-			while ( $words-->0 && $p<$max )
-			{
-				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-				$word = substr ( $response, $p, $len ); $p += $len;
-				list ( $docs, $hits ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
-				$result["words"][$word] = array (
-					"docs"=>sprintf ( "%u", $docs ),
-					"hits"=>sprintf ( "%u", $hits ) );
-			}
-		}
-
-		$this->_MBPop ();
-		return $results;
-	}
-
-	/////////////////////////////////////////////////////////////////////////////
-	// excerpts generation
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// connect to searchd server, and generate exceprts (snippets)
-	/// of given documents for given query. returns false on failure,
-	/// an array of snippets on success
-	function BuildExcerpts ( $docs, $index, $words, $opts=array() )
-	{
-		assert ( is_array($docs) );
-		assert ( is_string($index) );
-		assert ( is_string($words) );
-		assert ( is_array($opts) );
-
-		$this->_MBPush ();
-
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop();
-			return false;
-		}
-
-		/////////////////
-		// fixup options
-		/////////////////
-
-		if ( !isset($opts["before_match"]) )		$opts["before_match"] = "<b>";
-		if ( !isset($opts["after_match"]) )			$opts["after_match"] = "</b>";
-		if ( !isset($opts["chunk_separator"]) )		$opts["chunk_separator"] = " ... ";
-		if ( !isset($opts["limit"]) )				$opts["limit"] = 256;
-		if ( !isset($opts["limit_passages"]) )		$opts["limit_passages"] = 0;
-		if ( !isset($opts["limit_words"]) )			$opts["limit_words"] = 0;
-		if ( !isset($opts["around"]) )				$opts["around"] = 5;
-		if ( !isset($opts["exact_phrase"]) )		$opts["exact_phrase"] = false;
-		if ( !isset($opts["single_passage"]) )		$opts["single_passage"] = false;
-		if ( !isset($opts["use_boundaries"]) )		$opts["use_boundaries"] = false;
-		if ( !isset($opts["weight_order"]) )		$opts["weight_order"] = false;
-		if ( !isset($opts["query_mode"]) )			$opts["query_mode"] = false;
-		if ( !isset($opts["force_all_words"]) )		$opts["force_all_words"] = false;
-		if ( !isset($opts["start_passage_id"]) )	$opts["start_passage_id"] = 1;
-		if ( !isset($opts["load_files"]) )			$opts["load_files"] = false;
-		if ( !isset($opts["html_strip_mode"]) )		$opts["html_strip_mode"] = "index";
-		if ( !isset($opts["allow_empty"]) )			$opts["allow_empty"] = false;
-		if ( !isset($opts["passage_boundary"]) )	$opts["passage_boundary"] = "none";
-		if ( !isset($opts["emit_zones"]) )			$opts["emit_zones"] = false;
-		if ( !isset($opts["load_files_scattered"]) )		$opts["load_files_scattered"] = false;
-		
-
-		/////////////////
-		// build request
-		/////////////////
-
-		// v.1.2 req
-		$flags = 1; // remove spaces
-		if ( $opts["exact_phrase"] )	$flags |= 2;
-		if ( $opts["single_passage"] )	$flags |= 4;
-		if ( $opts["use_boundaries"] )	$flags |= 8;
-		if ( $opts["weight_order"] )	$flags |= 16;
-		if ( $opts["query_mode"] )		$flags |= 32;
-		if ( $opts["force_all_words"] )	$flags |= 64;
-		if ( $opts["load_files"] )		$flags |= 128;
-		if ( $opts["allow_empty"] )		$flags |= 256;
-		if ( $opts["emit_zones"] )		$flags |= 512;
-		if ( $opts["load_files_scattered"] )	$flags |= 1024;
-		$req = pack ( "NN", 0, $flags ); // mode=0, flags=$flags
-		$req .= pack ( "N", strlen($index) ) . $index; // req index
-		$req .= pack ( "N", strlen($words) ) . $words; // req words
-
-		// options
-		$req .= pack ( "N", strlen($opts["before_match"]) ) . $opts["before_match"];
-		$req .= pack ( "N", strlen($opts["after_match"]) ) . $opts["after_match"];
-		$req .= pack ( "N", strlen($opts["chunk_separator"]) ) . $opts["chunk_separator"];
-		$req .= pack ( "NN", (int)$opts["limit"], (int)$opts["around"] );
-		$req .= pack ( "NNN", (int)$opts["limit_passages"], (int)$opts["limit_words"], (int)$opts["start_passage_id"] ); // v.1.2
-		$req .= pack ( "N", strlen($opts["html_strip_mode"]) ) . $opts["html_strip_mode"];
-		$req .= pack ( "N", strlen($opts["passage_boundary"]) ) . $opts["passage_boundary"];
-
-		// documents
-		$req .= pack ( "N", count($docs) );
-		foreach ( $docs as $doc )
-		{
-			assert ( is_string($doc) );
-			$req .= pack ( "N", strlen($doc) ) . $doc;
-		}
-
-		////////////////////////////
-		// send query, get response
-		////////////////////////////
-
-		$len = strlen($req);
-		$req = pack ( "nnN", SEARCHD_COMMAND_EXCERPT, VER_COMMAND_EXCERPT, $len ) . $req; // add header
-		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_EXCERPT ) ) )
-		{
-			$this->_MBPop ();
-			return false;
-		}
-
-		//////////////////
-		// parse response
-		//////////////////
-
-		$pos = 0;
-		$res = array ();
-		$rlen = strlen($response);
-		for ( $i=0; $i<count($docs); $i++ )
-		{
-			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );
-			$pos += 4;
-
-			if ( $pos+$len > $rlen )
-			{
-				$this->_error = "incomplete reply";
-				$this->_MBPop ();
-				return false;
-			}
-			$res[] = $len ? substr ( $response, $pos, $len ) : "";
-			$pos += $len;
-		}
-
-		$this->_MBPop ();
-		return $res;
-	}
-
-
-	/////////////////////////////////////////////////////////////////////////////
-	// keyword generation
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// connect to searchd server, and generate keyword list for a given query
-	/// returns false on failure,
-	/// an array of words on success
-	function BuildKeywords ( $query, $index, $hits )
-	{
-		assert ( is_string($query) );
-		assert ( is_string($index) );
-		assert ( is_bool($hits) );
-
-		$this->_MBPush ();
-
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop();
-			return false;
-		}
-
-		/////////////////
-		// build request
-		/////////////////
-
-		// v.1.0 req
-		$req  = pack ( "N", strlen($query) ) . $query; // req query
-		$req .= pack ( "N", strlen($index) ) . $index; // req index
-		$req .= pack ( "N", (int)$hits );
-
-		////////////////////////////
-		// send query, get response
-		////////////////////////////
-
-		$len = strlen($req);
-		$req = pack ( "nnN", SEARCHD_COMMAND_KEYWORDS, VER_COMMAND_KEYWORDS, $len ) . $req; // add header
-		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_KEYWORDS ) ) )
-		{
-			$this->_MBPop ();
-			return false;
-		}
-
-		//////////////////
-		// parse response
-		//////////////////
-
-		$pos = 0;
-		$res = array ();
-		$rlen = strlen($response);
-		list(,$nwords) = unpack ( "N*", substr ( $response, $pos, 4 ) );
-		$pos += 4;
-		for ( $i=0; $i<$nwords; $i++ )
-		{
-			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
-			$tokenized = $len ? substr ( $response, $pos, $len ) : "";
-			$pos += $len;
-
-			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
-			$normalized = $len ? substr ( $response, $pos, $len ) : "";
-			$pos += $len;
-
-			$res[] = array ( "tokenized"=>$tokenized, "normalized"=>$normalized );
-
-			if ( $hits )
-			{
-				list($ndocs,$nhits) = array_values ( unpack ( "N*N*", substr ( $response, $pos, 8 ) ) );
-				$pos += 8;
-				$res [$i]["docs"] = $ndocs;
-				$res [$i]["hits"] = $nhits;
-			}
-
-			if ( $pos > $rlen )
-			{
-				$this->_error = "incomplete reply";
-				$this->_MBPop ();
-				return false;
-			}
-		}
-
-		$this->_MBPop ();
-		return $res;
-	}
-
-	function EscapeString ( $string )
-	{
-		$from = array ( '\\', '(',')','|','-','!','@','~','"','&', '/', '^', '$', '=' );
-		$to   = array ( '\\\\', '\(','\)','\|','\-','\!','\@','\~','\"', '\&', '\/', '\^', '\$', '\=' );
-
-		return str_replace ( $from, $to, $string );
-	}
-
-	/////////////////////////////////////////////////////////////////////////////
-	// attribute updates
-	/////////////////////////////////////////////////////////////////////////////
-
-	/// batch update given attributes in given rows in given indexes
-	/// returns amount of updated documents (0 or more) on success, or -1 on failure
-	function UpdateAttributes ( $index, $attrs, $values, $mva=false )
-	{
-		// verify everything
-		assert ( is_string($index) );
-		assert ( is_bool($mva) );
-
-		assert ( is_array($attrs) );
-		foreach ( $attrs as $attr )
-			assert ( is_string($attr) );
-
-		assert ( is_array($values) );
-		foreach ( $values as $id=>$entry )
-		{
-			assert ( is_numeric($id) );
-			assert ( is_array($entry) );
-			assert ( count($entry)==count($attrs) );
-			foreach ( $entry as $v )
-			{
-				if ( $mva )
-				{
-					assert ( is_array($v) );
-					foreach ( $v as $vv )
-						assert ( is_int($vv) );
-				} else
-					assert ( is_int($v) );
-			}
-		}
-
-		// build request
-		$this->_MBPush ();
-		$req = pack ( "N", strlen($index) ) . $index;
-
-		$req .= pack ( "N", count($attrs) );
-		foreach ( $attrs as $attr )
-		{
-			$req .= pack ( "N", strlen($attr) ) . $attr;
-			$req .= pack ( "N", $mva ? 1 : 0 );
-		}
-
-		$req .= pack ( "N", count($values) );
-		foreach ( $values as $id=>$entry )
-		{
-			$req .= sphPackU64 ( $id );
-			foreach ( $entry as $v )
-			{
-				$req .= pack ( "N", $mva ? count($v) : $v );
-				if ( $mva )
-					foreach ( $v as $vv )
-						$req .= pack ( "N", $vv );
-			}
-		}
-
-		// connect, send query, get response
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop ();
-			return -1;
-		}
-
-		$len = strlen($req);
-		$req = pack ( "nnN", SEARCHD_COMMAND_UPDATE, VER_COMMAND_UPDATE, $len ) . $req; // add header
-		if ( !$this->_Send ( $fp, $req, $len+8 ) )
-		{
-			$this->_MBPop ();
-			return -1;
-		}
-
-		if (!( $response = $this->_GetResponse ( $fp, VER_COMMAND_UPDATE ) ))
-		{
-			$this->_MBPop ();
-			return -1;
-		}
-
-		// parse response
-		list(,$updated) = unpack ( "N*", substr ( $response, 0, 4 ) );
-		$this->_MBPop ();
-		return $updated;
-	}
-
-	/////////////////////////////////////////////////////////////////////////////
-	// persistent connections
-	/////////////////////////////////////////////////////////////////////////////
-
-	function Open()
-	{
-		if ( $this->_socket !== false )
-		{
-			$this->_error = 'already connected';
-			return false;
-		}
-		if ( !$fp = $this->_Connect() )
-			return false;
-
-		// command, command version = 0, body length = 4, body = 1
-		$req = pack ( "nnNN", SEARCHD_COMMAND_PERSIST, 0, 4, 1 );
-		if ( !$this->_Send ( $fp, $req, 12 ) )
-			return false;
-
-		$this->_socket = $fp;
-		return true;
-	}
-
-	function Close()
-	{
-		if ( $this->_socket === false )
-		{
-			$this->_error = 'not connected';
-			return false;
-		}
-
-		fclose ( $this->_socket );
-		$this->_socket = false;
-		
-		return true;
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// status
-	//////////////////////////////////////////////////////////////////////////
-
-	function Status ()
-	{
-		$this->_MBPush ();
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop();
-			return false;
-		}
-
-		$req = pack ( "nnNN", SEARCHD_COMMAND_STATUS, VER_COMMAND_STATUS, 4, 1 ); // len=4, body=1
-		if ( !( $this->_Send ( $fp, $req, 12 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_STATUS ) ) )
-		{
-			$this->_MBPop ();
-			return false;
-		}
-
-		$res = substr ( $response, 4 ); // just ignore length, error handling, etc
-		$p = 0;
-		list ( $rows, $cols ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
-
-		$res = array();
-		for ( $i=0; $i<$rows; $i++ )
-			for ( $j=0; $j<$cols; $j++ )
-		{
-			list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-			$res[$i][] = substr ( $response, $p, $len ); $p += $len;
-		}
-
-		$this->_MBPop ();
-		return $res;
-	}
-
-	//////////////////////////////////////////////////////////////////////////
-	// flush
-	//////////////////////////////////////////////////////////////////////////
-
-	function FlushAttributes ()
-	{
-		$this->_MBPush ();
-		if (!( $fp = $this->_Connect() ))
-		{
-			$this->_MBPop();
-			return -1;
-		}
-
-		$req = pack ( "nnN", SEARCHD_COMMAND_FLUSHATTRS, VER_COMMAND_FLUSHATTRS, 0 ); // len=0
-		if ( !( $this->_Send ( $fp, $req, 8 ) ) ||
-			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_FLUSHATTRS ) ) )
-		{
-			$this->_MBPop ();
-			return -1;
-		}
-
-		$tag = -1;
-		if ( strlen($response)==4 )
-			list(,$tag) = unpack ( "N*", $response );
-		else
-			$this->_error = "unexpected response length";
-
-		$this->_MBPop ();
-		return $tag;
-	}
-}
-
-//
-// $Id: sphinxapi.php 3087 2012-01-30 23:07:35Z shodan $
-//
+<?php
+
+//
+// $Id: sphinxapi.php 3087 2012-01-30 23:07:35Z shodan $
+//
+
+//
+// Copyright (c) 2001-2012, Andrew Aksyonoff
+// Copyright (c) 2008-2012, Sphinx Technologies Inc
+// All rights reserved
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License. You should have
+// received a copy of the GPL license along with this program; if you
+// did not, you can find it at http://www.gnu.org/
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// PHP version of Sphinx searchd client (PHP API)
+/////////////////////////////////////////////////////////////////////////////
+
+/// known searchd commands
+define ( "SEARCHD_COMMAND_SEARCH",		0 );
+define ( "SEARCHD_COMMAND_EXCERPT",		1 );
+define ( "SEARCHD_COMMAND_UPDATE",		2 );
+define ( "SEARCHD_COMMAND_KEYWORDS",	3 );
+define ( "SEARCHD_COMMAND_PERSIST",		4 );
+define ( "SEARCHD_COMMAND_STATUS",		5 );
+define ( "SEARCHD_COMMAND_FLUSHATTRS",	7 );
+
+/// current client-side command implementation versions
+define ( "VER_COMMAND_SEARCH",		0x119 );
+define ( "VER_COMMAND_EXCERPT",		0x104 );
+define ( "VER_COMMAND_UPDATE",		0x102 );
+define ( "VER_COMMAND_KEYWORDS",	0x100 );
+define ( "VER_COMMAND_STATUS",		0x100 );
+define ( "VER_COMMAND_QUERY",		0x100 );
+define ( "VER_COMMAND_FLUSHATTRS",	0x100 );
+
+/// known searchd status codes
+define ( "SEARCHD_OK",				0 );
+define ( "SEARCHD_ERROR",			1 );
+define ( "SEARCHD_RETRY",			2 );
+define ( "SEARCHD_WARNING",			3 );
+
+/// known match modes
+define ( "SPH_MATCH_ALL",			0 );
+define ( "SPH_MATCH_ANY",			1 );
+define ( "SPH_MATCH_PHRASE",		2 );
+define ( "SPH_MATCH_BOOLEAN",		3 );
+define ( "SPH_MATCH_EXTENDED",		4 );
+define ( "SPH_MATCH_FULLSCAN",		5 );
+define ( "SPH_MATCH_EXTENDED2",		6 );	// extended engine V2 (TEMPORARY, WILL BE REMOVED)
+
+/// known ranking modes (ext2 only)
+define ( "SPH_RANK_PROXIMITY_BM25",	0 );	///< default mode, phrase proximity major factor and BM25 minor one
+define ( "SPH_RANK_BM25",			1 );	///< statistical mode, BM25 ranking only (faster but worse quality)
+define ( "SPH_RANK_NONE",			2 );	///< no ranking, all matches get a weight of 1
+define ( "SPH_RANK_WORDCOUNT",		3 );	///< simple word-count weighting, rank is a weighted sum of per-field keyword occurence counts
+define ( "SPH_RANK_PROXIMITY",		4 );
+define ( "SPH_RANK_MATCHANY",		5 );
+define ( "SPH_RANK_FIELDMASK",		6 );
+define ( "SPH_RANK_SPH04",			7 );
+define ( "SPH_RANK_EXPR",			8 );
+define ( "SPH_RANK_TOTAL",			9 );
+
+/// known sort modes
+define ( "SPH_SORT_RELEVANCE",		0 );
+define ( "SPH_SORT_ATTR_DESC",		1 );
+define ( "SPH_SORT_ATTR_ASC",		2 );
+define ( "SPH_SORT_TIME_SEGMENTS", 	3 );
+define ( "SPH_SORT_EXTENDED", 		4 );
+define ( "SPH_SORT_EXPR", 			5 );
+
+/// known filter types
+define ( "SPH_FILTER_VALUES",		0 );
+define ( "SPH_FILTER_RANGE",		1 );
+define ( "SPH_FILTER_FLOATRANGE",	2 );
+
+/// known attribute types
+define ( "SPH_ATTR_INTEGER",		1 );
+define ( "SPH_ATTR_TIMESTAMP",		2 );
+define ( "SPH_ATTR_ORDINAL",		3 );
+define ( "SPH_ATTR_BOOL",			4 );
+define ( "SPH_ATTR_FLOAT",			5 );
+define ( "SPH_ATTR_BIGINT",			6 );
+define ( "SPH_ATTR_STRING",			7 );
+define ( "SPH_ATTR_MULTI",			0x40000001 );
+define ( "SPH_ATTR_MULTI64",			0x40000002 );
+
+/// known grouping functions
+define ( "SPH_GROUPBY_DAY",			0 );
+define ( "SPH_GROUPBY_WEEK",		1 );
+define ( "SPH_GROUPBY_MONTH",		2 );
+define ( "SPH_GROUPBY_YEAR",		3 );
+define ( "SPH_GROUPBY_ATTR",		4 );
+define ( "SPH_GROUPBY_ATTRPAIR",	5 );
+
+// important properties of PHP's integers:
+//  - always signed (one bit short of PHP_INT_SIZE)
+//  - conversion from string to int is saturated
+//  - float is double
+//  - div converts arguments to floats
+//  - mod converts arguments to ints
+
+// the packing code below works as follows:
+//  - when we got an int, just pack it
+//    if performance is a problem, this is the branch users should aim for
+//
+//  - otherwise, we got a number in string form
+//    this might be due to different reasons, but we assume that this is
+//    because it didn't fit into PHP int
+//
+//  - factor the string into high and low ints for packing
+//    - if we have bcmath, then it is used
+//    - if we don't, we have to do it manually (this is the fun part)
+//
+//    - x64 branch does factoring using ints
+//    - x32 (ab)uses floats, since we can't fit unsigned 32-bit number into an int
+//
+// unpacking routines are pretty much the same.
+//  - return ints if we can
+//  - otherwise format number into a string
+
+/// pack 64-bit signed
+function sphPackI64 ( $v )
+{
+	assert ( is_numeric($v) );
+	
+	// x64
+	if ( PHP_INT_SIZE>=8 )
+	{
+		$v = (int)$v;
+		return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
+	}
+
+	// x32, int
+	if ( is_int($v) )
+		return pack ( "NN", $v < 0 ? -1 : 0, $v );
+
+	// x32, bcmath	
+	if ( function_exists("bcmul") )
+	{
+		if ( bccomp ( $v, 0 ) == -1 )
+			$v = bcadd ( "18446744073709551616", $v );
+		$h = bcdiv ( $v, "4294967296", 0 );
+		$l = bcmod ( $v, "4294967296" );
+		return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
+	}
+
+	// x32, no-bcmath
+	$p = max(0, strlen($v) - 13);
+	$lo = abs((float)substr($v, $p));
+	$hi = abs((float)substr($v, 0, $p));
+
+	$m = $lo + $hi*1316134912.0; // (10 ^ 13) % (1 << 32) = 1316134912
+	$q = floor($m/4294967296.0);
+	$l = $m - ($q*4294967296.0);
+	$h = $hi*2328.0 + $q; // (10 ^ 13) / (1 << 32) = 2328
+
+	if ( $v<0 )
+	{
+		if ( $l==0 )
+			$h = 4294967296.0 - $h;
+		else
+		{
+			$h = 4294967295.0 - $h;
+			$l = 4294967296.0 - $l;
+		}
+	}
+	return pack ( "NN", $h, $l );
+}
+
+/// pack 64-bit unsigned
+function sphPackU64 ( $v )
+{
+	assert ( is_numeric($v) );
+	
+	// x64
+	if ( PHP_INT_SIZE>=8 )
+	{
+		assert ( $v>=0 );
+		
+		// x64, int
+		if ( is_int($v) )
+			return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
+						  
+		// x64, bcmath
+		if ( function_exists("bcmul") )
+		{
+			$h = bcdiv ( $v, 4294967296, 0 );
+			$l = bcmod ( $v, 4294967296 );
+			return pack ( "NN", $h, $l );
+		}
+		
+		// x64, no-bcmath
+		$p = max ( 0, strlen($v) - 13 );
+		$lo = (int)substr ( $v, $p );
+		$hi = (int)substr ( $v, 0, $p );
+	
+		$m = $lo + $hi*1316134912;
+		$l = $m % 4294967296;
+		$h = $hi*2328 + (int)($m/4294967296);
+
+		return pack ( "NN", $h, $l );
+	}
+
+	// x32, int
+	if ( is_int($v) )
+		return pack ( "NN", 0, $v );
+	
+	// x32, bcmath
+	if ( function_exists("bcmul") )
+	{
+		$h = bcdiv ( $v, "4294967296", 0 );
+		$l = bcmod ( $v, "4294967296" );
+		return pack ( "NN", (float)$h, (float)$l ); // conversion to float is intentional; int would lose 31st bit
+	}
+
+	// x32, no-bcmath
+	$p = max(0, strlen($v) - 13);
+	$lo = (float)substr($v, $p);
+	$hi = (float)substr($v, 0, $p);
+	
+	$m = $lo + $hi*1316134912.0;
+	$q = floor($m / 4294967296.0);
+	$l = $m - ($q * 4294967296.0);
+	$h = $hi*2328.0 + $q;
+
+	return pack ( "NN", $h, $l );
+}
+
+// unpack 64-bit unsigned
+function sphUnpackU64 ( $v )
+{
+	list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
+
+	if ( PHP_INT_SIZE>=8 )
+	{
+		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
+		if ( $lo<0 ) $lo += (1<<32);
+
+		// x64, int
+		if ( $hi<=2147483647 )
+			return ($hi<<32) + $lo;
+
+		// x64, bcmath
+		if ( function_exists("bcmul") )
+			return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+
+		// x64, no-bcmath
+		$C = 100000;
+		$h = ((int)($hi / $C) << 32) + (int)($lo / $C);
+		$l = (($hi % $C) << 32) + ($lo % $C);
+		if ( $l>$C )
+		{
+			$h += (int)($l / $C);
+			$l  = $l % $C;
+		}
+
+		if ( $h==0 )
+			return $l;
+		return sprintf ( "%d%05d", $h, $l );
+	}
+
+	// x32, int
+	if ( $hi==0 )
+	{
+		if ( $lo>0 )
+			return $lo;
+		return sprintf ( "%u", $lo );
+	}
+
+	$hi = sprintf ( "%u", $hi );
+	$lo = sprintf ( "%u", $lo );
+
+	// x32, bcmath
+	if ( function_exists("bcmul") )
+		return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
+	
+	// x32, no-bcmath
+	$hi = (float)$hi;
+	$lo = (float)$lo;
+	
+	$q = floor($hi/10000000.0);
+	$r = $hi - $q*10000000.0;
+	$m = $lo + $r*4967296.0;
+	$mq = floor($m/10000000.0);
+	$l = $m - $mq*10000000.0;
+	$h = $q*4294967296.0 + $r*429.0 + $mq;
+
+	$h = sprintf ( "%.0f", $h );
+	$l = sprintf ( "%07.0f", $l );
+	if ( $h=="0" )
+		return sprintf( "%.0f", (float)$l );
+	return $h . $l;
+}
+
+// unpack 64-bit signed
+function sphUnpackI64 ( $v )
+{
+	list ( $hi, $lo ) = array_values ( unpack ( "N*N*", $v ) );
+
+	// x64
+	if ( PHP_INT_SIZE>=8 )
+	{
+		if ( $hi<0 ) $hi += (1<<32); // because php 5.2.2 to 5.2.5 is totally fucked up again
+		if ( $lo<0 ) $lo += (1<<32);
+
+		return ($hi<<32) + $lo;
+	}
+
+	// x32, int
+	if ( $hi==0 )
+	{
+		if ( $lo>0 )
+			return $lo;
+		return sprintf ( "%u", $lo );
+	}
+	// x32, int
+	elseif ( $hi==-1 )
+	{
+		if ( $lo<0 )
+			return $lo;
+		return sprintf ( "%.0f", $lo - 4294967296.0 );
+	}
+	
+	$neg = "";
+	$c = 0;
+	if ( $hi<0 )
+	{
+		$hi = ~$hi;
+		$lo = ~$lo;
+		$c = 1;
+		$neg = "-";
+	}	
+
+	$hi = sprintf ( "%u", $hi );
+	$lo = sprintf ( "%u", $lo );
+
+	// x32, bcmath
+	if ( function_exists("bcmul") )
+		return $neg . bcadd ( bcadd ( $lo, bcmul ( $hi, "4294967296" ) ), $c );
+
+	// x32, no-bcmath
+	$hi = (float)$hi;
+	$lo = (float)$lo;
+	
+	$q = floor($hi/10000000.0);
+	$r = $hi - $q*10000000.0;
+	$m = $lo + $r*4967296.0;
+	$mq = floor($m/10000000.0);
+	$l = $m - $mq*10000000.0 + $c;
+	$h = $q*4294967296.0 + $r*429.0 + $mq;
+	if ( $l==10000000 )
+	{
+		$l = 0;
+		$h += 1;
+	}
+
+	$h = sprintf ( "%.0f", $h );
+	$l = sprintf ( "%07.0f", $l );
+	if ( $h=="0" )
+		return $neg . sprintf( "%.0f", (float)$l );
+	return $neg . $h . $l;
+}
+
+
+function sphFixUint ( $value )
+{
+	if ( PHP_INT_SIZE>=8 )
+	{
+		// x64 route, workaround broken unpack() in 5.2.2+
+		if ( $value<0 ) $value += (1<<32);
+		return $value;
+	}
+	else
+	{
+		// x32 route, workaround php signed/unsigned braindamage
+		return sprintf ( "%u", $value );
+	}
+}
+
+
+/// sphinx searchd client class
+class SphinxClient
+{
+	var $_host;			///< searchd host (default is "localhost")
+	var $_port;			///< searchd port (default is 9312)
+	var $_offset;		///< how many records to seek from result-set start (default is 0)
+	var $_limit;		///< how many records to return from result-set starting at offset (default is 20)
+	var $_mode;			///< query matching mode (default is SPH_MATCH_ALL)
+	var $_weights;		///< per-field weights (default is 1 for all fields)
+	var $_sort;			///< match sorting mode (default is SPH_SORT_RELEVANCE)
+	var $_sortby;		///< attribute to sort by (defualt is "")
+	var $_min_id;		///< min ID to match (default is 0, which means no limit)
+	var $_max_id;		///< max ID to match (default is 0, which means no limit)
+	var $_filters;		///< search filters
+	var $_groupby;		///< group-by attribute name
+	var $_groupfunc;	///< group-by function (to pre-process group-by attribute value with)
+	var $_groupsort;	///< group-by sorting clause (to sort groups in result set with)
+	var $_groupdistinct;///< group-by count-distinct attribute
+	var $_maxmatches;	///< max matches to retrieve
+	var $_cutoff;		///< cutoff to stop searching at (default is 0)
+	var $_retrycount;	///< distributed retries count
+	var $_retrydelay;	///< distributed retries delay
+	var $_anchor;		///< geographical anchor point
+	var $_indexweights;	///< per-index weights
+	var $_ranker;		///< ranking mode (default is SPH_RANK_PROXIMITY_BM25)
+	var $_rankexpr;		///< ranking mode expression (for SPH_RANK_EXPR)
+	var $_maxquerytime;	///< max query time, milliseconds (default is 0, do not limit)
+	var $_fieldweights;	///< per-field-name weights
+	var $_overrides;	///< per-query attribute values overrides
+	var $_select;		///< select-list (attributes or expressions, with optional aliases)
+
+	var $_error;		///< last error message
+	var $_warning;		///< last warning message
+	var $_connerror;		///< connection error vs remote error flag
+
+	var $_reqs;			///< requests array for multi-query
+	var $_mbenc;		///< stored mbstring encoding
+	var $_arrayresult;	///< whether $result["matches"] should be a hash or an array
+	var $_timeout;		///< connect timeout
+
+	/////////////////////////////////////////////////////////////////////////////
+	// common stuff
+	/////////////////////////////////////////////////////////////////////////////
+
+	/// create a new client object and fill defaults
+	function SphinxClient ()
+	{
+		// per-client-object settings
+		$this->_host		= "localhost";
+		$this->_port		= 9312;
+		$this->_path		= false;
+		$this->_socket		= false;
+
+		// per-query settings
+		$this->_offset		= 0;
+		$this->_limit		= 20;
+		$this->_mode		= SPH_MATCH_ALL;
+		$this->_weights		= array ();
+		$this->_sort		= SPH_SORT_RELEVANCE;
+		$this->_sortby		= "";
+		$this->_min_id		= 0;
+		$this->_max_id		= 0;
+		$this->_filters		= array ();
+		$this->_groupby		= "";
+		$this->_groupfunc	= SPH_GROUPBY_DAY;
+		$this->_groupsort	= "@group desc";
+		$this->_groupdistinct= "";
+		$this->_maxmatches	= 1000;
+		$this->_cutoff		= 0;
+		$this->_retrycount	= 0;
+		$this->_retrydelay	= 0;
+		$this->_anchor		= array ();
+		$this->_indexweights= array ();
+		$this->_ranker		= SPH_RANK_PROXIMITY_BM25;
+		$this->_rankexpr	= "";
+		$this->_maxquerytime= 0;
+		$this->_fieldweights= array();
+		$this->_overrides 	= array();
+		$this->_select		= "*";
+
+		$this->_error		= ""; // per-reply fields (for single-query case)
+		$this->_warning		= "";
+		$this->_connerror	= false;
+
+		$this->_reqs		= array ();	// requests storage (for multi-query case)
+		$this->_mbenc		= "";
+		$this->_arrayresult	= false;
+		$this->_timeout		= 0;
+	}
+
+	function __destruct()
+	{
+		if ( $this->_socket !== false )
+			fclose ( $this->_socket );
+	}
+
+	/// get last error message (string)
+	function GetLastError ()
+	{
+		return $this->_error;
+	}
+
+	/// get last warning message (string)
+	function GetLastWarning ()
+	{
+		return $this->_warning;
+	}
+
+	/// get last error flag (to tell network connection errors from searchd errors or broken responses)
+	function IsConnectError()
+	{
+		return $this->_connerror;
+	}
+
+	/// set searchd host name (string) and port (integer)
+	function SetServer ( $host, $port = 0 )
+	{
+		assert ( is_string($host) );
+		if ( $host[0] == '/')
+		{
+			$this->_path = 'unix://' . $host;
+			return;
+		}
+		if ( substr ( $host, 0, 7 )=="unix://" )
+		{
+			$this->_path = $host;
+			return;
+		}
+				
+		assert ( is_int($port) );
+		$this->_host = $host;
+		$this->_port = $port;
+		$this->_path = '';
+
+	}
+
+	/// set server connection timeout (0 to remove)
+	function SetConnectTimeout ( $timeout )
+	{
+		assert ( is_numeric($timeout) );
+		$this->_timeout = $timeout;
+	}
+
+
+	function _Send ( $handle, $data, $length )
+	{
+		if ( feof($handle) || fwrite ( $handle, $data, $length ) !== $length )
+		{
+			$this->_error = 'connection unexpectedly closed (timed out?)';
+			$this->_connerror = true;
+			return false;
+		}
+		return true;
+	}
+
+	/////////////////////////////////////////////////////////////////////////////
+
+	/// enter mbstring workaround mode
+	function _MBPush ()
+	{
+		$this->_mbenc = "";
+		if ( ini_get ( "mbstring.func_overload" ) & 2 )
+		{
+			$this->_mbenc = mb_internal_encoding();
+			mb_internal_encoding ( "latin1" );
+		}
+    }
+
+	/// leave mbstring workaround mode
+	function _MBPop ()
+	{
+		if ( $this->_mbenc )
+			mb_internal_encoding ( $this->_mbenc );
+	}
+
+	/// connect to searchd server
+	function _Connect ()
+	{
+		if ( $this->_socket!==false )
+		{
+			// we are in persistent connection mode, so we have a socket
+			// however, need to check whether it's still alive
+			if ( !@feof ( $this->_socket ) )
+				return $this->_socket;
+
+			// force reopen
+			$this->_socket = false;
+		}
+
+		$errno = 0;
+		$errstr = "";
+		$this->_connerror = false;
+
+		if ( $this->_path )
+		{
+			$host = $this->_path;
+			$port = 0;
+		}
+		else
+		{
+			$host = $this->_host;
+			$port = $this->_port;
+		}
+
+		if ( $this->_timeout<=0 )
+			$fp = @fsockopen ( $host, $port, $errno, $errstr );
+		else
+			$fp = @fsockopen ( $host, $port, $errno, $errstr, $this->_timeout );
+		
+		if ( !$fp )
+		{
+			if ( $this->_path )
+				$location = $this->_path;
+			else
+				$location = "{$this->_host}:{$this->_port}";
+			
+			$errstr = trim ( $errstr );
+			$this->_error = "connection to $location failed (errno=$errno, msg=$errstr)";
+			$this->_connerror = true;
+			return false;
+		}
+
+		// send my version
+		// this is a subtle part. we must do it before (!) reading back from searchd.
+		// because otherwise under some conditions (reported on FreeBSD for instance)
+		// TCP stack could throttle write-write-read pattern because of Nagle.
+		if ( !$this->_Send ( $fp, pack ( "N", 1 ), 4 ) )
+		{
+			fclose ( $fp );
+			$this->_error = "failed to send client protocol version";
+			return false;
+		}
+
+		// check version
+		list(,$v) = unpack ( "N*", fread ( $fp, 4 ) );
+		$v = (int)$v;
+		if ( $v<1 )
+		{
+			fclose ( $fp );
+			$this->_error = "expected searchd protocol version 1+, got version '$v'";
+			return false;
+		}
+
+		return $fp;
+	}
+
+	/// get and check response packet from searchd server
+	function _GetResponse ( $fp, $client_ver )
+	{
+		$response = "";
+		$len = 0;
+
+		$header = fread ( $fp, 8 );
+		if ( strlen($header)==8 )
+		{
+			list ( $status, $ver, $len ) = array_values ( unpack ( "n2a/Nb", $header ) );
+			$left = $len;
+			while ( $left>0 && !feof($fp) )
+			{
+				$chunk = fread ( $fp, min ( 8192, $left ) );
+				if ( $chunk )
+				{
+					$response .= $chunk;
+					$left -= strlen($chunk);
+				}
+			}
+		}
+		if ( $this->_socket === false )
+			fclose ( $fp );
+
+		// check response
+		$read = strlen ( $response );
+		if ( !$response || $read!=$len )
+		{
+			$this->_error = $len
+				? "failed to read searchd response (status=$status, ver=$ver, len=$len, read=$read)"
+				: "received zero-sized searchd response";
+			return false;
+		}
+
+		// check status
+		if ( $status==SEARCHD_WARNING )
+		{
+			list(,$wlen) = unpack ( "N*", substr ( $response, 0, 4 ) );
+			$this->_warning = substr ( $response, 4, $wlen );
+			return substr ( $response, 4+$wlen );
+		}
+		if ( $status==SEARCHD_ERROR )
+		{
+			$this->_error = "searchd error: " . substr ( $response, 4 );
+			return false;
+		}
+		if ( $status==SEARCHD_RETRY )
+		{
+			$this->_error = "temporary searchd error: " . substr ( $response, 4 );
+			return false;
+		}
+		if ( $status!=SEARCHD_OK )
+		{
+			$this->_error = "unknown status code '$status'";
+			return false;
+		}
+
+		// check version
+		if ( $ver<$client_ver )
+		{
+			$this->_warning = sprintf ( "searchd command v.%d.%d older than client's v.%d.%d, some options might not work",
+				$ver>>8, $ver&0xff, $client_ver>>8, $client_ver&0xff );
+		}
+
+		return $response;
+	}
+
+	/////////////////////////////////////////////////////////////////////////////
+	// searching
+	/////////////////////////////////////////////////////////////////////////////
+
+	/// set offset and count into result set,
+	/// and optionally set max-matches and cutoff limits
+	function SetLimits ( $offset, $limit, $max=0, $cutoff=0 )
+	{
+		assert ( is_int($offset) );
+		assert ( is_int($limit) );
+		assert ( $offset>=0 );
+		assert ( $limit>0 );
+		assert ( $max>=0 );
+		$this->_offset = $offset;
+		$this->_limit = $limit;
+		if ( $max>0 )
+			$this->_maxmatches = $max;
+		if ( $cutoff>0 )
+			$this->_cutoff = $cutoff;
+	}
+
+	/// set maximum query time, in milliseconds, per-index
+	/// integer, 0 means "do not limit"
+	function SetMaxQueryTime ( $max )
+	{
+		assert ( is_int($max) );
+		assert ( $max>=0 );
+		$this->_maxquerytime = $max;
+	}
+
+	/// set matching mode
+	function SetMatchMode ( $mode )
+	{
+		assert ( $mode==SPH_MATCH_ALL
+			|| $mode==SPH_MATCH_ANY
+			|| $mode==SPH_MATCH_PHRASE
+			|| $mode==SPH_MATCH_BOOLEAN
+			|| $mode==SPH_MATCH_EXTENDED
+			|| $mode==SPH_MATCH_FULLSCAN
+			|| $mode==SPH_MATCH_EXTENDED2 );
+		$this->_mode = $mode;
+	}
+
+	/// set ranking mode
+	function SetRankingMode ( $ranker, $rankexpr="" )
+	{
+		assert ( $ranker>=0 && $ranker<SPH_RANK_TOTAL );
+		assert ( is_string($rankexpr) );
+		$this->_ranker = $ranker;
+		$this->_rankexpr = $rankexpr;
+	}
+
+	/// set matches sorting mode
+	function SetSortMode ( $mode, $sortby="" )
+	{
+		assert (
+			$mode==SPH_SORT_RELEVANCE ||
+			$mode==SPH_SORT_ATTR_DESC ||
+			$mode==SPH_SORT_ATTR_ASC ||
+			$mode==SPH_SORT_TIME_SEGMENTS ||
+			$mode==SPH_SORT_EXTENDED ||
+			$mode==SPH_SORT_EXPR );
+		assert ( is_string($sortby) );
+		assert ( $mode==SPH_SORT_RELEVANCE || strlen($sortby)>0 );
+
+		$this->_sort = $mode;
+		$this->_sortby = $sortby;
+	}
+
+	/// bind per-field weights by order
+	/// DEPRECATED; use SetFieldWeights() instead
+	function SetWeights ( $weights )
+	{
+		assert ( is_array($weights) );
+		foreach ( $weights as $weight )
+			assert ( is_int($weight) );
+
+		$this->_weights = $weights;
+	}
+
+	/// bind per-field weights by name
+	function SetFieldWeights ( $weights )
+	{
+		assert ( is_array($weights) );
+		foreach ( $weights as $name=>$weight )
+		{
+			assert ( is_string($name) );
+			assert ( is_int($weight) );
+		}
+		$this->_fieldweights = $weights;
+	}
+
+	/// bind per-index weights by name
+	function SetIndexWeights ( $weights )
+	{
+		assert ( is_array($weights) );
+		foreach ( $weights as $index=>$weight )
+		{
+			assert ( is_string($index) );
+			assert ( is_int($weight) );
+		}
+		$this->_indexweights = $weights;
+	}
+
+	/// set IDs range to match
+	/// only match records if document ID is beetwen $min and $max (inclusive)
+	function SetIDRange ( $min, $max )
+	{
+		assert ( is_numeric($min) );
+		assert ( is_numeric($max) );
+		assert ( $min<=$max );
+		$this->_min_id = $min;
+		$this->_max_id = $max;
+	}
+
+	/// set values set filter
+	/// only match records where $attribute value is in given set
+	function SetFilter ( $attribute, $values, $exclude=false )
+	{
+		assert ( is_string($attribute) );
+		assert ( is_array($values) );
+		assert ( count($values) );
+
+		if ( is_array($values) && count($values) )
+		{
+			foreach ( $values as $value )
+				assert ( is_numeric($value) );
+
+			$this->_filters[] = array ( "type"=>SPH_FILTER_VALUES, "attr"=>$attribute, "exclude"=>$exclude, "values"=>$values );
+		}
+	}
+
+	/// set range filter
+	/// only match records if $attribute value is beetwen $min and $max (inclusive)
+	function SetFilterRange ( $attribute, $min, $max, $exclude=false )
+	{
+		assert ( is_string($attribute) );
+		assert ( is_numeric($min) );
+		assert ( is_numeric($max) );
+		assert ( $min<=$max );
+
+		$this->_filters[] = array ( "type"=>SPH_FILTER_RANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max );
+	}
+
+	/// set float range filter
+	/// only match records if $attribute value is beetwen $min and $max (inclusive)
+	function SetFilterFloatRange ( $attribute, $min, $max, $exclude=false )
+	{
+		assert ( is_string($attribute) );
+		assert ( is_float($min) );
+		assert ( is_float($max) );
+		assert ( $min<=$max );
+
+		$this->_filters[] = array ( "type"=>SPH_FILTER_FLOATRANGE, "attr"=>$attribute, "exclude"=>$exclude, "min"=>$min, "max"=>$max );
+	}
+
+	/// setup anchor point for geosphere distance calculations
+	/// required to use @geodist in filters and sorting
+	/// latitude and longitude must be in radians
+	function SetGeoAnchor ( $attrlat, $attrlong, $lat, $long )
+	{
+		assert ( is_string($attrlat) );
+		assert ( is_string($attrlong) );
+		assert ( is_float($lat) );
+		assert ( is_float($long) );
+
+		$this->_anchor = array ( "attrlat"=>$attrlat, "attrlong"=>$attrlong, "lat"=>$lat, "long"=>$long );
+	}
+
+	/// set grouping attribute and function
+	function SetGroupBy ( $attribute, $func, $groupsort="@group desc" )
+	{
+		assert ( is_string($attribute) );
+		assert ( is_string($groupsort) );
+		assert ( $func==SPH_GROUPBY_DAY
+			|| $func==SPH_GROUPBY_WEEK
+			|| $func==SPH_GROUPBY_MONTH
+			|| $func==SPH_GROUPBY_YEAR
+			|| $func==SPH_GROUPBY_ATTR
+			|| $func==SPH_GROUPBY_ATTRPAIR );
+
+		$this->_groupby = $attribute;
+		$this->_groupfunc = $func;
+		$this->_groupsort = $groupsort;
+	}
+
+	/// set count-distinct attribute for group-by queries
+	function SetGroupDistinct ( $attribute )
+	{
+		assert ( is_string($attribute) );
+		$this->_groupdistinct = $attribute;
+	}
+
+	/// set distributed retries count and delay
+	function SetRetries ( $count, $delay=0 )
+	{
+		assert ( is_int($count) && $count>=0 );
+		assert ( is_int($delay) && $delay>=0 );
+		$this->_retrycount = $count;
+		$this->_retrydelay = $delay;
+	}
+
+	/// set result set format (hash or array; hash by default)
+	/// PHP specific; needed for group-by-MVA result sets that may contain duplicate IDs
+	function SetArrayResult ( $arrayresult )
+	{
+		assert ( is_bool($arrayresult) );
+		$this->_arrayresult = $arrayresult;
+	}
+
+	/// set attribute values override
+	/// there can be only one override per attribute
+	/// $values must be a hash that maps document IDs to attribute values
+	function SetOverride ( $attrname, $attrtype, $values )
+	{
+		assert ( is_string ( $attrname ) );
+		assert ( in_array ( $attrtype, array ( SPH_ATTR_INTEGER, SPH_ATTR_TIMESTAMP, SPH_ATTR_BOOL, SPH_ATTR_FLOAT, SPH_ATTR_BIGINT ) ) );
+		assert ( is_array ( $values ) );
+
+		$this->_overrides[$attrname] = array ( "attr"=>$attrname, "type"=>$attrtype, "values"=>$values );
+	}
+
+	/// set select-list (attributes or expressions), SQL-like syntax
+	function SetSelect ( $select )
+	{
+		assert ( is_string ( $select ) );
+		$this->_select = $select;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////
+
+	/// clear all filters (for multi-queries)
+	function ResetFilters ()
+	{
+		$this->_filters = array();
+		$this->_anchor = array();
+	}
+
+	/// clear groupby settings (for multi-queries)
+	function ResetGroupBy ()
+	{
+		$this->_groupby		= "";
+		$this->_groupfunc	= SPH_GROUPBY_DAY;
+		$this->_groupsort	= "@group desc";
+		$this->_groupdistinct= "";
+	}
+
+	/// clear all attribute value overrides (for multi-queries)
+	function ResetOverrides ()
+    {
+    	$this->_overrides = array ();
+    }
+
+	//////////////////////////////////////////////////////////////////////////////
+
+	/// connect to searchd server, run given search query through given indexes,
+	/// and return the search results
+	function Query ( $query, $index="*", $comment="" )
+	{
+		assert ( empty($this->_reqs) );
+
+		$this->AddQuery ( $query, $index, $comment );
+		$results = $this->RunQueries ();
+		$this->_reqs = array (); // just in case it failed too early
+
+		if ( !is_array($results) )
+			return false; // probably network error; error message should be already filled
+
+		$this->_error = $results[0]["error"];
+		$this->_warning = $results[0]["warning"];
+		if ( $results[0]["status"]==SEARCHD_ERROR )
+			return false;
+		else
+			return $results[0];
+	}
+
+	/// helper to pack floats in network byte order
+	function _PackFloat ( $f )
+	{
+		$t1 = pack ( "f", $f ); // machine order
+		list(,$t2) = unpack ( "L*", $t1 ); // int in machine order
+		return pack ( "N", $t2 );
+	}
+
+	/// add query to multi-query batch
+	/// returns index into results array from RunQueries() call
+	function AddQuery ( $query, $index="*", $comment="" )
+	{
+		// mbstring workaround
+		$this->_MBPush ();
+
+		// build request
+		$req = pack ( "NNNN", $this->_offset, $this->_limit, $this->_mode, $this->_ranker );
+		if ( $this->_ranker==SPH_RANK_EXPR )
+			$req .= pack ( "N", strlen($this->_rankexpr) ) . $this->_rankexpr;
+		$req .= pack ( "N", $this->_sort ); // (deprecated) sort mode
+		$req .= pack ( "N", strlen($this->_sortby) ) . $this->_sortby;
+		$req .= pack ( "N", strlen($query) ) . $query; // query itself
+		$req .= pack ( "N", count($this->_weights) ); // weights
+		foreach ( $this->_weights as $weight )
+			$req .= pack ( "N", (int)$weight );
+		$req .= pack ( "N", strlen($index) ) . $index; // indexes
+		$req .= pack ( "N", 1 ); // id64 range marker
+		$req .= sphPackU64 ( $this->_min_id ) . sphPackU64 ( $this->_max_id ); // id64 range
+
+		// filters
+		$req .= pack ( "N", count($this->_filters) );
+		foreach ( $this->_filters as $filter )
+		{
+			$req .= pack ( "N", strlen($filter["attr"]) ) . $filter["attr"];
+			$req .= pack ( "N", $filter["type"] );
+			switch ( $filter["type"] )
+			{
+				case SPH_FILTER_VALUES:
+					$req .= pack ( "N", count($filter["values"]) );
+					foreach ( $filter["values"] as $value )
+						$req .= sphPackI64 ( $value );
+					break;
+
+				case SPH_FILTER_RANGE:
+					$req .= sphPackI64 ( $filter["min"] ) . sphPackI64 ( $filter["max"] );
+					break;
+
+				case SPH_FILTER_FLOATRANGE:
+					$req .= $this->_PackFloat ( $filter["min"] ) . $this->_PackFloat ( $filter["max"] );
+					break;
+
+				default:
+					assert ( 0 && "internal error: unhandled filter type" );
+			}
+			$req .= pack ( "N", $filter["exclude"] );
+		}
+
+		// group-by clause, max-matches count, group-sort clause, cutoff count
+		$req .= pack ( "NN", $this->_groupfunc, strlen($this->_groupby) ) . $this->_groupby;
+		$req .= pack ( "N", $this->_maxmatches );
+		$req .= pack ( "N", strlen($this->_groupsort) ) . $this->_groupsort;
+		$req .= pack ( "NNN", $this->_cutoff, $this->_retrycount, $this->_retrydelay );
+		$req .= pack ( "N", strlen($this->_groupdistinct) ) . $this->_groupdistinct;
+
+		// anchor point
+		if ( empty($this->_anchor) )
+		{
+			$req .= pack ( "N", 0 );
+		} else
+		{
+			$a =& $this->_anchor;
+			$req .= pack ( "N", 1 );
+			$req .= pack ( "N", strlen($a["attrlat"]) ) . $a["attrlat"];
+			$req .= pack ( "N", strlen($a["attrlong"]) ) . $a["attrlong"];
+			$req .= $this->_PackFloat ( $a["lat"] ) . $this->_PackFloat ( $a["long"] );
+		}
+
+		// per-index weights
+		$req .= pack ( "N", count($this->_indexweights) );
+		foreach ( $this->_indexweights as $idx=>$weight )
+			$req .= pack ( "N", strlen($idx) ) . $idx . pack ( "N", $weight );
+
+		// max query time
+		$req .= pack ( "N", $this->_maxquerytime );
+
+		// per-field weights
+		$req .= pack ( "N", count($this->_fieldweights) );
+		foreach ( $this->_fieldweights as $field=>$weight )
+			$req .= pack ( "N", strlen($field) ) . $field . pack ( "N", $weight );
+
+		// comment
+		$req .= pack ( "N", strlen($comment) ) . $comment;
+
+		// attribute overrides
+		$req .= pack ( "N", count($this->_overrides) );
+		foreach ( $this->_overrides as $key => $entry )
+		{
+			$req .= pack ( "N", strlen($entry["attr"]) ) . $entry["attr"];
+			$req .= pack ( "NN", $entry["type"], count($entry["values"]) );
+			foreach ( $entry["values"] as $id=>$val )
+			{
+				assert ( is_numeric($id) );
+				assert ( is_numeric($val) );
+
+				$req .= sphPackU64 ( $id );
+				switch ( $entry["type"] )
+				{
+					case SPH_ATTR_FLOAT:	$req .= $this->_PackFloat ( $val ); break;
+					case SPH_ATTR_BIGINT:	$req .= sphPackI64 ( $val ); break;
+					default:				$req .= pack ( "N", $val ); break;
+				}
+			}
+		}
+
+		// select-list
+		$req .= pack ( "N", strlen($this->_select) ) . $this->_select;
+
+		// mbstring workaround
+		$this->_MBPop ();
+
+		// store request to requests array
+		$this->_reqs[] = $req;
+		return count($this->_reqs)-1;
+	}
+
+	/// connect to searchd, run queries batch, and return an array of result sets
+	function RunQueries ()
+	{
+		if ( empty($this->_reqs) )
+		{
+			$this->_error = "no queries defined, issue AddQuery() first";
+			return false;
+		}
+
+		// mbstring workaround
+		$this->_MBPush ();
+
+		if (!( $fp = $this->_Connect() ))
+		{
+			$this->_MBPop ();
+			return false;
+		}
+
+		// send query, get response
+		$nreqs = count($this->_reqs);
+		$req = join ( "", $this->_reqs );
+		$len = 8+strlen($req);
+		$req = pack ( "nnNNN", SEARCHD_COMMAND_SEARCH, VER_COMMAND_SEARCH, $len, 0, $nreqs ) . $req; // add header
+
+		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
+			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_SEARCH ) ) )
+		{
+			$this->_MBPop ();
+			return false;
+		}
+
+		// query sent ok; we can reset reqs now
+		$this->_reqs = array ();
+
+		// parse and return response
+		return $this->_ParseSearchResponse ( $response, $nreqs );
+	}
+
+	/// parse and return search query (or queries) response
+	function _ParseSearchResponse ( $response, $nreqs )
+	{
+		$p = 0; // current position
+		$max = strlen($response); // max position for checks, to protect against broken responses
+
+		$results = array ();
+		for ( $ires=0; $ires<$nreqs && $p<$max; $ires++ )
+		{
+			$results[] = array();
+			$result =& $results[$ires];
+
+			$result["error"] = "";
+			$result["warning"] = "";
+
+			// extract status
+			list(,$status) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+			$result["status"] = $status;
+			if ( $status!=SEARCHD_OK )
+			{
+				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+				$message = substr ( $response, $p, $len ); $p += $len;
+
+				if ( $status==SEARCHD_WARNING )
+				{
+					$result["warning"] = $message;
+				} else
+				{
+					$result["error"] = $message;
+					continue;
+				}
+			}
+
+			// read schema
+			$fields = array ();
+			$attrs = array ();
+
+			list(,$nfields) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+			while ( $nfields-->0 && $p<$max )
+			{
+				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+				$fields[] = substr ( $response, $p, $len ); $p += $len;
+			}
+			$result["fields"] = $fields;
+
+			list(,$nattrs) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+			while ( $nattrs-->0 && $p<$max  )
+			{
+				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+				$attr = substr ( $response, $p, $len ); $p += $len;
+				list(,$type) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+				$attrs[$attr] = $type;
+			}
+			$result["attrs"] = $attrs;
+
+			// read match count
+			list(,$count) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+			list(,$id64) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+
+			// read matches
+			$idx = -1;
+			while ( $count-->0 && $p<$max )
+			{
+				// index into result array
+				$idx++;
+
+				// parse document id and weight
+				if ( $id64 )
+				{
+					$doc = sphUnpackU64 ( substr ( $response, $p, 8 ) ); $p += 8;
+					list(,$weight) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+				}
+				else
+				{
+					list ( $doc, $weight ) = array_values ( unpack ( "N*N*",
+						substr ( $response, $p, 8 ) ) );
+					$p += 8;
+					$doc = sphFixUint($doc);
+				}
+				$weight = sprintf ( "%u", $weight );
+
+				// create match entry
+				if ( $this->_arrayresult )
+					$result["matches"][$idx] = array ( "id"=>$doc, "weight"=>$weight );
+				else
+					$result["matches"][$doc]["weight"] = $weight;
+
+				// parse and create attributes
+				$attrvals = array ();
+				foreach ( $attrs as $attr=>$type )
+				{
+					// handle 64bit ints
+					if ( $type==SPH_ATTR_BIGINT )
+					{
+						$attrvals[$attr] = sphUnpackI64 ( substr ( $response, $p, 8 ) ); $p += 8;
+						continue;
+					}
+
+					// handle floats
+					if ( $type==SPH_ATTR_FLOAT )
+					{
+						list(,$uval) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+						list(,$fval) = unpack ( "f*", pack ( "L", $uval ) ); 
+						$attrvals[$attr] = $fval;
+						continue;
+					}
+
+					// handle everything else as unsigned ints
+					list(,$val) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+					if ( $type==SPH_ATTR_MULTI )
+					{
+						$attrvals[$attr] = array ();
+						$nvalues = $val;
+						while ( $nvalues-->0 && $p<$max )
+						{
+							list(,$val) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+							$attrvals[$attr][] = sphFixUint($val);
+						}
+					} else if ( $type==SPH_ATTR_MULTI64 )
+					{
+						$attrvals[$attr] = array ();
+						$nvalues = $val;
+						while ( $nvalues>0 && $p<$max )
+						{
+							$attrvals[$attr][] = sphUnpackU64 ( substr ( $response, $p, 8 ) ); $p += 8;
+							$nvalues -= 2;
+						}
+					} else if ( $type==SPH_ATTR_STRING )
+					{
+						$attrvals[$attr] = substr ( $response, $p, $val );
+						$p += $val;						
+					} else
+					{
+						$attrvals[$attr] = sphFixUint($val);
+					}
+				}
+
+				if ( $this->_arrayresult )
+					$result["matches"][$idx]["attrs"] = $attrvals;
+				else
+					$result["matches"][$doc]["attrs"] = $attrvals;
+			}
+
+			list ( $total, $total_found, $msecs, $words ) =
+				array_values ( unpack ( "N*N*N*N*", substr ( $response, $p, 16 ) ) );
+			$result["total"] = sprintf ( "%u", $total );
+			$result["total_found"] = sprintf ( "%u", $total_found );
+			$result["time"] = sprintf ( "%.3f", $msecs/1000 );
+			$p += 16;
+
+			while ( $words-->0 && $p<$max )
+			{
+				list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+				$word = substr ( $response, $p, $len ); $p += $len;
+				list ( $docs, $hits ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
+				$result["words"][$word] = array (
+					"docs"=>sprintf ( "%u", $docs ),
+					"hits"=>sprintf ( "%u", $hits ) );
+			}
+		}
+
+		$this->_MBPop ();
+		return $results;
+	}
+
+	/////////////////////////////////////////////////////////////////////////////
+	// excerpts generation
+	/////////////////////////////////////////////////////////////////////////////
+
+	/// connect to searchd server, and generate exceprts (snippets)
+	/// of given documents for given query. returns false on failure,
+	/// an array of snippets on success
+	function BuildExcerpts ( $docs, $index, $words, $opts=array() )
+	{
+		assert ( is_array($docs) );
+		assert ( is_string($index) );
+		assert ( is_string($words) );
+		assert ( is_array($opts) );
+
+		$this->_MBPush ();
+
+		if (!( $fp = $this->_Connect() ))
+		{
+			$this->_MBPop();
+			return false;
+		}
+
+		/////////////////
+		// fixup options
+		/////////////////
+
+		if ( !isset($opts["before_match"]) )		$opts["before_match"] = "<b>";
+		if ( !isset($opts["after_match"]) )			$opts["after_match"] = "</b>";
+		if ( !isset($opts["chunk_separator"]) )		$opts["chunk_separator"] = " ... ";
+		if ( !isset($opts["limit"]) )				$opts["limit"] = 256;
+		if ( !isset($opts["limit_passages"]) )		$opts["limit_passages"] = 0;
+		if ( !isset($opts["limit_words"]) )			$opts["limit_words"] = 0;
+		if ( !isset($opts["around"]) )				$opts["around"] = 5;
+		if ( !isset($opts["exact_phrase"]) )		$opts["exact_phrase"] = false;
+		if ( !isset($opts["single_passage"]) )		$opts["single_passage"] = false;
+		if ( !isset($opts["use_boundaries"]) )		$opts["use_boundaries"] = false;
+		if ( !isset($opts["weight_order"]) )		$opts["weight_order"] = false;
+		if ( !isset($opts["query_mode"]) )			$opts["query_mode"] = false;
+		if ( !isset($opts["force_all_words"]) )		$opts["force_all_words"] = false;
+		if ( !isset($opts["start_passage_id"]) )	$opts["start_passage_id"] = 1;
+		if ( !isset($opts["load_files"]) )			$opts["load_files"] = false;
+		if ( !isset($opts["html_strip_mode"]) )		$opts["html_strip_mode"] = "index";
+		if ( !isset($opts["allow_empty"]) )			$opts["allow_empty"] = false;
+		if ( !isset($opts["passage_boundary"]) )	$opts["passage_boundary"] = "none";
+		if ( !isset($opts["emit_zones"]) )			$opts["emit_zones"] = false;
+		if ( !isset($opts["load_files_scattered"]) )		$opts["load_files_scattered"] = false;
+		
+
+		/////////////////
+		// build request
+		/////////////////
+
+		// v.1.2 req
+		$flags = 1; // remove spaces
+		if ( $opts["exact_phrase"] )	$flags |= 2;
+		if ( $opts["single_passage"] )	$flags |= 4;
+		if ( $opts["use_boundaries"] )	$flags |= 8;
+		if ( $opts["weight_order"] )	$flags |= 16;
+		if ( $opts["query_mode"] )		$flags |= 32;
+		if ( $opts["force_all_words"] )	$flags |= 64;
+		if ( $opts["load_files"] )		$flags |= 128;
+		if ( $opts["allow_empty"] )		$flags |= 256;
+		if ( $opts["emit_zones"] )		$flags |= 512;
+		if ( $opts["load_files_scattered"] )	$flags |= 1024;
+		$req = pack ( "NN", 0, $flags ); // mode=0, flags=$flags
+		$req .= pack ( "N", strlen($index) ) . $index; // req index
+		$req .= pack ( "N", strlen($words) ) . $words; // req words
+
+		// options
+		$req .= pack ( "N", strlen($opts["before_match"]) ) . $opts["before_match"];
+		$req .= pack ( "N", strlen($opts["after_match"]) ) . $opts["after_match"];
+		$req .= pack ( "N", strlen($opts["chunk_separator"]) ) . $opts["chunk_separator"];
+		$req .= pack ( "NN", (int)$opts["limit"], (int)$opts["around"] );
+		$req .= pack ( "NNN", (int)$opts["limit_passages"], (int)$opts["limit_words"], (int)$opts["start_passage_id"] ); // v.1.2
+		$req .= pack ( "N", strlen($opts["html_strip_mode"]) ) . $opts["html_strip_mode"];
+		$req .= pack ( "N", strlen($opts["passage_boundary"]) ) . $opts["passage_boundary"];
+
+		// documents
+		$req .= pack ( "N", count($docs) );
+		foreach ( $docs as $doc )
+		{
+			assert ( is_string($doc) );
+			$req .= pack ( "N", strlen($doc) ) . $doc;
+		}
+
+		////////////////////////////
+		// send query, get response
+		////////////////////////////
+
+		$len = strlen($req);
+		$req = pack ( "nnN", SEARCHD_COMMAND_EXCERPT, VER_COMMAND_EXCERPT, $len ) . $req; // add header
+		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
+			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_EXCERPT ) ) )
+		{
+			$this->_MBPop ();
+			return false;
+		}
+
+		//////////////////
+		// parse response
+		//////////////////
+
+		$pos = 0;
+		$res = array ();
+		$rlen = strlen($response);
+		for ( $i=0; $i<count($docs); $i++ )
+		{
+			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );
+			$pos += 4;
+
+			if ( $pos+$len > $rlen )
+			{
+				$this->_error = "incomplete reply";
+				$this->_MBPop ();
+				return false;
+			}
+			$res[] = $len ? substr ( $response, $pos, $len ) : "";
+			$pos += $len;
+		}
+
+		$this->_MBPop ();
+		return $res;
+	}
+
+
+	/////////////////////////////////////////////////////////////////////////////
+	// keyword generation
+	/////////////////////////////////////////////////////////////////////////////
+
+	/// connect to searchd server, and generate keyword list for a given query
+	/// returns false on failure,
+	/// an array of words on success
+	function BuildKeywords ( $query, $index, $hits )
+	{
+		assert ( is_string($query) );
+		assert ( is_string($index) );
+		assert ( is_bool($hits) );
+
+		$this->_MBPush ();
+
+		if (!( $fp = $this->_Connect() ))
+		{
+			$this->_MBPop();
+			return false;
+		}
+
+		/////////////////
+		// build request
+		/////////////////
+
+		// v.1.0 req
+		$req  = pack ( "N", strlen($query) ) . $query; // req query
+		$req .= pack ( "N", strlen($index) ) . $index; // req index
+		$req .= pack ( "N", (int)$hits );
+
+		////////////////////////////
+		// send query, get response
+		////////////////////////////
+
+		$len = strlen($req);
+		$req = pack ( "nnN", SEARCHD_COMMAND_KEYWORDS, VER_COMMAND_KEYWORDS, $len ) . $req; // add header
+		if ( !( $this->_Send ( $fp, $req, $len+8 ) ) ||
+			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_KEYWORDS ) ) )
+		{
+			$this->_MBPop ();
+			return false;
+		}
+
+		//////////////////
+		// parse response
+		//////////////////
+
+		$pos = 0;
+		$res = array ();
+		$rlen = strlen($response);
+		list(,$nwords) = unpack ( "N*", substr ( $response, $pos, 4 ) );
+		$pos += 4;
+		for ( $i=0; $i<$nwords; $i++ )
+		{
+			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
+			$tokenized = $len ? substr ( $response, $pos, $len ) : "";
+			$pos += $len;
+
+			list(,$len) = unpack ( "N*", substr ( $response, $pos, 4 ) );	$pos += 4;
+			$normalized = $len ? substr ( $response, $pos, $len ) : "";
+			$pos += $len;
+
+			$res[] = array ( "tokenized"=>$tokenized, "normalized"=>$normalized );
+
+			if ( $hits )
+			{
+				list($ndocs,$nhits) = array_values ( unpack ( "N*N*", substr ( $response, $pos, 8 ) ) );
+				$pos += 8;
+				$res [$i]["docs"] = $ndocs;
+				$res [$i]["hits"] = $nhits;
+			}
+
+			if ( $pos > $rlen )
+			{
+				$this->_error = "incomplete reply";
+				$this->_MBPop ();
+				return false;
+			}
+		}
+
+		$this->_MBPop ();
+		return $res;
+	}
+
+	function EscapeString ( $string )
+	{
+		$from = array ( '\\', '(',')','|','-','!','@','~','"','&', '/', '^', '$', '=' );
+		$to   = array ( '\\\\', '\(','\)','\|','\-','\!','\@','\~','\"', '\&', '\/', '\^', '\$', '\=' );
+
+		return str_replace ( $from, $to, $string );
+	}
+
+	/////////////////////////////////////////////////////////////////////////////
+	// attribute updates
+	/////////////////////////////////////////////////////////////////////////////
+
+	/// batch update given attributes in given rows in given indexes
+	/// returns amount of updated documents (0 or more) on success, or -1 on failure
+	function UpdateAttributes ( $index, $attrs, $values, $mva=false )
+	{
+		// verify everything
+		assert ( is_string($index) );
+		assert ( is_bool($mva) );
+
+		assert ( is_array($attrs) );
+		foreach ( $attrs as $attr )
+			assert ( is_string($attr) );
+
+		assert ( is_array($values) );
+		foreach ( $values as $id=>$entry )
+		{
+			assert ( is_numeric($id) );
+			assert ( is_array($entry) );
+			assert ( count($entry)==count($attrs) );
+			foreach ( $entry as $v )
+			{
+				if ( $mva )
+				{
+					assert ( is_array($v) );
+					foreach ( $v as $vv )
+						assert ( is_int($vv) );
+				} else
+					assert ( is_int($v) );
+			}
+		}
+
+		// build request
+		$this->_MBPush ();
+		$req = pack ( "N", strlen($index) ) . $index;
+
+		$req .= pack ( "N", count($attrs) );
+		foreach ( $attrs as $attr )
+		{
+			$req .= pack ( "N", strlen($attr) ) . $attr;
+			$req .= pack ( "N", $mva ? 1 : 0 );
+		}
+
+		$req .= pack ( "N", count($values) );
+		foreach ( $values as $id=>$entry )
+		{
+			$req .= sphPackU64 ( $id );
+			foreach ( $entry as $v )
+			{
+				$req .= pack ( "N", $mva ? count($v) : $v );
+				if ( $mva )
+					foreach ( $v as $vv )
+						$req .= pack ( "N", $vv );
+			}
+		}
+
+		// connect, send query, get response
+		if (!( $fp = $this->_Connect() ))
+		{
+			$this->_MBPop ();
+			return -1;
+		}
+
+		$len = strlen($req);
+		$req = pack ( "nnN", SEARCHD_COMMAND_UPDATE, VER_COMMAND_UPDATE, $len ) . $req; // add header
+		if ( !$this->_Send ( $fp, $req, $len+8 ) )
+		{
+			$this->_MBPop ();
+			return -1;
+		}
+
+		if (!( $response = $this->_GetResponse ( $fp, VER_COMMAND_UPDATE ) ))
+		{
+			$this->_MBPop ();
+			return -1;
+		}
+
+		// parse response
+		list(,$updated) = unpack ( "N*", substr ( $response, 0, 4 ) );
+		$this->_MBPop ();
+		return $updated;
+	}
+
+	/////////////////////////////////////////////////////////////////////////////
+	// persistent connections
+	/////////////////////////////////////////////////////////////////////////////
+
+	function Open()
+	{
+		if ( $this->_socket !== false )
+		{
+			$this->_error = 'already connected';
+			return false;
+		}
+		if ( !$fp = $this->_Connect() )
+			return false;
+
+		// command, command version = 0, body length = 4, body = 1
+		$req = pack ( "nnNN", SEARCHD_COMMAND_PERSIST, 0, 4, 1 );
+		if ( !$this->_Send ( $fp, $req, 12 ) )
+			return false;
+
+		$this->_socket = $fp;
+		return true;
+	}
+
+	function Close()
+	{
+		if ( $this->_socket === false )
+		{
+			$this->_error = 'not connected';
+			return false;
+		}
+
+		fclose ( $this->_socket );
+		$this->_socket = false;
+		
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// status
+	//////////////////////////////////////////////////////////////////////////
+
+	function Status ()
+	{
+		$this->_MBPush ();
+		if (!( $fp = $this->_Connect() ))
+		{
+			$this->_MBPop();
+			return false;
+		}
+
+		$req = pack ( "nnNN", SEARCHD_COMMAND_STATUS, VER_COMMAND_STATUS, 4, 1 ); // len=4, body=1
+		if ( !( $this->_Send ( $fp, $req, 12 ) ) ||
+			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_STATUS ) ) )
+		{
+			$this->_MBPop ();
+			return false;
+		}
+
+		$res = substr ( $response, 4 ); // just ignore length, error handling, etc
+		$p = 0;
+		list ( $rows, $cols ) = array_values ( unpack ( "N*N*", substr ( $response, $p, 8 ) ) ); $p += 8;
+
+		$res = array();
+		for ( $i=0; $i<$rows; $i++ )
+			for ( $j=0; $j<$cols; $j++ )
+		{
+			list(,$len) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
+			$res[$i][] = substr ( $response, $p, $len ); $p += $len;
+		}
+
+		$this->_MBPop ();
+		return $res;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	// flush
+	//////////////////////////////////////////////////////////////////////////
+
+	function FlushAttributes ()
+	{
+		$this->_MBPush ();
+		if (!( $fp = $this->_Connect() ))
+		{
+			$this->_MBPop();
+			return -1;
+		}
+
+		$req = pack ( "nnN", SEARCHD_COMMAND_FLUSHATTRS, VER_COMMAND_FLUSHATTRS, 0 ); // len=0
+		if ( !( $this->_Send ( $fp, $req, 8 ) ) ||
+			 !( $response = $this->_GetResponse ( $fp, VER_COMMAND_FLUSHATTRS ) ) )
+		{
+			$this->_MBPop ();
+			return -1;
+		}
+
+		$tag = -1;
+		if ( strlen($response)==4 )
+			list(,$tag) = unpack ( "N*", $response );
+		else
+			$this->_error = "unexpected response length";
+
+		$this->_MBPop ();
+		return $tag;
+	}
+}
+
+//
+// $Id: sphinxapi.php 3087 2012-01-30 23:07:35Z shodan $
+//
-- 
cgit v1.2.1


From 8a28271dd500b3623e1402339252504468e567f6 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 7 Dec 2012 21:23:20 -0600
Subject: [ticket/11257] Do not require set_name() method to exist

To use Service Collection

PHPBB3-11257
---
 phpBB/includes/di/service_collection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/di/service_collection.php b/phpBB/includes/di/service_collection.php
index 60323c8dba..880cb46d4d 100644
--- a/phpBB/includes/di/service_collection.php
+++ b/phpBB/includes/di/service_collection.php
@@ -43,7 +43,7 @@ class phpbb_di_service_collection extends ArrayObject
 	public function add($name)
 	{
 		$task = $this->container->get($name);
-		$task->set_name($name);
+
 		$this->offsetSet($name, $task);
 	}
 }
-- 
cgit v1.2.1


From b91ba8d5f1c05bc285e3f3b24fc5ffd50f6ee3ed Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Dec 2012 13:18:11 -0600
Subject: [ticket/11103] Newlines at end of files

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/user_loader.php b/phpBB/includes/user_loader.php
index a530f21f75..c7a6a103f8 100644
--- a/phpBB/includes/user_loader.php
+++ b/phpBB/includes/user_loader.php
@@ -115,4 +115,4 @@ class phpbb_user_loader
 
 		return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height']);
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1


From 2227ceab8bf0cccf95598f4e2a59cc7134adf7f0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Dec 2012 13:56:39 -0600
Subject: [ticket/11103] Use $request->variable rather than request_var

PHPBB3-11103
---
 phpBB/includes/ucp/ucp_notifications.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index e8ceac3f59..76fc411584 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -26,8 +26,8 @@ class ucp_notifications
 
 		add_form_key('ucp_notification');
 
-		$start = request_var('start', 0);
-		$form_time = min(request_var('form_time', 0), time());
+		$start = $request->variable('start', 0);
+		$form_time = min($request->variable('form_time', 0), time());
 
 		switch ($mode)
 		{
@@ -87,7 +87,7 @@ class ucp_notifications
 			case 'notification_list':
 			default:
 				// Mark all items read
-				if (request_var('mark', '') == 'all' && (confirm_box(true) || check_link_hash(request_var('token', ''), 'mark_all_notifications_read')))
+				if ($request->variable('mark', '') == 'all' && (confirm_box(true) || check_link_hash($request->variable('token', ''), 'mark_all_notifications_read')))
 				{
 					if (confirm_box(true))
 					{
@@ -114,7 +114,7 @@ class ucp_notifications
 						trigger_error('FORM_INVALID');
 					}
 
-					$mark_read = request_var('mark', array(0));
+					$mark_read = $request->variable('mark', array(0));
 
 					if (!empty($mark_read))
 					{
-- 
cgit v1.2.1


From c0534f9e5d1527426f5a80276cf8a08323334ef1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Dec 2012 14:28:38 -0600
Subject: [ticket/11103] User Loader constructor docs

PHPBB3-11103
---
 phpBB/includes/user_loader.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/user_loader.php b/phpBB/includes/user_loader.php
index c7a6a103f8..914770e335 100644
--- a/phpBB/includes/user_loader.php
+++ b/phpBB/includes/user_loader.php
@@ -43,6 +43,14 @@ class phpbb_user_loader
 	*/
 	protected $users = array();
 
+	/**
+	* User loader constructor
+	*
+	* @param dbal $db A database connection
+	* @param string $phpbb_root_path Path to the phpbb includes directory.
+	* @param string $php_ext php file extension
+	* @param string $users_table The name of the database table (phpbb_users)
+	*/
 	public function __construct(dbal $db, $phpbb_root_path, $php_ext, $users_table)
 	{
 		$this->db = $db;
-- 
cgit v1.2.1


From 37565f37e4363f257a160145bc7973a2d5738a86 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 8 Dec 2012 18:40:41 -0600
Subject: [ticket/11103] Some improvements to the user loader

PHPBB3-11103
---
 phpBB/includes/notification/type/pm.php            |   4 +-
 phpBB/includes/notification/type/post.php          |   8 +-
 phpBB/includes/notification/type/report_pm.php     |   6 +-
 .../notification/type/report_pm_closed.php         |   4 +-
 phpBB/includes/notification/type/report_post.php   |   4 +-
 .../notification/type/report_post_closed.php       |   4 +-
 phpBB/includes/notification/type/topic.php         |   8 +-
 phpBB/includes/user_loader.php                     | 117 +++++++++++++++++++--
 8 files changed, 121 insertions(+), 34 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index 1eaeb1a250..8d31c87817 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -112,9 +112,7 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 	*/
 	public function get_title()
 	{
-		$user_data = $this->user_loader->get_user($this->get_data('from_user_id'));
-
-		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		$username = $this->user_loader->get_username($this->get_data('from_user_id'), 'no_profile');
 
 		return $this->user->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
 	}
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 7e06779982..0646282c94 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -181,9 +181,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			}
 			else
 			{
-				$user_data = $this->user_loader->get_user($responder['poster_id']);
-
-				$usernames[] = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+				$usernames[] = $this->user_loader->get_username($responder['poster_id'], 'no_profile');
 			}
 		}
 
@@ -217,9 +215,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		}
 		else
 		{
-			$user_data = $this->user_loader->get_user($this->get_data('poster_id'));
-
-			$username = get_username_string('username', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile');
 		}
 
 		return array(
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 73e22dc83b..877e8209e3 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -160,9 +160,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	{
 		$this->user->add_lang('mcp');
 
-		$user_data = $this->user_loader->get_user($this->get_data('reporter_id'));
-
-		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		$username = $this->user_loader->get_username($this->get_data('reporter_id'), 'no_profile');
 
 		if ($this->get_data('report_text'))
 		{
@@ -186,7 +184,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 
 		return $this->user->lang(
 			$this->language_key,
-				$username,
+			$username,
 			censor_text($this->get_data('message_subject')),
 			$this->get_data('reason_description')
 		);
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index 51e5204304..2d60ae21d4 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -106,9 +106,7 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
 	*/
 	public function get_title()
 	{
-		$user_data = $this->user_loader->get_user($this->get_data('closer_id'));
-
-		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		$username = $this->user_loader->get_username($this->get_data('closer_id'), 'no_profile');
 
 		return $this->user->lang(
 			$this->language_key,
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index 2508644b0b..0334fdb109 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -127,9 +127,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	{
 		$this->user->add_lang('mcp');
 
-		$user_data = $this->user_loader->get_user($this->get_data('reporter_id'));
-
-		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		$username = $this->user_loader->get_username($this->get_data('reporter_id'), 'no_profile');
 
 		if ($this->get_data('report_text'))
 		{
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index a7016a8f3d..3282ba7d8c 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -106,9 +106,7 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
 	*/
 	public function get_title()
 	{
-		$user_data = $this->user_loader->get_user($this->get_data('closer_id'));
-
-		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		$username = $this->user_loader->get_username($this->get_data('closer_id'), 'no_profile');
 
 		return $this->user->lang(
 			$this->language_key,
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 6e9347d4a8..614d644501 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -142,9 +142,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		}
 		else
 		{
-			$user_data = $this->user_loader->get_user($this->get_data('poster_id'));
-
-			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile');
 		}
 
 		return $this->user->lang(
@@ -178,9 +176,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		}
 		else
 		{
-			$user_data = $this->user_loader->get_user($this->get_data('poster_id'));
-
-			$username = get_username_string('username', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile');
 		}
 
 		return array(
diff --git a/phpBB/includes/user_loader.php b/phpBB/includes/user_loader.php
index 914770e335..db12854a60 100644
--- a/phpBB/includes/user_loader.php
+++ b/phpBB/includes/user_loader.php
@@ -91,27 +91,100 @@ class phpbb_user_loader
 		}
 	}
 
+	/**
+	* Load a user by username
+	*
+	* Stores the full data in the user cache so they do not need to be loaded again
+	* Returns the user id so you may use get_user() from the returned value
+	*
+	* @param string $username Raw username to load (will be cleaned)
+	* @return int User ID for the username
+	*/
+	public function load_user_by_username($username)
+	{
+		$sql = 'SELECT *
+			FROM ' . $this->users_table . "
+			WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($username)) . "'";
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			$this->users[$row['user_id']] = $row;
+
+			return $row['user_id'];
+		}
+
+		return ANONYMOUS;
+	}
+
 	/**
 	* Get a user row from our users cache
 	*
-	* @param int $user_id
+	* @param int $user_id User ID of the user you want to retreive
+	* @param bool $query Should we query the database if this user has not yet been loaded?
+	* 						Typically this should be left as false and you should make sure
+	* 						you load users ahead of time with load_users()
 	* @return array|bool Row from the database of the user or Anonymous if the user wasn't loaded/does not exist
 	* 						or bool False if the anonymous user was not loaded
 	*/
-	public function get_user($user_id)
+	public function get_user($user_id, $query = false)
+	{
+		if (isset($this->users[$user_id]))
+		{
+			return $this->users[$user_id];
+		}
+		// Query them if we must (if ANONYMOUS is sent as the user_id and we have not loaded Anonymous yet, we must load Anonymous as a last resort)
+		else if ($query || $user_id == ANONYMOUS)
+		{
+			$this->load_users(array($user_id));
+
+			return $this->get_user($user_id);
+		}
+
+		return $this->get_user(ANONYMOUS);
+	}
+
+	/**
+	* Get username
+	*
+	* @param int $user_id User ID of the user you want to retreive the username for
+	* @param string $mode The mode to load (same as get_username_string). One of the following:
+	* 			profile (for getting an url to the profile)
+	* 			username (for obtaining the username)
+	* 			colour (for obtaining the user colour)
+	* 			full (for obtaining a html string representing a coloured link to the users profile)
+	* 			no_profile (the same as full but forcing no profile link)
+	* @param string $guest_username Optional parameter to specify the guest username. It will be used in favor of the GUEST language variable then.
+	* @param string $custom_profile_url Optional parameter to specify a profile url. The user id get appended to this url as &amp;u={user_id}
+	* @param bool $query Should we query the database if this user has not yet been loaded?
+	* 						Typically this should be left as false and you should make sure
+	* 						you load users ahead of time with load_users()
+	* @return string
+	*/
+	public function get_username($user_id, $mode, $guest_username = false, $custom_profile_url = false, $query = false)
 	{
-		return (isset($this->users[$user_id])) ? $this->users[$user_id] : (isset($this->users[ANONYMOUS]) ? $this->users[ANONYMOUS] : false);
+		if (!($user = $this->get_user($user_id, $query)))
+		{
+			return '';
+		}
+
+		return get_username_string($mode, $user['user_id'], $user['username'], $user['user_colour'], $guest_username, $custom_profile_url);
 	}
 
 	/**
 	* Get avatar
 	*
-	* @param int $user_id
+	* @param int $user_id User ID of the user you want to retreive the avatar for
+	* @param bool $query Should we query the database if this user has not yet been loaded?
+	* 						Typically this should be left as false and you should make sure
+	* 						you load users ahead of time with load_users()
 	* @return string
 	*/
-	public function get_avatar($user_id)
+	public function get_avatar($user_id, $query = false)
 	{
-		if (!($user = $this->get_user($user_id)))
+		if (!($user = $this->get_user($user_id, $query)))
 		{
 			return '';
 		}
@@ -123,4 +196,36 @@ class phpbb_user_loader
 
 		return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height']);
 	}
+
+	/**
+	* Get rank
+	*
+	* @param int $user_id User ID of the user you want to retreive the rank for
+	* @param bool $query Should we query the database if this user has not yet been loaded?
+	* 						Typically this should be left as false and you should make sure
+	* 						you load users ahead of time with load_users()
+	* @return array Array with keys 'rank_title', 'rank_img', and 'rank_img_src'
+	*/
+	public function get_rank($user_id, $query = false)
+	{
+		if (!($user = $this->get_user($user_id, $query)))
+		{
+			return '';
+		}
+
+		if (!function_exists('get_user_rank'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+		}
+
+		$rank = array(
+			'rank_title',
+			'rank_img',
+			'rank_img_src',
+		);
+
+		get_user_rank($user['user_rank'], (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts']), $rank['rank_title'], $rank['rank_img'], $rank['rank_img_src']);
+
+		return $rank;
+	}
 }
-- 
cgit v1.2.1


From 84284a9ccee7d5ccc658c3d1f751a5254b3b9175 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Dec 2012 13:43:06 -0600
Subject: [ticket/11103] Use scope: prototype

This lets us clean up the mess that was in load_object(), but requires
scope: prototype to be added to the service definitions for all types
or methods!

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 4c25fa72f0..22f8f58783 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -779,24 +779,6 @@ class phpbb_notification_manager
 	*/
 	protected function load_object($object_name)
 	{
-		// Here we cannot just use ContainerBuilder->get(name)
-		// The reason for this is because get handles services
-		// which are initialized once and shared. Here we need
-		// separate new objects because we pass around objects
-		// that store row data in each object, which would lead
-		// to over-writing of data if we used get()
-
-		$parameterBag = $this->phpbb_container->getParameterBag();
-		$definition = $this->phpbb_container->getDefinition($object_name);
-        $arguments = $this->phpbb_container->resolveServices(
-            $parameterBag->unescapeValue($parameterBag->resolveValue($definition->getArguments()))
-        );
-		$r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass()));
-
-		$object = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
-
-		$object->set_notification_manager($this);
-
-		return $object;
+		return $this->phpbb_container->get($object_name);
 	}
 }
-- 
cgit v1.2.1


From 83b8b65016f172baa65cbbb463015602c97e9e45 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 9 Dec 2012 23:47:46 +0100
Subject: [ticket/10714] Use dependencies instead of globals

We use a setter for the admin root path, as it is not defined all the time.
Aswell as we added a setter for the table name, so it can still be used
for custom tables.

PHPBB3-10714
---
 phpBB/includes/log/log.php | 161 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 116 insertions(+), 45 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index c2ebedd6f2..3d9620a2ee 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -42,15 +42,96 @@ class phpbb_log implements phpbb_log_interface
 	*/
 	protected $log_table;
 
+	/**
+	* Database object
+	* @var dbal
+	*/
+	protected $db;
+
+	/**
+	* User object
+	* @var phpbb_user
+	*/
+	protected $user;
+
+	/**
+	* Auth object
+	* @var phpbb_auth
+	*/
+	protected $auth;
+
+	/**
+	* Event dispatcher object
+	* @var phpbb_dispatcher
+	*/
+	protected $dispatcher;
+
+	/**
+	* phpBB root path
+	* @var string
+	*/
+	protected $phpbb_root_path;
+
+	/**
+	* Admin root path
+	* @var string
+	*/
+	protected $phpbb_admin_path;
+
+	/**
+	* PHP Extension
+	* @var string
+	*/
+	protected $php_ext;
+
 	/**
 	* Constructor
 	*
-	* @param	string	$log_table		The table we use to store our logs
+	* @param	dbal		$db		Database object
+	* @param	phpbb_user	$user	User object
+	* @param	phpbb_auth	$auth	Auth object
+	* @param	phpbb_dispatcher	$phpbb_dispatcher	Event dispatcher
+	* @param	string		$phpbb_root_path		Root path
+	* @param	string		$php_ext			PHP Extension
+	* @param	string		$log_table		Name of the table we use to store our logs
+	* @return	null
 	*/
-	public function __construct($log_table)
+	public function __construct(dbal $db, phpbb_user $user, phpbb_auth $auth, phpbb_dispatcher $phpbb_dispatcher, $phpbb_root_path, $php_ext, $log_table)
 	{
+		$this->db = $db;
+		$this->user = $user;
+		$this->auth = $auth;
+		$this->dispatcher = $phpbb_dispatcher;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
 		$this->log_table = $log_table;
+
 		$this->enable();
+		$this->set_admin_path('', false);
+	}
+
+	/**
+	* Set phpbb_admin_path and is_in_admin in order to return administrative user profile links in get_logs()
+	*
+	* @param	string	$phpbb_admin_path	Full path from current file to admin root
+	* @param	bool	$is_in_admin		Are we called from within the acp?
+	* @return	null
+	*/
+	public function set_admin_path($phpbb_admin_path, $is_in_admin)
+	{
+		$this->phpbb_admin_path = $phpbb_admin_path;
+		$this->is_in_admin = (bool) $is_in_admin;
+	}
+
+	/**
+	* Set table name
+	*
+	* @param	string	$log_table		Can overwrite the table to use for the logs
+	* @return	null
+	*/
+	public function set_log_table($log_table)
+	{
+		$this->log_table = $log_table;
 	}
 
 	/**
@@ -134,8 +215,6 @@ class phpbb_log implements phpbb_log_interface
 			return false;
 		}
 
-		global $db, $phpbb_dispatcher;
-
 		if ($log_time == false)
 		{
 			$log_time = time();
@@ -208,7 +287,7 @@ class phpbb_log implements phpbb_log_interface
 		* @since 3.1-A1
 		*/
 		$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
-		extract($phpbb_dispatcher->trigger_event('core.add_log', $vars));
+		extract($this->dispatcher->trigger_event('core.add_log', $vars));
 
 		// We didn't find a log_type, so we don't save it in the database.
 		if (!isset($sql_ary['log_type']))
@@ -216,9 +295,9 @@ class phpbb_log implements phpbb_log_interface
 			return false;
 		}
 
-		$db->sql_query('INSERT INTO ' . $this->log_table . ' ' . $db->sql_build_array('INSERT', $sql_ary));
+		$this->db->sql_query('INSERT INTO ' . $this->log_table . ' ' . $this->db->sql_build_array('INSERT', $sql_ary));
 
-		return $db->sql_nextid();
+		return $this->db->sql_nextid();
 	}
 
 	/**
@@ -228,14 +307,12 @@ class phpbb_log implements phpbb_log_interface
 	*/
 	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '')
 	{
-		global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path, $phpbb_dispatcher;
-
 		$this->logs_total = 0;
 		$this->logs_offset = $offset;
 
 		$topic_id_list = $reportee_id_list = array();
 
-		$profile_url = (defined('IN_ADMIN')) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&amp;mode=overview') : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile');
+		$profile_url = ($this->is_in_admin && $this->phpbb_admin_path) ? append_sid("{$this->phpbb_admin_path}index.{$this->php_ext}", 'i=users&amp;mode=overview') : append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=viewprofile');
 
 		switch ($mode)
 		{
@@ -254,7 +331,7 @@ class phpbb_log implements phpbb_log_interface
 				}
 				else if (is_array($forum_id))
 				{
-					$sql_additional = 'AND ' . $db->sql_in_set('l.forum_id', array_map('intval', $forum_id));
+					$sql_additional = 'AND ' . $this->db->sql_in_set('l.forum_id', array_map('intval', $forum_id));
 				}
 				else if ($forum_id)
 				{
@@ -308,7 +385,7 @@ class phpbb_log implements phpbb_log_interface
 		* @since 3.1-A1
 		*/
 		$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
-		extract($phpbb_dispatcher->trigger_event('core.get_logs_modify_type', $vars));
+		extract($this->dispatcher->trigger_event('core.get_logs_modify_type', $vars));
 
 		if ($log_type === false)
 		{
@@ -332,9 +409,9 @@ class phpbb_log implements phpbb_log_interface
 					AND l.log_time >= $log_time
 					$sql_keywords
 					$sql_additional";
-			$result = $db->sql_query($sql);
-			$this->logs_total = (int) $db->sql_fetchfield('total_entries');
-			$db->sql_freeresult($result);
+			$result = $this->db->sql_query($sql);
+			$this->logs_total = (int) $this->db->sql_fetchfield('total_entries');
+			$this->db->sql_freeresult($result);
 
 			if ($this->logs_total == 0)
 			{
@@ -358,11 +435,11 @@ class phpbb_log implements phpbb_log_interface
 				$sql_keywords
 				$sql_additional
 			ORDER BY $sort_by";
-		$result = $db->sql_query_limit($sql, $limit, $this->logs_offset);
+		$result = $this->db->sql_query_limit($sql, $limit, $this->logs_offset);
 
 		$i = 0;
 		$log = array();
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$row['forum_id'] = (int) $row['forum_id'];
 			if ($row['topic_id'])
@@ -391,8 +468,8 @@ class phpbb_log implements phpbb_log_interface
 				'forum_id'			=> (int) $row['forum_id'],
 				'topic_id'			=> (int) $row['topic_id'],
 
-				'viewforum'			=> ($row['forum_id'] && $auth->acl_get('f_read', $row['forum_id'])) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : false,
-				'action'			=> (isset($user->lang[$row['log_operation']])) ? $user->lang[$row['log_operation']] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}',
+				'viewforum'			=> ($row['forum_id'] && $this->auth->acl_get('f_read', $row['forum_id'])) ? append_sid("{$this->phpbb_root_path}viewforum.{$this->php_ext}", 'f=' . $row['forum_id']) : false,
+				'action'			=> (isset($this->user->lang[$row['log_operation']])) ? $this->user->lang[$row['log_operation']] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}',
 			);
 
 			/**
@@ -404,7 +481,7 @@ class phpbb_log implements phpbb_log_interface
 			* @since 3.1-A1
 			*/
 			$vars = array('row', 'log_entry_data');
-			extract($phpbb_dispatcher->trigger_event('core.get_logs_modify_entry_data', $vars));
+			extract($this->dispatcher->trigger_event('core.get_logs_modify_entry_data', $vars));
 
 			$log[$i] = $log_entry_data;
 
@@ -413,7 +490,7 @@ class phpbb_log implements phpbb_log_interface
 				$log_data_ary = @unserialize($row['log_data']);
 				$log_data_ary = ($log_data_ary !== false) ? $log_data_ary : array();
 
-				if (isset($user->lang[$row['log_operation']]))
+				if (isset($this->user->lang[$row['log_operation']]))
 				{
 					// Check if there are more occurrences of % than arguments, if there are we fill out the arguments array
 					// It doesn't matter if we add more arguments than placeholders
@@ -447,7 +524,7 @@ class phpbb_log implements phpbb_log_interface
 
 			$i++;
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		/**
 		* Get some additional data after we got all log entries
@@ -461,7 +538,7 @@ class phpbb_log implements phpbb_log_interface
 		* @since 3.1-A1
 		*/
 		$vars = array('log', 'topic_id_list', 'reportee_id_list');
-		extract($phpbb_dispatcher->trigger_event('core.get_logs_get_additional_data', $vars));
+		extract($this->dispatcher->trigger_event('core.get_logs_get_additional_data', $vars));
 
 		if (sizeof($topic_id_list))
 		{
@@ -469,8 +546,8 @@ class phpbb_log implements phpbb_log_interface
 
 			foreach ($log as $key => $row)
 			{
-				$log[$key]['viewtopic'] = (isset($topic_auth['f_read'][$row['topic_id']])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_auth['f_read'][$row['topic_id']] . '&amp;t=' . $row['topic_id']) : false;
-				$log[$key]['viewlogs'] = (isset($topic_auth['m_'][$row['topic_id']])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=logs&amp;mode=topic_logs&amp;t=' . $row['topic_id'], true, $user->session_id) : false;
+				$log[$key]['viewtopic'] = (isset($topic_auth['f_read'][$row['topic_id']])) ? append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", 'f=' . $topic_auth['f_read'][$row['topic_id']] . '&amp;t=' . $row['topic_id']) : false;
+				$log[$key]['viewlogs'] = (isset($topic_auth['m_'][$row['topic_id']])) ? append_sid("{$this->phpbb_root_path}mcp.{$this->php_ext}", 'i=logs&amp;mode=topic_logs&amp;t=' . $row['topic_id'], true, $this->user->session_id) : false;
 			}
 		}
 
@@ -502,8 +579,6 @@ class phpbb_log implements phpbb_log_interface
 	*/
 	private function generate_sql_keyword($keywords)
 	{
-		global $db, $user;
-
 		// Use no preg_quote for $keywords because this would lead to sole backslashes being added
 		// We also use an OR connection here for spaces and the | string. Currently, regex is not supported for searching (but may come later).
 		$keywords = preg_split('#[\s|]+#u', utf8_strtolower($keywords), 0, PREG_SPLIT_NO_EMPTY);
@@ -517,13 +592,13 @@ class phpbb_log implements phpbb_log_interface
 			for ($i = 0, $num_keywords = sizeof($keywords); $i < $num_keywords; $i++)
 			{
 				$keywords_pattern[] = preg_quote($keywords[$i], '#');
-				$keywords[$i] = $db->sql_like_expression($db->any_char . $keywords[$i] . $db->any_char);
+				$keywords[$i] = $this->db->sql_like_expression($this->db->any_char . $keywords[$i] . $this->db->any_char);
 			}
 
 			$keywords_pattern = '#' . implode('|', $keywords_pattern) . '#ui';
 
 			$operations = array();
-			foreach ($user->lang as $key => $value)
+			foreach ($this->user->lang as $key => $value)
 			{
 				if (substr($key, 0, 4) == 'LOG_' && preg_match($keywords_pattern, $value))
 				{
@@ -534,9 +609,9 @@ class phpbb_log implements phpbb_log_interface
 			$sql_keywords = 'AND (';
 			if (!empty($operations))
 			{
-				$sql_keywords .= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
+				$sql_keywords .= $this->db->sql_in_set('l.log_operation', $operations) . ' OR ';
 			}
-			$sql_lower = $db->sql_lower_text('l.log_data');
+			$sql_lower = $this->db->sql_lower_text('l.log_data');
 			$sql_keywords .= " $sql_lower " . implode(" OR $sql_lower ", $keywords) . ')';
 		}
 
@@ -557,32 +632,30 @@ class phpbb_log implements phpbb_log_interface
 	*/
 	private function get_topic_auth($topic_ids)
 	{
-		global $auth, $db;
-
 		$forum_auth = array('f_read' => array(), 'm_' => array());
 		$topic_ids = array_unique($topic_ids);
 
 		$sql = 'SELECT topic_id, forum_id
 			FROM ' . TOPICS_TABLE . '
-			WHERE ' . $db->sql_in_set('topic_id', array_map('intval', $topic_ids));
-		$result = $db->sql_query($sql);
+			WHERE ' . $this->db->sql_in_set('topic_id', array_map('intval', $topic_ids));
+		$result = $this->db->sql_query($sql);
 
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$row['topic_id'] = (int) $row['topic_id'];
 			$row['forum_id'] = (int) $row['forum_id'];
 
-			if ($auth->acl_get('f_read', $row['forum_id']))
+			if ($this->auth->acl_get('f_read', $row['forum_id']))
 			{
 				$forum_auth['f_read'][$row['topic_id']] = $row['forum_id'];
 			}
 
-			if ($auth->acl_gets('a_', 'm_', $row['forum_id']))
+			if ($this->auth->acl_gets('a_', 'm_', $row['forum_id']))
 			{
 				$forum_auth['m_'][$row['topic_id']] = $row['forum_id'];
 			}
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $forum_auth;
 	}
@@ -596,21 +669,19 @@ class phpbb_log implements phpbb_log_interface
 	*/
 	private function get_reportee_data($reportee_ids)
 	{
-		global $db;
-
 		$reportee_ids = array_unique($reportee_ids);
 		$reportee_data_list = array();
 
 		$sql = 'SELECT user_id, username, user_colour
 			FROM ' . USERS_TABLE . '
-			WHERE ' . $db->sql_in_set('user_id', $reportee_ids);
-		$result = $db->sql_query($sql);
+			WHERE ' . $this->db->sql_in_set('user_id', $reportee_ids);
+		$result = $this->db->sql_query($sql);
 
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$reportee_data_list[$row['user_id']] = $row;
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		return $reportee_data_list;
 	}
-- 
cgit v1.2.1


From 6dee2539419ba2c050830b7677294603a63b559a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Dec 2012 17:01:08 -0600
Subject: [ticket/11259] Make phpbb_admin_path available everywhere

PHPBB3-11259
---
 phpBB/includes/db/dbal.php           | 4 ++--
 phpBB/includes/functions.php         | 4 ++--
 phpBB/includes/functions_install.php | 3 +++
 phpBB/includes/ucp/ucp_groups.php    | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index ef1dd7d14d..c2708b09b2 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -822,7 +822,7 @@ class dbal
 	*/
 	function sql_report($mode, $query = '')
 	{
-		global $cache, $starttime, $phpbb_root_path, $user;
+		global $cache, $starttime, $phpbb_root_path, $phpbb_admin_path, $user;
 		global $request;
 
 		if (is_object($request) && !$request->variable('explain', false))
@@ -852,7 +852,7 @@ class dbal
 					<head>
 						<meta charset="utf-8">
 						<title>SQL Report</title>
-						<link href="' . $phpbb_root_path . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+						<link href="' . $phpbb_admin_path . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 					</head>
 					<body id="errorpage">
 					<div id="wrap">
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e492f97022..5fa5c5f505 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5339,7 +5339,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 function page_footer($run_cron = true, $display_template = true, $exit_handler = true)
 {
 	global $db, $config, $template, $user, $auth, $cache, $starttime, $phpbb_root_path, $phpEx;
-	global $request, $phpbb_dispatcher;
+	global $request, $phpbb_dispatcher, $phpbb_admin_path;
 
 	// A listener can set this variable to `true` when it overrides this function
 	$page_footer_override = false;
@@ -5395,7 +5395,7 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler =
 		'TRANSLATION_INFO'		=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
 		'CREDIT_LINE'			=> $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group'),
 
-		'U_ACP' => ($auth->acl_get('a_') && !empty($user->data['is_registered'])) ? append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $user->session_id) : '')
+		'U_ACP' => ($auth->acl_get('a_') && !empty($user->data['is_registered'])) ? append_sid("{$phpbb_admin_path}index.$phpEx", false, true, $user->session_id) : '')
 	);
 
 	// Call cron-type script
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index ab6b3ea009..1218ac401b 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -515,6 +515,9 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_test
 		'dbuser'		=> $data['dbuser'],
 		'dbpasswd'		=> htmlspecialchars_decode($data['dbpasswd']),
 		'table_prefix'	=> $data['table_prefix'],
+
+		'adm_relative_path'	=> 'adm/',
+
 		'acm_type'		=> 'phpbb_cache_driver_file',
 	);
 
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 9652986cf2..d92aea91f8 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -25,7 +25,7 @@ class ucp_groups
 
 	function main($id, $mode)
 	{
-		global $config, $phpbb_root_path, $phpEx;
+		global $config, $phpbb_root_path, $phpEx, $phpbb_admin_path;
 		global $db, $user, $auth, $cache, $template;
 		global $request;
 
@@ -438,7 +438,7 @@ class ucp_groups
 					$group_name = $group_row['group_name'];
 					$group_type = $group_row['group_type'];
 
-					$avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : '<img src="' . $phpbb_root_path . 'adm/images/no_avatar.gif" alt="" />';
+					$avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />';
 
 					$template->assign_vars(array(
 						'GROUP_NAME'			=> ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name,
@@ -730,7 +730,7 @@ class ucp_groups
 							'GROUP_CLOSED'		=> $type_closed,
 							'GROUP_HIDDEN'		=> $type_hidden,
 
-							'U_SWATCH'			=> append_sid("{$phpbb_root_path}adm/swatch.$phpEx", 'form=ucp&amp;name=group_colour'),
+							'U_SWATCH'			=> append_sid("{$phpbb_admin_path}swatch.$phpEx", 'form=ucp&amp;name=group_colour'),
 							'S_UCP_ACTION'		=> $this->u_action . "&amp;action=$action&amp;g=$group_id",
 							'L_AVATAR_EXPLAIN'	=> phpbb_avatar_explanation_string(),
 						));
-- 
cgit v1.2.1


From bff76f9ca81e30a03f116669645774ebd49ba1b1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Dec 2012 17:05:12 -0600
Subject: [ticket/11259] Also make adm_relative_path available in the container

PHPBB3-11259
---
 phpBB/includes/di/extension/config.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/di/extension/config.php b/phpBB/includes/di/extension/config.php
index fb5ca90070..bb3c04637a 100644
--- a/phpBB/includes/di/extension/config.php
+++ b/phpBB/includes/di/extension/config.php
@@ -42,6 +42,7 @@ class phpbb_di_extension_config extends Extension
 	{
 		require($this->config_file);
 
+		$container->setParameter('core.adm_relative_path', (isset($adm_relative_path) ? $adm_relative_path : 'adm/'));
 		$container->setParameter('core.table_prefix', $table_prefix);
 		$container->setParameter('cache.driver.class', $this->fix_acm_type($acm_type));
 		$container->setParameter('dbal.driver.class', 'dbal_'.$dbms);
-- 
cgit v1.2.1


From 30de17f69f70a0c23fa314de479bac57e3dbae2b Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Dec 2012 19:29:51 -0600
Subject: [ticket/11259] adm_relative_path -> phpbb_adm_relative_path

We can assume they properly format their config settings, right?

PHPBB3-11259
---
 phpBB/includes/di/extension/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/di/extension/config.php b/phpBB/includes/di/extension/config.php
index bb3c04637a..59b4c66870 100644
--- a/phpBB/includes/di/extension/config.php
+++ b/phpBB/includes/di/extension/config.php
@@ -42,7 +42,7 @@ class phpbb_di_extension_config extends Extension
 	{
 		require($this->config_file);
 
-		$container->setParameter('core.adm_relative_path', (isset($adm_relative_path) ? $adm_relative_path : 'adm/'));
+		$container->setParameter('core.adm_relative_path', (isset($phpbb_adm_relative_path) ? $phpbb_adm_relative_path : 'adm/'));
 		$container->setParameter('core.table_prefix', $table_prefix);
 		$container->setParameter('cache.driver.class', $this->fix_acm_type($acm_type));
 		$container->setParameter('dbal.driver.class', 'dbal_'.$dbms);
-- 
cgit v1.2.1


From 0446886f91376c258df3729287824e505ff788b3 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 10 Dec 2012 13:35:15 -0500
Subject: [feature/template-events] Pass arguments in correct order.

Thank you imkingdavid.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 7c91edd034..1b2e756064 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -106,7 +106,7 @@ class phpbb_style
 			$paths[] = $this->get_style_path($name);
 		}
 
-		return $this->set_custom_style($style_path, $names, $paths);
+		return $this->set_custom_style($style_path, $paths, $paths);
 	}
 
 	/**
-- 
cgit v1.2.1


From a0211ff2eb3a61f627d4ac4732c6ab68c2529d9e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 10 Dec 2012 13:35:15 -0500
Subject: [feature/template-events] Pass arguments in correct order.

Thank you imkingdavid.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 7c91edd034..4703c3a219 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -106,7 +106,7 @@ class phpbb_style
 			$paths[] = $this->get_style_path($name);
 		}
 
-		return $this->set_custom_style($style_path, $names, $paths);
+		return $this->set_custom_style($style_path, $paths, $names);
 	}
 
 	/**
-- 
cgit v1.2.1


From 61391f648c95251466f805f148f1656e940f2027 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 10 Dec 2012 21:16:08 -0600
Subject: [ticket/11259] htmlspecialchars($phpbb_admin_path)

PHPBB3-11259
---
 phpBB/includes/acp/acp_ranks.php | 14 +++++++-------
 phpBB/includes/db/dbal.php       |  2 +-
 phpBB/includes/functions_acp.php | 20 ++++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/includes/acp/acp_ranks.php
index d9ed5b17f1..6b06d03f52 100644
--- a/phpBB/includes/acp/acp_ranks.php
+++ b/phpBB/includes/acp/acp_ranks.php
@@ -71,7 +71,7 @@ class acp_ranks
 					'rank_min'			=> $min_posts,
 					'rank_image'		=> htmlspecialchars_decode($rank_image)
 				);
-				
+
 				if ($rank_id)
 				{
 					$sql = 'UPDATE ' . RANKS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE rank_id = $rank_id";
@@ -122,7 +122,7 @@ class acp_ranks
 					$cache->destroy('_ranks');
 
 					add_log('admin', 'LOG_RANK_REMOVED', $rank_title);
-					
+
 					if ($request->is_ajax())
 					{
 						$json_response = new phpbb_json_response;
@@ -151,7 +151,7 @@ class acp_ranks
 			case 'add':
 
 				$data = $ranks = $existing_imgs = array();
-				
+
 				$sql = 'SELECT *
 					FROM ' . RANKS_TABLE . '
 					ORDER BY rank_min ASC, rank_special ASC';
@@ -209,17 +209,17 @@ class acp_ranks
 
 					'RANK_TITLE'		=> (isset($ranks['rank_title'])) ? $ranks['rank_title'] : '',
 					'S_FILENAME_LIST'	=> $filename_list,
-					'RANK_IMAGE'		=> ($edit_img) ? $phpbb_root_path . $config['ranks_path'] . '/' . $edit_img : $phpbb_admin_path . 'images/spacer.gif',
+					'RANK_IMAGE'		=> ($edit_img) ? $phpbb_root_path . $config['ranks_path'] . '/' . $edit_img : htmlspecialchars($phpbb_admin_path) . 'images/spacer.gif',
 					'S_SPECIAL_RANK'	=> (isset($ranks['rank_special']) && $ranks['rank_special']) ? true : false,
 					'MIN_POSTS'			=> (isset($ranks['rank_min']) && !$ranks['rank_special']) ? $ranks['rank_min'] : 0)
 				);
-						
+
 
 				return;
 
 			break;
 		}
-	
+
 		$template->assign_vars(array(
 			'U_ACTION'		=> $this->u_action)
 		);
@@ -241,7 +241,7 @@ class acp_ranks
 
 				'U_EDIT'			=> $this->u_action . '&amp;action=edit&amp;id=' . $row['rank_id'],
 				'U_DELETE'			=> $this->u_action . '&amp;action=delete&amp;id=' . $row['rank_id'])
-			);	
+			);
 		}
 		$db->sql_freeresult($result);
 
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index c2708b09b2..c6a3638f9f 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -852,7 +852,7 @@ class dbal
 					<head>
 						<meta charset="utf-8">
 						<title>SQL Report</title>
-						<link href="' . $phpbb_admin_path . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+						<link href="' . htmlspecialchars($phpbb_admin_path) . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />
 					</head>
 					<body id="errorpage">
 					<div id="wrap">
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 2f3fd7bac0..32fd76e74d 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -82,16 +82,16 @@ function adm_page_header($page_title)
 		'T_RANKS_PATH'			=> "{$phpbb_root_path}{$config['ranks_path']}/",
 		'T_UPLOAD_PATH'			=> "{$phpbb_root_path}{$config['upload_path']}/",
 
-		'ICON_MOVE_UP'				=> '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
-		'ICON_MOVE_UP_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
-		'ICON_MOVE_DOWN'			=> '<img src="' . $phpbb_admin_path . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
-		'ICON_MOVE_DOWN_DISABLED'	=> '<img src="' . $phpbb_admin_path . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
-		'ICON_EDIT'					=> '<img src="' . $phpbb_admin_path . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
-		'ICON_EDIT_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
-		'ICON_DELETE'				=> '<img src="' . $phpbb_admin_path . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
-		'ICON_DELETE_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_delete_disabled.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
-		'ICON_SYNC'					=> '<img src="' . $phpbb_admin_path . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
-		'ICON_SYNC_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_sync_disabled.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
+		'ICON_MOVE_UP'				=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
+		'ICON_MOVE_UP_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
+		'ICON_MOVE_DOWN'			=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
+		'ICON_MOVE_DOWN_DISABLED'	=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
+		'ICON_EDIT'					=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
+		'ICON_EDIT_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
+		'ICON_DELETE'				=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
+		'ICON_DELETE_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_delete_disabled.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
+		'ICON_SYNC'					=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
+		'ICON_SYNC_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_sync_disabled.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
 
 		'S_USER_LANG'			=> $user->lang['USER_LANG'],
 		'S_CONTENT_DIRECTION'	=> $user->lang['DIRECTION'],
-- 
cgit v1.2.1


From c7ae790d16f662ef1cdb2e697f3276b9e618f4dd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 11 Dec 2012 10:25:38 +0100
Subject: [ticket/10714] Remove type hinting to allow the usage of mocks in
 tests

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 3d9620a2ee..beb2a659e1 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -96,7 +96,7 @@ class phpbb_log implements phpbb_log_interface
 	* @param	string		$log_table		Name of the table we use to store our logs
 	* @return	null
 	*/
-	public function __construct(dbal $db, phpbb_user $user, phpbb_auth $auth, phpbb_dispatcher $phpbb_dispatcher, $phpbb_root_path, $php_ext, $log_table)
+	public function __construct($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, $php_ext, $log_table)
 	{
 		$this->db = $db;
 		$this->user = $user;
-- 
cgit v1.2.1


From 2f47c99432c604a2adaad73821602a4b1763caa8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 11 Dec 2012 21:02:37 +0100
Subject: [feature/avatars] Add more consistency to codebase

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php         |  2 +-
 phpBB/includes/acp/acp_users.php          |  4 ++--
 phpBB/includes/avatar/driver/gravatar.php | 19 ++++++++++++-------
 phpBB/includes/avatar/driver/remote.php   | 15 ++++++++++-----
 phpBB/includes/ucp/ucp_profile.php        |  4 ++--
 5 files changed, 27 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index ae0abdd139..fe65ea2f03 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -529,7 +529,7 @@ class acp_groups
 						$avatars_enabled = true;
 						$config_name = $phpbb_avatar_manager->get_driver_config_name($driver);
 						$template->set_filenames(array(
-							'avatar' => "acp_avatar_options_$config_name.html",
+							'avatar' => "acp_avatar_options_{$config_name}.html",
 						));
 
 						if ($driver->prepare_form($template, $avatar_data, $avatar_error))
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index b3cfd81949..b2ef43edbe 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1765,7 +1765,7 @@ class acp_users
 
 									$sql = 'UPDATE ' . USERS_TABLE . '
 										SET ' . $db->sql_build_array('UPDATE', $result) . '
-										WHERE user_id = ' . $user_id;
+										WHERE user_id = ' . (int) $user_id;
 
 									$db->sql_query($sql);
 									trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
@@ -1810,7 +1810,7 @@ class acp_users
 						$avatars_enabled = true;
 						$config_name = $phpbb_avatar_manager->get_driver_config_name($driver);
 						$template->set_filenames(array(
-							'avatar' => "acp_avatar_options_$config_name.html",
+							'avatar' => "acp_avatar_options_{$config_name}.html",
 						));
 
 						if ($driver->prepare_form($template, $avatar_data, $error))
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 11996ca561..2b10fd0c2d 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -77,13 +77,18 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 			require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
 		}
 
-		$error = array_merge($error, validate_data(array(
-			'email' => $row['avatar'],
-		), array(
-			'email' => array(
-				array('string', false, 6, 60),
-				array('email')),
-		)));
+		$validate_array = validate_data(
+			array(
+				'email' => $row['avatar'],
+			),
+			array(
+				'email' => array(
+					array('string', false, 6, 60),
+					array('email'))
+			)
+		);
+
+		$error = array_merge($error, $validate_array);
 
 		if (!empty($error))
 		{
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 9135a62eac..1f16fce1e7 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -66,11 +66,16 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 			require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
 		}
 
-		$error = array_merge($error, validate_data(array(
-			'url' => $url,
-		), array(
-			'url' => array('string', true, 5, 255),
-		)));
+		$validate_array = validate_data(
+			array(
+				'url' => $url,
+			),
+			array(
+				'url' => array('string', true, 5, 255),
+			)
+		);
+
+		$error = array_merge($error, $validate_array);
 
 		if (!empty($error))
 		{
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 14639b00ff..8ed5aff3e3 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -590,7 +590,7 @@ class ucp_profile
 
 									$sql = 'UPDATE ' . USERS_TABLE . '
 										SET ' . $db->sql_build_array('UPDATE', $result) . '
-										WHERE user_id = ' . $user->data['user_id'];
+										WHERE user_id = ' . (int) $user->data['user_id'];
 
 									$db->sql_query($sql);
 									
@@ -615,7 +615,7 @@ class ucp_profile
 
 								$sql = 'UPDATE ' . USERS_TABLE . '
 									SET ' . $db->sql_build_array('UPDATE', $result) . '
-									WHERE user_id = ' . $user->data['user_id'];
+									WHERE user_id = ' . (int) $user->data['user_id'];
 
 								$db->sql_query($sql);
 								
-- 
cgit v1.2.1


From 7ce009f2e29045b2bd29dd670c900b79f7f3bd70 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 12 Dec 2012 12:46:20 +0100
Subject: [ticket/10954] Mark forums read without popup or page refresh

PHPBB3-10954
---
 phpBB/includes/functions_display.php | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 73129803ee..9745d493c4 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -61,10 +61,23 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		{
 			markread('all', false, false, request_var('mark_time', 0));
 
-			trigger_error(
-				$user->lang['FORUMS_MARKED'] . '<br /><br />' .
-				sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>')
-			);
+			if (!$request->is_ajax())
+			{
+				trigger_error(
+					$user->lang['FORUMS_MARKED'] . '<br /><br />' .
+					sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>')
+				);
+			}
+			else
+			{
+				// Tell the ajax script what language vars need to be replaced
+				$data = array(
+					'NO_UNREAD_POSTS'	=> $user->lang['NO_UNREAD_POSTS'],
+					'UNREAD_POSTS'		=> $user->lang['UNREAD_POSTS']
+				);
+				$json_response = new phpbb_json_response();
+				$json_response->send($data);
+			}
 		}
 		else
 		{
@@ -313,7 +326,20 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			$message = sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect . '">', '</a>');
 			meta_refresh(3, $redirect);
 
-			trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
+			if (!$request->is_ajax())
+			{
+				trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
+			}
+			else
+			{
+				// Tell the ajax script what language vars need to be replaced
+				$data = array(
+					'NO_UNREAD_POSTS'	=> $user->lang['NO_UNREAD_POSTS'],
+					'UNREAD_POSTS'		=> $user->lang['UNREAD_POSTS']
+				);
+				$json_response = new phpbb_json_response();
+				$json_response->send($data);
+			}
 		}
 		else
 		{
-- 
cgit v1.2.1


From 4980d8b01150593175274dad45890544f56075d6 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 2 Sep 2012 23:44:13 -0400
Subject: [ticket/11088] Move style, extension and language pack management to
 customise

Instead of being separated, these related ACP modules are now grouped
intuitively.

PHPBB3-11088
---
 phpBB/includes/acp/info/acp_extensions.php | 4 ++--
 phpBB/includes/acp/info/acp_language.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/info/acp_extensions.php b/phpBB/includes/acp/info/acp_extensions.php
index f5953fb1dd..03d7059165 100644
--- a/phpBB/includes/acp/info/acp_extensions.php
+++ b/phpBB/includes/acp/info/acp_extensions.php
@@ -16,10 +16,10 @@ class acp_extensions_info
 	{
 		return array(
 			'filename'	=> 'acp_extensions',
-			'title'		=> 'ACP_EXTENSIONS',
+			'title'		=> 'ACP_EXTENSIONS_MANAGEMENT',
 			'version'	=> '1.0.0',
 			'modes'		=> array(
-				'main'		=> array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_GENERAL_TASKS')),
+				'main'		=> array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSIONS_MANAGEMENT')),
 			),
 		);
 	}
diff --git a/phpBB/includes/acp/info/acp_language.php b/phpBB/includes/acp/info/acp_language.php
index 85dfb119ea..7f33a22fa6 100644
--- a/phpBB/includes/acp/info/acp_language.php
+++ b/phpBB/includes/acp/info/acp_language.php
@@ -19,7 +19,7 @@ class acp_language_info
 			'title'		=> 'ACP_LANGUAGE',
 			'version'	=> '1.0.0',
 			'modes'		=> array(
-				'lang_packs'		=> array('title' => 'ACP_LANGUAGE_PACKS', 'auth' => 'acl_a_language', 'cat' => array('ACP_GENERAL_TASKS')),
+				'lang_packs'		=> array('title' => 'ACP_LANGUAGE_PACKS', 'auth' => 'acl_a_language', 'cat' => array('ACP_LANGUAGE')),
 			),
 		);
 	}
-- 
cgit v1.2.1


From 7efc37d1f9d4a4335fc91af147cd059c17b7d45e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 12 Dec 2012 19:09:18 +0100
Subject: [ticket/10954] Modify is_ajax check for consistency

PHPBB3-10954
---
 phpBB/includes/functions_display.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 9745d493c4..f3198bc1e5 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -61,14 +61,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		{
 			markread('all', false, false, request_var('mark_time', 0));
 
-			if (!$request->is_ajax())
-			{
-				trigger_error(
-					$user->lang['FORUMS_MARKED'] . '<br /><br />' .
-					sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>')
-				);
-			}
-			else
+			if ($request->is_ajax())
 			{
 				// Tell the ajax script what language vars need to be replaced
 				$data = array(
@@ -78,6 +71,11 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 				$json_response = new phpbb_json_response();
 				$json_response->send($data);
 			}
+
+			trigger_error(
+				$user->lang['FORUMS_MARKED'] . '<br /><br />' .
+				sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>')
+			);
 		}
 		else
 		{
@@ -326,11 +324,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			$message = sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect . '">', '</a>');
 			meta_refresh(3, $redirect);
 
-			if (!$request->is_ajax())
-			{
-				trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
-			}
-			else
+			if ($request->is_ajax())
 			{
 				// Tell the ajax script what language vars need to be replaced
 				$data = array(
@@ -340,6 +334,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 				$json_response = new phpbb_json_response();
 				$json_response->send($data);
 			}
+
+			trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
 		}
 		else
 		{
-- 
cgit v1.2.1


From ffd531e4fd31fee31c6fbd8c94cb6077cd21a82d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Dec 2012 16:33:30 -0600
Subject: [ticket/11103] Revert changes to constants.php from my IDE

Readd a blank line at the end of the file

PHPBB3-11103
---
 phpBB/includes/constants.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 5128321618..68af41ab20 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -278,3 +278,4 @@ define('WORDS_TABLE',				$table_prefix . 'words');
 define('ZEBRA_TABLE',				$table_prefix . 'zebra');
 
 // Additional tables
+
-- 
cgit v1.2.1


From e2c67a8e42beefe1631a90feeb2215e2137c944b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 12 Dec 2012 21:46:38 -0500
Subject: [ticket/11162] Rename tricky updates to database helper.

PHPBB3-11162
---
 phpBB/includes/functions_database_helper.php | 206 +++++++++++++++++++++++++++
 phpBB/includes/functions_tricky_update.php   | 206 ---------------------------
 phpBB/includes/mcp/mcp_forum.php             |   2 +-
 phpBB/includes/mcp/mcp_topic.php             |   2 +-
 4 files changed, 208 insertions(+), 208 deletions(-)
 create mode 100644 phpBB/includes/functions_database_helper.php
 delete mode 100644 phpBB/includes/functions_tricky_update.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_database_helper.php b/phpBB/includes/functions_database_helper.php
new file mode 100644
index 0000000000..664c246888
--- /dev/null
+++ b/phpBB/includes/functions_database_helper.php
@@ -0,0 +1,206 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Updates rows in given table from a set of values to a new value.
+* If this results in rows violating uniqueness constraints, the duplicate
+* rows are eliminated.
+*
+* The only supported table is bookmarks.
+*
+* @param dbal $db Database object
+* @param string $table Table on which to perform the update
+* @param string $column Column whose values to change
+* @param array $from_values An array of values that should be changed
+* @param int $to_value The new value
+* @return null
+*/
+function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_values, $to_value)
+{
+	$sql = "SELECT $column, user_id
+		FROM $table
+		WHERE " . $db->sql_in_set($column, $from_values);
+	$result = $db->sql_query($sql);
+
+	$old_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$old_user_ids[$row[$column]][] = (int) $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$sql = "SELECT $column, user_id
+		FROM $table
+		WHERE $column = " . (int) $to_value;
+	$result = $db->sql_query($sql);
+
+	$new_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$new_user_ids[$row[$column]][] = (int) $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$queries = array();
+	foreach ($from_values as $from_value)
+	{
+		if (!isset($old_user_ids[$from_value]))
+		{
+			continue;
+		}
+		if (empty($new_user_ids))
+		{
+			$sql = "UPDATE $table
+				SET $column = " . (int) $to_value . "
+				WHERE $column = '" . $db->sql_escape($from_value) . "'";
+			$queries[] = $sql;
+		}
+		else
+		{
+			$different_user_ids = array_diff($old_user_ids[$from_value], $new_user_ids[$to_value]);
+			if (!empty($different_user_ids))
+			{
+				$sql = "UPDATE $table
+					SET $column = " . (int) $to_value . "
+					WHERE $column = '" . $db->sql_escape($from_value) . "'
+					AND " . $db->sql_in_set('user_id', $different_user_ids);
+				$queries[] = $sql;
+			}
+		}
+	}
+
+	if (!empty($queries))
+	{
+		$db->sql_transaction('begin');
+
+		foreach ($queries as $sql)
+		{
+			$db->sql_query($sql);
+		}
+
+		$sql = "DELETE FROM $table
+			WHERE " . $db->sql_in_set($column, $from_values);
+		$db->sql_query($sql);
+
+		$db->sql_transaction('commit');
+	}
+}
+
+/**
+* Updates rows in given table from a set of values to a new value.
+* If this results in rows violating uniqueness constraints, the duplicate
+* rows are merged respecting notify_status (0 takes precedence over 1).
+*
+* The only supported table is topics_watch.
+*
+* @param dbal $db Database object
+* @param string $table Table on which to perform the update
+* @param string $column Column whose values to change
+* @param array $from_values An array of values that should be changed
+* @param int $to_value The new value
+* @return null
+*/
+function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $column, $from_values, $to_value)
+{
+	$sql = "SELECT $column, user_id, notify_status
+		FROM $table
+		WHERE " . $db->sql_in_set($column, $from_values);
+	$result = $db->sql_query($sql);
+
+	$old_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$old_user_ids[(int) $row['notify_status']][$row[$column]][] = (int) $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$sql = "SELECT $column, user_id
+		FROM $table
+		WHERE $column = " . (int) $to_value;
+	$result = $db->sql_query($sql);
+
+	$new_user_ids = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$new_user_ids[$row[$column]][] = (int) $row['user_id'];
+	}
+	$db->sql_freeresult($result);
+
+	$queries = array();
+	$extra_updates = array(
+		0 => 'notify_status = 0',
+		1 => '',
+	);
+	foreach ($from_values as $from_value)
+	{
+		foreach ($extra_updates as $notify_status => $extra_update)
+		{
+			if (!isset($old_user_ids[$notify_status][$from_value]))
+			{
+				continue;
+			}
+			if (empty($new_user_ids))
+			{
+				$sql = "UPDATE $table
+					SET $column = " . (int) $to_value . "
+					WHERE $column = '" . $db->sql_escape($from_value) . "'";
+				$queries[] = $sql;
+			}
+			else
+			{
+				$different_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $new_user_ids[$to_value]);
+				if (!empty($different_user_ids))
+				{
+					$sql = "UPDATE $table
+						SET $column = " . (int) $to_value . "
+						WHERE $column = '" . $db->sql_escape($from_value) . "'
+						AND " . $db->sql_in_set('user_id', $different_user_ids);
+					$queries[] = $sql;
+				}
+
+				if ($extra_update)
+				{
+					$same_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $different_user_ids);
+					if (!empty($same_user_ids))
+					{
+						$sql = "UPDATE $table
+							SET $extra_update
+							WHERE $column = '" . (int) $to_value . "'
+							AND " . $db->sql_in_set('user_id', $same_user_ids);
+						$queries[] = $sql;
+					}
+				}
+			}
+		}
+	}
+
+	if (!empty($queries))
+	{
+		$db->sql_transaction('begin');
+
+		foreach ($queries as $sql)
+		{
+			$db->sql_query($sql);
+		}
+
+		$sql = "DELETE FROM $table
+			WHERE " . $db->sql_in_set($column, $from_values);
+		$db->sql_query($sql);
+
+		$db->sql_transaction('commit');
+	}
+}
diff --git a/phpBB/includes/functions_tricky_update.php b/phpBB/includes/functions_tricky_update.php
deleted file mode 100644
index 664c246888..0000000000
--- a/phpBB/includes/functions_tricky_update.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Updates rows in given table from a set of values to a new value.
-* If this results in rows violating uniqueness constraints, the duplicate
-* rows are eliminated.
-*
-* The only supported table is bookmarks.
-*
-* @param dbal $db Database object
-* @param string $table Table on which to perform the update
-* @param string $column Column whose values to change
-* @param array $from_values An array of values that should be changed
-* @param int $to_value The new value
-* @return null
-*/
-function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_values, $to_value)
-{
-	$sql = "SELECT $column, user_id
-		FROM $table
-		WHERE " . $db->sql_in_set($column, $from_values);
-	$result = $db->sql_query($sql);
-
-	$old_user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$old_user_ids[$row[$column]][] = (int) $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	$sql = "SELECT $column, user_id
-		FROM $table
-		WHERE $column = " . (int) $to_value;
-	$result = $db->sql_query($sql);
-
-	$new_user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$new_user_ids[$row[$column]][] = (int) $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	$queries = array();
-	foreach ($from_values as $from_value)
-	{
-		if (!isset($old_user_ids[$from_value]))
-		{
-			continue;
-		}
-		if (empty($new_user_ids))
-		{
-			$sql = "UPDATE $table
-				SET $column = " . (int) $to_value . "
-				WHERE $column = '" . $db->sql_escape($from_value) . "'";
-			$queries[] = $sql;
-		}
-		else
-		{
-			$different_user_ids = array_diff($old_user_ids[$from_value], $new_user_ids[$to_value]);
-			if (!empty($different_user_ids))
-			{
-				$sql = "UPDATE $table
-					SET $column = " . (int) $to_value . "
-					WHERE $column = '" . $db->sql_escape($from_value) . "'
-					AND " . $db->sql_in_set('user_id', $different_user_ids);
-				$queries[] = $sql;
-			}
-		}
-	}
-
-	if (!empty($queries))
-	{
-		$db->sql_transaction('begin');
-
-		foreach ($queries as $sql)
-		{
-			$db->sql_query($sql);
-		}
-
-		$sql = "DELETE FROM $table
-			WHERE " . $db->sql_in_set($column, $from_values);
-		$db->sql_query($sql);
-
-		$db->sql_transaction('commit');
-	}
-}
-
-/**
-* Updates rows in given table from a set of values to a new value.
-* If this results in rows violating uniqueness constraints, the duplicate
-* rows are merged respecting notify_status (0 takes precedence over 1).
-*
-* The only supported table is topics_watch.
-*
-* @param dbal $db Database object
-* @param string $table Table on which to perform the update
-* @param string $column Column whose values to change
-* @param array $from_values An array of values that should be changed
-* @param int $to_value The new value
-* @return null
-*/
-function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $column, $from_values, $to_value)
-{
-	$sql = "SELECT $column, user_id, notify_status
-		FROM $table
-		WHERE " . $db->sql_in_set($column, $from_values);
-	$result = $db->sql_query($sql);
-
-	$old_user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$old_user_ids[(int) $row['notify_status']][$row[$column]][] = (int) $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	$sql = "SELECT $column, user_id
-		FROM $table
-		WHERE $column = " . (int) $to_value;
-	$result = $db->sql_query($sql);
-
-	$new_user_ids = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$new_user_ids[$row[$column]][] = (int) $row['user_id'];
-	}
-	$db->sql_freeresult($result);
-
-	$queries = array();
-	$extra_updates = array(
-		0 => 'notify_status = 0',
-		1 => '',
-	);
-	foreach ($from_values as $from_value)
-	{
-		foreach ($extra_updates as $notify_status => $extra_update)
-		{
-			if (!isset($old_user_ids[$notify_status][$from_value]))
-			{
-				continue;
-			}
-			if (empty($new_user_ids))
-			{
-				$sql = "UPDATE $table
-					SET $column = " . (int) $to_value . "
-					WHERE $column = '" . $db->sql_escape($from_value) . "'";
-				$queries[] = $sql;
-			}
-			else
-			{
-				$different_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $new_user_ids[$to_value]);
-				if (!empty($different_user_ids))
-				{
-					$sql = "UPDATE $table
-						SET $column = " . (int) $to_value . "
-						WHERE $column = '" . $db->sql_escape($from_value) . "'
-						AND " . $db->sql_in_set('user_id', $different_user_ids);
-					$queries[] = $sql;
-				}
-
-				if ($extra_update)
-				{
-					$same_user_ids = array_diff($old_user_ids[$notify_status][$from_value], $different_user_ids);
-					if (!empty($same_user_ids))
-					{
-						$sql = "UPDATE $table
-							SET $extra_update
-							WHERE $column = '" . (int) $to_value . "'
-							AND " . $db->sql_in_set('user_id', $same_user_ids);
-						$queries[] = $sql;
-					}
-				}
-			}
-		}
-	}
-
-	if (!empty($queries))
-	{
-		$db->sql_transaction('begin');
-
-		foreach ($queries as $sql)
-		{
-			$db->sql_query($sql);
-		}
-
-		$sql = "DELETE FROM $table
-			WHERE " . $db->sql_in_set($column, $from_values);
-		$db->sql_query($sql);
-
-		$db->sql_transaction('commit');
-	}
-}
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index cd938e83a0..db9fbd90bd 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -417,7 +417,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		// Update the topic watch table.
 		if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status'))
 		{
-			include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx);
+			include($phpbb_root_path . 'includes/functions_database_helper.' . $phpEx);
 		}
 		phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 29dabdd2a2..66d0c7a47e 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -622,7 +622,7 @@ function merge_posts($topic_id, $to_topic_id)
 			// If the topic no longer exist, we will update the topic watch table.
 			if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status'))
 			{
-				include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx);
+				include($phpbb_root_path . 'includes/functions_database_helper.' . $phpEx);
 			}
 			phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 		}
-- 
cgit v1.2.1


From 10ee54d0280087a81236c05fbaf2c30f3b976b08 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 07:56:23 -0500
Subject: [ticket/11015] Restore whitespace to avoid conflict when merging
 develop.

PHPBB3-11015
---
 phpBB/includes/db/driver/mssql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/driver/mssql.php b/phpBB/includes/db/driver/mssql.php
index 2e9debf84f..0c3d201b29 100644
--- a/phpBB/includes/db/driver/mssql.php
+++ b/phpBB/includes/db/driver/mssql.php
@@ -372,7 +372,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 			FROM master.dbo.sysmessages
 			WHERE error = ' . $error['code'];
 		$result_id = @mssql_query($sql);
-
+		
 		if ($result_id)
 		{
 			$row = @mssql_fetch_assoc($result_id);
-- 
cgit v1.2.1


From ec074eb97c2b2dc490089782420b065f4c1274cb Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 13:10:26 -0600
Subject: [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager

$extension_manager should be $phpbb_extension_manager

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index a33d7f0aa3..d0a02567ad 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -210,7 +210,7 @@ class messenger
 		{
 			$style_resource_locator = new phpbb_style_resource_locator();
 			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
-			$tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $extension_manager);
+			$tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
 
 			$this->tpl_msg[$template_lang . $template_file] = $tpl;
-- 
cgit v1.2.1


From 12bc77d034b6ca3893bb7f9169cf1cfa1c19b440 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 18:00:12 -0500
Subject: [ticket/11015] Change more docblocks to phpbb_db_driver.

PHPBB3-11015
---
 phpBB/includes/config/db.php                       | 4 ++--
 phpBB/includes/cron/task/core/prune_all_forums.php | 2 +-
 phpBB/includes/cron/task/core/prune_forum.php      | 2 +-
 phpBB/includes/cron/task/core/tidy_search.php      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/config/db.php b/phpBB/includes/config/db.php
index ed86383b6b..b18369a479 100644
--- a/phpBB/includes/config/db.php
+++ b/phpBB/includes/config/db.php
@@ -29,7 +29,7 @@ class phpbb_config_db extends phpbb_config
 
 	/**
 	* Database connection
-	* @var dbal
+	* @var phpbb_db_driver
 	*/
 	protected $db;
 
@@ -42,7 +42,7 @@ class phpbb_config_db extends phpbb_config
 	/**
 	* Creates a configuration container with a default set of values
 	*
-	* @param dbal                         $db    Database connection
+	* @param phpbb_db_driver              $db    Database connection
 	* @param phpbb_cache_driver_interface $cache Cache instance
 	* @param string                       $table Configuration table name
 	*/
diff --git a/phpBB/includes/cron/task/core/prune_all_forums.php b/phpBB/includes/cron/task/core/prune_all_forums.php
index 26e7528035..2c5d38cec0 100644
--- a/phpBB/includes/cron/task/core/prune_all_forums.php
+++ b/phpBB/includes/cron/task/core/prune_all_forums.php
@@ -37,7 +37,7 @@ class phpbb_cron_task_core_prune_all_forums extends phpbb_cron_task_base
 	* @param string $phpbb_root_path The root path
 	* @param string $php_ext The PHP extension
 	* @param phpbb_config $config The config
-	* @param dbal $db The db connection
+	* @param phpbb_db_driver $db The db connection
 	*/
 	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_db_driver $db)
 	{
diff --git a/phpBB/includes/cron/task/core/prune_forum.php b/phpBB/includes/cron/task/core/prune_forum.php
index 9861d8b0c6..e3c497f072 100644
--- a/phpBB/includes/cron/task/core/prune_forum.php
+++ b/phpBB/includes/cron/task/core/prune_forum.php
@@ -47,7 +47,7 @@ class phpbb_cron_task_core_prune_forum extends phpbb_cron_task_base implements p
 	* @param string $phpbb_root_path The root path
 	* @param string $php_ext The PHP extension
 	* @param phpbb_config $config The config
-	* @param dbal $db The db connection
+	* @param phpbb_db_driver $db The db connection
 	*/
 	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_db_driver $db)
 	{
diff --git a/phpBB/includes/cron/task/core/tidy_search.php b/phpBB/includes/cron/task/core/tidy_search.php
index 169fd3ba73..3ec25aa021 100644
--- a/phpBB/includes/cron/task/core/tidy_search.php
+++ b/phpBB/includes/cron/task/core/tidy_search.php
@@ -38,7 +38,7 @@ class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base
 	* @param string $php_ext The PHP extension
 	* @param phpbb_auth $auth The auth
 	* @param phpbb_config $config The config
-	* @param dbal $db The db connection
+	* @param phpbb_db_driver $db The db connection
 	* @param phpbb_user $user The user
 	*/
 	public function __construct($phpbb_root_path, $php_ext, phpbb_auth $auth, phpbb_config $config, phpbb_db_driver $db, phpbb_user $user)
-- 
cgit v1.2.1


From 9e3fd3bf8e8ff08b159d9151aef6f9bb6b9244ee Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 19:07:49 -0500
Subject: [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.

PHPBB3-11015
---
 phpBB/includes/functions.php | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4bf991ca9e..5c08d457b6 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5550,23 +5550,39 @@ function phpbb_to_numeric($input)
 }
 
 /**
-* Convert 3.0 dbms to 3.1 db driver class name
+* Convert either 3.0 dbms or 3.1 db driver class name to 3.1 db driver class name.
+*
+* If $dbms is a valid 3.1 db driver class name, returns it unchanged.
+* Otherwise prepends phpbb_db_driver_ to the dbms to convert a 3.0 dbms
+* to 3.1 db driver class name.
 *
 * @param string $dbms dbms parameter
 * @return db driver class
 */
 function phpbb_convert_30_dbms_to_31($dbms)
 {
-	if (class_exists($dbms))
+	// Note: this check is done first because mysqli extension
+	// supplies a mysqli class, and class_exists($dbms) would return
+	// true for mysqli class.
+	// However, per the docblock any valid 3.1 driver name should be
+	// recognized by this function, and have priority over 3.0 dbms.
+	if (class_exists('phpbb_db_driver_' . $dbms))
 	{
-		return $dbms;
+		return 'phpbb_db_driver_' . $dbms;
 	}
 
-	if (class_exists('phpbb_db_driver_' . $dbms))
+	if (class_exists($dbms))
 	{
-		return 'phpbb_db_driver_' . $dbms;
+		return $dbms;
 	}
 
+	// Additionally we could check that $dbms extends phpbb_db_driver.
+	// http://php.net/manual/en/class.reflectionclass.php
+	// Beware of possible performance issues:
+	// http://stackoverflow.com/questions/294582/php-5-reflection-api-performance
+	// We could check for interface implementation in all paths or
+	// only when we do not prepend phpbb_db_driver_.
+
 	throw new \RuntimeException("You have specified an invalid dbms driver: $dbms");
 }
 
-- 
cgit v1.2.1


From ee7dc9e5a061038eadce40ed295d47f978b9e567 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 14 Dec 2012 01:08:09 +0100
Subject: [ticket/11015] Correctly transform 'mysqli' etc. in
 phpbb_convert_30_dbms_to_31

PHPBB3-11015
---
 phpBB/includes/functions.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 5c08d457b6..575dd11388 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5573,6 +5573,15 @@ function phpbb_convert_30_dbms_to_31($dbms)
 
 	if (class_exists($dbms))
 	{
+		/*
+		$reflection = new \ReflectionClass($dbms);
+   	 
+		if ($reflection->isSubclassOf('phpbb_db_driver'))
+		{
+			return $dbms;
+		}
+		*/
+
 		return $dbms;
 	}
 
-- 
cgit v1.2.1


From 89f069637cd95f584db924407378b64df9910243 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 19:21:23 -0500
Subject: [ticket/11015] Move comment in the right place.

PHPBB3-11015
---
 phpBB/includes/functions.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 575dd11388..8ef5284134 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5573,6 +5573,13 @@ function phpbb_convert_30_dbms_to_31($dbms)
 
 	if (class_exists($dbms))
 	{
+		// Additionally we could check that $dbms extends phpbb_db_driver.
+		// http://php.net/manual/en/class.reflectionclass.php
+		// Beware of possible performance issues:
+		// http://stackoverflow.com/questions/294582/php-5-reflection-api-performance
+		// We could check for interface implementation in all paths or
+		// only when we do not prepend phpbb_db_driver_.
+
 		/*
 		$reflection = new \ReflectionClass($dbms);
    	 
@@ -5585,13 +5592,6 @@ function phpbb_convert_30_dbms_to_31($dbms)
 		return $dbms;
 	}
 
-	// Additionally we could check that $dbms extends phpbb_db_driver.
-	// http://php.net/manual/en/class.reflectionclass.php
-	// Beware of possible performance issues:
-	// http://stackoverflow.com/questions/294582/php-5-reflection-api-performance
-	// We could check for interface implementation in all paths or
-	// only when we do not prepend phpbb_db_driver_.
-
 	throw new \RuntimeException("You have specified an invalid dbms driver: $dbms");
 }
 
-- 
cgit v1.2.1


From 249f3c8885d461ae3981dfd7b62093c2175175e3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 19:19:40 -0600
Subject: [ticket/11103] Instantiate $phpbb_notifications as needed

https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976

PHPBB3-11103
---
 phpBB/includes/functions.php             | 22 ++++++++++++++++------
 phpBB/includes/functions_admin.php       | 10 ++++++----
 phpBB/includes/functions_posting.php     |  6 ++++--
 phpBB/includes/functions_privmsgs.php    | 19 ++++++++++++-------
 phpBB/includes/mcp/mcp_pm_reports.php    |  5 +++--
 phpBB/includes/mcp/mcp_queue.php         | 13 +++++++++----
 phpBB/includes/mcp/mcp_reports.php       | 12 ++++++++----
 phpBB/includes/ucp/ucp_notifications.php |  4 +++-
 8 files changed, 61 insertions(+), 30 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 6f619ef51d..9b284c5ca9 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1328,7 +1328,7 @@ function phpbb_timezone_select($user, $default = '', $truncate = false)
 function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $user_id = 0)
 {
 	global $db, $user, $config;
-	global $request, $phpbb_notifications;
+	global $request, $phpbb_container;
 
 	$post_time = ($post_time === 0 || $post_time > time()) ? time() : (int) $post_time;
 
@@ -1338,6 +1338,8 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 		{
 			// Mark all forums read (index page)
 
+			$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 			// Mark all topic notifications read for this user
 			$phpbb_notifications->mark_notifications_read(array(
 				'topic',
@@ -1402,6 +1404,8 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			$forum_id = array($forum_id);
 		}
 
+		$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 		$phpbb_notifications->mark_notifications_read_by_parent(array(
 			'topic',
 			'approve_topic',
@@ -1523,11 +1527,14 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			return;
 		}
 
+		$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 		// Mark post notifications read for this user in this topic
 		$phpbb_notifications->mark_notifications_read(array(
 			'topic',
 			'approve_topic',
 		), $topic_id, $user->data['user_id'], $post_time);
+
 		$phpbb_notifications->mark_notifications_read_by_parent(array(
 			'quote',
 			'bookmark',
@@ -5042,7 +5049,7 @@ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null)
 function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum')
 {
 	global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path;
-	global $phpbb_dispatcher, $request, $phpbb_notifications;
+	global $phpbb_dispatcher, $request, $phpbb_container;
 
 	if (defined('HEADER_INC'))
 	{
@@ -5230,10 +5237,13 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 	{
 		$timezone_name = $user->lang['timezones'][$timezone_name];
 	}
-	
+
 	// Output the notifications
-	if ($config['load_notifications'])
+	$notifications = false;
+	if ($config['load_notifications'] && $user->data['user_id'] != ANONYMOUS && $user->data['user_type'] != USER_IGNORE)
 	{
+		$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 		$notifications = $phpbb_notifications->load_notifications(array(
 			'all_unread'	=> true,
 			'limit'			=> 5,
@@ -5264,8 +5274,8 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'PRIVATE_MESSAGE_INFO_UNREAD'	=> $l_privmsgs_text_unread,
 		'HIDDEN_FIELDS_FOR_JUMPBOX'	=> $hidden_fields_for_jumpbox,
 
-		'UNREAD_NOTIFICATIONS_COUNT'	=> ($config['load_notifications']) ? $notifications['unread_count'] : '',
-		'NOTIFICATIONS_COUNT'			=> ($config['load_notifications']) ? $user->lang('NOTIFICATIONS_COUNT', $notifications['unread_count']) : '',
+		'UNREAD_NOTIFICATIONS_COUNT'	=> ($notifications !== false) ? $notifications['unread_count'] : '',
+		'NOTIFICATIONS_COUNT'			=> ($notifications !== false) ? $user->lang('NOTIFICATIONS_COUNT', $notifications['unread_count']) : '',
 		'U_VIEW_ALL_NOTIFICATIONS'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications'),
 		'S_NOTIFICATIONS_DISPLAY'		=> $config['load_notifications'],
 
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 69ca44861f..9310b218fb 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -618,8 +618,7 @@ function move_posts($post_ids, $topic_id, $auto_sync = true)
 */
 function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_sync = true, $call_delete_posts = true)
 {
-	global $db, $config;
-	global $phpbb_notifications;
+	global $db, $config, $phpbb_container;
 
 	$approved_topics = 0;
 	$forum_ids = $topic_ids = array();
@@ -716,6 +715,8 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 		set_config_count('num_topics', $approved_topics * (-1), true);
 	}
 
+	$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 	$phpbb_notifications->delete_notifications(array(
 		'topic',
 		'approve_topic',
@@ -730,8 +731,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 */
 function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync = true, $post_count_sync = true, $call_delete_topics = true)
 {
-	global $db, $config, $phpbb_root_path, $phpEx, $auth, $user;
-	global $phpbb_notifications;
+	global $db, $config, $phpbb_root_path, $phpEx, $auth, $user, $phpbb_container;
 
 	if ($where_type === 'range')
 	{
@@ -900,6 +900,8 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 		delete_topics('topic_id', $remove_topics, $auto_sync, $post_count_sync, false);
 	}
 
+	$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 	$phpbb_notifications->delete_notifications(array(
 		'quote',
 		'bookmark',
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 8ba1fed6a7..1648228af5 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1410,8 +1410,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 */
 function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true, $update_search_index = true)
 {
-	global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path;
-	global $phpbb_notifications;
+	global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path, $phpbb_container;
 
 	// We do not handle erasing posts here
 	if ($mode == 'delete')
@@ -2231,6 +2230,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		'post_subject'		=> $subject,
 	));
 
+	$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 	if ($post_approval)
 	{
 		switch ($mode)
@@ -2282,6 +2283,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			case 'edit':
 			case 'edit_last_post':
 				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
+
 				$phpbb_notifications->delete_notifications(array(
 					'quote',
 					'bookmark',
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index ae8ffbe90e..14278a2529 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -876,7 +876,9 @@ function update_unread_status($unread, $msg_id, $user_id, $folder_id)
 		return;
 	}
 
-	global $db, $user, $phpbb_notifications;
+	global $db, $user, $phpbb_container;
+
+	$phpbb_notifications = $phpbb_container->get('notification_manager');
 
 	$phpbb_notifications->mark_notifications_read('pm', $msg_id, $user_id);
 
@@ -983,8 +985,7 @@ function handle_mark_actions($user_id, $mark_action)
 */
 function delete_pm($user_id, $msg_ids, $folder_id)
 {
-	global $db, $user, $phpbb_root_path, $phpEx;
-	global $phpbb_notifications;
+	global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
 
 	$user_id	= (int) $user_id;
 	$folder_id	= (int) $folder_id;
@@ -1096,6 +1097,8 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 		$user->data['user_unread_privmsg'] -= $num_unread;
 	}
 
+	$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 	$phpbb_notifications->delete_notifications('pm', array_keys($delete_rows));
 
 	// Now we have to check which messages we can delete completely
@@ -1162,8 +1165,7 @@ function phpbb_delete_user_pms($user_id)
 */
 function phpbb_delete_users_pms($user_ids)
 {
-	global $db, $user, $phpbb_root_path, $phpEx;
-	global $phpbb_notifications;
+	global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
 
 	$user_id_sql = $db->sql_in_set('user_id', $user_ids);
 	$author_id_sql = $db->sql_in_set('author_id', $user_ids);
@@ -1208,6 +1210,8 @@ function phpbb_delete_users_pms($user_ids)
 
 	$db->sql_transaction('begin');
 
+	$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 	if (!empty($undelivered_msg))
 	{
 		// A pm is delivered, if for any recipient the message was moved
@@ -1571,8 +1575,7 @@ function get_folder_status($folder_id, $folder)
 */
 function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 {
-	global $db, $auth, $config, $phpEx, $template, $user, $phpbb_root_path;
-	global $phpbb_notifications;
+	global $db, $auth, $config, $phpEx, $template, $user, $phpbb_root_path, $phpbb_container;
 
 	// We do not handle erasing pms here
 	if ($mode == 'delete')
@@ -1877,6 +1880,8 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 		'recipients'			=> $recipients,
 	));
 
+	$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 	if ($mode == 'edit')
 	{
 		$phpbb_notifications->update_notifications('pm', $pm_data);
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index 4ba1b2fd0c..db73506d1d 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -33,8 +33,7 @@ class mcp_pm_reports
 	function main($id, $mode)
 	{
 		global $auth, $db, $user, $template, $cache;
-		global $config, $phpbb_root_path, $phpEx, $action;
-		global $phpbb_notifications;
+		global $config, $phpbb_root_path, $phpEx, $action, $phpbb_container;
 
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
 		include_once($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
@@ -90,6 +89,8 @@ class mcp_pm_reports
 					trigger_error('NO_REPORT');
 				}
 
+				$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 				$phpbb_notifications->mark_notifications_read_by_parent('report_pm', $report_id, $user->data['user_id']);
 
 				$pm_id = $report['pm_id'];
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 4a3d443006..2a2146db71 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -33,8 +33,7 @@ class mcp_queue
 	function main($id, $mode)
 	{
 		global $auth, $db, $user, $template, $cache;
-		global $config, $phpbb_root_path, $phpEx, $action;
-		global $phpbb_notifications;
+		global $config, $phpbb_root_path, $phpEx, $action, $phpbb_container;
 
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
 
@@ -79,6 +78,8 @@ class mcp_queue
 				$post_id = request_var('p', 0);
 				$topic_id = request_var('t', 0);
 
+				$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 				if ($topic_id)
 				{
 					$topic_info = get_topic_data(array($topic_id), 'm_approve');
@@ -456,7 +457,7 @@ function approve_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path;
-	global $request, $phpbb_notifications;
+	global $request, $phpbb_container;
 
 	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 	{
@@ -605,6 +606,8 @@ function approve_post($post_id_list, $id, $mode)
 		// Send out normal user notifications
 		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
+		$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 		// Handle notifications
 		foreach ($post_info as $post_id => $post_data)
 		{
@@ -722,7 +725,7 @@ function disapprove_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path;
-	global $request, $phpbb_notifications;
+	global $request, $phpbb_container;
 
 	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 	{
@@ -855,6 +858,8 @@ function disapprove_post($post_id_list, $id, $mode)
 			}
 		}
 
+		$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 		foreach ($post_info as $post_id => $post_data)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 85723ab3f7..91ff31c51c 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -33,8 +33,7 @@ class mcp_reports
 	function main($id, $mode)
 	{
 		global $auth, $db, $user, $template, $cache;
-		global $config, $phpbb_root_path, $phpEx, $action;
-		global $phpbb_notifications;
+		global $config, $phpbb_root_path, $phpEx, $action, $phpbb_container;
 
 		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
 
@@ -88,6 +87,8 @@ class mcp_reports
 					trigger_error('NO_REPORT');
 				}
 
+				$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 				$phpbb_notifications->mark_notifications_read('report_post', $post_id, $user->data['user_id']);
 
 				if (!$report_id && $report['report_closed'])
@@ -446,8 +447,7 @@ class mcp_reports
 function close_report($report_id_list, $mode, $action, $pm = false)
 {
 	global $db, $template, $user, $config, $auth;
-	global $phpEx, $phpbb_root_path;
-	global $phpbb_notifications;
+	global $phpEx, $phpbb_root_path, $phpbb_container;
 
 	$pm_where = ($pm) ? ' AND r.post_id = 0 ' : ' AND r.pm_id = 0 ';
 	$id_column = ($pm) ? 'pm_id' : 'post_id';
@@ -636,6 +636,8 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 		// Notify reporters
 		if (sizeof($notify_reporters))
 		{
+			$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 			foreach ($notify_reporters as $report_id => $reporter)
 			{
 				if ($reporter['user_id'] == ANONYMOUS)
@@ -652,6 +654,7 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 						'closer_id'			=> $user->data['user_id'],
 						'from_user_id'		=> $post_info[$post_id]['author_id'],
 					)));
+
 					$phpbb_notifications->delete_notifications('report_pm', $post_id);
 				}
 				else
@@ -660,6 +663,7 @@ function close_report($report_id_list, $mode, $action, $pm = false)
 						'reporter'			=> $reporter['user_id'],
 						'closer_id'			=> $user->data['user_id'],
 					)));
+
 					$phpbb_notifications->delete_notifications('report_post', $post_id);
 				}
 			}
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 76fc411584..338c921e94 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -21,7 +21,7 @@ class ucp_notifications
 
 	public function main($id, $mode)
 	{
-		global $config, $template, $user, $request, $phpbb_notifications;
+		global $config, $template, $user, $request, $phpbb_container;
 		global $phpbb_root_path, $phpEx;
 
 		add_form_key('ucp_notification');
@@ -29,6 +29,8 @@ class ucp_notifications
 		$start = $request->variable('start', 0);
 		$form_time = min($request->variable('form_time', 0), time());
 
+		$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 		switch ($mode)
 		{
 			case 'notification_options':
-- 
cgit v1.2.1


From ddd874ba76366cebe3cc30df6daa1974e29f34d1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 19:46:32 -0600
Subject: [ticket/11103] dbal -> phpbb_db_driver

PHPBB3-11103
---
 phpBB/includes/notification/manager.php     | 4 ++--
 phpBB/includes/notification/method/base.php | 4 ++--
 phpBB/includes/notification/type/base.php   | 4 ++--
 phpBB/includes/user_loader.php              | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 22f8f58783..653446ab73 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -33,7 +33,7 @@ class phpbb_notification_manager
 	/** @var phpbb_user_loader */
 	protected $user_loader = null;
 
-	/** @var dbal */
+	/** @var phpbb_db_driver */
 	protected $db = null;
 
 	/** @var phpbb_user */
@@ -51,7 +51,7 @@ class phpbb_notification_manager
 	/** @var string */
 	protected $user_notifications_table = null;
 
-	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, dbal $db, $user, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
+	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, phpbb_db_driver $db, $user, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
 	{
 		$this->notification_types = $notification_types;
 		$this->notification_methods = $notification_methods;
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index 3f85d62a09..f37e7e7845 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -27,7 +27,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	/** @var phpbb_user_loader */
 	protected $user_loader = null;
 
-	/** @var dbal */
+	/** @var phpbb_db_driver */
 	protected $db = null;
 
 	/** @var phpbb_cache_service */
@@ -61,7 +61,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	*/
 	protected $queue = array();
 
-	public function __construct(phpbb_user_loader $user_loader, dbal $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index d596c06167..31792de04c 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -27,7 +27,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/** @var phpbb_user_loader */
 	protected $user_loader = null;
 
-	/** @var dbal */
+	/** @var phpbb_db_driver */
 	protected $db = null;
 
 	/** @var phpbb_cache_service */
@@ -84,7 +84,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	private $data = array();
 
-	public function __construct(phpbb_user_loader $user_loader, dbal $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
+	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
diff --git a/phpBB/includes/user_loader.php b/phpBB/includes/user_loader.php
index db12854a60..77128d6570 100644
--- a/phpBB/includes/user_loader.php
+++ b/phpBB/includes/user_loader.php
@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_user_loader
 {
-	/** @var dbal */
+	/** @var phpbb_db_driver */
 	protected $db = null;
 
 	/** @var string */
@@ -46,12 +46,12 @@ class phpbb_user_loader
 	/**
 	* User loader constructor
 	*
-	* @param dbal $db A database connection
+	* @param phpbb_db_driver $db A database connection
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
 	* @param string $php_ext php file extension
 	* @param string $users_table The name of the database table (phpbb_users)
 	*/
-	public function __construct(dbal $db, $phpbb_root_path, $php_ext, $users_table)
+	public function __construct(phpbb_db_driver $db, $phpbb_root_path, $php_ext, $users_table)
 	{
 		$this->db = $db;
 
-- 
cgit v1.2.1


From bec05a11f38cd57d7e7a6c7f64ecdb7351e24fc0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 19:56:39 -0600
Subject: [ticket/11103] Add constants for the tables

PHPBB3-11103
---
 phpBB/includes/constants.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 68af41ab20..7a3c73e987 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -239,6 +239,7 @@ define('LOG_TABLE',					$table_prefix . 'log');
 define('LOGIN_ATTEMPT_TABLE',		$table_prefix . 'login_attempts');
 define('MODERATOR_CACHE_TABLE',		$table_prefix . 'moderator_cache');
 define('MODULES_TABLE',				$table_prefix . 'modules');
+define('NOTIFICATIONS_TABLE',		$table_prefix . 'notifications');
 define('POLL_OPTIONS_TABLE',		$table_prefix . 'poll_options');
 define('POLL_VOTES_TABLE',			$table_prefix . 'poll_votes');
 define('POSTS_TABLE',				$table_prefix . 'posts');
@@ -272,6 +273,7 @@ define('TOPICS_POSTED_TABLE',		$table_prefix . 'topics_posted');
 define('TOPICS_TRACK_TABLE',		$table_prefix . 'topics_track');
 define('TOPICS_WATCH_TABLE',		$table_prefix . 'topics_watch');
 define('USER_GROUP_TABLE',			$table_prefix . 'user_group');
+define('USER_NOTIFICATIONS_TABLE',	$table_prefix . 'user_notifications');
 define('USERS_TABLE',				$table_prefix . 'users');
 define('WARNINGS_TABLE',			$table_prefix . 'warnings');
 define('WORDS_TABLE',				$table_prefix . 'words');
-- 
cgit v1.2.1


From abcc59fca6bd5d899adbec248ba60db6c013e6a2 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 3 Sep 2012 15:10:08 -0500
Subject: [ticket/8610] Update Bookmarks when merging topics

Update bookmarks to the new topic when merging multiple topics using
the merge_topics function.

PHPBB3-8610
---
 phpBB/includes/mcp/mcp_forum.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index b70601b479..865e464e81 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -422,6 +422,14 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 
 		$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
 
+		// If the topic no longer exist, we will update the bookmarks table.
+		// To not let it error out on users who bookmarked both topics, we just return on an error...
+		$db->sql_return_on_error(true);
+		$db->sql_query('UPDATE ' . BOOKMARKS_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
+		$db->sql_return_on_error(false);
+
+		$db->sql_query('DELETE FROM ' . BOOKMARKS_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
+
 		// Link to the new topic
 		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
 	}
@@ -444,4 +452,4 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 	}
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From 8dd2a151cc53a5482fcf462736cf5c2eabccf599 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 3 Sep 2012 15:18:30 -0500
Subject: [ticket/8610] Update Bookmarks when forking topics

Update bookmarks to the new topic when forking topics using
the mcp_fork_topic function.

PHPBB3-8610
---
 phpBB/includes/mcp/mcp_main.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index ffede11d37..f7c49539ea 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -1251,6 +1251,26 @@ function mcp_fork_topic($topic_ids)
 			{
 				$db->sql_multi_insert(TOPICS_WATCH_TABLE, $sql_ary);
 			}
+
+			$sql = 'SELECT user_id
+				FROM ' . BOOKMARKS_TABLE . '
+				WHERE topic_id = ' . $topic_id;
+			$result = $db->sql_query($sql);
+
+			$sql_ary = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$sql_ary[] = array(
+					'topic_id'		=> (int) $new_topic_id,
+					'user_id'		=> (int) $row['user_id'],
+				);
+			}
+			$db->sql_freeresult($result);
+
+			if (sizeof($sql_ary))
+			{
+				$db->sql_multi_insert(BOOKMARKS_TABLE, $sql_ary);
+			}
 		}
 
 		// Sync new topics, parent forums and board stats
@@ -1314,4 +1334,4 @@ function mcp_fork_topic($topic_ids)
 	}
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From 05d7decdd35eac3b58807b9ced318421a6ce15da Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 3 Sep 2012 15:30:52 -0500
Subject: [ticket/8610] Update Bookmarks when merging posts into another topic

Update bookmarks to the new topic when merging posts into another topic
using the merge_posts function.

PHPBB3-8610
---
 phpBB/includes/mcp/mcp_topic.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 7d4edaf362..36cfe1e355 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -626,6 +626,14 @@ function merge_posts($topic_id, $to_topic_id)
 			$db->sql_return_on_error(false);
 
 			$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE topic_id = ' . (int) $topic_id);
+
+			// If the topic no longer exist, we will update the bookmarks table.
+			// To not let it error out on users who bookmarked both topics, we just return on an error...
+			$db->sql_return_on_error(true);
+			$db->sql_query('UPDATE ' . BOOKMARKS_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id);
+			$db->sql_return_on_error(false);
+
+			$db->sql_query('DELETE FROM ' . BOOKMARKS_TABLE . ' WHERE topic_id = ' . (int) $topic_id);
 		}
 
 		// Link to the new topic
@@ -650,4 +658,4 @@ function merge_posts($topic_id, $to_topic_id)
 	}
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From 5a88bd1bf103537aece6713145fd13288cf3c329 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 3 Sep 2012 15:35:06 -0500
Subject: [ticket/8610] Update Bookmarks and Subscriptions when splitting
 topics

Update bookmarks and subscriptions to add bookmarks/subscriptions to the
new topic when using the split_topic function

PHPBB3-8610
---
 phpBB/includes/mcp/mcp_forum.php | 12 +++++++--
 phpBB/includes/mcp/mcp_topic.php | 56 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 64 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 865e464e81..ce709e7f71 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -98,6 +98,9 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 	$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total;
 	$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
 
+	$base_url = $url . "&amp;i=$id&amp;action=$action&amp;mode=$mode&amp;sd=$sort_dir&amp;sk=$sort_key&amp;st=$sort_days" . (($merge_select) ? $selected_ids : '');
+	phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $forum_topics, $topics_per_page, $start);
+	
 	$template->assign_vars(array(
 		'ACTION'				=> $action,
 		'FORUM_NAME'			=> $forum_info['forum_name'],
@@ -425,10 +428,15 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		// If the topic no longer exist, we will update the bookmarks table.
 		// To not let it error out on users who bookmarked both topics, we just return on an error...
 		$db->sql_return_on_error(true);
-		$db->sql_query('UPDATE ' . BOOKMARKS_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
+		$sql = 'UPDATE ' . BOOKMARKS_TABLE . '
+			SET topic_id = ' . (int) $to_topic_id . '
+			WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
+		$db->sql_query($sql);
 		$db->sql_return_on_error(false);
 
-		$db->sql_query('DELETE FROM ' . BOOKMARKS_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
+		$sql = 'DELETE FROM ' . BOOKMARKS_TABLE . '
+			WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
+		$db->sql_query($sql);
 
 		// Link to the new topic
 		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 36cfe1e355..f0775f9137 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -307,6 +307,12 @@ function mcp_topic_view($id, $mode, $action)
 		'post_ids'	=> $post_id_list,
 	));
 
+	$base_url = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&amp;t={$topic_info['topic_id']}&amp;mode=$mode&amp;action=$action&amp;to_topic_id=$to_topic_id&amp;posts_per_page=$posts_per_page&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir");
+	if ($posts_per_page)
+	{
+		phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total, $posts_per_page, $start);
+	}
+	
 	$template->assign_vars(array(
 		'TOPIC_TITLE'		=> $topic_info['topic_title'],
 		'U_VIEW_TOPIC'		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_info['forum_id'] . '&amp;t=' . $topic_info['topic_id']),
@@ -517,6 +523,47 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 			WHERE post_id = {$post_id_list[0]}";
 		$db->sql_query($sql);
 
+		$sql = 'SELECT user_id, notify_status
+			FROM ' . TOPICS_WATCH_TABLE . '
+			WHERE topic_id = ' . $topic_id;
+		$result = $db->sql_query($sql);
+
+		$sql_ary = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$sql_ary[] = array(
+				'topic_id'		=> (int) $to_topic_id,
+				'user_id'		=> (int) $row['user_id'],
+				'notify_status'	=> (int) $row['notify_status'],
+			);
+		}
+		$db->sql_freeresult($result);
+
+		if (sizeof($sql_ary))
+		{
+			$db->sql_multi_insert(TOPICS_WATCH_TABLE, $sql_ary);
+		}
+
+		$sql = 'SELECT user_id
+			FROM ' . BOOKMARKS_TABLE . '
+			WHERE topic_id = ' . $topic_id;
+		$result = $db->sql_query($sql);
+
+		$sql_ary = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$sql_ary[] = array(
+				'topic_id'		=> (int) $to_topic_id,
+				'user_id'		=> (int) $row['user_id'],
+			);
+		}
+		$db->sql_freeresult($result);
+
+		if (sizeof($sql_ary))
+		{
+			$db->sql_multi_insert(BOOKMARKS_TABLE, $sql_ary);
+		}
+
 		$success_msg = 'TOPIC_SPLIT_SUCCESS';
 
 		// Update forum statistics
@@ -630,10 +677,15 @@ function merge_posts($topic_id, $to_topic_id)
 			// If the topic no longer exist, we will update the bookmarks table.
 			// To not let it error out on users who bookmarked both topics, we just return on an error...
 			$db->sql_return_on_error(true);
-			$db->sql_query('UPDATE ' . BOOKMARKS_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id);
+			$sql = 'UPDATE ' . BOOKMARKS_TABLE . '
+				SET topic_id = ' . (int) $to_topic_id . '
+				WHERE topic_id = ' . (int) $topic_id;
+			$db->sql_query($sql);
 			$db->sql_return_on_error(false);
 
-			$db->sql_query('DELETE FROM ' . BOOKMARKS_TABLE . ' WHERE topic_id = ' . (int) $topic_id);
+			$sql = 'DELETE FROM ' . BOOKMARKS_TABLE . '
+				WHERE topic_id = ' . (int) $topic_id;
+			$db->sql_query($sql);
 		}
 
 		// Link to the new topic
-- 
cgit v1.2.1


From 71bcc58feecd49fe05f6b7e0e2bca8a94424f240 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 30 Oct 2012 12:27:02 -0500
Subject: [ticket/8610] Add some comments

PHPBB3-8610
---
 phpBB/includes/mcp/mcp_main.php  | 2 ++
 phpBB/includes/mcp/mcp_topic.php | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index f7c49539ea..cce4db8b4d 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -1231,6 +1231,7 @@ function mcp_fork_topic($topic_ids)
 				}
 			}
 
+			// Copy topic subscriptions to new topic
 			$sql = 'SELECT user_id, notify_status
 				FROM ' . TOPICS_WATCH_TABLE . '
 				WHERE topic_id = ' . $topic_id;
@@ -1252,6 +1253,7 @@ function mcp_fork_topic($topic_ids)
 				$db->sql_multi_insert(TOPICS_WATCH_TABLE, $sql_ary);
 			}
 
+			// Copy bookmarks to new topic
 			$sql = 'SELECT user_id
 				FROM ' . BOOKMARKS_TABLE . '
 				WHERE topic_id = ' . $topic_id;
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index f0775f9137..28f5c6a41d 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -523,6 +523,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 			WHERE post_id = {$post_id_list[0]}";
 		$db->sql_query($sql);
 
+		// Copy topic subscriptions to new topic
 		$sql = 'SELECT user_id, notify_status
 			FROM ' . TOPICS_WATCH_TABLE . '
 			WHERE topic_id = ' . $topic_id;
@@ -544,6 +545,7 @@ function split_topic($action, $topic_id, $to_forum_id, $subject)
 			$db->sql_multi_insert(TOPICS_WATCH_TABLE, $sql_ary);
 		}
 
+		// Copy bookmarks to new topic
 		$sql = 'SELECT user_id
 			FROM ' . BOOKMARKS_TABLE . '
 			WHERE topic_id = ' . $topic_id;
-- 
cgit v1.2.1


From 5e38317dcf28627abbb622d0412cc6cc3416071b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 21:27:30 -0500
Subject: [ticket/11162] Chase dbal autoloading changes in develop.

PHPBB3-11162
---
 phpBB/includes/functions_database_helper.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_database_helper.php b/phpBB/includes/functions_database_helper.php
index 664c246888..1b508e6a02 100644
--- a/phpBB/includes/functions_database_helper.php
+++ b/phpBB/includes/functions_database_helper.php
@@ -22,14 +22,14 @@ if (!defined('IN_PHPBB'))
 *
 * The only supported table is bookmarks.
 *
-* @param dbal $db Database object
+* @param phpbb_db_driver $db Database object
 * @param string $table Table on which to perform the update
 * @param string $column Column whose values to change
 * @param array $from_values An array of values that should be changed
 * @param int $to_value The new value
 * @return null
 */
-function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_values, $to_value)
+function phpbb_update_rows_avoiding_duplicates(phpbb_db_driver $db, $table, $column, $from_values, $to_value)
 {
 	$sql = "SELECT $column, user_id
 		FROM $table
@@ -107,14 +107,14 @@ function phpbb_update_rows_avoiding_duplicates($db, $table, $column, $from_value
 *
 * The only supported table is topics_watch.
 *
-* @param dbal $db Database object
+* @param phpbb_db_driver $db Database object
 * @param string $table Table on which to perform the update
 * @param string $column Column whose values to change
 * @param array $from_values An array of values that should be changed
 * @param int $to_value The new value
 * @return null
 */
-function phpbb_update_rows_avoiding_duplicates_notify_status($db, $table, $column, $from_values, $to_value)
+function phpbb_update_rows_avoiding_duplicates_notify_status(phpbb_db_driver $db, $table, $column, $from_values, $to_value)
 {
 	$sql = "SELECT $column, user_id, notify_status
 		FROM $table
-- 
cgit v1.2.1


From 5c614ff6249c441637103ba0b78338f878057479 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 20:30:16 -0600
Subject: [ticket/8610] Revert some funky merging I did from rebase

PHPBB3-8610
---
 phpBB/includes/mcp/mcp_forum.php | 5 +----
 phpBB/includes/mcp/mcp_main.php  | 2 +-
 phpBB/includes/mcp/mcp_topic.php | 8 +-------
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index ce709e7f71..78239698a9 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -98,9 +98,6 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 	$forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total;
 	$limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : '';
 
-	$base_url = $url . "&amp;i=$id&amp;action=$action&amp;mode=$mode&amp;sd=$sort_dir&amp;sk=$sort_key&amp;st=$sort_days" . (($merge_select) ? $selected_ids : '');
-	phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $forum_topics, $topics_per_page, $start);
-	
 	$template->assign_vars(array(
 		'ACTION'				=> $action,
 		'FORUM_NAME'			=> $forum_info['forum_name'],
@@ -460,4 +457,4 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index cce4db8b4d..0cef8933fc 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -1336,4 +1336,4 @@ function mcp_fork_topic($topic_ids)
 	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 28f5c6a41d..ba11b04884 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -307,12 +307,6 @@ function mcp_topic_view($id, $mode, $action)
 		'post_ids'	=> $post_id_list,
 	));
 
-	$base_url = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&amp;t={$topic_info['topic_id']}&amp;mode=$mode&amp;action=$action&amp;to_topic_id=$to_topic_id&amp;posts_per_page=$posts_per_page&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir");
-	if ($posts_per_page)
-	{
-		phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total, $posts_per_page, $start);
-	}
-	
 	$template->assign_vars(array(
 		'TOPIC_TITLE'		=> $topic_info['topic_title'],
 		'U_VIEW_TOPIC'		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_info['forum_id'] . '&amp;t=' . $topic_info['topic_id']),
@@ -712,4 +706,4 @@ function merge_posts($topic_id, $to_topic_id)
 	}
 }
 
-?>
+?>
\ No newline at end of file
-- 
cgit v1.2.1


From a50907250e487675baf9ac77be564b6ccb72b056 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 20:42:10 -0600
Subject: [ticket/8610] Use phpbb_update_rows_avoiding_duplicates

PHPBB3-8610
---
 phpBB/includes/mcp/mcp_forum.php | 16 +++++-----------
 phpBB/includes/mcp/mcp_topic.php | 12 +-----------
 2 files changed, 6 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 78239698a9..097f67487d 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -423,17 +423,11 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids));
 
 		// If the topic no longer exist, we will update the bookmarks table.
-		// To not let it error out on users who bookmarked both topics, we just return on an error...
-		$db->sql_return_on_error(true);
-		$sql = 'UPDATE ' . BOOKMARKS_TABLE . '
-			SET topic_id = ' . (int) $to_topic_id . '
-			WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
-		$db->sql_query($sql);
-		$db->sql_return_on_error(false);
-
-		$sql = 'DELETE FROM ' . BOOKMARKS_TABLE . '
-			WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
-		$db->sql_query($sql);
+		if (!function_exists('phpbb_update_rows_avoiding_duplicates'))
+		{
+			include($phpbb_root_path . 'includes/functions_database_helper.' . $phpEx);
+		}		
+		phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
 		// Link to the new topic
 		$return_link .= (($return_link) ? '<br /><br />' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $to_forum_id . '&amp;t=' . $to_topic_id) . '">', '</a>');
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index ba11b04884..29d7a0e41b 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -671,17 +671,7 @@ function merge_posts($topic_id, $to_topic_id)
 			$db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE topic_id = ' . (int) $topic_id);
 
 			// If the topic no longer exist, we will update the bookmarks table.
-			// To not let it error out on users who bookmarked both topics, we just return on an error...
-			$db->sql_return_on_error(true);
-			$sql = 'UPDATE ' . BOOKMARKS_TABLE . '
-				SET topic_id = ' . (int) $to_topic_id . '
-				WHERE topic_id = ' . (int) $topic_id;
-			$db->sql_query($sql);
-			$db->sql_return_on_error(false);
-
-			$sql = 'DELETE FROM ' . BOOKMARKS_TABLE . '
-				WHERE topic_id = ' . (int) $topic_id;
-			$db->sql_query($sql);
+			phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $topic_id, $to_topic_id);
 		}
 
 		// Link to the new topic
-- 
cgit v1.2.1


From ade9f831aa151de428c4d2b33fce48f9733db336 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 14 Dec 2012 12:58:57 +0100
Subject: [ticket/11250] Move quote special cases from class to unit tests

PHPBB3-11250
---
 phpBB/includes/message_parser.php | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 1cd2a46fa1..44960dd78d 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -702,17 +702,6 @@ class bbcode_firstpass extends bbcode
 	{
 		global $config, $user;
 
-		/**
-		* If you change this code, make sure the cases described within the following reports are still working:
-		* #3572 - [quote="[test]test"]test [ test[/quote] - (correct: parsed)
-		* #14667 - [quote]test[/quote] test ] and [ test [quote]test[/quote] (correct: parsed)
-		* #14770 - [quote="["]test[/quote] (correct: parsed)
-		* [quote="[i]test[/i]"]test[/quote] (correct: parsed)
-		* [quote="[quote]test[/quote]"]test[/quote] (correct: parsed - Username displayed as [quote]test[/quote])
-		* #20735 - [quote]test[/[/b]quote] test [/quote][/quote] test - (correct: quoted: "test[/[/b]quote] test" / non-quoted: "[/quote] test" - also failed if layout distorted)
-		* #40565 - [quote="a"]a[/quote][quote="a]a[/quote] (correct: first quote tag parsed, second quote tag unparsed)
-		*/
-
 		$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
 
 		if (!$in)
-- 
cgit v1.2.1


From 16c021e98667fe353e6b3a6cb0bbf3b8f2319f98 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 14 Dec 2012 15:46:45 +0100
Subject: [ticket/10954] Change behavior of marking topics/forums

It will now display a popup message for 3 seconds which will confirm the
taken action. The amount of DOM traversals have been significantly reduced
and jQuery.each is now used instead of for loops. Additionally, it is now
possible to click on the mark topics/forums read links without triggering
an AJAX error.

PHPBB3-10954
---
 phpBB/includes/functions_display.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index f3198bc1e5..cd4c901b58 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -63,10 +63,13 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 
 			if ($request->is_ajax())
 			{
-				// Tell the ajax script what language vars need to be replaced
+				// Tell the ajax script what language vars and URL need to be replaced
 				$data = array(
 					'NO_UNREAD_POSTS'	=> $user->lang['NO_UNREAD_POSTS'],
-					'UNREAD_POSTS'		=> $user->lang['UNREAD_POSTS']
+					'UNREAD_POSTS'		=> $user->lang['UNREAD_POSTS'],
+					'U_MARK_FORUMS'		=> ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'hash=' . generate_link_hash('global') . '&mark=forums&mark_time=' . time()) : '',
+					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
+					'MESSAGE_TEXT'		=> $user->lang['FORUMS_MARKED']
 				);
 				$json_response = new phpbb_json_response();
 				$json_response->send($data);
@@ -326,10 +329,13 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 
 			if ($request->is_ajax())
 			{
-				// Tell the ajax script what language vars need to be replaced
+				// Tell the ajax script what language vars and URL need to be replaced
 				$data = array(
 					'NO_UNREAD_POSTS'	=> $user->lang['NO_UNREAD_POSTS'],
-					'UNREAD_POSTS'		=> $user->lang['UNREAD_POSTS']
+					'UNREAD_POSTS'		=> $user->lang['UNREAD_POSTS'],
+					'U_MARK_FORUMS'		=> ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . '&f=' . $root_data['forum_id'] . '&mark=forums&mark_time=' . time()) : '',
+					'MESSAGE_TITLE'		=> $user->lang['INFORMATION'],
+					'MESSAGE_TEXT'		=> $user->lang['FORUMS_MARKED']
 				);
 				$json_response = new phpbb_json_response();
 				$json_response->send($data);
-- 
cgit v1.2.1


From 512697341a9c570ee11697eb221ef18d2fadfe45 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 14 Dec 2012 18:47:22 +0100
Subject: [ticket/10714] Fix database driver class name

PHPBB3-10714
---
 phpBB/includes/log/log.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index beb2a659e1..521a998d8e 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -44,7 +44,7 @@ class phpbb_log implements phpbb_log_interface
 
 	/**
 	* Database object
-	* @var dbal
+	* @var phpbb_db_driver
 	*/
 	protected $db;
 
@@ -87,9 +87,9 @@ class phpbb_log implements phpbb_log_interface
 	/**
 	* Constructor
 	*
-	* @param	dbal		$db		Database object
-	* @param	phpbb_user	$user	User object
-	* @param	phpbb_auth	$auth	Auth object
+	* @param	phpbb_db_driver	$db		Database object
+	* @param	phpbb_user		$user	User object
+	* @param	phpbb_auth		$auth	Auth object
 	* @param	phpbb_dispatcher	$phpbb_dispatcher	Event dispatcher
 	* @param	string		$phpbb_root_path		Root path
 	* @param	string		$php_ext			PHP Extension
-- 
cgit v1.2.1


From 95bd4d73eb41d677470b0bf77c521ae2a9bb731e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Dec 2012 10:33:03 -0600
Subject: [ticket/11103] Mark topic/post subscription notification read when
 approved

PHPBB3-11103
---
 phpBB/includes/mcp/mcp_queue.php        | 14 +++++++++++++-
 phpBB/includes/notification/manager.php | 10 ----------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 2a2146db71..24afa1f210 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -615,7 +615,13 @@ function approve_post($post_id_list, $id, $mode)
 			{
 				$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
 
-				$phpbb_notifications->add_notifications('topic', $post_data);
+				$phpbb_notifications->add_notifications(array(
+					'quote',
+					'topic',
+				), $post_data);
+
+				$phpbb_notifications->mark_notifications_read('quote', $post_data['post_id'], $user->data['user_id']);
+				$phpbb_notifications->mark_notifications_read('topic', $post_data['topic_id'], $user->data['user_id']);
 
 				if ($notify_poster)
 				{
@@ -631,6 +637,12 @@ function approve_post($post_id_list, $id, $mode)
 					'bookmark',
 					'post',
 				), $post_data);
+				
+				$phpbb_notifications->mark_notifications_read(array(
+					'quote',
+					'bookmark',
+					'post',
+				),$post_data['post_id'], $user->data['user_id']);
 
 				if ($notify_poster)
 				{
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 653446ab73..6bf97a3e71 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -226,16 +226,6 @@ class phpbb_notification_manager
 	*/
 	public function mark_notifications_read($item_type, $item_id, $user_id, $time = false)
 	{
-		if (is_array($item_type))
-		{
-			foreach ($item_type as $type)
-			{
-				$this->mark_notifications_read($type, $item_id, $user_id, $time);
-			}
-
-			return;
-		}
-
 		$time = ($time !== false) ? $time : time();
 
 		$sql = 'UPDATE ' . $this->notifications_table . "
-- 
cgit v1.2.1


From 5c496674f63b31e892d0f3bed7921feb947ed839 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 15 Dec 2012 01:19:55 -0500
Subject: [ticket/10758] Dependency inject parameters into cache_moderators.

Also add phpbb prefix since the signature is being changed anyway.

PHPBB3-10758
---
 phpBB/includes/acp/acp_forums.php      |  6 +++---
 phpBB/includes/acp/acp_main.php        | 18 +++++++++---------
 phpBB/includes/acp/acp_permissions.php | 16 ++++++++--------
 phpBB/includes/acp/acp_styles.php      |  4 +++-
 phpBB/includes/functions_admin.php     | 14 +++++++++-----
 phpBB/includes/functions_user.php      | 12 ++++++------
 6 files changed, 38 insertions(+), 32 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index c6dbf5eb9c..7e8d5d8388 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -206,7 +206,7 @@ class acp_forums
 							($action != 'edit' || empty($forum_id) || ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))))
 						{
 							copy_forum_permissions($forum_perm_from, $forum_data['forum_id'], ($action == 'edit') ? true : false);
-							cache_moderators();
+							phpbb_cache_moderators($db, $cache, $auth);
 							$copied_permissions = true;
 						}
 /* Commented out because of questionable UI workflow - re-visit for 3.0.7
@@ -266,7 +266,7 @@ class acp_forums
 					add_log('admin', 'LOG_FORUM_' . strtoupper($action), $row['forum_name'], $move_forum_name);
 					$cache->destroy('sql', FORUMS_TABLE);
 				}
-				
+
 				if ($request->is_ajax())
 				{
 					$json_response = new phpbb_json_response;
@@ -768,7 +768,7 @@ class acp_forums
 				if (!empty($forum_perm_from) && $forum_perm_from != $forum_id)
 				{
 					copy_forum_permissions($forum_perm_from, $forum_id, true);
-					cache_moderators();
+					phpbb_cache_moderators($db, $cache, $auth);
 					$auth->acl_clear_prefetch();
 					$cache->destroy('sql', FORUMS_TABLE);
 
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index d419bc3b99..c44bc1b8a6 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -24,7 +24,7 @@ class acp_main
 
 	function main($id, $mode)
 	{
-		global $config, $db, $user, $auth, $template, $request;
+		global $config, $db, $cache, $user, $auth, $template, $request;
 		global $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		// Show restore permissions notice
@@ -129,7 +129,7 @@ class acp_main
 						set_config('record_online_users', 1, true);
 						set_config('record_online_date', time(), true);
 						add_log('admin', 'LOG_RESET_ONLINE');
-						
+
 						if ($request->is_ajax())
 						{
 							trigger_error('RESET_ONLINE_SUCCESS');
@@ -184,7 +184,7 @@ class acp_main
 						update_last_username();
 
 						add_log('admin', 'LOG_RESYNC_STATS');
-						
+
 						if ($request->is_ajax())
 						{
 							trigger_error('RESYNC_STATS_SUCCESS');
@@ -251,7 +251,7 @@ class acp_main
 						}
 
 						add_log('admin', 'LOG_RESYNC_POSTCOUNTS');
-						
+
 						if ($request->is_ajax())
 						{
 							trigger_error('RESYNC_POSTCOUNTS_SUCCESS');
@@ -266,7 +266,7 @@ class acp_main
 
 						set_config('board_startdate', time() - 1);
 						add_log('admin', 'LOG_RESET_DATE');
-						
+
 						if ($request->is_ajax())
 						{
 							trigger_error('RESET_DATE_SUCCESS');
@@ -346,7 +346,7 @@ class acp_main
 						}
 
 						add_log('admin', 'LOG_RESYNC_POST_MARKING');
-						
+
 						if ($request->is_ajax())
 						{
 							trigger_error('RESYNC_POST_MARKING_SUCCESS');
@@ -359,10 +359,10 @@ class acp_main
 
 						// Clear permissions
 						$auth->acl_clear_prefetch();
-						cache_moderators();
+						phpbb_cache_moderators($db, $cache, $auth);
 
 						add_log('admin', 'LOG_PURGE_CACHE');
-						
+
 						if ($request->is_ajax())
 						{
 							trigger_error('PURGE_CACHE_SUCCESS');
@@ -413,7 +413,7 @@ class acp_main
 						$db->sql_query($sql);
 
 						add_log('admin', 'LOG_PURGE_SESSIONS');
-						
+
 						if ($request->is_ajax())
 						{
 							trigger_error('PURGE_SESSIONS_SUCCESS');
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index dd071074de..d65a9cbb9e 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -656,7 +656,7 @@ class acp_permissions
 	*/
 	function set_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id)
 	{
-		global $user, $auth;
+		global $db, $cache, $user, $auth;
 		global $request;
 
 		$psubmit = request_var('psubmit', array(0 => array(0 => 0)));
@@ -726,7 +726,7 @@ class acp_permissions
 		// Do we need to recache the moderator lists?
 		if ($permission_type == 'm_')
 		{
-			cache_moderators();
+			phpbb_cache_moderators($db, $cache, $auth);
 		}
 
 		// Remove users who are now moderators or admins from everyones foes list
@@ -745,7 +745,7 @@ class acp_permissions
 	*/
 	function set_all_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id)
 	{
-		global $user, $auth;
+		global $db, $cache, $user, $auth;
 		global $request;
 
 		// User or group to be set?
@@ -794,7 +794,7 @@ class acp_permissions
 		// Do we need to recache the moderator lists?
 		if ($permission_type == 'm_')
 		{
-			cache_moderators();
+			phpbb_cache_moderators($db, $cache, $auth);
 		}
 
 		// Remove users who are now moderators or admins from everyones foes list
@@ -858,7 +858,7 @@ class acp_permissions
 	*/
 	function remove_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id, &$forum_id)
 	{
-		global $user, $db, $auth;
+		global $user, $db, $cache, $auth;
 
 		// User or group to be set?
 		$ug_type = (sizeof($user_id)) ? 'user' : 'group';
@@ -874,7 +874,7 @@ class acp_permissions
 		// Do we need to recache the moderator lists?
 		if ($permission_type == 'm_')
 		{
-			cache_moderators();
+			phpbb_cache_moderators($db, $cache, $auth);
 		}
 
 		$this->log_action($mode, 'del', $permission_type, $ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : array(0 => 0)));
@@ -1172,7 +1172,7 @@ class acp_permissions
 	*/
 	function copy_forum_permissions()
 	{
-		global $auth, $cache, $template, $user;
+		global $db, $auth, $cache, $template, $user;
 
 		$user->add_lang('acp/forums');
 
@@ -1187,7 +1187,7 @@ class acp_permissions
 			{
 				if (copy_forum_permissions($src, $dest))
 				{
-					cache_moderators();
+					phpbb_cache_moderators($db, $cache, $auth);
 
 					$auth->acl_clear_prefetch();
 					$cache->destroy('sql', FORUMS_TABLE);
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index db77825ae7..266495972b 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -137,11 +137,13 @@ class acp_styles
 	*/
 	protected function action_cache()
 	{
+		global $db, $cache, $auth;
+
 		$this->cache->purge();
 
 		// Clear permissions
 		$this->auth->acl_clear_prefetch();
-		cache_moderators();
+		phpbb_cache_moderators($db, $cache, $auth);
 
 		add_log('admin', 'LOG_PURGE_CACHE');
 
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 15930f9a2c..571f1acd1d 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2292,13 +2292,17 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr
 }
 
 /**
-* Cache moderators, called whenever permissions are changed via admin_permissions. Changes of username
-* and group names must be carried through for the moderators table
+* Cache moderators. Called whenever permissions are changed
+* via admin_permissions. Changes of usernames and group names
+* must be carried through for the moderators table
+*
+* @param phpbb_db_driver $db Database connection
+* @param phpbb_cache_driver_interface Cache driver
+* @param phpbb_auth $auth Authentication object
+* @return null
 */
-function cache_moderators()
+function phpbb_cache_moderators($db, $cache, $auth)
 {
-	global $db, $cache, $auth, $phpbb_root_path, $phpEx;
-
 	// Remove cached sql results
 	$cache->destroy('sql', MODERATOR_CACHE_TABLE);
 
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 8f9c9198f4..2d6c15a5b1 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2842,7 +2842,7 @@ function avatar_remove_db($avatar_name)
 */
 function group_delete($group_id, $group_name = false)
 {
-	global $db, $phpbb_root_path, $phpEx, $phpbb_dispatcher;
+	global $db, $cache, $auth, $phpbb_root_path, $phpEx, $phpbb_dispatcher;
 
 	if (!$group_name)
 	{
@@ -2913,12 +2913,12 @@ function group_delete($group_id, $group_name = false)
 	extract($phpbb_dispatcher->trigger_event('core.delete_group_after', compact($vars)));
 
 	// Re-cache moderators
-	if (!function_exists('cache_moderators'))
+	if (!function_exists('phpbb_cache_moderators'))
 	{
 		include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 	}
 
-	cache_moderators();
+	phpbb_cache_moderators($db, $cache, $auth);
 
 	add_log('admin', 'LOG_GROUP_DELETE', $group_name);
 
@@ -3678,7 +3678,7 @@ function group_memberships($group_id_ary = false, $user_id_ary = false, $return_
 */
 function group_update_listings($group_id)
 {
-	global $auth;
+	global $db, $cache, $auth;
 
 	$hold_ary = $auth->acl_group_raw_data($group_id, array('a_', 'm_'));
 
@@ -3720,12 +3720,12 @@ function group_update_listings($group_id)
 
 	if ($mod_permissions)
 	{
-		if (!function_exists('cache_moderators'))
+		if (!function_exists('phpbb_cache_moderators'))
 		{
 			global $phpbb_root_path, $phpEx;
 			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 		}
-		cache_moderators();
+		phpbb_cache_moderators($db, $cache, $auth);
 	}
 
 	if ($mod_permissions || $admin_permissions)
-- 
cgit v1.2.1


From e82833d4b8bc9241641577b12a779e12338ace39 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 15 Dec 2012 01:29:10 -0500
Subject: [ticket/10758] Dependency inject parameters into update_foes.

Also add phpbb prefix since the signature is being changed anyway.

PHPBB3-10758
---
 phpBB/includes/acp/acp_permissions.php |  4 ++--
 phpBB/includes/functions_admin.php     | 12 ++++++++----
 phpBB/includes/functions_user.php      |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index d65a9cbb9e..3d4c256a3f 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -732,7 +732,7 @@ class acp_permissions
 		// Remove users who are now moderators or admins from everyones foes list
 		if ($permission_type == 'm_' || $permission_type == 'a_')
 		{
-			update_foes($group_id, $user_id);
+			phpbb_update_foes($db, $auth, $group_id, $user_id);
 		}
 
 		$this->log_action($mode, 'add', $permission_type, $ug_type, $ug_id, $forum_id);
@@ -800,7 +800,7 @@ class acp_permissions
 		// Remove users who are now moderators or admins from everyones foes list
 		if ($permission_type == 'm_' || $permission_type == 'a_')
 		{
-			update_foes($group_id, $user_id);
+			phpbb_update_foes($db, $auth, $group_id, $user_id);
 		}
 
 		$this->log_action($mode, 'add', $permission_type, $ug_type, $ug_ids, $forum_ids);
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 571f1acd1d..e8dd55813b 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2744,12 +2744,16 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 }
 
 /**
-* Update foes - remove moderators and administrators from foe lists...
+* Removes moderators and administrators from foe lists.
+*
+* @param phpbb_db_driver $db Database connection
+* @param phpbb_auth $auth Authentication object
+* @param array|bool $group_id If an array, remove all members of this group from foe lists, or false to ignore
+* @param array|bool $user_id If an array, remove this user from foe lists, or false to ignore
+* @return null
 */
-function update_foes($group_id = false, $user_id = false)
+function phpbb_update_foes($db, $auth, $group_id = false, $user_id = false)
 {
-	global $db, $auth;
-
 	// update foes for some user
 	if (is_array($user_id) && sizeof($user_id))
 	{
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 2d6c15a5b1..a50d5175fe 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -3730,12 +3730,12 @@ function group_update_listings($group_id)
 
 	if ($mod_permissions || $admin_permissions)
 	{
-		if (!function_exists('update_foes'))
+		if (!function_exists('phpbb_update_foes'))
 		{
 			global $phpbb_root_path, $phpEx;
 			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 		}
-		update_foes(array($group_id));
+		phpbb_update_foes($db, $auth, array($group_id));
 	}
 }
 
-- 
cgit v1.2.1


From 9e7d663e7638bac9add20d82467b8008e5c83e3b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 15 Dec 2012 14:09:33 -0500
Subject: [ticket/10758] Spelling fix.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/auth.php b/phpBB/includes/auth/auth.php
index e3bccaf47b..1ad9f94d26 100644
--- a/phpBB/includes/auth/auth.php
+++ b/phpBB/includes/auth/auth.php
@@ -191,7 +191,7 @@ class phpbb_auth
 
 	/**
 	* Get forums with the specified permission setting
-	* if the option is prefixed with !, then the result becomes nagated
+	* if the option is prefixed with !, then the result becomes negated
 	*
 	* @param bool $clean set to true if only values needs to be returned which are set/unset
 	*/
-- 
cgit v1.2.1


From 649e009f7b42a751d7b208bd5a4659c0fc442912 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Dec 2012 16:23:48 -0600
Subject: [ticket/8610] Update comment

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index de2966d34e..04e0e70f1d 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -422,7 +422,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		// Update the topic watch table.
 		phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
-		// If the topic no longer exist, we will update the bookmarks table.
+		// Update the bookmarks table.
 		phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
 		// Link to the new topic
-- 
cgit v1.2.1


From 066649946802896a3a18cc1868fe0e1795db3efb Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 15 Dec 2012 23:54:49 +0100
Subject: [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit"
 input box.

PHPBB3-11273
---
 phpBB/includes/search/fulltext_sphinx.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index a84a64825c..4bacf74f93 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -875,7 +875,7 @@ class phpbb_search_fulltext_sphinx
 		</dl>
 		<dl>
 			<dt><label for="fulltext_sphinx_indexer_mem_limit">' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" />' . $this->user->lang['MIB'] . '</dd>
+			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" /> ' . $this->user->lang['MIB'] . '</dd>
 		</dl>
 		<dl>
 			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</dt>
-- 
cgit v1.2.1


From d0375c46f91eb88508cbd8e320c7eda78d4f01dd Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Dec 2012 18:25:26 -0600
Subject: [ticket/11103] Purge notifications (to be used when an extension is
 purged)

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 653446ab73..fee1d079aa 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -733,6 +733,21 @@ class phpbb_notification_manager
 		$this->db->sql_query($sql);
 	}
 
+	/**
+	* Purge all notifications of a certain type
+	*
+	* This should be called when an extension which has notification types
+	* is purged so that all those notifications are removed
+	*
+	* @param string $item_type
+	*/
+	public function purge_notifications($item_type)
+	{
+		$sql = 'DELETE FROM ' . $this->notifications_table . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
+		$this->db->sql_query($sql);
+	}
+
 	/**
 	* Enable all notifications of a certain type
 	*
-- 
cgit v1.2.1


From c6f138ff12f015543f92d07fb5c93c083a246bab Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Dec 2012 18:35:17 -0600
Subject: [ticket/11103] Prune notifications function

To delete all notifications before a certain time

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 90916401c0..a5e1b09754 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -713,7 +713,7 @@ class phpbb_notification_manager
 	* is disabled so that all those notifications are hidden and do not
 	* cause errors
 	*
-	* @param string $item_type
+	* @param string $item_type Type identifier of the subscription
 	*/
 	public function disable_notifications($item_type)
 	{
@@ -729,7 +729,7 @@ class phpbb_notification_manager
 	* This should be called when an extension which has notification types
 	* is purged so that all those notifications are removed
 	*
-	* @param string $item_type
+	* @param string $item_type Type identifier of the subscription
 	*/
 	public function purge_notifications($item_type)
 	{
@@ -745,7 +745,7 @@ class phpbb_notification_manager
 	* that was disabled is re-enabled so that all those notifications that
 	* were hidden are shown again
 	*
-	* @param string $item_type
+	* @param string $item_type Type identifier of the subscription
 	*/
 	public function enable_notifications($item_type)
 	{
@@ -755,6 +755,18 @@ class phpbb_notification_manager
 		$this->db->sql_query($sql);
 	}
 
+	/**
+	* Delete all notifications older than a certain time
+	*
+	* @param int $timestamp Unix timestamp to delete all notifications that were created before
+	*/
+	public function prune_notifications($timestamp)
+	{
+		$sql = 'DELETE FROM ' . $this->notifications_table . '
+			WHERE time < ' . (int) $timestamp;
+		$this->db->sql_query($sql);
+	}
+
 	/**
 	* Helper to get the notifications item type class and set it up
 	*/
-- 
cgit v1.2.1


From f47e51d6dea9d59a36a6babf1f4033104c93a53d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Dec 2012 19:18:26 -0600
Subject: [ticket/11103] Move is_enabled to a separate table for better
 performance

PHPBB3-11103
---
 phpBB/includes/constants.php                  |  1 +
 phpBB/includes/notification/manager.php       | 98 +++++++++++++++++----------
 phpBB/includes/notification/type/base.php     |  4 --
 phpBB/includes/notification/type/bookmark.php | 13 ++--
 phpBB/includes/notification/type/post.php     | 13 ++--
 phpBB/includes/notification/type/quote.php    | 24 ++++---
 6 files changed, 92 insertions(+), 61 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 7a3c73e987..b8bf517d75 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -239,6 +239,7 @@ define('LOG_TABLE',					$table_prefix . 'log');
 define('LOGIN_ATTEMPT_TABLE',		$table_prefix . 'login_attempts');
 define('MODERATOR_CACHE_TABLE',		$table_prefix . 'moderator_cache');
 define('MODULES_TABLE',				$table_prefix . 'modules');
+define('NOTIFICATION_TYPES_TABLE',	$table_prefix . 'notification_types');
 define('NOTIFICATIONS_TABLE',		$table_prefix . 'notifications');
 define('POLL_OPTIONS_TABLE',		$table_prefix . 'poll_options');
 define('POLL_VOTES_TABLE',			$table_prefix . 'poll_votes');
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index a5e1b09754..63db3e6e9a 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -45,13 +45,16 @@ class phpbb_notification_manager
 	/** @var string */
 	protected $php_ext = null;
 
+	/** @var string */
+	protected $notification_types_table = null;
+
 	/** @var string */
 	protected $notifications_table = null;
 
 	/** @var string */
 	protected $user_notifications_table = null;
 
-	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, phpbb_db_driver $db, $user, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
+	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, phpbb_db_driver $db, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
 	{
 		$this->notification_types = $notification_types;
 		$this->notification_methods = $notification_methods;
@@ -64,6 +67,7 @@ class phpbb_notification_manager
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 
+		$this->notification_types_table = $notification_types_table;
 		$this->notifications_table = $notifications_table;
 		$this->user_notifications_table = $user_notifications_table;
 	}
@@ -121,11 +125,12 @@ class phpbb_notification_manager
 		if ($options['count_unread'])
 		{
 			// Get the total number of unread notifications
-			$sql = 'SELECT COUNT(*) AS unread_count
-				FROM ' . $this->notifications_table . '
-				WHERE user_id = ' . (int) $options['user_id'] . '
-					AND unread = 1
-					AND is_enabled = 1';
+			$sql = 'SELECT COUNT(n.notification_id) AS unread_count
+				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+				WHERE n.user_id = ' . (int) $options['user_id'] . '
+					AND n.unread = 1
+					AND nt.notification_type = n.item_type
+					AND nt.notification_type_enabled = 1';
 			$result = $this->db->sql_query($sql);
 			$unread_count = (int) $this->db->sql_fetchfield('unread_count', $result);
 			$this->db->sql_freeresult($result);
@@ -134,10 +139,11 @@ class phpbb_notification_manager
 		if ($options['count_total'])
 		{
 			// Get the total number of notifications
-			$sql = 'SELECT COUNT(*) AS total_count
-				FROM ' . $this->notifications_table . '
-				WHERE user_id = ' . (int) $options['user_id'] . '
-					AND is_enabled = 1';
+			$sql = 'SELECT COUNT(n.notification_id) AS total_count
+				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+				WHERE n.user_id = ' . (int) $options['user_id'] . '
+					AND nt.notification_type = n.item_type
+					AND nt.notification_type_enabled = 1';
 			$result = $this->db->sql_query($sql);
 			$total_count = (int) $this->db->sql_fetchfield('total_count', $result);
 			$this->db->sql_freeresult($result);
@@ -148,12 +154,13 @@ class phpbb_notification_manager
 			$rowset = array();
 
 			// Get the main notifications
-			$sql = 'SELECT *
-				FROM ' . $this->notifications_table . '
-				WHERE user_id = ' . (int) $options['user_id'] .
-					(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('notification_id', $options['notification_id']) : ' AND notification_id = ' . (int) $options['notification_id']) : '') . '
-			 		AND is_enabled = 1
-				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
+			$sql = 'SELECT n.*
+				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+				WHERE n.user_id = ' . (int) $options['user_id'] .
+					(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('n.notification_id', $options['notification_id']) : ' AND n.notification_id = ' . (int) $options['notification_id']) : '') . '
+					AND nt.notification_type = n.item_type
+					AND nt.notification_type_enabled = 1
+				ORDER BY n.' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 			$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
 
 			while ($row = $this->db->sql_fetchrow($result))
@@ -165,13 +172,14 @@ class phpbb_notification_manager
 			// Get all unread notifications
 			if ($unread_count && $options['all_unread'] && !empty($rowset))
 			{
-				$sql = 'SELECT *
-					FROM ' . $this->notifications_table . '
-					WHERE user_id = ' . (int) $options['user_id'] . '
-						AND unread = 1
-						AND ' . $this->db->sql_in_set('notification_id', array_keys($rowset), true) . '
-						AND is_enabled = 1
-					ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
+				$sql = 'SELECT n.*
+				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+					WHERE n.user_id = ' . (int) $options['user_id'] . '
+						AND n.unread = 1
+						AND ' . $this->db->sql_in_set('n.notification_id', array_keys($rowset), true) . '
+						AND nt.notification_type = n.item_type
+						AND nt.notification_type_enabled = 1
+					ORDER BY n.' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 				$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
 
 				while ($row = $this->db->sql_fetchrow($result))
@@ -345,6 +353,23 @@ class phpbb_notification_manager
 			return;
 		}
 
+		$sql = 'SELECT notification_type
+			FROM ' . $this->notification_types_table . "
+			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
+		$result = $this->db->sql_query($sql);
+
+		if ($this->db->sql_fetchrow($result) === false)
+		{
+			// Does not exist in the database, must add the item type
+			$sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array(
+				'notification_type'				=> $item_type,
+				'notification_type_enabled'		=> 1,
+			));
+			$this->db->sql_query($sql);
+		}
+
+		$this->db->sql_freeresult($result);
+
 		$item_id = $this->get_item_type_class($item_type)->get_item_id($data);
 
 		$user_ids = array();
@@ -356,11 +381,12 @@ class phpbb_notification_manager
 
 		// Make sure not to send new notifications to users who've already been notified about this item
 		// This may happen when an item was added, but now new users are able to see the item
-		$sql = 'SELECT user_id
-			FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id . '
-				AND is_enabled = 1';
+		$sql = 'SELECT n.user_id
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
+			WHERE n.item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND n.item_id = " . (int) $item_id . '
+				AND nt.notification_type = n.item_type
+				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
@@ -717,9 +743,9 @@ class phpbb_notification_manager
 	*/
 	public function disable_notifications($item_type)
 	{
-		$sql = 'UPDATE ' . $this->notifications_table . "
-			SET is_enabled = 0
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
+		$sql = 'UPDATE ' . $this->notification_types_table . "
+			SET notification_type_enabled = 0
+			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
 		$this->db->sql_query($sql);
 	}
 
@@ -736,6 +762,10 @@ class phpbb_notification_manager
 		$sql = 'DELETE FROM ' . $this->notifications_table . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
 		$this->db->sql_query($sql);
+
+		$sql = 'DELETE FROM ' . $this->notification_types_table . "
+			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
+		$this->db->sql_query($sql);
 	}
 
 	/**
@@ -749,9 +779,9 @@ class phpbb_notification_manager
 	*/
 	public function enable_notifications($item_type)
 	{
-		$sql = 'UPDATE ' . $this->notifications_table . "
-			SET is_enabled = 1
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
+		$sql = 'UPDATE ' . $this->notification_types_table . "
+			SET notification_type_enabled = 1
+			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
 		$this->db->sql_query($sql);
 	}
 
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 31792de04c..effa57e3a3 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -72,10 +72,6 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* item_parent_id	- Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
 	* user_id
 	* unread
-	* is_enabled		- EXTENSION AUTHORS TAKE NOTE! This is to prevent errors with notifications from extensions!
-	* 					- Set is_enabled to 0 for all your notifications when your extension is disabled so they are ignored and do not cause errors.
-	* 					- When your extension is enabled again, set is_enabled to 1 and your notifications will be working again.
-	*
 	* time
 	* data (special serialized field that each notification type can use to store stuff)
 	*
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index a17d8f5db7..750bd3b6cb 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -101,12 +101,13 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
-		$sql = 'SELECT *
-			FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->get_type() . "'
-				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND unread = 1
-				AND is_enabled = 1';
+		$sql = 'SELECT n.*
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
+			WHERE n.item_type = '" . $this->get_type() . "'
+				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
+				AND n.unread = 1
+				AND nt.notification_type = n.item_type
+				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 0646282c94..0a42029f18 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -122,12 +122,13 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
-		$sql = 'SELECT *
-			FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->get_type() . "'
-				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND unread = 1
-				AND is_enabled = 1';
+		$sql = 'SELECT n.*
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
+			WHERE n.item_type = '" . $this->get_type() . "'
+				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
+				AND n.unread = 1
+				AND nt.notification_type = n.item_type
+				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 1796343a0e..b3a347f98c 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -120,12 +120,13 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
-		$sql = 'SELECT *
-			FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->get_type() . "'
-				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND unread = 1
-				AND is_enabled = 1';
+		$sql = 'SELECT n.*
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
+			WHERE n.item_type = '" . $this->get_type() . "'
+				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
+				AND n.unread = 1
+				AND nt.notification_type = n.item_type
+				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
@@ -151,11 +152,12 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 	public function update_notifications($post)
 	{
 		$old_notifications = array();
-		$sql = 'SELECT user_id
-			FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->get_type() . "'
-				AND item_id = " . self::get_item_id($post) . '
-				AND is_enabled = 1';
+		$sql = 'SELECT n.user_id
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
+			WHERE n.item_type = '" . $this->get_type() . "'
+				AND n.item_id = " . self::get_item_id($post) . '
+				AND nt.notification_type = n.item_type
+				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-- 
cgit v1.2.1


From 47bed3321634d888a51a611e6586c012a27eb1eb Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Dec 2012 21:02:28 -0600
Subject: [ticket/11103] time -> notification_time

PHPBB3-11103
---
 phpBB/includes/notification/manager.php                 | 11 +++++------
 phpBB/includes/notification/type/approve_post.php       |  4 ++--
 phpBB/includes/notification/type/approve_topic.php      |  2 +-
 phpBB/includes/notification/type/base.php               |  6 +++---
 phpBB/includes/notification/type/disapprove_post.php    |  2 +-
 phpBB/includes/notification/type/disapprove_topic.php   |  2 +-
 phpBB/includes/notification/type/post.php               |  4 ++--
 phpBB/includes/notification/type/post_in_queue.php      |  2 +-
 phpBB/includes/notification/type/report_pm_closed.php   |  2 +-
 phpBB/includes/notification/type/report_post_closed.php |  2 +-
 phpBB/includes/notification/type/topic.php              |  4 ++--
 phpBB/includes/notification/type/topic_in_queue.php     |  2 +-
 12 files changed, 21 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 63db3e6e9a..8276996b94 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -96,7 +96,7 @@ class phpbb_notification_manager
 		$options = array_merge(array(
 			'notification_id'	=> false,
 			'user_id'			=> $this->user->data['user_id'],
-			'order_by'			=> 'time',
+			'order_by'			=> 'notification_time',
 			'order_dir'			=> 'DESC',
 			'limit'				=> 0,
 			'start'				=> 0,
@@ -238,10 +238,9 @@ class phpbb_notification_manager
 
 		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET unread = 0
-			WHERE time <= " . $time .
+			WHERE notification_time <= " . $time .
 				(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
 				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '') .
-				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
 		$this->db->sql_query($sql);
 	}
 
@@ -270,7 +269,7 @@ class phpbb_notification_manager
 		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET unread = 0
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND time <= " . $time .
+				AND notification_time <= " . $time .
 				(($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') .
 				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
 		$this->db->sql_query($sql);
@@ -288,7 +287,7 @@ class phpbb_notification_manager
 
 		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET unread = 0
-			WHERE time <= " . $time . '
+			WHERE notification_time <= " . $time . '
 				AND ' . ((is_array($notification_id)) ? $this->db->sql_in_set('notification_id', $notification_id) : 'notification_id = ' . (int) $notification_id);
 		$this->db->sql_query($sql);
 	}
@@ -793,7 +792,7 @@ class phpbb_notification_manager
 	public function prune_notifications($timestamp)
 	{
 		$sql = 'DELETE FROM ' . $this->notifications_table . '
-			WHERE time < ' . (int) $timestamp;
+			WHERE notification_time < ' . (int) $timestamp;
 		$this->db->sql_query($sql);
 	}
 
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index 38ff3f1d70..1a30781c35 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -32,7 +32,7 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 	{
 		return 'approve_post';
 	}
-	
+
 	/**
 	* Language key used to output the text
 	*
@@ -123,7 +123,7 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 
 		$data = parent::create_insert_array($post, $pre_create_data);
 
-		$this->time = $data['time'] = time();
+		$this->notification_time = $data['notification_time'] = time();
 
 		return $data;
 	}
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 5b9ea409fe..e728e9ac30 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -121,7 +121,7 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 	{
 		$data = parent::create_insert_array($post, $pre_create_data);
 
-		$this->time = $data['time'] = time();
+		$this->notification_time = $data['notification_time'] = time();
 
 		return $data;
 	}
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index effa57e3a3..45d0e5f60c 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -168,7 +168,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 			'item_type'	   			=> $this->get_type(),
 			'item_parent_id'		=> static::get_item_parent_id($type_data),
 
-			'time'					=> time(),
+			'notification_time'					=> time(),
 			'unread'				=> true,
 
 			'data'					=> array(),
@@ -195,7 +195,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 		// Unset data unique to each row
 		unset(
-			$data['time'], // Also unsetting time, since it always tries to change the time to current (if you actually need to change the time, over-ride this function)
+			$data['notification_time'], // Also unsetting time, since it always tries to change the time to current (if you actually need to change the time, over-ride this function)
 			$data['notification_id'],
 			$data['unread'],
 			$data['user_id']
@@ -250,7 +250,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 			'FORMATTED_TITLE'	=> $this->get_title(),
 
 			'URL'				=> $this->get_url(),
-			'TIME'	   			=> $this->user->format_date($this->time),
+			'TIME'	   			=> $this->user->format_date($this->notification_time),
 
 			'UNREAD'			=> $this->unread,
 
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
index d1d56086e7..951c7e0254 100644
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ b/phpBB/includes/notification/type/disapprove_post.php
@@ -103,7 +103,7 @@ class phpbb_notification_type_disapprove_post extends phpbb_notification_type_ap
 
 		$data = parent::create_insert_array($post);
 
-		$this->time = $data['time'] = time();
+		$this->notification_time = $data['notification_time'] = time();
 
 		return $data;
 	}
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
index 7affaa8afa..038e528797 100644
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ b/phpBB/includes/notification/type/disapprove_topic.php
@@ -103,7 +103,7 @@ class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_a
 
 		$data = parent::create_insert_array($post, $pre_create_data);
 
-		$this->time = $data['time'] = time();
+		$this->notification_time = $data['notification_time'] = time();
 
 		return $data;
 	}
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 0a42029f18..5eced0ca83 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -320,11 +320,11 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 
 		$this->set_data('forum_name', $post['forum_name']);
 
-		$this->time = $post['post_time'];
+		$this->notification_time = $post['post_time'];
 
 		// Topics can be "read" before they are public (while awaiting approval).
 		// Make sure that if the user has read the topic, it's marked as read in the notification
-		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->time)
+		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
 		{
 			$this->unread = false;
 		}
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 3cd9b11283..1c29bee3cd 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -120,7 +120,7 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 	{
 		$data = parent::create_insert_array($post, $pre_create_data);
 
-		$this->time = $data['time'] = time();
+		$this->notification_time = $data['notification_time'] = time();
 
 		return $data;
 	}
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index 2d60ae21d4..a735d2a822 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -148,7 +148,7 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
 
 		$data = parent::create_insert_array($pm, $pre_create_data);
 
-		$this->time = $data['time'] = time();
+		$this->notification_time = $data['notification_time'] = time();
 
 		return $data;
 	}
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index 3282ba7d8c..8b984fc8ce 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -148,7 +148,7 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
 
 		$data = parent::create_insert_array($post, $pre_create_data);
 
-		$this->time = $data['time'] = time();
+		$this->notification_time = $data['notification_time'] = time();
 
 		return $data;
 	}
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 614d644501..6eb78c30bb 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -261,11 +261,11 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 
 		$this->set_data('forum_name', $post['forum_name']);
 
-		$this->time = $post['post_time'];
+		$this->notification_time = $post['post_time'];
 
 		// Topics can be "read" before they are public (while awaiting approval).
 		// Make sure that if the user has read the topic, it's marked as read in the notification
-		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->time)
+		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
 		{
 			$this->unread = false;
 		}
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index 170a98ca1b..dc0b9f9869 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -113,7 +113,7 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 	{
 		$data = parent::create_insert_array($topic, $pre_create_data);
 
-		$this->time = $data['time'] = time();
+		$this->notification_time = $data['notification_time'] = time();
 
 		return $data;
 	}
-- 
cgit v1.2.1


From fad6bc5a7e58ddd370b88f73712de350b61bca29 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Dec 2012 21:08:26 -0600
Subject: [ticket/11103] unread -> notification_read

PHPBB3-11103
---
 phpBB/includes/notification/manager.php       | 15 +++++++++++----
 phpBB/includes/notification/type/base.php     | 14 +++++++-------
 phpBB/includes/notification/type/bookmark.php |  2 +-
 phpBB/includes/notification/type/post.php     |  4 ++--
 phpBB/includes/notification/type/quote.php    |  2 +-
 phpBB/includes/notification/type/topic.php    |  2 +-
 6 files changed, 23 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 8276996b94..fa1fd4b81f 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -128,8 +128,13 @@ class phpbb_notification_manager
 			$sql = 'SELECT COUNT(n.notification_id) AS unread_count
 				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
 				WHERE n.user_id = ' . (int) $options['user_id'] . '
+<<<<<<< HEAD
 					AND n.unread = 1
 					AND nt.notification_type = n.item_type
+=======
+					AND n.notification_read = 0
+					AND nt.notification_type = n.notification_type
+>>>>>>> 5cedca0... [ticket/11103] unread -> notification_read
 					AND nt.notification_type_enabled = 1';
 			$result = $this->db->sql_query($sql);
 			$unread_count = (int) $this->db->sql_fetchfield('unread_count', $result);
@@ -175,7 +180,7 @@ class phpbb_notification_manager
 				$sql = 'SELECT n.*
 				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
 					WHERE n.user_id = ' . (int) $options['user_id'] . '
-						AND n.unread = 1
+						AND n.notification_read = 0
 						AND ' . $this->db->sql_in_set('n.notification_id', array_keys($rowset), true) . '
 						AND nt.notification_type = n.item_type
 						AND nt.notification_type_enabled = 1
@@ -237,7 +242,7 @@ class phpbb_notification_manager
 		$time = ($time !== false) ? $time : time();
 
 		$sql = 'UPDATE ' . $this->notifications_table . "
-			SET unread = 0
+			SET notification_read = 1
 			WHERE notification_time <= " . $time .
 				(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
 				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '') .
@@ -267,8 +272,10 @@ class phpbb_notification_manager
 		$time = ($time !== false) ? $time : time();
 
 		$sql = 'UPDATE ' . $this->notifications_table . "
-			SET unread = 0
+			SET notification_read = 1
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+			SET notification_read = 1
+			WHERE notification_type = '" . $this->db->sql_escape($notification_type) . "'
 				AND notification_time <= " . $time .
 				(($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') .
 				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
@@ -286,7 +293,7 @@ class phpbb_notification_manager
 		$time = ($time !== false) ? $time : time();
 
 		$sql = 'UPDATE ' . $this->notifications_table . "
-			SET unread = 0
+			SET notification_read = 1
 			WHERE notification_time <= " . $time . '
 				AND ' . ((is_array($notification_id)) ? $this->db->sql_in_set('notification_id', $notification_id) : 'notification_id = ' . (int) $notification_id);
 		$this->db->sql_query($sql);
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 45d0e5f60c..cdca9aa642 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -168,8 +168,8 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 			'item_type'	   			=> $this->get_type(),
 			'item_parent_id'		=> static::get_item_parent_id($type_data),
 
-			'notification_time'					=> time(),
-			'unread'				=> true,
+			'notification_time'		=> time(),
+			'notification_read'		=> false,
 
 			'data'					=> array(),
 		), $this->data);
@@ -197,7 +197,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		unset(
 			$data['notification_time'], // Also unsetting time, since it always tries to change the time to current (if you actually need to change the time, over-ride this function)
 			$data['notification_id'],
-			$data['unread'],
+			$data['notification_read'],
 			$data['user_id']
 		);
 
@@ -252,9 +252,9 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 			'URL'				=> $this->get_url(),
 			'TIME'	   			=> $this->user->format_date($this->notification_time),
 
-			'UNREAD'			=> $this->unread,
+			'UNREAD'			=> !$this->notification_read,
 
-			'U_MARK_READ'		=> ($this->unread) ? $u_mark_read : '',
+			'U_MARK_READ'		=> (!$this->notification_read) ? $u_mark_read : '',
 		);
 	}
 
@@ -402,7 +402,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	protected function mark($unread = true, $return = false)
 	{
-		$this->unread = (bool) $unread;
+		$this->notification_read = (bool) !$unread;
 
 		$where = array(
 			"item_type = '" . $this->db->sql_escape($this->item_type) . "'",
@@ -417,7 +417,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		}
 
 		$sql = 'UPDATE ' . $this->notifications_table . '
-			SET unread = ' . (int) $this->unread . '
+			SET notification_read = ' . (int) $this->notification_read . '
 			WHERE ' . $where;
 		$this->db->sql_query($sql);
 	}
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index 750bd3b6cb..4e48a967d0 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -105,7 +105,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
 			WHERE n.item_type = '" . $this->get_type() . "'
 				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND n.unread = 1
+				AND n.notification_read = 0
 				AND nt.notification_type = n.item_type
 				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 5eced0ca83..f29372923e 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -126,7 +126,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
 			WHERE n.item_type = '" . $this->get_type() . "'
 				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND n.unread = 1
+				AND n.notification_read = 0
 				AND nt.notification_type = n.item_type
 				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
@@ -326,7 +326,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		// Make sure that if the user has read the topic, it's marked as read in the notification
 		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
 		{
-			$this->unread = false;
+			$this->notification_read = true;
 		}
 
 		return parent::create_insert_array($post, $pre_create_data);
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index b3a347f98c..5453b267c8 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -124,7 +124,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
 			WHERE n.item_type = '" . $this->get_type() . "'
 				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND n.unread = 1
+				AND n.notification_read = 0
 				AND nt.notification_type = n.item_type
 				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 6eb78c30bb..4f51ed4cb1 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -267,7 +267,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		// Make sure that if the user has read the topic, it's marked as read in the notification
 		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
 		{
-			$this->unread = false;
+			$this->notification_read = true;
 		}
 
 		return parent::create_insert_array($post, $pre_create_data);
-- 
cgit v1.2.1


From eeb40181956b578ca98ed0106f3019d8c8299ed3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Dec 2012 21:17:05 -0600
Subject: [ticket/11103] data -> notification_data

PHPBB3-11103
---
 phpBB/includes/notification/type/base.php | 10 +++++-----
 phpBB/includes/notification/type/post.php |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index cdca9aa642..c262fbeedb 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -110,7 +110,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	{
 		// The row from the database (unless this is a new notification we're going to add)
 		$this->data = $data;
-		$this->data['data'] = (isset($this->data['data'])) ? unserialize($this->data['data']) : array();
+		$this->data['notification_data'] = (isset($this->data['notification_data'])) ? unserialize($this->data['notification_data']) : array();
 	}
 
 	public function __get($name)
@@ -137,7 +137,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	protected function get_data($name)
 	{
-		return ($name === false) ? $this->data['data'] : ((isset($this->data['data'][$name])) ? $this->data['data'][$name] : null);
+		return ($name === false) ? $this->data['notification_data'] : ((isset($this->data['notification_data'][$name])) ? $this->data['notification_data'][$name] : null);
 	}
 
 	/**
@@ -148,7 +148,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	protected function set_data($name, $value)
 	{
-		$this->data['data'][$name] = $value;
+		$this->data['notification_data'][$name] = $value;
 	}
 
 	/**
@@ -171,12 +171,12 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 			'notification_time'		=> time(),
 			'notification_read'		=> false,
 
-			'data'					=> array(),
+			'notification_data'					=> array(),
 		), $this->data);
 
 		$data = $this->data;
 
-		$data['data'] = serialize($data['data']);
+		$data['notification_data'] = serialize($data['notification_data']);
 
 		return $data;
 	}
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index f29372923e..ddfa720e5e 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -342,7 +342,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		// Do not add them as a responder if they were the original poster that created the notification
 		if ($this->get_data('poster_id') == $post['poster_id'])
 		{
-			return array('data' => serialize($this->get_data(false)));
+			return array('notification_data' => serialize($this->get_data(false)));
 		}
 
 		$responders = $this->get_data('responders');
@@ -354,7 +354,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 			// Do not add them as a responder multiple times
 			if ($responder['poster_id'] == $post['poster_id'])
 			{
-				return array('data' => serialize($this->get_data(false)));
+				return array('notification_data' => serialize($this->get_data(false)));
 			}
 		}
 
@@ -365,6 +365,6 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 
 		$this->set_data('responders', $responders);
 
-		return array('data' => serialize($this->get_data(false)));
+		return array('notification_data' => serialize($this->get_data(false)));
 	}
 }
-- 
cgit v1.2.1


From 30356efab9503f44c26c6eebe6421911cd70ec64 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Dec 2012 21:54:19 -0600
Subject: [ticket/11103] updating comments

PHPBB3-11103
---
 phpBB/includes/notification/type/base.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index c262fbeedb..315bcb04c9 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -71,9 +71,9 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* item_id			- ID of the item (e.g. post_id, msg_id)
 	* item_parent_id	- Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
 	* user_id
-	* unread
-	* time
-	* data (special serialized field that each notification type can use to store stuff)
+	* notification_read
+	* notification_time
+	* notification_data (special serialized field that each notification type can use to store stuff)
 	*
 	* @var array $data Notification row from the database
 	* 		This must be private, all interaction should use __get(), __set(), get_data(), set_data()
-- 
cgit v1.2.1


From e6aaef6066549696453063417167e5a79c53b353 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 15 Dec 2012 15:22:39 +0100
Subject: [feature/avatars] Use callback method in avatar manager's clean row

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 2789158de5..f5c93a6328 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -157,17 +157,22 @@ class phpbb_avatar_manager
 		$keys = array_keys($row);
 		$values = array_values($row);
 
-		$keys = array_map(
-			function ($key)
-			{
-				return preg_replace('#^(?:user_|group_)#', '', $key);
-			},
-			$keys
-		);
+		$keys = array_map(array('phpbb_avatar_manager', 'strip_prefix'), $keys);
 
 		return array_combine($keys, $values);
 	}
 
+	/**
+	* Strip prepending user_ or group_ prefix from key
+	*
+	* @param string Array key
+	* @return string Key that has been stripped from its prefix
+	*/
+	protected static function strip_prefix($key)
+	{
+		return preg_replace('#^(?:user_|group_)#', '', $key);
+	}
+
 	/**
 	* Clean driver names that are returned from template files
 	* Underscores are replaced with dots
-- 
cgit v1.2.1


From 54d96dfac720d5aa1cdc617ca93749d26ee9f264 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 17 Dec 2012 12:59:44 +0100
Subject: [ticket/10763] Make functions for remote avatars static

fileupload::image_types() and filespec::get_extension() are called
statically while submitting the form for the remote avatar. Make them
static as described in the ticket in order to prevent a PHP notice.
Also change the tests to use the static functions.

PHPBB3-10763
---
 phpBB/includes/functions_upload.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index b467aa93d1..d4cb34cc4e 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -70,7 +70,7 @@ class filespec
 			$this->mimetype = 'application/octetstream';
 		}
 
-		$this->extension = strtolower($this->get_extension($this->realname));
+		$this->extension = strtolower(filespec::get_extension($this->realname));
 
 		// Try to get real filesize from temporary folder (not always working) ;)
 		$this->filesize = (@filesize($this->filename)) ? @filesize($this->filename) : $this->filesize;
@@ -187,8 +187,11 @@ class filespec
 
 	/**
 	* Get file extension
+	*
+	* @param string Filename that needs to be checked
+	* @return string Extension of the supplied filename
 	*/
-	function get_extension($filename)
+	static public function get_extension($filename)
 	{
 		if (strpos($filename, '.') === false)
 		{
@@ -369,7 +372,7 @@ class filespec
 				}
 
 				// Check image type
-				$types = $this->upload->image_types();
+				$types = fileupload::image_types();
 
 				if (!isset($types[$this->image_info[2]]) || !in_array($this->extension, $types[$this->image_info[2]]))
 				{
@@ -1019,9 +1022,11 @@ class fileupload
 	}
 
 	/**
-	* Return image type/extension mapping
+	* Get image type/extension mapping
+	*
+	* @return array Array containing the image types and their extensions
 	*/
-	function image_types()
+	static public function image_types()
 	{
 		return array(
 			IMAGETYPE_GIF		=> array('gif'),
-- 
cgit v1.2.1


From 4ae0c787828ea34bb927a8346804e52bd25cffac Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 17 Dec 2012 19:17:32 +0100
Subject: [ticket/10763] Use self when calling get_extension() in filespec
 class

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index d4cb34cc4e..4f31a85e83 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -70,7 +70,7 @@ class filespec
 			$this->mimetype = 'application/octetstream';
 		}
 
-		$this->extension = strtolower(filespec::get_extension($this->realname));
+		$this->extension = strtolower(self::get_extension($this->realname));
 
 		// Try to get real filesize from temporary folder (not always working) ;)
 		$this->filesize = (@filesize($this->filename)) ? @filesize($this->filename) : $this->filesize;
-- 
cgit v1.2.1


From 0d7f61dc7ab8b875b288b2d41ef27aa360973e57 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 18 Dec 2012 13:31:38 +0100
Subject: [ticket/11166] Use provided custom templates on AJAX confirm box

PHPBB3-11166
---
 phpBB/includes/functions.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 8ef5284134..fe42373862 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3084,8 +3084,9 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
 
 		'YES_VALUE'			=> $user->lang['YES'],
 		'S_CONFIRM_ACTION'	=> $u_action,
-		'S_HIDDEN_FIELDS'	=> $hidden . $s_hidden_fields)
-	);
+		'S_HIDDEN_FIELDS'	=> $hidden . $s_hidden_fields,
+		'S_AJAX_REQUEST'	=> $request->is_ajax(),
+	));
 
 	$sql = 'UPDATE ' . USERS_TABLE . " SET user_last_confirm_key = '" . $db->sql_escape($confirm_key) . "'
 		WHERE user_id = " . $user->data['user_id'];
@@ -3097,8 +3098,9 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
 		$u_action .= '&confirm_uid=' . $user->data['user_id'] . '&sess=' . $user->session_id . '&sid=' . $user->session_id;
 		$json_response = new phpbb_json_response;
 		$json_response->send(array(
+			'MESSAGE_BODY'		=> $template->assign_display('body'),
 			'MESSAGE_TITLE'		=> (!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title],
-			'MESSAGE_TEXT' 	=> (!isset($user->lang[$title . '_CONFIRM'])) ? $title : $user->lang[$title . '_CONFIRM'],
+			'MESSAGE_TEXT'		=> (!isset($user->lang[$title . '_CONFIRM'])) ? $title : $user->lang[$title . '_CONFIRM'],
 
 			'YES_VALUE'			=> $user->lang['YES'],
 			'S_CONFIRM_ACTION'	=> str_replace('&amp;', '&', $u_action), //inefficient, rewrite whole function
-- 
cgit v1.2.1


From 293b070efba81dd03d633fc9641c83c63c468bb8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 18 Dec 2012 14:50:00 +0100
Subject: [feature/soft-delete] Fix a problem with the "only softdeleted posts"
 logic

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_main.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index d8ef3e261b..d29ecfe003 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -786,15 +786,15 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 		$user->add_lang('posting');
 
 		$only_softdeleted = false;
-		// If there are only soft deleted topics, we display a message why the option is not available
 		if ($auth->acl_get('m_delete', $forum_id) && $auth->acl_get('m_softdelete', $forum_id))
 		{
+			// If there are only soft deleted topics, we display a message why the option is not available
 			$sql = 'SELECT topic_id
 				FROM ' . TOPICS_TABLE . '
 				WHERE ' . $db->sql_in_set('topic_id', $topic_ids) . '
 					AND topic_visibility <> ' . ITEM_DELETED;
 			$result = $db->sql_query_limit($sql, 1);
-			$only_softdeleted = (bool) $db->sql_fetchfield('topic_id');
+			$only_softdeleted = !$db->sql_fetchfield('topic_id');
 			$db->sql_freeresult($result);
 		}
 
@@ -806,7 +806,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 			'S_DELETE_REASON'		=> $auth->acl_get('m_softdelete', $forum_id),
 		));
 
-		$l_confirm = (sizeof($post_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS';
+		$l_confirm = (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS';
 		if ($only_softdeleted)
 		{
 			$l_confirm .= '_PERMANENTLY';
@@ -1023,15 +1023,15 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
 		$user->add_lang('posting');
 
 		$only_softdeleted = false;
-		// If there are only soft deleted posts, we display a message why the option is not available
 		if ($auth->acl_get('m_delete', $forum_id) && $auth->acl_get('m_softdelete', $forum_id))
 		{
+			// If there are only soft deleted posts, we display a message why the option is not available
 			$sql = 'SELECT post_id
 				FROM ' . POSTS_TABLE . '
 				WHERE ' . $db->sql_in_set('post_id', $post_ids) . '
 					AND post_visibility <> ' . ITEM_DELETED;
 			$result = $db->sql_query_limit($sql, 1);
-			$only_softdeleted = (bool) $db->sql_fetchfield('post_id');
+			$only_softdeleted = !$db->sql_fetchfield('post_id');
 			$db->sql_freeresult($result);
 		}
 
-- 
cgit v1.2.1


From 4300d06a172fd7950405dc23077b57354452d9b1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 18 Dec 2012 14:51:05 +0100
Subject: [feature/soft-delete] Add "Restore" to the mcp forum quick moderation

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 693a9d77e2..5fb9710eed 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -116,6 +116,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 		'S_CAN_REPORT'			=> $auth->acl_get('m_report', $forum_id),
 		'S_CAN_DELETE'			=> $auth->acl_get('m_delete', $forum_id),
+		'S_CAN_RESTORE'			=> $auth->acl_get('m_approve', $forum_id),
 		'S_CAN_MERGE'			=> $auth->acl_get('m_merge', $forum_id),
 		'S_CAN_MOVE'			=> $auth->acl_get('m_move', $forum_id),
 		'S_CAN_FORK'			=> $auth->acl_get('m_', $forum_id),
@@ -224,7 +225,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 		$posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_posts_unapproved'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false;
 		$topic_deleted = $row['topic_visibility'] == ITEM_DELETED;
 		$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? $url . '&amp;i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . '&amp;t=' . $row['topic_id'] : '';
-		$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? $url . 'i=queue&amp;mode=deleted_topics&amp;t=' . $topic_id : $u_mcp_queue;
+		$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? $url . '&amp;i=queue&amp;mode=deleted_topics&amp;t=' . $topic_id : $u_mcp_queue;
 
 		$topic_row = array(
 			'ATTACH_ICON_IMG'		=> ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
-- 
cgit v1.2.1


From 63f3cd45bb30354b4707b542e54e7dad0f99e15c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 18 Dec 2012 15:08:05 +0100
Subject: [feature/soft-delete] Add delete information to approve deatils page

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index e56aa17ee8..4180b5b08f 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -205,6 +205,33 @@ class mcp_queue
 					}
 				}
 
+				// Deleting information
+				if ($post_info['post_visibility'] == ITEM_DELETED && $post_info['post_delete_user'])
+				{
+					// User having deleted the post also being the post author?
+					if (!$post_info['post_delete_user'] || $post_info['post_delete_user'] == $post_info['poster_id'])
+					{
+						$display_username = get_username_string('full', $post_info['poster_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']);
+					}
+					else
+					{
+						$sql = 'SELECT u.user_id, u.username, u.user_colour
+							FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
+							WHERE p.post_id =  ' . $post_info['post_id'] . '
+								AND p.post_delete_user = u.user_id';
+						$result = $db->sql_query($sql);
+						$post_delete_userinfo = $db->sql_fetchrow($result);
+						$db->sql_freeresult($result);
+						$display_username = get_username_string('full', $post_info['post_delete_user'], $post_delete_userinfo['username'], $post_delete_userinfo['user_colour']);
+					}
+
+					$l_deleted_by = $user->lang('DELETED_INFORMATION', $display_username, $user->format_date($post_info['post_delete_time'], false, true));
+				}
+				else
+				{
+					$l_deleted_by = '';
+				}
+
 				$post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&amp;p=' . $post_info['post_id'] . '#p' . $post_info['post_id']);
 				$topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&amp;t=' . $post_info['topic_id']);
 
@@ -216,6 +243,9 @@ class mcp_queue
 					'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED),
 					'S_POST_LOCKED'			=> $post_info['post_edit_locked'],
 					'S_USER_NOTES'			=> true,
+					'S_POST_DELETED'		=> ($post_info['post_visibility'] == ITEM_DELETED),
+					'DELETED_MESSAGE'		=> $l_deleted_by,
+					'DELETE_REASON'			=> $post_info['post_delete_reason'],
 
 					'U_EDIT'				=> ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&amp;f={$post_info['forum_id']}&amp;p={$post_info['post_id']}") : '',
 					'U_MCP_APPROVE'			=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=approve_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
@@ -227,6 +257,7 @@ class mcp_queue
 
 					'MINI_POST_IMG'			=> ($post_unread) ? $user->img('icon_post_target_unread', 'UNREAD_POST') : $user->img('icon_post_target', 'POST'),
 
+
 					'RETURN_QUEUE'			=> sprintf($user->lang['RETURN_QUEUE'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue' . (($topic_id) ? '&amp;mode=unapproved_topics' : '&amp;mode=unapproved_posts')) . "&amp;start=$start\">", '</a>'),
 					'RETURN_POST'			=> sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>'),
 					'RETURN_TOPIC_SIMPLE'	=> sprintf($user->lang['RETURN_TOPIC_SIMPLE'], '<a href="' . $topic_url . '">', '</a>'),
-- 
cgit v1.2.1


From 6435b481c571dd44494f07b970339b104a8ffdd6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 18 Dec 2012 15:32:13 +0100
Subject: [feature/soft-delete] Fix a problem with "delete topics" in mcp

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 4180b5b08f..8b7b4ffda8 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -71,9 +71,10 @@ class mcp_queue
 				{
 					if (!empty($topic_id_list))
 					{
+						$post_visibility = ($mode == 'deleted_topics') ? ITEM_DELETED : ITEM_UNAPPROVED;
 						$sql = 'SELECT post_id
 							FROM ' . POSTS_TABLE . '
-							WHERE post_visibility = ' . ITEM_UNAPPROVED . '
+							WHERE post_visibility = ' . $post_visibility . '
 								AND ' . $db->sql_in_set('topic_id', $topic_id_list);
 						$result = $db->sql_query($sql);
 
-- 
cgit v1.2.1


From 9a1df948c635d9dbabaff94313652c6d8d1df28d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 19 Dec 2012 21:50:03 -0500
Subject: [ticket/10758] Extract obtain_user_data for the benefit of tests.

PHPBB3-10758
---
 phpBB/includes/acp/acp_permissions.php |  7 +------
 phpBB/includes/auth/auth.php           | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index 3d4c256a3f..a64765f4f5 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -952,12 +952,7 @@ class acp_permissions
 
 		if ($user_id != $user->data['user_id'])
 		{
-			$sql = 'SELECT user_id, username, user_permissions, user_type
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . $user_id;
-			$result = $db->sql_query($sql);
-			$userdata = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
+			$userdata = $auth->obtain_user_data($user_id);
 		}
 		else
 		{
diff --git a/phpBB/includes/auth/auth.php b/phpBB/includes/auth/auth.php
index 1ad9f94d26..2535247571 100644
--- a/phpBB/includes/auth/auth.php
+++ b/phpBB/includes/auth/auth.php
@@ -102,6 +102,26 @@ class phpbb_auth
 		return;
 	}
 
+	/**
+	* Retrieves data wanted by acl function from the database for the
+	* specified user.
+	*
+	* @param int $user_id User ID
+	* @return array User attributes
+	*/
+	public function obtain_user_data($user_id)
+	{
+		global $db;
+
+		$sql = 'SELECT user_id, username, user_permissions, user_type
+			FROM ' . USERS_TABLE . '
+			WHERE user_id = ' . $user_id;
+		$result = $db->sql_query($sql);
+		$user_data = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+		return $user_data;
+	}
+
 	/**
 	* Fill ACL array with relevant bitstrings from user_permissions column
 	* @access private
-- 
cgit v1.2.1


From 917a2fa9a6cf8b01a347df67fc14d3fc826aa3ed Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 22 May 2012 02:20:21 +0200
Subject: [ticket/10880] The m_approve permisson no longer implies f_noapprove.

PHPBB3-10880
---
 phpBB/includes/functions_posting.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index a1029ab97a..e5cbae0d71 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1698,8 +1698,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	// The variable name should be $post_approved, because it indicates if the post is approved or not
 	$post_approval = 1;
 
-	// Check the permissions for post approval. Moderators are not affected.
-	if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']))
+	// Check the permissions for post approval.
+	// Moderators must go through post approval like ordinary users.
+	if (!$auth->acl_get('f_noapprove', $data['forum_id']))
 	{
 		// Post not approved, but in queue
 		$post_approval = 0;
-- 
cgit v1.2.1


From 69e373c1af09e10722c1146f44493e8dc3669918 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 19 Dec 2012 21:47:53 -0500
Subject: [ticket/10758] Add compat functions.

PHPBB3-10758
---
 phpBB/includes/functions_admin.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index e8dd55813b..496d3eba09 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2472,6 +2472,20 @@ function phpbb_cache_moderators($db, $cache, $auth)
 	$db->sql_multi_insert(MODERATOR_CACHE_TABLE, $sql_ary);
 }
 
+/**
+* Cache moderators. Called whenever permissions are changed
+* via admin_permissions. Changes of usernames and group names
+* must be carried through for the moderators table
+*
+* @return null
+*/
+function cache_moderators()
+{
+	global $db, $cache, $auth;
+	return phpbb_cache_moderators($db, $cache, $auth);
+}
+
+
 /**
 * View log
 * If $log_count is set to false, we will skip counting all entries in the database.
@@ -2862,6 +2876,19 @@ function phpbb_update_foes($db, $auth, $group_id = false, $user_id = false)
 	unset($perms);
 }
 
+/**
+* Removes moderators and administrators from foe lists.
+*
+* @param array|bool $group_id If an array, remove all members of this group from foe lists, or false to ignore
+* @param array|bool $user_id If an array, remove this user from foe lists, or false to ignore
+* @return null
+*/
+function update_foes($group_id = false, $user_id = false)
+{
+	global $db, $auth;
+	phpbb_update_foes($db, $auth, $group_id, $user_id);
+}
+
 /**
 * Lists inactive users
 */
-- 
cgit v1.2.1


From e50f69187f21e29a12512880e0c69f2876e84aa1 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 20 Dec 2012 04:35:30 -0500
Subject: [ticket/11037] Eliminate global $db usage in cache drivers.

The only time $db is needed in cache drivers is to navigate the
result set in sql_save. Pass it as a parameter in that function.

PHPBB3-11037
---
 phpBB/includes/cache/driver/file.php      | 6 ++----
 phpBB/includes/cache/driver/interface.php | 3 ++-
 phpBB/includes/cache/driver/memory.php    | 6 ++----
 phpBB/includes/cache/driver/null.php      | 4 ++--
 phpBB/includes/db/driver/firebird.php     | 2 +-
 phpBB/includes/db/driver/mssql.php        | 2 +-
 phpBB/includes/db/driver/mssql_odbc.php   | 2 +-
 phpBB/includes/db/driver/mssqlnative.php  | 2 +-
 phpBB/includes/db/driver/mysql.php        | 2 +-
 phpBB/includes/db/driver/mysqli.php       | 2 +-
 phpBB/includes/db/driver/oracle.php       | 2 +-
 phpBB/includes/db/driver/postgres.php     | 2 +-
 phpBB/includes/db/driver/sqlite.php       | 2 +-
 13 files changed, 17 insertions(+), 20 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php
index 691abe0438..85decbe3e8 100644
--- a/phpBB/includes/cache/driver/file.php
+++ b/phpBB/includes/cache/driver/file.php
@@ -367,12 +367,10 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
 	}
 
 	/**
-	* Save sql query
+	* {@inheritDoc}
 	*/
-	function sql_save($query, $query_result, $ttl)
+	function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl)
 	{
-		global $db;
-
 		// Remove extra spaces and tabs
 		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
 
diff --git a/phpBB/includes/cache/driver/interface.php b/phpBB/includes/cache/driver/interface.php
index d403bbcd71..53f684d1c8 100644
--- a/phpBB/includes/cache/driver/interface.php
+++ b/phpBB/includes/cache/driver/interface.php
@@ -85,6 +85,7 @@ interface phpbb_cache_driver_interface
 	* result to persistent storage. In other words, there is no need
 	* to call save() afterwards.
 	*
+	* @param phpbb_db_driver $db	Database connection
 	* @param string $query			SQL query, should be used for generating storage key
 	* @param mixed $query_result	The result from dbal::sql_query, to be passed to
 	* 								dbal::sql_fetchrow to get all rows and store them
@@ -95,7 +96,7 @@ interface phpbb_cache_driver_interface
 	* 								representing the query should be returned. Otherwise
 	* 								the original $query_result should be returned.
 	*/
-	public function sql_save($query, $query_result, $ttl);
+	public function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl);
 
 	/**
 	* Check if result for a given SQL query exists in cache.
diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/includes/cache/driver/memory.php
index c39f9f7850..f77a1df316 100644
--- a/phpBB/includes/cache/driver/memory.php
+++ b/phpBB/includes/cache/driver/memory.php
@@ -283,12 +283,10 @@ abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base
 	}
 
 	/**
-	* Save sql query
+	* {@inheritDoc}
 	*/
-	function sql_save($query, $query_result, $ttl)
+	function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl)
 	{
-		global $db;
-
 		// Remove extra spaces and tabs
 		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
 		$hash = md5($query);
diff --git a/phpBB/includes/cache/driver/null.php b/phpBB/includes/cache/driver/null.php
index 687604d14f..2fadc27ba3 100644
--- a/phpBB/includes/cache/driver/null.php
+++ b/phpBB/includes/cache/driver/null.php
@@ -105,9 +105,9 @@ class phpbb_cache_driver_null extends phpbb_cache_driver_base
 	}
 
 	/**
-	* Save sql query
+	* {@inheritDoc}
 	*/
-	function sql_save($query, $query_result, $ttl)
+	function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl)
 	{
 		return $query_result;
 	}
diff --git a/phpBB/includes/db/driver/firebird.php b/phpBB/includes/db/driver/firebird.php
index a55175c345..4767b29f63 100644
--- a/phpBB/includes/db/driver/firebird.php
+++ b/phpBB/includes/db/driver/firebird.php
@@ -270,7 +270,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver
 				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
diff --git a/phpBB/includes/db/driver/mssql.php b/phpBB/includes/db/driver/mssql.php
index ac957e7698..215c6345c6 100644
--- a/phpBB/includes/db/driver/mssql.php
+++ b/phpBB/includes/db/driver/mssql.php
@@ -168,7 +168,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
diff --git a/phpBB/includes/db/driver/mssql_odbc.php b/phpBB/includes/db/driver/mssql_odbc.php
index 13e74e66d4..7d93f939a2 100644
--- a/phpBB/includes/db/driver/mssql_odbc.php
+++ b/phpBB/includes/db/driver/mssql_odbc.php
@@ -197,7 +197,7 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
 				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
diff --git a/phpBB/includes/db/driver/mssqlnative.php b/phpBB/includes/db/driver/mssqlnative.php
index 4b1639aba2..f88c702d07 100644
--- a/phpBB/includes/db/driver/mssqlnative.php
+++ b/phpBB/includes/db/driver/mssqlnative.php
@@ -337,7 +337,7 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
diff --git a/phpBB/includes/db/driver/mysql.php b/phpBB/includes/db/driver/mysql.php
index 6fc6fab483..30f78c9231 100644
--- a/phpBB/includes/db/driver/mysql.php
+++ b/phpBB/includes/db/driver/mysql.php
@@ -206,7 +206,7 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/includes/db/driver/mysqli.php
index be28a95715..4f45c5781c 100644
--- a/phpBB/includes/db/driver/mysqli.php
+++ b/phpBB/includes/db/driver/mysqli.php
@@ -201,7 +201,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 
 				if ($cache_ttl)
 				{
-					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
 			}
 			else if (defined('DEBUG'))
diff --git a/phpBB/includes/db/driver/oracle.php b/phpBB/includes/db/driver/oracle.php
index 6263ea8414..53f9dd71e0 100644
--- a/phpBB/includes/db/driver/oracle.php
+++ b/phpBB/includes/db/driver/oracle.php
@@ -446,7 +446,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver
 				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
diff --git a/phpBB/includes/db/driver/postgres.php b/phpBB/includes/db/driver/postgres.php
index 147ecd04d9..cca97c9c0e 100644
--- a/phpBB/includes/db/driver/postgres.php
+++ b/phpBB/includes/db/driver/postgres.php
@@ -211,7 +211,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
 				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
diff --git a/phpBB/includes/db/driver/sqlite.php b/phpBB/includes/db/driver/sqlite.php
index 6b9cc64d89..155409b665 100644
--- a/phpBB/includes/db/driver/sqlite.php
+++ b/phpBB/includes/db/driver/sqlite.php
@@ -152,7 +152,7 @@ class phpbb_db_driver_sqlite extends phpbb_db_driver
 				if ($cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($query, $this->query_result, $cache_ttl);
+					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
 				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
 				{
-- 
cgit v1.2.1


From 5c817289834e7a34d47410f89907de1bafefff8a Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 20 Dec 2012 05:10:57 -0500
Subject: [ticket/10758] Add deprecated tags.

PHPBB3-10758
---
 phpBB/includes/functions_admin.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 496d3eba09..77c70eb6fc 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2477,6 +2477,7 @@ function phpbb_cache_moderators($db, $cache, $auth)
 * via admin_permissions. Changes of usernames and group names
 * must be carried through for the moderators table
 *
+* @deprecated 3.1
 * @return null
 */
 function cache_moderators()
@@ -2879,6 +2880,7 @@ function phpbb_update_foes($db, $auth, $group_id = false, $user_id = false)
 /**
 * Removes moderators and administrators from foe lists.
 *
+* @deprecated 3.1
 * @param array|bool $group_id If an array, remove all members of this group from foe lists, or false to ignore
 * @param array|bool $user_id If an array, remove this user from foe lists, or false to ignore
 * @return null
-- 
cgit v1.2.1


From 24e1881ea1fd4da0bdf6de8f58cf8527b9087270 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 20 Dec 2012 15:23:29 +0100
Subject: [feature/soft-delete] Split up on the initial switch instead of a
 second one

Also fixing some documentation issues

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 71 +++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 41 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 8b7b4ffda8..dd3321e4e5 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -45,55 +45,44 @@ class mcp_queue
 		switch ($action)
 		{
 			case 'approve':
-			case 'disapprove':
 			case 'restore':
 				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 
 				$post_id_list = $request->variable('post_id_list', array(0));
 				$topic_id_list = $request->variable('topic_id_list', array(0));
 
-				if ($action != 'disapprove')
+				if (!empty($post_id_list))
 				{
-					if (!empty($post_id_list))
-					{
-						self::approve_posts($action, $post_id_list, 'queue', $mode);
-					}
-					else if (!empty($topic_id_list))
-					{
-						self::approve_topics($action, $topic_id_list, 'queue', $mode);
-					}
-					else
-					{
-						trigger_error('NO_POST_SELECTED');
-					}
+					self::approve_posts($action, $post_id_list, 'queue', $mode);
+				}
+				else if (!empty($topic_id_list))
+				{
+					self::approve_topics($action, $topic_id_list, 'queue', $mode);
 				}
 				else
 				{
-					if (!empty($topic_id_list))
-					{
-						$post_visibility = ($mode == 'deleted_topics') ? ITEM_DELETED : ITEM_UNAPPROVED;
-						$sql = 'SELECT post_id
-							FROM ' . POSTS_TABLE . '
-							WHERE post_visibility = ' . $post_visibility . '
-								AND ' . $db->sql_in_set('topic_id', $topic_id_list);
-						$result = $db->sql_query($sql);
+					trigger_error('NO_POST_SELECTED');
+				}
+			break;
 
-						$post_id_list = array();
-						while ($row = $db->sql_fetchrow($result))
-						{
-							$post_id_list[] = (int) $row['post_id'];
-						}
-						$db->sql_freeresult($result);
-					}
+			case 'delete':
+			case 'disapprove':
+				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
 
-					if (!empty($post_id_list))
-					{
-						self::disapprove_posts($post_id_list, 'queue', $mode);
-					}
-					else
-					{
-						trigger_error('NO_POST_SELECTED');
-					}
+				$post_id_list = $request->variable('post_id_list', array(0));
+				$topic_id_list = $request->variable('topic_id_list', array(0));
+
+				if (!empty($post_id_list))
+				{
+					self::disapprove_posts($post_id_list, 'queue', $mode);
+				}
+				else if (!empty($topic_id_list))
+				{
+					self::disapprove_topics($action, $topic_id_list, 'queue', $mode);
+				}
+				else
+				{
+					trigger_error('NO_POST_SELECTED');
 				}
 			break;
 		}
@@ -523,7 +512,7 @@ class mcp_queue
 	* @param $post_id_list	array	IDs of the posts to approve/restore
 	* @param $id			mixed	Category of the current active module
 	* @param $mode			string	Active module
-	* @return void
+	* @return null
 	*/
 	static public function approve_posts($action, $post_id_list, $id, $mode)
 	{
@@ -716,7 +705,7 @@ class mcp_queue
 	* @param $topic_id_list	array	IDs of the topics to approve/restore
 	* @param $id			mixed	Category of the current active module
 	* @param $mode			string	Active module
-	* @return void
+	* @return null
 	*/
 	static public function approve_topics($action, $topic_id_list, $id, $mode)
 	{
@@ -876,10 +865,10 @@ class mcp_queue
 	/**
 	* Disapprove Post
 	*
-	* @param $post_id_list	array	IDs of the posts to approve/restore
+	* @param $post_id_list	array	IDs of the posts to disapprove/delete
 	* @param $id			mixed	Category of the current active module
 	* @param $mode			string	Active module
-	* @return void
+	* @return null
 	*/
 	static public function disapprove_posts($post_id_list, $id, $mode)
 	{
-- 
cgit v1.2.1


From 4498c5aaebb1122b783b52a66f78d56e0ff2c63c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 20 Dec 2012 19:23:26 +0100
Subject: [feature/soft-delete] Split deleting soft-deleted posts from
 unapproving posts

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_main.php  |  8 ++---
 phpBB/includes/mcp/mcp_queue.php | 63 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 61 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index d29ecfe003..cf7c8af255 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -724,7 +724,7 @@ function mcp_restore_topic($topic_ids)
 /**
 * Delete Topics
 */
-function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '')
+function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '', $action = 'delete_topic')
 {
 	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
 
@@ -739,7 +739,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 	$s_hidden_fields = array(
 		'topic_id_list'	=> $topic_ids,
 		'f'				=> $forum_id,
-		'action'		=> 'delete_topic',
+		'action'		=> $action,
 		'redirect'		=> $redirect,
 	);
 	$success_msg = '';
@@ -852,7 +852,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 /**
 * Delete Posts
 */
-function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
+function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '', $action = 'delete_post')
 {
 	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
 
@@ -867,7 +867,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '')
 	$s_hidden_fields = array(
 		'post_id_list'	=> $post_ids,
 		'f'				=> $forum_id,
-		'action'		=> 'delete_post',
+		'action'		=> $action,
 		'redirect'		=> $redirect,
 	);
 	$success_msg = '';
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index dd3321e4e5..d9ec10e6da 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -66,19 +66,70 @@ class mcp_queue
 			break;
 
 			case 'delete':
-			case 'disapprove':
-				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-
 				$post_id_list = $request->variable('post_id_list', array(0));
 				$topic_id_list = $request->variable('topic_id_list', array(0));
 
 				if (!empty($post_id_list))
 				{
-					self::disapprove_posts($post_id_list, 'queue', $mode);
+					if (!function_exists('mcp_delete_post'))
+					{
+						global $phpbb_root_path, $phpEx;
+						include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx);
+					}
+					mcp_delete_post($post_id_list, false, '', $action);
 				}
 				else if (!empty($topic_id_list))
 				{
-					self::disapprove_topics($action, $topic_id_list, 'queue', $mode);
+					if (!function_exists('mcp_delete_topic'))
+					{
+						global $phpbb_root_path, $phpEx;
+						include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx);
+					}
+					mcp_delete_topic($topic_id_list, false, '', $action);
+				}
+				else
+				{
+					trigger_error('NO_POST_SELECTED');
+				}
+			break;
+
+			case 'disapprove':
+				$post_id_list = $request->variable('post_id_list', array(0));
+				$topic_id_list = $request->variable('topic_id_list', array(0));
+
+				if (!empty($topic_id_list) && $mode == 'deleted_topics')
+				{
+					if (!function_exists('mcp_delete_topics'))
+					{
+						global $phpbb_root_path, $phpEx;
+						include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx);
+					}
+					mcp_delete_topic($topic_id_list, false, '', 'disapprove');
+					return;
+				}
+
+				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+
+				if (!empty($topic_id_list))
+				{
+					$post_visibility = ($mode == 'deleted_topics') ? ITEM_DELETED : ITEM_UNAPPROVED;
+					$sql = 'SELECT post_id
+						FROM ' . POSTS_TABLE . '
+						WHERE post_visibility = ' . $post_visibility . '
+							AND ' . $db->sql_in_set('topic_id', $topic_id_list);
+					$result = $db->sql_query($sql);
+
+					$post_id_list = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$post_id_list[] = (int) $row['post_id'];
+					}
+					$db->sql_freeresult($result);
+				}
+
+				if (!empty($post_id_list))
+				{
+					self::disapprove_posts($post_id_list, 'queue', $mode);
 				}
 				else
 				{
@@ -893,7 +944,7 @@ class mcp_queue
 			'redirect'		=> $redirect)
 		);
 
-		$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
+		$notify_poster = $request->is_set('notify_poster');
 		$disapprove_reason = '';
 
 		if ($reason_id)
-- 
cgit v1.2.1


From aaaf8a5332aa6679522c687f0c8144d0819c05a5 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 22 Dec 2012 17:40:25 -0500
Subject: [ticket/10758] Yes, only one empty line.

PHPBB3-10758
---
 phpBB/includes/functions_admin.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 77c70eb6fc..22735cf2cd 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2486,7 +2486,6 @@ function cache_moderators()
 	return phpbb_cache_moderators($db, $cache, $auth);
 }
 
-
 /**
 * View log
 * If $log_count is set to false, we will skip counting all entries in the database.
-- 
cgit v1.2.1


From 496529fa714b6cdc6e8b8ffeb7750fe27907c267 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 22 Dec 2012 17:54:54 -0500
Subject: [ticket/10758] Add periods.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 22735cf2cd..3864c9de36 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2294,7 +2294,7 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr
 /**
 * Cache moderators. Called whenever permissions are changed
 * via admin_permissions. Changes of usernames and group names
-* must be carried through for the moderators table
+* must be carried through for the moderators table.
 *
 * @param phpbb_db_driver $db Database connection
 * @param phpbb_cache_driver_interface Cache driver
@@ -2475,7 +2475,7 @@ function phpbb_cache_moderators($db, $cache, $auth)
 /**
 * Cache moderators. Called whenever permissions are changed
 * via admin_permissions. Changes of usernames and group names
-* must be carried through for the moderators table
+* must be carried through for the moderators table.
 *
 * @deprecated 3.1
 * @return null
-- 
cgit v1.2.1


From cac39360669b10c7a27549ca36865249014e6d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fre=CC=80rejean?= <erikfrerejean@phpbb.com>
Date: Thu, 20 Dec 2012 16:27:33 +0100
Subject: [ticket/11283] Extension manager follow symlinks.

All extensions are located in the `phpBB/ext` directory,
however the `phpbb_extension_manager::all_available()`
method only looks into actual directories and ignores symlinks.

Add the `RecursiveDirectoryIterator::FOLLOW_SYMLINKS` flag to
the `new RecursiveDirectoryIterator` call so that you can store
extensions in a different location and use symlinks so that
phpBB can recognise them.

PHPBB3-11283
---
 phpBB/includes/extension/manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 67cc81e407..de6f364320 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -384,7 +384,7 @@ class phpbb_extension_manager
 		}
 
 		$iterator = new RecursiveIteratorIterator(
-			new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/'),
+			new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/', FilesystemIterator::NEW_CURRENT_AND_KEY | FilesystemIterator::FOLLOW_SYMLINKS),
 			RecursiveIteratorIterator::SELF_FIRST);
 		foreach ($iterator as $file_info)
 		{
-- 
cgit v1.2.1


From 5056f162351420440bf989d0b1cfc6c325499f7a Mon Sep 17 00:00:00 2001
From: Martin Beckmann <gn#36@phpbb.de>
Date: Mon, 24 Dec 2012 03:53:54 +0100
Subject: [ticket/11292] Fix: Newlines removed in display of PM reports

Report text is run through make_clickable and bbcode_nl2br for PMs
just as it is for posts.

PHPBB3-11292
---
 phpBB/includes/mcp/mcp_pm_reports.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index 72f77fae7c..77bc7680e6 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -123,6 +123,7 @@ class mcp_pm_reports
 
 				$message = bbcode_nl2br($message);
 				$message = smiley_text($message);
+				$report['report_text'] = make_clickable(bbcode_nl2br($report['report_text']));
 
 				if ($pm_info['message_attachment'] && $auth->acl_get('u_pm_download'))
 				{
-- 
cgit v1.2.1


From 8707a3413504b0cf922086daa6fc497ccf090448 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 24 Dec 2012 15:12:57 -0500
Subject: [ticket/10758] Add return to the other compat function.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 3864c9de36..5529f2af46 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2887,7 +2887,7 @@ function phpbb_update_foes($db, $auth, $group_id = false, $user_id = false)
 function update_foes($group_id = false, $user_id = false)
 {
 	global $db, $auth;
-	phpbb_update_foes($db, $auth, $group_id, $user_id);
+	return phpbb_update_foes($db, $auth, $group_id, $user_id);
 }
 
 /**
-- 
cgit v1.2.1


From 0b47a7823a8c48e31442595d4c802ae7f77096f3 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 24 Dec 2012 15:36:43 -0500
Subject: [ticket/11037] Eliminate globals from cache service.

PHPBB3-11037
---
 phpBB/includes/cache/service.php | 76 ++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 42 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/cache/service.php b/phpBB/includes/cache/service.php
index e63ec6e33a..0768236f3d 100644
--- a/phpBB/includes/cache/service.php
+++ b/phpBB/includes/cache/service.php
@@ -21,16 +21,24 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_cache_service
 {
-	private $driver;
+	protected $driver;
+	protected $config;
+	protected $db;
+	protected $phpbb_root_path;
+	protected $php_ext;
 
 	/**
 	* Creates a cache service around a cache driver
 	*
 	* @param phpbb_cache_driver_interface $driver The cache driver
 	*/
-	public function __construct(phpbb_cache_driver_interface $driver = null)
+	public function __construct(phpbb_cache_driver_interface $driver, phpbb_config $config, phpbb_db_driver $db, $phpbb_root_path, $php_ext)
 	{
 		$this->set_driver($driver);
+		$this->config = $config;
+		$this->db = $db;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -64,21 +72,19 @@ class phpbb_cache_service
 	*/
 	function obtain_word_list()
 	{
-		global $db;
-
 		if (($censors = $this->driver->get('_word_censors')) === false)
 		{
 			$sql = 'SELECT word, replacement
 				FROM ' . WORDS_TABLE;
-			$result = $db->sql_query($sql);
+			$result = $this->db->sql_query($sql);
 
 			$censors = array();
-			while ($row = $db->sql_fetchrow($result))
+			while ($row = $this->db->sql_fetchrow($result))
 			{
 				$censors['match'][] = get_censor_preg_expression($row['word']);
 				$censors['replace'][] = $row['replacement'];
 			}
-			$db->sql_freeresult($result);
+			$this->db->sql_freeresult($result);
 
 			$this->driver->put('_word_censors', $censors);
 		}
@@ -93,23 +99,21 @@ class phpbb_cache_service
 	{
 		if (($icons = $this->driver->get('_icons')) === false)
 		{
-			global $db;
-
 			// Topic icons
 			$sql = 'SELECT *
 				FROM ' . ICONS_TABLE . '
 				ORDER BY icons_order';
-			$result = $db->sql_query($sql);
+			$result = $this->db->sql_query($sql);
 
 			$icons = array();
-			while ($row = $db->sql_fetchrow($result))
+			while ($row = $this->db->sql_fetchrow($result))
 			{
 				$icons[$row['icons_id']]['img'] = $row['icons_url'];
 				$icons[$row['icons_id']]['width'] = (int) $row['icons_width'];
 				$icons[$row['icons_id']]['height'] = (int) $row['icons_height'];
 				$icons[$row['icons_id']]['display'] = (bool) $row['display_on_posting'];
 			}
-			$db->sql_freeresult($result);
+			$this->db->sql_freeresult($result);
 
 			$this->driver->put('_icons', $icons);
 		}
@@ -124,15 +128,13 @@ class phpbb_cache_service
 	{
 		if (($ranks = $this->driver->get('_ranks')) === false)
 		{
-			global $db;
-
 			$sql = 'SELECT *
 				FROM ' . RANKS_TABLE . '
 				ORDER BY rank_min DESC';
-			$result = $db->sql_query($sql);
+			$result = $this->db->sql_query($sql);
 
 			$ranks = array();
-			while ($row = $db->sql_fetchrow($result))
+			while ($row = $this->db->sql_fetchrow($result))
 			{
 				if ($row['rank_special'])
 				{
@@ -150,7 +152,7 @@ class phpbb_cache_service
 					);
 				}
 			}
-			$db->sql_freeresult($result);
+			$this->db->sql_freeresult($result);
 
 			$this->driver->put('_ranks', $ranks);
 		}
@@ -169,8 +171,6 @@ class phpbb_cache_service
 	{
 		if (($extensions = $this->driver->get('_extensions')) === false)
 		{
-			global $db;
-
 			$extensions = array(
 				'_allowed_post'	=> array(),
 				'_allowed_pm'	=> array(),
@@ -181,9 +181,9 @@ class phpbb_cache_service
 				FROM ' . EXTENSIONS_TABLE . ' e, ' . EXTENSION_GROUPS_TABLE . ' g
 				WHERE e.group_id = g.group_id
 					AND (g.allow_group = 1 OR g.allow_in_pm = 1)';
-			$result = $db->sql_query($sql);
+			$result = $this->db->sql_query($sql);
 
-			while ($row = $db->sql_fetchrow($result))
+			while ($row = $this->db->sql_fetchrow($result))
 			{
 				$extension = strtolower(trim($row['extension']));
 
@@ -210,7 +210,7 @@ class phpbb_cache_service
 					$extensions['_allowed_pm'][$extension] = 0;
 				}
 			}
-			$db->sql_freeresult($result);
+			$this->db->sql_freeresult($result);
 
 			$this->driver->put('_extensions', $extensions);
 		}
@@ -275,9 +275,7 @@ class phpbb_cache_service
 	{
 		if (($bots = $this->driver->get('_bots')) === false)
 		{
-			global $db;
-
-			switch ($db->sql_layer)
+			switch ($this->db->sql_layer)
 			{
 				case 'mssql':
 				case 'mssql_odbc':
@@ -303,14 +301,14 @@ class phpbb_cache_service
 					ORDER BY LENGTH(bot_agent) DESC';
 				break;
 			}
-			$result = $db->sql_query($sql);
+			$result = $this->db->sql_query($sql);
 
 			$bots = array();
-			while ($row = $db->sql_fetchrow($result))
+			while ($row = $this->db->sql_fetchrow($result))
 			{
 				$bots[] = $row;
 			}
-			$db->sql_freeresult($result);
+			$this->db->sql_freeresult($result);
 
 			$this->driver->put('_bots', $bots);
 		}
@@ -323,8 +321,6 @@ class phpbb_cache_service
 	*/
 	function obtain_cfg_items($style)
 	{
-		global $config, $phpbb_root_path;
-
 		$parsed_array = $this->driver->get('_cfg_' . $style['style_path']);
 
 		if ($parsed_array === false)
@@ -332,14 +328,14 @@ class phpbb_cache_service
 			$parsed_array = array();
 		}
 
-		$filename = $phpbb_root_path . 'styles/' . $style['style_path'] . '/style.cfg';
+		$filename = $this->phpbb_root_path . 'styles/' . $style['style_path'] . '/style.cfg';
 
 		if (!file_exists($filename))
 		{
 			return $parsed_array;
 		}
 
-		if (!isset($parsed_array['filetime']) || (($config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime'])))
+		if (!isset($parsed_array['filetime']) || (($this->config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime'])))
 		{
 			// Re-parse cfg file
 			$parsed_array = parse_cfg_file($filename);
@@ -358,18 +354,16 @@ class phpbb_cache_service
 	{
 		if (($usernames = $this->driver->get('_disallowed_usernames')) === false)
 		{
-			global $db;
-
 			$sql = 'SELECT disallow_username
 				FROM ' . DISALLOW_TABLE;
-			$result = $db->sql_query($sql);
+			$result = $this->db->sql_query($sql);
 
 			$usernames = array();
-			while ($row = $db->sql_fetchrow($result))
+			while ($row = $this->db->sql_fetchrow($result))
 			{
 				$usernames[] = str_replace('%', '.*?', preg_quote(utf8_clean_string($row['disallow_username']), '#'));
 			}
-			$db->sql_freeresult($result);
+			$this->db->sql_freeresult($result);
 
 			$this->driver->put('_disallowed_usernames', $usernames);
 		}
@@ -382,22 +376,20 @@ class phpbb_cache_service
 	*/
 	function obtain_hooks()
 	{
-		global $phpbb_root_path, $phpEx;
-
 		if (($hook_files = $this->driver->get('_hooks')) === false)
 		{
 			$hook_files = array();
 
 			// Now search for hooks...
-			$dh = @opendir($phpbb_root_path . 'includes/hooks/');
+			$dh = @opendir($this->phpbb_root_path . 'includes/hooks/');
 
 			if ($dh)
 			{
 				while (($file = readdir($dh)) !== false)
 				{
-					if (strpos($file, 'hook_') === 0 && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx)
+					if (strpos($file, 'hook_') === 0 && substr($file, -(strlen($this->php_ext) + 1)) === '.' . $this->php_ext)
 					{
-						$hook_files[] = substr($file, 0, -(strlen($phpEx) + 1));
+						$hook_files[] = substr($file, 0, -(strlen($this->php_ext) + 1));
 					}
 				}
 				closedir($dh);
-- 
cgit v1.2.1


From 989c4c3e6408e0d53b042161cfb34a0befe2570c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 25 Dec 2012 00:11:34 -0500
Subject: [ticket/11293] Add a note that mysqli should be in front of mysql.

php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if
both are available.

PHPBB3-11293
---
 phpBB/includes/functions_install.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index eae136808c..47f4eac627 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -55,6 +55,8 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
 		),
+		// Note: php 5.5 alpha 2 deprecated mysql.
+		// Keep mysqli before mysql in this list.
 		'mysqli'	=> array(
 			'LABEL'			=> 'MySQL with MySQLi Extension',
 			'SCHEMA'		=> 'mysql_41',
-- 
cgit v1.2.1


From bad7661ee985e63b8765845d710367e9f4f8260b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 26 Dec 2012 10:47:03 -0500
Subject: [ticket/11037] Add/update docblocks.

PHPBB3-11037
---
 phpBB/includes/cache/service.php | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/cache/service.php b/phpBB/includes/cache/service.php
index 0768236f3d..8c1e1ea1f8 100644
--- a/phpBB/includes/cache/service.php
+++ b/phpBB/includes/cache/service.php
@@ -21,16 +21,49 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_cache_service
 {
+	/**
+	* Cache driver.
+	*
+	* @var phpbb_cache_driver_interface
+	*/
 	protected $driver;
+
+	/**
+	* The config.
+	*
+	* @var phpbb_config
+	*/
 	protected $config;
+
+	/**
+	* Database connection.
+	*
+	* @var phpbb_db_driver
+	*/
 	protected $db;
+
+	/**
+	* Root path.
+	*
+	* @var string
+	*/
 	protected $phpbb_root_path;
+
+	/**
+	* PHP extension.
+	*
+	* @var string
+	*/
 	protected $php_ext;
 
 	/**
 	* Creates a cache service around a cache driver
 	*
 	* @param phpbb_cache_driver_interface $driver The cache driver
+	* @param phpbb_config $config The config
+	* @param phpbb_db_driver $db Database connection
+	* @param string $phpbb_root_path Root path
+	* @param string $php_ext PHP extension
 	*/
 	public function __construct(phpbb_cache_driver_interface $driver, phpbb_config $config, phpbb_db_driver $db, $phpbb_root_path, $php_ext)
 	{
-- 
cgit v1.2.1


From bf93dceb1f69cddc625b7dbbdf588847660070fa Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Dec 2012 11:09:03 -0600
Subject: [ticket/11103] Fix merge conflict

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index fa1fd4b81f..9858cda898 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -128,13 +128,8 @@ class phpbb_notification_manager
 			$sql = 'SELECT COUNT(n.notification_id) AS unread_count
 				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
 				WHERE n.user_id = ' . (int) $options['user_id'] . '
-<<<<<<< HEAD
-					AND n.unread = 1
-					AND nt.notification_type = n.item_type
-=======
 					AND n.notification_read = 0
-					AND nt.notification_type = n.notification_type
->>>>>>> 5cedca0... [ticket/11103] unread -> notification_read
+					AND nt.notification_type = n.item_type
 					AND nt.notification_type_enabled = 1';
 			$result = $this->db->sql_query($sql);
 			$unread_count = (int) $this->db->sql_fetchfield('unread_count', $result);
-- 
cgit v1.2.1


From 5a8520da62a540f140319ecaef011fc49eaba451 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Dec 2012 10:28:57 -0600
Subject: [ticket/11103] Fix some more merging issues

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 9858cda898..52cfa77388 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -240,7 +240,7 @@ class phpbb_notification_manager
 			SET notification_read = 1
 			WHERE notification_time <= " . $time .
 				(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
-				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '') .
+				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '');
 		$this->db->sql_query($sql);
 	}
 
@@ -269,8 +269,6 @@ class phpbb_notification_manager
 		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET notification_read = 1
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-			SET notification_read = 1
-			WHERE notification_type = '" . $this->db->sql_escape($notification_type) . "'
 				AND notification_time <= " . $time .
 				(($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') .
 				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
-- 
cgit v1.2.1


From 192039a9e070f7ae09397d232d19d33a71e48ed2 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Dec 2012 10:30:21 -0600
Subject: [ticket/11103] Fix sending the user ids to get the username/avatar

PHPBB3-11103
---
 phpBB/includes/notification/type/pm.php                 | 2 +-
 phpBB/includes/notification/type/report_pm.php          | 2 +-
 phpBB/includes/notification/type/report_pm_closed.php   | 2 +-
 phpBB/includes/notification/type/report_post.php        | 2 +-
 phpBB/includes/notification/type/report_post_closed.php | 2 +-
 phpBB/includes/notification/type/topic.php              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
index 8d31c87817..b3db7ad5ad 100644
--- a/phpBB/includes/notification/type/pm.php
+++ b/phpBB/includes/notification/type/pm.php
@@ -161,7 +161,7 @@ class phpbb_notification_type_pm extends phpbb_notification_type_base
 	*/
 	public function users_to_query()
 	{
-		return array($this->data['from_user_id']);
+		return array($this->get_data('from_user_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
index 877e8209e3..3fa73bab41 100644
--- a/phpBB/includes/notification/type/report_pm.php
+++ b/phpBB/includes/notification/type/report_pm.php
@@ -205,7 +205,7 @@ class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
 	*/
 	public function users_to_query()
 	{
-		return array($this->data['reporter_id']);
+		return array($this->get_data('reporter_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
index a735d2a822..63dfa92064 100644
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ b/phpBB/includes/notification/type/report_pm_closed.php
@@ -130,7 +130,7 @@ class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_p
 	*/
 	public function users_to_query()
 	{
-		return array($this->data['closer_id']);
+		return array($this->get_data('closer_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index 0334fdb109..1ea532c929 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -172,7 +172,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 	*/
 	public function users_to_query()
 	{
-		return array($this->data['reporter_id']);
+		return array($this->get_data('reporter_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
index 8b984fc8ce..3916cd8db7 100644
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ b/phpBB/includes/notification/type/report_post_closed.php
@@ -130,7 +130,7 @@ class phpbb_notification_type_report_post_closed extends phpbb_notification_type
 	*/
 	public function users_to_query()
 	{
-		return array($this->data['closer_id']);
+		return array($this->get_data('closer_id'));
 	}
 
 	/**
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 4f51ed4cb1..71e074fb50 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -208,7 +208,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 	*/
 	public function users_to_query()
 	{
-		return array($this->data['poster_id']);
+		return array($this->get_data('poster_id'));
 	}
 
 	/**
-- 
cgit v1.2.1


From c865f98dcfe57c3dff231fdf3574f5d3356ab7f5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 27 Dec 2012 20:42:05 +0100
Subject: [feature/avatars] Some more miscellaneous changes

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php       |  2 +-
 phpBB/includes/acp/acp_users.php        |  2 +-
 phpBB/includes/avatar/driver/remote.php |  2 +-
 phpBB/includes/avatar/driver/upload.php |  2 +-
 phpBB/includes/avatar/manager.php       | 44 ++++++++++++++++-----------------
 phpBB/includes/ucp/ucp_groups.php       |  2 +-
 phpBB/includes/ucp/ucp_profile.php      |  2 +-
 7 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index fe65ea2f03..eeeefe03ba 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -290,7 +290,7 @@ class acp_groups
 				if ($config['allow_avatar'])
 				{
 					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
+					$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
 
 					// This is normalised data, without the group_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($group_row);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index b2ef43edbe..0c29eb658f 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1737,7 +1737,7 @@ class acp_users
 				if ($config['allow_avatar'])
 				{
 					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
+					$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
 
 					// This is normalised data, without the user_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($user_row);
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 1f16fce1e7..717b73eb0c 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -117,7 +117,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 
 		if (!class_exists('fileupload'))
 		{
-			include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+			include($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
 		}
 
 		$types = fileupload::image_types();
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 38627baacf..4facb243ac 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -63,7 +63,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 
 		if (!class_exists('fileupload'))
 		{
-			include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+			include($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
 		}
 
 		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index f5c93a6328..cbc9c4a485 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 class phpbb_avatar_manager
 {
 	protected $config;
-	protected static $valid_drivers = false;
+	static protected $enabled_drivers = false;
 	protected $avatar_drivers;
 	protected $container;
 
@@ -47,18 +47,18 @@ class phpbb_avatar_manager
 	* Get the driver object specified by the avatar type
 	*
 	* @param string $avatar_type Avatar type; by default an avatar's service container name
-	* @param bool $load_valid Load only valid avatars
+	* @param bool $load_enabled Load only enabled avatars
 	*
 	* @return object Avatar driver object
 	*/
-	public function get_driver($avatar_type, $load_valid = true)
+	public function get_driver($avatar_type, $load_enabled = true)
 	{
-		if (self::$valid_drivers === false)
+		if (self::$enabled_drivers === false)
 		{
-			$this->load_valid_drivers();
+			$this->load_enabled_drivers();
 		}
 
-		$avatar_drivers = ($load_valid) ? self::$valid_drivers : $this->get_all_drivers();
+		$avatar_drivers = ($load_enabled) ? self::$enabled_drivers : $this->get_all_drivers();
 
 		// Legacy stuff...
 		switch ($avatar_type)
@@ -89,22 +89,22 @@ class phpbb_avatar_manager
 	}
 
 	/**
-	* Load the list of valid drivers
-	* This is executed once and fills self::$valid_drivers
+	* Load the list of enabled drivers
+	* This is executed once and fills self::$enabled_drivers
 	*/
-	protected function load_valid_drivers()
+	protected function load_enabled_drivers()
 	{
 		if (!empty($this->avatar_drivers))
 		{
-			self::$valid_drivers = array();
+			self::$enabled_drivers = array();
 			foreach ($this->avatar_drivers as $driver)
 			{
 				if ($this->is_enabled($driver))
 				{
-					self::$valid_drivers[$driver->get_name()] = $driver->get_name();
+					self::$enabled_drivers[$driver->get_name()] = $driver->get_name();
 				}
 			}
-			asort(self::$valid_drivers);
+			asort(self::$enabled_drivers);
 		}
 	}
 
@@ -130,18 +130,18 @@ class phpbb_avatar_manager
 	}
 
 	/**
-	* Get a list of valid avatar drivers
+	* Get a list of enabled avatar drivers
 	*
-	* @return array Array containing a list of the valid avatar drivers
+	* @return array Array containing a list of the enabled avatar drivers
 	*/
-	public function get_valid_drivers()
+	public function get_enabled_drivers()
 	{
-		if (self::$valid_drivers === false)
+		if (self::$enabled_drivers === false)
 		{
-			$this->load_valid_drivers();
+			$this->load_enabled_drivers();
 		}
 
-		return self::$valid_drivers;
+		return self::$enabled_drivers;
 	}
 
 	/**
@@ -152,7 +152,7 @@ class phpbb_avatar_manager
 	* @return array User data or group data with keys that have been
 	*        stripped from the preceding "user_" or "group_"
 	*/
-	public static function clean_row($row)
+	static public function clean_row($row)
 	{
 		$keys = array_keys($row);
 		$values = array_values($row);
@@ -168,7 +168,7 @@ class phpbb_avatar_manager
 	* @param string Array key
 	* @return string Key that has been stripped from its prefix
 	*/
-	protected static function strip_prefix($key)
+	static protected function strip_prefix($key)
 	{
 		return preg_replace('#^(?:user_|group_)#', '', $key);
 	}
@@ -181,7 +181,7 @@ class phpbb_avatar_manager
 	*
 	* @return string Cleaned driver name
 	*/
-	public static function clean_driver_name($name)
+	static public function clean_driver_name($name)
 	{
 		return str_replace('_', '.', $name);
 	}
@@ -194,7 +194,7 @@ class phpbb_avatar_manager
 	*
 	* @return string Prepared driver name
 	*/
-	public static function prepare_driver_name($name)
+	static public function prepare_driver_name($name)
 	{
 		return str_replace('.', '_', $name);
 	}
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 262e7b238f..18f782f63e 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -492,7 +492,7 @@ class ucp_groups
 						if ($config['allow_avatar'])
 						{
 							$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-							$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
+							$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
 
 							// This is normalised data, without the group_ prefix
 							$avatar_data = phpbb_avatar_manager::clean_row($group_row);
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 8ed5aff3e3..3f59cda4a0 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -562,7 +562,7 @@ class ucp_profile
 				if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
 				{
 					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
+					$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
 
 					// This is normalised data, without the user_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($user->data);
-- 
cgit v1.2.1


From 6f41228752fbb00139da5fd3f62c884a4391de82 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 27 Dec 2012 20:46:07 +0100
Subject: [feature/avatars] Add missing explanation to docblock of
 get_all_drivers()

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index cbc9c4a485..68d1133e86 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -111,6 +111,10 @@ class phpbb_avatar_manager
 	/**
 	* Get a list of all avatar drivers
 	*
+	* As this function will only be called in the ACP avatar settings page, it
+	* doesn't make much sense to cache the list of all avatar drivers like the
+	* list of the enabled drivers.
+	*
 	* @return array Array containing a list of all avatar drivers
 	*/
 	public function get_all_drivers()
-- 
cgit v1.2.1


From 8e756ad89005865b42e87ffc225f6d3bca475035 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 27 Dec 2012 21:40:35 +0100
Subject: [feature/avatars] Let the server handle http or https for gravatars

PHPBB3-10018
---
 phpBB/includes/avatar/driver/gravatar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 2b10fd0c2d..c6bfb0d5c1 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -24,7 +24,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	/**
 	* The URL for the gravatar service
 	*/
-	const GRAVATAR_URL = 'https://secure.gravatar.com/avatar/';
+	const GRAVATAR_URL = '//secure.gravatar.com/avatar/';
 
 	/**
 	* @inheritdoc
-- 
cgit v1.2.1


From 979edc4113f8b9ecb3aa4e7d445a5b59eefd78ff Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Mon, 3 Dec 2012 00:48:19 +0530
Subject: [ticket/11188] add count query to postgres search

PHPBB3-11188
---
 phpBB/includes/search/fulltext_postgres.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index f22ee2ca16..a9b122931b 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -476,6 +476,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			$tmp_sql_match[] = "to_tsvector ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', " . $sql_match_column . ") @@ to_tsquery ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', '" . $this->db->sql_escape($this->tsearch_query) . "')";
 		}
 
+		$this->db->sql_transaction('begin');
 		$sql = "SELECT $sql_select
 			FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
 			WHERE (" . implode(' OR ', $tmp_sql_match) . ")
@@ -499,7 +500,13 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 		// if the total result count is not cached yet, retrieve it from the db
 		if (!$result_count)
 		{
-			$result_count = sizeof ($id_ary);
+			$sql_count = "SELECT COUNT(*) as result_count
+				FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
+				WHERE (" . implode(' OR ', $tmp_sql_match) . ")
+				$sql_where_options";
+			$result = $this->db->sql_query($sql_count);
+			$result_count = (int) $this->db->sql_fetchfield('result_count');
+			$this->db->sql_freeresult($result);
 
 			if (!$result_count)
 			{
@@ -507,6 +514,8 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			}
 		}
 
+		$this->db->sql_transaction('commit');
+
 		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
 		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
 		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-- 
cgit v1.2.1


From 763f2929babcb65b503a60f712bfc552f1e296f9 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Mon, 3 Dec 2012 01:07:47 +0530
Subject: [ticket/11188] add result count query for author search

PHPBB3-11188
---
 phpBB/includes/search/fulltext_postgres.php | 34 ++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index a9b122931b..7d7b3f6fa8 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -656,6 +656,8 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			$field = 'topic_id';
 		}
 
+		$this->db->sql_transaction('begin');
+
 		// Only read one block of posts from the db and then cache it
 		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
 
@@ -668,7 +670,35 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 		// retrieve the total result count if needed
 		if (!$result_count)
 		{
-			$result_count = sizeof ($id_ary);
+			if ($type == 'posts')
+			{
+				$sql_count = "SELECT COUNT(*) as result_count
+					FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
+					WHERE $sql_author
+						$sql_topic_id
+						$sql_firstpost
+						$m_approve_fid_sql
+						$sql_fora
+						$sql_sort_join
+						$sql_time";
+			}
+			else
+			{
+				$sql_count = "SELECT COUNT(*) as result_count
+					FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
+					WHERE $sql_author
+						$sql_topic_id
+						$sql_firstpost
+						$m_approve_fid_sql
+						$sql_fora
+						AND t.topic_id = p.topic_id
+						$sql_sort_join
+						$sql_time
+					GROUP BY t.topic_id, $sort_by_sql[$sort_key]";
+			}
+
+			$result = $this->db->sql_query($sql_count);
+			$result_count = (int) $this->db->sql_fetchfield('result_count');
 
 			if (!$result_count)
 			{
@@ -676,6 +706,8 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			}
 		}
 
+		$this->db->sql_transaction('commit');
+
 		if (sizeof($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
-- 
cgit v1.2.1


From 3d27ed13f5ac960fc24a3f95e39c767be4a48f31 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 29 Dec 2012 19:34:21 -0500
Subject: [ticket/11188] Reduce waste.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index 7d7b3f6fa8..1475cc31d0 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -477,10 +477,13 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 		}
 
 		$this->db->sql_transaction('begin');
+
+		$sql_from = "FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p";
+		$sql_where = "WHERE (" . implode(' OR ', $tmp_sql_match) . ")
+			$sql_where_options";
 		$sql = "SELECT $sql_select
-			FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
-			WHERE (" . implode(' OR ', $tmp_sql_match) . ")
-			$sql_where_options
+			$sql_from
+			$sql_where
 			ORDER BY $sql_sort";
 		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
 
@@ -501,9 +504,8 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 		if (!$result_count)
 		{
 			$sql_count = "SELECT COUNT(*) as result_count
-				FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
-				WHERE (" . implode(' OR ', $tmp_sql_match) . ")
-				$sql_where_options";
+				$sql_from
+				$sql_where";
 			$result = $this->db->sql_query($sql_count);
 			$result_count = (int) $this->db->sql_fetchfield('result_count');
 			$this->db->sql_freeresult($result);
-- 
cgit v1.2.1


From ea24de8de3e4f451aa4394f0f46d6955ccb671c2 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 2 Jan 2013 04:04:01 +0100
Subject: [ticket/11306] Introduce phpbb_create_default_container

Extracts default container construction to factory function, removing
boilerplate duplication for container construction.

PHPBB3-11306
---
 phpBB/includes/functions_container.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 8014574443..0634948002 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -135,6 +135,22 @@ function phpbb_create_dumped_container_unless_debug(array $extensions, array $pa
 	return $container_factory($extensions, $passes, $phpbb_root_path, $php_ext);
 }
 
+function phpbb_create_default_container($phpbb_root_path, $php_ext)
+{
+	return phpbb_create_dumped_container_unless_debug(
+		array(
+			new phpbb_di_extension_config($phpbb_root_path . 'config.' . $php_ext),
+			new phpbb_di_extension_core($phpbb_root_path),
+		),
+		array(
+			new phpbb_di_pass_collection_pass(),
+			new phpbb_di_pass_kernel_pass(),
+		),
+		$phpbb_root_path,
+		$php_ext
+	);
+}
+
 function phpbb_container_filename($phpbb_root_path, $php_ext)
 {
 	$filename = str_replace(array('/', '.'), array('slash', 'dot'), $phpbb_root_path);
-- 
cgit v1.2.1


From 21eb8d842bc634a92f04c37e5de22c4c5692052d Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 2 Jan 2013 06:41:20 +0100
Subject: [ticket/11306] Add docblocks to all container related functions

PHPBB3-11306
---
 phpBB/includes/functions_container.php | 41 ++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 0634948002..a3ed21c35b 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -105,6 +105,15 @@ function phpbb_create_compiled_container(array $extensions, array $passes, $phpb
 	return $container;
 }
 
+/**
+* Create a compiled and dumped ContainerBuilder object
+*
+* @param array $extensions Array of Container extension objects
+* @param array $passes Array of Compiler Pass objects
+* @param string $phpbb_root_path Root path
+* @param string $php_ext PHP Extension
+* @return ContainerBuilder object (compiled)
+*/
 function phpbb_create_dumped_container(array $extensions, array $passes, $phpbb_root_path, $php_ext)
 {
 	// Check for our cached container; if it exists, use it
@@ -129,12 +138,37 @@ function phpbb_create_dumped_container(array $extensions, array $passes, $phpbb_
 	return $container;
 }
 
+/**
+* Create an environment-specific ContainerBuilder object
+*
+* If debug is enabled, the container is re-compiled every time.
+* This ensures that the latest changes will always be reflected
+* during development.
+*
+* Otherwise it will get the existing dumped container and use
+* that one instead.
+*
+* @param array $extensions Array of Container extension objects
+* @param array $passes Array of Compiler Pass objects
+* @param string $phpbb_root_path Root path
+* @param string $php_ext PHP Extension
+* @return ContainerBuilder object (compiled)
+*/
 function phpbb_create_dumped_container_unless_debug(array $extensions, array $passes, $phpbb_root_path, $php_ext)
 {
 	$container_factory = defined('DEBUG') ? 'phpbb_create_compiled_container' : 'phpbb_create_dumped_container';
 	return $container_factory($extensions, $passes, $phpbb_root_path, $php_ext);
 }
 
+/**
+* Create a default ContainerBuilder object
+*
+* Contains the default configuration of the phpBB container.
+*
+* @param array $extensions Array of Container extension objects
+* @param array $passes Array of Compiler Pass objects
+* @return ContainerBuilder object (compiled)
+*/
 function phpbb_create_default_container($phpbb_root_path, $php_ext)
 {
 	return phpbb_create_dumped_container_unless_debug(
@@ -151,6 +185,13 @@ function phpbb_create_default_container($phpbb_root_path, $php_ext)
 	);
 }
 
+/**
+* Get the filename under which the dumped container will be stored.
+*
+* @param string $phpbb_root_path Root path
+* @param string $php_ext PHP Extension
+* @return Path for dumped container
+*/
 function phpbb_container_filename($phpbb_root_path, $php_ext)
 {
 	$filename = str_replace(array('/', '.'), array('slash', 'dot'), $phpbb_root_path);
-- 
cgit v1.2.1


From 7adae349a96d5dffbd47ea5eca1e6bee481b7ce1 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Jan 2013 20:48:04 -0500
Subject: [ticket/11305] Extract hook finder from cache service.

Unlike most other things in cache service, hook finder does not need
a database connection.

PHPBB3-11305
---
 phpBB/includes/cache/service.php | 30 --------------
 phpBB/includes/hook/finder.php   | 84 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 30 deletions(-)
 create mode 100644 phpBB/includes/hook/finder.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/cache/service.php b/phpBB/includes/cache/service.php
index 8c1e1ea1f8..69c5e0fdd0 100644
--- a/phpBB/includes/cache/service.php
+++ b/phpBB/includes/cache/service.php
@@ -403,34 +403,4 @@ class phpbb_cache_service
 
 		return $usernames;
 	}
-
-	/**
-	* Obtain hooks...
-	*/
-	function obtain_hooks()
-	{
-		if (($hook_files = $this->driver->get('_hooks')) === false)
-		{
-			$hook_files = array();
-
-			// Now search for hooks...
-			$dh = @opendir($this->phpbb_root_path . 'includes/hooks/');
-
-			if ($dh)
-			{
-				while (($file = readdir($dh)) !== false)
-				{
-					if (strpos($file, 'hook_') === 0 && substr($file, -(strlen($this->php_ext) + 1)) === '.' . $this->php_ext)
-					{
-						$hook_files[] = substr($file, 0, -(strlen($this->php_ext) + 1));
-					}
-				}
-				closedir($dh);
-			}
-
-			$this->driver->put('_hooks', $hook_files);
-		}
-
-		return $hook_files;
-	}
 }
diff --git a/phpBB/includes/hook/finder.php b/phpBB/includes/hook/finder.php
new file mode 100644
index 0000000000..065e685514
--- /dev/null
+++ b/phpBB/includes/hook/finder.php
@@ -0,0 +1,84 @@
+<?php
+/**
+*
+* @package extension
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* The hook finder locates installed hooks.
+*
+* @package phpBB3
+*/
+class phpbb_hook_finder
+{
+	protected $phpbb_root_path;
+	protected $cache;
+	protected $php_ext;
+
+	/**
+	* Creates a new finder instance.
+	*
+	* @param string $phpbb_root_path Path to the phpbb root directory
+	* @param string $php_ext php file extension
+	* @param phpbb_cache_driver_interface $cache A cache instance or null
+	*/
+	public function __construct($phpbb_root_path, $php_ext, phpbb_cache_driver_interface $cache = null)
+	{
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->cache = $cache;
+		$this->php_ext = $php_ext;
+	}
+
+	/**
+	* Finds all hook files.
+	*
+	* @param bool $cache Whether the result should be cached
+	* @return array An array of paths to found hook files
+	*/
+	public function find($cache = true)
+	{
+		if (!defined('DEBUG') && $cache && $this->cache)
+		{
+			$hook_files = $this->cache->get('_hooks');
+			if ($hook_files !== false)
+			{
+				return $hook_files;
+			}
+		}
+
+		$hook_files = array();
+
+		// Now search for hooks...
+		$dh = @opendir($this->phpbb_root_path . 'includes/hooks/');
+
+		if ($dh)
+		{
+			while (($file = readdir($dh)) !== false)
+			{
+				if (strpos($file, 'hook_') === 0 && substr($file, -(strlen($this->php_ext) + 1)) === '.' . $this->php_ext)
+				{
+					$hook_files[] = substr($file, 0, -(strlen($this->php_ext) + 1));
+				}
+			}
+			closedir($dh);
+		}
+
+		if ($cache && $this->cache)
+		{
+			$this->cache->put('_hooks', $hook_files);
+		}
+
+		return $hook_files;
+	}
+}
-- 
cgit v1.2.1


From b94f9ae3029777fa0aba2f3cb52b321925ce7e72 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Jan 2013 20:57:21 -0500
Subject: [ticket/11305] Retrieve cache driver from container rather than cache
 service.

This only covers some of the call sites.

PHPBB3-11305
---
 phpBB/includes/acp/acp_modules.php | 6 +++---
 phpBB/includes/functions_user.php  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 8528dc91c4..52a82004e8 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -740,15 +740,15 @@ class acp_modules
 	*/
 	function remove_cache_file()
 	{
-		global $cache;
+		global $phpbb_container;
 
 		// Sanitise for future path use, it's escaped as appropriate for queries
 		$p_class = str_replace(array('.', '/', '\\'), '', basename($this->module_class));
 
-		$cache->destroy('_modules_' . $p_class);
+		$phpbb_container->get('cache.driver')->destroy('_modules_' . $p_class);
 
 		// Additionally remove sql cache
-		$cache->destroy('sql', MODULES_TABLE);
+		$phpbb_container->get('cache.driver')->destroy('sql', MODULES_TABLE);
 	}
 
 	/**
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index a50d5175fe..6abcdee8f2 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -3463,7 +3463,7 @@ function group_validate_groupname($group_id, $group_name)
 */
 function group_set_user_default($group_id, $user_id_ary, $group_attributes = false, $update_listing = false)
 {
-	global $cache, $db, $phpbb_dispatcher;
+	global $phpbb_container, $db, $phpbb_dispatcher;
 
 	if (empty($user_id_ary))
 	{
@@ -3579,7 +3579,7 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal
 	}
 
 	// Because some tables/caches use usercolour-specific data we need to purge this here.
-	$cache->destroy('sql', MODERATOR_CACHE_TABLE);
+	$phpbb_container->get('cache.driver')->destroy('sql', MODERATOR_CACHE_TABLE);
 }
 
 /**
-- 
cgit v1.2.1


From c8c6eb46ec6eefe0e58aebcd44f4c69f5df4b065 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 2 Jan 2013 14:36:14 -0500
Subject: [ticket/11305] Check for $cache being null before using it in db
 drivers.

There is no reason why db drivers must have a cache to work.
They query the database, that part works without caches.

PHPBB3-11305
---
 phpBB/includes/db/driver/driver.php      |  4 ++--
 phpBB/includes/db/driver/firebird.php    |  8 ++++----
 phpBB/includes/db/driver/mssql.php       | 10 +++++-----
 phpBB/includes/db/driver/mssql_odbc.php  |  8 ++++----
 phpBB/includes/db/driver/mssqlnative.php |  2 +-
 phpBB/includes/db/driver/mysql.php       | 10 +++++-----
 phpBB/includes/db/driver/mysqli.php      | 10 +++++-----
 phpBB/includes/db/driver/oracle.php      | 10 +++++-----
 phpBB/includes/db/driver/postgres.php    | 10 +++++-----
 phpBB/includes/db/driver/sqlite.php      | 10 +++++-----
 10 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php
index 52ac21a79f..8dda94bc2c 100644
--- a/phpBB/includes/db/driver/driver.php
+++ b/phpBB/includes/db/driver/driver.php
@@ -206,7 +206,7 @@ class phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -256,7 +256,7 @@ class phpbb_db_driver
 				$this->sql_rowseek($rownum, $query_id);
 			}
 
-			if (!is_object($query_id) && $cache->sql_exists($query_id))
+			if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 			{
 				return $cache->sql_fetchfield($query_id, $field);
 			}
diff --git a/phpBB/includes/db/driver/firebird.php b/phpBB/includes/db/driver/firebird.php
index 4767b29f63..787c28b812 100644
--- a/phpBB/includes/db/driver/firebird.php
+++ b/phpBB/includes/db/driver/firebird.php
@@ -154,7 +154,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver
 			}
 
 			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -267,7 +267,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver
 					}
 				}
 
-				if ($cache_ttl)
+				if ($cache && $cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
@@ -330,7 +330,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -396,7 +396,7 @@ class phpbb_db_driver_firebird extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/mssql.php b/phpBB/includes/db/driver/mssql.php
index 215c6345c6..89c2c2351b 100644
--- a/phpBB/includes/db/driver/mssql.php
+++ b/phpBB/includes/db/driver/mssql.php
@@ -150,7 +150,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 				$this->sql_report('start', $query);
 			}
 
-			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -165,7 +165,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl)
+				if ($cache && $cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
@@ -240,7 +240,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -277,7 +277,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -316,7 +316,7 @@ class phpbb_db_driver_mssql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/mssql_odbc.php b/phpBB/includes/db/driver/mssql_odbc.php
index 7d93f939a2..f7834443eb 100644
--- a/phpBB/includes/db/driver/mssql_odbc.php
+++ b/phpBB/includes/db/driver/mssql_odbc.php
@@ -179,7 +179,7 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
 			}
 
 			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -194,7 +194,7 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl)
+				if ($cache && $cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
@@ -270,7 +270,7 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -311,7 +311,7 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/mssqlnative.php b/phpBB/includes/db/driver/mssqlnative.php
index f88c702d07..656cbd2437 100644
--- a/phpBB/includes/db/driver/mssqlnative.php
+++ b/phpBB/includes/db/driver/mssqlnative.php
@@ -317,7 +317,7 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 			}
 
 			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
diff --git a/phpBB/includes/db/driver/mysql.php b/phpBB/includes/db/driver/mysql.php
index 30f78c9231..9de7283a42 100644
--- a/phpBB/includes/db/driver/mysql.php
+++ b/phpBB/includes/db/driver/mysql.php
@@ -188,7 +188,7 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 				$this->sql_report('start', $query);
 			}
 
-			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -203,7 +203,7 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl)
+				if ($cache && $cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
@@ -265,7 +265,7 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -286,7 +286,7 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -314,7 +314,7 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/includes/db/driver/mysqli.php
index 4f45c5781c..7448bf1670 100644
--- a/phpBB/includes/db/driver/mysqli.php
+++ b/phpBB/includes/db/driver/mysqli.php
@@ -184,7 +184,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 				$this->sql_report('start', $query);
 			}
 
-			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -199,7 +199,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl)
+				if ($cache && $cache_ttl)
 				{
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
 				}
@@ -256,7 +256,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (!is_object($query_id) && $cache->sql_exists($query_id))
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -283,7 +283,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (!is_object($query_id) && $cache->sql_exists($query_id))
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -311,7 +311,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if (!is_object($query_id) && $cache->sql_exists($query_id))
+		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/oracle.php b/phpBB/includes/db/driver/oracle.php
index 53f9dd71e0..e21e07055d 100644
--- a/phpBB/includes/db/driver/oracle.php
+++ b/phpBB/includes/db/driver/oracle.php
@@ -267,7 +267,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver
 			}
 
 			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -443,7 +443,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl)
+				if ($cache && $cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
@@ -498,7 +498,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -550,7 +550,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -619,7 +619,7 @@ class phpbb_db_driver_oracle extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/postgres.php b/phpBB/includes/db/driver/postgres.php
index cca97c9c0e..14854d179d 100644
--- a/phpBB/includes/db/driver/postgres.php
+++ b/phpBB/includes/db/driver/postgres.php
@@ -193,7 +193,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
 			}
 
 			$this->last_query_text = $query;
-			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -208,7 +208,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl)
+				if ($cache && $cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
@@ -278,7 +278,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -299,7 +299,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -348,7 +348,7 @@ class phpbb_db_driver_postgres extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
diff --git a/phpBB/includes/db/driver/sqlite.php b/phpBB/includes/db/driver/sqlite.php
index 155409b665..7188f0daa2 100644
--- a/phpBB/includes/db/driver/sqlite.php
+++ b/phpBB/includes/db/driver/sqlite.php
@@ -134,7 +134,7 @@ class phpbb_db_driver_sqlite extends phpbb_db_driver
 				$this->sql_report('start', $query);
 			}
 
-			$this->query_result = ($cache_ttl) ? $cache->sql_load($query) : false;
+			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
 			$this->sql_add_num_queries($this->query_result);
 
 			if ($this->query_result === false)
@@ -149,7 +149,7 @@ class phpbb_db_driver_sqlite extends phpbb_db_driver
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl)
+				if ($cache && $cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
@@ -210,7 +210,7 @@ class phpbb_db_driver_sqlite extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -231,7 +231,7 @@ class phpbb_db_driver_sqlite extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_rowseek($rownum, $query_id);
 		}
@@ -259,7 +259,7 @@ class phpbb_db_driver_sqlite extends phpbb_db_driver
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_freeresult($query_id);
 		}
-- 
cgit v1.2.1


From 7256a2d944df10ef649794c6174fea5ca69adea3 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Jan 2013 15:10:43 +0100
Subject: [feature/avatars] Add phpbb prefix to new functions

Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php         |  2 +-
 phpBB/includes/acp/acp_users.php          |  2 +-
 phpBB/includes/functions_display.php      | 10 +++++-----
 phpBB/includes/mcp/mcp_notes.php          |  4 ++--
 phpBB/includes/mcp/mcp_warn.php           |  8 ++++----
 phpBB/includes/ucp/ucp_groups.php         |  2 +-
 phpBB/includes/ucp/ucp_pm_viewmessage.php |  4 ++--
 phpBB/includes/ucp/ucp_profile.php        |  4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index eeeefe03ba..3a72a8c7ef 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -548,7 +548,7 @@ class acp_groups
 					}
 				}
 				
-				$avatar = get_group_avatar($group_row, 'GROUP_AVATAR', true);
+				$avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
 				
 				/*
 				* Merge any avatar errors into the primary error array
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 0c29eb658f..d742cad9f4 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1844,7 +1844,7 @@ class acp_users
 					}
 				}
 
-				$avatar = get_user_avatar($user_row, 'USER_AVATAR', true);
+				$avatar = phpbb_get_user_avatar($user_row, 'USER_AVATAR', true);
 
 				$template->assign_vars(array(
 					'S_AVATAR'	=> true,
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index cf56250296..0a288127a4 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1347,10 +1347,10 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 *
 * @return string Avatar html
 */
-function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
+function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false)
 {
 	$row = phpbb_avatar_manager::clean_row($user_row);
-	return get_avatar($row, $alt, $ignore_config);
+	return phpbb_get_avatar($row, $alt, $ignore_config);
 }
 
 /**
@@ -1362,10 +1362,10 @@ function get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false
 *
 * @return string Avatar html
 */
-function get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
+function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = false)
 {
 	$row = phpbb_avatar_manager::clean_row($user_row);
-	return get_avatar($row, $alt, $ignore_config);
+	return phpbb_get_avatar($row, $alt, $ignore_config);
 }
 
 /**
@@ -1377,7 +1377,7 @@ function get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config = fal
 *
 * @return string Avatar html
 */
-function get_avatar($row, $alt, $ignore_config = false)
+function phpbb_get_avatar($row, $alt, $ignore_config = false)
 {
 	global $user, $config, $cache, $phpbb_root_path, $phpEx;
 	global $request;
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index 0b00d77d8f..12fcbfe91e 100644
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -173,13 +173,13 @@ class mcp_notes
 		}
 
 		// Generate the appropriate user information for the user we are looking at
-		if (!function_exists('get_user_avatar'))
+		if (!function_exists('phpbb_get_user_avatar'))
 		{
 			include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 		}
 
 		$rank_title = $rank_img = '';
-		$avatar_img = get_user_avatar($userrow);
+		$avatar_img = phpbb_get_user_avatar($userrow);
 
 		$limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
 		$sort_by_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_IP'], 'd' => $user->lang['SORT_ACTION']);
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index f88ac3803f..4ef477775d 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -304,13 +304,13 @@ class mcp_warn
 		$message = smiley_text($message);
 
 		// Generate the appropriate user information for the user we are looking at
-		if (!function_exists('get_user_avatar'))
+		if (!function_exists('phpbb_get_user_avatar'))
 		{
 			include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 		}
 
 		get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src);
-		$avatar_img = get_user_avatar($user_row);
+		$avatar_img = phpbb_get_user_avatar($user_row);
 
 		$template->assign_vars(array(
 			'U_POST_ACTION'		=> $this->u_action,
@@ -409,13 +409,13 @@ class mcp_warn
 		}
 
 		// Generate the appropriate user information for the user we are looking at
-		if (!function_exists('get_user_avatar'))
+		if (!function_exists('phpbb_get_user_avatar'))
 		{
 			include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 		}
 
 		get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src);
-		$avatar_img = get_user_avatar($user_row);
+		$avatar_img = phpbb_get_user_avatar($user_row);
 
 		// OK, they didn't submit a warning so lets build the page for them to do so
 		$template->assign_vars(array(
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 9b83688a2c..b3e07cc7b9 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -438,7 +438,7 @@ class ucp_groups
 					$group_name = $group_row['group_name'];
 					$group_type = $group_row['group_type'];
 
-					$avatar = get_group_avatar($group_row, 'GROUP_AVATAR', true);
+					$avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
 
 					$template->assign_vars(array(
 						'GROUP_NAME'			=> ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name,
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 42b63f8ce1..712032463f 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -371,12 +371,12 @@ function get_user_information($user_id, $user_row)
 		}
 	}
 
-	if (!function_exists('get_user_avatar'))
+	if (!function_exists('phpbb_get_user_avatar'))
 	{
 		include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 	}
 
-	$user_row['avatar'] = ($user->optionget('viewavatars')) ? get_user_avatar($user_row) : '';
+	$user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : '';
 
 	get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']);
 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 3f59cda4a0..598314a035 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -550,7 +550,7 @@ class ucp_profile
 			break;
 
 			case 'avatar':
-				if (!function_exists('get_user_avatar'))
+				if (!function_exists('phpbb_get_user_avatar'))
 				{
 					include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 				}
@@ -672,7 +672,7 @@ class ucp_profile
 					}
 				}
 				
-				$avatar = get_user_avatar($user->data, 'USER_AVATAR', true);
+				$avatar = phpbb_get_user_avatar($user->data, 'USER_AVATAR', true);
 
 				$template->assign_vars(array(
 					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-- 
cgit v1.2.1


From 8f8527a416be41ba5f2ac984e944f76817260ed2 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Jan 2013 17:23:22 +0100
Subject: [feature/avatars] Improve handling of incorrect input for avatars

The upload avatar driver will now inform the user if insufficient data has
been entered for both remote and local avatar uploads.
The local avatar driver (gallery avatar) will also inform the user if he
didn't select a category and/or file before submitting.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/local.php  | 7 +++++++
 phpBB/includes/avatar/driver/upload.php | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index d7611b903a..bef5c6d427 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -120,6 +120,13 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 		$category = $this->request->variable('avatar_local_cat', '');
 
 		$file = $this->request->variable('avatar_local_file', '');
+
+		if (empty($category) || empty($file))
+		{
+			$error[] = 'NO_AVATAR_SELECTED';
+			return false;
+		}
+
 		if (!isset($avatar_list[$category][urldecode($file)]))
 		{
 			$error[] = 'AVATAR_URL_NOT_FOUND';
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 4facb243ac..1bb86cf158 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -75,10 +75,15 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 		{
 			$file = $upload->form_upload('avatar_upload_file');
 		}
-		else
+		elseif (!empty($this->config['allow_avatar_remote_upload']) && !empty($url))
 		{
 			$file = $upload->remote_upload($url);
 		}
+		else
+		{
+			$error[] = 'NO_AVATAR_SELECTED';
+			return false;
+		}
 
 		$prefix = $this->config['avatar_salt'] . '_';
 		$file->clean_filename('avatar', $prefix, $row['id']);
-- 
cgit v1.2.1


From 68baee4ce2388f9c6233e48ffb4b1223e7671373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fre=CC=80rejean?= <erikfrerejean@phpbb.com>
Date: Thu, 3 Jan 2013 13:16:38 +0100
Subject: [ticket/11309] phpbb_extension_interface::disable_step correct
 docblock.

The `@return` documentation of the `phpbb_extension_interface::disable_step`
method states incorrect that the method returns null, as it returns
false or a state.

PHPBB3-11309
---
 phpBB/includes/extension/interface.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/interface.php b/phpBB/includes/extension/interface.php
index 74ecb9b762..7b36a12bf6 100644
--- a/phpBB/includes/extension/interface.php
+++ b/phpBB/includes/extension/interface.php
@@ -45,7 +45,9 @@ interface phpbb_extension_interface
 	*
 	* @param	mixed	$old_state	The return value of the previous call
 	*								of this method, or false on the first call
-	* @return null
+	* @return	mixed				Returns false after last step, otherwise
+	*								temporary state which is passed as an
+	*								argument to the next step
 	*/
 	public function disable_step($old_state);
 
-- 
cgit v1.2.1


From 111e02395c2879662e2a3d07558519b838ddb69a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 5 Jan 2013 20:17:53 +0100
Subject: [feature/avatars] Add missing docblocks to avatar manager

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 68d1133e86..7c2d03f07b 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -20,9 +20,25 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_avatar_manager
 {
+	/**
+	* phpBB configuration
+	*/
 	protected $config;
+
+	/**
+	* Array that contains a list of enabled drivers
+	*/
 	static protected $enabled_drivers = false;
+
+	/**
+	* Array that contains all available avatar drivers which are passed via the
+	* service container
+	*/
 	protected $avatar_drivers;
+
+	/**
+	* Service container object
+	*/
 	protected $container;
 
 	/**
-- 
cgit v1.2.1


From 41710c745d5507aa71e25b125b0ae1485cc7ecc1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 6 Jan 2013 21:09:07 +0100
Subject: [feature/avatars] Add function for localizing errors

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php  | 18 ++----------------
 phpBB/includes/acp/acp_users.php   | 13 +------------
 phpBB/includes/avatar/manager.php  | 33 +++++++++++++++++++++++++++++----
 phpBB/includes/ucp/ucp_groups.php  | 14 +-------------
 phpBB/includes/ucp/ucp_profile.php | 15 ++-------------
 5 files changed, 35 insertions(+), 58 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 3a72a8c7ef..d9452a902e 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -550,22 +550,8 @@ class acp_groups
 				
 				$avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
 				
-				/*
-				* Merge any avatar errors into the primary error array
-				* Drivers use language constants, so we need to map to the actual strings
-				*/
-				foreach ($avatar_error as $lang)
-				{
-					if (is_array($lang))
-					{
-						$key = array_shift($lang);
-						$error[] = vsprintf($user->lang($key), $lang);
-					}
-					else
-					{
-						$error[] = $user->lang("$lang");
-					}
-				}
+				// Merge any avatar errors into the primary error array
+				$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
 
 				$back_link = request_var('back_link', '');
 
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index d742cad9f4..5960f33741 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1831,18 +1831,7 @@ class acp_users
 				}
 
 				// Replace "error" strings with their real, localised form
-				foreach ($error as $key => $lang)
-				{
-					if (is_array($lang))
-					{
-						$lang_key = array_shift($lang);
-						$error[$key] = vsprintf($user->lang($lang_key), $lang);
-					}
-					else
-					{
-						$error[$key] = $user->lang($lang);
-					}
-				}
+				$error = $phpbb_avatar_manager->localize_errors($user, $error);
 
 				$avatar = phpbb_get_user_avatar($user_row, 'USER_AVATAR', true);
 
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 7c2d03f07b..f91b0c4317 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -44,11 +44,7 @@ class phpbb_avatar_manager
 	/**
 	* Construct an avatar manager object
 	*
-	* @param string $phpbb_root_path Path to the phpBB root
-	* @param string $phpEx PHP file extension
 	* @param phpbb_config $config phpBB configuration
-	* @param phpbb_request $request Request object
-	* @param phpbb_cache_driver_interface $cache Cache driver
 	* @param array $avatar_drivers Avatar drivers passed via the service container
 	* @param object $container Container object
 	*/
@@ -260,4 +256,33 @@ class phpbb_avatar_manager
 	{
 		return preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
 	}
+
+	/**
+	* Replace "error" strings with their real, localized form
+	*
+	* @param phpbb_user phpBB User object
+	* @param array	$error Array containing error strings
+	*        Key values can either be a string with a language key or an array
+	*        that will be passed to vsprintf() with the language key in the
+	*        first array key.
+	*
+	* @return array Array containing the localized error strings
+	*/
+	public function localize_errors(phpbb_user $user, $error)
+	{
+		foreach ($error as $key => $lang)
+		{
+			if (is_array($lang))
+			{
+				$lang_key = array_shift($lang);
+				$error[$key] = vsprintf($user->lang($lang_key), $lang);
+			}
+			else
+			{
+				$error[$key] = $user->lang("$lang");
+			}
+		}
+
+		return $error;
+	}
 }
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index b3e07cc7b9..86c02b5bcc 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -674,19 +674,7 @@ class ucp_groups
 						}
 
 						// Merge any avatars errors into the primary error array
-						// Drivers use lang constants, so we need to map to the actual strings
-						foreach ($avatar_error as $lang)
-						{
-							if (is_array($lang))
-							{
-								$key = array_shift($lang);
-								$error[] = vsprintf($user->lang($key), $lang);
-							}
-							else
-							{
-								$error[] = $user->lang("$lang");
-							}
-						}
+						$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
 
 						$template->assign_vars(array(
 							'S_EDIT'			=> true,
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 598314a035..36d59e7854 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -659,19 +659,8 @@ class ucp_profile
 				}
 
 				// Replace "error" strings with their real, localised form
-				foreach ($error as $key => $lang)
-				{
-					if (is_array($lang))
-					{
-						$key = array_shift($lang);
-						$error[$key] = vsprintf($user->lang($key), $lang);
-					}
-					else
-					{
-						$error[$key] = $user->lang("$lang");
-					}
-				}
-				
+				$error = $phpbb_avatar_manager->localize_errors($user, $error);
+
 				$avatar = phpbb_get_user_avatar($user->data, 'USER_AVATAR', true);
 
 				$template->assign_vars(array(
-- 
cgit v1.2.1


From 8867cb60b1f7074c9f83c0403e5259148da65204 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 7 Jan 2013 21:16:39 +0100
Subject: [feature/avatars] Use empty() instead of sizeof()

PHPBB3-10018
---
 phpBB/includes/acp/acp_board.php | 2 +-
 phpBB/includes/acp/acp_users.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index a48d6eda83..3e47cd7c1f 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -140,7 +140,7 @@ class acp_board
 					)
 				);
 
-				if (sizeof($avatar_vars))
+				if (!empty($avatar_vars))
 				{
 					$display_vars['vars'] += $avatar_vars;
 				}
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 5960f33741..122bbeb770 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1837,7 +1837,7 @@ class acp_users
 
 				$template->assign_vars(array(
 					'S_AVATAR'	=> true,
-					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'ERROR'			=> (!empty($error)) ? implode('<br />', $error) : '',
 					'AVATAR'		=> (empty($avatar) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar),
 
 					'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
-- 
cgit v1.2.1


From 023d7a972dd5c279e0b0b24801f9e53e7865d39a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 7 Jan 2013 22:49:48 +0100
Subject: [feature/avatars] Remove $request property and pass as argument if
 needed

Remove the $request property from the phpbb_avatar_driver class and rather
pass it as function argument if it's needed in a function. Currently this
is only the case for the class methods prepare_form() and process_form().

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php          |  4 ++--
 phpBB/includes/acp/acp_users.php           |  4 ++--
 phpBB/includes/avatar/driver/driver.php    |  9 +--------
 phpBB/includes/avatar/driver/gravatar.php  | 14 +++++++-------
 phpBB/includes/avatar/driver/interface.php |  6 ++++--
 phpBB/includes/avatar/driver/local.php     | 10 +++++-----
 phpBB/includes/avatar/driver/remote.php    | 14 +++++++-------
 phpBB/includes/avatar/driver/upload.php    |  8 ++++----
 phpBB/includes/ucp/ucp_groups.php          |  4 ++--
 phpBB/includes/ucp/ucp_profile.php         |  4 ++--
 10 files changed, 36 insertions(+), 41 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index d9452a902e..25e199ab32 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -338,7 +338,7 @@ class acp_groups
 						if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 						{
 							$driver = $phpbb_avatar_manager->get_driver($driver_name);
-							$result = $driver->process_form($template, $avatar_data, $avatar_error);
+							$result = $driver->process_form($request, $template, $avatar_data, $avatar_error);
 
 							if ($result && empty($avatar_error))
 							{
@@ -532,7 +532,7 @@ class acp_groups
 							'avatar' => "acp_avatar_options_{$config_name}.html",
 						));
 
-						if ($driver->prepare_form($template, $avatar_data, $avatar_error))
+						if ($driver->prepare_form($request, $template, $avatar_data, $avatar_error))
 						{
 							$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 							$driver_upper = strtoupper($driver_name);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 122bbeb770..61b644e9f5 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1751,7 +1751,7 @@ class acp_users
 							if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 							{
 								$driver = $phpbb_avatar_manager->get_driver($driver_name);
-								$result = $driver->process_form($template, $avatar_data, $error);
+								$result = $driver->process_form($request, $template, $avatar_data, $error);
 
 								if ($result && empty($error))
 								{
@@ -1813,7 +1813,7 @@ class acp_users
 							'avatar' => "acp_avatar_options_{$config_name}.html",
 						));
 
-						if ($driver->prepare_form($template, $avatar_data, $error))
+						if ($driver->prepare_form($request, $template, $avatar_data, $error))
 						{
 							$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 							$driver_upper = strtoupper($driver_name);
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index ab89cfbffe..d4f9139c18 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -33,12 +33,6 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	*/
 	protected $config;
 
-	/**
-	* Request object
-	* @var phpbb_request
-	*/
-	protected $request;
-
 	/**
 	* Current $phpbb_root_path
 	* @var string
@@ -66,10 +60,9 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	* @param string $php_ext PHP file extension
 	* @param phpbb_cache_driver_interface $cache Cache driver
 	*/
-	public function __construct(phpbb_config $config, phpbb_request $request, $phpbb_root_path, $php_ext, phpbb_cache_driver_interface $cache = null)
+	public function __construct(phpbb_config $config, $phpbb_root_path, $php_ext, phpbb_cache_driver_interface $cache = null)
 	{
 		$this->config = $config;
-		$this->request = $request;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 		$this->cache = $cache;
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index c6bfb0d5c1..c574e23836 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -52,11 +52,11 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form($template, $row, &$error)
+	public function prepare_form($request, $template, $row, &$error)
 	{
 		$template->assign_vars(array(
-			'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('avatar_gravatar_width', 0),
-			'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('avatar_gravatar_width', 0),
+			'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_gravatar_width', 0),
+			'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_gravatar_width', 0),
 			'AVATAR_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
 		));
 
@@ -66,11 +66,11 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function process_form($template, $row, &$error)
+	public function process_form($request, $template, $row, &$error)
 	{
-		$row['avatar'] = $this->request->variable('avatar_gravatar_email', '');
-		$row['avatar_width'] = $this->request->variable('avatar_gravatar_width', 0);
-		$row['avatar_height'] = $this->request->variable('avatar_gravatar_height', 0);
+		$row['avatar'] = $request->variable('avatar_gravatar_email', '');
+		$row['avatar_width'] = $request->variable('avatar_gravatar_width', 0);
+		$row['avatar_height'] = $request->variable('avatar_gravatar_height', 0);
 
 		if (!function_exists('validate_data'))
 		{
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index e8f529f3c4..3c1db019f0 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -50,6 +50,7 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Prepare form for changing the settings of this avatar
 	*
+	* @param phpbb_request $request Request object
 	* @param phpbb_template	$template Template object
 	* @param array	$row User data or group data that has been cleaned with 
 	*        phpbb_avatar_manager::clean_row
@@ -60,7 +61,7 @@ interface phpbb_avatar_driver_interface
 	*
 	* @return bool True if form has been successfully prepared
 	*/
-	public function prepare_form($template, $row, &$error);
+	public function prepare_form($request, $template, $row, &$error);
 
 	/**
 	* Prepare form for changing the acp settings of this avatar
@@ -74,6 +75,7 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Process form data
 	*
+	* @param phpbb_request $request Request object
 	* @param phpbb_template	$template Template object
 	* @param array	$row User data or group data that has been cleaned with 
 	*        phpbb_avatar_manager::clean_row
@@ -85,7 +87,7 @@ interface phpbb_avatar_driver_interface
 	* @return array Array containing the avatar data as follows:
 	*        ['avatar'], ['avatar_width'], ['avatar_height']
 	*/
-	public function process_form($template, $row, &$error);
+	public function process_form($request, $template, $row, &$error);
 
 	/**
 	* Delete avatar
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index bef5c6d427..e49b8dd07f 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -36,10 +36,10 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form($template, $row, &$error)
+	public function prepare_form($request, $template, $row, &$error)
 	{
 		$avatar_list = $this->get_avatar_list();
-		$category = $this->request->variable('avatar_local_cat', '');
+		$category = $request->variable('avatar_local_cat', '');
 
 		foreach ($avatar_list as $cat => $null)
 		{
@@ -114,12 +114,12 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function process_form($template, $row, &$error)
+	public function process_form($request, $template, $row, &$error)
 	{
 		$avatar_list = $this->get_avatar_list();
-		$category = $this->request->variable('avatar_local_cat', '');
+		$category = $request->variable('avatar_local_cat', '');
 
-		$file = $this->request->variable('avatar_local_file', '');
+		$file = $request->variable('avatar_local_file', '');
 
 		if (empty($category) || empty($file))
 		{
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 717b73eb0c..e8f182063e 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -36,11 +36,11 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form($template, $row, &$error)
+	public function prepare_form($request, $template, $row, &$error)
 	{
 		$template->assign_vars(array(
-			'AVATAR_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('avatar_remote_width', 0),
-			'AVATAR_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('avatar_remote_width', 0),
+			'AVATAR_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_remote_width', 0),
+			'AVATAR_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_remote_width', 0),
 			'AVATAR_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '',
 		));
 
@@ -50,11 +50,11 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function process_form($template, $row, &$error)
+	public function process_form($request, $template, $row, &$error)
 	{
-		$url = $this->request->variable('avatar_remote_url', '');
-		$width = $this->request->variable('avatar_remote_width', 0);
-		$height = $this->request->variable('avatar_remote_height', 0);
+		$url = $request->variable('avatar_remote_url', '');
+		$width = $request->variable('avatar_remote_width', 0);
+		$height = $request->variable('avatar_remote_height', 0);
 
 		if (!preg_match('#^(http|https|ftp)://#i', $url))
 		{
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 1bb86cf158..6e6956bfde 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -36,7 +36,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form($template, $row, &$error)
+	public function prepare_form($request, $template, $row, &$error)
 	{
 		if (!$this->can_upload())
 		{
@@ -54,7 +54,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function process_form($template, $row, &$error)
+	public function process_form($request, $template, $row, &$error)
 	{
 		if (!$this->can_upload())
 		{
@@ -68,8 +68,8 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 
 		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
-		$url = $this->request->variable('avatar_upload_url', '');
-		$upload_file = $this->request->file('avatar_upload_file');
+		$url = $request->variable('avatar_upload_url', '');
+		$upload_file = $request->file('avatar_upload_file');
 
 		if (!empty($upload_file['name']))
 		{
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 86c02b5bcc..69cab610fc 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -526,7 +526,7 @@ class ucp_groups
 								if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 								{
 									$driver = $phpbb_avatar_manager->get_driver($driver_name);
-									$result = $driver->process_form($template, $avatar_data, $avatar_error);
+									$result = $driver->process_form($request, $template, $avatar_data, $avatar_error);
 
 									if ($result && empty($avatar_error))
 									{
@@ -657,7 +657,7 @@ class ucp_groups
 									'avatar' => $driver->get_template_name(),
 								));
 
-								if ($driver->prepare_form($template, $avatar_data, $avatar_error))
+								if ($driver->prepare_form($request, $template, $avatar_data, $avatar_error))
 								{
 									$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 									$driver_upper = strtoupper($driver_name);
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 36d59e7854..518ad9d917 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -576,7 +576,7 @@ class ucp_profile
 							if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 							{
 								$driver = $phpbb_avatar_manager->get_driver($driver_name);
-								$result = $driver->process_form($template, $avatar_data, $error);
+								$result = $driver->process_form($request, $template, $avatar_data, $error);
 
 								if ($result && empty($error))
 								{
@@ -641,7 +641,7 @@ class ucp_profile
 							'avatar' => $driver->get_template_name(),
 						));
 
-						if ($driver->prepare_form($template, $avatar_data, $error))
+						if ($driver->prepare_form($request, $template, $avatar_data, $error))
 						{
 							$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 							$driver_upper = strtoupper($driver_name);
-- 
cgit v1.2.1


From 8778c9c945e388c2b727f1b7cd057dd67a091441 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 8 Jan 2013 15:34:20 +0100
Subject: [feature/avatars] Pass phpbb_user object to get_custom_html()

Pass the phpbb_user object to function get_custom_html(). This object is
used in that method. Also fixed incorrect arguments to get_custom_html()
in phpbb_get_avatar().

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php    | 2 +-
 phpBB/includes/avatar/driver/gravatar.php  | 2 +-
 phpBB/includes/avatar/driver/interface.php | 5 ++++-
 phpBB/includes/functions_display.php       | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index d4f9139c18..cb6dbd7d68 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -71,7 +71,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	/**
 	* @inheritdoc
 	*/
-	public function get_custom_html($row, $alt = '')
+	public function get_custom_html($user, $row, $alt = '')
 	{
 		return '';
 	}
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index c574e23836..79cac75e28 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -41,7 +41,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function get_custom_html($row, $alt = '')
+	public function get_custom_html($user, $row, $alt = '')
 	{
 		return '<img src="' . $this->get_gravatar_url($row) . '" ' .
 			($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') .
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 3c1db019f0..836c45b49f 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -41,11 +41,14 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Returns custom html if it is needed for displaying this avatar
 	*
+	* @param phpbb_user $user phpBB user object
+	* @param array	$row User data or group data that has been cleaned with 
+	*        phpbb_avatar_manager::clean_row
 	* @param string $alt Alternate text for avatar image
 	*
 	* @return string HTML
 	*/
-	public function get_custom_html($row, $alt = '');
+	public function get_custom_html($user, $row, $alt = '');
 
 	/**
 	* Prepare form for changing the settings of this avatar
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 0a288127a4..9854cd6d70 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1400,7 +1400,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false)
 
 	if ($driver)
 	{
-		$html = $driver->get_custom_html($row, $ignore_config, $alt);
+		$html = $driver->get_custom_html($user, $row, $alt);
 		if (!empty($html))
 		{
 			return $html;
-- 
cgit v1.2.1


From 9e001153d6a64a90353207c4da8b01329f8e39e5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 8 Jan 2013 15:42:30 +0100
Subject: [feature/avatars] Pass phpbb_user object to prepare_form_acp()

The phpbb_user object might be used for language variables. Pass it as a
function argument to prepare_form_acp() instead of using globals.

PHPBB3-10018
---
 phpBB/includes/acp/acp_board.php           | 2 +-
 phpBB/includes/avatar/driver/driver.php    | 2 +-
 phpBB/includes/avatar/driver/interface.php | 4 +++-
 phpBB/includes/avatar/driver/local.php     | 2 +-
 phpBB/includes/avatar/driver/upload.php    | 4 +---
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 3e47cd7c1f..93e1dd71fe 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -121,7 +121,7 @@ class acp_board
 					* might have.
 					*/
 					$avatar_vars += $phpbb_avatar_manager->get_avatar_settings($driver);
-					$avatar_vars += $driver->prepare_form_acp();
+					$avatar_vars += $driver->prepare_form_acp($user);
 				}
 
 				$display_vars = array(
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index cb6dbd7d68..e03ef72b3a 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -79,7 +79,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form_acp()
+	public function prepare_form_acp($user)
 	{
 		return array();
 	}
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 836c45b49f..5d6d6b10ac 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -69,11 +69,13 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Prepare form for changing the acp settings of this avatar
 	*
+	* @param phpbb_user $user phpBB user object
+	*
 	* @return array Array of configuration options as consumed by acp_board.
 	*        The setting for enabling/disabling the avatar will be handled by
 	*        the avatar manager.
 	*/
-	public function prepare_form_acp();
+	public function prepare_form_acp($user);
 
 	/**
 	* Process form data
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index e49b8dd07f..f82c9a6c74 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -104,7 +104,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form_acp()
+	public function prepare_form_acp($user)
 	{
 		return array(
 			'avatar_gallery_path'	=> array('lang' => 'AVATAR_GALLERY_PATH',	'validate' => 'rpath',	'type' => 'text:20:255', 'explain' => true),
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 6e6956bfde..1e3c876299 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -122,10 +122,8 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form_acp()
+	public function prepare_form_acp($user)
 	{
-		global $user;
-
 		return array(
 			'allow_avatar_remote_upload'=> array('lang' => 'ALLOW_REMOTE_UPLOAD', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 			'avatar_filesize'		=> array('lang' => 'MAX_FILESIZE',			'validate' => 'int:0',	'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
-- 
cgit v1.2.1


From cb08bf3c0cac1f15ae46238a00a56ff7bf72efda Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 8 Jan 2013 21:46:43 +0100
Subject: [feature/avatars] Strictly check if avatar list is empty and cache
 result

PHPBB3-10018
---
 phpBB/includes/avatar/driver/local.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index f82c9a6c74..b96b602f85 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -142,6 +142,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 	/**
 	* Get a list of avatars that are locally available
+	* Results get cached for 24 hours (86400 seconds)
 	*
 	* @return array Array containing the locally available avatars
 	*/
@@ -149,7 +150,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	{
 		$avatar_list = ($this->cache == null) ? false : $this->cache->get('avatar_local_list');
 
-		if (!$avatar_list)
+		if ($avatar_list === false)
 		{
 			$avatar_list = array();
 			$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
@@ -185,7 +186,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 
 			if ($this->cache != null)
 			{
-				$this->cache->put('avatar_local_list', $avatar_list);
+				$this->cache->put('avatar_local_list', $avatar_list, 86400);
 			}
 		}
 
-- 
cgit v1.2.1


From 24befac7b4879ae02a4416e47ca0deea93766b93 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 8 Jan 2013 23:18:17 +0100
Subject: [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE
 on 5.4.

PHPBB3-11301
---
 phpBB/includes/captcha/captcha_non_gd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/captcha/captcha_non_gd.php b/phpBB/includes/captcha/captcha_non_gd.php
index f82896f628..a823fa4226 100644
--- a/phpBB/includes/captcha/captcha_non_gd.php
+++ b/phpBB/includes/captcha/captcha_non_gd.php
@@ -119,7 +119,7 @@ class captcha
 		$new_line = '';
 
 		$end = strlen($scanline) - ceil($width/2);
-		for ($i = floor($width/2); $i < $end; $i++)
+		for ($i = (int) floor($width/2); $i < $end; $i++)
 		{
 			$pixel = ord($scanline{$i});
 
-- 
cgit v1.2.1


From 41a07eedeb13349305977bb8882f0bd6429480e3 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 8 Jan 2013 23:20:30 +0100
Subject: [ticket/11301] Guidelines: Add spaces in front and after the /
 operator.

PHPBB3-11301
---
 phpBB/includes/captcha/captcha_non_gd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/captcha/captcha_non_gd.php b/phpBB/includes/captcha/captcha_non_gd.php
index a823fa4226..2adf909b96 100644
--- a/phpBB/includes/captcha/captcha_non_gd.php
+++ b/phpBB/includes/captcha/captcha_non_gd.php
@@ -119,7 +119,7 @@ class captcha
 		$new_line = '';
 
 		$end = strlen($scanline) - ceil($width/2);
-		for ($i = (int) floor($width/2); $i < $end; $i++)
+		for ($i = (int) floor($width / 2); $i < $end; $i++)
 		{
 			$pixel = ord($scanline{$i});
 
-- 
cgit v1.2.1


From 7402add107591ba675bc27248825b7bc9daedee4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 9 Jan 2013 15:50:15 +0100
Subject: [feature/avatars] Add missing @var to docblocks in avatar manager

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index f91b0c4317..4284e2262d 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -22,22 +22,26 @@ class phpbb_avatar_manager
 {
 	/**
 	* phpBB configuration
+	* @var phpbb_config
 	*/
 	protected $config;
 
 	/**
 	* Array that contains a list of enabled drivers
+	* @var array
 	*/
 	static protected $enabled_drivers = false;
 
 	/**
 	* Array that contains all available avatar drivers which are passed via the
 	* service container
+	* @var array
 	*/
 	protected $avatar_drivers;
 
 	/**
 	* Service container object
+	* @var object
 	*/
 	protected $container;
 
-- 
cgit v1.2.1


From f817e20f287a21e2dddfba9721f5e02dce162d29 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 15 Jul 2011 11:57:53 -0400
Subject: [feature/migrations] Basic migrations with schema and data changes

The migrator takes care of applying migrations as necessary.

RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41337

PHPBB3-9737
---
 phpBB/includes/constants.php    |   1 +
 phpBB/includes/db/migration.php |  79 ++++++++++++++
 phpBB/includes/db/migrator.php  | 227 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 307 insertions(+)
 create mode 100644 phpBB/includes/db/migration.php
 create mode 100644 phpBB/includes/db/migrator.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 68af41ab20..68c96a2759 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -237,6 +237,7 @@ define('ICONS_TABLE',				$table_prefix . 'icons');
 define('LANG_TABLE',				$table_prefix . 'lang');
 define('LOG_TABLE',					$table_prefix . 'log');
 define('LOGIN_ATTEMPT_TABLE',		$table_prefix . 'login_attempts');
+define('MIGRATIONS_TABLE',			$table_prefix . 'migrations');
 define('MODERATOR_CACHE_TABLE',		$table_prefix . 'moderator_cache');
 define('MODULES_TABLE',				$table_prefix . 'modules');
 define('POLL_OPTIONS_TABLE',		$table_prefix . 'poll_options');
diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
new file mode 100644
index 0000000000..f96fcb9568
--- /dev/null
+++ b/phpBB/includes/db/migration.php
@@ -0,0 +1,79 @@
+<?php
+/**
+*
+* @package db
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Abstract base class for database migrations
+*
+* Each migration consists of a set of schema and data changes to be implemented
+* in a subclass. This class provides various utility methods to simplify editing
+* a phpBB.
+*
+* @package db
+*/
+class phpbb_db_migration
+{
+	var $db;
+	var $db_tools;
+
+	/**
+	* Migration constructor
+	*
+	* @param dbal			$db			Connected database abstraction instance
+	* @param phpbb_db_tools	$db_tools	Instance of db schema manipulation tools
+	*/
+	function phpbb_db_migration(&$db, &$db_tools)
+	{
+		$this->db = &$db;
+		$this->db_tools = &$db_tools;
+	}
+
+	/**
+	* Defines other migrationsto be applied first (abstract method)
+	*
+	* @return array An array of migration class names
+	*/
+	function depends_on()
+	{
+		return array();
+	}
+
+	/**
+	* Updates the database schema
+	*
+	* @return null
+	*/
+	function update_schema()
+	{
+	}
+
+	/**
+	* Updates data
+	*
+	* @return null
+	*/
+	function update_data()
+	{
+	}
+
+	/**
+	* Adds a column to a database table
+	*/
+	function db_column_add($table_name, $column_name, $column_data)
+	{
+		$this->db_tools->sql_column_add($table_name, $column_name, $column_data);
+	}
+}
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
new file mode 100644
index 0000000000..d5d938ca28
--- /dev/null
+++ b/phpBB/includes/db/migrator.php
@@ -0,0 +1,227 @@
+<?php
+/**
+*
+* @package db
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* The migrator is responsible for applying new migrations in the correct order.
+*
+* @package db
+*/
+class phpbb_db_migrator
+{
+	var $db;
+	var $db_tools;
+
+	var $migrations_table;
+	var $migration_state;
+
+	var $migrations;
+
+	/**
+	* Constructor of the database migrator
+	*
+	* @param dbal			$db			Connected database abstraction instance
+	* @param phpbb_db_tools	$db_tools	Instance of db schema manipulation tools
+	* @param string			$migrations_table The name of the db table storing
+	*									information on applied migrations
+	*/
+	function phpbb_db_migrator(&$db, &$db_tools, $migrations_table)
+	{
+		$this->db = &$db;
+		$this->db_tools = &$db_tools;
+		$this->migrations_table = $migrations_table;
+		$this->migrations = array();
+
+		$this->load_migration_state();
+	}
+
+	/**
+	* Loads all migrations and their application state from the database.
+	*
+	* @return null
+	*/
+	function load_migration_state()
+	{
+		$sql = "SELECT *
+			FROM " . $this->migrations_table;
+		$result = $this->db->sql_query($sql);
+
+		$this->migration_state = array();
+		while ($migration = $this->db->sql_fetchrow($result))
+		{
+			$this->migration_state[$migration['migration_name']] = $migration;
+		}
+
+		$this->db->sql_freeresult($result);
+	}
+
+	/**
+	* Sets the list of available migration class names to the given array.
+	*
+	* @param array $class_names An array of migration class names
+	* @return null
+	*/
+	function set_migrations($class_names)
+	{
+		$this->migrations = $class_names;
+	}
+
+	/**
+	* Runs a single update step from the next migration to be applied.
+	*
+	* The update step can either be a schema or a (partial) data update. To
+	* check if update() needs to be called again use the finished() method.
+	*
+	* @return null
+	*/
+	function update()
+	{
+		foreach ($this->migrations as $name)
+		{
+			if (!isset($this->migration_state[$name]) ||
+				!$this->migration_state[$name]['migration_schema_done'] ||
+				!$this->migration_state[$name]['migration_data_done'])
+			{
+				if (!$this->try_apply($name))
+				{
+					continue;
+				}
+				else
+				{
+					return;
+				}
+			}
+		}
+	}
+
+	/**
+	* Attempts to apply a step of the given migration or one of its dependencies
+	*
+	* @param	string	The class name of the migration
+	* @return	bool	Whether any update step was successfully run
+	*/
+	function try_apply($name)
+	{
+		if (!class_exists($name))
+		{
+			return false;
+		}
+
+		$migration =& new $name($this->db, $this->db_tools);
+		$state = (isset($this->migration_state[$name])) ?
+			$this->migration_state[$name] :
+			array(
+				'migration_schema_done' => false,
+				'migration_data_done' => false,
+				'migration_data_state' => '',
+			);
+
+		$depends = $migration->depends_on();
+
+		foreach ($depends as $depend)
+		{
+			if (!isset($this->migration_state[$depend]) ||
+				!$this->migration_state[$depend]['migration_schema_done'] ||
+				!$this->migration_state[$depend]['migration_data_done'])
+			{
+				return $this->try_apply($depend);
+			}
+		}
+
+		if (!$state['migration_schema_done'])
+		{
+			$migration->update_schema();
+			$state['migration_schema_done'] = true;
+		}
+		else
+		{
+			$migration->update_data();
+			$state['migration_data_done'] = true;
+		}
+
+		$sql = 'UPDATE ' . $this->migrations_table . '
+			SET ' . $this->db->sql_build_array('UPDATE', $state) . "
+			WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
+		$this->db->sql_query($sql);
+
+		$this->migration_state[$name] = $state;
+
+		return true;
+	}
+
+	/**
+	* Checks if a migration's dependencies can even theoretically be satisfied.
+	*
+	* @param	string	$name	The class name of the migration
+	* @return	bool			Whether the migration cannot be fulfilled
+	*/
+	function unfulfillable($name)
+	{
+		if (isset($this->migration_state[$name]))
+		{
+			return false;
+		}
+
+		if (!class_exists($name))
+		{
+			return true;
+		}
+
+		$migration =& new $name($this->db, $this->db_tools);
+		$depends = $migration->depends_on();
+
+		foreach ($depends as $depend)
+		{
+			if ($this->unfulfillable($depend))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	* Checks whether all available, fulfillable migrations have been applied.
+	*
+	* @return bool Whether the migrations have been applied
+	*/
+	function finished()
+	{
+		foreach ($this->migrations as $name)
+		{
+			if (!isset($this->migration_state[$name]))
+			{
+				// skip unfulfillable migrations, but fulfillables mean we
+				// are not finished yet
+				if ($this->unfulfillable($name))
+				{
+					continue;
+				}
+				return false;
+			}
+
+			$migration = $this->migration_state[$name];
+
+			if (!$migration['migration_schema_done'] || !$migration['migration_data_done'])
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
-- 
cgit v1.2.1


From d304b6449db6e7c6f3c9058062aca0c641f023a4 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 7 Aug 2011 19:10:38 -0400
Subject: [feature/migrations] Store start and end time of migrations

PHPBB3-9737
---
 phpBB/includes/db/migrator.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index d5d938ca28..f4613e3aec 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -127,6 +127,8 @@ class phpbb_db_migrator
 				'migration_schema_done' => false,
 				'migration_data_done' => false,
 				'migration_data_state' => '',
+				'migration_start_time' => 0,
+				'migration_end_time' => 0,
 			);
 
 		$depends = $migration->depends_on();
@@ -141,6 +143,12 @@ class phpbb_db_migrator
 			}
 		}
 
+		if (!isset($this->migration_state[$name]))
+		{
+			$state['migration_start_time'] = time();
+			$this->insert_migration($name, $state);
+		}
+
 		if (!$state['migration_schema_done'])
 		{
 			$migration->update_schema();
@@ -150,6 +158,7 @@ class phpbb_db_migrator
 		{
 			$migration->update_data();
 			$state['migration_data_done'] = true;
+			$state['migration_end_time'] = time();
 		}
 
 		$sql = 'UPDATE ' . $this->migrations_table . '
@@ -162,6 +171,18 @@ class phpbb_db_migrator
 		return true;
 	}
 
+	function insert_migration($name, $state)
+	{
+		$migration_row = $state;
+		$migration_row['migration_name'] = $name;
+
+		$sql = 'INSERT INTO ' . $this->migrations_table . '
+			' . $this->db->sql_build_array('INSERT', $migration_row);
+		$this->db->sql_query($sql);
+
+		$this->migration_state[$name] = $state;
+	}
+
 	/**
 	* Checks if a migration's dependencies can even theoretically be satisfied.
 	*
-- 
cgit v1.2.1


From 8645321f40d0b13de6201688c69f9f05bc649dcf Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 25 Oct 2012 12:26:44 -0700
Subject: [feature/migrations] Return schema changes in database update style
 array

Returning the set of schema changes allows potentially aggregating to generate
the overall install schema automatically from a set of migrations

PHPBB3-9737
---
 phpBB/includes/db/migration.php | 5 +++--
 phpBB/includes/db/migrator.php  | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
index f96fcb9568..ee916aedc0 100644
--- a/phpBB/includes/db/migration.php
+++ b/phpBB/includes/db/migration.php
@@ -52,12 +52,13 @@ class phpbb_db_migration
 	}
 
 	/**
-	* Updates the database schema
+	* Updates the database schema by providing a set of change instructions
 	*
-	* @return null
+	* @return array
 	*/
 	function update_schema()
 	{
+		return array();
 	}
 
 	/**
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index f4613e3aec..4a178af468 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -151,7 +151,7 @@ class phpbb_db_migrator
 
 		if (!$state['migration_schema_done'])
 		{
-			$migration->update_schema();
+			$this->apply_schema_changes($migration->update_schema());
 			$state['migration_schema_done'] = true;
 		}
 		else
@@ -245,4 +245,9 @@ class phpbb_db_migrator
 
 		return true;
 	}
+
+	function apply_schema_changes($schema_changes)
+	{
+		$this->db_tools->perform_schema_changes($schema_changes);
+	}
 }
-- 
cgit v1.2.1


From c802f2a66c577781036b7bfd6d6689159028c3a6 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 25 Oct 2012 13:02:56 -0700
Subject: [feature/migrations] Standard vars for migrations and run sql with
 feedback

PHPBB3-9737
---
 phpBB/includes/db/migration.php | 52 +++++++++++++++++++++++++++++++++++++----
 phpBB/includes/db/migrator.php  | 17 +++++++++++---
 2 files changed, 62 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
index ee916aedc0..09d4e31344 100644
--- a/phpBB/includes/db/migration.php
+++ b/phpBB/includes/db/migration.php
@@ -28,17 +28,32 @@ class phpbb_db_migration
 {
 	var $db;
 	var $db_tools;
+	var $table_prefix;
+
+	var $phpbb_root_path;
+	var $php_ext;
+
+	var $errors;
 
 	/**
 	* Migration constructor
 	*
 	* @param dbal			$db			Connected database abstraction instance
 	* @param phpbb_db_tools	$db_tools	Instance of db schema manipulation tools
+	* @param string			$table_prefix The prefix for all table names
+	* @param string			$phpbb_root_path
+	* @param string			$php_ext
 	*/
-	function phpbb_db_migration(&$db, &$db_tools)
+	function phpbb_db_migration(&$db, &$db_tools, $table_prefix, $phpbb_root_path, $php_ext)
 	{
 		$this->db = &$db;
 		$this->db_tools = &$db_tools;
+		$this->table_prefix = $table_prefix;
+
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+
+		$this->errors = array();
 	}
 
 	/**
@@ -71,10 +86,39 @@ class phpbb_db_migration
 	}
 
 	/**
-	* Adds a column to a database table
+	* Wrapper for running queries to generate user feedback on updates
 	*/
-	function db_column_add($table_name, $column_name, $column_data)
+	function sql_query($sql)
 	{
-		$this->db_tools->sql_column_add($table_name, $column_name, $column_data);
+		if (defined('DEBUG_EXTRA'))
+		{
+			echo "<br />\n{$sql}\n<br />";
+		}
+
+		$db->sql_return_on_error(true);
+
+		if ($sql === 'begin')
+		{
+			$result = $db->sql_transaction('begin');
+		}
+		else if ($sql === 'commit')
+		{
+			$result = $db->sql_transaction('commit');
+		}
+		else
+		{
+			$result = $db->sql_query($sql);
+			if ($db->sql_error_triggered)
+			{
+				$this->errors[] = array(
+					'sql' => $db->sql_error_sql,
+					'code' => $db->sql_error_returned,
+				);
+			}
+		}
+
+		$db->sql_return_on_error(false);
+
+		return $result;
 	}
 }
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 4a178af468..4ce54a4b92 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -24,6 +24,10 @@ class phpbb_db_migrator
 {
 	var $db;
 	var $db_tools;
+	var $table_prefix;
+
+	var $phpbb_root_path;
+	var $php_ext;
 
 	var $migrations_table;
 	var $migration_state;
@@ -35,16 +39,23 @@ class phpbb_db_migrator
 	*
 	* @param dbal			$db			Connected database abstraction instance
 	* @param phpbb_db_tools	$db_tools	Instance of db schema manipulation tools
+	* @param string			$table_prefix The prefix for all table names
 	* @param string			$migrations_table The name of the db table storing
 	*									information on applied migrations
+	* @param string			$phpbb_root_path
+	* @param string			$php_ext
 	*/
-	function phpbb_db_migrator(&$db, &$db_tools, $migrations_table)
+	function phpbb_db_migrator(&$db, &$db_tools, $table_prefix, $migrations_table, $phpbb_root_path, $php_ext)
 	{
 		$this->db = &$db;
 		$this->db_tools = &$db_tools;
+		$this->table_prefix = $table_prefix;
 		$this->migrations_table = $migrations_table;
 		$this->migrations = array();
 
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+
 		$this->load_migration_state();
 	}
 
@@ -120,7 +131,7 @@ class phpbb_db_migrator
 			return false;
 		}
 
-		$migration =& new $name($this->db, $this->db_tools);
+		$migration =& new $name($this->db, $this->db_tools, $this->table_prefix, $this->phpbb_root_path, $this->php_ext);
 		$state = (isset($this->migration_state[$name])) ?
 			$this->migration_state[$name] :
 			array(
@@ -201,7 +212,7 @@ class phpbb_db_migrator
 			return true;
 		}
 
-		$migration =& new $name($this->db, $this->db_tools);
+		$migration =& new $name($this->db, $this->db_tools, $this->table_prefix, $this->phpbb_root_path, $this->php_ext);
 		$depends = $migration->depends_on();
 
 		foreach ($depends as $depend)
-- 
cgit v1.2.1


From b1f9ca2f6541924c75a30c68dd8a4bc8db62205d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 9 Nov 2012 17:10:48 +0100
Subject: [feature/migrations] Moved database_update info to individual
 migration classes

---
 phpBB/includes/db/migration.php          |   2 +-
 phpBB/includes/db/migration/v301.php     |  25 +++
 phpBB/includes/db/migration/v3010.php    |  25 +++
 phpBB/includes/db/migration/v3010rc1.php |  29 +++
 phpBB/includes/db/migration/v3010rc2.php |  25 +++
 phpBB/includes/db/migration/v3010rc3.php |  25 +++
 phpBB/includes/db/migration/v3011.php    |  25 +++
 phpBB/includes/db/migration/v3011rc1.php |  83 ++++++++
 phpBB/includes/db/migration/v3011rc2.php |  31 +++
 phpBB/includes/db/migration/v3012rc1.php |  26 +++
 phpBB/includes/db/migration/v301rc1.php  |  77 +++++++
 phpBB/includes/db/migration/v302.php     |  25 +++
 phpBB/includes/db/migration/v302rc1.php  |  30 +++
 phpBB/includes/db/migration/v302rc2.php  |  52 +++++
 phpBB/includes/db/migration/v303.php     |  25 +++
 phpBB/includes/db/migration/v303rc1.php  | 135 ++++++++++++
 phpBB/includes/db/migration/v304.php     |  40 ++++
 phpBB/includes/db/migration/v304rc1.php  |  96 +++++++++
 phpBB/includes/db/migration/v305.php     |  25 +++
 phpBB/includes/db/migration/v305rc1.php  | 146 +++++++++++++
 phpBB/includes/db/migration/v306.php     |  25 +++
 phpBB/includes/db/migration/v306rc1.php  | 350 +++++++++++++++++++++++++++++++
 phpBB/includes/db/migration/v306rc2.php  |  25 +++
 phpBB/includes/db/migration/v306rc3.php  |  31 +++
 phpBB/includes/db/migration/v306rc4.php  |  25 +++
 phpBB/includes/db/migration/v307.php     |  25 +++
 phpBB/includes/db/migration/v307pl1.php  |  25 +++
 phpBB/includes/db/migration/v307rc1.php  |  46 ++++
 phpBB/includes/db/migration/v307rc2.php  |  53 +++++
 phpBB/includes/db/migration/v308.php     |  25 +++
 phpBB/includes/db/migration/v308rc1.php  | 222 ++++++++++++++++++++
 phpBB/includes/db/migration/v309.php     |  25 +++
 phpBB/includes/db/migration/v309rc1.php  | 100 +++++++++
 phpBB/includes/db/migration/v309rc2.php  |  25 +++
 phpBB/includes/db/migration/v309rc3.php  |  25 +++
 phpBB/includes/db/migration/v309rc4.php  |  25 +++
 36 files changed, 1998 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/includes/db/migration/v301.php
 create mode 100644 phpBB/includes/db/migration/v3010.php
 create mode 100644 phpBB/includes/db/migration/v3010rc1.php
 create mode 100644 phpBB/includes/db/migration/v3010rc2.php
 create mode 100644 phpBB/includes/db/migration/v3010rc3.php
 create mode 100644 phpBB/includes/db/migration/v3011.php
 create mode 100644 phpBB/includes/db/migration/v3011rc1.php
 create mode 100644 phpBB/includes/db/migration/v3011rc2.php
 create mode 100644 phpBB/includes/db/migration/v3012rc1.php
 create mode 100644 phpBB/includes/db/migration/v301rc1.php
 create mode 100644 phpBB/includes/db/migration/v302.php
 create mode 100644 phpBB/includes/db/migration/v302rc1.php
 create mode 100644 phpBB/includes/db/migration/v302rc2.php
 create mode 100644 phpBB/includes/db/migration/v303.php
 create mode 100644 phpBB/includes/db/migration/v303rc1.php
 create mode 100644 phpBB/includes/db/migration/v304.php
 create mode 100644 phpBB/includes/db/migration/v304rc1.php
 create mode 100644 phpBB/includes/db/migration/v305.php
 create mode 100644 phpBB/includes/db/migration/v305rc1.php
 create mode 100644 phpBB/includes/db/migration/v306.php
 create mode 100644 phpBB/includes/db/migration/v306rc1.php
 create mode 100644 phpBB/includes/db/migration/v306rc2.php
 create mode 100644 phpBB/includes/db/migration/v306rc3.php
 create mode 100644 phpBB/includes/db/migration/v306rc4.php
 create mode 100644 phpBB/includes/db/migration/v307.php
 create mode 100644 phpBB/includes/db/migration/v307pl1.php
 create mode 100644 phpBB/includes/db/migration/v307rc1.php
 create mode 100644 phpBB/includes/db/migration/v307rc2.php
 create mode 100644 phpBB/includes/db/migration/v308.php
 create mode 100644 phpBB/includes/db/migration/v308rc1.php
 create mode 100644 phpBB/includes/db/migration/v309.php
 create mode 100644 phpBB/includes/db/migration/v309rc1.php
 create mode 100644 phpBB/includes/db/migration/v309rc2.php
 create mode 100644 phpBB/includes/db/migration/v309rc3.php
 create mode 100644 phpBB/includes/db/migration/v309rc4.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
index 09d4e31344..aca9d264bb 100644
--- a/phpBB/includes/db/migration.php
+++ b/phpBB/includes/db/migration.php
@@ -3,7 +3,7 @@
 *
 * @package db
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
 *
 */
 
diff --git a/phpBB/includes/db/migration/v301.php b/phpBB/includes/db/migration/v301.php
new file mode 100644
index 0000000000..8a2a265a3c
--- /dev/null
+++ b/phpBB/includes/db/migration/v301.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v301 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v301rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v3010.php b/phpBB/includes/db/migration/v3010.php
new file mode 100644
index 0000000000..7490ba1005
--- /dev/null
+++ b/phpBB/includes/db/migration/v3010.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v3010 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v3010rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v3010rc1.php b/phpBB/includes/db/migration/v3010rc1.php
new file mode 100644
index 0000000000..9a43b4c81d
--- /dev/null
+++ b/phpBB/includes/db/migration/v3010rc1.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v3010rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v309');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		if (!isset($config['email_max_chunk_size']))
+		{
+			set_config('email_max_chunk_size', '50');
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/v3010rc2.php b/phpBB/includes/db/migration/v3010rc2.php
new file mode 100644
index 0000000000..8c1809227c
--- /dev/null
+++ b/phpBB/includes/db/migration/v3010rc2.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v3010rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v3010rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v3010rc3.php b/phpBB/includes/db/migration/v3010rc3.php
new file mode 100644
index 0000000000..917cabd8fe
--- /dev/null
+++ b/phpBB/includes/db/migration/v3010rc3.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v3010rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v3010rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v3011.php b/phpBB/includes/db/migration/v3011.php
new file mode 100644
index 0000000000..7d506308b1
--- /dev/null
+++ b/phpBB/includes/db/migration/v3011.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v3011 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v3011rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v3011rc1.php b/phpBB/includes/db/migration/v3011rc1.php
new file mode 100644
index 0000000000..04f86b47ae
--- /dev/null
+++ b/phpBB/includes/db/migration/v3011rc1.php
@@ -0,0 +1,83 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v3011rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v3010');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		// Updates users having current style a deactivated one
+		$sql = 'SELECT style_id
+			FROM ' . STYLES_TABLE . '
+			WHERE style_active = 0';
+		$result = $db->sql_query($sql);
+
+		$deactivated_style_ids = array();
+		while ($style_id = $db->sql_fetchfield('style_id', false, $result))
+		{
+			$deactivated_style_ids[] = (int) $style_id;
+		}
+		$db->sql_freeresult($result);
+
+		if (!empty($deactivated_style_ids))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_style = ' . (int) $config['default_style'] .'
+				WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
+			_sql($sql, $errored, $error_ary);
+		}
+
+		// Delete orphan private messages
+		$batch_size = 500;
+
+		$sql_array = array(
+			'SELECT'	=> 'p.msg_id',
+			'FROM'		=> array(
+				PRIVMSGS_TABLE	=> 'p',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
+					'ON'	=> 'p.msg_id = t.msg_id',
+				),
+			),
+			'WHERE'		=> 't.user_id IS NULL',
+		);
+		$sql = $db->sql_build_query('SELECT', $sql_array);
+
+		do
+		{
+			$result = $db->sql_query_limit($sql, $batch_size);
+
+			$delete_pms = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$delete_pms[] = (int) $row['msg_id'];
+			}
+			$db->sql_freeresult($result);
+
+			if (!empty($delete_pms))
+			{
+				$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+					WHERE ' . $db->sql_in_set('msg_id', $delete_pms);
+				_sql($sql, $errored, $error_ary);
+			}
+		}
+		while (sizeof($delete_pms) == $batch_size);
+	}
+}
diff --git a/phpBB/includes/db/migration/v3011rc2.php b/phpBB/includes/db/migration/v3011rc2.php
new file mode 100644
index 0000000000..0f66eff156
--- /dev/null
+++ b/phpBB/includes/db/migration/v3011rc2.php
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v3011rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v3011rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_novalue' => array('BOOL', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v3012rc1.php b/phpBB/includes/db/migration/v3012rc1.php
new file mode 100644
index 0000000000..67f7a29b02
--- /dev/null
+++ b/phpBB/includes/db/migration/v3012rc1.php
@@ -0,0 +1,26 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v3012rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v3011');
+	}
+
+	function update_schema()
+	{
+		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v301rc1.php b/phpBB/includes/db/migration/v301rc1.php
new file mode 100644
index 0000000000..aee50e3039
--- /dev/null
+++ b/phpBB/includes/db/migration/v301rc1.php
@@ -0,0 +1,77 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v301rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array();
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'display_subforum_list' => array('BOOL', 1),
+				),
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('UINT', 0),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'groups' => array('group_legend'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('session_forum_id'),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_legend_name' => array('group_legend', 'group_name'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
+			array('custom', array(array(&$this, 'reset_smiley_size'))),
+		);
+	}
+
+	function fix_unset_last_view_time()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . "topics
+			SET topic_last_view_time = topic_last_post_time
+			WHERE topic_last_view_time = 0";
+		$this->sql_query($sql);
+	}
+
+	function reset_smiley_size()
+	{
+		// Update smiley sizes
+		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
+
+		foreach ($smileys as $smiley)
+		{
+			if (file_exists($this->phpbb_root_path . 'images/smilies/' . $smiley))
+			{
+				list($width, $height) = getimagesize($this->phpbb_root_path . 'images/smilies/' . $smiley);
+
+				$sql = 'UPDATE ' . SMILIES_TABLE . '
+					SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
+					WHERE smiley_url = '" . $this->db->sql_escape($smiley) . "'";
+
+				$this->sql_query($sql);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/v302.php b/phpBB/includes/db/migration/v302.php
new file mode 100644
index 0000000000..942a0ac58c
--- /dev/null
+++ b/phpBB/includes/db/migration/v302.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v302 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v302rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v302rc1.php b/phpBB/includes/db/migration/v302rc1.php
new file mode 100644
index 0000000000..ced4d9fbfc
--- /dev/null
+++ b/phpBB/includes/db/migration/v302rc1.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v301rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v301');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('referer_validation', '1')),
+			array('config.add', array('check_attachment_content', '1')),
+			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/v302rc2.php b/phpBB/includes/db/migration/v302rc2.php
new file mode 100644
index 0000000000..21aa5ca728
--- /dev/null
+++ b/phpBB/includes/db/migration/v302rc2.php
@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v302rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v302rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'drafts' => array(
+					'draft_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_last_post_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_subject' => array('STEXT_UNI', '', 'true_sort'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'topics' => array(
+					'topic_title' => array('STEXT_UNI', '', 'true_sort'),
+					'topic_last_post_subject' => array('STEXT_UNI', ''),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array('session_forum_id'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_fid' => array('session_forum_id'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v303.php b/phpBB/includes/db/migration/v303.php
new file mode 100644
index 0000000000..409c396baf
--- /dev/null
+++ b/phpBB/includes/db/migration/v303.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v303 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v302rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v303rc1.php b/phpBB/includes/db/migration/v303rc1.php
new file mode 100644
index 0000000000..b8ec5668fd
--- /dev/null
+++ b/phpBB/includes/db/migration/v303rc1.php
@@ -0,0 +1,135 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v303rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v302');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'styles_template' => array(
+					'template_inherits_id' => array('UINT:4', 0),
+					'template_inherit_path' => array('VCHAR', ''),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_max_recipients' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('enable_queue_trigger', '0')),
+			array('config.add', array('queue_trigger_posts', '3')),
+			array('config.add', array('pm_max_recipients', '0')),
+			array('custom', array('set_group_default_max_recipients'))
+
+			// Not prefilling yet
+			set_config('dbms_version', '');
+
+			// Add new permission u_masspm_group and duplicate settings from u_masspm
+			include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
+			$auth_admin = new auth_admin();
+
+			// Only add the new permission if it does not already exist
+			if (empty($auth_admin->acl_options['id']['u_masspm_group']))
+			{
+				$auth_admin->acl_add_option(array('global' => array('u_masspm_group')));
+
+				// Now the tricky part, filling the permission
+				$old_id = $auth_admin->acl_options['id']['u_masspm'];
+				$new_id = $auth_admin->acl_options['id']['u_masspm_group'];
+
+				$tables = array(ACL_GROUPS_TABLE, ACL_ROLES_DATA_TABLE, ACL_USERS_TABLE);
+
+				foreach ($tables as $table)
+				{
+					$sql = 'SELECT *
+						FROM ' . $table . '
+						WHERE auth_option_id = ' . $old_id;
+					$result = _sql($sql, $errored, $error_ary);
+
+					$sql_ary = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$row['auth_option_id'] = $new_id;
+						$sql_ary[] = $row;
+					}
+					$db->sql_freeresult($result);
+
+					if (sizeof($sql_ary))
+					{
+						$db->sql_multi_insert($table, $sql_ary);
+					}
+				}
+
+				// Remove any old permission entries
+				$auth_admin->acl_clear_prefetch();
+			}
+
+			/**
+			* Do not resync post counts here. An admin may do this later from the ACP
+			$start = 0;
+			$step = ($config['num_posts']) ? (max((int) ($config['num_posts'] / 5), 20000)) : 20000;
+
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_posts = 0';
+			_sql($sql, $errored, $error_ary);
+
+			do
+			{
+				$sql = 'SELECT COUNT(post_id) AS num_posts, poster_id
+					FROM ' . POSTS_TABLE . '
+					WHERE post_id BETWEEN ' . ($start + 1) . ' AND ' . ($start + $step) . '
+						AND post_postcount = 1 AND post_approved = 1
+					GROUP BY poster_id';
+				$result = _sql($sql, $errored, $error_ary);
+
+				if ($row = $db->sql_fetchrow($result))
+				{
+					do
+					{
+						$sql = 'UPDATE ' . USERS_TABLE . " SET user_posts = user_posts + {$row['num_posts']} WHERE user_id = {$row['poster_id']}";
+						_sql($sql, $errored, $error_ary);
+					}
+					while ($row = $db->sql_fetchrow($result));
+
+					$start += $step;
+				}
+				else
+				{
+					$start = 0;
+				}
+				$db->sql_freeresult($result);
+			}
+			while ($start);
+			*/
+
+			$sql = 'UPDATE ' . MODULES_TABLE . '
+				SET module_auth = \'acl_a_email && cfg_email_enable\'
+				WHERE module_class = \'acp\'
+					AND module_basename = \'email\'';
+			_sql($sql, $errored, $error_ary);
+	}
+
+	function set_group_default_max_recipients()
+	{
+		// Set maximum number of recipients for the registered users, bots, guests group
+		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
+			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
+		$this->sql_query($sql);
+	}
+
+}
diff --git a/phpBB/includes/db/migration/v304.php b/phpBB/includes/db/migration/v304.php
new file mode 100644
index 0000000000..2895caaa6d
--- /dev/null
+++ b/phpBB/includes/db/migration/v304.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v304 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v304rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		if ($db->sql_layer == 'oracle')
+		{
+			// log_operation is CLOB - but we can change this later
+			$sql = 'UPDATE ' . LOG_TABLE . "
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
+			_sql($sql, $errored, $error_ary);
+		}
+		else
+		{
+			$sql = 'UPDATE ' . LOG_TABLE . "
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation = 'LOG_TOPIC_DELETED'";
+			_sql($sql, $errored, $error_ary);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/v304rc1.php b/phpBB/includes/db/migration/v304rc1.php
new file mode 100644
index 0000000000..a7098ce62f
--- /dev/null
+++ b/phpBB/includes/db/migration/v304rc1.php
@@ -0,0 +1,96 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v304rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v303');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_profile' => array('BOOL', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'styles' => array(
+					'style_id' => array('UINT', NULL, 'auto_increment'),
+					'template_id' => array('UINT', 0),
+					'theme_id' => array('UINT', 0),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_imageset' => array(
+					'imageset_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_imageset_data' => array(
+					'image_id' => array('UINT', NULL, 'auto_increment'),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_theme' => array(
+					'theme_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template' => array(
+					'template_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template_data' => array(
+					'template_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
+				FROM ' . PROFILE_FIELDS_TABLE;
+		$result = _sql($sql, $errored, $error_ary);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'field_required'	=> 0,
+				'field_show_on_reg'	=> 0,
+				'field_hide'		=> 0,
+				'field_show_profile'=> 0,
+			);
+
+			if ($row['field_required'])
+			{
+				$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_show_on_reg'])
+			{
+				$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_hide'])
+			{
+				// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
+				$sql_ary['field_hide'] = 1;
+			}
+			else
+			{
+				// equivelant to "none", which is the "Display in user control panel" option
+				$sql_ary['field_show_profile'] = 1;
+			}
+
+			_sql('UPDATE ' . PROFILE_FIELDS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/v305.php b/phpBB/includes/db/migration/v305.php
new file mode 100644
index 0000000000..b4d676d72a
--- /dev/null
+++ b/phpBB/includes/db/migration/v305.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v305 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v305rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v305rc1.php b/phpBB/includes/db/migration/v305rc1.php
new file mode 100644
index 0000000000..8d9c4d2456
--- /dev/null
+++ b/phpBB/includes/db/migration/v305rc1.php
@@ -0,0 +1,146 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v305rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v304');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		// Captcha config variables
+		set_config('captcha_gd_wave', 0);
+		set_config('captcha_gd_3d_noise', 1);
+		set_config('captcha_gd_fonts', 1);
+		set_config('confirm_refresh', 1);
+
+		// Maximum number of keywords
+		set_config('max_num_search_keywords', 10);
+
+		// Remove static config var and put it back as dynamic variable
+		$sql = 'UPDATE ' . CONFIG_TABLE . "
+			SET is_dynamic = 1
+			WHERE config_name = 'search_indexing_state'";
+		_sql($sql, $errored, $error_ary);
+
+		// Hash old MD5 passwords
+		$sql = 'SELECT user_id, user_password
+				FROM ' . USERS_TABLE . '
+				WHERE user_pass_convert = 1';
+		$result = _sql($sql, $errored, $error_ary);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (strlen($row['user_password']) == 32)
+			{
+				$sql_ary = array(
+					'user_password'	=> phpbb_hash($row['user_password']),
+				);
+
+				_sql('UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id'], $errored, $error_ary);
+			}
+		}
+		$db->sql_freeresult($result);
+
+		// Adjust bot entry
+		$sql = 'UPDATE ' . BOTS_TABLE . "
+			SET bot_agent = 'ichiro/'
+			WHERE bot_agent = 'ichiro/2'";
+		_sql($sql, $errored, $error_ary);
+
+
+		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
+
+		// We get duplicate entries first
+		$sql = 'SELECT auth_option
+			FROM ' . ACL_OPTIONS_TABLE . '
+			GROUP BY auth_option
+			HAVING COUNT(*) >= 2';
+		$result = $db->sql_query($sql);
+
+		$auth_options = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$auth_options[] = $row['auth_option'];
+		}
+		$db->sql_freeresult($result);
+
+		// Remove specific auth options
+		if (!empty($auth_options))
+		{
+			foreach ($auth_options as $option)
+			{
+				// Select auth_option_ids... the largest id will be preserved
+				$sql = 'SELECT auth_option_id
+					FROM ' . ACL_OPTIONS_TABLE . "
+					WHERE auth_option = '" . $db->sql_escape($option) . "'
+					ORDER BY auth_option_id DESC";
+				// sql_query_limit not possible here, due to bug in postgresql layer
+				$result = $db->sql_query($sql);
+
+				// Skip first row, this is our original auth option we want to preserve
+				$row = $db->sql_fetchrow($result);
+
+				while ($row = $db->sql_fetchrow($result))
+				{
+					// Ok, remove this auth option...
+					_sql('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
+					_sql('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
+					_sql('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
+					_sql('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
+				}
+				$db->sql_freeresult($result);
+			}
+		}
+
+		// Now make auth_option UNIQUE, by dropping the old index and adding a UNIQUE one.
+		$changes = array(
+			'drop_keys'			=> array(
+				ACL_OPTIONS_TABLE		=> array('auth_option'),
+			),
+		);
+
+		global $db_tools;
+
+		$statements = $db_tools->perform_schema_changes($changes);
+
+		foreach ($statements as $sql)
+		{
+			_sql($sql, $errored, $error_ary);
+		}
+
+		$changes = array(
+			'add_unique_index'	=> array(
+				ACL_OPTIONS_TABLE		=> array(
+					'auth_option'		=> array('auth_option'),
+				),
+			),
+		);
+
+		$statements = $db_tools->perform_schema_changes($changes);
+
+		foreach ($statements as $sql)
+		{
+			_sql($sql, $errored, $error_ary);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/v306.php b/phpBB/includes/db/migration/v306.php
new file mode 100644
index 0000000000..eec2f7c752
--- /dev/null
+++ b/phpBB/includes/db/migration/v306.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v306 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v306rc4');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v306rc1.php b/phpBB/includes/db/migration/v306rc1.php
new file mode 100644
index 0000000000..63d1c66c2d
--- /dev/null
+++ b/phpBB/includes/db/migration/v306rc1.php
@@ -0,0 +1,350 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v306rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v305');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'confirm' => array(
+					'attempts' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_new' => array('BOOL', 1),
+					'user_reminded' => array('TINT:4', 0),
+					'user_reminded_time' => array('TIMESTAMP', 0),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_reported' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'reports' => array(
+					'pm_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'fields'			=> array(
+					'field_show_on_vt' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_options' => array('UINT:20', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'users' => array(
+					'user_options' => array('UINT:11', 230271),
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'reports' => array(
+					'post_id' => array('post_id'),
+					'pm_id' => array('pm_id'),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_username' => array('post_username:255'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		// Let's see if the GD Captcha can be enabled... we simply look for what *is* enabled...
+		if (!empty($config['captcha_gd']) && !isset($config['captcha_plugin']))
+		{
+			set_config('captcha_plugin', 'phpbb_captcha_gd');
+		}
+		else if (!isset($config['captcha_plugin']))
+		{
+			set_config('captcha_plugin', 'phpbb_captcha_nogd');
+		}
+
+		// Entries for the Feed Feature
+		set_config('feed_enable', '0');
+		set_config('feed_limit', '10');
+
+		set_config('feed_overall_forums', '1');
+		set_config('feed_overall_forums_limit', '15');
+
+		set_config('feed_overall_topics', '0');
+		set_config('feed_overall_topics_limit', '15');
+
+		set_config('feed_forum', '1');
+		set_config('feed_topic', '1');
+		set_config('feed_item_statistics', '1');
+
+		// Entries for smiley pagination
+		set_config('smilies_per_page', '50');
+
+		// Entry for reporting PMs
+		set_config('allow_pm_report', '1');
+
+		// Install modules
+		$modules_to_install = array(
+			'feed'					=> array(
+				'base'		=> 'board',
+				'class'		=> 'acp',
+				'title'		=> 'ACP_FEED_SETTINGS',
+				'auth'		=> 'acl_a_board',
+				'cat'		=> 'ACP_BOARD_CONFIGURATION',
+				'after'		=> array('signature', 'ACP_SIGNATURE_SETTINGS')
+			),
+			'warnings'				=> array(
+				'base'		=> 'users',
+				'class'		=> 'acp',
+				'title'		=> 'ACP_USER_WARNINGS',
+				'auth'		=> 'acl_a_user',
+				'display'	=> 0,
+				'cat'		=> 'ACP_CAT_USERS',
+				'after'		=> array('feedback', 'ACP_USER_FEEDBACK')
+			),
+			'send_statistics'		=> array(
+				'base'		=> 'send_statistics',
+				'class'		=> 'acp',
+				'title'		=> 'ACP_SEND_STATISTICS',
+				'auth'		=> 'acl_a_server',
+				'cat'		=> 'ACP_SERVER_CONFIGURATION'
+			),
+			'setting_forum_copy'	=> array(
+				'base'		=> 'permissions',
+				'class'		=> 'acp',
+				'title'		=> 'ACP_FORUM_PERMISSIONS_COPY',
+				'auth'		=> 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth',
+				'cat'		=> 'ACP_FORUM_BASED_PERMISSIONS',
+				'after'		=> array('setting_forum_local', 'ACP_FORUM_PERMISSIONS')
+			),
+			'pm_reports'			=> array(
+				'base'		=> 'pm_reports',
+				'class'		=> 'mcp',
+				'title'		=> 'MCP_PM_REPORTS_OPEN',
+				'auth'		=> 'aclf_m_report',
+				'cat'		=> 'MCP_REPORTS'
+			),
+			'pm_reports_closed'		=> array(
+				'base'		=> 'pm_reports',
+				'class'		=> 'mcp',
+				'title'		=> 'MCP_PM_REPORTS_CLOSED',
+				'auth'		=> 'aclf_m_report',
+				'cat'		=> 'MCP_REPORTS'
+			),
+			'pm_report_details'		=> array(
+				'base'		=> 'pm_reports',
+				'class'		=> 'mcp',
+				'title'		=> 'MCP_PM_REPORT_DETAILS',
+				'auth'		=> 'aclf_m_report',
+				'cat'		=> 'MCP_REPORTS'
+			),
+		);
+
+		_add_modules($modules_to_install);
+
+		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . "
+			WHERE group_name = 'NEWLY_REGISTERED'";
+		$result = $db->sql_query($sql);
+		$group_id = (int) $db->sql_fetchfield('group_id');
+		$db->sql_freeresult($result);
+
+		if (!$group_id)
+		{
+			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
+			_sql($sql, $errored, $error_ary);
+
+			$group_id = $db->sql_nextid();
+		}
+
+		// Insert new user role... at the end of the chain
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
+				AND role_type = 'u_'";
+		$result = $db->sql_query($sql);
+		$u_role = (int) $db->sql_fetchfield('role_id');
+		$db->sql_freeresult($result);
+
+		if (!$u_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'u_'";
+			$result = $db->sql_query($sql);
+			$next_order_id = (int) $db->sql_fetchfield('max_order_id');
+			$db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
+			_sql($sql, $errored, $error_ary);
+			$u_role = $db->sql_nextid();
+
+			if (!$errored)
+			{
+				// Now add the correct data to the roles...
+				// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
+				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
+				_sql($sql, $errored, $error_ary);
+
+				// Add user role to group
+				$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
+				_sql($sql, $errored, $error_ary);
+			}
+		}
+
+		// Insert new forum role
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
+				AND role_type = 'f_'";
+		$result = $db->sql_query($sql);
+		$f_role = (int) $db->sql_fetchfield('role_id');
+		$db->sql_freeresult($result);
+
+		if (!$f_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'f_'";
+			$result = $db->sql_query($sql);
+			$next_order_id = (int) $db->sql_fetchfield('max_order_id');
+			$db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
+			_sql($sql, $errored, $error_ary);
+			$f_role = $db->sql_nextid();
+
+			if (!$errored)
+			{
+				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
+				_sql($sql, $errored, $error_ary);
+			}
+		}
+
+		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
+		$sql = 'SELECT 1
+			FROM ' . USERS_TABLE . '
+			WHERE user_new = 0';
+		$result = $db->sql_query_limit($sql, 1);
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		if (!$row)
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
+			_sql($sql, $errored, $error_ary);
+		}
+
+		// Newly registered users limit
+		if (!isset($config['new_member_post_limit']))
+		{
+			set_config('new_member_post_limit', (!empty($config['enable_queue_trigger'])) ? $config['queue_trigger_posts'] : 0);
+		}
+
+		if (!isset($config['new_member_group_default']))
+		{
+			set_config('new_member_group_default', 0);
+		}
+
+		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
+		// Check if the role is already assigned...
+		$sql = 'SELECT forum_id
+			FROM ' . ACL_GROUPS_TABLE . '
+			WHERE group_id = ' . $group_id . '
+				AND auth_role_id = ' . $f_role;
+		$result = $db->sql_query($sql);
+		$is_options = (int) $db->sql_fetchfield('forum_id');
+		$db->sql_freeresult($result);
+
+		// Not assigned at all... :/
+		if (!$is_options)
+		{
+			// Get postable forums
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type != ' . FORUM_LINK;
+			$result = $db->sql_query($sql);
+
+			while ($row = $db->sql_fetchrow($result))
+			{
+				_sql('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)', $errored, $error_ary);
+			}
+			$db->sql_freeresult($result);
+		}
+
+		// Clear permissions...
+		include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
+		$auth_admin = new auth_admin();
+		$auth_admin->acl_clear_prefetch();
+
+		if (!isset($config['allow_avatar']))
+		{
+			if ($config['allow_avatar_upload'] || $config['allow_avatar_local'] || $config['allow_avatar_remote'])
+			{
+				set_config('allow_avatar', '1');
+			}
+			else
+			{
+				set_config('allow_avatar', '0');
+			}
+		}
+
+		if (!isset($config['allow_avatar_remote_upload']))
+		{
+			if ($config['allow_avatar_remote'] && $config['allow_avatar_upload'])
+			{
+				set_config('allow_avatar_remote_upload', '1');
+			}
+			else
+			{
+				set_config('allow_avatar_remote_upload', '0');
+			}
+		}
+
+		// Minimum number of characters
+		if (!isset($config['min_post_chars']))
+		{
+			set_config('min_post_chars', '1');
+		}
+
+		if (!isset($config['allow_quick_reply']))
+		{
+			set_config('allow_quick_reply', '1');
+		}
+
+		// Set every members user_options column to enable
+		// bbcode, smilies and URLs for signatures by default
+		$sql = 'SELECT user_options
+			FROM ' . USERS_TABLE . '
+			WHERE user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')';
+		$result = $db->sql_query_limit($sql, 1);
+		$user_option = (int) $db->sql_fetchfield('user_options');
+		$db->sql_freeresult($result);
+
+		// Check if we already updated the database by checking bit 15 which we used to store the sig_bbcode option
+		if (!($user_option & 1 << 15))
+		{
+			// 229376 is the added value to enable all three signature options
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
+			_sql($sql, $errored, $error_ary);
+		}
+
+		if (!isset($config['delete_time']))
+		{
+			set_config('delete_time', $config['edit_time']);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/v306rc2.php b/phpBB/includes/db/migration/v306rc2.php
new file mode 100644
index 0000000000..0a6c388da6
--- /dev/null
+++ b/phpBB/includes/db/migration/v306rc2.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v306rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v306rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v306rc3.php b/phpBB/includes/db/migration/v306rc3.php
new file mode 100644
index 0000000000..b3bd49eafa
--- /dev/null
+++ b/phpBB/includes/db/migration/v306rc3.php
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v306rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v306rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
+			SET field_show_on_vt = 1
+			WHERE field_hide = 0
+				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
+		_sql($sql, $errored, $error_ary);
+	}
+}
diff --git a/phpBB/includes/db/migration/v306rc4.php b/phpBB/includes/db/migration/v306rc4.php
new file mode 100644
index 0000000000..92c1979311
--- /dev/null
+++ b/phpBB/includes/db/migration/v306rc4.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v306rc4 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v306rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v307.php b/phpBB/includes/db/migration/v307.php
new file mode 100644
index 0000000000..a693a16676
--- /dev/null
+++ b/phpBB/includes/db/migration/v307.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v307 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v307rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v307pl1.php b/phpBB/includes/db/migration/v307pl1.php
new file mode 100644
index 0000000000..3c1ed2be94
--- /dev/null
+++ b/phpBB/includes/db/migration/v307pl1.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v307pl1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v307');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v307rc1.php b/phpBB/includes/db/migration/v307rc1.php
new file mode 100644
index 0000000000..f1c8b3384a
--- /dev/null
+++ b/phpBB/includes/db/migration/v307rc1.php
@@ -0,0 +1,46 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v307rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v306');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'drop_keys' => array(
+				$this->table_prefix . 'log' => array('log_time'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'topics_track' => array(
+					'topic_id' => array('topic_id'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		// ATOM Feeds
+		set_config('feed_overall', '1');
+		set_config('feed_http_auth', '0');
+		set_config('feed_limit_post', (string) (isset($config['feed_limit']) ? (int) $config['feed_limit'] : 15));
+		set_config('feed_limit_topic', (string) (isset($config['feed_overall_topics_limit']) ? (int) $config['feed_overall_topics_limit'] : 10));
+		set_config('feed_topics_new', (!empty($config['feed_overall_topics']) ? '1' : '0'));
+		set_config('feed_topics_active', (!empty($config['feed_overall_topics']) ? '1' : '0'));
+
+		// Delete all text-templates from the template_data
+		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
+			WHERE template_filename ' . $db->sql_like_expression($db->any_char . '.txt');
+		_sql($sql, $errored, $error_ary);
+	}
+}
diff --git a/phpBB/includes/db/migration/v307rc2.php b/phpBB/includes/db/migration/v307rc2.php
new file mode 100644
index 0000000000..f9492f3d1c
--- /dev/null
+++ b/phpBB/includes/db/migration/v307rc2.php
@@ -0,0 +1,53 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v307rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v307rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		$sql = 'SELECT user_id, user_email, user_email_hash
+			FROM ' . USERS_TABLE . '
+			WHERE user_type <> ' . USER_IGNORE . "
+				AND user_email <> ''";
+		$result = $db->sql_query($sql);
+
+		$i = 0;
+		while ($row = $db->sql_fetchrow($result))
+		{
+			// Snapshot of the phpbb_email_hash() function
+			// We cannot call it directly because the auto updater updates the DB first. :/
+			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
+
+			if ($user_email_hash != $row['user_email_hash'])
+			{
+				$sql_ary = array(
+					'user_email_hash'	=> $user_email_hash,
+				);
+
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE user_id = ' . (int) $row['user_id'];
+				_sql($sql, $errored, $error_ary, ($i % 100 == 0));
+
+				++$i;
+			}
+		}
+		$db->sql_freeresult($result);
+	}
+}
diff --git a/phpBB/includes/db/migration/v308.php b/phpBB/includes/db/migration/v308.php
new file mode 100644
index 0000000000..8a0d96b2e7
--- /dev/null
+++ b/phpBB/includes/db/migration/v308.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v308 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v308rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v308rc1.php b/phpBB/includes/db/migration/v308rc1.php
new file mode 100644
index 0000000000..13d0e98b1c
--- /dev/null
+++ b/phpBB/includes/db/migration/v308rc1.php
@@ -0,0 +1,222 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v308rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v307pl1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		// Update file extension group names to use language strings.
+		$sql = 'SELECT lang_dir
+			FROM ' . LANG_TABLE;
+		$result = $db->sql_query($sql);
+
+		$extension_groups_updated = array();
+		while ($lang_dir = $db->sql_fetchfield('lang_dir'))
+		{
+			$lang_dir = basename($lang_dir);
+
+			// The language strings we need are either in language/.../acp/attachments.php
+			// in the update package if we're updating to 3.0.8-RC1 or later,
+			// or they are in language/.../install.php when we're updating from 3.0.7-PL1 or earlier.
+			// On an already updated board, they can also already be in language/.../acp/attachments.php
+			// in the board root.
+			$lang_files = array(
+				"{$phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.$phpEx",
+				"{$phpbb_root_path}language/$lang_dir/install.$phpEx",
+				"{$phpbb_root_path}language/$lang_dir/acp/attachments.$phpEx",
+			);
+
+			foreach ($lang_files as $lang_file)
+			{
+				if (!file_exists($lang_file))
+				{
+					continue;
+				}
+
+				$lang = array();
+				include($lang_file);
+
+				foreach($lang as $lang_key => $lang_val)
+				{
+					if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
+					{
+						continue;
+					}
+
+					$sql_ary = array(
+						'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
+					);
+
+					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+						SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
+						WHERE group_name = '" . $db->sql_escape($lang_val) . "'";
+					_sql($sql, $errored, $error_ary);
+
+					$extension_groups_updated[$lang_key] = true;
+				}
+			}
+		}
+		$db->sql_freeresult($result);
+
+		// Install modules
+		$modules_to_install = array(
+			'post'					=> array(
+				'base'		=> 'board',
+				'class'		=> 'acp',
+				'title'		=> 'ACP_POST_SETTINGS',
+				'auth'		=> 'acl_a_board',
+				'cat'		=> 'ACP_MESSAGES',
+				'after'		=> array('message', 'ACP_MESSAGE_SETTINGS')
+			),
+		);
+
+		_add_modules($modules_to_install);
+
+		// update
+		$sql = 'UPDATE ' . MODULES_TABLE . '
+			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
+			WHERE module_class = \'ucp\'
+				AND module_basename = \'profile\'
+				AND module_mode = \'avatar\'';
+		_sql($sql, $errored, $error_ary);
+
+		// add Bing Bot
+		$bot_name = 'Bing [Bot]';
+		$bot_name_clean = utf8_clean_string($bot_name);
+
+		$sql = 'SELECT user_id
+			FROM ' . USERS_TABLE . "
+			WHERE username_clean = '" . $db->sql_escape($bot_name_clean) . "'";
+		$result = $db->sql_query($sql);
+		$bing_already_added = (bool) $db->sql_fetchfield('user_id');
+		$db->sql_freeresult($result);
+
+		if (!$bing_already_added)
+		{
+			$bot_agent = 'bingbot/';
+			$bot_ip = '';
+			$sql = 'SELECT group_id, group_colour
+				FROM ' . GROUPS_TABLE . "
+				WHERE group_name = 'BOTS'";
+			$result = $db->sql_query($sql);
+			$group_row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if (!$group_row)
+			{
+				// default fallback, should never get here
+				$group_row['group_id'] = 6;
+				$group_row['group_colour'] = '9E8DA7';
+			}
+
+			if (!function_exists('user_add'))
+			{
+				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+			}
+
+			$user_row = array(
+				'user_type'				=> USER_IGNORE,
+				'group_id'				=> $group_row['group_id'],
+				'username'				=> $bot_name,
+				'user_regdate'			=> time(),
+				'user_password'			=> '',
+				'user_colour'			=> $group_row['group_colour'],
+				'user_email'			=> '',
+				'user_lang'				=> $config['default_lang'],
+				'user_style'			=> $config['default_style'],
+				'user_timezone'			=> 0,
+				'user_dateformat'		=> $config['default_dateformat'],
+				'user_allow_massemail'	=> 0,
+			);
+
+			$user_id = user_add($user_row);
+
+			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+				'bot_active'	=> 1,
+				'bot_name'		=> (string) $bot_name,
+				'user_id'		=> (int) $user_id,
+				'bot_agent'		=> (string) $bot_agent,
+				'bot_ip'		=> (string) $bot_ip,
+			));
+
+			_sql($sql, $errored, $error_ary);
+		}
+		// end Bing Bot addition
+
+		// Delete shadow topics pointing to not existing topics
+		$batch_size = 500;
+
+		// Set of affected forums we have to resync
+		$sync_forum_ids = array();
+
+		do
+		{
+			$sql_array = array(
+				'SELECT'	=> 't1.topic_id, t1.forum_id',
+				'FROM'		=> array(
+					TOPICS_TABLE	=> 't1',
+				),
+				'LEFT_JOIN'	=> array(
+					array(
+						'FROM'	=> array(TOPICS_TABLE	=> 't2'),
+						'ON'	=> 't1.topic_moved_id = t2.topic_id',
+					),
+				),
+				'WHERE'		=> 't1.topic_moved_id <> 0
+							AND t2.topic_id IS NULL',
+			);
+			$sql = $db->sql_build_query('SELECT', $sql_array);
+			$result = $db->sql_query_limit($sql, $batch_size);
+
+			$topic_ids = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$topic_ids[] = (int) $row['topic_id'];
+
+				$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
+			}
+			$db->sql_freeresult($result);
+
+			if (!empty($topic_ids))
+			{
+				$sql = 'DELETE FROM ' . TOPICS_TABLE . '
+					WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
+				$db->sql_query($sql);
+			}
+		}
+		while (sizeof($topic_ids) == $batch_size);
+
+		// Sync the forums we have deleted shadow topics from.
+		sync('forum', 'forum_id', $sync_forum_ids, true, true);
+
+		// Unread posts search load switch
+		set_config('load_unreads_search', '1');
+
+		// Reduce queue interval to 60 seconds, email package size to 20
+		if ($config['queue_interval'] == 600)
+		{
+			set_config('queue_interval', '60');
+		}
+
+		if ($config['email_package_size'] == 50)
+		{
+			set_config('email_package_size', '20');
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/v309.php b/phpBB/includes/db/migration/v309.php
new file mode 100644
index 0000000000..ebb246da3a
--- /dev/null
+++ b/phpBB/includes/db/migration/v309.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v309 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v309rc4');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v309rc1.php b/phpBB/includes/db/migration/v309rc1.php
new file mode 100644
index 0000000000..ca56a4e7d9
--- /dev/null
+++ b/phpBB/includes/db/migration/v309rc1.php
@@ -0,0 +1,100 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v309rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v308');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_tables' => array(
+				$this->table_prefix . 'login_attempts' => array(
+					'COLUMNS' => array(
+						// this column was removed from the database updater
+						// after 3.0.9-RC3 was released. It might still exist
+						// in 3.0.9-RCX installations and has to be dropped in
+						// 3.0.12 after the db_tools class is capable of properly
+						// removing a primary key.
+						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
+						'attempt_ip'			=> array('VCHAR:40', ''),
+						'attempt_browser'		=> array('VCHAR:150', ''),
+						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
+						'attempt_time'			=> array('TIMESTAMP', 0),
+						'user_id'				=> array('UINT', 0),
+						'username'				=> array('VCHAR_UNI:255', 0),
+						'username_clean'		=> array('VCHAR_CI', 0),
+					),
+					//'PRIMARY_KEY' => 'attempt_id',
+					'KEYS' => array(
+						'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
+						'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+						'att_time' => array('INDEX', array('attempt_time')),
+						'user_id' => array('INDEX', 'user_id'),
+					),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'bbcode' => array(
+					'bbcode_id' => array('USINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		set_config('ip_login_limit_max', '50');
+		set_config('ip_login_limit_time', '21600');
+		set_config('ip_login_limit_use_forwarded', '0');
+
+		// Update file extension group names to use language strings, again.
+		$sql = 'SELECT group_id, group_name
+			FROM ' . EXTENSION_GROUPS_TABLE . '
+			WHERE group_name ' . $db->sql_like_expression('EXT_GROUP_' . $db->any_char);
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
+			);
+
+			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+				SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+				WHERE group_id = ' . $row['group_id'];
+			_sql($sql, $errored, $error_ary);
+		}
+		$db->sql_freeresult($result);
+
+		global $db_tools, $table_prefix;
+
+		// Recover from potentially broken Q&A CAPTCHA table on firebird
+		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
+		// without data loss
+		if ($db_tools->sql_layer == 'firebird')
+		{
+			$tables = array(
+				$table_prefix . 'captcha_questions',
+				$table_prefix . 'captcha_answers',
+				$table_prefix . 'qa_confirm',
+			);
+			foreach ($tables as $table)
+			{
+				if ($db_tools->sql_table_exists($table))
+				{
+					$db_tools->sql_table_drop($table);
+				}
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/v309rc2.php b/phpBB/includes/db/migration/v309rc2.php
new file mode 100644
index 0000000000..d552b95e7a
--- /dev/null
+++ b/phpBB/includes/db/migration/v309rc2.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v309rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v309rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v309rc3.php b/phpBB/includes/db/migration/v309rc3.php
new file mode 100644
index 0000000000..4c215c09f7
--- /dev/null
+++ b/phpBB/includes/db/migration/v309rc3.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v309rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v309rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v309rc4.php b/phpBB/includes/db/migration/v309rc4.php
new file mode 100644
index 0000000000..92f3d81947
--- /dev/null
+++ b/phpBB/includes/db/migration/v309rc4.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v309rc4 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v309rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
-- 
cgit v1.2.1


From b999a75528156b2cf229cc2ceac04b5a8bac859d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 9 Nov 2012 10:54:33 -0600
Subject: [feature/migrations] Some migrations data

PHPBB3-9737
---
 phpBB/includes/db/migration/v3010rc1.php |  7 ++--
 phpBB/includes/db/migration/v3011rc1.php | 57 ++++++++++++++++++++------------
 phpBB/includes/db/migration/v309rc1.php  | 42 +++++++++++++----------
 3 files changed, 63 insertions(+), 43 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/v3010rc1.php b/phpBB/includes/db/migration/v3010rc1.php
index 9a43b4c81d..847fe7c250 100644
--- a/phpBB/includes/db/migration/v3010rc1.php
+++ b/phpBB/includes/db/migration/v3010rc1.php
@@ -21,9 +21,8 @@ class phpbb_db_migration_v3010rc1 extends phpbb_db_migration
 
 	function update_data()
 	{
-		if (!isset($config['email_max_chunk_size']))
-		{
-			set_config('email_max_chunk_size', '50');
-		}
+		return array(
+			array('config.add', array('email_max_chunk_size', 50)),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/v3011rc1.php b/phpBB/includes/db/migration/v3011rc1.php
index 04f86b47ae..aad80ba59f 100644
--- a/phpBB/includes/db/migration/v3011rc1.php
+++ b/phpBB/includes/db/migration/v3011rc1.php
@@ -20,28 +20,39 @@ class phpbb_db_migration_v3011rc1 extends phpbb_db_migration
 	}
 
 	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
+			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
+		);
+	}
+
+	function cleanup_deactivated_styles()
 	{
 		// Updates users having current style a deactivated one
 		$sql = 'SELECT style_id
 			FROM ' . STYLES_TABLE . '
 			WHERE style_active = 0';
-		$result = $db->sql_query($sql);
+		$result = $this->sql_query($sql);
 
 		$deactivated_style_ids = array();
-		while ($style_id = $db->sql_fetchfield('style_id', false, $result))
+		while ($style_id = $this->db->sql_fetchfield('style_id', false, $result))
 		{
 			$deactivated_style_ids[] = (int) $style_id;
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (!empty($deactivated_style_ids))
 		{
 			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_style = ' . (int) $config['default_style'] .'
-				WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
-			_sql($sql, $errored, $error_ary);
+				SET user_style = ' . (int) $this->config['default_style'] .'
+				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
+			$this->sql_query($sql, $errored, $error_ary);
 		}
+	}
 
+	function delete_orphan_private_messages()
+	{
 		// Delete orphan private messages
 		$batch_size = 500;
 
@@ -58,26 +69,28 @@ class phpbb_db_migration_v3011rc1 extends phpbb_db_migration
 			),
 			'WHERE'		=> 't.user_id IS NULL',
 		);
-		$sql = $db->sql_build_query('SELECT', $sql_array);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
 
-		do
+		$result = $this->db->sql_query_limit($sql, $batch_size);
+
+		$delete_pms = array();
+		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$result = $db->sql_query_limit($sql, $batch_size);
+			$delete_pms[] = (int) $row['msg_id'];
+		}
+		$db->sql_freeresult($result);
 
-			$delete_pms = array();
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$delete_pms[] = (int) $row['msg_id'];
-			}
-			$db->sql_freeresult($result);
+		if (!empty($delete_pms))
+		{
+			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
+			$this->sql_query($sql, $errored, $error_ary);
 
-			if (!empty($delete_pms))
-			{
-				$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-					WHERE ' . $db->sql_in_set('msg_id', $delete_pms);
-				_sql($sql, $errored, $error_ary);
-			}
+			return true;
+		}
+		else
+		{
+			return false;
 		}
-		while (sizeof($delete_pms) == $batch_size);
 	}
 }
diff --git a/phpBB/includes/db/migration/v309rc1.php b/phpBB/includes/db/migration/v309rc1.php
index ca56a4e7d9..ce51e54642 100644
--- a/phpBB/includes/db/migration/v309rc1.php
+++ b/phpBB/includes/db/migration/v309rc1.php
@@ -53,46 +53,54 @@ class phpbb_db_migration_v309rc1 extends phpbb_db_migration
 
 	function update_data()
 	{
-		set_config('ip_login_limit_max', '50');
-		set_config('ip_login_limit_time', '21600');
-		set_config('ip_login_limit_use_forwarded', '0');
+		return array(
+			array('config.add', array('ip_login_limit_max', 50)),
+			array('config.add', array('ip_login_limit_time', 21600)),
+			array('config.add', array('ip_login_limit_use_forwarded', 0)),
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
+		);
+	}
 
+	function update_file_extension_group_names()
+	{
 		// Update file extension group names to use language strings, again.
 		$sql = 'SELECT group_id, group_name
 			FROM ' . EXTENSION_GROUPS_TABLE . '
-			WHERE group_name ' . $db->sql_like_expression('EXT_GROUP_' . $db->any_char);
-		$result = $db->sql_query($sql);
+			WHERE group_name ' . $this->db->sql_like_expression('EXT_GROUP_' . $this->db->any_char);
+		$result = $this->db->sql_query($sql);
 
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$sql_ary = array(
 				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
 			);
 
 			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-				SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
 				WHERE group_id = ' . $row['group_id'];
-			_sql($sql, $errored, $error_ary);
+			$this->sql_query($sql, $errored, $error_ary);
 		}
-		$db->sql_freeresult($result);
-
-		global $db_tools, $table_prefix;
+		$this->db->sql_freeresult($result);
+	}
 
+	function fix_firebird_qa_captcha()
+	{
 		// Recover from potentially broken Q&A CAPTCHA table on firebird
 		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
 		// without data loss
-		if ($db_tools->sql_layer == 'firebird')
+		if ($this->db_tools->sql_layer == 'firebird')
 		{
 			$tables = array(
-				$table_prefix . 'captcha_questions',
-				$table_prefix . 'captcha_answers',
-				$table_prefix . 'qa_confirm',
+				$this->table_prefix . 'captcha_questions',
+				$this->table_prefix . 'captcha_answers',
+				$this->table_prefix . 'qa_confirm',
 			);
 			foreach ($tables as $table)
 			{
-				if ($db_tools->sql_table_exists($table))
+				if ($this->db_tools->sql_table_exists($table))
 				{
-					$db_tools->sql_table_drop($table);
+					$this->db_tools->sql_table_drop($table);
 				}
 			}
 		}
-- 
cgit v1.2.1


From e7389e4c32f031fc6025880adf22b40d7d195f27 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 10 Nov 2012 04:00:38 -0600
Subject: [feature/migrations] 3.0.8-rc1 migration, fix some calls

PHPBB3-9737
---
 phpBB/includes/db/migration/v3011rc1.php |   4 +-
 phpBB/includes/db/migration/v308rc1.php  | 169 ++++++++++++++++---------------
 phpBB/includes/db/migration/v309rc1.php  |   2 +-
 3 files changed, 89 insertions(+), 86 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/v3011rc1.php b/phpBB/includes/db/migration/v3011rc1.php
index aad80ba59f..3bae7a4a2d 100644
--- a/phpBB/includes/db/migration/v3011rc1.php
+++ b/phpBB/includes/db/migration/v3011rc1.php
@@ -47,7 +47,7 @@ class phpbb_db_migration_v3011rc1 extends phpbb_db_migration
 			$sql = 'UPDATE ' . USERS_TABLE . '
 				SET user_style = ' . (int) $this->config['default_style'] .'
 				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
-			$this->sql_query($sql, $errored, $error_ary);
+			$this->sql_query($sql);
 		}
 	}
 
@@ -84,7 +84,7 @@ class phpbb_db_migration_v3011rc1 extends phpbb_db_migration
 		{
 			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
 				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
-			$this->sql_query($sql, $errored, $error_ary);
+			$this->sql_query($sql);
 
 			return true;
 		}
diff --git a/phpBB/includes/db/migration/v308rc1.php b/phpBB/includes/db/migration/v308rc1.php
index 13d0e98b1c..cbfedb1b53 100644
--- a/phpBB/includes/db/migration/v308rc1.php
+++ b/phpBB/includes/db/migration/v308rc1.php
@@ -20,14 +20,37 @@ class phpbb_db_migration_v308rc1 extends phpbb_db_migration
 	}
 
 	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'update_module_auth'))),
+			array('custom', array(array(&$this, 'update_bots'))),
+			array('custom', array(array(&$this, 'delete_orphan_shadow_topics'))),
+			array('module.add', array(
+				'post'	=> array(
+					'base'		=> 'board',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_POST_SETTINGS',
+					'auth'		=> 'acl_a_board',
+					'cat'		=> 'ACP_MESSAGES',
+					'after'		=> array('message', 'ACP_MESSAGE_SETTINGS')
+				),
+			)),
+			array('config.add', array('load_unreads_search', 1)),
+			array('config.update_if', array(600, 'queue_interval', 60)),
+			array('config.update_if', array(50, 'email_package_size', 20)),
+		);
+	}
+
+	function update_file_extension_group_names()
 	{
 		// Update file extension group names to use language strings.
 		$sql = 'SELECT lang_dir
 			FROM ' . LANG_TABLE;
-		$result = $db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
 		$extension_groups_updated = array();
-		while ($lang_dir = $db->sql_fetchfield('lang_dir'))
+		while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
 		{
 			$lang_dir = basename($lang_dir);
 
@@ -37,9 +60,9 @@ class phpbb_db_migration_v308rc1 extends phpbb_db_migration
 			// On an already updated board, they can also already be in language/.../acp/attachments.php
 			// in the board root.
 			$lang_files = array(
-				"{$phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.$phpEx",
-				"{$phpbb_root_path}language/$lang_dir/install.$phpEx",
-				"{$phpbb_root_path}language/$lang_dir/acp/attachments.$phpEx",
+				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.$this->phpEx",
+				"{$this->phpbb_root_path}language/$lang_dir/install.$this->phpEx",
+				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.$this->phpEx",
 			);
 
 			foreach ($lang_files as $lang_file)
@@ -64,48 +87,38 @@ class phpbb_db_migration_v308rc1 extends phpbb_db_migration
 					);
 
 					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-						SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
-						WHERE group_name = '" . $db->sql_escape($lang_val) . "'";
-					_sql($sql, $errored, $error_ary);
+						SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+						WHERE group_name = '" . $this->db->sql_escape($lang_val) . "'";
+					$this->sql_query($sql);
 
 					$extension_groups_updated[$lang_key] = true;
 				}
 			}
 		}
-		$db->sql_freeresult($result);
-
-		// Install modules
-		$modules_to_install = array(
-			'post'					=> array(
-				'base'		=> 'board',
-				'class'		=> 'acp',
-				'title'		=> 'ACP_POST_SETTINGS',
-				'auth'		=> 'acl_a_board',
-				'cat'		=> 'ACP_MESSAGES',
-				'after'		=> array('message', 'ACP_MESSAGE_SETTINGS')
-			),
-		);
-
-		_add_modules($modules_to_install);
+		$this->db->sql_freeresult($result);
+	}
 
-		// update
+	function update_module_auth()
+	{
 		$sql = 'UPDATE ' . MODULES_TABLE . '
 			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
 			WHERE module_class = \'ucp\'
 				AND module_basename = \'profile\'
 				AND module_mode = \'avatar\'';
-		_sql($sql, $errored, $error_ary);
+		$this->sql_query($sql);
+	}
 
-		// add Bing Bot
+	function update_bots()
+	{
 		$bot_name = 'Bing [Bot]';
 		$bot_name_clean = utf8_clean_string($bot_name);
 
 		$sql = 'SELECT user_id
 			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . $db->sql_escape($bot_name_clean) . "'";
-		$result = $db->sql_query($sql);
-		$bing_already_added = (bool) $db->sql_fetchfield('user_id');
-		$db->sql_freeresult($result);
+			WHERE username_clean = '" . $this->db->sql_escape($bot_name_clean) . "'";
+		$result = $this->db->sql_query($sql);
+		$bing_already_added = (bool) $this->db->sql_fetchfield('user_id');
+		$this->db->sql_freeresult($result);
 
 		if (!$bing_already_added)
 		{
@@ -114,9 +127,9 @@ class phpbb_db_migration_v308rc1 extends phpbb_db_migration
 			$sql = 'SELECT group_id, group_colour
 				FROM ' . GROUPS_TABLE . "
 				WHERE group_name = 'BOTS'";
-			$result = $db->sql_query($sql);
-			$group_row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
+			$result = $this->db->sql_query($sql);
+			$group_row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
 
 			if (!$group_row)
 			{
@@ -127,7 +140,7 @@ class phpbb_db_migration_v308rc1 extends phpbb_db_migration
 
 			if (!function_exists('user_add'))
 			{
-				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+				include($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
 			}
 
 			$user_row = array(
@@ -138,16 +151,16 @@ class phpbb_db_migration_v308rc1 extends phpbb_db_migration
 				'user_password'			=> '',
 				'user_colour'			=> $group_row['group_colour'],
 				'user_email'			=> '',
-				'user_lang'				=> $config['default_lang'],
-				'user_style'			=> $config['default_style'],
+				'user_lang'				=> $this->config['default_lang'],
+				'user_style'			=> $this->config['default_style'],
 				'user_timezone'			=> 0,
-				'user_dateformat'		=> $config['default_dateformat'],
+				'user_dateformat'		=> $this->config['default_dateformat'],
 				'user_allow_massemail'	=> 0,
 			);
 
 			$user_id = user_add($user_row);
 
-			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
+			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
 				'bot_active'	=> 1,
 				'bot_name'		=> (string) $bot_name,
 				'user_id'		=> (int) $user_id,
@@ -155,68 +168,58 @@ class phpbb_db_migration_v308rc1 extends phpbb_db_migration
 				'bot_ip'		=> (string) $bot_ip,
 			));
 
-			_sql($sql, $errored, $error_ary);
+			$this->sql_query($sql);
 		}
-		// end Bing Bot addition
+	}
 
+	function delete_orphan_shadow_topics()
+	{
 		// Delete shadow topics pointing to not existing topics
 		$batch_size = 500;
 
 		// Set of affected forums we have to resync
 		$sync_forum_ids = array();
 
-		do
-		{
-			$sql_array = array(
-				'SELECT'	=> 't1.topic_id, t1.forum_id',
-				'FROM'		=> array(
-					TOPICS_TABLE	=> 't1',
-				),
-				'LEFT_JOIN'	=> array(
-					array(
-						'FROM'	=> array(TOPICS_TABLE	=> 't2'),
-						'ON'	=> 't1.topic_moved_id = t2.topic_id',
-					),
+		$sql_array = array(
+			'SELECT'	=> 't1.topic_id, t1.forum_id',
+			'FROM'		=> array(
+				TOPICS_TABLE	=> 't1',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(TOPICS_TABLE	=> 't2'),
+					'ON'	=> 't1.topic_moved_id = t2.topic_id',
 				),
-				'WHERE'		=> 't1.topic_moved_id <> 0
-							AND t2.topic_id IS NULL',
-			);
-			$sql = $db->sql_build_query('SELECT', $sql_array);
-			$result = $db->sql_query_limit($sql, $batch_size);
-
-			$topic_ids = array();
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$topic_ids[] = (int) $row['topic_id'];
+			),
+			'WHERE'		=> 't1.topic_moved_id <> 0
+						AND t2.topic_id IS NULL',
+		);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query_limit($sql, $batch_size);
 
-				$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
-			}
-			$db->sql_freeresult($result);
+		$topic_ids = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$topic_ids[] = (int) $row['topic_id'];
 
-			if (!empty($topic_ids))
-			{
-				$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-					WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
-				$db->sql_query($sql);
-			}
+			$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
 		}
-		while (sizeof($topic_ids) == $batch_size);
+		$this->db->sql_freeresult($result);
 
-		// Sync the forums we have deleted shadow topics from.
-		sync('forum', 'forum_id', $sync_forum_ids, true, true);
+		if (!empty($topic_ids))
+		{
+			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
+			$this->db->sql_query($sql);
 
-		// Unread posts search load switch
-		set_config('load_unreads_search', '1');
+			// Sync the forums we have deleted shadow topics from.
+			sync('forum', 'forum_id', $sync_forum_ids, true, true);
 
-		// Reduce queue interval to 60 seconds, email package size to 20
-		if ($config['queue_interval'] == 600)
-		{
-			set_config('queue_interval', '60');
+			return true;
 		}
-
-		if ($config['email_package_size'] == 50)
+		else
 		{
-			set_config('email_package_size', '20');
+			return false;
 		}
 	}
 }
diff --git a/phpBB/includes/db/migration/v309rc1.php b/phpBB/includes/db/migration/v309rc1.php
index ce51e54642..e8db93c78d 100644
--- a/phpBB/includes/db/migration/v309rc1.php
+++ b/phpBB/includes/db/migration/v309rc1.php
@@ -79,7 +79,7 @@ class phpbb_db_migration_v309rc1 extends phpbb_db_migration
 			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
 				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
 				WHERE group_id = ' . $row['group_id'];
-			$this->sql_query($sql, $errored, $error_ary);
+			$this->sql_query($sql);
 		}
 		$this->db->sql_freeresult($result);
 	}
-- 
cgit v1.2.1


From 2a7985c26fcf558c30fa316262344307ffc99e9e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 10 Nov 2012 05:59:01 -0600
Subject: [feature/migrations] Migrations back through 3.0.6

PHPBB3-9737
---
 phpBB/includes/db/migration/v306rc1.php | 344 ++++++++++++++------------------
 phpBB/includes/db/migration/v306rc3.php |   9 +-
 phpBB/includes/db/migration/v307rc1.php |  23 ++-
 phpBB/includes/db/migration/v307rc2.php |  29 ++-
 phpBB/includes/db/migration/v308rc1.php |   4 +-
 5 files changed, 201 insertions(+), 208 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/v306rc1.php b/phpBB/includes/db/migration/v306rc1.php
index 63d1c66c2d..45b597d56b 100644
--- a/phpBB/includes/db/migration/v306rc1.php
+++ b/phpBB/includes/db/migration/v306rc1.php
@@ -61,109 +61,141 @@ class phpbb_db_migration_v306rc1 extends phpbb_db_migration
 
 	function update_data()
 	{
-		// Let's see if the GD Captcha can be enabled... we simply look for what *is* enabled...
-		if (!empty($config['captcha_gd']) && !isset($config['captcha_plugin']))
-		{
-			set_config('captcha_plugin', 'phpbb_captcha_gd');
-		}
-		else if (!isset($config['captcha_plugin']))
-		{
-			set_config('captcha_plugin', 'phpbb_captcha_nogd');
-		}
-
-		// Entries for the Feed Feature
-		set_config('feed_enable', '0');
-		set_config('feed_limit', '10');
-
-		set_config('feed_overall_forums', '1');
-		set_config('feed_overall_forums_limit', '15');
-
-		set_config('feed_overall_topics', '0');
-		set_config('feed_overall_topics_limit', '15');
-
-		set_config('feed_forum', '1');
-		set_config('feed_topic', '1');
-		set_config('feed_item_statistics', '1');
-
-		// Entries for smiley pagination
-		set_config('smilies_per_page', '50');
-
-		// Entry for reporting PMs
-		set_config('allow_pm_report', '1');
-
-		// Install modules
-		$modules_to_install = array(
-			'feed'					=> array(
-				'base'		=> 'board',
-				'class'		=> 'acp',
-				'title'		=> 'ACP_FEED_SETTINGS',
-				'auth'		=> 'acl_a_board',
-				'cat'		=> 'ACP_BOARD_CONFIGURATION',
-				'after'		=> array('signature', 'ACP_SIGNATURE_SETTINGS')
-			),
-			'warnings'				=> array(
-				'base'		=> 'users',
-				'class'		=> 'acp',
-				'title'		=> 'ACP_USER_WARNINGS',
-				'auth'		=> 'acl_a_user',
-				'display'	=> 0,
-				'cat'		=> 'ACP_CAT_USERS',
-				'after'		=> array('feedback', 'ACP_USER_FEEDBACK')
-			),
-			'send_statistics'		=> array(
-				'base'		=> 'send_statistics',
-				'class'		=> 'acp',
-				'title'		=> 'ACP_SEND_STATISTICS',
-				'auth'		=> 'acl_a_server',
-				'cat'		=> 'ACP_SERVER_CONFIGURATION'
-			),
-			'setting_forum_copy'	=> array(
-				'base'		=> 'permissions',
-				'class'		=> 'acp',
-				'title'		=> 'ACP_FORUM_PERMISSIONS_COPY',
-				'auth'		=> 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth',
-				'cat'		=> 'ACP_FORUM_BASED_PERMISSIONS',
-				'after'		=> array('setting_forum_local', 'ACP_FORUM_PERMISSIONS')
-			),
-			'pm_reports'			=> array(
-				'base'		=> 'pm_reports',
-				'class'		=> 'mcp',
-				'title'		=> 'MCP_PM_REPORTS_OPEN',
-				'auth'		=> 'aclf_m_report',
-				'cat'		=> 'MCP_REPORTS'
-			),
-			'pm_reports_closed'		=> array(
-				'base'		=> 'pm_reports',
-				'class'		=> 'mcp',
-				'title'		=> 'MCP_PM_REPORTS_CLOSED',
-				'auth'		=> 'aclf_m_report',
-				'cat'		=> 'MCP_REPORTS'
-			),
-			'pm_report_details'		=> array(
-				'base'		=> 'pm_reports',
-				'class'		=> 'mcp',
-				'title'		=> 'MCP_PM_REPORT_DETAILS',
-				'auth'		=> 'aclf_m_report',
-				'cat'		=> 'MCP_REPORTS'
-			),
+		return array(
+			//array('custom', array(array(&$this, '')))
+			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
+			array('config.update_if', array(
+				($this->config['captcha_gd']),
+				'captcha_plugin',
+				'phpbb_captcha_gd',
+			)),
+
+			array('config.add', array('feed_enable', 0)),
+			array('config.add', array('feed_limit', 10)),
+			array('config.add', array('feed_overall_forums', 1)),
+			array('config.add', array('feed_overall_forums_limit', 15)),
+			array('config.add', array('feed_overall_topics', 0)),
+			array('config.add', array('feed_overall_topics_limit', 15)),
+			array('config.add', array('feed_forum', 1)),
+			array('config.add', array('feed_topic', 1)),
+			array('config.add', array('feed_item_statistics', 1)),
+
+			array('config.add', array('smilies_per_page', 50)),
+			array('config.add', array('allow_pm_report', 1)),
+			array('config.add', array('min_post_chars', 1)),
+			array('config.add', array('allow_quick_reply', 1)),
+			array('config.add', array('new_member_post_limit', 0)),
+			array('config.add', array('new_member_group_default', 0)),
+			array('config.add', array('delete_time', $this->config['edit_time'])),
+
+			array('config.add', array('allow_avatar', 0)),
+			array('config.add_if', array(
+				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
+				'allow_avatar',
+				1,
+			)),
+			array('config.add', array('allow_avatar_remote_upload', 0)),
+			array('config.add_if', array(
+				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
+				'allow_avatar_remote_upload',
+				1,
+			)),
+
+			array('module.add', array(
+				'feed' => array(
+					'base'		=> 'board',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_FEED_SETTINGS',
+					'auth'		=> 'acl_a_board',
+					'cat'		=> 'ACP_BOARD_CONFIGURATION',
+					'after'		=> array('signature', 'ACP_SIGNATURE_SETTINGS')
+				),
+			)),
+			array('module.add', array(
+				'warnings' => array(
+					'base'		=> 'users',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_USER_WARNINGS',
+					'auth'		=> 'acl_a_user',
+					'display'	=> 0,
+					'cat'		=> 'ACP_CAT_USERS',
+					'after'		=> array('feedback', 'ACP_USER_FEEDBACK')
+				),
+			)),
+			array('module.add', array(
+				'send_statistics' => array(
+					'base'		=> 'send_statistics',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_SEND_STATISTICS',
+					'auth'		=> 'acl_a_server',
+					'cat'		=> 'ACP_SERVER_CONFIGURATION'
+				),
+			)),
+			array('module.add', array(
+				'setting_forum_copy' => array(
+					'base'		=> 'permissions',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_FORUM_PERMISSIONS_COPY',
+					'auth'		=> 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth',
+					'cat'		=> 'ACP_FORUM_BASED_PERMISSIONS',
+					'after'		=> array('setting_forum_local', 'ACP_FORUM_PERMISSIONS')
+				),
+			)),
+			array('module.add', array(
+				'pm_reports' => array(
+					'base'		=> 'pm_reports',
+					'class'		=> 'mcp',
+					'title'		=> 'MCP_PM_REPORTS_OPEN',
+					'auth'		=> 'aclf_m_report',
+					'cat'		=> 'MCP_REPORTS'
+				),
+			)),
+			array('module.add', array(
+				'pm_reports_closed' => array(
+					'base'		=> 'pm_reports',
+					'class'		=> 'mcp',
+					'title'		=> 'MCP_PM_REPORTS_CLOSED',
+					'auth'		=> 'aclf_m_report',
+					'cat'		=> 'MCP_REPORTS'
+				),
+			)),
+			array('module.add', array(
+				'pm_report_details' => array(
+					'base'		=> 'pm_reports',
+					'class'		=> 'mcp',
+					'title'		=> 'MCP_PM_REPORT_DETAILS',
+					'auth'		=> 'aclf_m_report',
+					'cat'		=> 'MCP_REPORTS'
+				),
+			)),
+			array('custom', array(array(&$this, 'add_newly_registered_group'))),
+			array('custom', array(array(&$this, 'set_user_options_default'))),
 		);
+	}
 
-		_add_modules($modules_to_install);
+	function set_user_options_default()
+	{
+		// 229376 is the added value to enable all three signature options
+		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
+		$this->sql_query($sql);
+	}
 
+	function add_newly_registered_group()
+	{
 		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
 		$sql = 'SELECT group_id
 			FROM ' . GROUPS_TABLE . "
 			WHERE group_name = 'NEWLY_REGISTERED'";
-		$result = $db->sql_query($sql);
-		$group_id = (int) $db->sql_fetchfield('group_id');
-		$db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$group_id = (int) $this->db->sql_fetchfield('group_id');
+		$this->db->sql_freeresult($result);
 
 		if (!$group_id)
 		{
 			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
-			_sql($sql, $errored, $error_ary);
+			$this->sql_query($sql);
 
-			$group_id = $db->sql_nextid();
+			$group_id = $this->db->sql_nextid();
 		}
 
 		// Insert new user role... at the end of the chain
@@ -171,35 +203,35 @@ class phpbb_db_migration_v306rc1 extends phpbb_db_migration
 			FROM ' . ACL_ROLES_TABLE . "
 			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
 				AND role_type = 'u_'";
-		$result = $db->sql_query($sql);
-		$u_role = (int) $db->sql_fetchfield('role_id');
-		$db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$u_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
 
 		if (!$u_role)
 		{
 			$sql = 'SELECT MAX(role_order) as max_order_id
 				FROM ' . ACL_ROLES_TABLE . "
 				WHERE role_type = 'u_'";
-			$result = $db->sql_query($sql);
-			$next_order_id = (int) $db->sql_fetchfield('max_order_id');
-			$db->sql_freeresult($result);
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
 
 			$next_order_id++;
 
 			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
-			_sql($sql, $errored, $error_ary);
-			$u_role = $db->sql_nextid();
+			$this->sql_query($sql);
+			$u_role = $this->db->sql_nextid();
 
 			if (!$errored)
 			{
 				// Now add the correct data to the roles...
 				// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
 				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
-				_sql($sql, $errored, $error_ary);
+				$this->sql_query($sql);
 
 				// Add user role to group
 				$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
-				_sql($sql, $errored, $error_ary);
+				$this->sql_query($sql);
 			}
 		}
 
@@ -208,29 +240,29 @@ class phpbb_db_migration_v306rc1 extends phpbb_db_migration
 			FROM ' . ACL_ROLES_TABLE . "
 			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
 				AND role_type = 'f_'";
-		$result = $db->sql_query($sql);
-		$f_role = (int) $db->sql_fetchfield('role_id');
-		$db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$f_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
 
 		if (!$f_role)
 		{
 			$sql = 'SELECT MAX(role_order) as max_order_id
 				FROM ' . ACL_ROLES_TABLE . "
 				WHERE role_type = 'f_'";
-			$result = $db->sql_query($sql);
-			$next_order_id = (int) $db->sql_fetchfield('max_order_id');
-			$db->sql_freeresult($result);
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
 
 			$next_order_id++;
 
 			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
-			_sql($sql, $errored, $error_ary);
-			$f_role = $db->sql_nextid();
+			$this->sql_query($sql);
+			$f_role = $this->db->sql_nextid();
 
 			if (!$errored)
 			{
 				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
-				_sql($sql, $errored, $error_ary);
+				$this->sql_query($sql);
 			}
 		}
 
@@ -238,25 +270,14 @@ class phpbb_db_migration_v306rc1 extends phpbb_db_migration
 		$sql = 'SELECT 1
 			FROM ' . USERS_TABLE . '
 			WHERE user_new = 0';
-		$result = $db->sql_query_limit($sql, 1);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
+		$result = $this->db->sql_query_limit($sql, 1);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
 
 		if (!$row)
 		{
 			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
-			_sql($sql, $errored, $error_ary);
-		}
-
-		// Newly registered users limit
-		if (!isset($config['new_member_post_limit']))
-		{
-			set_config('new_member_post_limit', (!empty($config['enable_queue_trigger'])) ? $config['queue_trigger_posts'] : 0);
-		}
-
-		if (!isset($config['new_member_group_default']))
-		{
-			set_config('new_member_group_default', 0);
+			$this->sql_query($sql);
 		}
 
 		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
@@ -265,9 +286,9 @@ class phpbb_db_migration_v306rc1 extends phpbb_db_migration
 			FROM ' . ACL_GROUPS_TABLE . '
 			WHERE group_id = ' . $group_id . '
 				AND auth_role_id = ' . $f_role;
-		$result = $db->sql_query($sql);
-		$is_options = (int) $db->sql_fetchfield('forum_id');
-		$db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$is_options = (int) $this->db->sql_fetchfield('forum_id');
+		$this->db->sql_freeresult($result);
 
 		// Not assigned at all... :/
 		if (!$is_options)
@@ -276,75 +297,18 @@ class phpbb_db_migration_v306rc1 extends phpbb_db_migration
 			$sql = 'SELECT forum_id
 				FROM ' . FORUMS_TABLE . '
 				WHERE forum_type != ' . FORUM_LINK;
-			$result = $db->sql_query($sql);
+			$result = $this->db->sql_query($sql);
 
-			while ($row = $db->sql_fetchrow($result))
+			while ($row = $this->db->sql_fetchrow($result))
 			{
-				_sql('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)', $errored, $error_ary);
+				$this->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)');
 			}
-			$db->sql_freeresult($result);
+			$this->db->sql_freeresult($result);
 		}
 
 		// Clear permissions...
-		include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
+		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->phpEx);
 		$auth_admin = new auth_admin();
 		$auth_admin->acl_clear_prefetch();
-
-		if (!isset($config['allow_avatar']))
-		{
-			if ($config['allow_avatar_upload'] || $config['allow_avatar_local'] || $config['allow_avatar_remote'])
-			{
-				set_config('allow_avatar', '1');
-			}
-			else
-			{
-				set_config('allow_avatar', '0');
-			}
-		}
-
-		if (!isset($config['allow_avatar_remote_upload']))
-		{
-			if ($config['allow_avatar_remote'] && $config['allow_avatar_upload'])
-			{
-				set_config('allow_avatar_remote_upload', '1');
-			}
-			else
-			{
-				set_config('allow_avatar_remote_upload', '0');
-			}
-		}
-
-		// Minimum number of characters
-		if (!isset($config['min_post_chars']))
-		{
-			set_config('min_post_chars', '1');
-		}
-
-		if (!isset($config['allow_quick_reply']))
-		{
-			set_config('allow_quick_reply', '1');
-		}
-
-		// Set every members user_options column to enable
-		// bbcode, smilies and URLs for signatures by default
-		$sql = 'SELECT user_options
-			FROM ' . USERS_TABLE . '
-			WHERE user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')';
-		$result = $db->sql_query_limit($sql, 1);
-		$user_option = (int) $db->sql_fetchfield('user_options');
-		$db->sql_freeresult($result);
-
-		// Check if we already updated the database by checking bit 15 which we used to store the sig_bbcode option
-		if (!($user_option & 1 << 15))
-		{
-			// 229376 is the added value to enable all three signature options
-			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
-			_sql($sql, $errored, $error_ary);
-		}
-
-		if (!isset($config['delete_time']))
-		{
-			set_config('delete_time', $config['edit_time']);
-		}
 	}
 }
diff --git a/phpBB/includes/db/migration/v306rc3.php b/phpBB/includes/db/migration/v306rc3.php
index b3bd49eafa..e2c4e66ada 100644
--- a/phpBB/includes/db/migration/v306rc3.php
+++ b/phpBB/includes/db/migration/v306rc3.php
@@ -20,12 +20,19 @@ class phpbb_db_migration_v306rc3 extends phpbb_db_migration
 	}
 
 	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_cp_fields'))),
+		);
+	}
+
+	function update_cp_fields()
 	{
 		// Update the Custom Profile Fields based on previous settings to the new format
 		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
 			SET field_show_on_vt = 1
 			WHERE field_hide = 0
 				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
-		_sql($sql, $errored, $error_ary);
+		$this->sql_query($sql);
 	}
 }
diff --git a/phpBB/includes/db/migration/v307rc1.php b/phpBB/includes/db/migration/v307rc1.php
index f1c8b3384a..9b55cb2757 100644
--- a/phpBB/includes/db/migration/v307rc1.php
+++ b/phpBB/includes/db/migration/v307rc1.php
@@ -30,17 +30,22 @@ class phpbb_db_migration_v307rc1 extends phpbb_db_migration
 
 	function update_data()
 	{
-		// ATOM Feeds
-		set_config('feed_overall', '1');
-		set_config('feed_http_auth', '0');
-		set_config('feed_limit_post', (string) (isset($config['feed_limit']) ? (int) $config['feed_limit'] : 15));
-		set_config('feed_limit_topic', (string) (isset($config['feed_overall_topics_limit']) ? (int) $config['feed_overall_topics_limit'] : 10));
-		set_config('feed_topics_new', (!empty($config['feed_overall_topics']) ? '1' : '0'));
-		set_config('feed_topics_active', (!empty($config['feed_overall_topics']) ? '1' : '0'));
+		return array(
+			array('config.add', array('feed_overall', 1)),
+			array('config.add', array('feed_http_auth', 0)),
+			array('config.add', array('feed_limit_post', $this->config['feed_limit'])),
+			array('config.add', array('feed_limit_topic', $this->config['feed_overall_topics_limit'])),
+			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
+			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
+			array('custom', array(array(&$this, 'delete_text_templates'))),
+		);
+	}
 
+	function delete_text_templates()
+	{
 		// Delete all text-templates from the template_data
 		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
-			WHERE template_filename ' . $db->sql_like_expression($db->any_char . '.txt');
-		_sql($sql, $errored, $error_ary);
+			WHERE template_filename ' . $this->db->sql_like_expression($this->db->any_char . '.txt');
+		$this->sql_query($sql);
 	}
 }
diff --git a/phpBB/includes/db/migration/v307rc2.php b/phpBB/includes/db/migration/v307rc2.php
index f9492f3d1c..438ebfb8c2 100644
--- a/phpBB/includes/db/migration/v307rc2.php
+++ b/phpBB/includes/db/migration/v307rc2.php
@@ -21,15 +21,26 @@ class phpbb_db_migration_v307rc2 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('custom', array(array(&$this, 'update_email_hash'))),
+		);
+	}
+
+	function update_email_hash($start = 0)
+	{
+		$limit = 1000;
+
 		$sql = 'SELECT user_id, user_email, user_email_hash
 			FROM ' . USERS_TABLE . '
 			WHERE user_type <> ' . USER_IGNORE . "
 				AND user_email <> ''";
-		$result = $db->sql_query($sql);
+		$result = $this->db->sql_query_limit($sql, $limit, $start);
 
 		$i = 0;
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
+			$i++;
+
 			// Snapshot of the phpbb_email_hash() function
 			// We cannot call it directly because the auto updater updates the DB first. :/
 			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
@@ -41,13 +52,19 @@ class phpbb_db_migration_v307rc2 extends phpbb_db_migration
 				);
 
 				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
 					WHERE user_id = ' . (int) $row['user_id'];
-				_sql($sql, $errored, $error_ary, ($i % 100 == 0));
-
-				++$i;
+				$this->sql_query($sql);
 			}
 		}
 		$db->sql_freeresult($result);
+
+		if ($i < $limit)
+		{
+			// Completed
+			return false;
+		}
+
+		return $start + $limit;
 	}
 }
diff --git a/phpBB/includes/db/migration/v308rc1.php b/phpBB/includes/db/migration/v308rc1.php
index cbfedb1b53..f365695058 100644
--- a/phpBB/includes/db/migration/v308rc1.php
+++ b/phpBB/includes/db/migration/v308rc1.php
@@ -37,8 +37,8 @@ class phpbb_db_migration_v308rc1 extends phpbb_db_migration
 				),
 			)),
 			array('config.add', array('load_unreads_search', 1)),
-			array('config.update_if', array(600, 'queue_interval', 60)),
-			array('config.update_if', array(50, 'email_package_size', 20)),
+			array('config.update_if_equals', array(600, 'queue_interval', 60)),
+			array('config.update_if_equals', array(50, 'email_package_size', 20)),
 		);
 	}
 
-- 
cgit v1.2.1


From ae8edf7b0e74c54b5b02b66a8b2a436a4172c63e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 10 Nov 2012 06:26:38 -0600
Subject: [feature/migrations] Use $this->db

PHPBB3-9737
---
 phpBB/includes/db/migration.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
index aca9d264bb..de9f6d07e3 100644
--- a/phpBB/includes/db/migration.php
+++ b/phpBB/includes/db/migration.php
@@ -95,29 +95,29 @@ class phpbb_db_migration
 			echo "<br />\n{$sql}\n<br />";
 		}
 
-		$db->sql_return_on_error(true);
+		$this->db->sql_return_on_error(true);
 
 		if ($sql === 'begin')
 		{
-			$result = $db->sql_transaction('begin');
+			$result = $this->db->sql_transaction('begin');
 		}
 		else if ($sql === 'commit')
 		{
-			$result = $db->sql_transaction('commit');
+			$result = $this->db->sql_transaction('commit');
 		}
 		else
 		{
-			$result = $db->sql_query($sql);
-			if ($db->sql_error_triggered)
+			$result = $this->db->sql_query($sql);
+			if ($this->db->sql_error_triggered)
 			{
 				$this->errors[] = array(
-					'sql' => $db->sql_error_sql,
-					'code' => $db->sql_error_returned,
+					'sql'	=> $this->db->sql_error_sql,
+					'code'	=> $this->db->sql_error_returned,
 				);
 			}
 		}
 
-		$db->sql_return_on_error(false);
+		$this->db->sql_return_on_error(false);
 
 		return $result;
 	}
-- 
cgit v1.2.1


From 167faed1630d01e3d592a6696f58316c1d832ff9 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 10 Nov 2012 06:32:02 -0600
Subject: [feature/migrations] Depend on part2

PHPBB3-9737
---
 phpBB/includes/db/migration/v305.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/v305.php b/phpBB/includes/db/migration/v305.php
index b4d676d72a..71e28c6b7b 100644
--- a/phpBB/includes/db/migration/v305.php
+++ b/phpBB/includes/db/migration/v305.php
@@ -11,7 +11,7 @@ class phpbb_db_migration_v305 extends phpbb_db_migration
 {
 	function depends_on()
 	{
-		return array('phpbb_db_migration_v305rc1');
+		return array('phpbb_db_migration_v305rc1part2');
 	}
 
 	function update_schema()
-- 
cgit v1.2.1


From b52a0f50ab980ca941267ddb4f509f104b07db77 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 10 Nov 2012 13:32:44 +0100
Subject: [feature/migrations] Update 3.0.3-3.0.5 migrations to work

---
 phpBB/includes/db/migration/305rc1part2.php |  34 +++++++++
 phpBB/includes/db/migration/v303rc1.php     | 100 ++++----------------------
 phpBB/includes/db/migration/v304.php        |  15 ++--
 phpBB/includes/db/migration/v304rc1.php     |  13 +++-
 phpBB/includes/db/migration/v305rc1.php     | 105 +++++++++++-----------------
 5 files changed, 107 insertions(+), 160 deletions(-)
 create mode 100644 phpBB/includes/db/migration/305rc1part2.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/305rc1part2.php b/phpBB/includes/db/migration/305rc1part2.php
new file mode 100644
index 0000000000..238e533b06
--- /dev/null
+++ b/phpBB/includes/db/migration/305rc1part2.php
@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_v305rc1part2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_v305rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'drop_keys'			=> array(
+				ACL_OPTIONS_TABLE		=> array('auth_option'),
+			),
+			'add_unique_index'	=> array(
+				ACL_OPTIONS_TABLE		=> array(
+					'auth_option'		=> array('auth_option'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v303rc1.php b/phpBB/includes/db/migration/v303rc1.php
index b8ec5668fd..7518a6ed54 100644
--- a/phpBB/includes/db/migration/v303rc1.php
+++ b/phpBB/includes/db/migration/v303rc1.php
@@ -35,93 +35,20 @@ class phpbb_db_migration_v303rc1 extends phpbb_db_migration
 			array('config.add', array('enable_queue_trigger', '0')),
 			array('config.add', array('queue_trigger_posts', '3')),
 			array('config.add', array('pm_max_recipients', '0')),
-			array('custom', array('set_group_default_max_recipients'))
-
-			// Not prefilling yet
-			set_config('dbms_version', '');
-
-			// Add new permission u_masspm_group and duplicate settings from u_masspm
-			include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
-			$auth_admin = new auth_admin();
-
-			// Only add the new permission if it does not already exist
-			if (empty($auth_admin->acl_options['id']['u_masspm_group']))
-			{
-				$auth_admin->acl_add_option(array('global' => array('u_masspm_group')));
-
-				// Now the tricky part, filling the permission
-				$old_id = $auth_admin->acl_options['id']['u_masspm'];
-				$new_id = $auth_admin->acl_options['id']['u_masspm_group'];
-
-				$tables = array(ACL_GROUPS_TABLE, ACL_ROLES_DATA_TABLE, ACL_USERS_TABLE);
-
-				foreach ($tables as $table)
-				{
-					$sql = 'SELECT *
-						FROM ' . $table . '
-						WHERE auth_option_id = ' . $old_id;
-					$result = _sql($sql, $errored, $error_ary);
-
-					$sql_ary = array();
-					while ($row = $db->sql_fetchrow($result))
-					{
-						$row['auth_option_id'] = $new_id;
-						$sql_ary[] = $row;
-					}
-					$db->sql_freeresult($result);
-
-					if (sizeof($sql_ary))
-					{
-						$db->sql_multi_insert($table, $sql_ary);
-					}
-				}
-
-				// Remove any old permission entries
-				$auth_admin->acl_clear_prefetch();
-			}
-
-			/**
-			* Do not resync post counts here. An admin may do this later from the ACP
-			$start = 0;
-			$step = ($config['num_posts']) ? (max((int) ($config['num_posts'] / 5), 20000)) : 20000;
-
-			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_posts = 0';
-			_sql($sql, $errored, $error_ary);
-
-			do
-			{
-				$sql = 'SELECT COUNT(post_id) AS num_posts, poster_id
-					FROM ' . POSTS_TABLE . '
-					WHERE post_id BETWEEN ' . ($start + 1) . ' AND ' . ($start + $step) . '
-						AND post_postcount = 1 AND post_approved = 1
-					GROUP BY poster_id';
-				$result = _sql($sql, $errored, $error_ary);
-
-				if ($row = $db->sql_fetchrow($result))
-				{
-					do
-					{
-						$sql = 'UPDATE ' . USERS_TABLE . " SET user_posts = user_posts + {$row['num_posts']} WHERE user_id = {$row['poster_id']}";
-						_sql($sql, $errored, $error_ary);
-					}
-					while ($row = $db->sql_fetchrow($result));
-
-					$start += $step;
-				}
-				else
-				{
-					$start = 0;
-				}
-				$db->sql_freeresult($result);
-			}
-			while ($start);
-			*/
+			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
+			array('config.add', array('dbms_version', '')),
+			array('permission.add', array('u_masspm_group', phpbb_auth::IS_GLOBAL),
+			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
+		));
+	}
 
-			$sql = 'UPDATE ' . MODULES_TABLE . '
-				SET module_auth = \'acl_a_email && cfg_email_enable\'
-				WHERE module_class = \'acp\'
-					AND module_basename = \'email\'';
-			_sql($sql, $errored, $error_ary);
+	function correct_acp_email_permissions()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . 'modules
+			SET module_auth = \'acl_a_email && cfg_email_enable\'
+			WHERE module_class = \'acp\'
+				AND module_basename = \'email\'';
+		$this->sql_query($sql);
 	}
 
 	function set_group_default_max_recipients()
@@ -131,5 +58,4 @@ class phpbb_db_migration_v303rc1 extends phpbb_db_migration
 			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
 		$this->sql_query($sql);
 	}
-
 }
diff --git a/phpBB/includes/db/migration/v304.php b/phpBB/includes/db/migration/v304.php
index 2895caaa6d..5358bcc20f 100644
--- a/phpBB/includes/db/migration/v304.php
+++ b/phpBB/includes/db/migration/v304.php
@@ -20,21 +20,28 @@ class phpbb_db_migration_v304 extends phpbb_db_migration
 	}
 
 	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
+		);
+	}
+
+	function rename_log_delete_topic()
 	{
 		if ($db->sql_layer == 'oracle')
 		{
 			// log_operation is CLOB - but we can change this later
-			$sql = 'UPDATE ' . LOG_TABLE . "
+			$sql = 'UPDATE ' . $this->table_prefix . "log
 				SET log_operation = 'LOG_DELETE_TOPIC'
 				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
-			_sql($sql, $errored, $error_ary);
+			$this->sql_query($sql);
 		}
 		else
 		{
-			$sql = 'UPDATE ' . LOG_TABLE . "
+			$sql = 'UPDATE ' . $this->table_prefix . "log
 				SET log_operation = 'LOG_DELETE_TOPIC'
 				WHERE log_operation = 'LOG_TOPIC_DELETED'";
-			_sql($sql, $errored, $error_ary);
+			$this->sql_query($sql);
 		}
 	}
 }
diff --git a/phpBB/includes/db/migration/v304rc1.php b/phpBB/includes/db/migration/v304rc1.php
index a7098ce62f..2daad4e826 100644
--- a/phpBB/includes/db/migration/v304rc1.php
+++ b/phpBB/includes/db/migration/v304rc1.php
@@ -56,13 +56,20 @@ class phpbb_db_migration_v304rc1 extends phpbb_db_migration
 	}
 
 	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
+		);
+	}
+
+	function update_custom_profile_fields()
 	{
 		// Update the Custom Profile Fields based on previous settings to the new format
 		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
 				FROM ' . PROFILE_FIELDS_TABLE;
-		$result = _sql($sql, $errored, $error_ary);
+		$result = $this->sql_query($sql);
 
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$sql_ary = array(
 				'field_required'	=> 0,
@@ -90,7 +97,7 @@ class phpbb_db_migration_v304rc1 extends phpbb_db_migration
 				$sql_ary['field_show_profile'] = 1;
 			}
 
-			_sql('UPDATE ' . PROFILE_FIELDS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
+			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
 		}
 	}
 }
diff --git a/phpBB/includes/db/migration/v305rc1.php b/phpBB/includes/db/migration/v305rc1.php
index 8d9c4d2456..4f20796608 100644
--- a/phpBB/includes/db/migration/v305rc1.php
+++ b/phpBB/includes/db/migration/v305rc1.php
@@ -27,28 +27,29 @@ class phpbb_db_migration_v305rc1 extends phpbb_db_migration
 
 	function update_data()
 	{
-		// Captcha config variables
-		set_config('captcha_gd_wave', 0);
-		set_config('captcha_gd_3d_noise', 1);
-		set_config('captcha_gd_fonts', 1);
-		set_config('confirm_refresh', 1);
+		$search_indexing_state = $this->config['search_indexing_state'];
 
-		// Maximum number of keywords
-		set_config('max_num_search_keywords', 10);
-
-		// Remove static config var and put it back as dynamic variable
-		$sql = 'UPDATE ' . CONFIG_TABLE . "
-			SET is_dynamic = 1
-			WHERE config_name = 'search_indexing_state'";
-		_sql($sql, $errored, $error_ary);
+		return array(
+			array('config.add', array('captcha_gd_wave', 0)),
+			array('config.add', array('captcha_gd_3d_noise', 1)),
+			array('config.add', array('captcha_gd_refresh', 1)),
+			array('config.add', array('confirm_refresh', 1)),
+			array('config.add', array('max_num_search_keywords', 10)),
+			array('config.remove', array('search_indexing_state')),
+			array('config.add', array('search_indexing_state', $search_indexing_state, true)),
+			array('custom', array(array(&$this, 'hash_old_passwords'))),
+			array('custom', array(array(&$this, 'update_ichiro_bot'))),
+		);
+	}
 
-		// Hash old MD5 passwords
+	function hash_old_passwords()
+	{
 		$sql = 'SELECT user_id, user_password
-				FROM ' . USERS_TABLE . '
+				FROM ' . $this->table_prefix . 'users
 				WHERE user_pass_convert = 1';
-		$result = _sql($sql, $errored, $error_ary);
+		$result = $this->sql_query($sql);
 
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			if (strlen($row['user_password']) == 32)
 			{
@@ -56,33 +57,36 @@ class phpbb_db_migration_v305rc1 extends phpbb_db_migration
 					'user_password'	=> phpbb_hash($row['user_password']),
 				);
 
-				_sql('UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id'], $errored, $error_ary);
+				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
 			}
 		}
 		$db->sql_freeresult($result);
+	}
 
+	function update_ichiro_bot()
+	{
 		// Adjust bot entry
-		$sql = 'UPDATE ' . BOTS_TABLE . "
+		$sql = 'UPDATE ' . $this->table_prefix . "bots
 			SET bot_agent = 'ichiro/'
 			WHERE bot_agent = 'ichiro/2'";
-		_sql($sql, $errored, $error_ary);
-
+		$this->sql_query($sql);
+	}
 
+	function remove_duplicate_auth_options()
+	{
 		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
-
-		// We get duplicate entries first
 		$sql = 'SELECT auth_option
-			FROM ' . ACL_OPTIONS_TABLE . '
+			FROM ' . $this->table_prefix . 'acl_options
 			GROUP BY auth_option
 			HAVING COUNT(*) >= 2';
-		$result = $db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
 		$auth_options = array();
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$auth_options[] = $row['auth_option'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		// Remove specific auth options
 		if (!empty($auth_options))
@@ -95,52 +99,21 @@ class phpbb_db_migration_v305rc1 extends phpbb_db_migration
 					WHERE auth_option = '" . $db->sql_escape($option) . "'
 					ORDER BY auth_option_id DESC";
 				// sql_query_limit not possible here, due to bug in postgresql layer
-				$result = $db->sql_query($sql);
+				$result = $this->sql_query($sql);
 
 				// Skip first row, this is our original auth option we want to preserve
-				$row = $db->sql_fetchrow($result);
+				$row = $this->db->sql_fetchrow($result);
 
-				while ($row = $db->sql_fetchrow($result))
+				while ($row = $this->db->sql_fetchrow($result))
 				{
 					// Ok, remove this auth option...
-					_sql('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
-					_sql('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
-					_sql('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
-					_sql('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
+					$this->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
 				}
-				$db->sql_freeresult($result);
+				$this->db->sql_freeresult($result);
 			}
 		}
-
-		// Now make auth_option UNIQUE, by dropping the old index and adding a UNIQUE one.
-		$changes = array(
-			'drop_keys'			=> array(
-				ACL_OPTIONS_TABLE		=> array('auth_option'),
-			),
-		);
-
-		global $db_tools;
-
-		$statements = $db_tools->perform_schema_changes($changes);
-
-		foreach ($statements as $sql)
-		{
-			_sql($sql, $errored, $error_ary);
-		}
-
-		$changes = array(
-			'add_unique_index'	=> array(
-				ACL_OPTIONS_TABLE		=> array(
-					'auth_option'		=> array('auth_option'),
-				),
-			),
-		);
-
-		$statements = $db_tools->perform_schema_changes($changes);
-
-		foreach ($statements as $sql)
-		{
-			_sql($sql, $errored, $error_ary);
-		}
 	}
 }
-- 
cgit v1.2.1


From ce021710fbe4d594e4f66c3338da8bb2610a0c75 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 8 Jan 2013 22:07:01 -0600
Subject: [feature/migrations] Rename classes, depends on

PHPBB3-9737
---
 phpBB/includes/db/migration/305rc1part2.php    |   34 -
 phpBB/includes/db/migration/3_0_1.php          |   25 +
 phpBB/includes/db/migration/3_0_10.php         |   25 +
 phpBB/includes/db/migration/3_0_10_rc1.php     |   28 +
 phpBB/includes/db/migration/3_0_10_rc2.php     |   25 +
 phpBB/includes/db/migration/3_0_10_rc3.php     |   25 +
 phpBB/includes/db/migration/3_0_11.php         |   25 +
 phpBB/includes/db/migration/3_0_11_rc1.php     |   96 +
 phpBB/includes/db/migration/3_0_11_rc2         |   31 +
 phpBB/includes/db/migration/3_0_12_rc1.php     |   26 +
 phpBB/includes/db/migration/3_0_1_rc1.php      |   77 +
 phpBB/includes/db/migration/3_0_2.php          |   25 +
 phpBB/includes/db/migration/3_0_2_rc1.php      |   30 +
 phpBB/includes/db/migration/3_0_2_rc2.php      |   52 +
 phpBB/includes/db/migration/3_0_3.php          |   25 +
 phpBB/includes/db/migration/3_0_3_rc1.php      |   61 +
 phpBB/includes/db/migration/3_0_4.php          |   47 +
 phpBB/includes/db/migration/3_0_4_rc1.php      |  103 +
 phpBB/includes/db/migration/3_0_5.php          |   25 +
 phpBB/includes/db/migration/3_0_5_rc1.php      |  119 +
 phpBB/includes/db/migration/3_0_5_rc1part2.php |   34 +
 phpBB/includes/db/migration/3_0_6.php          |   25 +
 phpBB/includes/db/migration/3_0_6_rc1.php      |  314 +++
 phpBB/includes/db/migration/3_0_6_rc2.php      |   25 +
 phpBB/includes/db/migration/3_0_6_rc3.php      |   38 +
 phpBB/includes/db/migration/3_0_6_rc4.php      |   25 +
 phpBB/includes/db/migration/3_0_7.php          |   25 +
 phpBB/includes/db/migration/3_0_7_pl1.php      |   25 +
 phpBB/includes/db/migration/3_0_7_rc1.php      |   51 +
 phpBB/includes/db/migration/3_0_7_rc2.php      |   70 +
 phpBB/includes/db/migration/3_0_8.php          |   25 +
 phpBB/includes/db/migration/3_0_8_rc1.php      |  225 ++
 phpBB/includes/db/migration/3_0_9.php          |   25 +
 phpBB/includes/db/migration/3_0_9_rc1.php      |  108 +
 phpBB/includes/db/migration/3_0_9_rc2.php      |   25 +
 phpBB/includes/db/migration/3_0_9_rc3.php      |   25 +
 phpBB/includes/db/migration/3_0_9_rc4.php      |   25 +
 phpBB/includes/db/migration/v301.php           |   25 -
 phpBB/includes/db/migration/v3010.php          |   25 -
 phpBB/includes/db/migration/v3010rc1.php       |   28 -
 phpBB/includes/db/migration/v3010rc2.php       |   25 -
 phpBB/includes/db/migration/v3010rc3.php       |   25 -
 phpBB/includes/db/migration/v3011.php          |   25 -
 phpBB/includes/db/migration/v3011rc1.php       |   96 -
 phpBB/includes/db/migration/v3011rc2.php       |   31 -
 phpBB/includes/db/migration/v3012rc1.php       |   26 -
 phpBB/includes/db/migration/v301rc1.php        |   77 -
 phpBB/includes/db/migration/v302.php           |   25 -
 phpBB/includes/db/migration/v302rc1.php        |   30 -
 phpBB/includes/db/migration/v302rc2.php        |   52 -
 phpBB/includes/db/migration/v303.php           |   25 -
 phpBB/includes/db/migration/v303rc1.php        |   61 -
 phpBB/includes/db/migration/v304.php           |   47 -
 phpBB/includes/db/migration/v304rc1.php        |  103 -
 phpBB/includes/db/migration/v305.php           |   25 -
 phpBB/includes/db/migration/v305rc1.php        |  119 -
 phpBB/includes/db/migration/v306.php           |   25 -
 phpBB/includes/db/migration/v306rc1.php        |  314 ---
 phpBB/includes/db/migration/v306rc2.php        |   25 -
 phpBB/includes/db/migration/v306rc3.php        |   38 -
 phpBB/includes/db/migration/v306rc4.php        |   25 -
 phpBB/includes/db/migration/v307.php           |   25 -
 phpBB/includes/db/migration/v307pl1.php        |   25 -
 phpBB/includes/db/migration/v307rc1.php        |   51 -
 phpBB/includes/db/migration/v307rc2.php        |   70 -
 phpBB/includes/db/migration/v308.php           |   25 -
 phpBB/includes/db/migration/v308rc1.php        |  225 --
 phpBB/includes/db/migration/v309.php           |   25 -
 phpBB/includes/db/migration/v309rc1.php        |  108 -
 phpBB/includes/db/migration/v309rc2.php        |   25 -
 phpBB/includes/db/migration/v309rc3.php        |   25 -
 phpBB/includes/db/migration/v309rc4.php        |   25 -
 phpBB/includes/db/migrationtools/base.php      |   15 +
 phpBB/includes/db/migrationtools/config.php    |  121 +
 phpBB/includes/db/migrationtools/umil.php      | 3037 ++++++++++++++++++++++++
 75 files changed, 5133 insertions(+), 1960 deletions(-)
 delete mode 100644 phpBB/includes/db/migration/305rc1part2.php
 create mode 100644 phpBB/includes/db/migration/3_0_1.php
 create mode 100644 phpBB/includes/db/migration/3_0_10.php
 create mode 100644 phpBB/includes/db/migration/3_0_10_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_10_rc2.php
 create mode 100644 phpBB/includes/db/migration/3_0_10_rc3.php
 create mode 100644 phpBB/includes/db/migration/3_0_11.php
 create mode 100644 phpBB/includes/db/migration/3_0_11_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_11_rc2
 create mode 100644 phpBB/includes/db/migration/3_0_12_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_1_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_2.php
 create mode 100644 phpBB/includes/db/migration/3_0_2_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_2_rc2.php
 create mode 100644 phpBB/includes/db/migration/3_0_3.php
 create mode 100644 phpBB/includes/db/migration/3_0_3_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_4.php
 create mode 100644 phpBB/includes/db/migration/3_0_4_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_5.php
 create mode 100644 phpBB/includes/db/migration/3_0_5_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_5_rc1part2.php
 create mode 100644 phpBB/includes/db/migration/3_0_6.php
 create mode 100644 phpBB/includes/db/migration/3_0_6_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_6_rc2.php
 create mode 100644 phpBB/includes/db/migration/3_0_6_rc3.php
 create mode 100644 phpBB/includes/db/migration/3_0_6_rc4.php
 create mode 100644 phpBB/includes/db/migration/3_0_7.php
 create mode 100644 phpBB/includes/db/migration/3_0_7_pl1.php
 create mode 100644 phpBB/includes/db/migration/3_0_7_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_7_rc2.php
 create mode 100644 phpBB/includes/db/migration/3_0_8.php
 create mode 100644 phpBB/includes/db/migration/3_0_8_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_9.php
 create mode 100644 phpBB/includes/db/migration/3_0_9_rc1.php
 create mode 100644 phpBB/includes/db/migration/3_0_9_rc2.php
 create mode 100644 phpBB/includes/db/migration/3_0_9_rc3.php
 create mode 100644 phpBB/includes/db/migration/3_0_9_rc4.php
 delete mode 100644 phpBB/includes/db/migration/v301.php
 delete mode 100644 phpBB/includes/db/migration/v3010.php
 delete mode 100644 phpBB/includes/db/migration/v3010rc1.php
 delete mode 100644 phpBB/includes/db/migration/v3010rc2.php
 delete mode 100644 phpBB/includes/db/migration/v3010rc3.php
 delete mode 100644 phpBB/includes/db/migration/v3011.php
 delete mode 100644 phpBB/includes/db/migration/v3011rc1.php
 delete mode 100644 phpBB/includes/db/migration/v3011rc2.php
 delete mode 100644 phpBB/includes/db/migration/v3012rc1.php
 delete mode 100644 phpBB/includes/db/migration/v301rc1.php
 delete mode 100644 phpBB/includes/db/migration/v302.php
 delete mode 100644 phpBB/includes/db/migration/v302rc1.php
 delete mode 100644 phpBB/includes/db/migration/v302rc2.php
 delete mode 100644 phpBB/includes/db/migration/v303.php
 delete mode 100644 phpBB/includes/db/migration/v303rc1.php
 delete mode 100644 phpBB/includes/db/migration/v304.php
 delete mode 100644 phpBB/includes/db/migration/v304rc1.php
 delete mode 100644 phpBB/includes/db/migration/v305.php
 delete mode 100644 phpBB/includes/db/migration/v305rc1.php
 delete mode 100644 phpBB/includes/db/migration/v306.php
 delete mode 100644 phpBB/includes/db/migration/v306rc1.php
 delete mode 100644 phpBB/includes/db/migration/v306rc2.php
 delete mode 100644 phpBB/includes/db/migration/v306rc3.php
 delete mode 100644 phpBB/includes/db/migration/v306rc4.php
 delete mode 100644 phpBB/includes/db/migration/v307.php
 delete mode 100644 phpBB/includes/db/migration/v307pl1.php
 delete mode 100644 phpBB/includes/db/migration/v307rc1.php
 delete mode 100644 phpBB/includes/db/migration/v307rc2.php
 delete mode 100644 phpBB/includes/db/migration/v308.php
 delete mode 100644 phpBB/includes/db/migration/v308rc1.php
 delete mode 100644 phpBB/includes/db/migration/v309.php
 delete mode 100644 phpBB/includes/db/migration/v309rc1.php
 delete mode 100644 phpBB/includes/db/migration/v309rc2.php
 delete mode 100644 phpBB/includes/db/migration/v309rc3.php
 delete mode 100644 phpBB/includes/db/migration/v309rc4.php
 create mode 100644 phpBB/includes/db/migrationtools/base.php
 create mode 100644 phpBB/includes/db/migrationtools/config.php
 create mode 100644 phpBB/includes/db/migrationtools/umil.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/305rc1part2.php b/phpBB/includes/db/migration/305rc1part2.php
deleted file mode 100644
index 238e533b06..0000000000
--- a/phpBB/includes/db/migration/305rc1part2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v305rc1part2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v305rc1');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'drop_keys'			=> array(
-				ACL_OPTIONS_TABLE		=> array('auth_option'),
-			),
-			'add_unique_index'	=> array(
-				ACL_OPTIONS_TABLE		=> array(
-					'auth_option'		=> array('auth_option'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_1.php b/phpBB/includes/db/migration/3_0_1.php
new file mode 100644
index 0000000000..1cb069a2b1
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_1.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_1_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_10.php b/phpBB/includes/db/migration/3_0_10.php
new file mode 100644
index 0000000000..aae27a08c7
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_10.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_10 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_10_rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_10_rc1.php b/phpBB/includes/db/migration/3_0_10_rc1.php
new file mode 100644
index 0000000000..5d65ae15da
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_10_rc1.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_10_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_9');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('email_max_chunk_size', 50)),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_10_rc2.php b/phpBB/includes/db/migration/3_0_10_rc2.php
new file mode 100644
index 0000000000..d5dc4caec9
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_10_rc2.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_10_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_10_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_10_rc3.php b/phpBB/includes/db/migration/3_0_10_rc3.php
new file mode 100644
index 0000000000..dc962b73c8
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_10_rc3.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_10_rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_10_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_11.php b/phpBB/includes/db/migration/3_0_11.php
new file mode 100644
index 0000000000..89ffe310f4
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_11.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_11 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_11_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_11_rc1.php b/phpBB/includes/db/migration/3_0_11_rc1.php
new file mode 100644
index 0000000000..1b74aa9a4c
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_11_rc1.php
@@ -0,0 +1,96 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_11_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_10');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
+			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
+		);
+	}
+
+	function cleanup_deactivated_styles()
+	{
+		// Updates users having current style a deactivated one
+		$sql = 'SELECT style_id
+			FROM ' . STYLES_TABLE . '
+			WHERE style_active = 0';
+		$result = $this->sql_query($sql);
+
+		$deactivated_style_ids = array();
+		while ($style_id = $this->db->sql_fetchfield('style_id', false, $result))
+		{
+			$deactivated_style_ids[] = (int) $style_id;
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($deactivated_style_ids))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_style = ' . (int) $this->config['default_style'] .'
+				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
+			$this->sql_query($sql);
+		}
+	}
+
+	function delete_orphan_private_messages()
+	{
+		// Delete orphan private messages
+		$batch_size = 500;
+
+		$sql_array = array(
+			'SELECT'	=> 'p.msg_id',
+			'FROM'		=> array(
+				PRIVMSGS_TABLE	=> 'p',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
+					'ON'	=> 'p.msg_id = t.msg_id',
+				),
+			),
+			'WHERE'		=> 't.user_id IS NULL',
+		);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+
+		$result = $this->db->sql_query_limit($sql, $batch_size);
+
+		$delete_pms = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$delete_pms[] = (int) $row['msg_id'];
+		}
+		$db->sql_freeresult($result);
+
+		if (!empty($delete_pms))
+		{
+			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
+			$this->sql_query($sql);
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_11_rc2 b/phpBB/includes/db/migration/3_0_11_rc2
new file mode 100644
index 0000000000..f4e64871ed
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_11_rc2
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_11_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_11_rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_novalue' => array('BOOL', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_12_rc1.php b/phpBB/includes/db/migration/3_0_12_rc1.php
new file mode 100644
index 0000000000..58e112a43a
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_12_rc1.php
@@ -0,0 +1,26 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_12_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_11');
+	}
+
+	function update_schema()
+	{
+		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_1_rc1.php b/phpBB/includes/db/migration/3_0_1_rc1.php
new file mode 100644
index 0000000000..e3be8b36d4
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_1_rc1.php
@@ -0,0 +1,77 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_1_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array();
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'display_subforum_list' => array('BOOL', 1),
+				),
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('UINT', 0),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'groups' => array('group_legend'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('session_forum_id'),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_legend_name' => array('group_legend', 'group_name'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
+			array('custom', array(array(&$this, 'reset_smiley_size'))),
+		);
+	}
+
+	function fix_unset_last_view_time()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . "topics
+			SET topic_last_view_time = topic_last_post_time
+			WHERE topic_last_view_time = 0";
+		$this->sql_query($sql);
+	}
+
+	function reset_smiley_size()
+	{
+		// Update smiley sizes
+		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
+
+		foreach ($smileys as $smiley)
+		{
+			if (file_exists($this->phpbb_root_path . 'images/smilies/' . $smiley))
+			{
+				list($width, $height) = getimagesize($this->phpbb_root_path . 'images/smilies/' . $smiley);
+
+				$sql = 'UPDATE ' . SMILIES_TABLE . '
+					SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
+					WHERE smiley_url = '" . $this->db->sql_escape($smiley) . "'";
+
+				$this->sql_query($sql);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_2.php b/phpBB/includes/db/migration/3_0_2.php
new file mode 100644
index 0000000000..36e8d52e6b
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_2.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_2_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_2_rc1.php b/phpBB/includes/db/migration/3_0_2_rc1.php
new file mode 100644
index 0000000000..cd21b7f64f
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_2_rc1.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_1_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('referer_validation', '1')),
+			array('config.add', array('check_attachment_content', '1')),
+			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_2_rc2.php b/phpBB/includes/db/migration/3_0_2_rc2.php
new file mode 100644
index 0000000000..a1fab753e2
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_2_rc2.php
@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_2_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_2_rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'drafts' => array(
+					'draft_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_last_post_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_subject' => array('STEXT_UNI', '', 'true_sort'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'topics' => array(
+					'topic_title' => array('STEXT_UNI', '', 'true_sort'),
+					'topic_last_post_subject' => array('STEXT_UNI', ''),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array('session_forum_id'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_fid' => array('session_forum_id'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_3.php b/phpBB/includes/db/migration/3_0_3.php
new file mode 100644
index 0000000000..c9ca33ee88
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_3.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_2_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_3_rc1.php b/phpBB/includes/db/migration/3_0_3_rc1.php
new file mode 100644
index 0000000000..0cd99457ee
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_3_rc1.php
@@ -0,0 +1,61 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_3_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_2');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'styles_template' => array(
+					'template_inherits_id' => array('UINT:4', 0),
+					'template_inherit_path' => array('VCHAR', ''),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_max_recipients' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('enable_queue_trigger', '0')),
+			array('config.add', array('queue_trigger_posts', '3')),
+			array('config.add', array('pm_max_recipients', '0')),
+			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
+			array('config.add', array('dbms_version', '')),
+			array('permission.add', array('u_masspm_group', phpbb_auth::IS_GLOBAL),
+			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
+		));
+	}
+
+	function correct_acp_email_permissions()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . 'modules
+			SET module_auth = \'acl_a_email && cfg_email_enable\'
+			WHERE module_class = \'acp\'
+				AND module_basename = \'email\'';
+		$this->sql_query($sql);
+	}
+
+	function set_group_default_max_recipients()
+	{
+		// Set maximum number of recipients for the registered users, bots, guests group
+		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
+			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_4.php b/phpBB/includes/db/migration/3_0_4.php
new file mode 100644
index 0000000000..bbaaea54c9
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_4.php
@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_4 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_4_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
+		);
+	}
+
+	function rename_log_delete_topic()
+	{
+		if ($db->sql_layer == 'oracle')
+		{
+			// log_operation is CLOB - but we can change this later
+			$sql = 'UPDATE ' . $this->table_prefix . "log
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
+			$this->sql_query($sql);
+		}
+		else
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . "log
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation = 'LOG_TOPIC_DELETED'";
+			$this->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_4_rc1.php b/phpBB/includes/db/migration/3_0_4_rc1.php
new file mode 100644
index 0000000000..b783e58e24
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_4_rc1.php
@@ -0,0 +1,103 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_4_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_3');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_profile' => array('BOOL', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'styles' => array(
+					'style_id' => array('UINT', NULL, 'auto_increment'),
+					'template_id' => array('UINT', 0),
+					'theme_id' => array('UINT', 0),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_imageset' => array(
+					'imageset_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_imageset_data' => array(
+					'image_id' => array('UINT', NULL, 'auto_increment'),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_theme' => array(
+					'theme_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template' => array(
+					'template_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template_data' => array(
+					'template_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
+		);
+	}
+
+	function update_custom_profile_fields()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
+				FROM ' . PROFILE_FIELDS_TABLE;
+		$result = $this->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'field_required'	=> 0,
+				'field_show_on_reg'	=> 0,
+				'field_hide'		=> 0,
+				'field_show_profile'=> 0,
+			);
+
+			if ($row['field_required'])
+			{
+				$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_show_on_reg'])
+			{
+				$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_hide'])
+			{
+				// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
+				$sql_ary['field_hide'] = 1;
+			}
+			else
+			{
+				// equivelant to "none", which is the "Display in user control panel" option
+				$sql_ary['field_show_profile'] = 1;
+			}
+
+			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_5.php b/phpBB/includes/db/migration/3_0_5.php
new file mode 100644
index 0000000000..272779f083
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_5.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_5 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_5_rc1part2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_5_rc1.php b/phpBB/includes/db/migration/3_0_5_rc1.php
new file mode 100644
index 0000000000..8975728cca
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_5_rc1.php
@@ -0,0 +1,119 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_5_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_4');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		$search_indexing_state = $this->config['search_indexing_state'];
+
+		return array(
+			array('config.add', array('captcha_gd_wave', 0)),
+			array('config.add', array('captcha_gd_3d_noise', 1)),
+			array('config.add', array('captcha_gd_refresh', 1)),
+			array('config.add', array('confirm_refresh', 1)),
+			array('config.add', array('max_num_search_keywords', 10)),
+			array('config.remove', array('search_indexing_state')),
+			array('config.add', array('search_indexing_state', $search_indexing_state, true)),
+			array('custom', array(array(&$this, 'hash_old_passwords'))),
+			array('custom', array(array(&$this, 'update_ichiro_bot'))),
+		);
+	}
+
+	function hash_old_passwords()
+	{
+		$sql = 'SELECT user_id, user_password
+				FROM ' . $this->table_prefix . 'users
+				WHERE user_pass_convert = 1';
+		$result = $this->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (strlen($row['user_password']) == 32)
+			{
+				$sql_ary = array(
+					'user_password'	=> phpbb_hash($row['user_password']),
+				);
+
+				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
+			}
+		}
+		$db->sql_freeresult($result);
+	}
+
+	function update_ichiro_bot()
+	{
+		// Adjust bot entry
+		$sql = 'UPDATE ' . $this->table_prefix . "bots
+			SET bot_agent = 'ichiro/'
+			WHERE bot_agent = 'ichiro/2'";
+		$this->sql_query($sql);
+	}
+
+	function remove_duplicate_auth_options()
+	{
+		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
+		$sql = 'SELECT auth_option
+			FROM ' . $this->table_prefix . 'acl_options
+			GROUP BY auth_option
+			HAVING COUNT(*) >= 2';
+		$result = $this->db->sql_query($sql);
+
+		$auth_options = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$auth_options[] = $row['auth_option'];
+		}
+		$this->db->sql_freeresult($result);
+
+		// Remove specific auth options
+		if (!empty($auth_options))
+		{
+			foreach ($auth_options as $option)
+			{
+				// Select auth_option_ids... the largest id will be preserved
+				$sql = 'SELECT auth_option_id
+					FROM ' . ACL_OPTIONS_TABLE . "
+					WHERE auth_option = '" . $db->sql_escape($option) . "'
+					ORDER BY auth_option_id DESC";
+				// sql_query_limit not possible here, due to bug in postgresql layer
+				$result = $this->sql_query($sql);
+
+				// Skip first row, this is our original auth option we want to preserve
+				$row = $this->db->sql_fetchrow($result);
+
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					// Ok, remove this auth option...
+					$this->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+				}
+				$this->db->sql_freeresult($result);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_5_rc1part2.php b/phpBB/includes/db/migration/3_0_5_rc1part2.php
new file mode 100644
index 0000000000..710c8dce91
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_5_rc1part2.php
@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_5_rc1part2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_5_rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'drop_keys'			=> array(
+				ACL_OPTIONS_TABLE		=> array('auth_option'),
+			),
+			'add_unique_index'	=> array(
+				ACL_OPTIONS_TABLE		=> array(
+					'auth_option'		=> array('auth_option'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_6.php b/phpBB/includes/db/migration/3_0_6.php
new file mode 100644
index 0000000000..9582038b36
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_6.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_6 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_6_rc4');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_6_rc1.php b/phpBB/includes/db/migration/3_0_6_rc1.php
new file mode 100644
index 0000000000..0aa5746164
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_6_rc1.php
@@ -0,0 +1,314 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_6_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_5');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'confirm' => array(
+					'attempts' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_new' => array('BOOL', 1),
+					'user_reminded' => array('TINT:4', 0),
+					'user_reminded_time' => array('TIMESTAMP', 0),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_reported' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'reports' => array(
+					'pm_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'fields'			=> array(
+					'field_show_on_vt' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_options' => array('UINT:20', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'users' => array(
+					'user_options' => array('UINT:11', 230271),
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'reports' => array(
+					'post_id' => array('post_id'),
+					'pm_id' => array('pm_id'),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_username' => array('post_username:255'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			//array('custom', array(array(&$this, '')))
+			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
+			array('config.update_if', array(
+				($this->config['captcha_gd']),
+				'captcha_plugin',
+				'phpbb_captcha_gd',
+			)),
+
+			array('config.add', array('feed_enable', 0)),
+			array('config.add', array('feed_limit', 10)),
+			array('config.add', array('feed_overall_forums', 1)),
+			array('config.add', array('feed_overall_forums_limit', 15)),
+			array('config.add', array('feed_overall_topics', 0)),
+			array('config.add', array('feed_overall_topics_limit', 15)),
+			array('config.add', array('feed_forum', 1)),
+			array('config.add', array('feed_topic', 1)),
+			array('config.add', array('feed_item_statistics', 1)),
+
+			array('config.add', array('smilies_per_page', 50)),
+			array('config.add', array('allow_pm_report', 1)),
+			array('config.add', array('min_post_chars', 1)),
+			array('config.add', array('allow_quick_reply', 1)),
+			array('config.add', array('new_member_post_limit', 0)),
+			array('config.add', array('new_member_group_default', 0)),
+			array('config.add', array('delete_time', $this->config['edit_time'])),
+
+			array('config.add', array('allow_avatar', 0)),
+			array('config.add_if', array(
+				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
+				'allow_avatar',
+				1,
+			)),
+			array('config.add', array('allow_avatar_remote_upload', 0)),
+			array('config.add_if', array(
+				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
+				'allow_avatar_remote_upload',
+				1,
+			)),
+
+			array('module.add', array(
+				'feed' => array(
+					'base'		=> 'board',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_FEED_SETTINGS',
+					'auth'		=> 'acl_a_board',
+					'cat'		=> 'ACP_BOARD_CONFIGURATION',
+					'after'		=> array('signature', 'ACP_SIGNATURE_SETTINGS')
+				),
+			)),
+			array('module.add', array(
+				'warnings' => array(
+					'base'		=> 'users',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_USER_WARNINGS',
+					'auth'		=> 'acl_a_user',
+					'display'	=> 0,
+					'cat'		=> 'ACP_CAT_USERS',
+					'after'		=> array('feedback', 'ACP_USER_FEEDBACK')
+				),
+			)),
+			array('module.add', array(
+				'send_statistics' => array(
+					'base'		=> 'send_statistics',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_SEND_STATISTICS',
+					'auth'		=> 'acl_a_server',
+					'cat'		=> 'ACP_SERVER_CONFIGURATION'
+				),
+			)),
+			array('module.add', array(
+				'setting_forum_copy' => array(
+					'base'		=> 'permissions',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_FORUM_PERMISSIONS_COPY',
+					'auth'		=> 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth',
+					'cat'		=> 'ACP_FORUM_BASED_PERMISSIONS',
+					'after'		=> array('setting_forum_local', 'ACP_FORUM_PERMISSIONS')
+				),
+			)),
+			array('module.add', array(
+				'pm_reports' => array(
+					'base'		=> 'pm_reports',
+					'class'		=> 'mcp',
+					'title'		=> 'MCP_PM_REPORTS_OPEN',
+					'auth'		=> 'aclf_m_report',
+					'cat'		=> 'MCP_REPORTS'
+				),
+			)),
+			array('module.add', array(
+				'pm_reports_closed' => array(
+					'base'		=> 'pm_reports',
+					'class'		=> 'mcp',
+					'title'		=> 'MCP_PM_REPORTS_CLOSED',
+					'auth'		=> 'aclf_m_report',
+					'cat'		=> 'MCP_REPORTS'
+				),
+			)),
+			array('module.add', array(
+				'pm_report_details' => array(
+					'base'		=> 'pm_reports',
+					'class'		=> 'mcp',
+					'title'		=> 'MCP_PM_REPORT_DETAILS',
+					'auth'		=> 'aclf_m_report',
+					'cat'		=> 'MCP_REPORTS'
+				),
+			)),
+			array('custom', array(array(&$this, 'add_newly_registered_group'))),
+			array('custom', array(array(&$this, 'set_user_options_default'))),
+		);
+	}
+
+	function set_user_options_default()
+	{
+		// 229376 is the added value to enable all three signature options
+		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
+		$this->sql_query($sql);
+	}
+
+	function add_newly_registered_group()
+	{
+		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . "
+			WHERE group_name = 'NEWLY_REGISTERED'";
+		$result = $this->db->sql_query($sql);
+		$group_id = (int) $this->db->sql_fetchfield('group_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$group_id)
+		{
+			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
+			$this->sql_query($sql);
+
+			$group_id = $this->db->sql_nextid();
+		}
+
+		// Insert new user role... at the end of the chain
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
+				AND role_type = 'u_'";
+		$result = $this->db->sql_query($sql);
+		$u_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$u_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'u_'";
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
+			$this->sql_query($sql);
+			$u_role = $this->db->sql_nextid();
+
+			if (!$errored)
+			{
+				// Now add the correct data to the roles...
+				// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
+				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
+				$this->sql_query($sql);
+
+				// Add user role to group
+				$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
+				$this->sql_query($sql);
+			}
+		}
+
+		// Insert new forum role
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
+				AND role_type = 'f_'";
+		$result = $this->db->sql_query($sql);
+		$f_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$f_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'f_'";
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
+			$this->sql_query($sql);
+			$f_role = $this->db->sql_nextid();
+
+			if (!$errored)
+			{
+				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
+				$this->sql_query($sql);
+			}
+		}
+
+		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
+		$sql = 'SELECT 1
+			FROM ' . USERS_TABLE . '
+			WHERE user_new = 0';
+		$result = $this->db->sql_query_limit($sql, 1);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$row)
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
+			$this->sql_query($sql);
+		}
+
+		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
+		// Check if the role is already assigned...
+		$sql = 'SELECT forum_id
+			FROM ' . ACL_GROUPS_TABLE . '
+			WHERE group_id = ' . $group_id . '
+				AND auth_role_id = ' . $f_role;
+		$result = $this->db->sql_query($sql);
+		$is_options = (int) $this->db->sql_fetchfield('forum_id');
+		$this->db->sql_freeresult($result);
+
+		// Not assigned at all... :/
+		if (!$is_options)
+		{
+			// Get postable forums
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type != ' . FORUM_LINK;
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$this->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)');
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		// Clear permissions...
+		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->phpEx);
+		$auth_admin = new auth_admin();
+		$auth_admin->acl_clear_prefetch();
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_6_rc2.php b/phpBB/includes/db/migration/3_0_6_rc2.php
new file mode 100644
index 0000000000..1552485d0a
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_6_rc2.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_6_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_6_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_6_rc3.php b/phpBB/includes/db/migration/3_0_6_rc3.php
new file mode 100644
index 0000000000..6a7ad1c56d
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_6_rc3.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_6_rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_6_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_cp_fields'))),
+		);
+	}
+
+	function update_cp_fields()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
+			SET field_show_on_vt = 1
+			WHERE field_hide = 0
+				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_6_rc4.php b/phpBB/includes/db/migration/3_0_6_rc4.php
new file mode 100644
index 0000000000..00161456b6
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_6_rc4.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_6_rc4 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_6_rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_7.php b/phpBB/includes/db/migration/3_0_7.php
new file mode 100644
index 0000000000..2b5ec15fa9
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_7.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_7 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_7_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_7_pl1.php b/phpBB/includes/db/migration/3_0_7_pl1.php
new file mode 100644
index 0000000000..22c04f1daf
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_7_pl1.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_7_pl1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_7');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_7_rc1.php b/phpBB/includes/db/migration/3_0_7_rc1.php
new file mode 100644
index 0000000000..d08a468941
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_7_rc1.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_7_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_6');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'drop_keys' => array(
+				$this->table_prefix . 'log' => array('log_time'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'topics_track' => array(
+					'topic_id' => array('topic_id'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('feed_overall', 1)),
+			array('config.add', array('feed_http_auth', 0)),
+			array('config.add', array('feed_limit_post', $this->config['feed_limit'])),
+			array('config.add', array('feed_limit_topic', $this->config['feed_overall_topics_limit'])),
+			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
+			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
+			array('custom', array(array(&$this, 'delete_text_templates'))),
+		);
+	}
+
+	function delete_text_templates()
+	{
+		// Delete all text-templates from the template_data
+		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
+			WHERE template_filename ' . $this->db->sql_like_expression($this->db->any_char . '.txt');
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_7_rc2.php b/phpBB/includes/db/migration/3_0_7_rc2.php
new file mode 100644
index 0000000000..4ab4e906d7
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_7_rc2.php
@@ -0,0 +1,70 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_7_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_7_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_email_hash'))),
+		);
+	}
+
+	function update_email_hash($start = 0)
+	{
+		$limit = 1000;
+
+		$sql = 'SELECT user_id, user_email, user_email_hash
+			FROM ' . USERS_TABLE . '
+			WHERE user_type <> ' . USER_IGNORE . "
+				AND user_email <> ''";
+		$result = $this->db->sql_query_limit($sql, $limit, $start);
+
+		$i = 0;
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$i++;
+
+			// Snapshot of the phpbb_email_hash() function
+			// We cannot call it directly because the auto updater updates the DB first. :/
+			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
+
+			if ($user_email_hash != $row['user_email_hash'])
+			{
+				$sql_ary = array(
+					'user_email_hash'	=> $user_email_hash,
+				);
+
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE user_id = ' . (int) $row['user_id'];
+				$this->sql_query($sql);
+			}
+		}
+		$db->sql_freeresult($result);
+
+		if ($i < $limit)
+		{
+			// Completed
+			return false;
+		}
+
+		return $start + $limit;
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_8.php b/phpBB/includes/db/migration/3_0_8.php
new file mode 100644
index 0000000000..3e7f843a65
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_8.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_8 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_8_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_8_rc1.php b/phpBB/includes/db/migration/3_0_8_rc1.php
new file mode 100644
index 0000000000..0d93efedce
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_8_rc1.php
@@ -0,0 +1,225 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_8_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_7_pl1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'update_module_auth'))),
+			array('custom', array(array(&$this, 'update_bots'))),
+			array('custom', array(array(&$this, 'delete_orphan_shadow_topics'))),
+			array('module.add', array(
+				'post'	=> array(
+					'base'		=> 'board',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_POST_SETTINGS',
+					'auth'		=> 'acl_a_board',
+					'cat'		=> 'ACP_MESSAGES',
+					'after'		=> array('message', 'ACP_MESSAGE_SETTINGS')
+				),
+			)),
+			array('config.add', array('load_unreads_search', 1)),
+			array('config.update_if_equals', array(600, 'queue_interval', 60)),
+			array('config.update_if_equals', array(50, 'email_package_size', 20)),
+		);
+	}
+
+	function update_file_extension_group_names()
+	{
+		// Update file extension group names to use language strings.
+		$sql = 'SELECT lang_dir
+			FROM ' . LANG_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		$extension_groups_updated = array();
+		while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
+		{
+			$lang_dir = basename($lang_dir);
+
+			// The language strings we need are either in language/.../acp/attachments.php
+			// in the update package if we're updating to 3.0.8-RC1 or later,
+			// or they are in language/.../install.php when we're updating from 3.0.7-PL1 or earlier.
+			// On an already updated board, they can also already be in language/.../acp/attachments.php
+			// in the board root.
+			$lang_files = array(
+				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.$this->phpEx",
+				"{$this->phpbb_root_path}language/$lang_dir/install.$this->phpEx",
+				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.$this->phpEx",
+			);
+
+			foreach ($lang_files as $lang_file)
+			{
+				if (!file_exists($lang_file))
+				{
+					continue;
+				}
+
+				$lang = array();
+				include($lang_file);
+
+				foreach($lang as $lang_key => $lang_val)
+				{
+					if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
+					{
+						continue;
+					}
+
+					$sql_ary = array(
+						'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
+					);
+
+					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+						SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+						WHERE group_name = '" . $this->db->sql_escape($lang_val) . "'";
+					$this->sql_query($sql);
+
+					$extension_groups_updated[$lang_key] = true;
+				}
+			}
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	function update_module_auth()
+	{
+		$sql = 'UPDATE ' . MODULES_TABLE . '
+			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
+			WHERE module_class = \'ucp\'
+				AND module_basename = \'profile\'
+				AND module_mode = \'avatar\'';
+		$this->sql_query($sql);
+	}
+
+	function update_bots()
+	{
+		$bot_name = 'Bing [Bot]';
+		$bot_name_clean = utf8_clean_string($bot_name);
+
+		$sql = 'SELECT user_id
+			FROM ' . USERS_TABLE . "
+			WHERE username_clean = '" . $this->db->sql_escape($bot_name_clean) . "'";
+		$result = $this->db->sql_query($sql);
+		$bing_already_added = (bool) $this->db->sql_fetchfield('user_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$bing_already_added)
+		{
+			$bot_agent = 'bingbot/';
+			$bot_ip = '';
+			$sql = 'SELECT group_id, group_colour
+				FROM ' . GROUPS_TABLE . "
+				WHERE group_name = 'BOTS'";
+			$result = $this->db->sql_query($sql);
+			$group_row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$group_row)
+			{
+				// default fallback, should never get here
+				$group_row['group_id'] = 6;
+				$group_row['group_colour'] = '9E8DA7';
+			}
+
+			if (!function_exists('user_add'))
+			{
+				include($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
+			}
+
+			$user_row = array(
+				'user_type'				=> USER_IGNORE,
+				'group_id'				=> $group_row['group_id'],
+				'username'				=> $bot_name,
+				'user_regdate'			=> time(),
+				'user_password'			=> '',
+				'user_colour'			=> $group_row['group_colour'],
+				'user_email'			=> '',
+				'user_lang'				=> $this->config['default_lang'],
+				'user_style'			=> $this->config['default_style'],
+				'user_timezone'			=> 0,
+				'user_dateformat'		=> $this->config['default_dateformat'],
+				'user_allow_massemail'	=> 0,
+			);
+
+			$user_id = user_add($user_row);
+
+			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
+				'bot_active'	=> 1,
+				'bot_name'		=> (string) $bot_name,
+				'user_id'		=> (int) $user_id,
+				'bot_agent'		=> (string) $bot_agent,
+				'bot_ip'		=> (string) $bot_ip,
+			));
+
+			$this->sql_query($sql);
+		}
+	}
+
+	function delete_orphan_shadow_topics()
+	{
+		// Delete shadow topics pointing to not existing topics
+		$batch_size = 500;
+
+		// Set of affected forums we have to resync
+		$sync_forum_ids = array();
+
+		$sql_array = array(
+			'SELECT'	=> 't1.topic_id, t1.forum_id',
+			'FROM'		=> array(
+				TOPICS_TABLE	=> 't1',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(TOPICS_TABLE	=> 't2'),
+					'ON'	=> 't1.topic_moved_id = t2.topic_id',
+				),
+			),
+			'WHERE'		=> 't1.topic_moved_id <> 0
+						AND t2.topic_id IS NULL',
+		);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query_limit($sql, $batch_size);
+
+		$topic_ids = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$topic_ids[] = (int) $row['topic_id'];
+
+			$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($topic_ids))
+		{
+			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
+			$this->db->sql_query($sql);
+
+			// Sync the forums we have deleted shadow topics from.
+			sync('forum', 'forum_id', $sync_forum_ids, true, true);
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_9.php b/phpBB/includes/db/migration/3_0_9.php
new file mode 100644
index 0000000000..2e1eab26e7
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_9.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_9 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_9_rc4');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_9_rc1.php b/phpBB/includes/db/migration/3_0_9_rc1.php
new file mode 100644
index 0000000000..4ee18349ce
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_9_rc1.php
@@ -0,0 +1,108 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_9_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_8');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_tables' => array(
+				$this->table_prefix . 'login_attempts' => array(
+					'COLUMNS' => array(
+						// this column was removed from the database updater
+						// after 3.0.9-RC3 was released. It might still exist
+						// in 3.0.9-RCX installations and has to be dropped in
+						// 3.0.12 after the db_tools class is capable of properly
+						// removing a primary key.
+						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
+						'attempt_ip'			=> array('VCHAR:40', ''),
+						'attempt_browser'		=> array('VCHAR:150', ''),
+						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
+						'attempt_time'			=> array('TIMESTAMP', 0),
+						'user_id'				=> array('UINT', 0),
+						'username'				=> array('VCHAR_UNI:255', 0),
+						'username_clean'		=> array('VCHAR_CI', 0),
+					),
+					//'PRIMARY_KEY' => 'attempt_id',
+					'KEYS' => array(
+						'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
+						'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+						'att_time' => array('INDEX', array('attempt_time')),
+						'user_id' => array('INDEX', 'user_id'),
+					),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'bbcode' => array(
+					'bbcode_id' => array('USINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('ip_login_limit_max', 50)),
+			array('config.add', array('ip_login_limit_time', 21600)),
+			array('config.add', array('ip_login_limit_use_forwarded', 0)),
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
+		);
+	}
+
+	function update_file_extension_group_names()
+	{
+		// Update file extension group names to use language strings, again.
+		$sql = 'SELECT group_id, group_name
+			FROM ' . EXTENSION_GROUPS_TABLE . '
+			WHERE group_name ' . $this->db->sql_like_expression('EXT_GROUP_' . $this->db->any_char);
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
+			);
+
+			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+				WHERE group_id = ' . $row['group_id'];
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	function fix_firebird_qa_captcha()
+	{
+		// Recover from potentially broken Q&A CAPTCHA table on firebird
+		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
+		// without data loss
+		if ($this->db_tools->sql_layer == 'firebird')
+		{
+			$tables = array(
+				$this->table_prefix . 'captcha_questions',
+				$this->table_prefix . 'captcha_answers',
+				$this->table_prefix . 'qa_confirm',
+			);
+			foreach ($tables as $table)
+			{
+				if ($this->db_tools->sql_table_exists($table))
+				{
+					$this->db_tools->sql_table_drop($table);
+				}
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_9_rc2.php b/phpBB/includes/db/migration/3_0_9_rc2.php
new file mode 100644
index 0000000000..96782b2b01
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_9_rc2.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_9_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_9_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_9_rc3.php b/phpBB/includes/db/migration/3_0_9_rc3.php
new file mode 100644
index 0000000000..ac0f3cb972
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_9_rc3.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_9_rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_9_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/3_0_9_rc4.php b/phpBB/includes/db/migration/3_0_9_rc4.php
new file mode 100644
index 0000000000..7880e1b864
--- /dev/null
+++ b/phpBB/includes/db/migration/3_0_9_rc4.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_3_0_9_rc4 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_3_0_9_rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/v301.php b/phpBB/includes/db/migration/v301.php
deleted file mode 100644
index 8a2a265a3c..0000000000
--- a/phpBB/includes/db/migration/v301.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v301 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v301rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v3010.php b/phpBB/includes/db/migration/v3010.php
deleted file mode 100644
index 7490ba1005..0000000000
--- a/phpBB/includes/db/migration/v3010.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v3010 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v3010rc3');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v3010rc1.php b/phpBB/includes/db/migration/v3010rc1.php
deleted file mode 100644
index 847fe7c250..0000000000
--- a/phpBB/includes/db/migration/v3010rc1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v3010rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v309');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('email_max_chunk_size', 50)),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/v3010rc2.php b/phpBB/includes/db/migration/v3010rc2.php
deleted file mode 100644
index 8c1809227c..0000000000
--- a/phpBB/includes/db/migration/v3010rc2.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v3010rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v3010rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v3010rc3.php b/phpBB/includes/db/migration/v3010rc3.php
deleted file mode 100644
index 917cabd8fe..0000000000
--- a/phpBB/includes/db/migration/v3010rc3.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v3010rc3 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v3010rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v3011.php b/phpBB/includes/db/migration/v3011.php
deleted file mode 100644
index 7d506308b1..0000000000
--- a/phpBB/includes/db/migration/v3011.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v3011 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v3011rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v3011rc1.php b/phpBB/includes/db/migration/v3011rc1.php
deleted file mode 100644
index 3bae7a4a2d..0000000000
--- a/phpBB/includes/db/migration/v3011rc1.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v3011rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v3010');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
-			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
-		);
-	}
-
-	function cleanup_deactivated_styles()
-	{
-		// Updates users having current style a deactivated one
-		$sql = 'SELECT style_id
-			FROM ' . STYLES_TABLE . '
-			WHERE style_active = 0';
-		$result = $this->sql_query($sql);
-
-		$deactivated_style_ids = array();
-		while ($style_id = $this->db->sql_fetchfield('style_id', false, $result))
-		{
-			$deactivated_style_ids[] = (int) $style_id;
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($deactivated_style_ids))
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_style = ' . (int) $this->config['default_style'] .'
-				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
-			$this->sql_query($sql);
-		}
-	}
-
-	function delete_orphan_private_messages()
-	{
-		// Delete orphan private messages
-		$batch_size = 500;
-
-		$sql_array = array(
-			'SELECT'	=> 'p.msg_id',
-			'FROM'		=> array(
-				PRIVMSGS_TABLE	=> 'p',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
-					'ON'	=> 'p.msg_id = t.msg_id',
-				),
-			),
-			'WHERE'		=> 't.user_id IS NULL',
-		);
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-
-		$result = $this->db->sql_query_limit($sql, $batch_size);
-
-		$delete_pms = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$delete_pms[] = (int) $row['msg_id'];
-		}
-		$db->sql_freeresult($result);
-
-		if (!empty($delete_pms))
-		{
-			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
-			$this->sql_query($sql);
-
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/v3011rc2.php b/phpBB/includes/db/migration/v3011rc2.php
deleted file mode 100644
index 0f66eff156..0000000000
--- a/phpBB/includes/db/migration/v3011rc2.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v3011rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v3011rc1');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_novalue' => array('BOOL', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v3012rc1.php b/phpBB/includes/db/migration/v3012rc1.php
deleted file mode 100644
index 67f7a29b02..0000000000
--- a/phpBB/includes/db/migration/v3012rc1.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v3012rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v3011');
-	}
-
-	function update_schema()
-	{
-		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v301rc1.php b/phpBB/includes/db/migration/v301rc1.php
deleted file mode 100644
index aee50e3039..0000000000
--- a/phpBB/includes/db/migration/v301rc1.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v301rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array();
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'display_subforum_list' => array('BOOL', 1),
-				),
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array('UINT', 0),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'groups' => array('group_legend'),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array('session_forum_id'),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_legend_name' => array('group_legend', 'group_name'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
-			array('custom', array(array(&$this, 'reset_smiley_size'))),
-		);
-	}
-
-	function fix_unset_last_view_time()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . "topics
-			SET topic_last_view_time = topic_last_post_time
-			WHERE topic_last_view_time = 0";
-		$this->sql_query($sql);
-	}
-
-	function reset_smiley_size()
-	{
-		// Update smiley sizes
-		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
-
-		foreach ($smileys as $smiley)
-		{
-			if (file_exists($this->phpbb_root_path . 'images/smilies/' . $smiley))
-			{
-				list($width, $height) = getimagesize($this->phpbb_root_path . 'images/smilies/' . $smiley);
-
-				$sql = 'UPDATE ' . SMILIES_TABLE . '
-					SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
-					WHERE smiley_url = '" . $this->db->sql_escape($smiley) . "'";
-
-				$this->sql_query($sql);
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/v302.php b/phpBB/includes/db/migration/v302.php
deleted file mode 100644
index 942a0ac58c..0000000000
--- a/phpBB/includes/db/migration/v302.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v302 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v302rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v302rc1.php b/phpBB/includes/db/migration/v302rc1.php
deleted file mode 100644
index ced4d9fbfc..0000000000
--- a/phpBB/includes/db/migration/v302rc1.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v301rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v301');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('referer_validation', '1')),
-			array('config.add', array('check_attachment_content', '1')),
-			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/v302rc2.php b/phpBB/includes/db/migration/v302rc2.php
deleted file mode 100644
index 21aa5ca728..0000000000
--- a/phpBB/includes/db/migration/v302rc2.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v302rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v302rc1');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'change_columns' => array(
-				$this->table_prefix . 'drafts' => array(
-					'draft_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_last_post_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_subject' => array('STEXT_UNI', '', 'true_sort'),
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'topics' => array(
-					'topic_title' => array('STEXT_UNI', '', 'true_sort'),
-					'topic_last_post_subject' => array('STEXT_UNI', ''),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'sessions' => array('session_forum_id'),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_fid' => array('session_forum_id'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v303.php b/phpBB/includes/db/migration/v303.php
deleted file mode 100644
index 409c396baf..0000000000
--- a/phpBB/includes/db/migration/v303.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v303 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v302rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v303rc1.php b/phpBB/includes/db/migration/v303rc1.php
deleted file mode 100644
index 7518a6ed54..0000000000
--- a/phpBB/includes/db/migration/v303rc1.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v303rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v302');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'styles_template' => array(
-					'template_inherits_id' => array('UINT:4', 0),
-					'template_inherit_path' => array('VCHAR', ''),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_max_recipients' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('enable_queue_trigger', '0')),
-			array('config.add', array('queue_trigger_posts', '3')),
-			array('config.add', array('pm_max_recipients', '0')),
-			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
-			array('config.add', array('dbms_version', '')),
-			array('permission.add', array('u_masspm_group', phpbb_auth::IS_GLOBAL),
-			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
-		));
-	}
-
-	function correct_acp_email_permissions()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . 'modules
-			SET module_auth = \'acl_a_email && cfg_email_enable\'
-			WHERE module_class = \'acp\'
-				AND module_basename = \'email\'';
-		$this->sql_query($sql);
-	}
-
-	function set_group_default_max_recipients()
-	{
-		// Set maximum number of recipients for the registered users, bots, guests group
-		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
-			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/v304.php b/phpBB/includes/db/migration/v304.php
deleted file mode 100644
index 5358bcc20f..0000000000
--- a/phpBB/includes/db/migration/v304.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v304 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v304rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
-		);
-	}
-
-	function rename_log_delete_topic()
-	{
-		if ($db->sql_layer == 'oracle')
-		{
-			// log_operation is CLOB - but we can change this later
-			$sql = 'UPDATE ' . $this->table_prefix . "log
-				SET log_operation = 'LOG_DELETE_TOPIC'
-				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
-			$this->sql_query($sql);
-		}
-		else
-		{
-			$sql = 'UPDATE ' . $this->table_prefix . "log
-				SET log_operation = 'LOG_DELETE_TOPIC'
-				WHERE log_operation = 'LOG_TOPIC_DELETED'";
-			$this->sql_query($sql);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/v304rc1.php b/phpBB/includes/db/migration/v304rc1.php
deleted file mode 100644
index 2daad4e826..0000000000
--- a/phpBB/includes/db/migration/v304rc1.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v304rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v303');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_profile' => array('BOOL', 0),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'styles' => array(
-					'style_id' => array('UINT', NULL, 'auto_increment'),
-					'template_id' => array('UINT', 0),
-					'theme_id' => array('UINT', 0),
-					'imageset_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'styles_imageset' => array(
-					'imageset_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_imageset_data' => array(
-					'image_id' => array('UINT', NULL, 'auto_increment'),
-					'imageset_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'styles_theme' => array(
-					'theme_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_template' => array(
-					'template_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_template_data' => array(
-					'template_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_style' => array('UINT', 0),
-				),
-				$this->table_prefix . 'users' => array(
-					'user_style' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
-		);
-	}
-
-	function update_custom_profile_fields()
-	{
-		// Update the Custom Profile Fields based on previous settings to the new format
-		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
-				FROM ' . PROFILE_FIELDS_TABLE;
-		$result = $this->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql_ary = array(
-				'field_required'	=> 0,
-				'field_show_on_reg'	=> 0,
-				'field_hide'		=> 0,
-				'field_show_profile'=> 0,
-			);
-
-			if ($row['field_required'])
-			{
-				$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
-			}
-			else if ($row['field_show_on_reg'])
-			{
-				$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
-			}
-			else if ($row['field_hide'])
-			{
-				// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
-				$sql_ary['field_hide'] = 1;
-			}
-			else
-			{
-				// equivelant to "none", which is the "Display in user control panel" option
-				$sql_ary['field_show_profile'] = 1;
-			}
-
-			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/v305.php b/phpBB/includes/db/migration/v305.php
deleted file mode 100644
index 71e28c6b7b..0000000000
--- a/phpBB/includes/db/migration/v305.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v305 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v305rc1part2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v305rc1.php b/phpBB/includes/db/migration/v305rc1.php
deleted file mode 100644
index 4f20796608..0000000000
--- a/phpBB/includes/db/migration/v305rc1.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v305rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v304');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'change_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'forum_style' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		$search_indexing_state = $this->config['search_indexing_state'];
-
-		return array(
-			array('config.add', array('captcha_gd_wave', 0)),
-			array('config.add', array('captcha_gd_3d_noise', 1)),
-			array('config.add', array('captcha_gd_refresh', 1)),
-			array('config.add', array('confirm_refresh', 1)),
-			array('config.add', array('max_num_search_keywords', 10)),
-			array('config.remove', array('search_indexing_state')),
-			array('config.add', array('search_indexing_state', $search_indexing_state, true)),
-			array('custom', array(array(&$this, 'hash_old_passwords'))),
-			array('custom', array(array(&$this, 'update_ichiro_bot'))),
-		);
-	}
-
-	function hash_old_passwords()
-	{
-		$sql = 'SELECT user_id, user_password
-				FROM ' . $this->table_prefix . 'users
-				WHERE user_pass_convert = 1';
-		$result = $this->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (strlen($row['user_password']) == 32)
-			{
-				$sql_ary = array(
-					'user_password'	=> phpbb_hash($row['user_password']),
-				);
-
-				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
-			}
-		}
-		$db->sql_freeresult($result);
-	}
-
-	function update_ichiro_bot()
-	{
-		// Adjust bot entry
-		$sql = 'UPDATE ' . $this->table_prefix . "bots
-			SET bot_agent = 'ichiro/'
-			WHERE bot_agent = 'ichiro/2'";
-		$this->sql_query($sql);
-	}
-
-	function remove_duplicate_auth_options()
-	{
-		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
-		$sql = 'SELECT auth_option
-			FROM ' . $this->table_prefix . 'acl_options
-			GROUP BY auth_option
-			HAVING COUNT(*) >= 2';
-		$result = $this->db->sql_query($sql);
-
-		$auth_options = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$auth_options[] = $row['auth_option'];
-		}
-		$this->db->sql_freeresult($result);
-
-		// Remove specific auth options
-		if (!empty($auth_options))
-		{
-			foreach ($auth_options as $option)
-			{
-				// Select auth_option_ids... the largest id will be preserved
-				$sql = 'SELECT auth_option_id
-					FROM ' . ACL_OPTIONS_TABLE . "
-					WHERE auth_option = '" . $db->sql_escape($option) . "'
-					ORDER BY auth_option_id DESC";
-				// sql_query_limit not possible here, due to bug in postgresql layer
-				$result = $this->sql_query($sql);
-
-				// Skip first row, this is our original auth option we want to preserve
-				$row = $this->db->sql_fetchrow($result);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// Ok, remove this auth option...
-					$this->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-				}
-				$this->db->sql_freeresult($result);
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/v306.php b/phpBB/includes/db/migration/v306.php
deleted file mode 100644
index eec2f7c752..0000000000
--- a/phpBB/includes/db/migration/v306.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v306 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v306rc4');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v306rc1.php b/phpBB/includes/db/migration/v306rc1.php
deleted file mode 100644
index 45b597d56b..0000000000
--- a/phpBB/includes/db/migration/v306rc1.php
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v306rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v305');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'confirm' => array(
-					'attempts' => array('UINT', 0),
-				),
-				$this->table_prefix . 'users' => array(
-					'user_new' => array('BOOL', 1),
-					'user_reminded' => array('TINT:4', 0),
-					'user_reminded_time' => array('TIMESTAMP', 0),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_reported' => array('BOOL', 0),
-				),
-				$this->table_prefix . 'reports' => array(
-					'pm_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'fields'			=> array(
-					'field_show_on_vt' => array('BOOL', 0),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_options' => array('UINT:20', 0),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'users' => array(
-					'user_options' => array('UINT:11', 230271),
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'reports' => array(
-					'post_id' => array('post_id'),
-					'pm_id' => array('pm_id'),
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_username' => array('post_username:255'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			//array('custom', array(array(&$this, '')))
-			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
-			array('config.update_if', array(
-				($this->config['captcha_gd']),
-				'captcha_plugin',
-				'phpbb_captcha_gd',
-			)),
-
-			array('config.add', array('feed_enable', 0)),
-			array('config.add', array('feed_limit', 10)),
-			array('config.add', array('feed_overall_forums', 1)),
-			array('config.add', array('feed_overall_forums_limit', 15)),
-			array('config.add', array('feed_overall_topics', 0)),
-			array('config.add', array('feed_overall_topics_limit', 15)),
-			array('config.add', array('feed_forum', 1)),
-			array('config.add', array('feed_topic', 1)),
-			array('config.add', array('feed_item_statistics', 1)),
-
-			array('config.add', array('smilies_per_page', 50)),
-			array('config.add', array('allow_pm_report', 1)),
-			array('config.add', array('min_post_chars', 1)),
-			array('config.add', array('allow_quick_reply', 1)),
-			array('config.add', array('new_member_post_limit', 0)),
-			array('config.add', array('new_member_group_default', 0)),
-			array('config.add', array('delete_time', $this->config['edit_time'])),
-
-			array('config.add', array('allow_avatar', 0)),
-			array('config.add_if', array(
-				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
-				'allow_avatar',
-				1,
-			)),
-			array('config.add', array('allow_avatar_remote_upload', 0)),
-			array('config.add_if', array(
-				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
-				'allow_avatar_remote_upload',
-				1,
-			)),
-
-			array('module.add', array(
-				'feed' => array(
-					'base'		=> 'board',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_FEED_SETTINGS',
-					'auth'		=> 'acl_a_board',
-					'cat'		=> 'ACP_BOARD_CONFIGURATION',
-					'after'		=> array('signature', 'ACP_SIGNATURE_SETTINGS')
-				),
-			)),
-			array('module.add', array(
-				'warnings' => array(
-					'base'		=> 'users',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_USER_WARNINGS',
-					'auth'		=> 'acl_a_user',
-					'display'	=> 0,
-					'cat'		=> 'ACP_CAT_USERS',
-					'after'		=> array('feedback', 'ACP_USER_FEEDBACK')
-				),
-			)),
-			array('module.add', array(
-				'send_statistics' => array(
-					'base'		=> 'send_statistics',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_SEND_STATISTICS',
-					'auth'		=> 'acl_a_server',
-					'cat'		=> 'ACP_SERVER_CONFIGURATION'
-				),
-			)),
-			array('module.add', array(
-				'setting_forum_copy' => array(
-					'base'		=> 'permissions',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_FORUM_PERMISSIONS_COPY',
-					'auth'		=> 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth',
-					'cat'		=> 'ACP_FORUM_BASED_PERMISSIONS',
-					'after'		=> array('setting_forum_local', 'ACP_FORUM_PERMISSIONS')
-				),
-			)),
-			array('module.add', array(
-				'pm_reports' => array(
-					'base'		=> 'pm_reports',
-					'class'		=> 'mcp',
-					'title'		=> 'MCP_PM_REPORTS_OPEN',
-					'auth'		=> 'aclf_m_report',
-					'cat'		=> 'MCP_REPORTS'
-				),
-			)),
-			array('module.add', array(
-				'pm_reports_closed' => array(
-					'base'		=> 'pm_reports',
-					'class'		=> 'mcp',
-					'title'		=> 'MCP_PM_REPORTS_CLOSED',
-					'auth'		=> 'aclf_m_report',
-					'cat'		=> 'MCP_REPORTS'
-				),
-			)),
-			array('module.add', array(
-				'pm_report_details' => array(
-					'base'		=> 'pm_reports',
-					'class'		=> 'mcp',
-					'title'		=> 'MCP_PM_REPORT_DETAILS',
-					'auth'		=> 'aclf_m_report',
-					'cat'		=> 'MCP_REPORTS'
-				),
-			)),
-			array('custom', array(array(&$this, 'add_newly_registered_group'))),
-			array('custom', array(array(&$this, 'set_user_options_default'))),
-		);
-	}
-
-	function set_user_options_default()
-	{
-		// 229376 is the added value to enable all three signature options
-		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
-		$this->sql_query($sql);
-	}
-
-	function add_newly_registered_group()
-	{
-		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = 'NEWLY_REGISTERED'";
-		$result = $this->db->sql_query($sql);
-		$group_id = (int) $this->db->sql_fetchfield('group_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$group_id)
-		{
-			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
-			$this->sql_query($sql);
-
-			$group_id = $this->db->sql_nextid();
-		}
-
-		// Insert new user role... at the end of the chain
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
-				AND role_type = 'u_'";
-		$result = $this->db->sql_query($sql);
-		$u_role = (int) $this->db->sql_fetchfield('role_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$u_role)
-		{
-			$sql = 'SELECT MAX(role_order) as max_order_id
-				FROM ' . ACL_ROLES_TABLE . "
-				WHERE role_type = 'u_'";
-			$result = $this->db->sql_query($sql);
-			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
-			$this->db->sql_freeresult($result);
-
-			$next_order_id++;
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
-			$this->sql_query($sql);
-			$u_role = $this->db->sql_nextid();
-
-			if (!$errored)
-			{
-				// Now add the correct data to the roles...
-				// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
-				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
-				$this->sql_query($sql);
-
-				// Add user role to group
-				$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
-				$this->sql_query($sql);
-			}
-		}
-
-		// Insert new forum role
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
-				AND role_type = 'f_'";
-		$result = $this->db->sql_query($sql);
-		$f_role = (int) $this->db->sql_fetchfield('role_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$f_role)
-		{
-			$sql = 'SELECT MAX(role_order) as max_order_id
-				FROM ' . ACL_ROLES_TABLE . "
-				WHERE role_type = 'f_'";
-			$result = $this->db->sql_query($sql);
-			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
-			$this->db->sql_freeresult($result);
-
-			$next_order_id++;
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
-			$this->sql_query($sql);
-			$f_role = $this->db->sql_nextid();
-
-			if (!$errored)
-			{
-				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
-				$this->sql_query($sql);
-			}
-		}
-
-		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
-		$sql = 'SELECT 1
-			FROM ' . USERS_TABLE . '
-			WHERE user_new = 0';
-		$result = $this->db->sql_query_limit($sql, 1);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
-			$this->sql_query($sql);
-		}
-
-		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
-		// Check if the role is already assigned...
-		$sql = 'SELECT forum_id
-			FROM ' . ACL_GROUPS_TABLE . '
-			WHERE group_id = ' . $group_id . '
-				AND auth_role_id = ' . $f_role;
-		$result = $this->db->sql_query($sql);
-		$is_options = (int) $this->db->sql_fetchfield('forum_id');
-		$this->db->sql_freeresult($result);
-
-		// Not assigned at all... :/
-		if (!$is_options)
-		{
-			// Get postable forums
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_type != ' . FORUM_LINK;
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$this->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)');
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		// Clear permissions...
-		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->phpEx);
-		$auth_admin = new auth_admin();
-		$auth_admin->acl_clear_prefetch();
-	}
-}
diff --git a/phpBB/includes/db/migration/v306rc2.php b/phpBB/includes/db/migration/v306rc2.php
deleted file mode 100644
index 0a6c388da6..0000000000
--- a/phpBB/includes/db/migration/v306rc2.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v306rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v306rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v306rc3.php b/phpBB/includes/db/migration/v306rc3.php
deleted file mode 100644
index e2c4e66ada..0000000000
--- a/phpBB/includes/db/migration/v306rc3.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v306rc3 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v306rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_cp_fields'))),
-		);
-	}
-
-	function update_cp_fields()
-	{
-		// Update the Custom Profile Fields based on previous settings to the new format
-		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
-			SET field_show_on_vt = 1
-			WHERE field_hide = 0
-				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/v306rc4.php b/phpBB/includes/db/migration/v306rc4.php
deleted file mode 100644
index 92c1979311..0000000000
--- a/phpBB/includes/db/migration/v306rc4.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v306rc4 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v306rc3');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v307.php b/phpBB/includes/db/migration/v307.php
deleted file mode 100644
index a693a16676..0000000000
--- a/phpBB/includes/db/migration/v307.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v307 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v307rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v307pl1.php b/phpBB/includes/db/migration/v307pl1.php
deleted file mode 100644
index 3c1ed2be94..0000000000
--- a/phpBB/includes/db/migration/v307pl1.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v307pl1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v307');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v307rc1.php b/phpBB/includes/db/migration/v307rc1.php
deleted file mode 100644
index 9b55cb2757..0000000000
--- a/phpBB/includes/db/migration/v307rc1.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v307rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v306');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'drop_keys' => array(
-				$this->table_prefix . 'log' => array('log_time'),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'topics_track' => array(
-					'topic_id' => array('topic_id'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('feed_overall', 1)),
-			array('config.add', array('feed_http_auth', 0)),
-			array('config.add', array('feed_limit_post', $this->config['feed_limit'])),
-			array('config.add', array('feed_limit_topic', $this->config['feed_overall_topics_limit'])),
-			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
-			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
-			array('custom', array(array(&$this, 'delete_text_templates'))),
-		);
-	}
-
-	function delete_text_templates()
-	{
-		// Delete all text-templates from the template_data
-		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
-			WHERE template_filename ' . $this->db->sql_like_expression($this->db->any_char . '.txt');
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/v307rc2.php b/phpBB/includes/db/migration/v307rc2.php
deleted file mode 100644
index 438ebfb8c2..0000000000
--- a/phpBB/includes/db/migration/v307rc2.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v307rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v307rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_email_hash'))),
-		);
-	}
-
-	function update_email_hash($start = 0)
-	{
-		$limit = 1000;
-
-		$sql = 'SELECT user_id, user_email, user_email_hash
-			FROM ' . USERS_TABLE . '
-			WHERE user_type <> ' . USER_IGNORE . "
-				AND user_email <> ''";
-		$result = $this->db->sql_query_limit($sql, $limit, $start);
-
-		$i = 0;
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$i++;
-
-			// Snapshot of the phpbb_email_hash() function
-			// We cannot call it directly because the auto updater updates the DB first. :/
-			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
-
-			if ($user_email_hash != $row['user_email_hash'])
-			{
-				$sql_ary = array(
-					'user_email_hash'	=> $user_email_hash,
-				);
-
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE user_id = ' . (int) $row['user_id'];
-				$this->sql_query($sql);
-			}
-		}
-		$db->sql_freeresult($result);
-
-		if ($i < $limit)
-		{
-			// Completed
-			return false;
-		}
-
-		return $start + $limit;
-	}
-}
diff --git a/phpBB/includes/db/migration/v308.php b/phpBB/includes/db/migration/v308.php
deleted file mode 100644
index 8a0d96b2e7..0000000000
--- a/phpBB/includes/db/migration/v308.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v308 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v308rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v308rc1.php b/phpBB/includes/db/migration/v308rc1.php
deleted file mode 100644
index f365695058..0000000000
--- a/phpBB/includes/db/migration/v308rc1.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v308rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v307pl1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
-			array('custom', array(array(&$this, 'update_module_auth'))),
-			array('custom', array(array(&$this, 'update_bots'))),
-			array('custom', array(array(&$this, 'delete_orphan_shadow_topics'))),
-			array('module.add', array(
-				'post'	=> array(
-					'base'		=> 'board',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_POST_SETTINGS',
-					'auth'		=> 'acl_a_board',
-					'cat'		=> 'ACP_MESSAGES',
-					'after'		=> array('message', 'ACP_MESSAGE_SETTINGS')
-				),
-			)),
-			array('config.add', array('load_unreads_search', 1)),
-			array('config.update_if_equals', array(600, 'queue_interval', 60)),
-			array('config.update_if_equals', array(50, 'email_package_size', 20)),
-		);
-	}
-
-	function update_file_extension_group_names()
-	{
-		// Update file extension group names to use language strings.
-		$sql = 'SELECT lang_dir
-			FROM ' . LANG_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		$extension_groups_updated = array();
-		while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
-		{
-			$lang_dir = basename($lang_dir);
-
-			// The language strings we need are either in language/.../acp/attachments.php
-			// in the update package if we're updating to 3.0.8-RC1 or later,
-			// or they are in language/.../install.php when we're updating from 3.0.7-PL1 or earlier.
-			// On an already updated board, they can also already be in language/.../acp/attachments.php
-			// in the board root.
-			$lang_files = array(
-				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.$this->phpEx",
-				"{$this->phpbb_root_path}language/$lang_dir/install.$this->phpEx",
-				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.$this->phpEx",
-			);
-
-			foreach ($lang_files as $lang_file)
-			{
-				if (!file_exists($lang_file))
-				{
-					continue;
-				}
-
-				$lang = array();
-				include($lang_file);
-
-				foreach($lang as $lang_key => $lang_val)
-				{
-					if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
-					{
-						continue;
-					}
-
-					$sql_ary = array(
-						'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
-					);
-
-					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-						SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
-						WHERE group_name = '" . $this->db->sql_escape($lang_val) . "'";
-					$this->sql_query($sql);
-
-					$extension_groups_updated[$lang_key] = true;
-				}
-			}
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	function update_module_auth()
-	{
-		$sql = 'UPDATE ' . MODULES_TABLE . '
-			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
-			WHERE module_class = \'ucp\'
-				AND module_basename = \'profile\'
-				AND module_mode = \'avatar\'';
-		$this->sql_query($sql);
-	}
-
-	function update_bots()
-	{
-		$bot_name = 'Bing [Bot]';
-		$bot_name_clean = utf8_clean_string($bot_name);
-
-		$sql = 'SELECT user_id
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . $this->db->sql_escape($bot_name_clean) . "'";
-		$result = $this->db->sql_query($sql);
-		$bing_already_added = (bool) $this->db->sql_fetchfield('user_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$bing_already_added)
-		{
-			$bot_agent = 'bingbot/';
-			$bot_ip = '';
-			$sql = 'SELECT group_id, group_colour
-				FROM ' . GROUPS_TABLE . "
-				WHERE group_name = 'BOTS'";
-			$result = $this->db->sql_query($sql);
-			$group_row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$group_row)
-			{
-				// default fallback, should never get here
-				$group_row['group_id'] = 6;
-				$group_row['group_colour'] = '9E8DA7';
-			}
-
-			if (!function_exists('user_add'))
-			{
-				include($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
-			}
-
-			$user_row = array(
-				'user_type'				=> USER_IGNORE,
-				'group_id'				=> $group_row['group_id'],
-				'username'				=> $bot_name,
-				'user_regdate'			=> time(),
-				'user_password'			=> '',
-				'user_colour'			=> $group_row['group_colour'],
-				'user_email'			=> '',
-				'user_lang'				=> $this->config['default_lang'],
-				'user_style'			=> $this->config['default_style'],
-				'user_timezone'			=> 0,
-				'user_dateformat'		=> $this->config['default_dateformat'],
-				'user_allow_massemail'	=> 0,
-			);
-
-			$user_id = user_add($user_row);
-
-			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
-				'bot_active'	=> 1,
-				'bot_name'		=> (string) $bot_name,
-				'user_id'		=> (int) $user_id,
-				'bot_agent'		=> (string) $bot_agent,
-				'bot_ip'		=> (string) $bot_ip,
-			));
-
-			$this->sql_query($sql);
-		}
-	}
-
-	function delete_orphan_shadow_topics()
-	{
-		// Delete shadow topics pointing to not existing topics
-		$batch_size = 500;
-
-		// Set of affected forums we have to resync
-		$sync_forum_ids = array();
-
-		$sql_array = array(
-			'SELECT'	=> 't1.topic_id, t1.forum_id',
-			'FROM'		=> array(
-				TOPICS_TABLE	=> 't1',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(TOPICS_TABLE	=> 't2'),
-					'ON'	=> 't1.topic_moved_id = t2.topic_id',
-				),
-			),
-			'WHERE'		=> 't1.topic_moved_id <> 0
-						AND t2.topic_id IS NULL',
-		);
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-		$result = $this->db->sql_query_limit($sql, $batch_size);
-
-		$topic_ids = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$topic_ids[] = (int) $row['topic_id'];
-
-			$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($topic_ids))
-		{
-			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
-			$this->db->sql_query($sql);
-
-			// Sync the forums we have deleted shadow topics from.
-			sync('forum', 'forum_id', $sync_forum_ids, true, true);
-
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/v309.php b/phpBB/includes/db/migration/v309.php
deleted file mode 100644
index ebb246da3a..0000000000
--- a/phpBB/includes/db/migration/v309.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v309 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v309rc4');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v309rc1.php b/phpBB/includes/db/migration/v309rc1.php
deleted file mode 100644
index e8db93c78d..0000000000
--- a/phpBB/includes/db/migration/v309rc1.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v309rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v308');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_tables' => array(
-				$this->table_prefix . 'login_attempts' => array(
-					'COLUMNS' => array(
-						// this column was removed from the database updater
-						// after 3.0.9-RC3 was released. It might still exist
-						// in 3.0.9-RCX installations and has to be dropped in
-						// 3.0.12 after the db_tools class is capable of properly
-						// removing a primary key.
-						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
-						'attempt_ip'			=> array('VCHAR:40', ''),
-						'attempt_browser'		=> array('VCHAR:150', ''),
-						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
-						'attempt_time'			=> array('TIMESTAMP', 0),
-						'user_id'				=> array('UINT', 0),
-						'username'				=> array('VCHAR_UNI:255', 0),
-						'username_clean'		=> array('VCHAR_CI', 0),
-					),
-					//'PRIMARY_KEY' => 'attempt_id',
-					'KEYS' => array(
-						'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
-						'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
-						'att_time' => array('INDEX', array('attempt_time')),
-						'user_id' => array('INDEX', 'user_id'),
-					),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'bbcode' => array(
-					'bbcode_id' => array('USINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('ip_login_limit_max', 50)),
-			array('config.add', array('ip_login_limit_time', 21600)),
-			array('config.add', array('ip_login_limit_use_forwarded', 0)),
-			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
-			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
-		);
-	}
-
-	function update_file_extension_group_names()
-	{
-		// Update file extension group names to use language strings, again.
-		$sql = 'SELECT group_id, group_name
-			FROM ' . EXTENSION_GROUPS_TABLE . '
-			WHERE group_name ' . $this->db->sql_like_expression('EXT_GROUP_' . $this->db->any_char);
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql_ary = array(
-				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
-			);
-
-			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE group_id = ' . $row['group_id'];
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	function fix_firebird_qa_captcha()
-	{
-		// Recover from potentially broken Q&A CAPTCHA table on firebird
-		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
-		// without data loss
-		if ($this->db_tools->sql_layer == 'firebird')
-		{
-			$tables = array(
-				$this->table_prefix . 'captcha_questions',
-				$this->table_prefix . 'captcha_answers',
-				$this->table_prefix . 'qa_confirm',
-			);
-			foreach ($tables as $table)
-			{
-				if ($this->db_tools->sql_table_exists($table))
-				{
-					$this->db_tools->sql_table_drop($table);
-				}
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/v309rc2.php b/phpBB/includes/db/migration/v309rc2.php
deleted file mode 100644
index d552b95e7a..0000000000
--- a/phpBB/includes/db/migration/v309rc2.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v309rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v309rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v309rc3.php b/phpBB/includes/db/migration/v309rc3.php
deleted file mode 100644
index 4c215c09f7..0000000000
--- a/phpBB/includes/db/migration/v309rc3.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v309rc3 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v309rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/v309rc4.php b/phpBB/includes/db/migration/v309rc4.php
deleted file mode 100644
index 92f3d81947..0000000000
--- a/phpBB/includes/db/migration/v309rc4.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_v309rc4 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_v309rc3');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migrationtools/base.php b/phpBB/includes/db/migrationtools/base.php
new file mode 100644
index 0000000000..7fc6057e3a
--- /dev/null
+++ b/phpBB/includes/db/migrationtools/base.php
@@ -0,0 +1,15 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migrationtools_base
+{
+	var $cache;
+	var $config;
+	var $db;
+}
\ No newline at end of file
diff --git a/phpBB/includes/db/migrationtools/config.php b/phpBB/includes/db/migrationtools/config.php
new file mode 100644
index 0000000000..5a40e39943
--- /dev/null
+++ b/phpBB/includes/db/migrationtools/config.php
@@ -0,0 +1,121 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migrationtools_config extends phpbb_db_migration
+{
+	/**
+	* Config Exists
+	*
+	* This function is to check to see if a config variable exists or if it does not.
+	*
+	* @param string $config_name The name of the config setting you wish to check for.
+	* @param bool $return_result - return the config value/default if true : default false.
+	*
+	* @return bool true/false if config exists
+	*/
+	function config_exists($config_name, $return_result = false)
+	{
+		$sql = 'SELECT *
+				FROM ' . CONFIG_TABLE . "
+				WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			if (!isset($this->config[$config_name]))
+			{
+				$this->config[$config_name] = $row['config_value'];
+
+				if (!$row['is_dynamic'])
+				{
+					$this->cache->destroy('config');
+				}
+			}
+
+			return ($return_result) ? $row : true;
+		}
+
+		// this should never happen, but if it does, we need to remove the config from the array
+		if (isset($this->config[$config_name]))
+		{
+			unset($this->config[$config_name]);
+			$this->cache->destroy('config');
+		}
+
+		return false;
+	}
+
+	/**
+	* Config Add
+	*
+	* This function allows you to add a config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to add
+	* @param mixed $config_value The value of the config setting
+	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
+	*
+	* @return result
+	*/
+	function config_add($config_name, $config_value = '', $is_dynamic = false)
+	{
+		if ($this->config_exists($config_name))
+		{
+			return $this->umil_end('CONFIG_ALREADY_EXISTS', $config_name);
+		}
+
+		set_config($config_name, $config_value, $is_dynamic);
+	}
+
+	/**
+	* Config Update
+	*
+	* This function allows you to update an existing config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to update
+	* @param mixed $config_value The value of the config setting
+	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
+	*
+	* @return result
+	*/
+	function config_update($config_name, $config_value = '')
+	{
+		if (!$this->config_exists($config_name))
+		{
+			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		set_config($config_name, $config_value);
+	}
+
+	/**
+	* Config Remove
+	*
+	* This function allows you to remove an existing config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to remove
+	*
+	* @return result
+	*/
+	function config_remove($config_name)
+	{
+		if (!$this->config_exists($config_name))
+		{
+			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		$sql = 'DELETE FROM ' . CONFIG_TABLE . "
+			WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
+		$this->db->sql_query($sql);
+
+		unset($this->config[$config_name]);
+		$this->cache->destroy('config');
+	}
+}
\ No newline at end of file
diff --git a/phpBB/includes/db/migrationtools/umil.php b/phpBB/includes/db/migrationtools/umil.php
new file mode 100644
index 0000000000..ce7b8ff3be
--- /dev/null
+++ b/phpBB/includes/db/migrationtools/umil.php
@@ -0,0 +1,3037 @@
+<?php
+/**
+ *
+ * @author Nathan Guse (EXreaction) http://lithiumstudios.org
+ * @author David Lewis (Highway of Life) highwayoflife@gmail.com
+ * @package umil
+ * @version $Id$
+ * @copyright (c) 2008 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ *
+ */
+
+/**
+ * @ignore
+ */
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+define('UMIL_VERSION', '1.0.4');
+
+/**
+* Multicall instructions
+*
+* With the "multicall" (as I am calling it) you can make a single function call and have it repeat the actions multiple times on information sent from an array.
+*
+* To do this (it does not work on the _exists functions), all you must do is send the first variable in the function call as an array and for each item, send an array for each of the variables in order.
+*
+* Example:
+* $umil->config_add(array(
+*	array('config_name', 'config_value'),
+*	array('config_name1', 'config_value1'),
+*	array('config_name2', 'config_value2', true),
+*	array('config_name3', 'config_value3', true),
+* );
+*/
+
+/**
+* UMIL - Unified MOD Installation Library class
+*
+* Cache Functions
+*	cache_purge($type = '', $style_id = 0)
+*
+* Config Functions:
+*	config_exists($config_name, $return_result = false)
+*	config_add($config_name, $config_value = '', $is_dynamic = false)
+*	config_update($config_name, $config_value, $is_dynamic = false)
+*	config_remove($config_name)
+*
+* Module Functions
+*	module_exists($class, $parent, $module)
+*	module_add($class, $parent = 0, $data = array())
+*	module_remove($class, $parent = 0, $module = '')
+*
+* Permissions/Auth Functions
+*	permission_exists($auth_option, $global = true)
+*	permission_add($auth_option, $global = true)
+*	permission_remove($auth_option, $global = true)
+*	permission_set($name, $auth_option = array(), $type = 'role', $global = true, $has_permission = true)
+*	permission_unset($name, $auth_option = array(), $type = 'role', $global = true)
+*
+* Table Functions
+*	table_exists($table_name)
+*	table_add($table_name, $table_data = array())
+*	table_remove($table_name)
+*
+* Table Column Functions
+*	table_column_exists($table_name, $column_name)
+*	table_column_add($table_name, $column_name = '', $column_data = array())
+*	table_column_update($table_name, $column_name = '', $column_data = array())
+*	table_column_remove($table_name, $column_name = '')
+*
+* Table Key/Index Functions
+*	table_index_exists($table_name, $index_name)
+*	table_index_add($table_name, $index_name = '', $column = array())
+*	table_index_remove($table_name, $index_name = '')
+*
+* Table Row Functions (note that these actions are not reversed automatically during uninstallation)
+*	table_row_insert($table_name, $data = array())
+*	table_row_remove($table_name, $data = array())
+*	table_row_update($table_name, $data = array(), $new_data = array())
+*
+* Version Check Function
+* 	version_check($url, $path, $file)
+*/
+class umil
+{
+	/**
+	* This will hold the text output for the inputted command (if the mod author would like to display the command that was ran)
+	*
+	* @var string
+	*/
+	var $command = '';
+
+	/**
+	* This will hold the text output for the result of the command.  $user->lang['SUCCESS'] if everything worked.
+	*
+	* @var string
+	*/
+	var $result = '';
+
+	/**
+	* Auto run $this->display_results after running a command
+	*/
+	var $auto_display_results = false;
+
+	/**
+	* Stand Alone option (this makes it possible to just use the single umil file and not worry about any language stuff
+	*/
+	var $stand_alone = false;
+
+	/**
+	* Were any new permissions added (used in umil_frontend)?
+	*/
+	var $permissions_added = false;
+
+	/**
+	* Database Object
+	*/
+	var $db = false;
+
+	/**
+	* Database Tools Object
+	*/
+	var $db_tools = false;
+
+	/**
+	* Do we want a custom prefix besides the phpBB table prefix?  You *probably* should not change this...
+	*/
+	var $table_prefix = false;
+
+	/**
+	* Constructor
+	*/
+	function umil($stand_alone = false, $db = false)
+	{
+		// Setup $this->db
+		if ($db !== false)
+		{
+			if (!is_object($db) || !method_exists($db, 'sql_query'))
+			{
+				trigger_error('Invalid $db Object');
+			}
+
+			$this->db = $db;
+		}
+		else
+		{
+			global $db;
+			$this->db = $db;
+		}
+
+		// Setup $this->db_tools
+		if (!class_exists('phpbb_db_tools'))
+		{
+			global $phpbb_root_path, $phpEx;
+			include($phpbb_root_path . 'includes/db/db_tools.' . $phpEx);
+		}
+		$this->db_tools = new phpbb_db_tools($this->db);
+
+		$this->stand_alone = $stand_alone;
+
+		if (!$stand_alone)
+		{
+			global $config, $user, $phpbb_root_path, $phpEx;
+
+			/* Does not have the fall back option to use en/ if the user's language file does not exist, so we will not use it...unless that is changed.
+			if (method_exists('user', 'set_custom_lang_path'))
+			{
+				$user->set_custom_lang_path($phpbb_root_path . 'umil/language/');
+				$user->add_lang('umil');
+				$user->set_custom_lang_path($phpbb_root_path . 'language/');
+			}
+			else
+			{*/
+				// Include the umil language file.  First we check if the language file for the user's language is available, if not we check if the board's default language is available, if not we use the english file.
+				if (isset($user->data['user_lang']) && file_exists("{$phpbb_root_path}umil/language/{$user->data['user_lang']}/umil.$phpEx"))
+				{
+					$path = $user->data['user_lang'];
+				}
+				else if (file_exists("{$phpbb_root_path}umil/language/" . basename($config['default_lang']) . "/umil.$phpEx"))
+				{
+					$path = basename($config['default_lang']);
+				}
+				else if (file_exists("{$phpbb_root_path}umil/language/en/umil.$phpEx"))
+				{
+					$path = 'en';
+				}
+				else
+				{
+					trigger_error('Language Files Missing.<br /><br />Please download the latest UMIL (Unified MOD Install Library) from: <a href="http://www.phpbb.com/mods/umil/">phpBB.com/mods/umil</a>', E_USER_ERROR);
+				}
+
+				$user->add_lang('./../../umil/language/' . $path . '/umil');
+			//}
+
+			$user->add_lang(array('acp/common', 'acp/permissions'));
+
+			// Check to see if a newer version is available.
+			$info = $this->version_check('version.phpbb.com', '/umil', ((defined('PHPBB_QA')) ? 'umil_qa.txt' : 'umil.txt'));
+			if (is_array($info) && isset($info[0]) && isset($info[1]))
+			{
+				if (version_compare(UMIL_VERSION, $info[0], '<'))
+				{
+					global $template;
+
+					// Make sure user->setup() has been called
+					if (empty($user->lang))
+					{
+						$user->setup();
+					}
+
+					page_header('', false);
+
+					$user->lang['UPDATE_UMIL'] = (isset($user->lang['UPDATE_UMIL'])) ? $user->lang['UPDATE_UMIL'] : 'This version of UMIL is outdated.<br /><br />Please download the latest UMIL (Unified MOD Install Library) from: <a href="%1$s">%1$s</a>';
+					$template->assign_vars(array(
+						'S_BOARD_DISABLED'		=> true,
+						'L_BOARD_DISABLED'		=> sprintf($user->lang['UPDATE_UMIL'], $info[1]),
+					));
+				}
+			}
+		}
+	}
+
+	/**
+	* umil_start
+	*
+	* A function which runs (almost) every time a function here is ran
+	*/
+	function umil_start()
+	{
+		global $user;
+
+		// Set up the command.  This will get the arguments sent to the function.
+		$args = func_get_args();
+		$this->command = call_user_func_array(array($this, 'get_output_text'), $args);
+
+		$this->result = (isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS';
+		$this->db->sql_return_on_error(true);
+
+		//$this->db->sql_transaction('begin');
+	}
+
+	/**
+	* umil_end
+	*
+	* A function which runs (almost) every time a function here is ran
+	*/
+	function umil_end()
+	{
+		global $user;
+
+		// Set up the result.  This will get the arguments sent to the function.
+		$args = func_get_args();
+		$result = call_user_func_array(array($this, 'get_output_text'), $args);
+		$this->result = ($result) ? $result : $this->result;
+
+		if ($this->db->sql_error_triggered)
+		{
+			if ($this->result == ((isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS'))
+			{
+				$this->result = 'SQL ERROR ' . $this->db->sql_error_returned['message'];
+			}
+			else
+			{
+				$this->result .= '<br /><br />SQL ERROR ' . $this->db->sql_error_returned['message'];
+			}
+
+			//$this->db->sql_transaction('rollback');
+		}
+		else
+		{
+			//$this->db->sql_transaction('commit');
+		}
+
+		$this->db->sql_return_on_error(false);
+
+		// Auto output if requested.
+		if ($this->auto_display_results && method_exists($this, 'display_results'))
+		{
+			$this->display_results();
+		}
+
+		return '<strong>' . $this->command . '</strong><br />' . $this->result;
+	}
+
+	/**
+	* Get text for output
+	*
+	* Takes the given arguments and prepares them for the UI
+	*
+	* First argument sent is used as the language key
+	* Further arguments (if send) are used on the language key through vsprintf()
+	*
+	* @return string Returns the prepared string for output
+	*/
+	function get_output_text()
+	{
+		global $user;
+
+		// Set up the command.  This will get the arguments sent to the function.
+		$args = func_get_args();
+		if (sizeof($args))
+		{
+			$lang_key = array_shift($args);
+
+			if (sizeof($args))
+			{
+				$lang_args = array();
+				foreach ($args as $arg)
+				{
+					$lang_args[] = (isset($user->lang[$arg])) ? $user->lang[$arg] : $arg;
+				}
+
+				return @vsprintf(((isset($user->lang[$lang_key])) ? $user->lang[$lang_key] : $lang_key), $lang_args);
+			}
+			else
+			{
+				return ((isset($user->lang[$lang_key])) ? $user->lang[$lang_key] : $lang_key);
+			}
+		}
+
+		return '';
+	}
+
+	/**
+	* Run Actions
+	*
+	* Do-It-All function that can do everything required for installing/updating/uninstalling a mod based on an array of actions and the versions.
+	*
+	* @param string $action The action. install|update|uninstall
+	* @param array $versions The array of versions and the actions for each
+	* @param string $version_config_name The name of the config setting which holds/will hold the currently installed version
+	* @param string $version_select Added for the UMIL Auto system to allow you to select the version you want to install/update/uninstall to.
+	*/
+	function run_actions($action, $versions, $version_config_name, $version_select = '')
+	{
+		// We will sort the actions to prevent issues from mod authors incorrectly listing the version numbers
+		uksort($versions, 'version_compare');
+
+		// Find the current version to install
+		$current_version = '0.0.0';
+		foreach ($versions as $version => $actions)
+		{
+			$current_version = $version;
+		}
+
+		$db_version = '';
+		if ($this->config_exists($version_config_name))
+		{
+			global $config;
+			$db_version = $config[$version_config_name];
+		}
+
+		// Set the action to install from update if nothing is currently installed
+		if ($action == 'update' && !$db_version)
+		{
+			$action = 'install';
+		}
+
+		if ($action == 'install' || $action == 'update')
+		{
+			$version_installed = $db_version;
+			foreach ($versions as $version => $version_actions)
+			{
+				// If we are updating
+				if ($db_version && version_compare($version, $db_version, '<='))
+				{
+					continue;
+				}
+
+				if ($version_select && version_compare($version, $version_select, '>'))
+				{
+					break;
+				}
+
+				foreach ($version_actions as $method => $params)
+				{
+					if ($method == 'custom')
+					{
+						$this->_call_custom_function($params, $action, $version);
+					}
+					else
+					{
+						if (method_exists($this, $method))
+						{
+							call_user_func(array($this, $method), $params);
+						}
+					}
+				}
+
+				$version_installed = $version;
+			}
+
+			// update the version number or add it
+			if ($this->config_exists($version_config_name))
+			{
+				$this->config_update($version_config_name, $version_installed);
+			}
+			else
+			{
+				$this->config_add($version_config_name, $version_installed);
+			}
+		}
+		else if ($action == 'uninstall' && $db_version)
+		{
+			// reverse version list
+			$versions = array_reverse($versions);
+
+			foreach ($versions as $version => $version_actions)
+			{
+				// Uninstalling and this listed version is newer than installed
+				if (version_compare($version, $db_version, '>'))
+				{
+					continue;
+				}
+
+				// Version selection stuff
+				if ($version_select && version_compare($version, $version_select, '<='))
+				{
+					// update the version number
+					$this->config_update($version_config_name, $version);
+					break;
+				}
+
+				$cache_purge = false;
+				$version_actions = array_reverse($version_actions);
+				foreach ($version_actions as $method => $params)
+				{
+					if ($method == 'custom')
+					{
+						$this->_call_custom_function($params, $action, $version);
+					}
+					else
+					{
+						// This way we always run the cache purge at the end of the version (done for the uninstall because the instructions are reversed, which would cause the cache purge to be run at the beginning if it was meant to run at the end).
+						if ($method == 'cache_purge')
+						{
+							$cache_purge = $params;
+							continue;
+						}
+
+						// A few things are not possible for uninstallations update actions and table_row actions
+						if (strpos($method, 'update') !== false || strpos($method, 'table_insert') !== false || strpos($method, 'table_row_') !== false)
+						{
+							continue;
+						}
+
+						// reverse function call
+						$method = str_replace(array('add', 'remove', 'temp'), array('temp', 'add', 'remove'), $method);
+						$method = str_replace(array('set', 'unset', 'temp'), array('temp', 'set', 'unset'), $method);
+
+						if (method_exists($this, $method))
+						{
+							call_user_func(array($this, $method), ((is_array($params) ? array_reverse($params) : $params)));
+						}
+					}
+				}
+
+				if ($cache_purge !== false)
+				{
+					$this->cache_purge($cache_purge);
+				}
+			}
+
+			if (!$version_select)
+			{
+				// Unset the version number
+				$this->config_remove($version_config_name);
+			}
+		}
+	}
+
+	/**
+	* Call custom function helper
+	*/
+	function _call_custom_function($functions, $action, $version)
+	{
+		if (!is_array($functions))
+		{
+			$functions = array($functions);
+		}
+
+		$return = '';
+
+		foreach ($functions as $function)
+		{
+			if (function_exists($function))
+			{
+				// Must reset before calling the function
+				$this->umil_start();
+
+				$returned = call_user_func($function, $action, $version);
+				if (is_string($returned))
+				{
+					$this->command = $this->get_output_text($returned);
+				}
+				else if (is_array($returned) && isset($returned['command']))
+				{
+					if (is_array($returned['command']))
+					{
+						$this->command = call_user_func_array(array($this, 'get_output_text'), $returned['command']);
+					}
+					else
+					{
+						$this->command = $this->get_output_text($returned['command']);
+					}
+
+					if (isset($returned['result']))
+					{
+						$this->result = $this->get_output_text($returned['result']);
+					}
+				}
+				else
+				{
+					$this->command = $this->get_output_text('UNKNOWN');
+				}
+
+				$return .= $this->umil_end() . '<br />';
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	* Multicall Helper
+	*
+	* @param mixed $function Function name to call
+	* @param mixed $params The parameters array
+	*
+	* @return bool True if we have done a multicall ($params is an array), false if not ($params is not an array)
+	*/
+	function multicall($function, $params)
+	{
+		if (is_array($params) && !empty($params))
+		{
+			foreach ($params as $param)
+			{
+				if (!is_array($param))
+				{
+					call_user_func(array($this, $function), $param);
+				}
+				else
+				{
+					call_user_func_array(array($this, $function), $param);
+				}
+			}
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Cache Purge
+	*
+	* This function is for purging either phpBB3’s data cache, authorization cache, or the styles cache.
+	*
+	* @param string $type The type of cache you want purged.  Available types: auth, imageset, template, theme.  Anything else sent will purge the forum's cache.
+	* @param int $style_id The id of the item you want purged (if the type selected is imageset/template/theme, 0 for all items in that section)
+	*/
+	function cache_purge($type = '', $style_id = 0)
+	{
+		global $auth, $cache, $user, $phpbb_root_path, $phpEx;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $type))
+		{
+			return;
+		}
+
+		$style_id = (int) $style_id;
+		$type = (string) $type; // Prevent PHP bug.
+
+		switch ($type)
+		{
+			case 'auth' :
+				$this->umil_start('AUTH_CACHE_PURGE');
+				$cache->destroy('_acl_options');
+				$auth->acl_clear_prefetch();
+
+				return $this->umil_end();
+			break;
+
+			case 'imageset' :
+				if ($style_id == 0)
+				{
+					$return = array();
+					$sql = 'SELECT imageset_id
+						FROM ' . STYLES_IMAGESET_TABLE;
+					$result = $this->db->sql_query($sql);
+					while ($row = $this->db->sql_fetchrow($result))
+					{
+						$return[] = $this->cache_purge('imageset', $row['imageset_id']);
+					}
+					$this->db->sql_freeresult($result);
+
+					return implode('<br /><br />', $return);
+				}
+				else
+				{
+					$sql = 'SELECT *
+						FROM ' . STYLES_IMAGESET_TABLE . "
+						WHERE imageset_id = $style_id";
+					$result = $this->db->sql_query($sql);
+					$imageset_row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					if (!$imageset_row)
+					{
+						$this->umil_start('IMAGESET_CACHE_PURGE', 'UNKNOWN');
+						return $this->umil_end('FAIL');
+					}
+
+					$this->umil_start('IMAGESET_CACHE_PURGE', $imageset_row['imageset_name']);
+
+					// The following is from includes/acp/acp_styles.php (edited)
+					$sql_ary = array();
+
+					$cfg_data_imageset = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/imageset.cfg");
+
+					$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . '
+						WHERE imageset_id = ' . $style_id;
+					$result = $this->db->sql_query($sql);
+
+					foreach ($cfg_data_imageset as $image_name => $value)
+					{
+						if (strpos($value, '*') !== false)
+						{
+							if (substr($value, -1, 1) === '*')
+							{
+								list($image_filename, $image_height) = explode('*', $value);
+								$image_width = 0;
+							}
+							else
+							{
+								list($image_filename, $image_height, $image_width) = explode('*', $value);
+							}
+						}
+						else
+						{
+							$image_filename = $value;
+							$image_height = $image_width = 0;
+						}
+
+						if (strpos($image_name, 'img_') === 0 && $image_filename)
+						{
+							$image_name = substr($image_name, 4);
+
+							$sql_ary[] = array(
+								'image_name'		=> (string) $image_name,
+								'image_filename'	=> (string) $image_filename,
+								'image_height'		=> (int) $image_height,
+								'image_width'		=> (int) $image_width,
+								'imageset_id'		=> (int) $style_id,
+								'image_lang'		=> '',
+							);
+						}
+					}
+
+					$sql = 'SELECT lang_dir
+						FROM ' . LANG_TABLE;
+					$result = $this->db->sql_query($sql);
+
+					while ($row = $this->db->sql_fetchrow($result))
+					{
+						if (@file_exists("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg"))
+						{
+							$cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg");
+							foreach ($cfg_data_imageset_data as $image_name => $value)
+							{
+								if (strpos($value, '*') !== false)
+								{
+									if (substr($value, -1, 1) === '*')
+									{
+										list($image_filename, $image_height) = explode('*', $value);
+										$image_width = 0;
+									}
+									else
+									{
+										list($image_filename, $image_height, $image_width) = explode('*', $value);
+									}
+								}
+								else
+								{
+									$image_filename = $value;
+									$image_height = $image_width = 0;
+								}
+
+								if (strpos($image_name, 'img_') === 0 && $image_filename)
+								{
+									$image_name = substr($image_name, 4);
+									$sql_ary[] = array(
+										'image_name'		=> (string) $image_name,
+										'image_filename'	=> (string) $image_filename,
+										'image_height'		=> (int) $image_height,
+										'image_width'		=> (int) $image_width,
+										'imageset_id'		=> (int) $style_id,
+										'image_lang'		=> (string) $row['lang_dir'],
+									);
+								}
+							}
+						}
+					}
+					$this->db->sql_freeresult($result);
+
+					$this->db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
+
+					$cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE);
+
+					return $this->umil_end();
+				}
+			break;
+			//case 'imageset' :
+
+			case 'template' :
+				if ($style_id == 0)
+				{
+					$return = array();
+					$sql = 'SELECT template_id
+						FROM ' . STYLES_TEMPLATE_TABLE;
+					$result = $this->db->sql_query($sql);
+					while ($row = $this->db->sql_fetchrow($result))
+					{
+						$return[] = $this->cache_purge('template', $row['template_id']);
+					}
+					$this->db->sql_freeresult($result);
+
+					return implode('<br /><br />', $return);
+				}
+				else
+				{
+					$sql = 'SELECT *
+						FROM ' . STYLES_TEMPLATE_TABLE . "
+						WHERE template_id = $style_id";
+					$result = $this->db->sql_query($sql);
+					$template_row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					if (!$template_row)
+					{
+						$this->umil_start('TEMPLATE_CACHE_PURGE', 'UNKNOWN');
+						return $this->umil_end('FAIL');
+					}
+
+					$this->umil_start('TEMPLATE_CACHE_PURGE', $template_row['template_name']);
+
+					// The following is from includes/acp/acp_styles.php
+					if ($template_row['template_storedb'] && file_exists("{$phpbb_root_path}styles/{$template_row['template_path']}/template/"))
+					{
+						$filelist = array('' => array());
+
+						$sql = 'SELECT template_filename, template_mtime
+							FROM ' . STYLES_TEMPLATE_DATA_TABLE . "
+							WHERE template_id = $style_id";
+						$result = $this->db->sql_query($sql);
+
+						while ($row = $this->db->sql_fetchrow($result))
+						{
+//							if (@filemtime("{$phpbb_root_path}styles/{$template_row['template_path']}/template/" . $row['template_filename']) > $row['template_mtime'])
+//							{
+								// get folder info from the filename
+								if (($slash_pos = strrpos($row['template_filename'], '/')) === false)
+								{
+									$filelist[''][] = $row['template_filename'];
+								}
+								else
+								{
+									$filelist[substr($row['template_filename'], 0, $slash_pos + 1)][] = substr($row['template_filename'], $slash_pos + 1, strlen($row['template_filename']) - $slash_pos - 1);
+								}
+//							}
+						}
+						$this->db->sql_freeresult($result);
+
+						$includes = array();
+						foreach ($filelist as $pathfile => $file_ary)
+						{
+							foreach ($file_ary as $file)
+							{
+								if (!($fp = @fopen("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file", 'r')))
+								{
+									return $this->umil_end('FILE_COULD_NOT_READ', "{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file");
+								}
+								$template_data = fread($fp, filesize("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"));
+								fclose($fp);
+
+								if (preg_match_all('#<!-- INCLUDE (.*?\.html) -->#is', $template_data, $matches))
+								{
+									foreach ($matches[1] as $match)
+									{
+										$includes[trim($match)][] = $file;
+									}
+								}
+							}
+						}
+
+						foreach ($filelist as $pathfile => $file_ary)
+						{
+							foreach ($file_ary as $file)
+							{
+								// Skip index.
+								if (strpos($file, 'index.') === 0)
+								{
+									continue;
+								}
+
+								// We could do this using extended inserts ... but that could be one
+								// heck of a lot of data ...
+								$sql_ary = array(
+									'template_id'			=> (int) $style_id,
+									'template_filename'		=> "$pathfile$file",
+									'template_included'		=> (isset($includes[$file])) ? implode(':', $includes[$file]) . ':' : '',
+									'template_mtime'		=> (int) filemtime("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"),
+									'template_data'			=> (string) file_get_contents("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"),
+								);
+
+								$sql = 'UPDATE ' . STYLES_TEMPLATE_DATA_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+									WHERE template_id = $style_id
+										AND template_filename = '" . $this->db->sql_escape("$pathfile$file") . "'";
+								$this->db->sql_query($sql);
+							}
+						}
+						unset($filelist);
+					}
+
+					// Purge the forum's cache as well.
+					$cache->purge();
+
+					return $this->umil_end();
+				}
+			break;
+			//case 'template' :
+
+			case 'theme' :
+				if ($style_id == 0)
+				{
+					$return = array();
+					$sql = 'SELECT theme_id
+						FROM ' . STYLES_THEME_TABLE;
+					$result = $this->db->sql_query($sql);
+					while ($row = $this->db->sql_fetchrow($result))
+					{
+						$return[] = $this->cache_purge('theme', $row['theme_id']);
+					}
+					$this->db->sql_freeresult($result);
+
+					return implode('<br /><br />', $return);
+				}
+				else
+				{
+					$sql = 'SELECT *
+						FROM ' . STYLES_THEME_TABLE . "
+						WHERE theme_id = $style_id";
+					$result = $this->db->sql_query($sql);
+					$theme_row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					if (!$theme_row)
+					{
+						$this->umil_start('THEME_CACHE_PURGE', 'UNKNOWN');
+						return $this->umil_end('FAIL');
+					}
+
+					$this->umil_start('THEME_CACHE_PURGE', $theme_row['theme_name']);
+
+					// The following is from includes/acp/acp_styles.php
+					if ($theme_row['theme_storedb'] && file_exists("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css"))
+					{
+						$stylesheet = file_get_contents($phpbb_root_path . 'styles/' . $theme_row['theme_path'] . '/theme/stylesheet.css');
+
+						// Match CSS imports
+						$matches = array();
+						preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches);
+
+						if (sizeof($matches))
+						{
+							foreach ($matches[0] as $idx => $match)
+							{
+								if (!file_exists("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/{$matches[1][$idx]}"))
+								{
+									continue;
+								}
+
+								$content = trim(file_get_contents("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/{$matches[1][$idx]}"));
+								$stylesheet = str_replace($match, $content, $stylesheet);
+							}
+						}
+
+						// adjust paths
+						$db_theme_data = str_replace('./', 'styles/' . $theme_row['theme_path'] . '/theme/', $stylesheet);
+
+						// Save CSS contents
+						$sql_ary = array(
+							'theme_mtime'	=> (int) filemtime("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css"),
+							'theme_data'	=> $db_theme_data,
+						);
+
+						$sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+							WHERE theme_id = $style_id";
+						$this->db->sql_query($sql);
+
+						$cache->destroy('sql', STYLES_THEME_TABLE);
+					}
+
+					return $this->umil_end();
+				}
+			break;
+			//case 'theme' :
+
+			default:
+				$this->umil_start('CACHE_PURGE');
+				$cache->purge();
+
+				return $this->umil_end();
+			break;
+		}
+	}
+
+	/**
+	* Config Exists
+	*
+	* This function is to check to see if a config variable exists or if it does not.
+	*
+	* @param string $config_name The name of the config setting you wish to check for.
+	* @param bool $return_result - return the config value/default if true : default false.
+	*
+	* @return bool true/false if config exists
+	*/
+	function config_exists($config_name, $return_result = false)
+	{
+		global $config, $cache;
+
+		$sql = 'SELECT *
+				FROM ' . CONFIG_TABLE . "
+				WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			if (!isset($config[$config_name]))
+			{
+				$config[$config_name] = $row['config_value'];
+
+				if (!$row['is_dynamic'])
+				{
+					$cache->destroy('config');
+				}
+			}
+
+			return ($return_result) ? $row : true;
+		}
+
+		// this should never happen, but if it does, we need to remove the config from the array
+		if (isset($config[$config_name]))
+		{
+			unset($config[$config_name]);
+			$cache->destroy('config');
+		}
+
+		return false;
+	}
+
+	/**
+	* Config Add
+	*
+	* This function allows you to add a config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to add
+	* @param mixed $config_value The value of the config setting
+	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
+	*
+	* @return result
+	*/
+	function config_add($config_name, $config_value = '', $is_dynamic = false)
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $config_name))
+		{
+			return;
+		}
+
+		$this->umil_start('CONFIG_ADD', $config_name);
+
+		if ($this->config_exists($config_name))
+		{
+			return $this->umil_end('CONFIG_ALREADY_EXISTS', $config_name);
+		}
+
+		set_config($config_name, $config_value, $is_dynamic);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Config Update
+	*
+	* This function allows you to update an existing config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to update
+	* @param mixed $config_value The value of the config setting
+	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
+	*
+	* @return result
+	*/
+	function config_update($config_name, $config_value = '', $is_dynamic = false)
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $config_name))
+		{
+			return;
+		}
+
+		$this->umil_start('CONFIG_UPDATE', $config_name);
+
+		if (!$this->config_exists($config_name))
+		{
+			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		set_config($config_name, $config_value, $is_dynamic);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Config Remove
+	*
+	* This function allows you to remove an existing config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to remove
+	*
+	* @return result
+	*/
+	function config_remove($config_name)
+	{
+		global $cache, $config;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $config_name))
+		{
+			return;
+		}
+
+		$this->umil_start('CONFIG_REMOVE', $config_name);
+
+		if (!$this->config_exists($config_name))
+		{
+			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		$sql = 'DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
+		$this->db->sql_query($sql);
+
+		unset($config[$config_name]);
+		$cache->destroy('config');
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Module Exists
+	*
+	* Check if a module exists
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
+	* @param int|string $module The module_id|module_langname you would like to check for to see if it exists
+	*/
+	function module_exists($class, $parent, $module)
+	{
+		// the main root directory should return true
+		if (!$module)
+		{
+			return true;
+		}
+
+		$class = $this->db->sql_escape($class);
+		$module = $this->db->sql_escape($module);
+
+		$parent_sql = '';
+		if ($parent !== false)
+		{
+			// Allows '' to be sent as 0
+			$parent = (!$parent) ? 0 : $parent;
+
+			if (!is_numeric($parent))
+			{
+				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+					WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+					AND module_class = '$class'";
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				if (!$row)
+				{
+					return false;
+				}
+
+				$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
+			}
+			else
+			{
+				$parent_sql = 'AND parent_id = ' . (int) $parent;
+			}
+		}
+
+		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+			WHERE module_class = '$class'
+			$parent_sql
+			AND " . ((is_numeric($module)) ? 'module_id = ' . (int) $module : "module_langname = '$module'");
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Module Add
+	*
+	* Add a new module
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string $parent The parent module_id|module_langname (0 for no parent)
+	* @param array $data an array of the data on the new module.  This can be setup in two different ways.
+	*	1. The "manual" way.  For inserting a category or one at a time.  It will be merged with the base array shown a bit below,
+	*		but at the least requires 'module_langname' to be sent, and, if you want to create a module (instead of just a category) you must send module_basename and module_mode.
+	* array(
+	*		'module_enabled'	=> 1,
+	*		'module_display'	=> 1,
+	*		'module_basename'	=> '',
+	*		'module_class'		=> $class,
+	*		'parent_id'			=> (int) $parent,
+	*		'module_langname'	=> '',
+	*		'module_mode'		=> '',
+	*		'module_auth'		=> '',
+	*	)
+	*	2. The "automatic" way.  For inserting multiple at a time based on the specs in the info file for the module(s).  For this to work the modules must be correctly setup in the info file.
+	*		An example follows (this would insert the settings, log, and flag modes from the includes/acp/info/acp_asacp.php file):
+	* array(
+	* 		'module_basename'	=> 'asacp',
+	* 		'modes'				=> array('settings', 'log', 'flag'),
+	* )
+	* 		Optionally you may not send 'modes' and it will insert all of the modules in that info file.
+	*  @param string|bool $include_path If you would like to use a custom include path, specify that here
+	*/
+	function module_add($class, $parent = 0, $data = array(), $include_path = false)
+	{
+		global $cache, $user, $phpbb_root_path, $phpEx;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $class))
+		{
+			return;
+		}
+
+		// Prevent stupid things like trying to add a module with no name or any data on it
+		if (empty($data))
+		{
+			$this->umil_start('MODULE_ADD', $class, 'UNKNOWN');
+			return $this->umil_end('FAIL');
+		}
+
+        // Allows '' to be sent as 0
+		$parent = (!$parent) ? 0 : $parent;
+
+		// allow sending the name as a string in $data to create a category
+		if (!is_array($data))
+		{
+			$data = array('module_langname' => $data);
+		}
+
+		if (!isset($data['module_langname']))
+		{
+			// The "automatic" way
+			$basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
+			$basename = str_replace(array('/', '\\'), '', $basename);
+			$class = str_replace(array('/', '\\'), '', $class);
+			$info_file = "$class/info/{$class}_$basename.$phpEx";
+
+			// The manual and automatic ways both failed...
+			if (!file_exists((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file))
+			{
+				$this->umil_start('MODULE_ADD', $class, $info_file);
+				return $this->umil_end('FAIL');
+			}
+
+			$classname = "{$class}_{$basename}_info";
+
+			if (!class_exists($classname))
+			{
+				include((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file);
+			}
+
+			$info = new $classname;
+			$module = $info->module();
+			unset($info);
+
+			$result = '';
+			foreach ($module['modes'] as $mode => $module_info)
+			{
+				if (!isset($data['modes']) || in_array($mode, $data['modes']))
+				{
+					$new_module = array(
+						'module_basename'	=> $basename,
+						'module_langname'	=> $module_info['title'],
+						'module_mode'		=> $mode,
+						'module_auth'		=> $module_info['auth'],
+						'module_display'	=> (isset($module_info['display'])) ? $module_info['display'] : true,
+						'before'			=> (isset($module_info['before'])) ? $module_info['before'] : false,
+						'after'				=> (isset($module_info['after'])) ? $module_info['after'] : false,
+					);
+
+					// Run the "manual" way with the data we've collected.
+					$result .= ((isset($data['spacer'])) ? $data['spacer'] : '<br />') . $this->module_add($class, $parent, $new_module);
+				}
+			}
+
+			return $result;
+		}
+
+		// The "manual" way
+		$this->umil_start('MODULE_ADD', $class, ((isset($user->lang[$data['module_langname']])) ? $user->lang[$data['module_langname']] : $data['module_langname']));
+		add_log('admin', 'LOG_MODULE_ADD', ((isset($user->lang[$data['module_langname']])) ? $user->lang[$data['module_langname']] : $data['module_langname']));
+
+		$class = $this->db->sql_escape($class);
+
+		if (!is_numeric($parent))
+		{
+			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+				WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+				AND module_class = '$class'";
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$row)
+			{
+				return $this->umil_end('PARENT_NOT_EXIST');
+			}
+
+			$parent = $data['parent_id'] = $row['module_id'];
+		}
+		else if (!$this->module_exists($class, false, $parent))
+		{
+			return $this->umil_end('PARENT_NOT_EXIST');
+		}
+
+		if ($this->module_exists($class, $parent, $data['module_langname']))
+		{
+			return $this->umil_end('MODULE_ALREADY_EXIST');
+		}
+
+		if (!class_exists('acp_modules'))
+		{
+			include($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
+			$user->add_lang('acp/modules');
+		}
+		$acp_modules = new acp_modules();
+
+		$module_data = array(
+			'module_enabled'	=> (isset($data['module_enabled'])) ? $data['module_enabled'] : 1,
+			'module_display'	=> (isset($data['module_display'])) ? $data['module_display'] : 1,
+			'module_basename'	=> (isset($data['module_basename'])) ? $data['module_basename'] : '',
+			'module_class'		=> $class,
+			'parent_id'			=> (int) $parent,
+			'module_langname'	=> (isset($data['module_langname'])) ? $data['module_langname'] : '',
+			'module_mode'		=> (isset($data['module_mode'])) ? $data['module_mode'] : '',
+			'module_auth'		=> (isset($data['module_auth'])) ? $data['module_auth'] : '',
+		);
+		$result = $acp_modules->update_module_data($module_data, true);
+
+		// update_module_data can either return a string or an empty array...
+		if (is_string($result))
+		{
+			// Error
+			$this->result = $this->get_output_text($result);
+		}
+		else
+		{
+			// Success
+
+			// Move the module if requested above/below an existing one
+			if (isset($data['before']) && $data['before'])
+			{
+				$sql = 'SELECT left_id FROM ' . MODULES_TABLE . '
+					WHERE module_class = \'' . $class . '\'
+					AND parent_id = ' . (int) $parent . '
+					AND module_langname = \'' . $this->db->sql_escape($data['before']) . '\'';
+				$this->db->sql_query($sql);
+				$to_left = $this->db->sql_fetchfield('left_id');
+
+				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
+					WHERE module_class = '$class'
+					AND left_id >= $to_left
+					AND left_id < {$module_data['left_id']}";
+				$this->db->sql_query($sql);
+
+				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = $to_left, right_id = " . ($to_left + 1) . "
+					WHERE module_class = '$class'
+					AND module_id = {$module_data['module_id']}";
+				$this->db->sql_query($sql);
+			}
+			else if (isset($data['after']) && $data['after'])
+			{
+				$sql = 'SELECT right_id FROM ' . MODULES_TABLE . '
+					WHERE module_class = \'' . $class . '\'
+					AND parent_id = ' . (int) $parent . '
+					AND module_langname = \'' . $this->db->sql_escape($data['after']) . '\'';
+				$this->db->sql_query($sql);
+				$to_right = $this->db->sql_fetchfield('right_id');
+
+				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
+					WHERE module_class = '$class'
+					AND left_id >= $to_right
+					AND left_id < {$module_data['left_id']}";
+				$this->db->sql_query($sql);
+
+				$sql = 'UPDATE ' . MODULES_TABLE . ' SET left_id = ' . ($to_right + 1) . ', right_id = ' . ($to_right + 2) . "
+					WHERE module_class = '$class'
+					AND module_id = {$module_data['module_id']}";
+				$this->db->sql_query($sql);
+			}
+		}
+
+		// Clear the Modules Cache
+		$cache->destroy("_modules_$class");
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Module Remove
+	*
+	* Remove a module
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
+	* @param int|string $module The module id|module_langname
+	* @param string|bool $include_path If you would like to use a custom include path, specify that here
+	*/
+	function module_remove($class, $parent = 0, $module = '', $include_path = false)
+	{
+		global $cache, $user, $phpbb_root_path, $phpEx;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $class))
+		{
+			return;
+		}
+
+		// Imitation of module_add's "automatic" and "manual" method so the uninstaller works from the same set of instructions for umil_auto
+		if (is_array($module))
+		{
+			if (isset($module['module_langname']))
+			{
+				// Manual Method
+				return $this->module_remove($class, $parent, $module['module_langname'], $include_path);
+			}
+
+			// Failed.
+			if (!isset($module['module_basename']))
+			{
+				$this->umil_start('MODULE_REMOVE', $class, 'UNKNOWN');
+				return $this->umil_end('FAIL');
+			}
+
+			// Automatic method
+			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
+			$class = str_replace(array('/', '\\'), '', $class);
+			$info_file = "$class/info/{$class}_$basename.$phpEx";
+
+			if (!file_exists((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file))
+			{
+				$this->umil_start('MODULE_REMOVE', $class, $info_file);
+				return $this->umil_end('FAIL');
+			}
+
+			$classname = "{$class}_{$basename}_info";
+
+			if (!class_exists($classname))
+			{
+				include((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file);
+			}
+
+			$info = new $classname;
+			$module_info = $info->module();
+			unset($info);
+
+			$result = '';
+			foreach ($module_info['modes'] as $mode => $info)
+			{
+				if (!isset($module['modes']) || in_array($mode, $module['modes']))
+				{
+					$result .= $this->module_remove($class, $parent, $info['title']) . '<br />';
+				}
+			}
+			return $result;
+		}
+		else
+		{
+			$class = $this->db->sql_escape($class);
+
+			if (!$this->module_exists($class, $parent, $module))
+			{
+				$this->umil_start('MODULE_REMOVE', $class, ((isset($user->lang[$module])) ? $user->lang[$module] : $module));
+				return $this->umil_end('MODULE_NOT_EXIST');
+			}
+
+			$parent_sql = '';
+			if ($parent !== false)
+			{
+				// Allows '' to be sent as 0
+				$parent = (!$parent) ? 0 : $parent;
+
+				if (!is_numeric($parent))
+				{
+					$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+						WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+						AND module_class = '$class'";
+					$result = $this->db->sql_query($sql);
+					$row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					// we know it exists from the module_exists check
+					$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
+				}
+				else
+				{
+					$parent_sql = 'AND parent_id = ' . (int) $parent;
+				}
+			}
+
+			$module_ids = array();
+			if (!is_numeric($module))
+			{
+				$module = $this->db->sql_escape($module);
+				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+					WHERE module_langname = '$module'
+					AND module_class = '$class'
+					$parent_sql";
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$module_ids[] = (int) $row['module_id'];
+				}
+				$this->db->sql_freeresult($result);
+
+				$module_name = $module;
+			}
+			else
+			{
+				$module = (int) $module;
+				$sql = 'SELECT module_langname FROM ' . MODULES_TABLE . "
+					WHERE module_id = $module
+					AND module_class = '$class'
+					$parent_sql";
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				$module_name = $row['module_langname'];
+				$module_ids[] = $module;
+			}
+
+			$this->umil_start('MODULE_REMOVE', $class, ((isset($user->lang[$module_name])) ? $user->lang[$module_name] : $module_name));
+			add_log('admin', 'LOG_MODULE_REMOVED', ((isset($user->lang[$module_name])) ? $user->lang[$module_name] : $module_name));
+
+			if (!class_exists('acp_modules'))
+			{
+				include($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
+				$user->add_lang('acp/modules');
+			}
+			$acp_modules = new acp_modules();
+			$acp_modules->module_class = $class;
+
+			foreach ($module_ids as $module_id)
+			{
+				$result = $acp_modules->delete_module($module_id);
+				if (!empty($result))
+				{
+					if ($this->result == ((isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS'))
+					{
+						$this->result = implode('<br />', $result);
+					}
+					else
+					{
+						$this->result .= '<br />' . implode('<br />', $result);
+					}
+				}
+			}
+
+			$cache->destroy("_modules_$class");
+
+			return $this->umil_end();
+		}
+	}
+
+	/**
+	* Permission Exists
+	*
+	* Check if a permission (auth) setting exists
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return bool true if it exists, false if not
+	*/
+	function permission_exists($auth_option, $global = true)
+	{
+		if ($global)
+		{
+			$type_sql = ' AND is_global = 1';
+		}
+		else
+		{
+			$type_sql = ' AND is_local = 1';
+		}
+
+		$sql = 'SELECT auth_option_id
+				FROM ' . ACL_OPTIONS_TABLE . "
+				WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'"
+				. $type_sql;
+		$result = $this->db->sql_query($sql);
+
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Permission Add
+	*
+	* Add a permission (auth) option
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return result
+	*/
+	function permission_add($auth_option, $global = true)
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $auth_option))
+		{
+			return;
+		}
+
+		$this->umil_start('PERMISSION_ADD', $auth_option);
+
+		if ($this->permission_exists($auth_option, $global))
+		{
+			return $this->umil_end('PERMISSION_ALREADY_EXISTS', $auth_option);
+		}
+
+		// We've added permissions, so set to true to notify the user.
+		$this->permissions_added = true;
+
+		if (!class_exists('auth_admin'))
+		{
+			global $phpbb_root_path, $phpEx;
+
+			include($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
+		}
+		$auth_admin = new auth_admin();
+
+		// We have to add a check to see if the !$global (if global, local, and if local, global) permission already exists.  If it does, acl_add_option currently has a bug which would break the ACL system, so we are having a work-around here.
+		if ($this->permission_exists($auth_option, !$global))
+		{
+			$sql_ary = array(
+				'is_global'	=> 1,
+				'is_local'	=> 1,
+			);
+			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+				WHERE auth_option = \'' . $this->db->sql_escape($auth_option) . "'";
+			$this->db->sql_query($sql);
+		}
+		else
+		{
+			if ($global)
+			{
+				$auth_admin->acl_add_option(array('global' => array($auth_option)));
+			}
+			else
+			{
+				$auth_admin->acl_add_option(array('local' => array($auth_option)));
+			}
+		}
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Permission Remove
+	*
+	* Remove a permission (auth) option
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return result
+	*/
+	function permission_remove($auth_option, $global = true)
+	{
+		global $auth, $cache;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $auth_option))
+		{
+			return;
+		}
+
+		$this->umil_start('PERMISSION_REMOVE', $auth_option);
+
+		if (!$this->permission_exists($auth_option, $global))
+		{
+			return $this->umil_end('PERMISSION_NOT_EXIST', $auth_option);
+		}
+
+		if ($global)
+		{
+			$type_sql = ' AND is_global = 1';
+		}
+		else
+		{
+			$type_sql = ' AND is_local = 1';
+		}
+		$sql = 'SELECT auth_option_id, is_global, is_local FROM ' . ACL_OPTIONS_TABLE . "
+			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'" .
+			$type_sql;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$id = $row['auth_option_id'];
+
+		// If it is a local and global permission, do not remove the row! :P
+		if ($row['is_global'] && $row['is_local'])
+		{
+			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
+				SET ' . (($global) ? 'is_global = 0' : 'is_local = 0') . '
+				WHERE auth_option_id = ' . $id;
+			$this->db->sql_query($sql);
+		}
+		else
+		{
+			// Delete time
+			$this->db->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $id);
+		}
+
+		// Purge the auth cache
+		$cache->destroy('_acl_options');
+		$auth->acl_clear_prefetch();
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Add a new permission role
+	*
+	* @param string $role_name The new role name
+	* @param sting $role_type The type (u_, m_, a_)
+	*/
+	function permission_role_add($role_name, $role_type = '', $role_description = '')
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $role_name))
+		{
+			return;
+		}
+
+		$this->umil_start('PERMISSION_ROLE_ADD', $role_name);
+
+		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if ($role_id)
+		{
+			return $this->umil_end('ROLE_ALREADY_EXISTS', $old_role_name);
+		}
+
+		$sql = 'SELECT MAX(role_order) AS max FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_type = \'' . $this->db->sql_escape($role_type) . '\'';
+		$this->db->sql_query($sql);
+		$role_order = $this->db->sql_fetchfield('max');
+		$role_order = (!$role_order) ? 1 : $role_order + 1;
+
+		$sql_ary = array(
+			'role_name'			=> $role_name,
+			'role_description'	=> $role_description,
+			'role_type'			=> $role_type,
+			'role_order'		=> $role_order,
+		);
+
+		$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+		$this->db->sql_query($sql);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Update the name on a permission role
+	*
+	* @param string $old_role_name The old role name
+	* @param string $new_role_name The new role name
+	*/
+	function permission_role_update($old_role_name, $new_role_name = '')
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $role_name))
+		{
+			return;
+		}
+
+		$this->umil_start('PERMISSION_ROLE_UPDATE', $old_role_name);
+
+		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if (!$role_id)
+		{
+			return $this->umil_end('ROLE_NOT_EXIST', $old_role_name);
+		}
+
+		$sql = 'UPDATE ' . ACL_ROLES_TABLE . '
+			SET role_name = \'' . $this->db->sql_escape($new_role_name) . '\'
+			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
+		$this->db->sql_query($sql);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Remove a permission role
+	*
+	* @param string $role_name The role name to remove
+	*/
+	function permission_role_remove($role_name)
+	{
+		global $auth;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $role_name))
+		{
+			return;
+		}
+
+		$this->umil_start('PERMISSION_ROLE_REMOVE', $role_name);
+
+		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if (!$role_id)
+		{
+			return $this->umil_end('ROLE_NOT_EXIST', $role_name);
+		}
+
+		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
+			WHERE role_id = ' . $role_id;
+		$this->db->sql_query($sql);
+
+		$sql = 'DELETE FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_id = ' . $role_id;
+		$this->db->sql_query($sql);
+
+		$auth->acl_clear_prefetch();
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Permission Set
+	*
+	* Allows you to set permissions for a certain group/role
+	*
+	* @param string $name The name of the role/group
+	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
+	* @param string $type The type (role|group)
+	* @param bool $has_permission True if you want to give them permission, false if you want to deny them permission
+	*/
+	function permission_set($name, $auth_option = array(), $type = 'role', $has_permission = true)
+	{
+		global $auth;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $name))
+		{
+			return;
+		}
+
+		if (!is_array($auth_option))
+		{
+			$auth_option = array($auth_option);
+		}
+
+		$new_auth = array();
+		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
+			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$new_auth[] = $row['auth_option_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!sizeof($new_auth))
+		{
+			return false;
+		}
+
+		$current_auth = array();
+
+		$type = (string) $type; // Prevent PHP bug.
+
+		switch ($type)
+		{
+			case 'role' :
+				$this->umil_start('PERMISSION_SET_ROLE', $name);
+
+				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('role_id');
+
+				if (!$role_id)
+				{
+					return $this->umil_end('ROLE_NOT_EXIST');
+				}
+
+				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_ROLES_DATA_TABLE . '
+					WHERE role_id = ' . $role_id;
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
+				}
+				$this->db->sql_freeresult($result);
+			break;
+
+			case 'group' :
+				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . ' WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$group_id = $this->db->sql_fetchfield('group_id');
+
+				if (!$group_id)
+				{
+					$this->umil_start('PERMISSION_SET_GROUP', $name);
+					return $this->umil_end('GROUP_NOT_EXIST');
+				}
+
+				// If the group has a role set for them we will add the requested permissions to that role.
+				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id . '
+					AND auth_role_id <> 0
+					AND forum_id = 0';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('auth_role_id');
+				if ($role_id)
+				{
+					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
+						WHERE role_id = ' . $role_id;
+					$this->db->sql_query($sql);
+					$role_name = $this->db->sql_fetchfield('role_name');
+
+					return $this->permission_set($role_name, $auth_option, 'role', $has_permission);
+				}
+
+				$this->umil_start('PERMISSION_SET_GROUP', $name);
+
+				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id;
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
+				}
+				$this->db->sql_freeresult($result);
+			break;
+		}
+
+		$sql_ary = array();
+		switch ($type)
+		{
+			case 'role' :
+				foreach ($new_auth as $auth_option_id)
+				{
+					if (!isset($current_auth[$auth_option_id]))
+					{
+						$sql_ary[] = array(
+							'role_id'			=> $role_id,
+							'auth_option_id'	=> $auth_option_id,
+							'auth_setting'		=> $has_permission,
+				        );
+					}
+				}
+
+				$this->db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary);
+			break;
+
+			case 'group' :
+				foreach ($new_auth as $auth_option_id)
+				{
+					if (!isset($current_auth[$auth_option_id]))
+					{
+						$sql_ary[] = array(
+							'group_id'			=> $group_id,
+							'auth_option_id'	=> $auth_option_id,
+							'auth_setting'		=> $has_permission,
+				        );
+					}
+				}
+
+				$this->db->sql_multi_insert(ACL_GROUPS_TABLE, $sql_ary);
+			break;
+		}
+
+		$auth->acl_clear_prefetch();
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Permission Unset
+	*
+	* Allows you to unset (remove) permissions for a certain group/role
+	*
+	* @param string $name The name of the role/group
+	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
+	* @param string $type The type (role|group)
+	*/
+	function permission_unset($name, $auth_option = array(), $type = 'role')
+	{
+		global $auth;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $name))
+		{
+			return;
+		}
+
+		if (!is_array($auth_option))
+		{
+			$auth_option = array($auth_option);
+		}
+
+		$to_remove = array();
+		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
+			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$to_remove[] = $row['auth_option_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!sizeof($to_remove))
+		{
+			return false;
+		}
+
+		$type = (string) $type; // Prevent PHP bug.
+
+		switch ($type)
+		{
+			case 'role' :
+				$this->umil_start('PERMISSION_UNSET_ROLE', $name);
+
+				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('role_id');
+
+				if (!$role_id)
+				{
+					return $this->umil_end('ROLE_NOT_EXIST');
+				}
+
+				$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
+					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
+				$this->db->sql_query($sql);
+			break;
+
+			case 'group' :
+				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . ' WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$group_id = $this->db->sql_fetchfield('group_id');
+
+				if (!$group_id)
+				{
+					$this->umil_start('PERMISSION_UNSET_GROUP', $name);
+					return $this->umil_end('GROUP_NOT_EXIST');
+				}
+
+				// If the group has a role set for them we will remove the requested permissions from that role.
+				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id . '
+					AND auth_role_id <> 0';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('auth_role_id');
+				if ($role_id)
+				{
+					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
+						WHERE role_id = ' . $role_id;
+					$this->db->sql_query($sql);
+					$role_name = $this->db->sql_fetchfield('role_name');
+
+					return $this->permission_unset($role_name, $auth_option, 'role');
+				}
+
+				$this->umil_start('PERMISSION_UNSET_GROUP', $name);
+
+				$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
+					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
+				$this->db->sql_query($sql);
+			break;
+		}
+
+		$auth->acl_clear_prefetch();
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Exists
+	*
+	* Check if a table exists in the DB or not
+	*
+	* @param string $table_name The table name to check for
+	*
+	* @return bool true if the table exists, false if not
+	*/
+	function table_exists($table_name)
+	{
+		$this->get_table_name($table_name);
+
+		// Use sql_table_exists if available
+		if (method_exists($this->db_tools, 'sql_table_exists'))
+		{
+			$roe = $this->db->return_on_error;
+			$result = $this->db_tools->sql_table_exists($table_name);
+
+			// db_tools::sql_table_exists resets the return_on_error to false always after completing, so we must make sure we set it to true again if it was before
+			if ($roe)
+			{
+				$this->db->sql_return_on_error(true);
+			}
+
+			return $result;
+		}
+
+		if (!function_exists('get_tables'))
+		{
+			global $phpbb_root_path, $phpEx;
+			include($phpbb_root_path . 'includes/functions_install.' . $phpEx);
+		}
+
+		$tables = get_tables($this->db);
+
+		if (in_array($table_name, $tables))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	* Table Add
+	*
+	* This only supports input from the array format of db_tools or create_schema_files.
+	*/
+	function table_add($table_name, $table_data = array())
+	{
+		global $dbms, $user;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		/**
+		* $table_data can be empty when uninstalling a mod and table_remove was used, but no 2rd argument was given.
+		* In that case we'll assume that it was a column previously added by the mod (if not the author should specify a 2rd argument) and skip this to prevent an error
+		*/
+		if (empty($table_data))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_ADD', $table_name);
+
+		if ($this->table_exists($table_name))
+		{
+			return $this->umil_end('TABLE_ALREADY_EXISTS', $table_name);
+		}
+
+		if (!is_array($table_data))
+		{
+			return $this->umil_end('NO_TABLE_DATA');
+		}
+
+		if (!function_exists('get_available_dbms'))
+		{
+			global $phpbb_root_path, $phpEx;
+			include("{$phpbb_root_path}includes/functions_install.$phpEx");
+		}
+
+		/*
+		* This function has had numerous problems and is currently broken, so until phpBB uses it I will not be anymore
+		if (method_exists($this->db_tools, 'sql_create_table'))
+		{
+			// Added in 3.0.5
+			$this->db_tools->sql_create_table($table_name, $table_data);
+		}
+		else
+		{*/
+			$available_dbms = get_available_dbms($dbms);
+
+			$sql_query = $this->create_table_sql($table_name, $table_data);
+			$sql_query = split_sql_file($sql_query, $available_dbms[$dbms]['DELIM']);
+
+			foreach ($sql_query as $sql)
+			{
+				$this->db->sql_query($sql);
+			}
+		//}
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Remove
+	*
+	* Delete/Drop a DB table
+	*/
+	function table_remove($table_name)
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_REMOVE', $table_name);
+
+		if (!$this->table_exists($table_name))
+		{
+			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
+		}
+
+		if (method_exists($this->db_tools, 'sql_table_drop'))
+		{
+			// Added in 3.0.5
+			$this->db_tools->sql_table_drop($table_name);
+		}
+		else
+		{
+			$this->db->sql_query('DROP TABLE ' . $table_name);
+		}
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Column Exists
+	*
+	* Check to see if a column exists in a table
+	*/
+	function table_column_exists($table_name, $column_name)
+	{
+		$this->get_table_name($table_name);
+
+		return $this->db_tools->sql_column_exists($table_name, $column_name);
+	}
+
+	/**
+	* Table Column Add
+	*
+	* Add a new column to a table.
+	*/
+	function table_column_add($table_name, $column_name = '', $column_data = array())
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		/**
+		* $column_data can be empty when uninstalling a mod and table_column_remove was used, but no 3rd argument was given.
+		* In that case we'll assume that it was a column previously added by the mod (if not the author should specify a 3rd argument) and skip this to prevent an error
+		*/
+		if (empty($column_data))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_COLUMN_ADD', $table_name, $column_name);
+
+		if ($this->table_column_exists($table_name, $column_name))
+		{
+			return $this->umil_end('TABLE_COLUMN_ALREADY_EXISTS', $table_name, $column_name);
+		}
+
+		$this->db_tools->sql_column_add($table_name, $column_name, $column_data);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Column Update
+	*
+	* Alter/Update a column in a table.  You can not change a column name with this.
+	*/
+	function table_column_update($table_name, $column_name = '', $column_data = array())
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_COLUMN_UPDATE', $table_name, $column_name);
+
+		if (!$this->table_column_exists($table_name, $column_name))
+		{
+			return $this->umil_end('TABLE_COLUMN_NOT_EXIST', $table_name, $column_name);
+		}
+
+		$this->db_tools->sql_column_change($table_name, $column_name, $column_data);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Column Remove
+	*
+	* Remove a column from a table
+	*/
+	function table_column_remove($table_name, $column_name = '')
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_COLUMN_REMOVE', $table_name, $column_name);
+
+		if (!$this->table_column_exists($table_name, $column_name))
+		{
+			return $this->umil_end('TABLE_COLUMN_NOT_EXIST', $table_name, $column_name);
+		}
+
+		$this->db_tools->sql_column_remove($table_name, $column_name);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Index Exists
+	*
+	* Check if a table key/index exists on a table (can not check primary or unique)
+	*/
+	function table_index_exists($table_name, $index_name)
+	{
+		$this->get_table_name($table_name);
+
+		$indexes = $this->db_tools->sql_list_index($table_name);
+
+		if (in_array($index_name, $indexes))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Table Index Add
+	*
+	* Add a new key/index to a table
+	*/
+	function table_index_add($table_name, $index_name = '', $column = array())
+	{
+		global $config;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		// Let them skip the column field and just use the index name in that case as the column as well
+		if (empty($column))
+		{
+			$column = array($index_name);
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_KEY_ADD', $table_name, $index_name);
+
+		if ($this->table_index_exists($table_name, $index_name))
+		{
+			return $this->umil_end('TABLE_KEY_ALREADY_EXIST', $table_name, $index_name);
+		}
+
+		if (!is_array($column))
+		{
+			$column = array($column);
+		}
+
+		// remove index length if we are before 3.0.8
+		// the feature (required for some types when using MySQL4)
+		// was added in that release (ticket PHPBB3-8944)
+		if (version_compare($config['version'], '3.0.7-pl1', '<='))
+		{
+			$column = preg_replace('#:.*$#', '', $column);
+		}
+
+		$this->db_tools->sql_create_index($table_name, $index_name, $column);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Index Remove
+	*
+	* Remove a key/index from a table
+	*/
+	function table_index_remove($table_name, $index_name = '')
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_KEY_REMOVE', $table_name, $index_name);
+
+		if (!$this->table_index_exists($table_name, $index_name))
+		{
+			return $this->umil_end('TABLE_KEY_NOT_EXIST', $table_name, $index_name);
+		}
+
+		$this->db_tools->sql_index_drop($table_name, $index_name);
+
+		return $this->umil_end();
+	}
+
+	// Ignore, function was renamed to table_row_insert and keeping for backwards compatibility
+	function table_insert($table_name, $data = array()) { $this->table_row_insert($table_name, $data); }
+
+	/**
+	* Table Insert
+	*
+	* Insert data into a table
+	*/
+	function table_row_insert($table_name, $data = array())
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_ROW_INSERT_DATA', $table_name);
+
+		if (!$this->table_exists($table_name))
+		{
+			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
+		}
+
+		$this->db->sql_multi_insert($table_name, $data);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Row Update
+	*
+	* Update a row in a table
+	*
+	* $data should be an array with the column names as keys and values as the items to check for each column.  Example:
+	* array('user_id' => 123, 'user_name' => 'test user') would become:
+	* WHERE user_id = 123 AND user_name = 'test user'
+	*
+	* $new_data is the new data it will be updated to (same format as you'd enter into $db->sql_build_array('UPDATE' ).
+	*/
+	function table_row_update($table_name, $data = array(), $new_data = array())
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		if (!sizeof($data))
+		{
+			return $this->umil_end('FAIL');
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_ROW_UPDATE_DATA', $table_name);
+
+		if (!$this->table_exists($table_name))
+		{
+			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
+		}
+
+		$sql = 'UPDATE ' . $table_name . '
+			SET ' . $this->db->sql_build_array('UPDATE', $new_data) . '
+			WHERE ' . $this->db->sql_build_array('SELECT', $data);
+		$this->db->sql_query($sql);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Row Remove
+	*
+	* Remove a row from a table
+	*
+	* $data should be an array with the column names as keys and values as the items to check for each column.  Example:
+	* array('user_id' => 123, 'user_name' => 'test user') would become:
+	* WHERE user_id = 123 AND user_name = 'test user'
+	*/
+	function table_row_remove($table_name, $data = array())
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		if (!sizeof($data))
+		{
+			return $this->umil_end('FAIL');
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_ROW_REMOVE_DATA', $table_name);
+
+		if (!$this->table_exists($table_name))
+		{
+			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
+		}
+
+		$sql = 'DELETE FROM ' . $table_name . ' WHERE ' . $this->db->sql_build_array('SELECT', $data);
+		$this->db->sql_query($sql);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Version Checker
+	*
+	* Format the file like the following:
+	* http://www.phpbb.com/updatecheck/30x.txt
+	*
+	* @param string $url The url to access (ex: www.phpbb.com)
+	* @param string $path The path to access (ex: /updatecheck)
+	* @param string $file The name of the file to access (ex: 30x.txt)
+	*
+	* @return array|string Error Message if there was any error, or an array (each line in the file as a value)
+	*/
+	function version_check($url, $path, $file, $timeout = 10, $port = 80)
+	{
+		if (!function_exists('get_remote_file'))
+		{
+			global $phpbb_root_path, $phpEx;
+
+			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+		}
+
+		$errstr = $errno = '';
+
+		$info = get_remote_file($url, $path, $file, $errstr, $errno, $port, $timeout);
+
+		if ($info === false)
+		{
+			return $errstr . ' [ ' . $errno . ' ]';
+		}
+
+		$info = str_replace("\r\n", "\n", $info);
+		$info = explode("\n", $info);
+
+		return $info;
+	}
+
+	/**
+	* Create table SQL
+	*
+	* Create the SQL query for the specified DBMS on the fly from a create_schema_files type of table array
+	*
+	* @param string $table_name The name of the table
+	* @param array $table_data The table data (formatted in the array format used by create_schema_files)
+	* @param string $dbms The dbms this will be built for (for testing only, leave blank to use the current DBMS)
+	*
+	* @return The sql query to run for the submitted dbms to insert the table
+	*/
+	function create_table_sql($table_name, $table_data, $dbms = '')
+	{
+		// To allow testing
+		$dbms = ($dbms) ? $dbms : $this->db_tools->sql_layer;
+
+		// A list of types being unsigned for better reference in some db's
+		$unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
+		$supported_dbms = array('firebird', 'mssql', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite');
+
+		$sql = '';
+
+		// Create Table statement
+		$generator = $textimage = false;
+
+		switch ($dbms)
+		{
+			case 'mysql_40':
+			case 'mysql_41':
+			case 'firebird':
+			case 'oracle':
+			case 'sqlite':
+			case 'postgres':
+				$sql .= "CREATE TABLE {$table_name} (\n";
+			break;
+
+			case 'mssql':
+				$sql .= "CREATE TABLE [{$table_name}] (\n";
+			break;
+		}
+
+		// Table specific so we don't get overlap
+		$modded_array = array();
+
+		// Write columns one by one...
+		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
+		{
+			// Get type
+			if (strpos($column_data[0], ':') !== false)
+			{
+				list($orig_column_type, $column_length) = explode(':', $column_data[0]);
+				if (!is_array($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']))
+				{
+					$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'], $column_length);
+				}
+				else
+				{
+					if (isset($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule']))
+					{
+						switch ($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule'][0])
+						{
+							case 'div':
+								$column_length /= $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule'][1];
+								$column_length = ceil($column_length);
+								$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length);
+							break;
+						}
+					}
+
+					if (isset($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit']))
+					{
+						switch ($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][0])
+						{
+							case 'mult':
+								$column_length *= $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][1];
+								if ($column_length > $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][2])
+								{
+									$column_type = $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][3];
+									$modded_array[$column_name] = $column_type;
+								}
+								else
+								{
+									$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length);
+								}
+							break;
+						}
+					}
+				}
+				$orig_column_type .= ':';
+			}
+			else
+			{
+				$orig_column_type = $column_data[0];
+				$column_type = $this->db_tools->dbms_type_map[$dbms][$column_data[0]];
+				if ($column_type == 'text' || $column_type == 'blob')
+				{
+					$modded_array[$column_name] = $column_type;
+				}
+			}
+
+			// Adjust default value if db-dependant specified
+			if (is_array($column_data[1]))
+			{
+				$column_data[1] = (isset($column_data[1][$dbms])) ? $column_data[1][$dbms] : $column_data[1]['default'];
+			}
+
+			switch ($dbms)
+			{
+				case 'mysql_40':
+				case 'mysql_41':
+					$sql .= "\t{$column_name} {$column_type} ";
+
+					// For hexadecimal values do not use single quotes
+					if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
+					{
+						$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
+					}
+					$sql .= 'NOT NULL';
+
+					if (isset($column_data[2]))
+					{
+						if ($column_data[2] == 'auto_increment')
+						{
+							$sql .= ' auto_increment';
+						}
+						else if ($dbms === 'mysql_41' && $column_data[2] == 'true_sort')
+						{
+							$sql .= ' COLLATE utf8_unicode_ci';
+						}
+					}
+
+					$sql .= ",\n";
+				break;
+
+				case 'sqlite':
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$sql .= "\t{$column_name} INTEGER PRIMARY KEY ";
+						$generator = $column_name;
+					}
+					else
+					{
+						$sql .= "\t{$column_name} {$column_type} ";
+					}
+
+					$sql .= 'NOT NULL ';
+					$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
+					$sql .= ",\n";
+				break;
+
+				case 'firebird':
+					$sql .= "\t{$column_name} {$column_type} ";
+
+					if (!is_null($column_data[1]))
+					{
+						$sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
+					}
+
+					$sql .= 'NOT NULL';
+
+					// This is a UNICODE column and thus should be given it's fair share
+					if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0]))
+					{
+						$sql .= ' COLLATE UNICODE';
+					}
+
+					$sql .= ",\n";
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$generator = $column_name;
+					}
+				break;
+
+				case 'mssql':
+					if ($column_type == '[text]')
+					{
+						$textimage = true;
+					}
+
+					$sql .= "\t[{$column_name}] {$column_type} ";
+
+					if (!is_null($column_data[1]))
+					{
+						// For hexadecimal values do not use single quotes
+						if (strpos($column_data[1], '0x') === 0)
+						{
+							$sql .= 'DEFAULT (' . $column_data[1] . ') ';
+						}
+						else
+						{
+							$sql .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
+						}
+					}
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$sql .= 'IDENTITY (1, 1) ';
+					}
+
+					$sql .= 'NOT NULL';
+					$sql .= " ,\n";
+				break;
+
+				case 'oracle':
+					$sql .= "\t{$column_name} {$column_type} ";
+					$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
+
+					// In Oracle empty strings ('') are treated as NULL.
+					// Therefore in oracle we allow NULL's for all DEFAULT '' entries
+					$sql .= ($column_data[1] === '') ? ",\n" : "NOT NULL,\n";
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$generator = $column_name;
+					}
+				break;
+
+				case 'postgres':
+					$sql .= "\t{$column_name} {$column_type} ";
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$sql .= "DEFAULT nextval('{$table_name}_seq'),\n";
+
+						// Make sure the sequence will be created before creating the table
+						$sql = "CREATE SEQUENCE {$table_name}_seq;\n\n" . $sql;
+					}
+					else
+					{
+						$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
+						$sql .= "NOT NULL";
+
+						// Unsigned? Then add a CHECK contraint
+						if (in_array($orig_column_type, $unsigned_types))
+						{
+							$sql .= " CHECK ({$column_name} >= 0)";
+						}
+
+						$sql .= ",\n";
+					}
+				break;
+			}
+		}
+
+		switch ($dbms)
+		{
+			case 'firebird':
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n);;\n\n";
+			break;
+
+			case 'mssql':
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n) ON [PRIMARY]" . (($textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '') . "\n";
+				$sql .= "GO\n\n";
+			break;
+		}
+
+		// Write primary key
+		if (isset($table_data['PRIMARY_KEY']))
+		{
+			if (!is_array($table_data['PRIMARY_KEY']))
+			{
+				$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
+			}
+
+			switch ($dbms)
+			{
+				case 'mysql_40':
+				case 'mysql_41':
+				case 'postgres':
+					$sql .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
+				break;
+
+				case 'firebird':
+					$sql .= "ALTER TABLE {$table_name} ADD PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ");;\n\n";
+				break;
+
+				case 'sqlite':
+					if ($generator === false || !in_array($generator, $table_data['PRIMARY_KEY']))
+					{
+						$sql .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
+					}
+				break;
+
+				case 'mssql':
+					$sql .= "ALTER TABLE [{$table_name}] WITH NOCHECK ADD \n";
+					$sql .= "\tCONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED \n";
+					$sql .= "\t(\n";
+					$sql .= "\t\t[" . implode("],\n\t\t[", $table_data['PRIMARY_KEY']) . "]\n";
+					$sql .= "\t)  ON [PRIMARY] \n";
+					$sql .= "GO\n\n";
+				break;
+
+				case 'oracle':
+					$sql .= "\tCONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
+				break;
+			}
+		}
+
+		switch ($dbms)
+		{
+			case 'oracle':
+				// UNIQUE contrains to be added?
+				if (isset($table_data['KEYS']))
+				{
+					foreach ($table_data['KEYS'] as $key_name => $key_data)
+					{
+						if (!is_array($key_data[1]))
+						{
+							$key_data[1] = array($key_data[1]);
+						}
+
+						if ($key_data[0] == 'UNIQUE')
+						{
+							$sql .= "\tCONSTRAINT u_phpbb_{$key_name} UNIQUE (" . implode(', ', $key_data[1]) . "),\n";
+						}
+					}
+				}
+
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n)\n/\n\n";
+			break;
+
+			case 'postgres':
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n);\n\n";
+			break;
+
+			case 'sqlite':
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n);\n\n";
+			break;
+		}
+
+		// Write Keys
+		if (isset($table_data['KEYS']))
+		{
+			foreach ($table_data['KEYS'] as $key_name => $key_data)
+			{
+				if (!is_array($key_data[1]))
+				{
+					$key_data[1] = array($key_data[1]);
+				}
+
+				switch ($dbms)
+				{
+					case 'mysql_40':
+					case 'mysql_41':
+						$sql .= ($key_data[0] == 'INDEX') ? "\tKEY" : '';
+						$sql .= ($key_data[0] == 'UNIQUE') ? "\tUNIQUE" : '';
+						foreach ($key_data[1] as $key => $col_name)
+						{
+							if (isset($modded_array[$col_name]))
+							{
+								switch ($modded_array[$col_name])
+								{
+									case 'text':
+									case 'blob':
+										$key_data[1][$key] = $col_name . '(255)';
+									break;
+								}
+							}
+						}
+						$sql .= ' ' . $key_name . ' (' . implode(', ', $key_data[1]) . "),\n";
+					break;
+
+					case 'firebird':
+						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
+
+						$sql .= ' ' . $table_name . '_' . $key_name . ' ON ' . $table_name . '(' . implode(', ', $key_data[1]) . ");;\n";
+					break;
+
+					case 'mssql':
+						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE  INDEX' : '';
+						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE  UNIQUE  INDEX' : '';
+						$sql .= " [{$key_name}] ON [{$table_name}]([" . implode('], [', $key_data[1]) . "]) ON [PRIMARY]\n";
+						$sql .= "GO\n\n";
+					break;
+
+					case 'oracle':
+						if ($key_data[0] == 'UNIQUE')
+						{
+							continue;
+						}
+
+						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+
+						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ")\n";
+						$sql .= "/\n";
+					break;
+
+					case 'sqlite':
+						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
+
+						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n";
+					break;
+
+					case 'postgres':
+						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
+
+						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n";
+					break;
+				}
+			}
+		}
+
+		switch ($dbms)
+		{
+			case 'mysql_40':
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n);\n\n";
+			break;
+
+			case 'mysql_41':
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n) CHARACTER SET utf8 COLLATE utf8_bin;\n\n";
+			break;
+
+			// Create Generator
+			case 'firebird':
+				if ($generator !== false)
+				{
+					$sql .= "\nCREATE GENERATOR {$table_name}_gen;;\n";
+					$sql .= 'SET GENERATOR ' . $table_name . "_gen TO 0;;\n\n";
+
+					$sql .= 'CREATE TRIGGER t_' . $table_name . ' FOR ' . $table_name . "\n";
+					$sql .= "BEFORE INSERT\nAS\nBEGIN\n";
+					$sql .= "\tNEW.{$generator} = GEN_ID({$table_name}_gen, 1);\nEND;;\n\n";
+				}
+			break;
+
+			case 'oracle':
+				if ($generator !== false)
+				{
+					$sql .= "\nCREATE SEQUENCE {$table_name}_seq\n/\n\n";
+
+					$sql .= "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
+					$sql .= "BEFORE INSERT ON {$table_name}\n";
+					$sql .= "FOR EACH ROW WHEN (\n";
+					$sql .= "\tnew.{$generator} IS NULL OR new.{$generator} = 0\n";
+					$sql .= ")\nBEGIN\n";
+					$sql .= "\tSELECT {$table_name}_seq.nextval\n";
+					$sql .= "\tINTO :new.{$generator}\n";
+					$sql .= "\tFROM dual;\nEND;\n/\n\n";
+				}
+			break;
+		}
+
+		return $sql;
+	}
+
+	/**
+	* Get the real table name
+	* By A_Jelly_Doughnut
+	*
+	* @param string $table_name The table name to get the real table name from
+	*/
+	function get_table_name(&$table_name)
+	{
+		// Use the global table prefix if a custom one is not specified
+		if ($this->table_prefix === false)
+		{
+			global $table_prefix;
+		}
+		else
+		{
+			$table_prefix = $this->table_prefix;
+		}
+
+		static $constants = NULL;
+
+		if (is_null($constants))
+		{
+			$constants = get_defined_constants();
+		}
+
+		/**
+		* only do the replace if the table prefix is not already present
+		* this is required since UMIL supports specifying a table via phpbb_foo
+		* (where a replace would be needed)
+		* or by FOO_TABLE (where a replace is already done at constant-define time)
+		*/
+		if (!preg_match('#^' . preg_quote($table_prefix, '#') . '#', $table_name) || !in_array($table_name, $constants, true))
+		{
+			$table_name = preg_replace('#^phpbb_#i', $table_prefix, $table_name);
+		}
+	}
+}
+
+?>
\ No newline at end of file
-- 
cgit v1.2.1


From 91a921a96bf26607879de850fca105be78eadf1d Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 11 Nov 2012 09:43:07 +0100
Subject: [feature/migrations] Change migration data processing to run step by
 step

---
 phpBB/includes/db/migrator.php | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 4ce54a4b92..912a7b34ba 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -167,7 +167,7 @@ class phpbb_db_migrator
 		}
 		else
 		{
-			$migration->update_data();
+			$this->process_data_step($migration);
 			$state['migration_data_done'] = true;
 			$state['migration_end_time'] = time();
 		}
@@ -182,6 +182,28 @@ class phpbb_db_migrator
 		return true;
 	}
 
+	function process_data_step(&$migration)
+	{
+		$continue = false;
+		$steps = $migration->update_data();
+
+		foreach ($steps as $step)
+		{
+			$continue = $this->run_step($step);
+			if (!$continue)
+			{
+				return false;
+			}
+		}
+
+		return $continue;
+	}
+
+	function run_step(&$step)
+	{
+
+	}
+
 	function insert_migration($name, $state)
 	{
 		$migration_row = $state;
-- 
cgit v1.2.1


From 82efb3e446efbb8ef05c6a777e3866901abfd07a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 8 Jan 2013 22:07:12 -0600
Subject: [feature/migrations] Remove references as it is now 3.1 code

PHPBB3-9737
---
 phpBB/includes/db/migration.php                    |    6 +-
 phpBB/includes/db/migration/3_0_1.php              |   25 -
 phpBB/includes/db/migration/3_0_10.php             |   25 -
 phpBB/includes/db/migration/3_0_10_rc1.php         |   28 -
 phpBB/includes/db/migration/3_0_10_rc2.php         |   25 -
 phpBB/includes/db/migration/3_0_10_rc3.php         |   25 -
 phpBB/includes/db/migration/3_0_11.php             |   25 -
 phpBB/includes/db/migration/3_0_11_rc1.php         |   96 -
 phpBB/includes/db/migration/3_0_11_rc2             |   31 -
 phpBB/includes/db/migration/3_0_12_rc1.php         |   26 -
 phpBB/includes/db/migration/3_0_1_rc1.php          |   77 -
 phpBB/includes/db/migration/3_0_2.php              |   25 -
 phpBB/includes/db/migration/3_0_2_rc1.php          |   30 -
 phpBB/includes/db/migration/3_0_2_rc2.php          |   52 -
 phpBB/includes/db/migration/3_0_3.php              |   25 -
 phpBB/includes/db/migration/3_0_3_rc1.php          |   61 -
 phpBB/includes/db/migration/3_0_4.php              |   47 -
 phpBB/includes/db/migration/3_0_4_rc1.php          |  103 -
 phpBB/includes/db/migration/3_0_5.php              |   25 -
 phpBB/includes/db/migration/3_0_5_rc1.php          |  119 -
 phpBB/includes/db/migration/3_0_5_rc1part2.php     |   34 -
 phpBB/includes/db/migration/3_0_6.php              |   25 -
 phpBB/includes/db/migration/3_0_6_rc1.php          |  314 --
 phpBB/includes/db/migration/3_0_6_rc2.php          |   25 -
 phpBB/includes/db/migration/3_0_6_rc3.php          |   38 -
 phpBB/includes/db/migration/3_0_6_rc4.php          |   25 -
 phpBB/includes/db/migration/3_0_7.php              |   25 -
 phpBB/includes/db/migration/3_0_7_pl1.php          |   25 -
 phpBB/includes/db/migration/3_0_7_rc1.php          |   51 -
 phpBB/includes/db/migration/3_0_7_rc2.php          |   70 -
 phpBB/includes/db/migration/3_0_8.php              |   25 -
 phpBB/includes/db/migration/3_0_8_rc1.php          |  225 --
 phpBB/includes/db/migration/3_0_9.php              |   25 -
 phpBB/includes/db/migration/3_0_9_rc1.php          |  108 -
 phpBB/includes/db/migration/3_0_9_rc2.php          |   25 -
 phpBB/includes/db/migration/3_0_9_rc3.php          |   25 -
 phpBB/includes/db/migration/3_0_9_rc4.php          |   25 -
 phpBB/includes/db/migration/data/3_0_1.php         |   25 +
 phpBB/includes/db/migration/data/3_0_10.php        |   25 +
 phpBB/includes/db/migration/data/3_0_10_rc1.php    |   28 +
 phpBB/includes/db/migration/data/3_0_10_rc2.php    |   25 +
 phpBB/includes/db/migration/data/3_0_10_rc3.php    |   25 +
 phpBB/includes/db/migration/data/3_0_11.php        |   25 +
 phpBB/includes/db/migration/data/3_0_11_rc1.php    |   96 +
 phpBB/includes/db/migration/data/3_0_11_rc2        |   31 +
 phpBB/includes/db/migration/data/3_0_12_rc1.php    |   26 +
 phpBB/includes/db/migration/data/3_0_1_rc1.php     |   77 +
 phpBB/includes/db/migration/data/3_0_2.php         |   25 +
 phpBB/includes/db/migration/data/3_0_2_rc1.php     |   30 +
 phpBB/includes/db/migration/data/3_0_2_rc2.php     |   52 +
 phpBB/includes/db/migration/data/3_0_3.php         |   25 +
 phpBB/includes/db/migration/data/3_0_3_rc1.php     |   61 +
 phpBB/includes/db/migration/data/3_0_4.php         |   47 +
 phpBB/includes/db/migration/data/3_0_4_rc1.php     |  103 +
 phpBB/includes/db/migration/data/3_0_5.php         |   25 +
 phpBB/includes/db/migration/data/3_0_5_rc1.php     |  119 +
 .../includes/db/migration/data/3_0_5_rc1part2.php  |   34 +
 phpBB/includes/db/migration/data/3_0_6.php         |   25 +
 phpBB/includes/db/migration/data/3_0_6_rc1.php     |  299 ++
 phpBB/includes/db/migration/data/3_0_6_rc2.php     |   25 +
 phpBB/includes/db/migration/data/3_0_6_rc3.php     |   38 +
 phpBB/includes/db/migration/data/3_0_6_rc4.php     |   25 +
 phpBB/includes/db/migration/data/3_0_7.php         |   25 +
 phpBB/includes/db/migration/data/3_0_7_pl1.php     |   25 +
 phpBB/includes/db/migration/data/3_0_7_rc1.php     |   51 +
 phpBB/includes/db/migration/data/3_0_7_rc2.php     |   70 +
 phpBB/includes/db/migration/data/3_0_8.php         |   25 +
 phpBB/includes/db/migration/data/3_0_8_rc1.php     |  223 ++
 phpBB/includes/db/migration/data/3_0_9.php         |   25 +
 phpBB/includes/db/migration/data/3_0_9_rc1.php     |  108 +
 phpBB/includes/db/migration/data/3_0_9_rc2.php     |   25 +
 phpBB/includes/db/migration/data/3_0_9_rc3.php     |   25 +
 phpBB/includes/db/migration/data/3_0_9_rc4.php     |   25 +
 phpBB/includes/db/migration/tools/base.php         |   47 +
 phpBB/includes/db/migration/tools/config.php       |  106 +
 phpBB/includes/db/migration/tools/module.php       |  419 +++
 phpBB/includes/db/migration/tools/permission.php   |  480 ++++
 phpBB/includes/db/migration/tools/umil.php         | 3037 ++++++++++++++++++++
 phpBB/includes/db/migrationtools/base.php          |   15 -
 phpBB/includes/db/migrationtools/config.php        |  121 -
 phpBB/includes/db/migrationtools/umil.php          | 3037 --------------------
 phpBB/includes/db/migrator.php                     |   14 +-
 82 files changed, 6042 insertions(+), 5143 deletions(-)
 delete mode 100644 phpBB/includes/db/migration/3_0_1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_10.php
 delete mode 100644 phpBB/includes/db/migration/3_0_10_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_10_rc2.php
 delete mode 100644 phpBB/includes/db/migration/3_0_10_rc3.php
 delete mode 100644 phpBB/includes/db/migration/3_0_11.php
 delete mode 100644 phpBB/includes/db/migration/3_0_11_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_11_rc2
 delete mode 100644 phpBB/includes/db/migration/3_0_12_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_1_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_2.php
 delete mode 100644 phpBB/includes/db/migration/3_0_2_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_2_rc2.php
 delete mode 100644 phpBB/includes/db/migration/3_0_3.php
 delete mode 100644 phpBB/includes/db/migration/3_0_3_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_4.php
 delete mode 100644 phpBB/includes/db/migration/3_0_4_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_5.php
 delete mode 100644 phpBB/includes/db/migration/3_0_5_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_5_rc1part2.php
 delete mode 100644 phpBB/includes/db/migration/3_0_6.php
 delete mode 100644 phpBB/includes/db/migration/3_0_6_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_6_rc2.php
 delete mode 100644 phpBB/includes/db/migration/3_0_6_rc3.php
 delete mode 100644 phpBB/includes/db/migration/3_0_6_rc4.php
 delete mode 100644 phpBB/includes/db/migration/3_0_7.php
 delete mode 100644 phpBB/includes/db/migration/3_0_7_pl1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_7_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_7_rc2.php
 delete mode 100644 phpBB/includes/db/migration/3_0_8.php
 delete mode 100644 phpBB/includes/db/migration/3_0_8_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_9.php
 delete mode 100644 phpBB/includes/db/migration/3_0_9_rc1.php
 delete mode 100644 phpBB/includes/db/migration/3_0_9_rc2.php
 delete mode 100644 phpBB/includes/db/migration/3_0_9_rc3.php
 delete mode 100644 phpBB/includes/db/migration/3_0_9_rc4.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_10.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_10_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_10_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_10_rc3.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_11.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_11_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_11_rc2
 create mode 100644 phpBB/includes/db/migration/data/3_0_12_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_1_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_2_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_2_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_3.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_3_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_4.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_4_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_5.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_5_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_5_rc1part2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_6.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_6_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_6_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_6_rc3.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_6_rc4.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_7.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_7_pl1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_7_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_7_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_8.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_8_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_9.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_9_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_9_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_9_rc3.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_9_rc4.php
 create mode 100644 phpBB/includes/db/migration/tools/base.php
 create mode 100644 phpBB/includes/db/migration/tools/config.php
 create mode 100644 phpBB/includes/db/migration/tools/module.php
 create mode 100644 phpBB/includes/db/migration/tools/permission.php
 create mode 100644 phpBB/includes/db/migration/tools/umil.php
 delete mode 100644 phpBB/includes/db/migrationtools/base.php
 delete mode 100644 phpBB/includes/db/migrationtools/config.php
 delete mode 100644 phpBB/includes/db/migrationtools/umil.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
index de9f6d07e3..c98ac8728a 100644
--- a/phpBB/includes/db/migration.php
+++ b/phpBB/includes/db/migration.php
@@ -44,10 +44,10 @@ class phpbb_db_migration
 	* @param string			$phpbb_root_path
 	* @param string			$php_ext
 	*/
-	function phpbb_db_migration(&$db, &$db_tools, $table_prefix, $phpbb_root_path, $php_ext)
+	function phpbb_db_migration($db, $db_tools, $table_prefix, $phpbb_root_path, $php_ext)
 	{
-		$this->db = &$db;
-		$this->db_tools = &$db_tools;
+		$this->db = $db;
+		$this->db_tools = $db_tools;
 		$this->table_prefix = $table_prefix;
 
 		$this->phpbb_root_path = $phpbb_root_path;
diff --git a/phpBB/includes/db/migration/3_0_1.php b/phpBB/includes/db/migration/3_0_1.php
deleted file mode 100644
index 1cb069a2b1..0000000000
--- a/phpBB/includes/db/migration/3_0_1.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_1_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_10.php b/phpBB/includes/db/migration/3_0_10.php
deleted file mode 100644
index aae27a08c7..0000000000
--- a/phpBB/includes/db/migration/3_0_10.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_10 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_10_rc3');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_10_rc1.php b/phpBB/includes/db/migration/3_0_10_rc1.php
deleted file mode 100644
index 5d65ae15da..0000000000
--- a/phpBB/includes/db/migration/3_0_10_rc1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_10_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_9');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('email_max_chunk_size', 50)),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_10_rc2.php b/phpBB/includes/db/migration/3_0_10_rc2.php
deleted file mode 100644
index d5dc4caec9..0000000000
--- a/phpBB/includes/db/migration/3_0_10_rc2.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_10_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_10_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_10_rc3.php b/phpBB/includes/db/migration/3_0_10_rc3.php
deleted file mode 100644
index dc962b73c8..0000000000
--- a/phpBB/includes/db/migration/3_0_10_rc3.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_10_rc3 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_10_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_11.php b/phpBB/includes/db/migration/3_0_11.php
deleted file mode 100644
index 89ffe310f4..0000000000
--- a/phpBB/includes/db/migration/3_0_11.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_11 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_11_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_11_rc1.php b/phpBB/includes/db/migration/3_0_11_rc1.php
deleted file mode 100644
index 1b74aa9a4c..0000000000
--- a/phpBB/includes/db/migration/3_0_11_rc1.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_11_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_10');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
-			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
-		);
-	}
-
-	function cleanup_deactivated_styles()
-	{
-		// Updates users having current style a deactivated one
-		$sql = 'SELECT style_id
-			FROM ' . STYLES_TABLE . '
-			WHERE style_active = 0';
-		$result = $this->sql_query($sql);
-
-		$deactivated_style_ids = array();
-		while ($style_id = $this->db->sql_fetchfield('style_id', false, $result))
-		{
-			$deactivated_style_ids[] = (int) $style_id;
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($deactivated_style_ids))
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_style = ' . (int) $this->config['default_style'] .'
-				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
-			$this->sql_query($sql);
-		}
-	}
-
-	function delete_orphan_private_messages()
-	{
-		// Delete orphan private messages
-		$batch_size = 500;
-
-		$sql_array = array(
-			'SELECT'	=> 'p.msg_id',
-			'FROM'		=> array(
-				PRIVMSGS_TABLE	=> 'p',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
-					'ON'	=> 'p.msg_id = t.msg_id',
-				),
-			),
-			'WHERE'		=> 't.user_id IS NULL',
-		);
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-
-		$result = $this->db->sql_query_limit($sql, $batch_size);
-
-		$delete_pms = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$delete_pms[] = (int) $row['msg_id'];
-		}
-		$db->sql_freeresult($result);
-
-		if (!empty($delete_pms))
-		{
-			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
-			$this->sql_query($sql);
-
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_11_rc2 b/phpBB/includes/db/migration/3_0_11_rc2
deleted file mode 100644
index f4e64871ed..0000000000
--- a/phpBB/includes/db/migration/3_0_11_rc2
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_11_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_11_rc1');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_novalue' => array('BOOL', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_12_rc1.php b/phpBB/includes/db/migration/3_0_12_rc1.php
deleted file mode 100644
index 58e112a43a..0000000000
--- a/phpBB/includes/db/migration/3_0_12_rc1.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_12_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_11');
-	}
-
-	function update_schema()
-	{
-		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_1_rc1.php b/phpBB/includes/db/migration/3_0_1_rc1.php
deleted file mode 100644
index e3be8b36d4..0000000000
--- a/phpBB/includes/db/migration/3_0_1_rc1.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_1_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array();
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'display_subforum_list' => array('BOOL', 1),
-				),
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array('UINT', 0),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'groups' => array('group_legend'),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array('session_forum_id'),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_legend_name' => array('group_legend', 'group_name'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
-			array('custom', array(array(&$this, 'reset_smiley_size'))),
-		);
-	}
-
-	function fix_unset_last_view_time()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . "topics
-			SET topic_last_view_time = topic_last_post_time
-			WHERE topic_last_view_time = 0";
-		$this->sql_query($sql);
-	}
-
-	function reset_smiley_size()
-	{
-		// Update smiley sizes
-		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
-
-		foreach ($smileys as $smiley)
-		{
-			if (file_exists($this->phpbb_root_path . 'images/smilies/' . $smiley))
-			{
-				list($width, $height) = getimagesize($this->phpbb_root_path . 'images/smilies/' . $smiley);
-
-				$sql = 'UPDATE ' . SMILIES_TABLE . '
-					SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
-					WHERE smiley_url = '" . $this->db->sql_escape($smiley) . "'";
-
-				$this->sql_query($sql);
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_2.php b/phpBB/includes/db/migration/3_0_2.php
deleted file mode 100644
index 36e8d52e6b..0000000000
--- a/phpBB/includes/db/migration/3_0_2.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_2_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_2_rc1.php b/phpBB/includes/db/migration/3_0_2_rc1.php
deleted file mode 100644
index cd21b7f64f..0000000000
--- a/phpBB/includes/db/migration/3_0_2_rc1.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_1_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('referer_validation', '1')),
-			array('config.add', array('check_attachment_content', '1')),
-			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_2_rc2.php b/phpBB/includes/db/migration/3_0_2_rc2.php
deleted file mode 100644
index a1fab753e2..0000000000
--- a/phpBB/includes/db/migration/3_0_2_rc2.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_2_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_2_rc1');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'change_columns' => array(
-				$this->table_prefix . 'drafts' => array(
-					'draft_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_last_post_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_subject' => array('STEXT_UNI', '', 'true_sort'),
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'topics' => array(
-					'topic_title' => array('STEXT_UNI', '', 'true_sort'),
-					'topic_last_post_subject' => array('STEXT_UNI', ''),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'sessions' => array('session_forum_id'),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_fid' => array('session_forum_id'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_3.php b/phpBB/includes/db/migration/3_0_3.php
deleted file mode 100644
index c9ca33ee88..0000000000
--- a/phpBB/includes/db/migration/3_0_3.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_3 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_2_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_3_rc1.php b/phpBB/includes/db/migration/3_0_3_rc1.php
deleted file mode 100644
index 0cd99457ee..0000000000
--- a/phpBB/includes/db/migration/3_0_3_rc1.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_3_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_2');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'styles_template' => array(
-					'template_inherits_id' => array('UINT:4', 0),
-					'template_inherit_path' => array('VCHAR', ''),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_max_recipients' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('enable_queue_trigger', '0')),
-			array('config.add', array('queue_trigger_posts', '3')),
-			array('config.add', array('pm_max_recipients', '0')),
-			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
-			array('config.add', array('dbms_version', '')),
-			array('permission.add', array('u_masspm_group', phpbb_auth::IS_GLOBAL),
-			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
-		));
-	}
-
-	function correct_acp_email_permissions()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . 'modules
-			SET module_auth = \'acl_a_email && cfg_email_enable\'
-			WHERE module_class = \'acp\'
-				AND module_basename = \'email\'';
-		$this->sql_query($sql);
-	}
-
-	function set_group_default_max_recipients()
-	{
-		// Set maximum number of recipients for the registered users, bots, guests group
-		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
-			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_4.php b/phpBB/includes/db/migration/3_0_4.php
deleted file mode 100644
index bbaaea54c9..0000000000
--- a/phpBB/includes/db/migration/3_0_4.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_4 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_4_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
-		);
-	}
-
-	function rename_log_delete_topic()
-	{
-		if ($db->sql_layer == 'oracle')
-		{
-			// log_operation is CLOB - but we can change this later
-			$sql = 'UPDATE ' . $this->table_prefix . "log
-				SET log_operation = 'LOG_DELETE_TOPIC'
-				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
-			$this->sql_query($sql);
-		}
-		else
-		{
-			$sql = 'UPDATE ' . $this->table_prefix . "log
-				SET log_operation = 'LOG_DELETE_TOPIC'
-				WHERE log_operation = 'LOG_TOPIC_DELETED'";
-			$this->sql_query($sql);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_4_rc1.php b/phpBB/includes/db/migration/3_0_4_rc1.php
deleted file mode 100644
index b783e58e24..0000000000
--- a/phpBB/includes/db/migration/3_0_4_rc1.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_4_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_3');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_profile' => array('BOOL', 0),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'styles' => array(
-					'style_id' => array('UINT', NULL, 'auto_increment'),
-					'template_id' => array('UINT', 0),
-					'theme_id' => array('UINT', 0),
-					'imageset_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'styles_imageset' => array(
-					'imageset_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_imageset_data' => array(
-					'image_id' => array('UINT', NULL, 'auto_increment'),
-					'imageset_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'styles_theme' => array(
-					'theme_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_template' => array(
-					'template_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_template_data' => array(
-					'template_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_style' => array('UINT', 0),
-				),
-				$this->table_prefix . 'users' => array(
-					'user_style' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
-		);
-	}
-
-	function update_custom_profile_fields()
-	{
-		// Update the Custom Profile Fields based on previous settings to the new format
-		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
-				FROM ' . PROFILE_FIELDS_TABLE;
-		$result = $this->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql_ary = array(
-				'field_required'	=> 0,
-				'field_show_on_reg'	=> 0,
-				'field_hide'		=> 0,
-				'field_show_profile'=> 0,
-			);
-
-			if ($row['field_required'])
-			{
-				$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
-			}
-			else if ($row['field_show_on_reg'])
-			{
-				$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
-			}
-			else if ($row['field_hide'])
-			{
-				// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
-				$sql_ary['field_hide'] = 1;
-			}
-			else
-			{
-				// equivelant to "none", which is the "Display in user control panel" option
-				$sql_ary['field_show_profile'] = 1;
-			}
-
-			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_5.php b/phpBB/includes/db/migration/3_0_5.php
deleted file mode 100644
index 272779f083..0000000000
--- a/phpBB/includes/db/migration/3_0_5.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_5 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_5_rc1part2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_5_rc1.php b/phpBB/includes/db/migration/3_0_5_rc1.php
deleted file mode 100644
index 8975728cca..0000000000
--- a/phpBB/includes/db/migration/3_0_5_rc1.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_5_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_4');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'change_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'forum_style' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		$search_indexing_state = $this->config['search_indexing_state'];
-
-		return array(
-			array('config.add', array('captcha_gd_wave', 0)),
-			array('config.add', array('captcha_gd_3d_noise', 1)),
-			array('config.add', array('captcha_gd_refresh', 1)),
-			array('config.add', array('confirm_refresh', 1)),
-			array('config.add', array('max_num_search_keywords', 10)),
-			array('config.remove', array('search_indexing_state')),
-			array('config.add', array('search_indexing_state', $search_indexing_state, true)),
-			array('custom', array(array(&$this, 'hash_old_passwords'))),
-			array('custom', array(array(&$this, 'update_ichiro_bot'))),
-		);
-	}
-
-	function hash_old_passwords()
-	{
-		$sql = 'SELECT user_id, user_password
-				FROM ' . $this->table_prefix . 'users
-				WHERE user_pass_convert = 1';
-		$result = $this->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (strlen($row['user_password']) == 32)
-			{
-				$sql_ary = array(
-					'user_password'	=> phpbb_hash($row['user_password']),
-				);
-
-				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
-			}
-		}
-		$db->sql_freeresult($result);
-	}
-
-	function update_ichiro_bot()
-	{
-		// Adjust bot entry
-		$sql = 'UPDATE ' . $this->table_prefix . "bots
-			SET bot_agent = 'ichiro/'
-			WHERE bot_agent = 'ichiro/2'";
-		$this->sql_query($sql);
-	}
-
-	function remove_duplicate_auth_options()
-	{
-		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
-		$sql = 'SELECT auth_option
-			FROM ' . $this->table_prefix . 'acl_options
-			GROUP BY auth_option
-			HAVING COUNT(*) >= 2';
-		$result = $this->db->sql_query($sql);
-
-		$auth_options = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$auth_options[] = $row['auth_option'];
-		}
-		$this->db->sql_freeresult($result);
-
-		// Remove specific auth options
-		if (!empty($auth_options))
-		{
-			foreach ($auth_options as $option)
-			{
-				// Select auth_option_ids... the largest id will be preserved
-				$sql = 'SELECT auth_option_id
-					FROM ' . ACL_OPTIONS_TABLE . "
-					WHERE auth_option = '" . $db->sql_escape($option) . "'
-					ORDER BY auth_option_id DESC";
-				// sql_query_limit not possible here, due to bug in postgresql layer
-				$result = $this->sql_query($sql);
-
-				// Skip first row, this is our original auth option we want to preserve
-				$row = $this->db->sql_fetchrow($result);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// Ok, remove this auth option...
-					$this->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-				}
-				$this->db->sql_freeresult($result);
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_5_rc1part2.php b/phpBB/includes/db/migration/3_0_5_rc1part2.php
deleted file mode 100644
index 710c8dce91..0000000000
--- a/phpBB/includes/db/migration/3_0_5_rc1part2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_5_rc1part2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_5_rc1');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'drop_keys'			=> array(
-				ACL_OPTIONS_TABLE		=> array('auth_option'),
-			),
-			'add_unique_index'	=> array(
-				ACL_OPTIONS_TABLE		=> array(
-					'auth_option'		=> array('auth_option'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_6.php b/phpBB/includes/db/migration/3_0_6.php
deleted file mode 100644
index 9582038b36..0000000000
--- a/phpBB/includes/db/migration/3_0_6.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_6 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_6_rc4');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_6_rc1.php b/phpBB/includes/db/migration/3_0_6_rc1.php
deleted file mode 100644
index 0aa5746164..0000000000
--- a/phpBB/includes/db/migration/3_0_6_rc1.php
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_6_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_5');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'confirm' => array(
-					'attempts' => array('UINT', 0),
-				),
-				$this->table_prefix . 'users' => array(
-					'user_new' => array('BOOL', 1),
-					'user_reminded' => array('TINT:4', 0),
-					'user_reminded_time' => array('TIMESTAMP', 0),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_reported' => array('BOOL', 0),
-				),
-				$this->table_prefix . 'reports' => array(
-					'pm_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'fields'			=> array(
-					'field_show_on_vt' => array('BOOL', 0),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_options' => array('UINT:20', 0),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'users' => array(
-					'user_options' => array('UINT:11', 230271),
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'reports' => array(
-					'post_id' => array('post_id'),
-					'pm_id' => array('pm_id'),
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_username' => array('post_username:255'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			//array('custom', array(array(&$this, '')))
-			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
-			array('config.update_if', array(
-				($this->config['captcha_gd']),
-				'captcha_plugin',
-				'phpbb_captcha_gd',
-			)),
-
-			array('config.add', array('feed_enable', 0)),
-			array('config.add', array('feed_limit', 10)),
-			array('config.add', array('feed_overall_forums', 1)),
-			array('config.add', array('feed_overall_forums_limit', 15)),
-			array('config.add', array('feed_overall_topics', 0)),
-			array('config.add', array('feed_overall_topics_limit', 15)),
-			array('config.add', array('feed_forum', 1)),
-			array('config.add', array('feed_topic', 1)),
-			array('config.add', array('feed_item_statistics', 1)),
-
-			array('config.add', array('smilies_per_page', 50)),
-			array('config.add', array('allow_pm_report', 1)),
-			array('config.add', array('min_post_chars', 1)),
-			array('config.add', array('allow_quick_reply', 1)),
-			array('config.add', array('new_member_post_limit', 0)),
-			array('config.add', array('new_member_group_default', 0)),
-			array('config.add', array('delete_time', $this->config['edit_time'])),
-
-			array('config.add', array('allow_avatar', 0)),
-			array('config.add_if', array(
-				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
-				'allow_avatar',
-				1,
-			)),
-			array('config.add', array('allow_avatar_remote_upload', 0)),
-			array('config.add_if', array(
-				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
-				'allow_avatar_remote_upload',
-				1,
-			)),
-
-			array('module.add', array(
-				'feed' => array(
-					'base'		=> 'board',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_FEED_SETTINGS',
-					'auth'		=> 'acl_a_board',
-					'cat'		=> 'ACP_BOARD_CONFIGURATION',
-					'after'		=> array('signature', 'ACP_SIGNATURE_SETTINGS')
-				),
-			)),
-			array('module.add', array(
-				'warnings' => array(
-					'base'		=> 'users',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_USER_WARNINGS',
-					'auth'		=> 'acl_a_user',
-					'display'	=> 0,
-					'cat'		=> 'ACP_CAT_USERS',
-					'after'		=> array('feedback', 'ACP_USER_FEEDBACK')
-				),
-			)),
-			array('module.add', array(
-				'send_statistics' => array(
-					'base'		=> 'send_statistics',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_SEND_STATISTICS',
-					'auth'		=> 'acl_a_server',
-					'cat'		=> 'ACP_SERVER_CONFIGURATION'
-				),
-			)),
-			array('module.add', array(
-				'setting_forum_copy' => array(
-					'base'		=> 'permissions',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_FORUM_PERMISSIONS_COPY',
-					'auth'		=> 'acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth',
-					'cat'		=> 'ACP_FORUM_BASED_PERMISSIONS',
-					'after'		=> array('setting_forum_local', 'ACP_FORUM_PERMISSIONS')
-				),
-			)),
-			array('module.add', array(
-				'pm_reports' => array(
-					'base'		=> 'pm_reports',
-					'class'		=> 'mcp',
-					'title'		=> 'MCP_PM_REPORTS_OPEN',
-					'auth'		=> 'aclf_m_report',
-					'cat'		=> 'MCP_REPORTS'
-				),
-			)),
-			array('module.add', array(
-				'pm_reports_closed' => array(
-					'base'		=> 'pm_reports',
-					'class'		=> 'mcp',
-					'title'		=> 'MCP_PM_REPORTS_CLOSED',
-					'auth'		=> 'aclf_m_report',
-					'cat'		=> 'MCP_REPORTS'
-				),
-			)),
-			array('module.add', array(
-				'pm_report_details' => array(
-					'base'		=> 'pm_reports',
-					'class'		=> 'mcp',
-					'title'		=> 'MCP_PM_REPORT_DETAILS',
-					'auth'		=> 'aclf_m_report',
-					'cat'		=> 'MCP_REPORTS'
-				),
-			)),
-			array('custom', array(array(&$this, 'add_newly_registered_group'))),
-			array('custom', array(array(&$this, 'set_user_options_default'))),
-		);
-	}
-
-	function set_user_options_default()
-	{
-		// 229376 is the added value to enable all three signature options
-		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
-		$this->sql_query($sql);
-	}
-
-	function add_newly_registered_group()
-	{
-		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = 'NEWLY_REGISTERED'";
-		$result = $this->db->sql_query($sql);
-		$group_id = (int) $this->db->sql_fetchfield('group_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$group_id)
-		{
-			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
-			$this->sql_query($sql);
-
-			$group_id = $this->db->sql_nextid();
-		}
-
-		// Insert new user role... at the end of the chain
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
-				AND role_type = 'u_'";
-		$result = $this->db->sql_query($sql);
-		$u_role = (int) $this->db->sql_fetchfield('role_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$u_role)
-		{
-			$sql = 'SELECT MAX(role_order) as max_order_id
-				FROM ' . ACL_ROLES_TABLE . "
-				WHERE role_type = 'u_'";
-			$result = $this->db->sql_query($sql);
-			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
-			$this->db->sql_freeresult($result);
-
-			$next_order_id++;
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
-			$this->sql_query($sql);
-			$u_role = $this->db->sql_nextid();
-
-			if (!$errored)
-			{
-				// Now add the correct data to the roles...
-				// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
-				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
-				$this->sql_query($sql);
-
-				// Add user role to group
-				$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
-				$this->sql_query($sql);
-			}
-		}
-
-		// Insert new forum role
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
-				AND role_type = 'f_'";
-		$result = $this->db->sql_query($sql);
-		$f_role = (int) $this->db->sql_fetchfield('role_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$f_role)
-		{
-			$sql = 'SELECT MAX(role_order) as max_order_id
-				FROM ' . ACL_ROLES_TABLE . "
-				WHERE role_type = 'f_'";
-			$result = $this->db->sql_query($sql);
-			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
-			$this->db->sql_freeresult($result);
-
-			$next_order_id++;
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
-			$this->sql_query($sql);
-			$f_role = $this->db->sql_nextid();
-
-			if (!$errored)
-			{
-				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
-				$this->sql_query($sql);
-			}
-		}
-
-		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
-		$sql = 'SELECT 1
-			FROM ' . USERS_TABLE . '
-			WHERE user_new = 0';
-		$result = $this->db->sql_query_limit($sql, 1);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
-			$this->sql_query($sql);
-		}
-
-		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
-		// Check if the role is already assigned...
-		$sql = 'SELECT forum_id
-			FROM ' . ACL_GROUPS_TABLE . '
-			WHERE group_id = ' . $group_id . '
-				AND auth_role_id = ' . $f_role;
-		$result = $this->db->sql_query($sql);
-		$is_options = (int) $this->db->sql_fetchfield('forum_id');
-		$this->db->sql_freeresult($result);
-
-		// Not assigned at all... :/
-		if (!$is_options)
-		{
-			// Get postable forums
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_type != ' . FORUM_LINK;
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$this->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)');
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		// Clear permissions...
-		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->phpEx);
-		$auth_admin = new auth_admin();
-		$auth_admin->acl_clear_prefetch();
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_6_rc2.php b/phpBB/includes/db/migration/3_0_6_rc2.php
deleted file mode 100644
index 1552485d0a..0000000000
--- a/phpBB/includes/db/migration/3_0_6_rc2.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_6_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_6_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_6_rc3.php b/phpBB/includes/db/migration/3_0_6_rc3.php
deleted file mode 100644
index 6a7ad1c56d..0000000000
--- a/phpBB/includes/db/migration/3_0_6_rc3.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_6_rc3 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_6_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_cp_fields'))),
-		);
-	}
-
-	function update_cp_fields()
-	{
-		// Update the Custom Profile Fields based on previous settings to the new format
-		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
-			SET field_show_on_vt = 1
-			WHERE field_hide = 0
-				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_6_rc4.php b/phpBB/includes/db/migration/3_0_6_rc4.php
deleted file mode 100644
index 00161456b6..0000000000
--- a/phpBB/includes/db/migration/3_0_6_rc4.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_6_rc4 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_6_rc3');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_7.php b/phpBB/includes/db/migration/3_0_7.php
deleted file mode 100644
index 2b5ec15fa9..0000000000
--- a/phpBB/includes/db/migration/3_0_7.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_7 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_7_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_7_pl1.php b/phpBB/includes/db/migration/3_0_7_pl1.php
deleted file mode 100644
index 22c04f1daf..0000000000
--- a/phpBB/includes/db/migration/3_0_7_pl1.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_7_pl1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_7');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_7_rc1.php b/phpBB/includes/db/migration/3_0_7_rc1.php
deleted file mode 100644
index d08a468941..0000000000
--- a/phpBB/includes/db/migration/3_0_7_rc1.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_7_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_6');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'drop_keys' => array(
-				$this->table_prefix . 'log' => array('log_time'),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'topics_track' => array(
-					'topic_id' => array('topic_id'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('feed_overall', 1)),
-			array('config.add', array('feed_http_auth', 0)),
-			array('config.add', array('feed_limit_post', $this->config['feed_limit'])),
-			array('config.add', array('feed_limit_topic', $this->config['feed_overall_topics_limit'])),
-			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
-			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
-			array('custom', array(array(&$this, 'delete_text_templates'))),
-		);
-	}
-
-	function delete_text_templates()
-	{
-		// Delete all text-templates from the template_data
-		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
-			WHERE template_filename ' . $this->db->sql_like_expression($this->db->any_char . '.txt');
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_7_rc2.php b/phpBB/includes/db/migration/3_0_7_rc2.php
deleted file mode 100644
index 4ab4e906d7..0000000000
--- a/phpBB/includes/db/migration/3_0_7_rc2.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_7_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_7_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_email_hash'))),
-		);
-	}
-
-	function update_email_hash($start = 0)
-	{
-		$limit = 1000;
-
-		$sql = 'SELECT user_id, user_email, user_email_hash
-			FROM ' . USERS_TABLE . '
-			WHERE user_type <> ' . USER_IGNORE . "
-				AND user_email <> ''";
-		$result = $this->db->sql_query_limit($sql, $limit, $start);
-
-		$i = 0;
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$i++;
-
-			// Snapshot of the phpbb_email_hash() function
-			// We cannot call it directly because the auto updater updates the DB first. :/
-			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
-
-			if ($user_email_hash != $row['user_email_hash'])
-			{
-				$sql_ary = array(
-					'user_email_hash'	=> $user_email_hash,
-				);
-
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE user_id = ' . (int) $row['user_id'];
-				$this->sql_query($sql);
-			}
-		}
-		$db->sql_freeresult($result);
-
-		if ($i < $limit)
-		{
-			// Completed
-			return false;
-		}
-
-		return $start + $limit;
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_8.php b/phpBB/includes/db/migration/3_0_8.php
deleted file mode 100644
index 3e7f843a65..0000000000
--- a/phpBB/includes/db/migration/3_0_8.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_8 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_8_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_8_rc1.php b/phpBB/includes/db/migration/3_0_8_rc1.php
deleted file mode 100644
index 0d93efedce..0000000000
--- a/phpBB/includes/db/migration/3_0_8_rc1.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_8_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_7_pl1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
-			array('custom', array(array(&$this, 'update_module_auth'))),
-			array('custom', array(array(&$this, 'update_bots'))),
-			array('custom', array(array(&$this, 'delete_orphan_shadow_topics'))),
-			array('module.add', array(
-				'post'	=> array(
-					'base'		=> 'board',
-					'class'		=> 'acp',
-					'title'		=> 'ACP_POST_SETTINGS',
-					'auth'		=> 'acl_a_board',
-					'cat'		=> 'ACP_MESSAGES',
-					'after'		=> array('message', 'ACP_MESSAGE_SETTINGS')
-				),
-			)),
-			array('config.add', array('load_unreads_search', 1)),
-			array('config.update_if_equals', array(600, 'queue_interval', 60)),
-			array('config.update_if_equals', array(50, 'email_package_size', 20)),
-		);
-	}
-
-	function update_file_extension_group_names()
-	{
-		// Update file extension group names to use language strings.
-		$sql = 'SELECT lang_dir
-			FROM ' . LANG_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		$extension_groups_updated = array();
-		while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
-		{
-			$lang_dir = basename($lang_dir);
-
-			// The language strings we need are either in language/.../acp/attachments.php
-			// in the update package if we're updating to 3.0.8-RC1 or later,
-			// or they are in language/.../install.php when we're updating from 3.0.7-PL1 or earlier.
-			// On an already updated board, they can also already be in language/.../acp/attachments.php
-			// in the board root.
-			$lang_files = array(
-				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.$this->phpEx",
-				"{$this->phpbb_root_path}language/$lang_dir/install.$this->phpEx",
-				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.$this->phpEx",
-			);
-
-			foreach ($lang_files as $lang_file)
-			{
-				if (!file_exists($lang_file))
-				{
-					continue;
-				}
-
-				$lang = array();
-				include($lang_file);
-
-				foreach($lang as $lang_key => $lang_val)
-				{
-					if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
-					{
-						continue;
-					}
-
-					$sql_ary = array(
-						'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
-					);
-
-					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-						SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
-						WHERE group_name = '" . $this->db->sql_escape($lang_val) . "'";
-					$this->sql_query($sql);
-
-					$extension_groups_updated[$lang_key] = true;
-				}
-			}
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	function update_module_auth()
-	{
-		$sql = 'UPDATE ' . MODULES_TABLE . '
-			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
-			WHERE module_class = \'ucp\'
-				AND module_basename = \'profile\'
-				AND module_mode = \'avatar\'';
-		$this->sql_query($sql);
-	}
-
-	function update_bots()
-	{
-		$bot_name = 'Bing [Bot]';
-		$bot_name_clean = utf8_clean_string($bot_name);
-
-		$sql = 'SELECT user_id
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . $this->db->sql_escape($bot_name_clean) . "'";
-		$result = $this->db->sql_query($sql);
-		$bing_already_added = (bool) $this->db->sql_fetchfield('user_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$bing_already_added)
-		{
-			$bot_agent = 'bingbot/';
-			$bot_ip = '';
-			$sql = 'SELECT group_id, group_colour
-				FROM ' . GROUPS_TABLE . "
-				WHERE group_name = 'BOTS'";
-			$result = $this->db->sql_query($sql);
-			$group_row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$group_row)
-			{
-				// default fallback, should never get here
-				$group_row['group_id'] = 6;
-				$group_row['group_colour'] = '9E8DA7';
-			}
-
-			if (!function_exists('user_add'))
-			{
-				include($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
-			}
-
-			$user_row = array(
-				'user_type'				=> USER_IGNORE,
-				'group_id'				=> $group_row['group_id'],
-				'username'				=> $bot_name,
-				'user_regdate'			=> time(),
-				'user_password'			=> '',
-				'user_colour'			=> $group_row['group_colour'],
-				'user_email'			=> '',
-				'user_lang'				=> $this->config['default_lang'],
-				'user_style'			=> $this->config['default_style'],
-				'user_timezone'			=> 0,
-				'user_dateformat'		=> $this->config['default_dateformat'],
-				'user_allow_massemail'	=> 0,
-			);
-
-			$user_id = user_add($user_row);
-
-			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
-				'bot_active'	=> 1,
-				'bot_name'		=> (string) $bot_name,
-				'user_id'		=> (int) $user_id,
-				'bot_agent'		=> (string) $bot_agent,
-				'bot_ip'		=> (string) $bot_ip,
-			));
-
-			$this->sql_query($sql);
-		}
-	}
-
-	function delete_orphan_shadow_topics()
-	{
-		// Delete shadow topics pointing to not existing topics
-		$batch_size = 500;
-
-		// Set of affected forums we have to resync
-		$sync_forum_ids = array();
-
-		$sql_array = array(
-			'SELECT'	=> 't1.topic_id, t1.forum_id',
-			'FROM'		=> array(
-				TOPICS_TABLE	=> 't1',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(TOPICS_TABLE	=> 't2'),
-					'ON'	=> 't1.topic_moved_id = t2.topic_id',
-				),
-			),
-			'WHERE'		=> 't1.topic_moved_id <> 0
-						AND t2.topic_id IS NULL',
-		);
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-		$result = $this->db->sql_query_limit($sql, $batch_size);
-
-		$topic_ids = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$topic_ids[] = (int) $row['topic_id'];
-
-			$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($topic_ids))
-		{
-			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
-			$this->db->sql_query($sql);
-
-			// Sync the forums we have deleted shadow topics from.
-			sync('forum', 'forum_id', $sync_forum_ids, true, true);
-
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_9.php b/phpBB/includes/db/migration/3_0_9.php
deleted file mode 100644
index 2e1eab26e7..0000000000
--- a/phpBB/includes/db/migration/3_0_9.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_9 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_9_rc4');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_9_rc1.php b/phpBB/includes/db/migration/3_0_9_rc1.php
deleted file mode 100644
index 4ee18349ce..0000000000
--- a/phpBB/includes/db/migration/3_0_9_rc1.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_9_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_8');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_tables' => array(
-				$this->table_prefix . 'login_attempts' => array(
-					'COLUMNS' => array(
-						// this column was removed from the database updater
-						// after 3.0.9-RC3 was released. It might still exist
-						// in 3.0.9-RCX installations and has to be dropped in
-						// 3.0.12 after the db_tools class is capable of properly
-						// removing a primary key.
-						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
-						'attempt_ip'			=> array('VCHAR:40', ''),
-						'attempt_browser'		=> array('VCHAR:150', ''),
-						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
-						'attempt_time'			=> array('TIMESTAMP', 0),
-						'user_id'				=> array('UINT', 0),
-						'username'				=> array('VCHAR_UNI:255', 0),
-						'username_clean'		=> array('VCHAR_CI', 0),
-					),
-					//'PRIMARY_KEY' => 'attempt_id',
-					'KEYS' => array(
-						'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
-						'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
-						'att_time' => array('INDEX', array('attempt_time')),
-						'user_id' => array('INDEX', 'user_id'),
-					),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'bbcode' => array(
-					'bbcode_id' => array('USINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('ip_login_limit_max', 50)),
-			array('config.add', array('ip_login_limit_time', 21600)),
-			array('config.add', array('ip_login_limit_use_forwarded', 0)),
-			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
-			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
-		);
-	}
-
-	function update_file_extension_group_names()
-	{
-		// Update file extension group names to use language strings, again.
-		$sql = 'SELECT group_id, group_name
-			FROM ' . EXTENSION_GROUPS_TABLE . '
-			WHERE group_name ' . $this->db->sql_like_expression('EXT_GROUP_' . $this->db->any_char);
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql_ary = array(
-				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
-			);
-
-			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE group_id = ' . $row['group_id'];
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	function fix_firebird_qa_captcha()
-	{
-		// Recover from potentially broken Q&A CAPTCHA table on firebird
-		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
-		// without data loss
-		if ($this->db_tools->sql_layer == 'firebird')
-		{
-			$tables = array(
-				$this->table_prefix . 'captcha_questions',
-				$this->table_prefix . 'captcha_answers',
-				$this->table_prefix . 'qa_confirm',
-			);
-			foreach ($tables as $table)
-			{
-				if ($this->db_tools->sql_table_exists($table))
-				{
-					$this->db_tools->sql_table_drop($table);
-				}
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_9_rc2.php b/phpBB/includes/db/migration/3_0_9_rc2.php
deleted file mode 100644
index 96782b2b01..0000000000
--- a/phpBB/includes/db/migration/3_0_9_rc2.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_9_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_9_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_9_rc3.php b/phpBB/includes/db/migration/3_0_9_rc3.php
deleted file mode 100644
index ac0f3cb972..0000000000
--- a/phpBB/includes/db/migration/3_0_9_rc3.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_9_rc3 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_9_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/3_0_9_rc4.php b/phpBB/includes/db/migration/3_0_9_rc4.php
deleted file mode 100644
index 7880e1b864..0000000000
--- a/phpBB/includes/db/migration/3_0_9_rc4.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_3_0_9_rc4 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_3_0_9_rc3');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_1.php b/phpBB/includes/db/migration/data/3_0_1.php
new file mode 100644
index 0000000000..294db3d946
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_1.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_1_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_10.php b/phpBB/includes/db/migration/data/3_0_10.php
new file mode 100644
index 0000000000..6d39969d48
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_10.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_10 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_10_rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc1.php b/phpBB/includes/db/migration/data/3_0_10_rc1.php
new file mode 100644
index 0000000000..06105c5b0d
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_10_rc1.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_10_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_9');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('email_max_chunk_size', 50)),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc2.php b/phpBB/includes/db/migration/data/3_0_10_rc2.php
new file mode 100644
index 0000000000..04161caf28
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_10_rc2.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_10_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_10_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc3.php b/phpBB/includes/db/migration/data/3_0_10_rc3.php
new file mode 100644
index 0000000000..539f0b8fec
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_10_rc3.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_10_rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_10_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_11.php b/phpBB/includes/db/migration/data/3_0_11.php
new file mode 100644
index 0000000000..3404272ef9
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_11.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_11 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc1.php b/phpBB/includes/db/migration/data/3_0_11_rc1.php
new file mode 100644
index 0000000000..f44226df02
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_11_rc1.php
@@ -0,0 +1,96 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_10');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
+			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
+		);
+	}
+
+	function cleanup_deactivated_styles()
+	{
+		// Updates users having current style a deactivated one
+		$sql = 'SELECT style_id
+			FROM ' . STYLES_TABLE . '
+			WHERE style_active = 0';
+		$result = $this->sql_query($sql);
+
+		$deactivated_style_ids = array();
+		while ($style_id = $this->db->sql_fetchfield('style_id', false, $result))
+		{
+			$deactivated_style_ids[] = (int) $style_id;
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($deactivated_style_ids))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_style = ' . (int) $this->config['default_style'] .'
+				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
+			$this->sql_query($sql);
+		}
+	}
+
+	function delete_orphan_private_messages()
+	{
+		// Delete orphan private messages
+		$batch_size = 500;
+
+		$sql_array = array(
+			'SELECT'	=> 'p.msg_id',
+			'FROM'		=> array(
+				PRIVMSGS_TABLE	=> 'p',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
+					'ON'	=> 'p.msg_id = t.msg_id',
+				),
+			),
+			'WHERE'		=> 't.user_id IS NULL',
+		);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+
+		$result = $this->db->sql_query_limit($sql, $batch_size);
+
+		$delete_pms = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$delete_pms[] = (int) $row['msg_id'];
+		}
+		$db->sql_freeresult($result);
+
+		if (!empty($delete_pms))
+		{
+			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
+			$this->sql_query($sql);
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc2 b/phpBB/includes/db/migration/data/3_0_11_rc2
new file mode 100644
index 0000000000..6add980c73
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_11_rc2
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_11_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11_rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_novalue' => array('BOOL', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_12_rc1.php b/phpBB/includes/db/migration/data/3_0_12_rc1.php
new file mode 100644
index 0000000000..734a57ecee
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_12_rc1.php
@@ -0,0 +1,26 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_12_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11');
+	}
+
+	function update_schema()
+	{
+		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_1_rc1.php b/phpBB/includes/db/migration/data/3_0_1_rc1.php
new file mode 100644
index 0000000000..1a696e0003
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_1_rc1.php
@@ -0,0 +1,77 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array();
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'display_subforum_list' => array('BOOL', 1),
+				),
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('UINT', 0),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'groups' => array('group_legend'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('session_forum_id'),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_legend_name' => array('group_legend', 'group_name'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
+			array('custom', array(array(&$this, 'reset_smiley_size'))),
+		);
+	}
+
+	function fix_unset_last_view_time()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . "topics
+			SET topic_last_view_time = topic_last_post_time
+			WHERE topic_last_view_time = 0";
+		$this->sql_query($sql);
+	}
+
+	function reset_smiley_size()
+	{
+		// Update smiley sizes
+		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
+
+		foreach ($smileys as $smiley)
+		{
+			if (file_exists($this->phpbb_root_path . 'images/smilies/' . $smiley))
+			{
+				list($width, $height) = getimagesize($this->phpbb_root_path . 'images/smilies/' . $smiley);
+
+				$sql = 'UPDATE ' . SMILIES_TABLE . '
+					SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
+					WHERE smiley_url = '" . $this->db->sql_escape($smiley) . "'";
+
+				$this->sql_query($sql);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_2.php b/phpBB/includes/db/migration/data/3_0_2.php
new file mode 100644
index 0000000000..a5f94e644b
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_2.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_2_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc1.php b/phpBB/includes/db/migration/data/3_0_2_rc1.php
new file mode 100644
index 0000000000..1b4d3bc2b8
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_2_rc1.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('referer_validation', '1')),
+			array('config.add', array('check_attachment_content', '1')),
+			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc2.php b/phpBB/includes/db/migration/data/3_0_2_rc2.php
new file mode 100644
index 0000000000..9ddeb60a14
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_2_rc2.php
@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_2_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_2_rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'drafts' => array(
+					'draft_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_last_post_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_subject' => array('STEXT_UNI', '', 'true_sort'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'topics' => array(
+					'topic_title' => array('STEXT_UNI', '', 'true_sort'),
+					'topic_last_post_subject' => array('STEXT_UNI', ''),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array('session_forum_id'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_fid' => array('session_forum_id'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_3.php b/phpBB/includes/db/migration/data/3_0_3.php
new file mode 100644
index 0000000000..f989eea025
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_3.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_2_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_3_rc1.php b/phpBB/includes/db/migration/data/3_0_3_rc1.php
new file mode 100644
index 0000000000..737eab4bd3
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_3_rc1.php
@@ -0,0 +1,61 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_2');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'styles_template' => array(
+					'template_inherits_id' => array('UINT:4', 0),
+					'template_inherit_path' => array('VCHAR', ''),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_max_recipients' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('enable_queue_trigger', '0')),
+			array('config.add', array('queue_trigger_posts', '3')),
+			array('config.add', array('pm_max_recipients', '0')),
+			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
+			array('config.add', array('dbms_version', '')),
+			array('permission.add', array('u_masspm_group', phpbb_auth::IS_GLOBAL),
+			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
+		));
+	}
+
+	function correct_acp_email_permissions()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . 'modules
+			SET module_auth = \'acl_a_email && cfg_email_enable\'
+			WHERE module_class = \'acp\'
+				AND module_basename = \'email\'';
+		$this->sql_query($sql);
+	}
+
+	function set_group_default_max_recipients()
+	{
+		// Set maximum number of recipients for the registered users, bots, guests group
+		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
+			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_4.php b/phpBB/includes/db/migration/data/3_0_4.php
new file mode 100644
index 0000000000..cd34fda9ab
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_4.php
@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_4 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_4_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
+		);
+	}
+
+	function rename_log_delete_topic()
+	{
+		if ($db->sql_layer == 'oracle')
+		{
+			// log_operation is CLOB - but we can change this later
+			$sql = 'UPDATE ' . $this->table_prefix . "log
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
+			$this->sql_query($sql);
+		}
+		else
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . "log
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation = 'LOG_TOPIC_DELETED'";
+			$this->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_4_rc1.php b/phpBB/includes/db/migration/data/3_0_4_rc1.php
new file mode 100644
index 0000000000..342f1fa910
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_4_rc1.php
@@ -0,0 +1,103 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_3');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_profile' => array('BOOL', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'styles' => array(
+					'style_id' => array('UINT', NULL, 'auto_increment'),
+					'template_id' => array('UINT', 0),
+					'theme_id' => array('UINT', 0),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_imageset' => array(
+					'imageset_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_imageset_data' => array(
+					'image_id' => array('UINT', NULL, 'auto_increment'),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_theme' => array(
+					'theme_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template' => array(
+					'template_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template_data' => array(
+					'template_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
+		);
+	}
+
+	function update_custom_profile_fields()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
+				FROM ' . PROFILE_FIELDS_TABLE;
+		$result = $this->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'field_required'	=> 0,
+				'field_show_on_reg'	=> 0,
+				'field_hide'		=> 0,
+				'field_show_profile'=> 0,
+			);
+
+			if ($row['field_required'])
+			{
+				$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_show_on_reg'])
+			{
+				$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_hide'])
+			{
+				// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
+				$sql_ary['field_hide'] = 1;
+			}
+			else
+			{
+				// equivelant to "none", which is the "Display in user control panel" option
+				$sql_ary['field_show_profile'] = 1;
+			}
+
+			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_5.php b/phpBB/includes/db/migration/data/3_0_5.php
new file mode 100644
index 0000000000..5671832a82
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_5.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_5 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_5_rc1part2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1.php b/phpBB/includes/db/migration/data/3_0_5_rc1.php
new file mode 100644
index 0000000000..9205f0d5f8
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_5_rc1.php
@@ -0,0 +1,119 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_4');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		$search_indexing_state = $this->config['search_indexing_state'];
+
+		return array(
+			array('config.add', array('captcha_gd_wave', 0)),
+			array('config.add', array('captcha_gd_3d_noise', 1)),
+			array('config.add', array('captcha_gd_refresh', 1)),
+			array('config.add', array('confirm_refresh', 1)),
+			array('config.add', array('max_num_search_keywords', 10)),
+			array('config.remove', array('search_indexing_state')),
+			array('config.add', array('search_indexing_state', $search_indexing_state, true)),
+			array('custom', array(array(&$this, 'hash_old_passwords'))),
+			array('custom', array(array(&$this, 'update_ichiro_bot'))),
+		);
+	}
+
+	function hash_old_passwords()
+	{
+		$sql = 'SELECT user_id, user_password
+				FROM ' . $this->table_prefix . 'users
+				WHERE user_pass_convert = 1';
+		$result = $this->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (strlen($row['user_password']) == 32)
+			{
+				$sql_ary = array(
+					'user_password'	=> phpbb_hash($row['user_password']),
+				);
+
+				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
+			}
+		}
+		$db->sql_freeresult($result);
+	}
+
+	function update_ichiro_bot()
+	{
+		// Adjust bot entry
+		$sql = 'UPDATE ' . $this->table_prefix . "bots
+			SET bot_agent = 'ichiro/'
+			WHERE bot_agent = 'ichiro/2'";
+		$this->sql_query($sql);
+	}
+
+	function remove_duplicate_auth_options()
+	{
+		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
+		$sql = 'SELECT auth_option
+			FROM ' . $this->table_prefix . 'acl_options
+			GROUP BY auth_option
+			HAVING COUNT(*) >= 2';
+		$result = $this->db->sql_query($sql);
+
+		$auth_options = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$auth_options[] = $row['auth_option'];
+		}
+		$this->db->sql_freeresult($result);
+
+		// Remove specific auth options
+		if (!empty($auth_options))
+		{
+			foreach ($auth_options as $option)
+			{
+				// Select auth_option_ids... the largest id will be preserved
+				$sql = 'SELECT auth_option_id
+					FROM ' . ACL_OPTIONS_TABLE . "
+					WHERE auth_option = '" . $db->sql_escape($option) . "'
+					ORDER BY auth_option_id DESC";
+				// sql_query_limit not possible here, due to bug in postgresql layer
+				$result = $this->sql_query($sql);
+
+				// Skip first row, this is our original auth option we want to preserve
+				$row = $this->db->sql_fetchrow($result);
+
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					// Ok, remove this auth option...
+					$this->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+				}
+				$this->db->sql_freeresult($result);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
new file mode 100644
index 0000000000..6be8ea9845
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_5_rc1part2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_5_rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'drop_keys'			=> array(
+				ACL_OPTIONS_TABLE		=> array('auth_option'),
+			),
+			'add_unique_index'	=> array(
+				ACL_OPTIONS_TABLE		=> array(
+					'auth_option'		=> array('auth_option'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_6.php b/phpBB/includes/db/migration/data/3_0_6.php
new file mode 100644
index 0000000000..c2cb59e62a
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_6.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_6 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_6_rc4');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc1.php b/phpBB/includes/db/migration/data/3_0_6_rc1.php
new file mode 100644
index 0000000000..eefdc1692d
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_6_rc1.php
@@ -0,0 +1,299 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_5');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'confirm' => array(
+					'attempts' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_new' => array('BOOL', 1),
+					'user_reminded' => array('TINT:4', 0),
+					'user_reminded_time' => array('TIMESTAMP', 0),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_reported' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'reports' => array(
+					'pm_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'fields'			=> array(
+					'field_show_on_vt' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_options' => array('UINT:20', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'users' => array(
+					'user_options' => array('UINT:11', 230271),
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'reports' => array(
+					'post_id' => array('post_id'),
+					'pm_id' => array('pm_id'),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_username' => array('post_username:255'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
+			array('if', array(
+				($this->config['captcha_gd']),
+				array('config.update', array('captcha_plugin', 'phpbb_captcha_gd')),
+			)),
+
+			array('config.add', array('feed_enable', 0)),
+			array('config.add', array('feed_limit', 10)),
+			array('config.add', array('feed_overall_forums', 1)),
+			array('config.add', array('feed_overall_forums_limit', 15)),
+			array('config.add', array('feed_overall_topics', 0)),
+			array('config.add', array('feed_overall_topics_limit', 15)),
+			array('config.add', array('feed_forum', 1)),
+			array('config.add', array('feed_topic', 1)),
+			array('config.add', array('feed_item_statistics', 1)),
+
+			array('config.add', array('smilies_per_page', 50)),
+			array('config.add', array('allow_pm_report', 1)),
+			array('config.add', array('min_post_chars', 1)),
+			array('config.add', array('allow_quick_reply', 1)),
+			array('config.add', array('new_member_post_limit', 0)),
+			array('config.add', array('new_member_group_default', 0)),
+			array('config.add', array('delete_time', $this->config['edit_time'])),
+
+			array('config.add', array('allow_avatar', 0)),
+			array('if', array(
+				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
+				array('config.add', array('allow_avatar', 1)),
+			)),
+			array('config.add', array('allow_avatar_remote_upload', 0)),
+			array('if', array(
+				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
+				array('config.add', array('allow_avatar_remote_upload', 1)),
+			)),
+
+			array('module.add', array(
+				'acp',
+				'ACP_BOARD_CONFIGURATION',
+				array(
+					'module_basename'	=> 'board',
+					'modes'				=> array('feed'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_CAT_USERS',
+				array(
+					'module_basename'	=> 'users',
+					'modes'				=> array('warnings'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_SERVER_CONFIGURATION',
+				array(
+					'module_basename'	=> 'send_statistics',
+					'modes'				=> array('send_statistics'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_FORUM_BASED_PERMISSIONS',
+				array(
+					'module_basename'	=> 'permissions',
+					'modes'				=> array('setting_forum_copy'),
+				),
+			)),
+			array('module.add', array(
+				'mcp',
+				'MCP_REPORTS',
+				array(
+					'module_basename'	=> 'pm_reports',
+					'modes'				=> array('pm_reports'),
+				),
+			)),
+			array('module.add', array(
+				'mcp',
+				'MCP_REPORTS',
+				array(
+					'module_basename'	=> 'pm_reports',
+					'modes'				=> array('pm_reports_closed'),
+				),
+			)),
+			array('module.add', array(
+				'mcp',
+				'MCP_REPORTS',
+				array(
+					'module_basename'	=> 'pm_reports',
+					'modes'				=> array('pm_report_details'),
+				),
+			)),
+			array('custom', array(array(&$this, 'add_newly_registered_group'))),
+			array('custom', array(array(&$this, 'set_user_options_default'))),
+		);
+	}
+
+	function set_user_options_default()
+	{
+		// 229376 is the added value to enable all three signature options
+		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
+		$this->sql_query($sql);
+	}
+
+	function add_newly_registered_group()
+	{
+		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . "
+			WHERE group_name = 'NEWLY_REGISTERED'";
+		$result = $this->db->sql_query($sql);
+		$group_id = (int) $this->db->sql_fetchfield('group_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$group_id)
+		{
+			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
+			$this->sql_query($sql);
+
+			$group_id = $this->db->sql_nextid();
+		}
+
+		// Insert new user role... at the end of the chain
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
+				AND role_type = 'u_'";
+		$result = $this->db->sql_query($sql);
+		$u_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$u_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'u_'";
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
+			$this->sql_query($sql);
+			$u_role = $this->db->sql_nextid();
+
+			if (!$errored)
+			{
+				// Now add the correct data to the roles...
+				// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
+				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
+				$this->sql_query($sql);
+
+				// Add user role to group
+				$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
+				$this->sql_query($sql);
+			}
+		}
+
+		// Insert new forum role
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
+				AND role_type = 'f_'";
+		$result = $this->db->sql_query($sql);
+		$f_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$f_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'f_'";
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
+			$this->sql_query($sql);
+			$f_role = $this->db->sql_nextid();
+
+			if (!$errored)
+			{
+				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
+				$this->sql_query($sql);
+			}
+		}
+
+		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
+		$sql = 'SELECT 1
+			FROM ' . USERS_TABLE . '
+			WHERE user_new = 0';
+		$result = $this->db->sql_query_limit($sql, 1);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$row)
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
+			$this->sql_query($sql);
+		}
+
+		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
+		// Check if the role is already assigned...
+		$sql = 'SELECT forum_id
+			FROM ' . ACL_GROUPS_TABLE . '
+			WHERE group_id = ' . $group_id . '
+				AND auth_role_id = ' . $f_role;
+		$result = $this->db->sql_query($sql);
+		$is_options = (int) $this->db->sql_fetchfield('forum_id');
+		$this->db->sql_freeresult($result);
+
+		// Not assigned at all... :/
+		if (!$is_options)
+		{
+			// Get postable forums
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type != ' . FORUM_LINK;
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$this->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)');
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		// Clear permissions...
+		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->phpEx);
+		$auth_admin = new auth_admin();
+		$auth_admin->acl_clear_prefetch();
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc2.php b/phpBB/includes/db/migration/data/3_0_6_rc2.php
new file mode 100644
index 0000000000..07b31a53b9
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_6_rc2.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_6_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_6_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc3.php b/phpBB/includes/db/migration/data/3_0_6_rc3.php
new file mode 100644
index 0000000000..c19a792bad
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_6_rc3.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_6_rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_6_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_cp_fields'))),
+		);
+	}
+
+	function update_cp_fields()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
+			SET field_show_on_vt = 1
+			WHERE field_hide = 0
+				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc4.php b/phpBB/includes/db/migration/data/3_0_6_rc4.php
new file mode 100644
index 0000000000..c48b1ca394
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_6_rc4.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_6_rc4 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_6_rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_7.php b/phpBB/includes/db/migration/data/3_0_7.php
new file mode 100644
index 0000000000..05781b7b49
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_7.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_7 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_7_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_7_pl1.php b/phpBB/includes/db/migration/data/3_0_7_pl1.php
new file mode 100644
index 0000000000..cee7a91a2e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_7_pl1.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_7_pl1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_7');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc1.php b/phpBB/includes/db/migration/data/3_0_7_rc1.php
new file mode 100644
index 0000000000..b2d49cce63
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_7_rc1.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_6');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'drop_keys' => array(
+				$this->table_prefix . 'log' => array('log_time'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'topics_track' => array(
+					'topic_id' => array('topic_id'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('feed_overall', 1)),
+			array('config.add', array('feed_http_auth', 0)),
+			array('config.add', array('feed_limit_post', $this->config['feed_limit'])),
+			array('config.add', array('feed_limit_topic', $this->config['feed_overall_topics_limit'])),
+			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
+			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
+			array('custom', array(array(&$this, 'delete_text_templates'))),
+		);
+	}
+
+	function delete_text_templates()
+	{
+		// Delete all text-templates from the template_data
+		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
+			WHERE template_filename ' . $this->db->sql_like_expression($this->db->any_char . '.txt');
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc2.php b/phpBB/includes/db/migration/data/3_0_7_rc2.php
new file mode 100644
index 0000000000..8a751328bf
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_7_rc2.php
@@ -0,0 +1,70 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_7_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_7_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_email_hash'))),
+		);
+	}
+
+	function update_email_hash($start = 0)
+	{
+		$limit = 1000;
+
+		$sql = 'SELECT user_id, user_email, user_email_hash
+			FROM ' . USERS_TABLE . '
+			WHERE user_type <> ' . USER_IGNORE . "
+				AND user_email <> ''";
+		$result = $this->db->sql_query_limit($sql, $limit, $start);
+
+		$i = 0;
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$i++;
+
+			// Snapshot of the phpbb_email_hash() function
+			// We cannot call it directly because the auto updater updates the DB first. :/
+			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
+
+			if ($user_email_hash != $row['user_email_hash'])
+			{
+				$sql_ary = array(
+					'user_email_hash'	=> $user_email_hash,
+				);
+
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE user_id = ' . (int) $row['user_id'];
+				$this->sql_query($sql);
+			}
+		}
+		$db->sql_freeresult($result);
+
+		if ($i < $limit)
+		{
+			// Completed
+			return false;
+		}
+
+		return $start + $limit;
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_8.php b/phpBB/includes/db/migration/data/3_0_8.php
new file mode 100644
index 0000000000..a714a3d2f6
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_8.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_8 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_8_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_8_rc1.php b/phpBB/includes/db/migration/data/3_0_8_rc1.php
new file mode 100644
index 0000000000..73838d9d29
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_8_rc1.php
@@ -0,0 +1,223 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_7_pl1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'update_module_auth'))),
+			array('custom', array(array(&$this, 'update_bots'))),
+			array('custom', array(array(&$this, 'delete_orphan_shadow_topics'))),
+			array('module.add', array(
+				'acp',
+				'ACP_MESSAGES',
+				array(
+					'module_basename'	=> 'board',
+					'modes'				=> array('post'),
+				),
+			)),
+			array('config.add', array('load_unreads_search', 1)),
+			array('config.update_if_equals', array(600, 'queue_interval', 60)),
+			array('config.update_if_equals', array(50, 'email_package_size', 20)),
+		);
+	}
+
+	function update_file_extension_group_names()
+	{
+		// Update file extension group names to use language strings.
+		$sql = 'SELECT lang_dir
+			FROM ' . LANG_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		$extension_groups_updated = array();
+		while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
+		{
+			$lang_dir = basename($lang_dir);
+
+			// The language strings we need are either in language/.../acp/attachments.php
+			// in the update package if we're updating to 3.0.8-RC1 or later,
+			// or they are in language/.../install.php when we're updating from 3.0.7-PL1 or earlier.
+			// On an already updated board, they can also already be in language/.../acp/attachments.php
+			// in the board root.
+			$lang_files = array(
+				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.$this->phpEx",
+				"{$this->phpbb_root_path}language/$lang_dir/install.$this->phpEx",
+				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.$this->phpEx",
+			);
+
+			foreach ($lang_files as $lang_file)
+			{
+				if (!file_exists($lang_file))
+				{
+					continue;
+				}
+
+				$lang = array();
+				include($lang_file);
+
+				foreach($lang as $lang_key => $lang_val)
+				{
+					if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
+					{
+						continue;
+					}
+
+					$sql_ary = array(
+						'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
+					);
+
+					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+						SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+						WHERE group_name = '" . $this->db->sql_escape($lang_val) . "'";
+					$this->sql_query($sql);
+
+					$extension_groups_updated[$lang_key] = true;
+				}
+			}
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	function update_module_auth()
+	{
+		$sql = 'UPDATE ' . MODULES_TABLE . '
+			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
+			WHERE module_class = \'ucp\'
+				AND module_basename = \'profile\'
+				AND module_mode = \'avatar\'';
+		$this->sql_query($sql);
+	}
+
+	function update_bots()
+	{
+		$bot_name = 'Bing [Bot]';
+		$bot_name_clean = utf8_clean_string($bot_name);
+
+		$sql = 'SELECT user_id
+			FROM ' . USERS_TABLE . "
+			WHERE username_clean = '" . $this->db->sql_escape($bot_name_clean) . "'";
+		$result = $this->db->sql_query($sql);
+		$bing_already_added = (bool) $this->db->sql_fetchfield('user_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$bing_already_added)
+		{
+			$bot_agent = 'bingbot/';
+			$bot_ip = '';
+			$sql = 'SELECT group_id, group_colour
+				FROM ' . GROUPS_TABLE . "
+				WHERE group_name = 'BOTS'";
+			$result = $this->db->sql_query($sql);
+			$group_row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$group_row)
+			{
+				// default fallback, should never get here
+				$group_row['group_id'] = 6;
+				$group_row['group_colour'] = '9E8DA7';
+			}
+
+			if (!function_exists('user_add'))
+			{
+				include($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
+			}
+
+			$user_row = array(
+				'user_type'				=> USER_IGNORE,
+				'group_id'				=> $group_row['group_id'],
+				'username'				=> $bot_name,
+				'user_regdate'			=> time(),
+				'user_password'			=> '',
+				'user_colour'			=> $group_row['group_colour'],
+				'user_email'			=> '',
+				'user_lang'				=> $this->config['default_lang'],
+				'user_style'			=> $this->config['default_style'],
+				'user_timezone'			=> 0,
+				'user_dateformat'		=> $this->config['default_dateformat'],
+				'user_allow_massemail'	=> 0,
+			);
+
+			$user_id = user_add($user_row);
+
+			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
+				'bot_active'	=> 1,
+				'bot_name'		=> (string) $bot_name,
+				'user_id'		=> (int) $user_id,
+				'bot_agent'		=> (string) $bot_agent,
+				'bot_ip'		=> (string) $bot_ip,
+			));
+
+			$this->sql_query($sql);
+		}
+	}
+
+	function delete_orphan_shadow_topics()
+	{
+		// Delete shadow topics pointing to not existing topics
+		$batch_size = 500;
+
+		// Set of affected forums we have to resync
+		$sync_forum_ids = array();
+
+		$sql_array = array(
+			'SELECT'	=> 't1.topic_id, t1.forum_id',
+			'FROM'		=> array(
+				TOPICS_TABLE	=> 't1',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(TOPICS_TABLE	=> 't2'),
+					'ON'	=> 't1.topic_moved_id = t2.topic_id',
+				),
+			),
+			'WHERE'		=> 't1.topic_moved_id <> 0
+						AND t2.topic_id IS NULL',
+		);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query_limit($sql, $batch_size);
+
+		$topic_ids = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$topic_ids[] = (int) $row['topic_id'];
+
+			$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($topic_ids))
+		{
+			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
+			$this->db->sql_query($sql);
+
+			// Sync the forums we have deleted shadow topics from.
+			sync('forum', 'forum_id', $sync_forum_ids, true, true);
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_9.php b/phpBB/includes/db/migration/data/3_0_9.php
new file mode 100644
index 0000000000..4b2c08a256
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_9.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_9 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_9_rc4');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc1.php b/phpBB/includes/db/migration/data/3_0_9_rc1.php
new file mode 100644
index 0000000000..98d3a26481
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_9_rc1.php
@@ -0,0 +1,108 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_8');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_tables' => array(
+				$this->table_prefix . 'login_attempts' => array(
+					'COLUMNS' => array(
+						// this column was removed from the database updater
+						// after 3.0.9-RC3 was released. It might still exist
+						// in 3.0.9-RCX installations and has to be dropped in
+						// 3.0.12 after the db_tools class is capable of properly
+						// removing a primary key.
+						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
+						'attempt_ip'			=> array('VCHAR:40', ''),
+						'attempt_browser'		=> array('VCHAR:150', ''),
+						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
+						'attempt_time'			=> array('TIMESTAMP', 0),
+						'user_id'				=> array('UINT', 0),
+						'username'				=> array('VCHAR_UNI:255', 0),
+						'username_clean'		=> array('VCHAR_CI', 0),
+					),
+					//'PRIMARY_KEY' => 'attempt_id',
+					'KEYS' => array(
+						'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
+						'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+						'att_time' => array('INDEX', array('attempt_time')),
+						'user_id' => array('INDEX', 'user_id'),
+					),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'bbcode' => array(
+					'bbcode_id' => array('USINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('ip_login_limit_max', 50)),
+			array('config.add', array('ip_login_limit_time', 21600)),
+			array('config.add', array('ip_login_limit_use_forwarded', 0)),
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
+		);
+	}
+
+	function update_file_extension_group_names()
+	{
+		// Update file extension group names to use language strings, again.
+		$sql = 'SELECT group_id, group_name
+			FROM ' . EXTENSION_GROUPS_TABLE . '
+			WHERE group_name ' . $this->db->sql_like_expression('EXT_GROUP_' . $this->db->any_char);
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
+			);
+
+			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+				WHERE group_id = ' . $row['group_id'];
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	function fix_firebird_qa_captcha()
+	{
+		// Recover from potentially broken Q&A CAPTCHA table on firebird
+		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
+		// without data loss
+		if ($this->db_tools->sql_layer == 'firebird')
+		{
+			$tables = array(
+				$this->table_prefix . 'captcha_questions',
+				$this->table_prefix . 'captcha_answers',
+				$this->table_prefix . 'qa_confirm',
+			);
+			foreach ($tables as $table)
+			{
+				if ($this->db_tools->sql_table_exists($table))
+				{
+					$this->db_tools->sql_table_drop($table);
+				}
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc2.php b/phpBB/includes/db/migration/data/3_0_9_rc2.php
new file mode 100644
index 0000000000..589047670a
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_9_rc2.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_9_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_9_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc3.php b/phpBB/includes/db/migration/data/3_0_9_rc3.php
new file mode 100644
index 0000000000..06061cbcb6
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_9_rc3.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_9_rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_9_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc4.php b/phpBB/includes/db/migration/data/3_0_9_rc4.php
new file mode 100644
index 0000000000..04b3ae4b39
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_9_rc4.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_9_rc4 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_9_rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+	}
+}
diff --git a/phpBB/includes/db/migration/tools/base.php b/phpBB/includes/db/migration/tools/base.php
new file mode 100644
index 0000000000..61116d8b55
--- /dev/null
+++ b/phpBB/includes/db/migration/tools/base.php
@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_tools_base
+{
+	/** @var phpbb_auth */
+	protected $auth = null;
+
+	/** @var phpbb_cache_service */
+	protected $cache = null;
+
+	/** @var phpbb_config */
+	protected $config = null;
+
+	/** @var dbal */
+	protected $db = null;
+
+	/** @var phpbb_template */
+	protected $template = null;
+
+	/** @var phpbb_user */
+	protected $user = null;
+
+	/** @var string */
+	protected $phpbb_root_path = null;
+
+	/** @var string */
+	protected $php_ext = null;
+
+	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	{
+		$this->db = $db;
+		$this->cache = $cache;
+		$this->template = $template;
+		$this->user = $user;
+		$this->auth = $auth;
+		$this->config = $config;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+	}
+}
\ No newline at end of file
diff --git a/phpBB/includes/db/migration/tools/config.php b/phpBB/includes/db/migration/tools/config.php
new file mode 100644
index 0000000000..965ba1d136
--- /dev/null
+++ b/phpBB/includes/db/migration/tools/config.php
@@ -0,0 +1,106 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_tools_config extends phpbb_db_migration_tools_base
+{
+	/**
+	* Config Exists
+	*
+	* This function is to check to see if a config variable exists or if it does not.
+	*
+	* @param string $config_name The name of the config setting you wish to check for.
+	*
+	* @return bool true/false if config exists
+	*/
+	public function exists($config_name)
+	{
+		return (bool) $this->config->offsetExists($config_name);
+	}
+
+	/**
+	* Config Add
+	*
+	* This function allows you to add a config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to add
+	* @param mixed $config_value The value of the config setting
+	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
+	*/
+	public function add($config_name, $config_value = '', $is_dynamic = false)
+	{
+		if ($this->config_exists($config_name))
+		{
+			throw new phpbb_db_migration_exception('CONFIG_ALREADY_EXISTS', $config_name);
+		}
+
+		$this->config->set($config_name, $config_value, $is_dynamic);
+
+		return false;
+	}
+
+	/**
+	* Config Update
+	*
+	* This function allows you to update an existing config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to update
+	* @param mixed $config_value The value of the config setting
+	*/
+	public function update($config_name, $config_value = '')
+	{
+		if (!$this->config_exists($config_name))
+		{
+			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		$this->config->set($config_name, $config_value);
+
+		return false;
+	}
+
+	/**
+	* Config Update If Equals
+	*
+	* This function allows you to update a config setting if the first argument equal to the current config value
+	*
+	* @param bool $compare If equal to the current config value, will be updated to the new config value, otherwise not
+	* @param string $config_name The name of the config setting you would like to update
+	* @param mixed $config_value The value of the config setting
+	*/
+	public function update_if_equals($compare, $config_name, $config_value = '')
+	{
+		if (!$this->config_exists($config_name))
+		{
+			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		$this->config->set_atomic($config_name, $compare, $config_value);
+
+		return false;
+	}
+
+	/**
+	* Config Remove
+	*
+	* This function allows you to remove an existing config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to remove
+	*/
+	public function remove($config_name)
+	{
+		if (!$this->config_exists($config_name))
+		{
+			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		$this->config->delete($config_name);
+
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/phpBB/includes/db/migration/tools/module.php b/phpBB/includes/db/migration/tools/module.php
new file mode 100644
index 0000000000..df1912a022
--- /dev/null
+++ b/phpBB/includes/db/migration/tools/module.php
@@ -0,0 +1,419 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_tools_module extends phpbb_db_migration_tools_base
+{
+	/**
+	* Module Exists
+	*
+	* Check if a module exists
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
+	* @param int|string $module The module_id|module_langname you would like to check for to see if it exists
+	*
+	* @return bool true/false if module exists
+	*/
+	public function exists($class, $parent, $module)
+	{
+		// the main root directory should return true
+		if (!$module)
+		{
+			return true;
+		}
+
+		$class = $this->db->sql_escape($class);
+		$module = $this->db->sql_escape($module);
+
+		$parent_sql = '';
+		if ($parent !== false)
+		{
+			// Allows '' to be sent as 0
+			$parent = (!$parent) ? 0 : $parent;
+
+			if (!is_numeric($parent))
+			{
+				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+					WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+						AND module_class = '$class'";
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				if (!$row)
+				{
+					return false;
+				}
+
+				$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
+			}
+			else
+			{
+				$parent_sql = 'AND parent_id = ' . (int) $parent;
+			}
+		}
+
+		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+			WHERE module_class = '$class'
+				$parent_sql
+				AND " . ((is_numeric($module)) ? 'module_id = ' . (int) $module : "module_langname = '$module'");
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Module Add
+	*
+	* Add a new module
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string $parent The parent module_id|module_langname (0 for no parent)
+	* @param array $data an array of the data on the new module.  This can be setup in two different ways.
+	*	1. The "manual" way.  For inserting a category or one at a time.  It will be merged with the base array shown a bit below,
+	*		but at the least requires 'module_langname' to be sent, and, if you want to create a module (instead of just a category) you must send module_basename and module_mode.
+	* array(
+	*		'module_enabled'	=> 1,
+	*		'module_display'	=> 1,
+	*		'module_basename'	=> '',
+	*		'module_class'		=> $class,
+	*		'parent_id'			=> (int) $parent,
+	*		'module_langname'	=> '',
+	*		'module_mode'		=> '',
+	*		'module_auth'		=> '',
+	*	)
+	*	2. The "automatic" way.  For inserting multiple at a time based on the specs in the info file for the module(s).  For this to work the modules must be correctly setup in the info file.
+	*		An example follows (this would insert the settings, log, and flag modes from the includes/acp/info/acp_asacp.php file):
+	* array(
+	* 		'module_basename'	=> 'asacp',
+	* 		'modes'				=> array('settings', 'log', 'flag'),
+	* )
+	* 		Optionally you may not send 'modes' and it will insert all of the modules in that info file.
+	*  @param string|bool $include_path If you would like to use a custom include path, specify that here
+	*/
+	public function add($class, $parent = 0, $data = array(), $include_path = false)
+	{
+        // Allows '' to be sent as 0
+		$parent = (!$parent) ? 0 : $parent;
+
+		// allow sending the name as a string in $data to create a category
+		if (!is_array($data))
+		{
+			$data = array('module_langname' => $data);
+		}
+
+		if (!isset($data['module_langname']))
+		{
+			// The "automatic" way
+			$basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
+			$basename = str_replace(array('/', '\\'), '', $basename);
+			$class = str_replace(array('/', '\\'), '', $class);
+			$info_file = "$class/info/{$class}_$basename.$this->phpEx";
+
+			// The manual and automatic ways both failed...
+			if (!file_exists((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file))
+			{
+				throw new phpbb_db_migration_exception('MODULE_ADD', $class, $info_file);
+			}
+
+			$classname = "{$class}_{$basename}_info";
+
+			if (!class_exists($classname))
+			{
+				include((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file);
+			}
+
+			$info = new $classname;
+			$module = $info->module();
+			unset($info);
+
+			$result = '';
+			foreach ($module['modes'] as $mode => $module_info)
+			{
+				if (!isset($data['modes']) || in_array($mode, $data['modes']))
+				{
+					$new_module = array(
+						'module_basename'	=> $basename,
+						'module_langname'	=> $module_info['title'],
+						'module_mode'		=> $mode,
+						'module_auth'		=> $module_info['auth'],
+						'module_display'	=> (isset($module_info['display'])) ? $module_info['display'] : true,
+						'before'			=> (isset($module_info['before'])) ? $module_info['before'] : false,
+						'after'				=> (isset($module_info['after'])) ? $module_info['after'] : false,
+					);
+
+					// Run the "manual" way with the data we've collected.
+					$result .= ((isset($data['spacer'])) ? $data['spacer'] : '<br />') . $this->add($class, $parent, $new_module);
+				}
+			}
+
+			return $result;
+		}
+
+		// The "manual" way
+		add_log('admin', 'LOG_MODULE_ADD', ((isset($this->user->lang[$data['module_langname']])) ? $this->user->lang[$data['module_langname']] : $data['module_langname']));
+
+		$class = $this->db->sql_escape($class);
+
+		if (!is_numeric($parent))
+		{
+			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+				WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+					AND module_class = '$class'";
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$row)
+			{
+				throw new phpbb_db_migration_exception('MODULE_PARENT_NOT_EXIST', $parent);
+			}
+
+			$parent = $data['parent_id'] = $row['module_id'];
+		}
+		else if (!$this->exists($class, false, $parent))
+		{
+			throw new phpbb_db_migration_exception('MODULE_PARENT_NOT_EXIST', $parent);
+		}
+
+		if ($this->exists($class, $parent, $data['module_langname']))
+		{
+			throw new phpbb_db_migration_exception('MODULE_ALREADY_EXIST', $data['module_langname']);
+		}
+
+		if (!class_exists('acp_modules'))
+		{
+			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->phpEx);
+			$this->user->add_lang('acp/modules');
+		}
+		$acp_modules = new acp_modules();
+
+		$module_data = array(
+			'module_enabled'	=> (isset($data['module_enabled'])) ? $data['module_enabled'] : 1,
+			'module_display'	=> (isset($data['module_display'])) ? $data['module_display'] : 1,
+			'module_basename'	=> (isset($data['module_basename'])) ? $data['module_basename'] : '',
+			'module_class'		=> $class,
+			'parent_id'			=> (int) $parent,
+			'module_langname'	=> (isset($data['module_langname'])) ? $data['module_langname'] : '',
+			'module_mode'		=> (isset($data['module_mode'])) ? $data['module_mode'] : '',
+			'module_auth'		=> (isset($data['module_auth'])) ? $data['module_auth'] : '',
+		);
+		$result = $acp_modules->update_module_data($module_data, true);
+
+		// update_module_data can either return a string or an empty array...
+		if (is_string($result))
+		{
+			// Error
+			throw new phpbb_db_migration_exception('MODULE_ERROR', $result);
+		}
+		else
+		{
+			// Success
+
+			// Move the module if requested above/below an existing one
+			if (isset($data['before']) && $data['before'])
+			{
+				$sql = 'SELECT left_id FROM ' . MODULES_TABLE . '
+					WHERE module_class = \'' . $class . '\'
+						AND parent_id = ' . (int) $parent . '
+						AND module_langname = \'' . $this->db->sql_escape($data['before']) . '\'';
+				$this->db->sql_query($sql);
+				$to_left = $this->db->sql_fetchfield('left_id');
+
+				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
+					WHERE module_class = '$class'
+						AND left_id >= $to_left
+						AND left_id < {$module_data['left_id']}";
+				$this->db->sql_query($sql);
+
+				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = $to_left, right_id = " . ($to_left + 1) . "
+					WHERE module_class = '$class'
+						AND module_id = {$module_data['module_id']}";
+				$this->db->sql_query($sql);
+			}
+			else if (isset($data['after']) && $data['after'])
+			{
+				$sql = 'SELECT right_id FROM ' . MODULES_TABLE . '
+					WHERE module_class = \'' . $class . '\'
+						AND parent_id = ' . (int) $parent . '
+						AND module_langname = \'' . $this->db->sql_escape($data['after']) . '\'';
+				$this->db->sql_query($sql);
+				$to_right = $this->db->sql_fetchfield('right_id');
+
+				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
+					WHERE module_class = '$class'
+						AND left_id >= $to_right
+						AND left_id < {$module_data['left_id']}";
+				$this->db->sql_query($sql);
+
+				$sql = 'UPDATE ' . MODULES_TABLE . ' SET left_id = ' . ($to_right + 1) . ', right_id = ' . ($to_right + 2) . "
+					WHERE module_class = '$class'
+						AND module_id = {$module_data['module_id']}";
+				$this->db->sql_query($sql);
+			}
+		}
+
+		// Clear the Modules Cache
+		$this->cache->destroy("_modules_$class");
+
+		return false;
+	}
+
+	/**
+	* Module Remove
+	*
+	* Remove a module
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
+	* @param int|string $module The module id|module_langname
+	* @param string|bool $include_path If you would like to use a custom include path, specify that here
+	*/
+	public function remove($class, $parent = 0, $module = '', $include_path = false)
+	{
+		// Imitation of module_add's "automatic" and "manual" method so the uninstaller works from the same set of instructions for umil_auto
+		if (is_array($module))
+		{
+			if (isset($module['module_langname']))
+			{
+				// Manual Method
+				return $this->remove($class, $parent, $module['module_langname'], $include_path);
+			}
+
+			// Failed.
+			if (!isset($module['module_basename']))
+			{
+				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST');
+			}
+
+			// Automatic method
+			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
+			$class = str_replace(array('/', '\\'), '', $class);
+			$info_file = "$class/info/{$class}_$basename.$this->phpEx";
+
+			if (!file_exists((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file))
+			{
+				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $info_file);
+			}
+
+			$classname = "{$class}_{$basename}_info";
+
+			if (!class_exists($classname))
+			{
+				include((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file);
+			}
+
+			$info = new $classname;
+			$module_info = $info->module();
+			unset($info);
+
+			foreach ($module_info['modes'] as $mode => $info)
+			{
+				if (!isset($module['modes']) || in_array($mode, $module['modes']))
+				{
+					$this->remove($class, $parent, $info['title']) . '<br />';
+				}
+			}
+			return false;
+		}
+		else
+		{
+			$class = $this->db->sql_escape($class);
+
+			if (!$this->exists($class, $parent, $module))
+			{
+				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', ((isset($this->user->lang[$module])) ? $this->user->lang[$module] : $module));
+			}
+
+			$parent_sql = '';
+			if ($parent !== false)
+			{
+				// Allows '' to be sent as 0
+				$parent = (!$parent) ? 0 : $parent;
+
+				if (!is_numeric($parent))
+				{
+					$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+						WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+							AND module_class = '$class'";
+					$result = $this->db->sql_query($sql);
+					$row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					// we know it exists from the module_exists check
+					$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
+				}
+				else
+				{
+					$parent_sql = 'AND parent_id = ' . (int) $parent;
+				}
+			}
+
+			$module_ids = array();
+			if (!is_numeric($module))
+			{
+				$module = $this->db->sql_escape($module);
+				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+					WHERE module_langname = '$module'
+						AND module_class = '$class'
+					$parent_sql";
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$module_ids[] = (int) $row['module_id'];
+				}
+				$this->db->sql_freeresult($result);
+
+				$module_name = $module;
+			}
+			else
+			{
+				$module = (int) $module;
+				$sql = 'SELECT module_langname FROM ' . MODULES_TABLE . "
+					WHERE module_id = $module
+						AND module_class = '$class'
+					$parent_sql";
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				$module_name = $row['module_langname'];
+				$module_ids[] = $module;
+			}
+
+			if (!class_exists('acp_modules'))
+			{
+				include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->phpEx);
+				$this->user->add_lang('acp/modules');
+			}
+			$acp_modules = new acp_modules();
+			$acp_modules->module_class = $class;
+
+			foreach ($module_ids as $module_id)
+			{
+				$result = $acp_modules->delete_module($module_id);
+				if (!empty($result))
+				{
+					throw new phpbb_db_migration_exception('CANNOT_REMOVE_MODULE', $module_id);
+				}
+			}
+
+			$cache->destroy("_modules_$class");
+
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/phpBB/includes/db/migration/tools/permission.php b/phpBB/includes/db/migration/tools/permission.php
new file mode 100644
index 0000000000..3fbe7c649c
--- /dev/null
+++ b/phpBB/includes/db/migration/tools/permission.php
@@ -0,0 +1,480 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_tools_permission extends phpbb_db_migration_tools_base
+{
+	/**
+	* Permission Exists
+	*
+	* Check if a permission (auth) setting exists
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return bool true if it exists, false if not
+	*/
+	public function exists($auth_option, $global = true)
+	{
+		if ($global)
+		{
+			$type_sql = ' AND is_global = 1';
+		}
+		else
+		{
+			$type_sql = ' AND is_local = 1';
+		}
+
+		$sql = 'SELECT auth_option_id
+			FROM ' . ACL_OPTIONS_TABLE . "
+			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'"
+				. $type_sql;
+		$result = $this->db->sql_query($sql);
+
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Permission Add
+	*
+	* Add a permission (auth) option
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return result
+	*/
+	public function add($auth_option, $global = true)
+	{
+		if ($this->exists($auth_option, $global))
+		{
+			throw new phpbb_db_migration_exception('PERMISSION_ALREADY_EXISTS', $auth_option);
+		}
+
+		// We've added permissions, so set to true to notify the user.
+		$this->permissions_added = true;
+
+		if (!class_exists('auth_admin'))
+		{
+			include($this->phpbb_root_path . 'includes/acp/auth.' . $this->phpEx);
+		}
+		$auth_admin = new auth_admin();
+
+		// We have to add a check to see if the !$global (if global, local, and if local, global) permission already exists.  If it does, acl_add_option currently has a bug which would break the ACL system, so we are having a work-around here.
+		if ($this->exists($auth_option, !$global))
+		{
+			$sql_ary = array(
+				'is_global'	=> 1,
+				'is_local'	=> 1,
+			);
+			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+				WHERE auth_option = \'' . $this->db->sql_escape($auth_option) . "'";
+			$this->db->sql_query($sql);
+		}
+		else
+		{
+			if ($global)
+			{
+				$auth_admin->acl_add_option(array('global' => array($auth_option)));
+			}
+			else
+			{
+				$auth_admin->acl_add_option(array('local' => array($auth_option)));
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	* Permission Remove
+	*
+	* Remove a permission (auth) option
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return result
+	*/
+	public function remove($auth_option, $global = true)
+	{
+		if (!$this->exists($auth_option, $global))
+		{
+			throw new phpbb_db_migration_exception('PERMISSION_NOT_EXIST', $auth_option);
+		}
+
+		if ($global)
+		{
+			$type_sql = ' AND is_global = 1';
+		}
+		else
+		{
+			$type_sql = ' AND is_local = 1';
+		}
+		$sql = 'SELECT auth_option_id, is_global, is_local FROM ' . ACL_OPTIONS_TABLE . "
+			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'" .
+				$type_sql;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$id = $row['auth_option_id'];
+
+		// If it is a local and global permission, do not remove the row! :P
+		if ($row['is_global'] && $row['is_local'])
+		{
+			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
+				SET ' . (($global) ? 'is_global = 0' : 'is_local = 0') . '
+				WHERE auth_option_id = ' . $id;
+			$this->db->sql_query($sql);
+		}
+		else
+		{
+			// Delete time
+			$this->db->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $id);
+		}
+
+		// Purge the auth cache
+		$this->cache->destroy('_acl_options');
+		$this->auth->acl_clear_prefetch();
+
+		return false;
+	}
+
+	/**
+	* Add a new permission role
+	*
+	* @param string $role_name The new role name
+	* @param sting $role_type The type (u_, m_, a_)
+	*/
+	public function role_add($role_name, $role_type = '', $role_description = '')
+	{
+		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if ($role_id)
+		{
+			throw new phpbb_db_migration_exception('ROLE_ALREADY_EXISTS', $old_role_name);
+		}
+
+		$sql = 'SELECT MAX(role_order) AS max FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_type = \'' . $this->db->sql_escape($role_type) . '\'';
+		$this->db->sql_query($sql);
+		$role_order = $this->db->sql_fetchfield('max');
+		$role_order = (!$role_order) ? 1 : $role_order + 1;
+
+		$sql_ary = array(
+			'role_name'			=> $role_name,
+			'role_description'	=> $role_description,
+			'role_type'			=> $role_type,
+			'role_order'		=> $role_order,
+		);
+
+		$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+		$this->db->sql_query($sql);
+
+		return false;
+	}
+
+	/**
+	* Update the name on a permission role
+	*
+	* @param string $old_role_name The old role name
+	* @param string $new_role_name The new role name
+	*/
+	public function role_update($old_role_name, $new_role_name = '')
+	{
+		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if (!$role_id)
+		{
+			throw new phpbb_db_migration_exception('ROLE_NOT_EXISTS', $old_role_name);
+		}
+
+		$sql = 'UPDATE ' . ACL_ROLES_TABLE . '
+			SET role_name = \'' . $this->db->sql_escape($new_role_name) . '\'
+			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
+		$this->db->sql_query($sql);
+
+		return false;
+	}
+
+	/**
+	* Remove a permission role
+	*
+	* @param string $role_name The role name to remove
+	*/
+	public function role_remove($role_name)
+	{
+		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if (!$role_id)
+		{
+			throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $role_name);
+		}
+
+		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
+			WHERE role_id = ' . $role_id;
+		$this->db->sql_query($sql);
+
+		$sql = 'DELETE FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_id = ' . $role_id;
+		$this->db->sql_query($sql);
+
+		$this->auth->acl_clear_prefetch();
+
+		return false;
+	}
+
+	/**
+	* Permission Set
+	*
+	* Allows you to set permissions for a certain group/role
+	*
+	* @param string $name The name of the role/group
+	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
+	* @param string $type The type (role|group)
+	* @param bool $has_permission True if you want to give them permission, false if you want to deny them permission
+	*/
+	public function permission_set($name, $auth_option = array(), $type = 'role', $has_permission = true)
+	{
+		if (!is_array($auth_option))
+		{
+			$auth_option = array($auth_option);
+		}
+
+		$new_auth = array();
+		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
+			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$new_auth[] = $row['auth_option_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!sizeof($new_auth))
+		{
+			return false;
+		}
+
+		$current_auth = array();
+
+		$type = (string) $type; // Prevent PHP bug.
+
+		switch ($type)
+		{
+			case 'role' :
+				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('role_id');
+
+				if (!$role_id)
+				{
+					throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name);
+				}
+
+				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_ROLES_DATA_TABLE . '
+					WHERE role_id = ' . $role_id;
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
+				}
+				$this->db->sql_freeresult($result);
+			break;
+
+			case 'group' :
+				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . ' WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$group_id = $this->db->sql_fetchfield('group_id');
+
+				if (!$group_id)
+				{
+					throw new phpbb_db_migration_exception('GROUP_NOT_EXIST', $name);
+				}
+
+				// If the group has a role set for them we will add the requested permissions to that role.
+				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id . '
+						AND auth_role_id <> 0
+						AND forum_id = 0';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('auth_role_id');
+				if ($role_id)
+				{
+					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
+						WHERE role_id = ' . $role_id;
+					$this->db->sql_query($sql);
+					$role_name = $this->db->sql_fetchfield('role_name');
+
+					return $this->set($role_name, $auth_option, 'role', $has_permission);
+				}
+
+				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id;
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
+				}
+				$this->db->sql_freeresult($result);
+			break;
+		}
+
+		$sql_ary = array();
+		switch ($type)
+		{
+			case 'role' :
+				foreach ($new_auth as $auth_option_id)
+				{
+					if (!isset($current_auth[$auth_option_id]))
+					{
+						$sql_ary[] = array(
+							'role_id'			=> $role_id,
+							'auth_option_id'	=> $auth_option_id,
+							'auth_setting'		=> $has_permission,
+				        );
+					}
+				}
+
+				$this->db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary);
+			break;
+
+			case 'group' :
+				foreach ($new_auth as $auth_option_id)
+				{
+					if (!isset($current_auth[$auth_option_id]))
+					{
+						$sql_ary[] = array(
+							'group_id'			=> $group_id,
+							'auth_option_id'	=> $auth_option_id,
+							'auth_setting'		=> $has_permission,
+				        );
+					}
+				}
+
+				$this->db->sql_multi_insert(ACL_GROUPS_TABLE, $sql_ary);
+			break;
+		}
+
+		$this->auth->acl_clear_prefetch();
+
+		return false;
+	}
+
+	/**
+	* Permission Unset
+	*
+	* Allows you to unset (remove) permissions for a certain group/role
+	*
+	* @param string $name The name of the role/group
+	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
+	* @param string $type The type (role|group)
+	*/
+	public function permission_unset($name, $auth_option = array(), $type = 'role')
+	{
+		if (!is_array($auth_option))
+		{
+			$auth_option = array($auth_option);
+		}
+
+		$to_remove = array();
+		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
+			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$to_remove[] = $row['auth_option_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!sizeof($to_remove))
+		{
+			return false;
+		}
+
+		$type = (string) $type; // Prevent PHP bug.
+
+		switch ($type)
+		{
+			case 'role' :
+				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('role_id');
+
+				if (!$role_id)
+				{
+				throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name);
+				}
+
+				$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
+					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
+				$this->db->sql_query($sql);
+			break;
+
+			case 'group' :
+				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . '
+					WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$group_id = $this->db->sql_fetchfield('group_id');
+
+				if (!$group_id)
+				{
+					throw new phpbb_db_migration_exception('GROUP_NOT_EXIST', $name);
+				}
+
+				// If the group has a role set for them we will remove the requested permissions from that role.
+				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id . '
+						AND auth_role_id <> 0';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('auth_role_id');
+				if ($role_id)
+				{
+					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
+						WHERE role_id = ' . $role_id;
+					$this->db->sql_query($sql);
+					$role_name = $this->db->sql_fetchfield('role_name');
+
+					return $this->permission_unset($role_name, $auth_option, 'role');
+				}
+
+				$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
+					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
+				$this->db->sql_query($sql);
+			break;
+		}
+
+		$this->auth->acl_clear_prefetch();
+
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/phpBB/includes/db/migration/tools/umil.php b/phpBB/includes/db/migration/tools/umil.php
new file mode 100644
index 0000000000..ce7b8ff3be
--- /dev/null
+++ b/phpBB/includes/db/migration/tools/umil.php
@@ -0,0 +1,3037 @@
+<?php
+/**
+ *
+ * @author Nathan Guse (EXreaction) http://lithiumstudios.org
+ * @author David Lewis (Highway of Life) highwayoflife@gmail.com
+ * @package umil
+ * @version $Id$
+ * @copyright (c) 2008 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ *
+ */
+
+/**
+ * @ignore
+ */
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+define('UMIL_VERSION', '1.0.4');
+
+/**
+* Multicall instructions
+*
+* With the "multicall" (as I am calling it) you can make a single function call and have it repeat the actions multiple times on information sent from an array.
+*
+* To do this (it does not work on the _exists functions), all you must do is send the first variable in the function call as an array and for each item, send an array for each of the variables in order.
+*
+* Example:
+* $umil->config_add(array(
+*	array('config_name', 'config_value'),
+*	array('config_name1', 'config_value1'),
+*	array('config_name2', 'config_value2', true),
+*	array('config_name3', 'config_value3', true),
+* );
+*/
+
+/**
+* UMIL - Unified MOD Installation Library class
+*
+* Cache Functions
+*	cache_purge($type = '', $style_id = 0)
+*
+* Config Functions:
+*	config_exists($config_name, $return_result = false)
+*	config_add($config_name, $config_value = '', $is_dynamic = false)
+*	config_update($config_name, $config_value, $is_dynamic = false)
+*	config_remove($config_name)
+*
+* Module Functions
+*	module_exists($class, $parent, $module)
+*	module_add($class, $parent = 0, $data = array())
+*	module_remove($class, $parent = 0, $module = '')
+*
+* Permissions/Auth Functions
+*	permission_exists($auth_option, $global = true)
+*	permission_add($auth_option, $global = true)
+*	permission_remove($auth_option, $global = true)
+*	permission_set($name, $auth_option = array(), $type = 'role', $global = true, $has_permission = true)
+*	permission_unset($name, $auth_option = array(), $type = 'role', $global = true)
+*
+* Table Functions
+*	table_exists($table_name)
+*	table_add($table_name, $table_data = array())
+*	table_remove($table_name)
+*
+* Table Column Functions
+*	table_column_exists($table_name, $column_name)
+*	table_column_add($table_name, $column_name = '', $column_data = array())
+*	table_column_update($table_name, $column_name = '', $column_data = array())
+*	table_column_remove($table_name, $column_name = '')
+*
+* Table Key/Index Functions
+*	table_index_exists($table_name, $index_name)
+*	table_index_add($table_name, $index_name = '', $column = array())
+*	table_index_remove($table_name, $index_name = '')
+*
+* Table Row Functions (note that these actions are not reversed automatically during uninstallation)
+*	table_row_insert($table_name, $data = array())
+*	table_row_remove($table_name, $data = array())
+*	table_row_update($table_name, $data = array(), $new_data = array())
+*
+* Version Check Function
+* 	version_check($url, $path, $file)
+*/
+class umil
+{
+	/**
+	* This will hold the text output for the inputted command (if the mod author would like to display the command that was ran)
+	*
+	* @var string
+	*/
+	var $command = '';
+
+	/**
+	* This will hold the text output for the result of the command.  $user->lang['SUCCESS'] if everything worked.
+	*
+	* @var string
+	*/
+	var $result = '';
+
+	/**
+	* Auto run $this->display_results after running a command
+	*/
+	var $auto_display_results = false;
+
+	/**
+	* Stand Alone option (this makes it possible to just use the single umil file and not worry about any language stuff
+	*/
+	var $stand_alone = false;
+
+	/**
+	* Were any new permissions added (used in umil_frontend)?
+	*/
+	var $permissions_added = false;
+
+	/**
+	* Database Object
+	*/
+	var $db = false;
+
+	/**
+	* Database Tools Object
+	*/
+	var $db_tools = false;
+
+	/**
+	* Do we want a custom prefix besides the phpBB table prefix?  You *probably* should not change this...
+	*/
+	var $table_prefix = false;
+
+	/**
+	* Constructor
+	*/
+	function umil($stand_alone = false, $db = false)
+	{
+		// Setup $this->db
+		if ($db !== false)
+		{
+			if (!is_object($db) || !method_exists($db, 'sql_query'))
+			{
+				trigger_error('Invalid $db Object');
+			}
+
+			$this->db = $db;
+		}
+		else
+		{
+			global $db;
+			$this->db = $db;
+		}
+
+		// Setup $this->db_tools
+		if (!class_exists('phpbb_db_tools'))
+		{
+			global $phpbb_root_path, $phpEx;
+			include($phpbb_root_path . 'includes/db/db_tools.' . $phpEx);
+		}
+		$this->db_tools = new phpbb_db_tools($this->db);
+
+		$this->stand_alone = $stand_alone;
+
+		if (!$stand_alone)
+		{
+			global $config, $user, $phpbb_root_path, $phpEx;
+
+			/* Does not have the fall back option to use en/ if the user's language file does not exist, so we will not use it...unless that is changed.
+			if (method_exists('user', 'set_custom_lang_path'))
+			{
+				$user->set_custom_lang_path($phpbb_root_path . 'umil/language/');
+				$user->add_lang('umil');
+				$user->set_custom_lang_path($phpbb_root_path . 'language/');
+			}
+			else
+			{*/
+				// Include the umil language file.  First we check if the language file for the user's language is available, if not we check if the board's default language is available, if not we use the english file.
+				if (isset($user->data['user_lang']) && file_exists("{$phpbb_root_path}umil/language/{$user->data['user_lang']}/umil.$phpEx"))
+				{
+					$path = $user->data['user_lang'];
+				}
+				else if (file_exists("{$phpbb_root_path}umil/language/" . basename($config['default_lang']) . "/umil.$phpEx"))
+				{
+					$path = basename($config['default_lang']);
+				}
+				else if (file_exists("{$phpbb_root_path}umil/language/en/umil.$phpEx"))
+				{
+					$path = 'en';
+				}
+				else
+				{
+					trigger_error('Language Files Missing.<br /><br />Please download the latest UMIL (Unified MOD Install Library) from: <a href="http://www.phpbb.com/mods/umil/">phpBB.com/mods/umil</a>', E_USER_ERROR);
+				}
+
+				$user->add_lang('./../../umil/language/' . $path . '/umil');
+			//}
+
+			$user->add_lang(array('acp/common', 'acp/permissions'));
+
+			// Check to see if a newer version is available.
+			$info = $this->version_check('version.phpbb.com', '/umil', ((defined('PHPBB_QA')) ? 'umil_qa.txt' : 'umil.txt'));
+			if (is_array($info) && isset($info[0]) && isset($info[1]))
+			{
+				if (version_compare(UMIL_VERSION, $info[0], '<'))
+				{
+					global $template;
+
+					// Make sure user->setup() has been called
+					if (empty($user->lang))
+					{
+						$user->setup();
+					}
+
+					page_header('', false);
+
+					$user->lang['UPDATE_UMIL'] = (isset($user->lang['UPDATE_UMIL'])) ? $user->lang['UPDATE_UMIL'] : 'This version of UMIL is outdated.<br /><br />Please download the latest UMIL (Unified MOD Install Library) from: <a href="%1$s">%1$s</a>';
+					$template->assign_vars(array(
+						'S_BOARD_DISABLED'		=> true,
+						'L_BOARD_DISABLED'		=> sprintf($user->lang['UPDATE_UMIL'], $info[1]),
+					));
+				}
+			}
+		}
+	}
+
+	/**
+	* umil_start
+	*
+	* A function which runs (almost) every time a function here is ran
+	*/
+	function umil_start()
+	{
+		global $user;
+
+		// Set up the command.  This will get the arguments sent to the function.
+		$args = func_get_args();
+		$this->command = call_user_func_array(array($this, 'get_output_text'), $args);
+
+		$this->result = (isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS';
+		$this->db->sql_return_on_error(true);
+
+		//$this->db->sql_transaction('begin');
+	}
+
+	/**
+	* umil_end
+	*
+	* A function which runs (almost) every time a function here is ran
+	*/
+	function umil_end()
+	{
+		global $user;
+
+		// Set up the result.  This will get the arguments sent to the function.
+		$args = func_get_args();
+		$result = call_user_func_array(array($this, 'get_output_text'), $args);
+		$this->result = ($result) ? $result : $this->result;
+
+		if ($this->db->sql_error_triggered)
+		{
+			if ($this->result == ((isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS'))
+			{
+				$this->result = 'SQL ERROR ' . $this->db->sql_error_returned['message'];
+			}
+			else
+			{
+				$this->result .= '<br /><br />SQL ERROR ' . $this->db->sql_error_returned['message'];
+			}
+
+			//$this->db->sql_transaction('rollback');
+		}
+		else
+		{
+			//$this->db->sql_transaction('commit');
+		}
+
+		$this->db->sql_return_on_error(false);
+
+		// Auto output if requested.
+		if ($this->auto_display_results && method_exists($this, 'display_results'))
+		{
+			$this->display_results();
+		}
+
+		return '<strong>' . $this->command . '</strong><br />' . $this->result;
+	}
+
+	/**
+	* Get text for output
+	*
+	* Takes the given arguments and prepares them for the UI
+	*
+	* First argument sent is used as the language key
+	* Further arguments (if send) are used on the language key through vsprintf()
+	*
+	* @return string Returns the prepared string for output
+	*/
+	function get_output_text()
+	{
+		global $user;
+
+		// Set up the command.  This will get the arguments sent to the function.
+		$args = func_get_args();
+		if (sizeof($args))
+		{
+			$lang_key = array_shift($args);
+
+			if (sizeof($args))
+			{
+				$lang_args = array();
+				foreach ($args as $arg)
+				{
+					$lang_args[] = (isset($user->lang[$arg])) ? $user->lang[$arg] : $arg;
+				}
+
+				return @vsprintf(((isset($user->lang[$lang_key])) ? $user->lang[$lang_key] : $lang_key), $lang_args);
+			}
+			else
+			{
+				return ((isset($user->lang[$lang_key])) ? $user->lang[$lang_key] : $lang_key);
+			}
+		}
+
+		return '';
+	}
+
+	/**
+	* Run Actions
+	*
+	* Do-It-All function that can do everything required for installing/updating/uninstalling a mod based on an array of actions and the versions.
+	*
+	* @param string $action The action. install|update|uninstall
+	* @param array $versions The array of versions and the actions for each
+	* @param string $version_config_name The name of the config setting which holds/will hold the currently installed version
+	* @param string $version_select Added for the UMIL Auto system to allow you to select the version you want to install/update/uninstall to.
+	*/
+	function run_actions($action, $versions, $version_config_name, $version_select = '')
+	{
+		// We will sort the actions to prevent issues from mod authors incorrectly listing the version numbers
+		uksort($versions, 'version_compare');
+
+		// Find the current version to install
+		$current_version = '0.0.0';
+		foreach ($versions as $version => $actions)
+		{
+			$current_version = $version;
+		}
+
+		$db_version = '';
+		if ($this->config_exists($version_config_name))
+		{
+			global $config;
+			$db_version = $config[$version_config_name];
+		}
+
+		// Set the action to install from update if nothing is currently installed
+		if ($action == 'update' && !$db_version)
+		{
+			$action = 'install';
+		}
+
+		if ($action == 'install' || $action == 'update')
+		{
+			$version_installed = $db_version;
+			foreach ($versions as $version => $version_actions)
+			{
+				// If we are updating
+				if ($db_version && version_compare($version, $db_version, '<='))
+				{
+					continue;
+				}
+
+				if ($version_select && version_compare($version, $version_select, '>'))
+				{
+					break;
+				}
+
+				foreach ($version_actions as $method => $params)
+				{
+					if ($method == 'custom')
+					{
+						$this->_call_custom_function($params, $action, $version);
+					}
+					else
+					{
+						if (method_exists($this, $method))
+						{
+							call_user_func(array($this, $method), $params);
+						}
+					}
+				}
+
+				$version_installed = $version;
+			}
+
+			// update the version number or add it
+			if ($this->config_exists($version_config_name))
+			{
+				$this->config_update($version_config_name, $version_installed);
+			}
+			else
+			{
+				$this->config_add($version_config_name, $version_installed);
+			}
+		}
+		else if ($action == 'uninstall' && $db_version)
+		{
+			// reverse version list
+			$versions = array_reverse($versions);
+
+			foreach ($versions as $version => $version_actions)
+			{
+				// Uninstalling and this listed version is newer than installed
+				if (version_compare($version, $db_version, '>'))
+				{
+					continue;
+				}
+
+				// Version selection stuff
+				if ($version_select && version_compare($version, $version_select, '<='))
+				{
+					// update the version number
+					$this->config_update($version_config_name, $version);
+					break;
+				}
+
+				$cache_purge = false;
+				$version_actions = array_reverse($version_actions);
+				foreach ($version_actions as $method => $params)
+				{
+					if ($method == 'custom')
+					{
+						$this->_call_custom_function($params, $action, $version);
+					}
+					else
+					{
+						// This way we always run the cache purge at the end of the version (done for the uninstall because the instructions are reversed, which would cause the cache purge to be run at the beginning if it was meant to run at the end).
+						if ($method == 'cache_purge')
+						{
+							$cache_purge = $params;
+							continue;
+						}
+
+						// A few things are not possible for uninstallations update actions and table_row actions
+						if (strpos($method, 'update') !== false || strpos($method, 'table_insert') !== false || strpos($method, 'table_row_') !== false)
+						{
+							continue;
+						}
+
+						// reverse function call
+						$method = str_replace(array('add', 'remove', 'temp'), array('temp', 'add', 'remove'), $method);
+						$method = str_replace(array('set', 'unset', 'temp'), array('temp', 'set', 'unset'), $method);
+
+						if (method_exists($this, $method))
+						{
+							call_user_func(array($this, $method), ((is_array($params) ? array_reverse($params) : $params)));
+						}
+					}
+				}
+
+				if ($cache_purge !== false)
+				{
+					$this->cache_purge($cache_purge);
+				}
+			}
+
+			if (!$version_select)
+			{
+				// Unset the version number
+				$this->config_remove($version_config_name);
+			}
+		}
+	}
+
+	/**
+	* Call custom function helper
+	*/
+	function _call_custom_function($functions, $action, $version)
+	{
+		if (!is_array($functions))
+		{
+			$functions = array($functions);
+		}
+
+		$return = '';
+
+		foreach ($functions as $function)
+		{
+			if (function_exists($function))
+			{
+				// Must reset before calling the function
+				$this->umil_start();
+
+				$returned = call_user_func($function, $action, $version);
+				if (is_string($returned))
+				{
+					$this->command = $this->get_output_text($returned);
+				}
+				else if (is_array($returned) && isset($returned['command']))
+				{
+					if (is_array($returned['command']))
+					{
+						$this->command = call_user_func_array(array($this, 'get_output_text'), $returned['command']);
+					}
+					else
+					{
+						$this->command = $this->get_output_text($returned['command']);
+					}
+
+					if (isset($returned['result']))
+					{
+						$this->result = $this->get_output_text($returned['result']);
+					}
+				}
+				else
+				{
+					$this->command = $this->get_output_text('UNKNOWN');
+				}
+
+				$return .= $this->umil_end() . '<br />';
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	* Multicall Helper
+	*
+	* @param mixed $function Function name to call
+	* @param mixed $params The parameters array
+	*
+	* @return bool True if we have done a multicall ($params is an array), false if not ($params is not an array)
+	*/
+	function multicall($function, $params)
+	{
+		if (is_array($params) && !empty($params))
+		{
+			foreach ($params as $param)
+			{
+				if (!is_array($param))
+				{
+					call_user_func(array($this, $function), $param);
+				}
+				else
+				{
+					call_user_func_array(array($this, $function), $param);
+				}
+			}
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Cache Purge
+	*
+	* This function is for purging either phpBB3’s data cache, authorization cache, or the styles cache.
+	*
+	* @param string $type The type of cache you want purged.  Available types: auth, imageset, template, theme.  Anything else sent will purge the forum's cache.
+	* @param int $style_id The id of the item you want purged (if the type selected is imageset/template/theme, 0 for all items in that section)
+	*/
+	function cache_purge($type = '', $style_id = 0)
+	{
+		global $auth, $cache, $user, $phpbb_root_path, $phpEx;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $type))
+		{
+			return;
+		}
+
+		$style_id = (int) $style_id;
+		$type = (string) $type; // Prevent PHP bug.
+
+		switch ($type)
+		{
+			case 'auth' :
+				$this->umil_start('AUTH_CACHE_PURGE');
+				$cache->destroy('_acl_options');
+				$auth->acl_clear_prefetch();
+
+				return $this->umil_end();
+			break;
+
+			case 'imageset' :
+				if ($style_id == 0)
+				{
+					$return = array();
+					$sql = 'SELECT imageset_id
+						FROM ' . STYLES_IMAGESET_TABLE;
+					$result = $this->db->sql_query($sql);
+					while ($row = $this->db->sql_fetchrow($result))
+					{
+						$return[] = $this->cache_purge('imageset', $row['imageset_id']);
+					}
+					$this->db->sql_freeresult($result);
+
+					return implode('<br /><br />', $return);
+				}
+				else
+				{
+					$sql = 'SELECT *
+						FROM ' . STYLES_IMAGESET_TABLE . "
+						WHERE imageset_id = $style_id";
+					$result = $this->db->sql_query($sql);
+					$imageset_row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					if (!$imageset_row)
+					{
+						$this->umil_start('IMAGESET_CACHE_PURGE', 'UNKNOWN');
+						return $this->umil_end('FAIL');
+					}
+
+					$this->umil_start('IMAGESET_CACHE_PURGE', $imageset_row['imageset_name']);
+
+					// The following is from includes/acp/acp_styles.php (edited)
+					$sql_ary = array();
+
+					$cfg_data_imageset = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/imageset.cfg");
+
+					$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . '
+						WHERE imageset_id = ' . $style_id;
+					$result = $this->db->sql_query($sql);
+
+					foreach ($cfg_data_imageset as $image_name => $value)
+					{
+						if (strpos($value, '*') !== false)
+						{
+							if (substr($value, -1, 1) === '*')
+							{
+								list($image_filename, $image_height) = explode('*', $value);
+								$image_width = 0;
+							}
+							else
+							{
+								list($image_filename, $image_height, $image_width) = explode('*', $value);
+							}
+						}
+						else
+						{
+							$image_filename = $value;
+							$image_height = $image_width = 0;
+						}
+
+						if (strpos($image_name, 'img_') === 0 && $image_filename)
+						{
+							$image_name = substr($image_name, 4);
+
+							$sql_ary[] = array(
+								'image_name'		=> (string) $image_name,
+								'image_filename'	=> (string) $image_filename,
+								'image_height'		=> (int) $image_height,
+								'image_width'		=> (int) $image_width,
+								'imageset_id'		=> (int) $style_id,
+								'image_lang'		=> '',
+							);
+						}
+					}
+
+					$sql = 'SELECT lang_dir
+						FROM ' . LANG_TABLE;
+					$result = $this->db->sql_query($sql);
+
+					while ($row = $this->db->sql_fetchrow($result))
+					{
+						if (@file_exists("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg"))
+						{
+							$cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg");
+							foreach ($cfg_data_imageset_data as $image_name => $value)
+							{
+								if (strpos($value, '*') !== false)
+								{
+									if (substr($value, -1, 1) === '*')
+									{
+										list($image_filename, $image_height) = explode('*', $value);
+										$image_width = 0;
+									}
+									else
+									{
+										list($image_filename, $image_height, $image_width) = explode('*', $value);
+									}
+								}
+								else
+								{
+									$image_filename = $value;
+									$image_height = $image_width = 0;
+								}
+
+								if (strpos($image_name, 'img_') === 0 && $image_filename)
+								{
+									$image_name = substr($image_name, 4);
+									$sql_ary[] = array(
+										'image_name'		=> (string) $image_name,
+										'image_filename'	=> (string) $image_filename,
+										'image_height'		=> (int) $image_height,
+										'image_width'		=> (int) $image_width,
+										'imageset_id'		=> (int) $style_id,
+										'image_lang'		=> (string) $row['lang_dir'],
+									);
+								}
+							}
+						}
+					}
+					$this->db->sql_freeresult($result);
+
+					$this->db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
+
+					$cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE);
+
+					return $this->umil_end();
+				}
+			break;
+			//case 'imageset' :
+
+			case 'template' :
+				if ($style_id == 0)
+				{
+					$return = array();
+					$sql = 'SELECT template_id
+						FROM ' . STYLES_TEMPLATE_TABLE;
+					$result = $this->db->sql_query($sql);
+					while ($row = $this->db->sql_fetchrow($result))
+					{
+						$return[] = $this->cache_purge('template', $row['template_id']);
+					}
+					$this->db->sql_freeresult($result);
+
+					return implode('<br /><br />', $return);
+				}
+				else
+				{
+					$sql = 'SELECT *
+						FROM ' . STYLES_TEMPLATE_TABLE . "
+						WHERE template_id = $style_id";
+					$result = $this->db->sql_query($sql);
+					$template_row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					if (!$template_row)
+					{
+						$this->umil_start('TEMPLATE_CACHE_PURGE', 'UNKNOWN');
+						return $this->umil_end('FAIL');
+					}
+
+					$this->umil_start('TEMPLATE_CACHE_PURGE', $template_row['template_name']);
+
+					// The following is from includes/acp/acp_styles.php
+					if ($template_row['template_storedb'] && file_exists("{$phpbb_root_path}styles/{$template_row['template_path']}/template/"))
+					{
+						$filelist = array('' => array());
+
+						$sql = 'SELECT template_filename, template_mtime
+							FROM ' . STYLES_TEMPLATE_DATA_TABLE . "
+							WHERE template_id = $style_id";
+						$result = $this->db->sql_query($sql);
+
+						while ($row = $this->db->sql_fetchrow($result))
+						{
+//							if (@filemtime("{$phpbb_root_path}styles/{$template_row['template_path']}/template/" . $row['template_filename']) > $row['template_mtime'])
+//							{
+								// get folder info from the filename
+								if (($slash_pos = strrpos($row['template_filename'], '/')) === false)
+								{
+									$filelist[''][] = $row['template_filename'];
+								}
+								else
+								{
+									$filelist[substr($row['template_filename'], 0, $slash_pos + 1)][] = substr($row['template_filename'], $slash_pos + 1, strlen($row['template_filename']) - $slash_pos - 1);
+								}
+//							}
+						}
+						$this->db->sql_freeresult($result);
+
+						$includes = array();
+						foreach ($filelist as $pathfile => $file_ary)
+						{
+							foreach ($file_ary as $file)
+							{
+								if (!($fp = @fopen("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file", 'r')))
+								{
+									return $this->umil_end('FILE_COULD_NOT_READ', "{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file");
+								}
+								$template_data = fread($fp, filesize("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"));
+								fclose($fp);
+
+								if (preg_match_all('#<!-- INCLUDE (.*?\.html) -->#is', $template_data, $matches))
+								{
+									foreach ($matches[1] as $match)
+									{
+										$includes[trim($match)][] = $file;
+									}
+								}
+							}
+						}
+
+						foreach ($filelist as $pathfile => $file_ary)
+						{
+							foreach ($file_ary as $file)
+							{
+								// Skip index.
+								if (strpos($file, 'index.') === 0)
+								{
+									continue;
+								}
+
+								// We could do this using extended inserts ... but that could be one
+								// heck of a lot of data ...
+								$sql_ary = array(
+									'template_id'			=> (int) $style_id,
+									'template_filename'		=> "$pathfile$file",
+									'template_included'		=> (isset($includes[$file])) ? implode(':', $includes[$file]) . ':' : '',
+									'template_mtime'		=> (int) filemtime("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"),
+									'template_data'			=> (string) file_get_contents("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"),
+								);
+
+								$sql = 'UPDATE ' . STYLES_TEMPLATE_DATA_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+									WHERE template_id = $style_id
+										AND template_filename = '" . $this->db->sql_escape("$pathfile$file") . "'";
+								$this->db->sql_query($sql);
+							}
+						}
+						unset($filelist);
+					}
+
+					// Purge the forum's cache as well.
+					$cache->purge();
+
+					return $this->umil_end();
+				}
+			break;
+			//case 'template' :
+
+			case 'theme' :
+				if ($style_id == 0)
+				{
+					$return = array();
+					$sql = 'SELECT theme_id
+						FROM ' . STYLES_THEME_TABLE;
+					$result = $this->db->sql_query($sql);
+					while ($row = $this->db->sql_fetchrow($result))
+					{
+						$return[] = $this->cache_purge('theme', $row['theme_id']);
+					}
+					$this->db->sql_freeresult($result);
+
+					return implode('<br /><br />', $return);
+				}
+				else
+				{
+					$sql = 'SELECT *
+						FROM ' . STYLES_THEME_TABLE . "
+						WHERE theme_id = $style_id";
+					$result = $this->db->sql_query($sql);
+					$theme_row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					if (!$theme_row)
+					{
+						$this->umil_start('THEME_CACHE_PURGE', 'UNKNOWN');
+						return $this->umil_end('FAIL');
+					}
+
+					$this->umil_start('THEME_CACHE_PURGE', $theme_row['theme_name']);
+
+					// The following is from includes/acp/acp_styles.php
+					if ($theme_row['theme_storedb'] && file_exists("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css"))
+					{
+						$stylesheet = file_get_contents($phpbb_root_path . 'styles/' . $theme_row['theme_path'] . '/theme/stylesheet.css');
+
+						// Match CSS imports
+						$matches = array();
+						preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches);
+
+						if (sizeof($matches))
+						{
+							foreach ($matches[0] as $idx => $match)
+							{
+								if (!file_exists("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/{$matches[1][$idx]}"))
+								{
+									continue;
+								}
+
+								$content = trim(file_get_contents("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/{$matches[1][$idx]}"));
+								$stylesheet = str_replace($match, $content, $stylesheet);
+							}
+						}
+
+						// adjust paths
+						$db_theme_data = str_replace('./', 'styles/' . $theme_row['theme_path'] . '/theme/', $stylesheet);
+
+						// Save CSS contents
+						$sql_ary = array(
+							'theme_mtime'	=> (int) filemtime("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css"),
+							'theme_data'	=> $db_theme_data,
+						);
+
+						$sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+							WHERE theme_id = $style_id";
+						$this->db->sql_query($sql);
+
+						$cache->destroy('sql', STYLES_THEME_TABLE);
+					}
+
+					return $this->umil_end();
+				}
+			break;
+			//case 'theme' :
+
+			default:
+				$this->umil_start('CACHE_PURGE');
+				$cache->purge();
+
+				return $this->umil_end();
+			break;
+		}
+	}
+
+	/**
+	* Config Exists
+	*
+	* This function is to check to see if a config variable exists or if it does not.
+	*
+	* @param string $config_name The name of the config setting you wish to check for.
+	* @param bool $return_result - return the config value/default if true : default false.
+	*
+	* @return bool true/false if config exists
+	*/
+	function config_exists($config_name, $return_result = false)
+	{
+		global $config, $cache;
+
+		$sql = 'SELECT *
+				FROM ' . CONFIG_TABLE . "
+				WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			if (!isset($config[$config_name]))
+			{
+				$config[$config_name] = $row['config_value'];
+
+				if (!$row['is_dynamic'])
+				{
+					$cache->destroy('config');
+				}
+			}
+
+			return ($return_result) ? $row : true;
+		}
+
+		// this should never happen, but if it does, we need to remove the config from the array
+		if (isset($config[$config_name]))
+		{
+			unset($config[$config_name]);
+			$cache->destroy('config');
+		}
+
+		return false;
+	}
+
+	/**
+	* Config Add
+	*
+	* This function allows you to add a config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to add
+	* @param mixed $config_value The value of the config setting
+	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
+	*
+	* @return result
+	*/
+	function config_add($config_name, $config_value = '', $is_dynamic = false)
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $config_name))
+		{
+			return;
+		}
+
+		$this->umil_start('CONFIG_ADD', $config_name);
+
+		if ($this->config_exists($config_name))
+		{
+			return $this->umil_end('CONFIG_ALREADY_EXISTS', $config_name);
+		}
+
+		set_config($config_name, $config_value, $is_dynamic);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Config Update
+	*
+	* This function allows you to update an existing config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to update
+	* @param mixed $config_value The value of the config setting
+	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
+	*
+	* @return result
+	*/
+	function config_update($config_name, $config_value = '', $is_dynamic = false)
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $config_name))
+		{
+			return;
+		}
+
+		$this->umil_start('CONFIG_UPDATE', $config_name);
+
+		if (!$this->config_exists($config_name))
+		{
+			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		set_config($config_name, $config_value, $is_dynamic);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Config Remove
+	*
+	* This function allows you to remove an existing config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to remove
+	*
+	* @return result
+	*/
+	function config_remove($config_name)
+	{
+		global $cache, $config;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $config_name))
+		{
+			return;
+		}
+
+		$this->umil_start('CONFIG_REMOVE', $config_name);
+
+		if (!$this->config_exists($config_name))
+		{
+			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		$sql = 'DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
+		$this->db->sql_query($sql);
+
+		unset($config[$config_name]);
+		$cache->destroy('config');
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Module Exists
+	*
+	* Check if a module exists
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
+	* @param int|string $module The module_id|module_langname you would like to check for to see if it exists
+	*/
+	function module_exists($class, $parent, $module)
+	{
+		// the main root directory should return true
+		if (!$module)
+		{
+			return true;
+		}
+
+		$class = $this->db->sql_escape($class);
+		$module = $this->db->sql_escape($module);
+
+		$parent_sql = '';
+		if ($parent !== false)
+		{
+			// Allows '' to be sent as 0
+			$parent = (!$parent) ? 0 : $parent;
+
+			if (!is_numeric($parent))
+			{
+				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+					WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+					AND module_class = '$class'";
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				if (!$row)
+				{
+					return false;
+				}
+
+				$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
+			}
+			else
+			{
+				$parent_sql = 'AND parent_id = ' . (int) $parent;
+			}
+		}
+
+		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+			WHERE module_class = '$class'
+			$parent_sql
+			AND " . ((is_numeric($module)) ? 'module_id = ' . (int) $module : "module_langname = '$module'");
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Module Add
+	*
+	* Add a new module
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string $parent The parent module_id|module_langname (0 for no parent)
+	* @param array $data an array of the data on the new module.  This can be setup in two different ways.
+	*	1. The "manual" way.  For inserting a category or one at a time.  It will be merged with the base array shown a bit below,
+	*		but at the least requires 'module_langname' to be sent, and, if you want to create a module (instead of just a category) you must send module_basename and module_mode.
+	* array(
+	*		'module_enabled'	=> 1,
+	*		'module_display'	=> 1,
+	*		'module_basename'	=> '',
+	*		'module_class'		=> $class,
+	*		'parent_id'			=> (int) $parent,
+	*		'module_langname'	=> '',
+	*		'module_mode'		=> '',
+	*		'module_auth'		=> '',
+	*	)
+	*	2. The "automatic" way.  For inserting multiple at a time based on the specs in the info file for the module(s).  For this to work the modules must be correctly setup in the info file.
+	*		An example follows (this would insert the settings, log, and flag modes from the includes/acp/info/acp_asacp.php file):
+	* array(
+	* 		'module_basename'	=> 'asacp',
+	* 		'modes'				=> array('settings', 'log', 'flag'),
+	* )
+	* 		Optionally you may not send 'modes' and it will insert all of the modules in that info file.
+	*  @param string|bool $include_path If you would like to use a custom include path, specify that here
+	*/
+	function module_add($class, $parent = 0, $data = array(), $include_path = false)
+	{
+		global $cache, $user, $phpbb_root_path, $phpEx;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $class))
+		{
+			return;
+		}
+
+		// Prevent stupid things like trying to add a module with no name or any data on it
+		if (empty($data))
+		{
+			$this->umil_start('MODULE_ADD', $class, 'UNKNOWN');
+			return $this->umil_end('FAIL');
+		}
+
+        // Allows '' to be sent as 0
+		$parent = (!$parent) ? 0 : $parent;
+
+		// allow sending the name as a string in $data to create a category
+		if (!is_array($data))
+		{
+			$data = array('module_langname' => $data);
+		}
+
+		if (!isset($data['module_langname']))
+		{
+			// The "automatic" way
+			$basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
+			$basename = str_replace(array('/', '\\'), '', $basename);
+			$class = str_replace(array('/', '\\'), '', $class);
+			$info_file = "$class/info/{$class}_$basename.$phpEx";
+
+			// The manual and automatic ways both failed...
+			if (!file_exists((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file))
+			{
+				$this->umil_start('MODULE_ADD', $class, $info_file);
+				return $this->umil_end('FAIL');
+			}
+
+			$classname = "{$class}_{$basename}_info";
+
+			if (!class_exists($classname))
+			{
+				include((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file);
+			}
+
+			$info = new $classname;
+			$module = $info->module();
+			unset($info);
+
+			$result = '';
+			foreach ($module['modes'] as $mode => $module_info)
+			{
+				if (!isset($data['modes']) || in_array($mode, $data['modes']))
+				{
+					$new_module = array(
+						'module_basename'	=> $basename,
+						'module_langname'	=> $module_info['title'],
+						'module_mode'		=> $mode,
+						'module_auth'		=> $module_info['auth'],
+						'module_display'	=> (isset($module_info['display'])) ? $module_info['display'] : true,
+						'before'			=> (isset($module_info['before'])) ? $module_info['before'] : false,
+						'after'				=> (isset($module_info['after'])) ? $module_info['after'] : false,
+					);
+
+					// Run the "manual" way with the data we've collected.
+					$result .= ((isset($data['spacer'])) ? $data['spacer'] : '<br />') . $this->module_add($class, $parent, $new_module);
+				}
+			}
+
+			return $result;
+		}
+
+		// The "manual" way
+		$this->umil_start('MODULE_ADD', $class, ((isset($user->lang[$data['module_langname']])) ? $user->lang[$data['module_langname']] : $data['module_langname']));
+		add_log('admin', 'LOG_MODULE_ADD', ((isset($user->lang[$data['module_langname']])) ? $user->lang[$data['module_langname']] : $data['module_langname']));
+
+		$class = $this->db->sql_escape($class);
+
+		if (!is_numeric($parent))
+		{
+			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+				WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+				AND module_class = '$class'";
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$row)
+			{
+				return $this->umil_end('PARENT_NOT_EXIST');
+			}
+
+			$parent = $data['parent_id'] = $row['module_id'];
+		}
+		else if (!$this->module_exists($class, false, $parent))
+		{
+			return $this->umil_end('PARENT_NOT_EXIST');
+		}
+
+		if ($this->module_exists($class, $parent, $data['module_langname']))
+		{
+			return $this->umil_end('MODULE_ALREADY_EXIST');
+		}
+
+		if (!class_exists('acp_modules'))
+		{
+			include($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
+			$user->add_lang('acp/modules');
+		}
+		$acp_modules = new acp_modules();
+
+		$module_data = array(
+			'module_enabled'	=> (isset($data['module_enabled'])) ? $data['module_enabled'] : 1,
+			'module_display'	=> (isset($data['module_display'])) ? $data['module_display'] : 1,
+			'module_basename'	=> (isset($data['module_basename'])) ? $data['module_basename'] : '',
+			'module_class'		=> $class,
+			'parent_id'			=> (int) $parent,
+			'module_langname'	=> (isset($data['module_langname'])) ? $data['module_langname'] : '',
+			'module_mode'		=> (isset($data['module_mode'])) ? $data['module_mode'] : '',
+			'module_auth'		=> (isset($data['module_auth'])) ? $data['module_auth'] : '',
+		);
+		$result = $acp_modules->update_module_data($module_data, true);
+
+		// update_module_data can either return a string or an empty array...
+		if (is_string($result))
+		{
+			// Error
+			$this->result = $this->get_output_text($result);
+		}
+		else
+		{
+			// Success
+
+			// Move the module if requested above/below an existing one
+			if (isset($data['before']) && $data['before'])
+			{
+				$sql = 'SELECT left_id FROM ' . MODULES_TABLE . '
+					WHERE module_class = \'' . $class . '\'
+					AND parent_id = ' . (int) $parent . '
+					AND module_langname = \'' . $this->db->sql_escape($data['before']) . '\'';
+				$this->db->sql_query($sql);
+				$to_left = $this->db->sql_fetchfield('left_id');
+
+				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
+					WHERE module_class = '$class'
+					AND left_id >= $to_left
+					AND left_id < {$module_data['left_id']}";
+				$this->db->sql_query($sql);
+
+				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = $to_left, right_id = " . ($to_left + 1) . "
+					WHERE module_class = '$class'
+					AND module_id = {$module_data['module_id']}";
+				$this->db->sql_query($sql);
+			}
+			else if (isset($data['after']) && $data['after'])
+			{
+				$sql = 'SELECT right_id FROM ' . MODULES_TABLE . '
+					WHERE module_class = \'' . $class . '\'
+					AND parent_id = ' . (int) $parent . '
+					AND module_langname = \'' . $this->db->sql_escape($data['after']) . '\'';
+				$this->db->sql_query($sql);
+				$to_right = $this->db->sql_fetchfield('right_id');
+
+				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
+					WHERE module_class = '$class'
+					AND left_id >= $to_right
+					AND left_id < {$module_data['left_id']}";
+				$this->db->sql_query($sql);
+
+				$sql = 'UPDATE ' . MODULES_TABLE . ' SET left_id = ' . ($to_right + 1) . ', right_id = ' . ($to_right + 2) . "
+					WHERE module_class = '$class'
+					AND module_id = {$module_data['module_id']}";
+				$this->db->sql_query($sql);
+			}
+		}
+
+		// Clear the Modules Cache
+		$cache->destroy("_modules_$class");
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Module Remove
+	*
+	* Remove a module
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
+	* @param int|string $module The module id|module_langname
+	* @param string|bool $include_path If you would like to use a custom include path, specify that here
+	*/
+	function module_remove($class, $parent = 0, $module = '', $include_path = false)
+	{
+		global $cache, $user, $phpbb_root_path, $phpEx;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $class))
+		{
+			return;
+		}
+
+		// Imitation of module_add's "automatic" and "manual" method so the uninstaller works from the same set of instructions for umil_auto
+		if (is_array($module))
+		{
+			if (isset($module['module_langname']))
+			{
+				// Manual Method
+				return $this->module_remove($class, $parent, $module['module_langname'], $include_path);
+			}
+
+			// Failed.
+			if (!isset($module['module_basename']))
+			{
+				$this->umil_start('MODULE_REMOVE', $class, 'UNKNOWN');
+				return $this->umil_end('FAIL');
+			}
+
+			// Automatic method
+			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
+			$class = str_replace(array('/', '\\'), '', $class);
+			$info_file = "$class/info/{$class}_$basename.$phpEx";
+
+			if (!file_exists((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file))
+			{
+				$this->umil_start('MODULE_REMOVE', $class, $info_file);
+				return $this->umil_end('FAIL');
+			}
+
+			$classname = "{$class}_{$basename}_info";
+
+			if (!class_exists($classname))
+			{
+				include((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file);
+			}
+
+			$info = new $classname;
+			$module_info = $info->module();
+			unset($info);
+
+			$result = '';
+			foreach ($module_info['modes'] as $mode => $info)
+			{
+				if (!isset($module['modes']) || in_array($mode, $module['modes']))
+				{
+					$result .= $this->module_remove($class, $parent, $info['title']) . '<br />';
+				}
+			}
+			return $result;
+		}
+		else
+		{
+			$class = $this->db->sql_escape($class);
+
+			if (!$this->module_exists($class, $parent, $module))
+			{
+				$this->umil_start('MODULE_REMOVE', $class, ((isset($user->lang[$module])) ? $user->lang[$module] : $module));
+				return $this->umil_end('MODULE_NOT_EXIST');
+			}
+
+			$parent_sql = '';
+			if ($parent !== false)
+			{
+				// Allows '' to be sent as 0
+				$parent = (!$parent) ? 0 : $parent;
+
+				if (!is_numeric($parent))
+				{
+					$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+						WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+						AND module_class = '$class'";
+					$result = $this->db->sql_query($sql);
+					$row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					// we know it exists from the module_exists check
+					$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
+				}
+				else
+				{
+					$parent_sql = 'AND parent_id = ' . (int) $parent;
+				}
+			}
+
+			$module_ids = array();
+			if (!is_numeric($module))
+			{
+				$module = $this->db->sql_escape($module);
+				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+					WHERE module_langname = '$module'
+					AND module_class = '$class'
+					$parent_sql";
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$module_ids[] = (int) $row['module_id'];
+				}
+				$this->db->sql_freeresult($result);
+
+				$module_name = $module;
+			}
+			else
+			{
+				$module = (int) $module;
+				$sql = 'SELECT module_langname FROM ' . MODULES_TABLE . "
+					WHERE module_id = $module
+					AND module_class = '$class'
+					$parent_sql";
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				$module_name = $row['module_langname'];
+				$module_ids[] = $module;
+			}
+
+			$this->umil_start('MODULE_REMOVE', $class, ((isset($user->lang[$module_name])) ? $user->lang[$module_name] : $module_name));
+			add_log('admin', 'LOG_MODULE_REMOVED', ((isset($user->lang[$module_name])) ? $user->lang[$module_name] : $module_name));
+
+			if (!class_exists('acp_modules'))
+			{
+				include($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
+				$user->add_lang('acp/modules');
+			}
+			$acp_modules = new acp_modules();
+			$acp_modules->module_class = $class;
+
+			foreach ($module_ids as $module_id)
+			{
+				$result = $acp_modules->delete_module($module_id);
+				if (!empty($result))
+				{
+					if ($this->result == ((isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS'))
+					{
+						$this->result = implode('<br />', $result);
+					}
+					else
+					{
+						$this->result .= '<br />' . implode('<br />', $result);
+					}
+				}
+			}
+
+			$cache->destroy("_modules_$class");
+
+			return $this->umil_end();
+		}
+	}
+
+	/**
+	* Permission Exists
+	*
+	* Check if a permission (auth) setting exists
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return bool true if it exists, false if not
+	*/
+	function permission_exists($auth_option, $global = true)
+	{
+		if ($global)
+		{
+			$type_sql = ' AND is_global = 1';
+		}
+		else
+		{
+			$type_sql = ' AND is_local = 1';
+		}
+
+		$sql = 'SELECT auth_option_id
+				FROM ' . ACL_OPTIONS_TABLE . "
+				WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'"
+				. $type_sql;
+		$result = $this->db->sql_query($sql);
+
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Permission Add
+	*
+	* Add a permission (auth) option
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return result
+	*/
+	function permission_add($auth_option, $global = true)
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $auth_option))
+		{
+			return;
+		}
+
+		$this->umil_start('PERMISSION_ADD', $auth_option);
+
+		if ($this->permission_exists($auth_option, $global))
+		{
+			return $this->umil_end('PERMISSION_ALREADY_EXISTS', $auth_option);
+		}
+
+		// We've added permissions, so set to true to notify the user.
+		$this->permissions_added = true;
+
+		if (!class_exists('auth_admin'))
+		{
+			global $phpbb_root_path, $phpEx;
+
+			include($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
+		}
+		$auth_admin = new auth_admin();
+
+		// We have to add a check to see if the !$global (if global, local, and if local, global) permission already exists.  If it does, acl_add_option currently has a bug which would break the ACL system, so we are having a work-around here.
+		if ($this->permission_exists($auth_option, !$global))
+		{
+			$sql_ary = array(
+				'is_global'	=> 1,
+				'is_local'	=> 1,
+			);
+			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+				WHERE auth_option = \'' . $this->db->sql_escape($auth_option) . "'";
+			$this->db->sql_query($sql);
+		}
+		else
+		{
+			if ($global)
+			{
+				$auth_admin->acl_add_option(array('global' => array($auth_option)));
+			}
+			else
+			{
+				$auth_admin->acl_add_option(array('local' => array($auth_option)));
+			}
+		}
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Permission Remove
+	*
+	* Remove a permission (auth) option
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return result
+	*/
+	function permission_remove($auth_option, $global = true)
+	{
+		global $auth, $cache;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $auth_option))
+		{
+			return;
+		}
+
+		$this->umil_start('PERMISSION_REMOVE', $auth_option);
+
+		if (!$this->permission_exists($auth_option, $global))
+		{
+			return $this->umil_end('PERMISSION_NOT_EXIST', $auth_option);
+		}
+
+		if ($global)
+		{
+			$type_sql = ' AND is_global = 1';
+		}
+		else
+		{
+			$type_sql = ' AND is_local = 1';
+		}
+		$sql = 'SELECT auth_option_id, is_global, is_local FROM ' . ACL_OPTIONS_TABLE . "
+			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'" .
+			$type_sql;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$id = $row['auth_option_id'];
+
+		// If it is a local and global permission, do not remove the row! :P
+		if ($row['is_global'] && $row['is_local'])
+		{
+			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
+				SET ' . (($global) ? 'is_global = 0' : 'is_local = 0') . '
+				WHERE auth_option_id = ' . $id;
+			$this->db->sql_query($sql);
+		}
+		else
+		{
+			// Delete time
+			$this->db->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $id);
+		}
+
+		// Purge the auth cache
+		$cache->destroy('_acl_options');
+		$auth->acl_clear_prefetch();
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Add a new permission role
+	*
+	* @param string $role_name The new role name
+	* @param sting $role_type The type (u_, m_, a_)
+	*/
+	function permission_role_add($role_name, $role_type = '', $role_description = '')
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $role_name))
+		{
+			return;
+		}
+
+		$this->umil_start('PERMISSION_ROLE_ADD', $role_name);
+
+		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if ($role_id)
+		{
+			return $this->umil_end('ROLE_ALREADY_EXISTS', $old_role_name);
+		}
+
+		$sql = 'SELECT MAX(role_order) AS max FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_type = \'' . $this->db->sql_escape($role_type) . '\'';
+		$this->db->sql_query($sql);
+		$role_order = $this->db->sql_fetchfield('max');
+		$role_order = (!$role_order) ? 1 : $role_order + 1;
+
+		$sql_ary = array(
+			'role_name'			=> $role_name,
+			'role_description'	=> $role_description,
+			'role_type'			=> $role_type,
+			'role_order'		=> $role_order,
+		);
+
+		$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+		$this->db->sql_query($sql);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Update the name on a permission role
+	*
+	* @param string $old_role_name The old role name
+	* @param string $new_role_name The new role name
+	*/
+	function permission_role_update($old_role_name, $new_role_name = '')
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $role_name))
+		{
+			return;
+		}
+
+		$this->umil_start('PERMISSION_ROLE_UPDATE', $old_role_name);
+
+		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if (!$role_id)
+		{
+			return $this->umil_end('ROLE_NOT_EXIST', $old_role_name);
+		}
+
+		$sql = 'UPDATE ' . ACL_ROLES_TABLE . '
+			SET role_name = \'' . $this->db->sql_escape($new_role_name) . '\'
+			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
+		$this->db->sql_query($sql);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Remove a permission role
+	*
+	* @param string $role_name The role name to remove
+	*/
+	function permission_role_remove($role_name)
+	{
+		global $auth;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $role_name))
+		{
+			return;
+		}
+
+		$this->umil_start('PERMISSION_ROLE_REMOVE', $role_name);
+
+		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if (!$role_id)
+		{
+			return $this->umil_end('ROLE_NOT_EXIST', $role_name);
+		}
+
+		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
+			WHERE role_id = ' . $role_id;
+		$this->db->sql_query($sql);
+
+		$sql = 'DELETE FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_id = ' . $role_id;
+		$this->db->sql_query($sql);
+
+		$auth->acl_clear_prefetch();
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Permission Set
+	*
+	* Allows you to set permissions for a certain group/role
+	*
+	* @param string $name The name of the role/group
+	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
+	* @param string $type The type (role|group)
+	* @param bool $has_permission True if you want to give them permission, false if you want to deny them permission
+	*/
+	function permission_set($name, $auth_option = array(), $type = 'role', $has_permission = true)
+	{
+		global $auth;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $name))
+		{
+			return;
+		}
+
+		if (!is_array($auth_option))
+		{
+			$auth_option = array($auth_option);
+		}
+
+		$new_auth = array();
+		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
+			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$new_auth[] = $row['auth_option_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!sizeof($new_auth))
+		{
+			return false;
+		}
+
+		$current_auth = array();
+
+		$type = (string) $type; // Prevent PHP bug.
+
+		switch ($type)
+		{
+			case 'role' :
+				$this->umil_start('PERMISSION_SET_ROLE', $name);
+
+				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('role_id');
+
+				if (!$role_id)
+				{
+					return $this->umil_end('ROLE_NOT_EXIST');
+				}
+
+				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_ROLES_DATA_TABLE . '
+					WHERE role_id = ' . $role_id;
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
+				}
+				$this->db->sql_freeresult($result);
+			break;
+
+			case 'group' :
+				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . ' WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$group_id = $this->db->sql_fetchfield('group_id');
+
+				if (!$group_id)
+				{
+					$this->umil_start('PERMISSION_SET_GROUP', $name);
+					return $this->umil_end('GROUP_NOT_EXIST');
+				}
+
+				// If the group has a role set for them we will add the requested permissions to that role.
+				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id . '
+					AND auth_role_id <> 0
+					AND forum_id = 0';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('auth_role_id');
+				if ($role_id)
+				{
+					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
+						WHERE role_id = ' . $role_id;
+					$this->db->sql_query($sql);
+					$role_name = $this->db->sql_fetchfield('role_name');
+
+					return $this->permission_set($role_name, $auth_option, 'role', $has_permission);
+				}
+
+				$this->umil_start('PERMISSION_SET_GROUP', $name);
+
+				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id;
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
+				}
+				$this->db->sql_freeresult($result);
+			break;
+		}
+
+		$sql_ary = array();
+		switch ($type)
+		{
+			case 'role' :
+				foreach ($new_auth as $auth_option_id)
+				{
+					if (!isset($current_auth[$auth_option_id]))
+					{
+						$sql_ary[] = array(
+							'role_id'			=> $role_id,
+							'auth_option_id'	=> $auth_option_id,
+							'auth_setting'		=> $has_permission,
+				        );
+					}
+				}
+
+				$this->db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary);
+			break;
+
+			case 'group' :
+				foreach ($new_auth as $auth_option_id)
+				{
+					if (!isset($current_auth[$auth_option_id]))
+					{
+						$sql_ary[] = array(
+							'group_id'			=> $group_id,
+							'auth_option_id'	=> $auth_option_id,
+							'auth_setting'		=> $has_permission,
+				        );
+					}
+				}
+
+				$this->db->sql_multi_insert(ACL_GROUPS_TABLE, $sql_ary);
+			break;
+		}
+
+		$auth->acl_clear_prefetch();
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Permission Unset
+	*
+	* Allows you to unset (remove) permissions for a certain group/role
+	*
+	* @param string $name The name of the role/group
+	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
+	* @param string $type The type (role|group)
+	*/
+	function permission_unset($name, $auth_option = array(), $type = 'role')
+	{
+		global $auth;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $name))
+		{
+			return;
+		}
+
+		if (!is_array($auth_option))
+		{
+			$auth_option = array($auth_option);
+		}
+
+		$to_remove = array();
+		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
+			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$to_remove[] = $row['auth_option_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!sizeof($to_remove))
+		{
+			return false;
+		}
+
+		$type = (string) $type; // Prevent PHP bug.
+
+		switch ($type)
+		{
+			case 'role' :
+				$this->umil_start('PERMISSION_UNSET_ROLE', $name);
+
+				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
+					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('role_id');
+
+				if (!$role_id)
+				{
+					return $this->umil_end('ROLE_NOT_EXIST');
+				}
+
+				$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
+					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
+				$this->db->sql_query($sql);
+			break;
+
+			case 'group' :
+				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . ' WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
+				$this->db->sql_query($sql);
+				$group_id = $this->db->sql_fetchfield('group_id');
+
+				if (!$group_id)
+				{
+					$this->umil_start('PERMISSION_UNSET_GROUP', $name);
+					return $this->umil_end('GROUP_NOT_EXIST');
+				}
+
+				// If the group has a role set for them we will remove the requested permissions from that role.
+				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id . '
+					AND auth_role_id <> 0';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('auth_role_id');
+				if ($role_id)
+				{
+					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
+						WHERE role_id = ' . $role_id;
+					$this->db->sql_query($sql);
+					$role_name = $this->db->sql_fetchfield('role_name');
+
+					return $this->permission_unset($role_name, $auth_option, 'role');
+				}
+
+				$this->umil_start('PERMISSION_UNSET_GROUP', $name);
+
+				$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
+					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
+				$this->db->sql_query($sql);
+			break;
+		}
+
+		$auth->acl_clear_prefetch();
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Exists
+	*
+	* Check if a table exists in the DB or not
+	*
+	* @param string $table_name The table name to check for
+	*
+	* @return bool true if the table exists, false if not
+	*/
+	function table_exists($table_name)
+	{
+		$this->get_table_name($table_name);
+
+		// Use sql_table_exists if available
+		if (method_exists($this->db_tools, 'sql_table_exists'))
+		{
+			$roe = $this->db->return_on_error;
+			$result = $this->db_tools->sql_table_exists($table_name);
+
+			// db_tools::sql_table_exists resets the return_on_error to false always after completing, so we must make sure we set it to true again if it was before
+			if ($roe)
+			{
+				$this->db->sql_return_on_error(true);
+			}
+
+			return $result;
+		}
+
+		if (!function_exists('get_tables'))
+		{
+			global $phpbb_root_path, $phpEx;
+			include($phpbb_root_path . 'includes/functions_install.' . $phpEx);
+		}
+
+		$tables = get_tables($this->db);
+
+		if (in_array($table_name, $tables))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	* Table Add
+	*
+	* This only supports input from the array format of db_tools or create_schema_files.
+	*/
+	function table_add($table_name, $table_data = array())
+	{
+		global $dbms, $user;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		/**
+		* $table_data can be empty when uninstalling a mod and table_remove was used, but no 2rd argument was given.
+		* In that case we'll assume that it was a column previously added by the mod (if not the author should specify a 2rd argument) and skip this to prevent an error
+		*/
+		if (empty($table_data))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_ADD', $table_name);
+
+		if ($this->table_exists($table_name))
+		{
+			return $this->umil_end('TABLE_ALREADY_EXISTS', $table_name);
+		}
+
+		if (!is_array($table_data))
+		{
+			return $this->umil_end('NO_TABLE_DATA');
+		}
+
+		if (!function_exists('get_available_dbms'))
+		{
+			global $phpbb_root_path, $phpEx;
+			include("{$phpbb_root_path}includes/functions_install.$phpEx");
+		}
+
+		/*
+		* This function has had numerous problems and is currently broken, so until phpBB uses it I will not be anymore
+		if (method_exists($this->db_tools, 'sql_create_table'))
+		{
+			// Added in 3.0.5
+			$this->db_tools->sql_create_table($table_name, $table_data);
+		}
+		else
+		{*/
+			$available_dbms = get_available_dbms($dbms);
+
+			$sql_query = $this->create_table_sql($table_name, $table_data);
+			$sql_query = split_sql_file($sql_query, $available_dbms[$dbms]['DELIM']);
+
+			foreach ($sql_query as $sql)
+			{
+				$this->db->sql_query($sql);
+			}
+		//}
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Remove
+	*
+	* Delete/Drop a DB table
+	*/
+	function table_remove($table_name)
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_REMOVE', $table_name);
+
+		if (!$this->table_exists($table_name))
+		{
+			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
+		}
+
+		if (method_exists($this->db_tools, 'sql_table_drop'))
+		{
+			// Added in 3.0.5
+			$this->db_tools->sql_table_drop($table_name);
+		}
+		else
+		{
+			$this->db->sql_query('DROP TABLE ' . $table_name);
+		}
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Column Exists
+	*
+	* Check to see if a column exists in a table
+	*/
+	function table_column_exists($table_name, $column_name)
+	{
+		$this->get_table_name($table_name);
+
+		return $this->db_tools->sql_column_exists($table_name, $column_name);
+	}
+
+	/**
+	* Table Column Add
+	*
+	* Add a new column to a table.
+	*/
+	function table_column_add($table_name, $column_name = '', $column_data = array())
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		/**
+		* $column_data can be empty when uninstalling a mod and table_column_remove was used, but no 3rd argument was given.
+		* In that case we'll assume that it was a column previously added by the mod (if not the author should specify a 3rd argument) and skip this to prevent an error
+		*/
+		if (empty($column_data))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_COLUMN_ADD', $table_name, $column_name);
+
+		if ($this->table_column_exists($table_name, $column_name))
+		{
+			return $this->umil_end('TABLE_COLUMN_ALREADY_EXISTS', $table_name, $column_name);
+		}
+
+		$this->db_tools->sql_column_add($table_name, $column_name, $column_data);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Column Update
+	*
+	* Alter/Update a column in a table.  You can not change a column name with this.
+	*/
+	function table_column_update($table_name, $column_name = '', $column_data = array())
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_COLUMN_UPDATE', $table_name, $column_name);
+
+		if (!$this->table_column_exists($table_name, $column_name))
+		{
+			return $this->umil_end('TABLE_COLUMN_NOT_EXIST', $table_name, $column_name);
+		}
+
+		$this->db_tools->sql_column_change($table_name, $column_name, $column_data);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Column Remove
+	*
+	* Remove a column from a table
+	*/
+	function table_column_remove($table_name, $column_name = '')
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_COLUMN_REMOVE', $table_name, $column_name);
+
+		if (!$this->table_column_exists($table_name, $column_name))
+		{
+			return $this->umil_end('TABLE_COLUMN_NOT_EXIST', $table_name, $column_name);
+		}
+
+		$this->db_tools->sql_column_remove($table_name, $column_name);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Index Exists
+	*
+	* Check if a table key/index exists on a table (can not check primary or unique)
+	*/
+	function table_index_exists($table_name, $index_name)
+	{
+		$this->get_table_name($table_name);
+
+		$indexes = $this->db_tools->sql_list_index($table_name);
+
+		if (in_array($index_name, $indexes))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Table Index Add
+	*
+	* Add a new key/index to a table
+	*/
+	function table_index_add($table_name, $index_name = '', $column = array())
+	{
+		global $config;
+
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		// Let them skip the column field and just use the index name in that case as the column as well
+		if (empty($column))
+		{
+			$column = array($index_name);
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_KEY_ADD', $table_name, $index_name);
+
+		if ($this->table_index_exists($table_name, $index_name))
+		{
+			return $this->umil_end('TABLE_KEY_ALREADY_EXIST', $table_name, $index_name);
+		}
+
+		if (!is_array($column))
+		{
+			$column = array($column);
+		}
+
+		// remove index length if we are before 3.0.8
+		// the feature (required for some types when using MySQL4)
+		// was added in that release (ticket PHPBB3-8944)
+		if (version_compare($config['version'], '3.0.7-pl1', '<='))
+		{
+			$column = preg_replace('#:.*$#', '', $column);
+		}
+
+		$this->db_tools->sql_create_index($table_name, $index_name, $column);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Index Remove
+	*
+	* Remove a key/index from a table
+	*/
+	function table_index_remove($table_name, $index_name = '')
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_KEY_REMOVE', $table_name, $index_name);
+
+		if (!$this->table_index_exists($table_name, $index_name))
+		{
+			return $this->umil_end('TABLE_KEY_NOT_EXIST', $table_name, $index_name);
+		}
+
+		$this->db_tools->sql_index_drop($table_name, $index_name);
+
+		return $this->umil_end();
+	}
+
+	// Ignore, function was renamed to table_row_insert and keeping for backwards compatibility
+	function table_insert($table_name, $data = array()) { $this->table_row_insert($table_name, $data); }
+
+	/**
+	* Table Insert
+	*
+	* Insert data into a table
+	*/
+	function table_row_insert($table_name, $data = array())
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_ROW_INSERT_DATA', $table_name);
+
+		if (!$this->table_exists($table_name))
+		{
+			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
+		}
+
+		$this->db->sql_multi_insert($table_name, $data);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Row Update
+	*
+	* Update a row in a table
+	*
+	* $data should be an array with the column names as keys and values as the items to check for each column.  Example:
+	* array('user_id' => 123, 'user_name' => 'test user') would become:
+	* WHERE user_id = 123 AND user_name = 'test user'
+	*
+	* $new_data is the new data it will be updated to (same format as you'd enter into $db->sql_build_array('UPDATE' ).
+	*/
+	function table_row_update($table_name, $data = array(), $new_data = array())
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		if (!sizeof($data))
+		{
+			return $this->umil_end('FAIL');
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_ROW_UPDATE_DATA', $table_name);
+
+		if (!$this->table_exists($table_name))
+		{
+			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
+		}
+
+		$sql = 'UPDATE ' . $table_name . '
+			SET ' . $this->db->sql_build_array('UPDATE', $new_data) . '
+			WHERE ' . $this->db->sql_build_array('SELECT', $data);
+		$this->db->sql_query($sql);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Table Row Remove
+	*
+	* Remove a row from a table
+	*
+	* $data should be an array with the column names as keys and values as the items to check for each column.  Example:
+	* array('user_id' => 123, 'user_name' => 'test user') would become:
+	* WHERE user_id = 123 AND user_name = 'test user'
+	*/
+	function table_row_remove($table_name, $data = array())
+	{
+		// Multicall
+		if ($this->multicall(__FUNCTION__, $table_name))
+		{
+			return;
+		}
+
+		if (!sizeof($data))
+		{
+			return $this->umil_end('FAIL');
+		}
+
+		$this->get_table_name($table_name);
+
+		$this->umil_start('TABLE_ROW_REMOVE_DATA', $table_name);
+
+		if (!$this->table_exists($table_name))
+		{
+			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
+		}
+
+		$sql = 'DELETE FROM ' . $table_name . ' WHERE ' . $this->db->sql_build_array('SELECT', $data);
+		$this->db->sql_query($sql);
+
+		return $this->umil_end();
+	}
+
+	/**
+	* Version Checker
+	*
+	* Format the file like the following:
+	* http://www.phpbb.com/updatecheck/30x.txt
+	*
+	* @param string $url The url to access (ex: www.phpbb.com)
+	* @param string $path The path to access (ex: /updatecheck)
+	* @param string $file The name of the file to access (ex: 30x.txt)
+	*
+	* @return array|string Error Message if there was any error, or an array (each line in the file as a value)
+	*/
+	function version_check($url, $path, $file, $timeout = 10, $port = 80)
+	{
+		if (!function_exists('get_remote_file'))
+		{
+			global $phpbb_root_path, $phpEx;
+
+			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+		}
+
+		$errstr = $errno = '';
+
+		$info = get_remote_file($url, $path, $file, $errstr, $errno, $port, $timeout);
+
+		if ($info === false)
+		{
+			return $errstr . ' [ ' . $errno . ' ]';
+		}
+
+		$info = str_replace("\r\n", "\n", $info);
+		$info = explode("\n", $info);
+
+		return $info;
+	}
+
+	/**
+	* Create table SQL
+	*
+	* Create the SQL query for the specified DBMS on the fly from a create_schema_files type of table array
+	*
+	* @param string $table_name The name of the table
+	* @param array $table_data The table data (formatted in the array format used by create_schema_files)
+	* @param string $dbms The dbms this will be built for (for testing only, leave blank to use the current DBMS)
+	*
+	* @return The sql query to run for the submitted dbms to insert the table
+	*/
+	function create_table_sql($table_name, $table_data, $dbms = '')
+	{
+		// To allow testing
+		$dbms = ($dbms) ? $dbms : $this->db_tools->sql_layer;
+
+		// A list of types being unsigned for better reference in some db's
+		$unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
+		$supported_dbms = array('firebird', 'mssql', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite');
+
+		$sql = '';
+
+		// Create Table statement
+		$generator = $textimage = false;
+
+		switch ($dbms)
+		{
+			case 'mysql_40':
+			case 'mysql_41':
+			case 'firebird':
+			case 'oracle':
+			case 'sqlite':
+			case 'postgres':
+				$sql .= "CREATE TABLE {$table_name} (\n";
+			break;
+
+			case 'mssql':
+				$sql .= "CREATE TABLE [{$table_name}] (\n";
+			break;
+		}
+
+		// Table specific so we don't get overlap
+		$modded_array = array();
+
+		// Write columns one by one...
+		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
+		{
+			// Get type
+			if (strpos($column_data[0], ':') !== false)
+			{
+				list($orig_column_type, $column_length) = explode(':', $column_data[0]);
+				if (!is_array($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']))
+				{
+					$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'], $column_length);
+				}
+				else
+				{
+					if (isset($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule']))
+					{
+						switch ($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule'][0])
+						{
+							case 'div':
+								$column_length /= $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule'][1];
+								$column_length = ceil($column_length);
+								$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length);
+							break;
+						}
+					}
+
+					if (isset($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit']))
+					{
+						switch ($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][0])
+						{
+							case 'mult':
+								$column_length *= $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][1];
+								if ($column_length > $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][2])
+								{
+									$column_type = $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][3];
+									$modded_array[$column_name] = $column_type;
+								}
+								else
+								{
+									$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length);
+								}
+							break;
+						}
+					}
+				}
+				$orig_column_type .= ':';
+			}
+			else
+			{
+				$orig_column_type = $column_data[0];
+				$column_type = $this->db_tools->dbms_type_map[$dbms][$column_data[0]];
+				if ($column_type == 'text' || $column_type == 'blob')
+				{
+					$modded_array[$column_name] = $column_type;
+				}
+			}
+
+			// Adjust default value if db-dependant specified
+			if (is_array($column_data[1]))
+			{
+				$column_data[1] = (isset($column_data[1][$dbms])) ? $column_data[1][$dbms] : $column_data[1]['default'];
+			}
+
+			switch ($dbms)
+			{
+				case 'mysql_40':
+				case 'mysql_41':
+					$sql .= "\t{$column_name} {$column_type} ";
+
+					// For hexadecimal values do not use single quotes
+					if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
+					{
+						$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
+					}
+					$sql .= 'NOT NULL';
+
+					if (isset($column_data[2]))
+					{
+						if ($column_data[2] == 'auto_increment')
+						{
+							$sql .= ' auto_increment';
+						}
+						else if ($dbms === 'mysql_41' && $column_data[2] == 'true_sort')
+						{
+							$sql .= ' COLLATE utf8_unicode_ci';
+						}
+					}
+
+					$sql .= ",\n";
+				break;
+
+				case 'sqlite':
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$sql .= "\t{$column_name} INTEGER PRIMARY KEY ";
+						$generator = $column_name;
+					}
+					else
+					{
+						$sql .= "\t{$column_name} {$column_type} ";
+					}
+
+					$sql .= 'NOT NULL ';
+					$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
+					$sql .= ",\n";
+				break;
+
+				case 'firebird':
+					$sql .= "\t{$column_name} {$column_type} ";
+
+					if (!is_null($column_data[1]))
+					{
+						$sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
+					}
+
+					$sql .= 'NOT NULL';
+
+					// This is a UNICODE column and thus should be given it's fair share
+					if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0]))
+					{
+						$sql .= ' COLLATE UNICODE';
+					}
+
+					$sql .= ",\n";
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$generator = $column_name;
+					}
+				break;
+
+				case 'mssql':
+					if ($column_type == '[text]')
+					{
+						$textimage = true;
+					}
+
+					$sql .= "\t[{$column_name}] {$column_type} ";
+
+					if (!is_null($column_data[1]))
+					{
+						// For hexadecimal values do not use single quotes
+						if (strpos($column_data[1], '0x') === 0)
+						{
+							$sql .= 'DEFAULT (' . $column_data[1] . ') ';
+						}
+						else
+						{
+							$sql .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
+						}
+					}
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$sql .= 'IDENTITY (1, 1) ';
+					}
+
+					$sql .= 'NOT NULL';
+					$sql .= " ,\n";
+				break;
+
+				case 'oracle':
+					$sql .= "\t{$column_name} {$column_type} ";
+					$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
+
+					// In Oracle empty strings ('') are treated as NULL.
+					// Therefore in oracle we allow NULL's for all DEFAULT '' entries
+					$sql .= ($column_data[1] === '') ? ",\n" : "NOT NULL,\n";
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$generator = $column_name;
+					}
+				break;
+
+				case 'postgres':
+					$sql .= "\t{$column_name} {$column_type} ";
+
+					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+					{
+						$sql .= "DEFAULT nextval('{$table_name}_seq'),\n";
+
+						// Make sure the sequence will be created before creating the table
+						$sql = "CREATE SEQUENCE {$table_name}_seq;\n\n" . $sql;
+					}
+					else
+					{
+						$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
+						$sql .= "NOT NULL";
+
+						// Unsigned? Then add a CHECK contraint
+						if (in_array($orig_column_type, $unsigned_types))
+						{
+							$sql .= " CHECK ({$column_name} >= 0)";
+						}
+
+						$sql .= ",\n";
+					}
+				break;
+			}
+		}
+
+		switch ($dbms)
+		{
+			case 'firebird':
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n);;\n\n";
+			break;
+
+			case 'mssql':
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n) ON [PRIMARY]" . (($textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '') . "\n";
+				$sql .= "GO\n\n";
+			break;
+		}
+
+		// Write primary key
+		if (isset($table_data['PRIMARY_KEY']))
+		{
+			if (!is_array($table_data['PRIMARY_KEY']))
+			{
+				$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
+			}
+
+			switch ($dbms)
+			{
+				case 'mysql_40':
+				case 'mysql_41':
+				case 'postgres':
+					$sql .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
+				break;
+
+				case 'firebird':
+					$sql .= "ALTER TABLE {$table_name} ADD PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ");;\n\n";
+				break;
+
+				case 'sqlite':
+					if ($generator === false || !in_array($generator, $table_data['PRIMARY_KEY']))
+					{
+						$sql .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
+					}
+				break;
+
+				case 'mssql':
+					$sql .= "ALTER TABLE [{$table_name}] WITH NOCHECK ADD \n";
+					$sql .= "\tCONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED \n";
+					$sql .= "\t(\n";
+					$sql .= "\t\t[" . implode("],\n\t\t[", $table_data['PRIMARY_KEY']) . "]\n";
+					$sql .= "\t)  ON [PRIMARY] \n";
+					$sql .= "GO\n\n";
+				break;
+
+				case 'oracle':
+					$sql .= "\tCONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
+				break;
+			}
+		}
+
+		switch ($dbms)
+		{
+			case 'oracle':
+				// UNIQUE contrains to be added?
+				if (isset($table_data['KEYS']))
+				{
+					foreach ($table_data['KEYS'] as $key_name => $key_data)
+					{
+						if (!is_array($key_data[1]))
+						{
+							$key_data[1] = array($key_data[1]);
+						}
+
+						if ($key_data[0] == 'UNIQUE')
+						{
+							$sql .= "\tCONSTRAINT u_phpbb_{$key_name} UNIQUE (" . implode(', ', $key_data[1]) . "),\n";
+						}
+					}
+				}
+
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n)\n/\n\n";
+			break;
+
+			case 'postgres':
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n);\n\n";
+			break;
+
+			case 'sqlite':
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n);\n\n";
+			break;
+		}
+
+		// Write Keys
+		if (isset($table_data['KEYS']))
+		{
+			foreach ($table_data['KEYS'] as $key_name => $key_data)
+			{
+				if (!is_array($key_data[1]))
+				{
+					$key_data[1] = array($key_data[1]);
+				}
+
+				switch ($dbms)
+				{
+					case 'mysql_40':
+					case 'mysql_41':
+						$sql .= ($key_data[0] == 'INDEX') ? "\tKEY" : '';
+						$sql .= ($key_data[0] == 'UNIQUE') ? "\tUNIQUE" : '';
+						foreach ($key_data[1] as $key => $col_name)
+						{
+							if (isset($modded_array[$col_name]))
+							{
+								switch ($modded_array[$col_name])
+								{
+									case 'text':
+									case 'blob':
+										$key_data[1][$key] = $col_name . '(255)';
+									break;
+								}
+							}
+						}
+						$sql .= ' ' . $key_name . ' (' . implode(', ', $key_data[1]) . "),\n";
+					break;
+
+					case 'firebird':
+						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
+
+						$sql .= ' ' . $table_name . '_' . $key_name . ' ON ' . $table_name . '(' . implode(', ', $key_data[1]) . ");;\n";
+					break;
+
+					case 'mssql':
+						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE  INDEX' : '';
+						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE  UNIQUE  INDEX' : '';
+						$sql .= " [{$key_name}] ON [{$table_name}]([" . implode('], [', $key_data[1]) . "]) ON [PRIMARY]\n";
+						$sql .= "GO\n\n";
+					break;
+
+					case 'oracle':
+						if ($key_data[0] == 'UNIQUE')
+						{
+							continue;
+						}
+
+						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+
+						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ")\n";
+						$sql .= "/\n";
+					break;
+
+					case 'sqlite':
+						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
+
+						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n";
+					break;
+
+					case 'postgres':
+						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
+						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
+
+						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n";
+					break;
+				}
+			}
+		}
+
+		switch ($dbms)
+		{
+			case 'mysql_40':
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n);\n\n";
+			break;
+
+			case 'mysql_41':
+				// Remove last line delimiter...
+				$sql = substr($sql, 0, -2);
+				$sql .= "\n) CHARACTER SET utf8 COLLATE utf8_bin;\n\n";
+			break;
+
+			// Create Generator
+			case 'firebird':
+				if ($generator !== false)
+				{
+					$sql .= "\nCREATE GENERATOR {$table_name}_gen;;\n";
+					$sql .= 'SET GENERATOR ' . $table_name . "_gen TO 0;;\n\n";
+
+					$sql .= 'CREATE TRIGGER t_' . $table_name . ' FOR ' . $table_name . "\n";
+					$sql .= "BEFORE INSERT\nAS\nBEGIN\n";
+					$sql .= "\tNEW.{$generator} = GEN_ID({$table_name}_gen, 1);\nEND;;\n\n";
+				}
+			break;
+
+			case 'oracle':
+				if ($generator !== false)
+				{
+					$sql .= "\nCREATE SEQUENCE {$table_name}_seq\n/\n\n";
+
+					$sql .= "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
+					$sql .= "BEFORE INSERT ON {$table_name}\n";
+					$sql .= "FOR EACH ROW WHEN (\n";
+					$sql .= "\tnew.{$generator} IS NULL OR new.{$generator} = 0\n";
+					$sql .= ")\nBEGIN\n";
+					$sql .= "\tSELECT {$table_name}_seq.nextval\n";
+					$sql .= "\tINTO :new.{$generator}\n";
+					$sql .= "\tFROM dual;\nEND;\n/\n\n";
+				}
+			break;
+		}
+
+		return $sql;
+	}
+
+	/**
+	* Get the real table name
+	* By A_Jelly_Doughnut
+	*
+	* @param string $table_name The table name to get the real table name from
+	*/
+	function get_table_name(&$table_name)
+	{
+		// Use the global table prefix if a custom one is not specified
+		if ($this->table_prefix === false)
+		{
+			global $table_prefix;
+		}
+		else
+		{
+			$table_prefix = $this->table_prefix;
+		}
+
+		static $constants = NULL;
+
+		if (is_null($constants))
+		{
+			$constants = get_defined_constants();
+		}
+
+		/**
+		* only do the replace if the table prefix is not already present
+		* this is required since UMIL supports specifying a table via phpbb_foo
+		* (where a replace would be needed)
+		* or by FOO_TABLE (where a replace is already done at constant-define time)
+		*/
+		if (!preg_match('#^' . preg_quote($table_prefix, '#') . '#', $table_name) || !in_array($table_name, $constants, true))
+		{
+			$table_name = preg_replace('#^phpbb_#i', $table_prefix, $table_name);
+		}
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/phpBB/includes/db/migrationtools/base.php b/phpBB/includes/db/migrationtools/base.php
deleted file mode 100644
index 7fc6057e3a..0000000000
--- a/phpBB/includes/db/migrationtools/base.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migrationtools_base
-{
-	var $cache;
-	var $config;
-	var $db;
-}
\ No newline at end of file
diff --git a/phpBB/includes/db/migrationtools/config.php b/phpBB/includes/db/migrationtools/config.php
deleted file mode 100644
index 5a40e39943..0000000000
--- a/phpBB/includes/db/migrationtools/config.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migrationtools_config extends phpbb_db_migration
-{
-	/**
-	* Config Exists
-	*
-	* This function is to check to see if a config variable exists or if it does not.
-	*
-	* @param string $config_name The name of the config setting you wish to check for.
-	* @param bool $return_result - return the config value/default if true : default false.
-	*
-	* @return bool true/false if config exists
-	*/
-	function config_exists($config_name, $return_result = false)
-	{
-		$sql = 'SELECT *
-				FROM ' . CONFIG_TABLE . "
-				WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row)
-		{
-			if (!isset($this->config[$config_name]))
-			{
-				$this->config[$config_name] = $row['config_value'];
-
-				if (!$row['is_dynamic'])
-				{
-					$this->cache->destroy('config');
-				}
-			}
-
-			return ($return_result) ? $row : true;
-		}
-
-		// this should never happen, but if it does, we need to remove the config from the array
-		if (isset($this->config[$config_name]))
-		{
-			unset($this->config[$config_name]);
-			$this->cache->destroy('config');
-		}
-
-		return false;
-	}
-
-	/**
-	* Config Add
-	*
-	* This function allows you to add a config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to add
-	* @param mixed $config_value The value of the config setting
-	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
-	*
-	* @return result
-	*/
-	function config_add($config_name, $config_value = '', $is_dynamic = false)
-	{
-		if ($this->config_exists($config_name))
-		{
-			return $this->umil_end('CONFIG_ALREADY_EXISTS', $config_name);
-		}
-
-		set_config($config_name, $config_value, $is_dynamic);
-	}
-
-	/**
-	* Config Update
-	*
-	* This function allows you to update an existing config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to update
-	* @param mixed $config_value The value of the config setting
-	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
-	*
-	* @return result
-	*/
-	function config_update($config_name, $config_value = '')
-	{
-		if (!$this->config_exists($config_name))
-		{
-			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
-		}
-
-		set_config($config_name, $config_value);
-	}
-
-	/**
-	* Config Remove
-	*
-	* This function allows you to remove an existing config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to remove
-	*
-	* @return result
-	*/
-	function config_remove($config_name)
-	{
-		if (!$this->config_exists($config_name))
-		{
-			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
-		}
-
-		$sql = 'DELETE FROM ' . CONFIG_TABLE . "
-			WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
-		$this->db->sql_query($sql);
-
-		unset($this->config[$config_name]);
-		$this->cache->destroy('config');
-	}
-}
\ No newline at end of file
diff --git a/phpBB/includes/db/migrationtools/umil.php b/phpBB/includes/db/migrationtools/umil.php
deleted file mode 100644
index ce7b8ff3be..0000000000
--- a/phpBB/includes/db/migrationtools/umil.php
+++ /dev/null
@@ -1,3037 +0,0 @@
-<?php
-/**
- *
- * @author Nathan Guse (EXreaction) http://lithiumstudios.org
- * @author David Lewis (Highway of Life) highwayoflife@gmail.com
- * @package umil
- * @version $Id$
- * @copyright (c) 2008 phpBB Group
- * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
- *
- */
-
-/**
- * @ignore
- */
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-define('UMIL_VERSION', '1.0.4');
-
-/**
-* Multicall instructions
-*
-* With the "multicall" (as I am calling it) you can make a single function call and have it repeat the actions multiple times on information sent from an array.
-*
-* To do this (it does not work on the _exists functions), all you must do is send the first variable in the function call as an array and for each item, send an array for each of the variables in order.
-*
-* Example:
-* $umil->config_add(array(
-*	array('config_name', 'config_value'),
-*	array('config_name1', 'config_value1'),
-*	array('config_name2', 'config_value2', true),
-*	array('config_name3', 'config_value3', true),
-* );
-*/
-
-/**
-* UMIL - Unified MOD Installation Library class
-*
-* Cache Functions
-*	cache_purge($type = '', $style_id = 0)
-*
-* Config Functions:
-*	config_exists($config_name, $return_result = false)
-*	config_add($config_name, $config_value = '', $is_dynamic = false)
-*	config_update($config_name, $config_value, $is_dynamic = false)
-*	config_remove($config_name)
-*
-* Module Functions
-*	module_exists($class, $parent, $module)
-*	module_add($class, $parent = 0, $data = array())
-*	module_remove($class, $parent = 0, $module = '')
-*
-* Permissions/Auth Functions
-*	permission_exists($auth_option, $global = true)
-*	permission_add($auth_option, $global = true)
-*	permission_remove($auth_option, $global = true)
-*	permission_set($name, $auth_option = array(), $type = 'role', $global = true, $has_permission = true)
-*	permission_unset($name, $auth_option = array(), $type = 'role', $global = true)
-*
-* Table Functions
-*	table_exists($table_name)
-*	table_add($table_name, $table_data = array())
-*	table_remove($table_name)
-*
-* Table Column Functions
-*	table_column_exists($table_name, $column_name)
-*	table_column_add($table_name, $column_name = '', $column_data = array())
-*	table_column_update($table_name, $column_name = '', $column_data = array())
-*	table_column_remove($table_name, $column_name = '')
-*
-* Table Key/Index Functions
-*	table_index_exists($table_name, $index_name)
-*	table_index_add($table_name, $index_name = '', $column = array())
-*	table_index_remove($table_name, $index_name = '')
-*
-* Table Row Functions (note that these actions are not reversed automatically during uninstallation)
-*	table_row_insert($table_name, $data = array())
-*	table_row_remove($table_name, $data = array())
-*	table_row_update($table_name, $data = array(), $new_data = array())
-*
-* Version Check Function
-* 	version_check($url, $path, $file)
-*/
-class umil
-{
-	/**
-	* This will hold the text output for the inputted command (if the mod author would like to display the command that was ran)
-	*
-	* @var string
-	*/
-	var $command = '';
-
-	/**
-	* This will hold the text output for the result of the command.  $user->lang['SUCCESS'] if everything worked.
-	*
-	* @var string
-	*/
-	var $result = '';
-
-	/**
-	* Auto run $this->display_results after running a command
-	*/
-	var $auto_display_results = false;
-
-	/**
-	* Stand Alone option (this makes it possible to just use the single umil file and not worry about any language stuff
-	*/
-	var $stand_alone = false;
-
-	/**
-	* Were any new permissions added (used in umil_frontend)?
-	*/
-	var $permissions_added = false;
-
-	/**
-	* Database Object
-	*/
-	var $db = false;
-
-	/**
-	* Database Tools Object
-	*/
-	var $db_tools = false;
-
-	/**
-	* Do we want a custom prefix besides the phpBB table prefix?  You *probably* should not change this...
-	*/
-	var $table_prefix = false;
-
-	/**
-	* Constructor
-	*/
-	function umil($stand_alone = false, $db = false)
-	{
-		// Setup $this->db
-		if ($db !== false)
-		{
-			if (!is_object($db) || !method_exists($db, 'sql_query'))
-			{
-				trigger_error('Invalid $db Object');
-			}
-
-			$this->db = $db;
-		}
-		else
-		{
-			global $db;
-			$this->db = $db;
-		}
-
-		// Setup $this->db_tools
-		if (!class_exists('phpbb_db_tools'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include($phpbb_root_path . 'includes/db/db_tools.' . $phpEx);
-		}
-		$this->db_tools = new phpbb_db_tools($this->db);
-
-		$this->stand_alone = $stand_alone;
-
-		if (!$stand_alone)
-		{
-			global $config, $user, $phpbb_root_path, $phpEx;
-
-			/* Does not have the fall back option to use en/ if the user's language file does not exist, so we will not use it...unless that is changed.
-			if (method_exists('user', 'set_custom_lang_path'))
-			{
-				$user->set_custom_lang_path($phpbb_root_path . 'umil/language/');
-				$user->add_lang('umil');
-				$user->set_custom_lang_path($phpbb_root_path . 'language/');
-			}
-			else
-			{*/
-				// Include the umil language file.  First we check if the language file for the user's language is available, if not we check if the board's default language is available, if not we use the english file.
-				if (isset($user->data['user_lang']) && file_exists("{$phpbb_root_path}umil/language/{$user->data['user_lang']}/umil.$phpEx"))
-				{
-					$path = $user->data['user_lang'];
-				}
-				else if (file_exists("{$phpbb_root_path}umil/language/" . basename($config['default_lang']) . "/umil.$phpEx"))
-				{
-					$path = basename($config['default_lang']);
-				}
-				else if (file_exists("{$phpbb_root_path}umil/language/en/umil.$phpEx"))
-				{
-					$path = 'en';
-				}
-				else
-				{
-					trigger_error('Language Files Missing.<br /><br />Please download the latest UMIL (Unified MOD Install Library) from: <a href="http://www.phpbb.com/mods/umil/">phpBB.com/mods/umil</a>', E_USER_ERROR);
-				}
-
-				$user->add_lang('./../../umil/language/' . $path . '/umil');
-			//}
-
-			$user->add_lang(array('acp/common', 'acp/permissions'));
-
-			// Check to see if a newer version is available.
-			$info = $this->version_check('version.phpbb.com', '/umil', ((defined('PHPBB_QA')) ? 'umil_qa.txt' : 'umil.txt'));
-			if (is_array($info) && isset($info[0]) && isset($info[1]))
-			{
-				if (version_compare(UMIL_VERSION, $info[0], '<'))
-				{
-					global $template;
-
-					// Make sure user->setup() has been called
-					if (empty($user->lang))
-					{
-						$user->setup();
-					}
-
-					page_header('', false);
-
-					$user->lang['UPDATE_UMIL'] = (isset($user->lang['UPDATE_UMIL'])) ? $user->lang['UPDATE_UMIL'] : 'This version of UMIL is outdated.<br /><br />Please download the latest UMIL (Unified MOD Install Library) from: <a href="%1$s">%1$s</a>';
-					$template->assign_vars(array(
-						'S_BOARD_DISABLED'		=> true,
-						'L_BOARD_DISABLED'		=> sprintf($user->lang['UPDATE_UMIL'], $info[1]),
-					));
-				}
-			}
-		}
-	}
-
-	/**
-	* umil_start
-	*
-	* A function which runs (almost) every time a function here is ran
-	*/
-	function umil_start()
-	{
-		global $user;
-
-		// Set up the command.  This will get the arguments sent to the function.
-		$args = func_get_args();
-		$this->command = call_user_func_array(array($this, 'get_output_text'), $args);
-
-		$this->result = (isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS';
-		$this->db->sql_return_on_error(true);
-
-		//$this->db->sql_transaction('begin');
-	}
-
-	/**
-	* umil_end
-	*
-	* A function which runs (almost) every time a function here is ran
-	*/
-	function umil_end()
-	{
-		global $user;
-
-		// Set up the result.  This will get the arguments sent to the function.
-		$args = func_get_args();
-		$result = call_user_func_array(array($this, 'get_output_text'), $args);
-		$this->result = ($result) ? $result : $this->result;
-
-		if ($this->db->sql_error_triggered)
-		{
-			if ($this->result == ((isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS'))
-			{
-				$this->result = 'SQL ERROR ' . $this->db->sql_error_returned['message'];
-			}
-			else
-			{
-				$this->result .= '<br /><br />SQL ERROR ' . $this->db->sql_error_returned['message'];
-			}
-
-			//$this->db->sql_transaction('rollback');
-		}
-		else
-		{
-			//$this->db->sql_transaction('commit');
-		}
-
-		$this->db->sql_return_on_error(false);
-
-		// Auto output if requested.
-		if ($this->auto_display_results && method_exists($this, 'display_results'))
-		{
-			$this->display_results();
-		}
-
-		return '<strong>' . $this->command . '</strong><br />' . $this->result;
-	}
-
-	/**
-	* Get text for output
-	*
-	* Takes the given arguments and prepares them for the UI
-	*
-	* First argument sent is used as the language key
-	* Further arguments (if send) are used on the language key through vsprintf()
-	*
-	* @return string Returns the prepared string for output
-	*/
-	function get_output_text()
-	{
-		global $user;
-
-		// Set up the command.  This will get the arguments sent to the function.
-		$args = func_get_args();
-		if (sizeof($args))
-		{
-			$lang_key = array_shift($args);
-
-			if (sizeof($args))
-			{
-				$lang_args = array();
-				foreach ($args as $arg)
-				{
-					$lang_args[] = (isset($user->lang[$arg])) ? $user->lang[$arg] : $arg;
-				}
-
-				return @vsprintf(((isset($user->lang[$lang_key])) ? $user->lang[$lang_key] : $lang_key), $lang_args);
-			}
-			else
-			{
-				return ((isset($user->lang[$lang_key])) ? $user->lang[$lang_key] : $lang_key);
-			}
-		}
-
-		return '';
-	}
-
-	/**
-	* Run Actions
-	*
-	* Do-It-All function that can do everything required for installing/updating/uninstalling a mod based on an array of actions and the versions.
-	*
-	* @param string $action The action. install|update|uninstall
-	* @param array $versions The array of versions and the actions for each
-	* @param string $version_config_name The name of the config setting which holds/will hold the currently installed version
-	* @param string $version_select Added for the UMIL Auto system to allow you to select the version you want to install/update/uninstall to.
-	*/
-	function run_actions($action, $versions, $version_config_name, $version_select = '')
-	{
-		// We will sort the actions to prevent issues from mod authors incorrectly listing the version numbers
-		uksort($versions, 'version_compare');
-
-		// Find the current version to install
-		$current_version = '0.0.0';
-		foreach ($versions as $version => $actions)
-		{
-			$current_version = $version;
-		}
-
-		$db_version = '';
-		if ($this->config_exists($version_config_name))
-		{
-			global $config;
-			$db_version = $config[$version_config_name];
-		}
-
-		// Set the action to install from update if nothing is currently installed
-		if ($action == 'update' && !$db_version)
-		{
-			$action = 'install';
-		}
-
-		if ($action == 'install' || $action == 'update')
-		{
-			$version_installed = $db_version;
-			foreach ($versions as $version => $version_actions)
-			{
-				// If we are updating
-				if ($db_version && version_compare($version, $db_version, '<='))
-				{
-					continue;
-				}
-
-				if ($version_select && version_compare($version, $version_select, '>'))
-				{
-					break;
-				}
-
-				foreach ($version_actions as $method => $params)
-				{
-					if ($method == 'custom')
-					{
-						$this->_call_custom_function($params, $action, $version);
-					}
-					else
-					{
-						if (method_exists($this, $method))
-						{
-							call_user_func(array($this, $method), $params);
-						}
-					}
-				}
-
-				$version_installed = $version;
-			}
-
-			// update the version number or add it
-			if ($this->config_exists($version_config_name))
-			{
-				$this->config_update($version_config_name, $version_installed);
-			}
-			else
-			{
-				$this->config_add($version_config_name, $version_installed);
-			}
-		}
-		else if ($action == 'uninstall' && $db_version)
-		{
-			// reverse version list
-			$versions = array_reverse($versions);
-
-			foreach ($versions as $version => $version_actions)
-			{
-				// Uninstalling and this listed version is newer than installed
-				if (version_compare($version, $db_version, '>'))
-				{
-					continue;
-				}
-
-				// Version selection stuff
-				if ($version_select && version_compare($version, $version_select, '<='))
-				{
-					// update the version number
-					$this->config_update($version_config_name, $version);
-					break;
-				}
-
-				$cache_purge = false;
-				$version_actions = array_reverse($version_actions);
-				foreach ($version_actions as $method => $params)
-				{
-					if ($method == 'custom')
-					{
-						$this->_call_custom_function($params, $action, $version);
-					}
-					else
-					{
-						// This way we always run the cache purge at the end of the version (done for the uninstall because the instructions are reversed, which would cause the cache purge to be run at the beginning if it was meant to run at the end).
-						if ($method == 'cache_purge')
-						{
-							$cache_purge = $params;
-							continue;
-						}
-
-						// A few things are not possible for uninstallations update actions and table_row actions
-						if (strpos($method, 'update') !== false || strpos($method, 'table_insert') !== false || strpos($method, 'table_row_') !== false)
-						{
-							continue;
-						}
-
-						// reverse function call
-						$method = str_replace(array('add', 'remove', 'temp'), array('temp', 'add', 'remove'), $method);
-						$method = str_replace(array('set', 'unset', 'temp'), array('temp', 'set', 'unset'), $method);
-
-						if (method_exists($this, $method))
-						{
-							call_user_func(array($this, $method), ((is_array($params) ? array_reverse($params) : $params)));
-						}
-					}
-				}
-
-				if ($cache_purge !== false)
-				{
-					$this->cache_purge($cache_purge);
-				}
-			}
-
-			if (!$version_select)
-			{
-				// Unset the version number
-				$this->config_remove($version_config_name);
-			}
-		}
-	}
-
-	/**
-	* Call custom function helper
-	*/
-	function _call_custom_function($functions, $action, $version)
-	{
-		if (!is_array($functions))
-		{
-			$functions = array($functions);
-		}
-
-		$return = '';
-
-		foreach ($functions as $function)
-		{
-			if (function_exists($function))
-			{
-				// Must reset before calling the function
-				$this->umil_start();
-
-				$returned = call_user_func($function, $action, $version);
-				if (is_string($returned))
-				{
-					$this->command = $this->get_output_text($returned);
-				}
-				else if (is_array($returned) && isset($returned['command']))
-				{
-					if (is_array($returned['command']))
-					{
-						$this->command = call_user_func_array(array($this, 'get_output_text'), $returned['command']);
-					}
-					else
-					{
-						$this->command = $this->get_output_text($returned['command']);
-					}
-
-					if (isset($returned['result']))
-					{
-						$this->result = $this->get_output_text($returned['result']);
-					}
-				}
-				else
-				{
-					$this->command = $this->get_output_text('UNKNOWN');
-				}
-
-				$return .= $this->umil_end() . '<br />';
-			}
-		}
-
-		return $return;
-	}
-
-	/**
-	* Multicall Helper
-	*
-	* @param mixed $function Function name to call
-	* @param mixed $params The parameters array
-	*
-	* @return bool True if we have done a multicall ($params is an array), false if not ($params is not an array)
-	*/
-	function multicall($function, $params)
-	{
-		if (is_array($params) && !empty($params))
-		{
-			foreach ($params as $param)
-			{
-				if (!is_array($param))
-				{
-					call_user_func(array($this, $function), $param);
-				}
-				else
-				{
-					call_user_func_array(array($this, $function), $param);
-				}
-			}
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Cache Purge
-	*
-	* This function is for purging either phpBB3’s data cache, authorization cache, or the styles cache.
-	*
-	* @param string $type The type of cache you want purged.  Available types: auth, imageset, template, theme.  Anything else sent will purge the forum's cache.
-	* @param int $style_id The id of the item you want purged (if the type selected is imageset/template/theme, 0 for all items in that section)
-	*/
-	function cache_purge($type = '', $style_id = 0)
-	{
-		global $auth, $cache, $user, $phpbb_root_path, $phpEx;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $type))
-		{
-			return;
-		}
-
-		$style_id = (int) $style_id;
-		$type = (string) $type; // Prevent PHP bug.
-
-		switch ($type)
-		{
-			case 'auth' :
-				$this->umil_start('AUTH_CACHE_PURGE');
-				$cache->destroy('_acl_options');
-				$auth->acl_clear_prefetch();
-
-				return $this->umil_end();
-			break;
-
-			case 'imageset' :
-				if ($style_id == 0)
-				{
-					$return = array();
-					$sql = 'SELECT imageset_id
-						FROM ' . STYLES_IMAGESET_TABLE;
-					$result = $this->db->sql_query($sql);
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						$return[] = $this->cache_purge('imageset', $row['imageset_id']);
-					}
-					$this->db->sql_freeresult($result);
-
-					return implode('<br /><br />', $return);
-				}
-				else
-				{
-					$sql = 'SELECT *
-						FROM ' . STYLES_IMAGESET_TABLE . "
-						WHERE imageset_id = $style_id";
-					$result = $this->db->sql_query($sql);
-					$imageset_row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					if (!$imageset_row)
-					{
-						$this->umil_start('IMAGESET_CACHE_PURGE', 'UNKNOWN');
-						return $this->umil_end('FAIL');
-					}
-
-					$this->umil_start('IMAGESET_CACHE_PURGE', $imageset_row['imageset_name']);
-
-					// The following is from includes/acp/acp_styles.php (edited)
-					$sql_ary = array();
-
-					$cfg_data_imageset = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/imageset.cfg");
-
-					$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . '
-						WHERE imageset_id = ' . $style_id;
-					$result = $this->db->sql_query($sql);
-
-					foreach ($cfg_data_imageset as $image_name => $value)
-					{
-						if (strpos($value, '*') !== false)
-						{
-							if (substr($value, -1, 1) === '*')
-							{
-								list($image_filename, $image_height) = explode('*', $value);
-								$image_width = 0;
-							}
-							else
-							{
-								list($image_filename, $image_height, $image_width) = explode('*', $value);
-							}
-						}
-						else
-						{
-							$image_filename = $value;
-							$image_height = $image_width = 0;
-						}
-
-						if (strpos($image_name, 'img_') === 0 && $image_filename)
-						{
-							$image_name = substr($image_name, 4);
-
-							$sql_ary[] = array(
-								'image_name'		=> (string) $image_name,
-								'image_filename'	=> (string) $image_filename,
-								'image_height'		=> (int) $image_height,
-								'image_width'		=> (int) $image_width,
-								'imageset_id'		=> (int) $style_id,
-								'image_lang'		=> '',
-							);
-						}
-					}
-
-					$sql = 'SELECT lang_dir
-						FROM ' . LANG_TABLE;
-					$result = $this->db->sql_query($sql);
-
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						if (@file_exists("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg"))
-						{
-							$cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg");
-							foreach ($cfg_data_imageset_data as $image_name => $value)
-							{
-								if (strpos($value, '*') !== false)
-								{
-									if (substr($value, -1, 1) === '*')
-									{
-										list($image_filename, $image_height) = explode('*', $value);
-										$image_width = 0;
-									}
-									else
-									{
-										list($image_filename, $image_height, $image_width) = explode('*', $value);
-									}
-								}
-								else
-								{
-									$image_filename = $value;
-									$image_height = $image_width = 0;
-								}
-
-								if (strpos($image_name, 'img_') === 0 && $image_filename)
-								{
-									$image_name = substr($image_name, 4);
-									$sql_ary[] = array(
-										'image_name'		=> (string) $image_name,
-										'image_filename'	=> (string) $image_filename,
-										'image_height'		=> (int) $image_height,
-										'image_width'		=> (int) $image_width,
-										'imageset_id'		=> (int) $style_id,
-										'image_lang'		=> (string) $row['lang_dir'],
-									);
-								}
-							}
-						}
-					}
-					$this->db->sql_freeresult($result);
-
-					$this->db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
-
-					$cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE);
-
-					return $this->umil_end();
-				}
-			break;
-			//case 'imageset' :
-
-			case 'template' :
-				if ($style_id == 0)
-				{
-					$return = array();
-					$sql = 'SELECT template_id
-						FROM ' . STYLES_TEMPLATE_TABLE;
-					$result = $this->db->sql_query($sql);
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						$return[] = $this->cache_purge('template', $row['template_id']);
-					}
-					$this->db->sql_freeresult($result);
-
-					return implode('<br /><br />', $return);
-				}
-				else
-				{
-					$sql = 'SELECT *
-						FROM ' . STYLES_TEMPLATE_TABLE . "
-						WHERE template_id = $style_id";
-					$result = $this->db->sql_query($sql);
-					$template_row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					if (!$template_row)
-					{
-						$this->umil_start('TEMPLATE_CACHE_PURGE', 'UNKNOWN');
-						return $this->umil_end('FAIL');
-					}
-
-					$this->umil_start('TEMPLATE_CACHE_PURGE', $template_row['template_name']);
-
-					// The following is from includes/acp/acp_styles.php
-					if ($template_row['template_storedb'] && file_exists("{$phpbb_root_path}styles/{$template_row['template_path']}/template/"))
-					{
-						$filelist = array('' => array());
-
-						$sql = 'SELECT template_filename, template_mtime
-							FROM ' . STYLES_TEMPLATE_DATA_TABLE . "
-							WHERE template_id = $style_id";
-						$result = $this->db->sql_query($sql);
-
-						while ($row = $this->db->sql_fetchrow($result))
-						{
-//							if (@filemtime("{$phpbb_root_path}styles/{$template_row['template_path']}/template/" . $row['template_filename']) > $row['template_mtime'])
-//							{
-								// get folder info from the filename
-								if (($slash_pos = strrpos($row['template_filename'], '/')) === false)
-								{
-									$filelist[''][] = $row['template_filename'];
-								}
-								else
-								{
-									$filelist[substr($row['template_filename'], 0, $slash_pos + 1)][] = substr($row['template_filename'], $slash_pos + 1, strlen($row['template_filename']) - $slash_pos - 1);
-								}
-//							}
-						}
-						$this->db->sql_freeresult($result);
-
-						$includes = array();
-						foreach ($filelist as $pathfile => $file_ary)
-						{
-							foreach ($file_ary as $file)
-							{
-								if (!($fp = @fopen("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file", 'r')))
-								{
-									return $this->umil_end('FILE_COULD_NOT_READ', "{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file");
-								}
-								$template_data = fread($fp, filesize("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"));
-								fclose($fp);
-
-								if (preg_match_all('#<!-- INCLUDE (.*?\.html) -->#is', $template_data, $matches))
-								{
-									foreach ($matches[1] as $match)
-									{
-										$includes[trim($match)][] = $file;
-									}
-								}
-							}
-						}
-
-						foreach ($filelist as $pathfile => $file_ary)
-						{
-							foreach ($file_ary as $file)
-							{
-								// Skip index.
-								if (strpos($file, 'index.') === 0)
-								{
-									continue;
-								}
-
-								// We could do this using extended inserts ... but that could be one
-								// heck of a lot of data ...
-								$sql_ary = array(
-									'template_id'			=> (int) $style_id,
-									'template_filename'		=> "$pathfile$file",
-									'template_included'		=> (isset($includes[$file])) ? implode(':', $includes[$file]) . ':' : '',
-									'template_mtime'		=> (int) filemtime("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"),
-									'template_data'			=> (string) file_get_contents("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"),
-								);
-
-								$sql = 'UPDATE ' . STYLES_TEMPLATE_DATA_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
-									WHERE template_id = $style_id
-										AND template_filename = '" . $this->db->sql_escape("$pathfile$file") . "'";
-								$this->db->sql_query($sql);
-							}
-						}
-						unset($filelist);
-					}
-
-					// Purge the forum's cache as well.
-					$cache->purge();
-
-					return $this->umil_end();
-				}
-			break;
-			//case 'template' :
-
-			case 'theme' :
-				if ($style_id == 0)
-				{
-					$return = array();
-					$sql = 'SELECT theme_id
-						FROM ' . STYLES_THEME_TABLE;
-					$result = $this->db->sql_query($sql);
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						$return[] = $this->cache_purge('theme', $row['theme_id']);
-					}
-					$this->db->sql_freeresult($result);
-
-					return implode('<br /><br />', $return);
-				}
-				else
-				{
-					$sql = 'SELECT *
-						FROM ' . STYLES_THEME_TABLE . "
-						WHERE theme_id = $style_id";
-					$result = $this->db->sql_query($sql);
-					$theme_row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					if (!$theme_row)
-					{
-						$this->umil_start('THEME_CACHE_PURGE', 'UNKNOWN');
-						return $this->umil_end('FAIL');
-					}
-
-					$this->umil_start('THEME_CACHE_PURGE', $theme_row['theme_name']);
-
-					// The following is from includes/acp/acp_styles.php
-					if ($theme_row['theme_storedb'] && file_exists("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css"))
-					{
-						$stylesheet = file_get_contents($phpbb_root_path . 'styles/' . $theme_row['theme_path'] . '/theme/stylesheet.css');
-
-						// Match CSS imports
-						$matches = array();
-						preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches);
-
-						if (sizeof($matches))
-						{
-							foreach ($matches[0] as $idx => $match)
-							{
-								if (!file_exists("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/{$matches[1][$idx]}"))
-								{
-									continue;
-								}
-
-								$content = trim(file_get_contents("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/{$matches[1][$idx]}"));
-								$stylesheet = str_replace($match, $content, $stylesheet);
-							}
-						}
-
-						// adjust paths
-						$db_theme_data = str_replace('./', 'styles/' . $theme_row['theme_path'] . '/theme/', $stylesheet);
-
-						// Save CSS contents
-						$sql_ary = array(
-							'theme_mtime'	=> (int) filemtime("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css"),
-							'theme_data'	=> $db_theme_data,
-						);
-
-						$sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
-							WHERE theme_id = $style_id";
-						$this->db->sql_query($sql);
-
-						$cache->destroy('sql', STYLES_THEME_TABLE);
-					}
-
-					return $this->umil_end();
-				}
-			break;
-			//case 'theme' :
-
-			default:
-				$this->umil_start('CACHE_PURGE');
-				$cache->purge();
-
-				return $this->umil_end();
-			break;
-		}
-	}
-
-	/**
-	* Config Exists
-	*
-	* This function is to check to see if a config variable exists or if it does not.
-	*
-	* @param string $config_name The name of the config setting you wish to check for.
-	* @param bool $return_result - return the config value/default if true : default false.
-	*
-	* @return bool true/false if config exists
-	*/
-	function config_exists($config_name, $return_result = false)
-	{
-		global $config, $cache;
-
-		$sql = 'SELECT *
-				FROM ' . CONFIG_TABLE . "
-				WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row)
-		{
-			if (!isset($config[$config_name]))
-			{
-				$config[$config_name] = $row['config_value'];
-
-				if (!$row['is_dynamic'])
-				{
-					$cache->destroy('config');
-				}
-			}
-
-			return ($return_result) ? $row : true;
-		}
-
-		// this should never happen, but if it does, we need to remove the config from the array
-		if (isset($config[$config_name]))
-		{
-			unset($config[$config_name]);
-			$cache->destroy('config');
-		}
-
-		return false;
-	}
-
-	/**
-	* Config Add
-	*
-	* This function allows you to add a config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to add
-	* @param mixed $config_value The value of the config setting
-	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
-	*
-	* @return result
-	*/
-	function config_add($config_name, $config_value = '', $is_dynamic = false)
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $config_name))
-		{
-			return;
-		}
-
-		$this->umil_start('CONFIG_ADD', $config_name);
-
-		if ($this->config_exists($config_name))
-		{
-			return $this->umil_end('CONFIG_ALREADY_EXISTS', $config_name);
-		}
-
-		set_config($config_name, $config_value, $is_dynamic);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Config Update
-	*
-	* This function allows you to update an existing config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to update
-	* @param mixed $config_value The value of the config setting
-	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
-	*
-	* @return result
-	*/
-	function config_update($config_name, $config_value = '', $is_dynamic = false)
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $config_name))
-		{
-			return;
-		}
-
-		$this->umil_start('CONFIG_UPDATE', $config_name);
-
-		if (!$this->config_exists($config_name))
-		{
-			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
-		}
-
-		set_config($config_name, $config_value, $is_dynamic);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Config Remove
-	*
-	* This function allows you to remove an existing config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to remove
-	*
-	* @return result
-	*/
-	function config_remove($config_name)
-	{
-		global $cache, $config;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $config_name))
-		{
-			return;
-		}
-
-		$this->umil_start('CONFIG_REMOVE', $config_name);
-
-		if (!$this->config_exists($config_name))
-		{
-			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
-		}
-
-		$sql = 'DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
-		$this->db->sql_query($sql);
-
-		unset($config[$config_name]);
-		$cache->destroy('config');
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Module Exists
-	*
-	* Check if a module exists
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
-	* @param int|string $module The module_id|module_langname you would like to check for to see if it exists
-	*/
-	function module_exists($class, $parent, $module)
-	{
-		// the main root directory should return true
-		if (!$module)
-		{
-			return true;
-		}
-
-		$class = $this->db->sql_escape($class);
-		$module = $this->db->sql_escape($module);
-
-		$parent_sql = '';
-		if ($parent !== false)
-		{
-			// Allows '' to be sent as 0
-			$parent = (!$parent) ? 0 : $parent;
-
-			if (!is_numeric($parent))
-			{
-				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-					WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-					AND module_class = '$class'";
-				$result = $this->db->sql_query($sql);
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					return false;
-				}
-
-				$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
-			}
-			else
-			{
-				$parent_sql = 'AND parent_id = ' . (int) $parent;
-			}
-		}
-
-		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-			WHERE module_class = '$class'
-			$parent_sql
-			AND " . ((is_numeric($module)) ? 'module_id = ' . (int) $module : "module_langname = '$module'");
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Module Add
-	*
-	* Add a new module
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string $parent The parent module_id|module_langname (0 for no parent)
-	* @param array $data an array of the data on the new module.  This can be setup in two different ways.
-	*	1. The "manual" way.  For inserting a category or one at a time.  It will be merged with the base array shown a bit below,
-	*		but at the least requires 'module_langname' to be sent, and, if you want to create a module (instead of just a category) you must send module_basename and module_mode.
-	* array(
-	*		'module_enabled'	=> 1,
-	*		'module_display'	=> 1,
-	*		'module_basename'	=> '',
-	*		'module_class'		=> $class,
-	*		'parent_id'			=> (int) $parent,
-	*		'module_langname'	=> '',
-	*		'module_mode'		=> '',
-	*		'module_auth'		=> '',
-	*	)
-	*	2. The "automatic" way.  For inserting multiple at a time based on the specs in the info file for the module(s).  For this to work the modules must be correctly setup in the info file.
-	*		An example follows (this would insert the settings, log, and flag modes from the includes/acp/info/acp_asacp.php file):
-	* array(
-	* 		'module_basename'	=> 'asacp',
-	* 		'modes'				=> array('settings', 'log', 'flag'),
-	* )
-	* 		Optionally you may not send 'modes' and it will insert all of the modules in that info file.
-	*  @param string|bool $include_path If you would like to use a custom include path, specify that here
-	*/
-	function module_add($class, $parent = 0, $data = array(), $include_path = false)
-	{
-		global $cache, $user, $phpbb_root_path, $phpEx;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $class))
-		{
-			return;
-		}
-
-		// Prevent stupid things like trying to add a module with no name or any data on it
-		if (empty($data))
-		{
-			$this->umil_start('MODULE_ADD', $class, 'UNKNOWN');
-			return $this->umil_end('FAIL');
-		}
-
-        // Allows '' to be sent as 0
-		$parent = (!$parent) ? 0 : $parent;
-
-		// allow sending the name as a string in $data to create a category
-		if (!is_array($data))
-		{
-			$data = array('module_langname' => $data);
-		}
-
-		if (!isset($data['module_langname']))
-		{
-			// The "automatic" way
-			$basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
-			$basename = str_replace(array('/', '\\'), '', $basename);
-			$class = str_replace(array('/', '\\'), '', $class);
-			$info_file = "$class/info/{$class}_$basename.$phpEx";
-
-			// The manual and automatic ways both failed...
-			if (!file_exists((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file))
-			{
-				$this->umil_start('MODULE_ADD', $class, $info_file);
-				return $this->umil_end('FAIL');
-			}
-
-			$classname = "{$class}_{$basename}_info";
-
-			if (!class_exists($classname))
-			{
-				include((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file);
-			}
-
-			$info = new $classname;
-			$module = $info->module();
-			unset($info);
-
-			$result = '';
-			foreach ($module['modes'] as $mode => $module_info)
-			{
-				if (!isset($data['modes']) || in_array($mode, $data['modes']))
-				{
-					$new_module = array(
-						'module_basename'	=> $basename,
-						'module_langname'	=> $module_info['title'],
-						'module_mode'		=> $mode,
-						'module_auth'		=> $module_info['auth'],
-						'module_display'	=> (isset($module_info['display'])) ? $module_info['display'] : true,
-						'before'			=> (isset($module_info['before'])) ? $module_info['before'] : false,
-						'after'				=> (isset($module_info['after'])) ? $module_info['after'] : false,
-					);
-
-					// Run the "manual" way with the data we've collected.
-					$result .= ((isset($data['spacer'])) ? $data['spacer'] : '<br />') . $this->module_add($class, $parent, $new_module);
-				}
-			}
-
-			return $result;
-		}
-
-		// The "manual" way
-		$this->umil_start('MODULE_ADD', $class, ((isset($user->lang[$data['module_langname']])) ? $user->lang[$data['module_langname']] : $data['module_langname']));
-		add_log('admin', 'LOG_MODULE_ADD', ((isset($user->lang[$data['module_langname']])) ? $user->lang[$data['module_langname']] : $data['module_langname']));
-
-		$class = $this->db->sql_escape($class);
-
-		if (!is_numeric($parent))
-		{
-			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-				WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-				AND module_class = '$class'";
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$row)
-			{
-				return $this->umil_end('PARENT_NOT_EXIST');
-			}
-
-			$parent = $data['parent_id'] = $row['module_id'];
-		}
-		else if (!$this->module_exists($class, false, $parent))
-		{
-			return $this->umil_end('PARENT_NOT_EXIST');
-		}
-
-		if ($this->module_exists($class, $parent, $data['module_langname']))
-		{
-			return $this->umil_end('MODULE_ALREADY_EXIST');
-		}
-
-		if (!class_exists('acp_modules'))
-		{
-			include($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
-			$user->add_lang('acp/modules');
-		}
-		$acp_modules = new acp_modules();
-
-		$module_data = array(
-			'module_enabled'	=> (isset($data['module_enabled'])) ? $data['module_enabled'] : 1,
-			'module_display'	=> (isset($data['module_display'])) ? $data['module_display'] : 1,
-			'module_basename'	=> (isset($data['module_basename'])) ? $data['module_basename'] : '',
-			'module_class'		=> $class,
-			'parent_id'			=> (int) $parent,
-			'module_langname'	=> (isset($data['module_langname'])) ? $data['module_langname'] : '',
-			'module_mode'		=> (isset($data['module_mode'])) ? $data['module_mode'] : '',
-			'module_auth'		=> (isset($data['module_auth'])) ? $data['module_auth'] : '',
-		);
-		$result = $acp_modules->update_module_data($module_data, true);
-
-		// update_module_data can either return a string or an empty array...
-		if (is_string($result))
-		{
-			// Error
-			$this->result = $this->get_output_text($result);
-		}
-		else
-		{
-			// Success
-
-			// Move the module if requested above/below an existing one
-			if (isset($data['before']) && $data['before'])
-			{
-				$sql = 'SELECT left_id FROM ' . MODULES_TABLE . '
-					WHERE module_class = \'' . $class . '\'
-					AND parent_id = ' . (int) $parent . '
-					AND module_langname = \'' . $this->db->sql_escape($data['before']) . '\'';
-				$this->db->sql_query($sql);
-				$to_left = $this->db->sql_fetchfield('left_id');
-
-				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE module_class = '$class'
-					AND left_id >= $to_left
-					AND left_id < {$module_data['left_id']}";
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = $to_left, right_id = " . ($to_left + 1) . "
-					WHERE module_class = '$class'
-					AND module_id = {$module_data['module_id']}";
-				$this->db->sql_query($sql);
-			}
-			else if (isset($data['after']) && $data['after'])
-			{
-				$sql = 'SELECT right_id FROM ' . MODULES_TABLE . '
-					WHERE module_class = \'' . $class . '\'
-					AND parent_id = ' . (int) $parent . '
-					AND module_langname = \'' . $this->db->sql_escape($data['after']) . '\'';
-				$this->db->sql_query($sql);
-				$to_right = $this->db->sql_fetchfield('right_id');
-
-				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE module_class = '$class'
-					AND left_id >= $to_right
-					AND left_id < {$module_data['left_id']}";
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . MODULES_TABLE . ' SET left_id = ' . ($to_right + 1) . ', right_id = ' . ($to_right + 2) . "
-					WHERE module_class = '$class'
-					AND module_id = {$module_data['module_id']}";
-				$this->db->sql_query($sql);
-			}
-		}
-
-		// Clear the Modules Cache
-		$cache->destroy("_modules_$class");
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Module Remove
-	*
-	* Remove a module
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
-	* @param int|string $module The module id|module_langname
-	* @param string|bool $include_path If you would like to use a custom include path, specify that here
-	*/
-	function module_remove($class, $parent = 0, $module = '', $include_path = false)
-	{
-		global $cache, $user, $phpbb_root_path, $phpEx;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $class))
-		{
-			return;
-		}
-
-		// Imitation of module_add's "automatic" and "manual" method so the uninstaller works from the same set of instructions for umil_auto
-		if (is_array($module))
-		{
-			if (isset($module['module_langname']))
-			{
-				// Manual Method
-				return $this->module_remove($class, $parent, $module['module_langname'], $include_path);
-			}
-
-			// Failed.
-			if (!isset($module['module_basename']))
-			{
-				$this->umil_start('MODULE_REMOVE', $class, 'UNKNOWN');
-				return $this->umil_end('FAIL');
-			}
-
-			// Automatic method
-			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
-			$class = str_replace(array('/', '\\'), '', $class);
-			$info_file = "$class/info/{$class}_$basename.$phpEx";
-
-			if (!file_exists((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file))
-			{
-				$this->umil_start('MODULE_REMOVE', $class, $info_file);
-				return $this->umil_end('FAIL');
-			}
-
-			$classname = "{$class}_{$basename}_info";
-
-			if (!class_exists($classname))
-			{
-				include((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file);
-			}
-
-			$info = new $classname;
-			$module_info = $info->module();
-			unset($info);
-
-			$result = '';
-			foreach ($module_info['modes'] as $mode => $info)
-			{
-				if (!isset($module['modes']) || in_array($mode, $module['modes']))
-				{
-					$result .= $this->module_remove($class, $parent, $info['title']) . '<br />';
-				}
-			}
-			return $result;
-		}
-		else
-		{
-			$class = $this->db->sql_escape($class);
-
-			if (!$this->module_exists($class, $parent, $module))
-			{
-				$this->umil_start('MODULE_REMOVE', $class, ((isset($user->lang[$module])) ? $user->lang[$module] : $module));
-				return $this->umil_end('MODULE_NOT_EXIST');
-			}
-
-			$parent_sql = '';
-			if ($parent !== false)
-			{
-				// Allows '' to be sent as 0
-				$parent = (!$parent) ? 0 : $parent;
-
-				if (!is_numeric($parent))
-				{
-					$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-						WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-						AND module_class = '$class'";
-					$result = $this->db->sql_query($sql);
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					// we know it exists from the module_exists check
-					$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
-				}
-				else
-				{
-					$parent_sql = 'AND parent_id = ' . (int) $parent;
-				}
-			}
-
-			$module_ids = array();
-			if (!is_numeric($module))
-			{
-				$module = $this->db->sql_escape($module);
-				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-					WHERE module_langname = '$module'
-					AND module_class = '$class'
-					$parent_sql";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$module_ids[] = (int) $row['module_id'];
-				}
-				$this->db->sql_freeresult($result);
-
-				$module_name = $module;
-			}
-			else
-			{
-				$module = (int) $module;
-				$sql = 'SELECT module_langname FROM ' . MODULES_TABLE . "
-					WHERE module_id = $module
-					AND module_class = '$class'
-					$parent_sql";
-				$result = $this->db->sql_query($sql);
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$module_name = $row['module_langname'];
-				$module_ids[] = $module;
-			}
-
-			$this->umil_start('MODULE_REMOVE', $class, ((isset($user->lang[$module_name])) ? $user->lang[$module_name] : $module_name));
-			add_log('admin', 'LOG_MODULE_REMOVED', ((isset($user->lang[$module_name])) ? $user->lang[$module_name] : $module_name));
-
-			if (!class_exists('acp_modules'))
-			{
-				include($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
-				$user->add_lang('acp/modules');
-			}
-			$acp_modules = new acp_modules();
-			$acp_modules->module_class = $class;
-
-			foreach ($module_ids as $module_id)
-			{
-				$result = $acp_modules->delete_module($module_id);
-				if (!empty($result))
-				{
-					if ($this->result == ((isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS'))
-					{
-						$this->result = implode('<br />', $result);
-					}
-					else
-					{
-						$this->result .= '<br />' . implode('<br />', $result);
-					}
-				}
-			}
-
-			$cache->destroy("_modules_$class");
-
-			return $this->umil_end();
-		}
-	}
-
-	/**
-	* Permission Exists
-	*
-	* Check if a permission (auth) setting exists
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
-	* @return bool true if it exists, false if not
-	*/
-	function permission_exists($auth_option, $global = true)
-	{
-		if ($global)
-		{
-			$type_sql = ' AND is_global = 1';
-		}
-		else
-		{
-			$type_sql = ' AND is_local = 1';
-		}
-
-		$sql = 'SELECT auth_option_id
-				FROM ' . ACL_OPTIONS_TABLE . "
-				WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'"
-				. $type_sql;
-		$result = $this->db->sql_query($sql);
-
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Permission Add
-	*
-	* Add a permission (auth) option
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
-	* @return result
-	*/
-	function permission_add($auth_option, $global = true)
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $auth_option))
-		{
-			return;
-		}
-
-		$this->umil_start('PERMISSION_ADD', $auth_option);
-
-		if ($this->permission_exists($auth_option, $global))
-		{
-			return $this->umil_end('PERMISSION_ALREADY_EXISTS', $auth_option);
-		}
-
-		// We've added permissions, so set to true to notify the user.
-		$this->permissions_added = true;
-
-		if (!class_exists('auth_admin'))
-		{
-			global $phpbb_root_path, $phpEx;
-
-			include($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
-		}
-		$auth_admin = new auth_admin();
-
-		// We have to add a check to see if the !$global (if global, local, and if local, global) permission already exists.  If it does, acl_add_option currently has a bug which would break the ACL system, so we are having a work-around here.
-		if ($this->permission_exists($auth_option, !$global))
-		{
-			$sql_ary = array(
-				'is_global'	=> 1,
-				'is_local'	=> 1,
-			);
-			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE auth_option = \'' . $this->db->sql_escape($auth_option) . "'";
-			$this->db->sql_query($sql);
-		}
-		else
-		{
-			if ($global)
-			{
-				$auth_admin->acl_add_option(array('global' => array($auth_option)));
-			}
-			else
-			{
-				$auth_admin->acl_add_option(array('local' => array($auth_option)));
-			}
-		}
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Permission Remove
-	*
-	* Remove a permission (auth) option
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
-	* @return result
-	*/
-	function permission_remove($auth_option, $global = true)
-	{
-		global $auth, $cache;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $auth_option))
-		{
-			return;
-		}
-
-		$this->umil_start('PERMISSION_REMOVE', $auth_option);
-
-		if (!$this->permission_exists($auth_option, $global))
-		{
-			return $this->umil_end('PERMISSION_NOT_EXIST', $auth_option);
-		}
-
-		if ($global)
-		{
-			$type_sql = ' AND is_global = 1';
-		}
-		else
-		{
-			$type_sql = ' AND is_local = 1';
-		}
-		$sql = 'SELECT auth_option_id, is_global, is_local FROM ' . ACL_OPTIONS_TABLE . "
-			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'" .
-			$type_sql;
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		$id = $row['auth_option_id'];
-
-		// If it is a local and global permission, do not remove the row! :P
-		if ($row['is_global'] && $row['is_local'])
-		{
-			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
-				SET ' . (($global) ? 'is_global = 0' : 'is_local = 0') . '
-				WHERE auth_option_id = ' . $id;
-			$this->db->sql_query($sql);
-		}
-		else
-		{
-			// Delete time
-			$this->db->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $id);
-		}
-
-		// Purge the auth cache
-		$cache->destroy('_acl_options');
-		$auth->acl_clear_prefetch();
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Add a new permission role
-	*
-	* @param string $role_name The new role name
-	* @param sting $role_type The type (u_, m_, a_)
-	*/
-	function permission_role_add($role_name, $role_type = '', $role_description = '')
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $role_name))
-		{
-			return;
-		}
-
-		$this->umil_start('PERMISSION_ROLE_ADD', $role_name);
-
-		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
-		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
-
-		if ($role_id)
-		{
-			return $this->umil_end('ROLE_ALREADY_EXISTS', $old_role_name);
-		}
-
-		$sql = 'SELECT MAX(role_order) AS max FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_type = \'' . $this->db->sql_escape($role_type) . '\'';
-		$this->db->sql_query($sql);
-		$role_order = $this->db->sql_fetchfield('max');
-		$role_order = (!$role_order) ? 1 : $role_order + 1;
-
-		$sql_ary = array(
-			'role_name'			=> $role_name,
-			'role_description'	=> $role_description,
-			'role_type'			=> $role_type,
-			'role_order'		=> $role_order,
-		);
-
-		$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
-		$this->db->sql_query($sql);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Update the name on a permission role
-	*
-	* @param string $old_role_name The old role name
-	* @param string $new_role_name The new role name
-	*/
-	function permission_role_update($old_role_name, $new_role_name = '')
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $role_name))
-		{
-			return;
-		}
-
-		$this->umil_start('PERMISSION_ROLE_UPDATE', $old_role_name);
-
-		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
-		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
-
-		if (!$role_id)
-		{
-			return $this->umil_end('ROLE_NOT_EXIST', $old_role_name);
-		}
-
-		$sql = 'UPDATE ' . ACL_ROLES_TABLE . '
-			SET role_name = \'' . $this->db->sql_escape($new_role_name) . '\'
-			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
-		$this->db->sql_query($sql);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Remove a permission role
-	*
-	* @param string $role_name The role name to remove
-	*/
-	function permission_role_remove($role_name)
-	{
-		global $auth;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $role_name))
-		{
-			return;
-		}
-
-		$this->umil_start('PERMISSION_ROLE_REMOVE', $role_name);
-
-		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
-		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
-
-		if (!$role_id)
-		{
-			return $this->umil_end('ROLE_NOT_EXIST', $role_name);
-		}
-
-		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-			WHERE role_id = ' . $role_id;
-		$this->db->sql_query($sql);
-
-		$sql = 'DELETE FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_id = ' . $role_id;
-		$this->db->sql_query($sql);
-
-		$auth->acl_clear_prefetch();
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Permission Set
-	*
-	* Allows you to set permissions for a certain group/role
-	*
-	* @param string $name The name of the role/group
-	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
-	* @param string $type The type (role|group)
-	* @param bool $has_permission True if you want to give them permission, false if you want to deny them permission
-	*/
-	function permission_set($name, $auth_option = array(), $type = 'role', $has_permission = true)
-	{
-		global $auth;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $name))
-		{
-			return;
-		}
-
-		if (!is_array($auth_option))
-		{
-			$auth_option = array($auth_option);
-		}
-
-		$new_auth = array();
-		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$new_auth[] = $row['auth_option_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!sizeof($new_auth))
-		{
-			return false;
-		}
-
-		$current_auth = array();
-
-		$type = (string) $type; // Prevent PHP bug.
-
-		switch ($type)
-		{
-			case 'role' :
-				$this->umil_start('PERMISSION_SET_ROLE', $name);
-
-				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('role_id');
-
-				if (!$role_id)
-				{
-					return $this->umil_end('ROLE_NOT_EXIST');
-				}
-
-				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_ROLES_DATA_TABLE . '
-					WHERE role_id = ' . $role_id;
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
-				}
-				$this->db->sql_freeresult($result);
-			break;
-
-			case 'group' :
-				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . ' WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$group_id = $this->db->sql_fetchfield('group_id');
-
-				if (!$group_id)
-				{
-					$this->umil_start('PERMISSION_SET_GROUP', $name);
-					return $this->umil_end('GROUP_NOT_EXIST');
-				}
-
-				// If the group has a role set for them we will add the requested permissions to that role.
-				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id . '
-					AND auth_role_id <> 0
-					AND forum_id = 0';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('auth_role_id');
-				if ($role_id)
-				{
-					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
-						WHERE role_id = ' . $role_id;
-					$this->db->sql_query($sql);
-					$role_name = $this->db->sql_fetchfield('role_name');
-
-					return $this->permission_set($role_name, $auth_option, 'role', $has_permission);
-				}
-
-				$this->umil_start('PERMISSION_SET_GROUP', $name);
-
-				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id;
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
-				}
-				$this->db->sql_freeresult($result);
-			break;
-		}
-
-		$sql_ary = array();
-		switch ($type)
-		{
-			case 'role' :
-				foreach ($new_auth as $auth_option_id)
-				{
-					if (!isset($current_auth[$auth_option_id]))
-					{
-						$sql_ary[] = array(
-							'role_id'			=> $role_id,
-							'auth_option_id'	=> $auth_option_id,
-							'auth_setting'		=> $has_permission,
-				        );
-					}
-				}
-
-				$this->db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary);
-			break;
-
-			case 'group' :
-				foreach ($new_auth as $auth_option_id)
-				{
-					if (!isset($current_auth[$auth_option_id]))
-					{
-						$sql_ary[] = array(
-							'group_id'			=> $group_id,
-							'auth_option_id'	=> $auth_option_id,
-							'auth_setting'		=> $has_permission,
-				        );
-					}
-				}
-
-				$this->db->sql_multi_insert(ACL_GROUPS_TABLE, $sql_ary);
-			break;
-		}
-
-		$auth->acl_clear_prefetch();
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Permission Unset
-	*
-	* Allows you to unset (remove) permissions for a certain group/role
-	*
-	* @param string $name The name of the role/group
-	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
-	* @param string $type The type (role|group)
-	*/
-	function permission_unset($name, $auth_option = array(), $type = 'role')
-	{
-		global $auth;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $name))
-		{
-			return;
-		}
-
-		if (!is_array($auth_option))
-		{
-			$auth_option = array($auth_option);
-		}
-
-		$to_remove = array();
-		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$to_remove[] = $row['auth_option_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!sizeof($to_remove))
-		{
-			return false;
-		}
-
-		$type = (string) $type; // Prevent PHP bug.
-
-		switch ($type)
-		{
-			case 'role' :
-				$this->umil_start('PERMISSION_UNSET_ROLE', $name);
-
-				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('role_id');
-
-				if (!$role_id)
-				{
-					return $this->umil_end('ROLE_NOT_EXIST');
-				}
-
-				$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
-				$this->db->sql_query($sql);
-			break;
-
-			case 'group' :
-				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . ' WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$group_id = $this->db->sql_fetchfield('group_id');
-
-				if (!$group_id)
-				{
-					$this->umil_start('PERMISSION_UNSET_GROUP', $name);
-					return $this->umil_end('GROUP_NOT_EXIST');
-				}
-
-				// If the group has a role set for them we will remove the requested permissions from that role.
-				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id . '
-					AND auth_role_id <> 0';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('auth_role_id');
-				if ($role_id)
-				{
-					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
-						WHERE role_id = ' . $role_id;
-					$this->db->sql_query($sql);
-					$role_name = $this->db->sql_fetchfield('role_name');
-
-					return $this->permission_unset($role_name, $auth_option, 'role');
-				}
-
-				$this->umil_start('PERMISSION_UNSET_GROUP', $name);
-
-				$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
-					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
-				$this->db->sql_query($sql);
-			break;
-		}
-
-		$auth->acl_clear_prefetch();
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Exists
-	*
-	* Check if a table exists in the DB or not
-	*
-	* @param string $table_name The table name to check for
-	*
-	* @return bool true if the table exists, false if not
-	*/
-	function table_exists($table_name)
-	{
-		$this->get_table_name($table_name);
-
-		// Use sql_table_exists if available
-		if (method_exists($this->db_tools, 'sql_table_exists'))
-		{
-			$roe = $this->db->return_on_error;
-			$result = $this->db_tools->sql_table_exists($table_name);
-
-			// db_tools::sql_table_exists resets the return_on_error to false always after completing, so we must make sure we set it to true again if it was before
-			if ($roe)
-			{
-				$this->db->sql_return_on_error(true);
-			}
-
-			return $result;
-		}
-
-		if (!function_exists('get_tables'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include($phpbb_root_path . 'includes/functions_install.' . $phpEx);
-		}
-
-		$tables = get_tables($this->db);
-
-		if (in_array($table_name, $tables))
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	* Table Add
-	*
-	* This only supports input from the array format of db_tools or create_schema_files.
-	*/
-	function table_add($table_name, $table_data = array())
-	{
-		global $dbms, $user;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		/**
-		* $table_data can be empty when uninstalling a mod and table_remove was used, but no 2rd argument was given.
-		* In that case we'll assume that it was a column previously added by the mod (if not the author should specify a 2rd argument) and skip this to prevent an error
-		*/
-		if (empty($table_data))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_ADD', $table_name);
-
-		if ($this->table_exists($table_name))
-		{
-			return $this->umil_end('TABLE_ALREADY_EXISTS', $table_name);
-		}
-
-		if (!is_array($table_data))
-		{
-			return $this->umil_end('NO_TABLE_DATA');
-		}
-
-		if (!function_exists('get_available_dbms'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include("{$phpbb_root_path}includes/functions_install.$phpEx");
-		}
-
-		/*
-		* This function has had numerous problems and is currently broken, so until phpBB uses it I will not be anymore
-		if (method_exists($this->db_tools, 'sql_create_table'))
-		{
-			// Added in 3.0.5
-			$this->db_tools->sql_create_table($table_name, $table_data);
-		}
-		else
-		{*/
-			$available_dbms = get_available_dbms($dbms);
-
-			$sql_query = $this->create_table_sql($table_name, $table_data);
-			$sql_query = split_sql_file($sql_query, $available_dbms[$dbms]['DELIM']);
-
-			foreach ($sql_query as $sql)
-			{
-				$this->db->sql_query($sql);
-			}
-		//}
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Remove
-	*
-	* Delete/Drop a DB table
-	*/
-	function table_remove($table_name)
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_REMOVE', $table_name);
-
-		if (!$this->table_exists($table_name))
-		{
-			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
-		}
-
-		if (method_exists($this->db_tools, 'sql_table_drop'))
-		{
-			// Added in 3.0.5
-			$this->db_tools->sql_table_drop($table_name);
-		}
-		else
-		{
-			$this->db->sql_query('DROP TABLE ' . $table_name);
-		}
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Column Exists
-	*
-	* Check to see if a column exists in a table
-	*/
-	function table_column_exists($table_name, $column_name)
-	{
-		$this->get_table_name($table_name);
-
-		return $this->db_tools->sql_column_exists($table_name, $column_name);
-	}
-
-	/**
-	* Table Column Add
-	*
-	* Add a new column to a table.
-	*/
-	function table_column_add($table_name, $column_name = '', $column_data = array())
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		/**
-		* $column_data can be empty when uninstalling a mod and table_column_remove was used, but no 3rd argument was given.
-		* In that case we'll assume that it was a column previously added by the mod (if not the author should specify a 3rd argument) and skip this to prevent an error
-		*/
-		if (empty($column_data))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_COLUMN_ADD', $table_name, $column_name);
-
-		if ($this->table_column_exists($table_name, $column_name))
-		{
-			return $this->umil_end('TABLE_COLUMN_ALREADY_EXISTS', $table_name, $column_name);
-		}
-
-		$this->db_tools->sql_column_add($table_name, $column_name, $column_data);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Column Update
-	*
-	* Alter/Update a column in a table.  You can not change a column name with this.
-	*/
-	function table_column_update($table_name, $column_name = '', $column_data = array())
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_COLUMN_UPDATE', $table_name, $column_name);
-
-		if (!$this->table_column_exists($table_name, $column_name))
-		{
-			return $this->umil_end('TABLE_COLUMN_NOT_EXIST', $table_name, $column_name);
-		}
-
-		$this->db_tools->sql_column_change($table_name, $column_name, $column_data);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Column Remove
-	*
-	* Remove a column from a table
-	*/
-	function table_column_remove($table_name, $column_name = '')
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_COLUMN_REMOVE', $table_name, $column_name);
-
-		if (!$this->table_column_exists($table_name, $column_name))
-		{
-			return $this->umil_end('TABLE_COLUMN_NOT_EXIST', $table_name, $column_name);
-		}
-
-		$this->db_tools->sql_column_remove($table_name, $column_name);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Index Exists
-	*
-	* Check if a table key/index exists on a table (can not check primary or unique)
-	*/
-	function table_index_exists($table_name, $index_name)
-	{
-		$this->get_table_name($table_name);
-
-		$indexes = $this->db_tools->sql_list_index($table_name);
-
-		if (in_array($index_name, $indexes))
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Table Index Add
-	*
-	* Add a new key/index to a table
-	*/
-	function table_index_add($table_name, $index_name = '', $column = array())
-	{
-		global $config;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		// Let them skip the column field and just use the index name in that case as the column as well
-		if (empty($column))
-		{
-			$column = array($index_name);
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_KEY_ADD', $table_name, $index_name);
-
-		if ($this->table_index_exists($table_name, $index_name))
-		{
-			return $this->umil_end('TABLE_KEY_ALREADY_EXIST', $table_name, $index_name);
-		}
-
-		if (!is_array($column))
-		{
-			$column = array($column);
-		}
-
-		// remove index length if we are before 3.0.8
-		// the feature (required for some types when using MySQL4)
-		// was added in that release (ticket PHPBB3-8944)
-		if (version_compare($config['version'], '3.0.7-pl1', '<='))
-		{
-			$column = preg_replace('#:.*$#', '', $column);
-		}
-
-		$this->db_tools->sql_create_index($table_name, $index_name, $column);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Index Remove
-	*
-	* Remove a key/index from a table
-	*/
-	function table_index_remove($table_name, $index_name = '')
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_KEY_REMOVE', $table_name, $index_name);
-
-		if (!$this->table_index_exists($table_name, $index_name))
-		{
-			return $this->umil_end('TABLE_KEY_NOT_EXIST', $table_name, $index_name);
-		}
-
-		$this->db_tools->sql_index_drop($table_name, $index_name);
-
-		return $this->umil_end();
-	}
-
-	// Ignore, function was renamed to table_row_insert and keeping for backwards compatibility
-	function table_insert($table_name, $data = array()) { $this->table_row_insert($table_name, $data); }
-
-	/**
-	* Table Insert
-	*
-	* Insert data into a table
-	*/
-	function table_row_insert($table_name, $data = array())
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_ROW_INSERT_DATA', $table_name);
-
-		if (!$this->table_exists($table_name))
-		{
-			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
-		}
-
-		$this->db->sql_multi_insert($table_name, $data);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Row Update
-	*
-	* Update a row in a table
-	*
-	* $data should be an array with the column names as keys and values as the items to check for each column.  Example:
-	* array('user_id' => 123, 'user_name' => 'test user') would become:
-	* WHERE user_id = 123 AND user_name = 'test user'
-	*
-	* $new_data is the new data it will be updated to (same format as you'd enter into $db->sql_build_array('UPDATE' ).
-	*/
-	function table_row_update($table_name, $data = array(), $new_data = array())
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		if (!sizeof($data))
-		{
-			return $this->umil_end('FAIL');
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_ROW_UPDATE_DATA', $table_name);
-
-		if (!$this->table_exists($table_name))
-		{
-			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
-		}
-
-		$sql = 'UPDATE ' . $table_name . '
-			SET ' . $this->db->sql_build_array('UPDATE', $new_data) . '
-			WHERE ' . $this->db->sql_build_array('SELECT', $data);
-		$this->db->sql_query($sql);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Row Remove
-	*
-	* Remove a row from a table
-	*
-	* $data should be an array with the column names as keys and values as the items to check for each column.  Example:
-	* array('user_id' => 123, 'user_name' => 'test user') would become:
-	* WHERE user_id = 123 AND user_name = 'test user'
-	*/
-	function table_row_remove($table_name, $data = array())
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		if (!sizeof($data))
-		{
-			return $this->umil_end('FAIL');
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_ROW_REMOVE_DATA', $table_name);
-
-		if (!$this->table_exists($table_name))
-		{
-			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
-		}
-
-		$sql = 'DELETE FROM ' . $table_name . ' WHERE ' . $this->db->sql_build_array('SELECT', $data);
-		$this->db->sql_query($sql);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Version Checker
-	*
-	* Format the file like the following:
-	* http://www.phpbb.com/updatecheck/30x.txt
-	*
-	* @param string $url The url to access (ex: www.phpbb.com)
-	* @param string $path The path to access (ex: /updatecheck)
-	* @param string $file The name of the file to access (ex: 30x.txt)
-	*
-	* @return array|string Error Message if there was any error, or an array (each line in the file as a value)
-	*/
-	function version_check($url, $path, $file, $timeout = 10, $port = 80)
-	{
-		if (!function_exists('get_remote_file'))
-		{
-			global $phpbb_root_path, $phpEx;
-
-			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
-		}
-
-		$errstr = $errno = '';
-
-		$info = get_remote_file($url, $path, $file, $errstr, $errno, $port, $timeout);
-
-		if ($info === false)
-		{
-			return $errstr . ' [ ' . $errno . ' ]';
-		}
-
-		$info = str_replace("\r\n", "\n", $info);
-		$info = explode("\n", $info);
-
-		return $info;
-	}
-
-	/**
-	* Create table SQL
-	*
-	* Create the SQL query for the specified DBMS on the fly from a create_schema_files type of table array
-	*
-	* @param string $table_name The name of the table
-	* @param array $table_data The table data (formatted in the array format used by create_schema_files)
-	* @param string $dbms The dbms this will be built for (for testing only, leave blank to use the current DBMS)
-	*
-	* @return The sql query to run for the submitted dbms to insert the table
-	*/
-	function create_table_sql($table_name, $table_data, $dbms = '')
-	{
-		// To allow testing
-		$dbms = ($dbms) ? $dbms : $this->db_tools->sql_layer;
-
-		// A list of types being unsigned for better reference in some db's
-		$unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
-		$supported_dbms = array('firebird', 'mssql', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite');
-
-		$sql = '';
-
-		// Create Table statement
-		$generator = $textimage = false;
-
-		switch ($dbms)
-		{
-			case 'mysql_40':
-			case 'mysql_41':
-			case 'firebird':
-			case 'oracle':
-			case 'sqlite':
-			case 'postgres':
-				$sql .= "CREATE TABLE {$table_name} (\n";
-			break;
-
-			case 'mssql':
-				$sql .= "CREATE TABLE [{$table_name}] (\n";
-			break;
-		}
-
-		// Table specific so we don't get overlap
-		$modded_array = array();
-
-		// Write columns one by one...
-		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
-		{
-			// Get type
-			if (strpos($column_data[0], ':') !== false)
-			{
-				list($orig_column_type, $column_length) = explode(':', $column_data[0]);
-				if (!is_array($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']))
-				{
-					$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'], $column_length);
-				}
-				else
-				{
-					if (isset($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule']))
-					{
-						switch ($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule'][0])
-						{
-							case 'div':
-								$column_length /= $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule'][1];
-								$column_length = ceil($column_length);
-								$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length);
-							break;
-						}
-					}
-
-					if (isset($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit']))
-					{
-						switch ($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][0])
-						{
-							case 'mult':
-								$column_length *= $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][1];
-								if ($column_length > $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][2])
-								{
-									$column_type = $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][3];
-									$modded_array[$column_name] = $column_type;
-								}
-								else
-								{
-									$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length);
-								}
-							break;
-						}
-					}
-				}
-				$orig_column_type .= ':';
-			}
-			else
-			{
-				$orig_column_type = $column_data[0];
-				$column_type = $this->db_tools->dbms_type_map[$dbms][$column_data[0]];
-				if ($column_type == 'text' || $column_type == 'blob')
-				{
-					$modded_array[$column_name] = $column_type;
-				}
-			}
-
-			// Adjust default value if db-dependant specified
-			if (is_array($column_data[1]))
-			{
-				$column_data[1] = (isset($column_data[1][$dbms])) ? $column_data[1][$dbms] : $column_data[1]['default'];
-			}
-
-			switch ($dbms)
-			{
-				case 'mysql_40':
-				case 'mysql_41':
-					$sql .= "\t{$column_name} {$column_type} ";
-
-					// For hexadecimal values do not use single quotes
-					if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
-					{
-						$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
-					}
-					$sql .= 'NOT NULL';
-
-					if (isset($column_data[2]))
-					{
-						if ($column_data[2] == 'auto_increment')
-						{
-							$sql .= ' auto_increment';
-						}
-						else if ($dbms === 'mysql_41' && $column_data[2] == 'true_sort')
-						{
-							$sql .= ' COLLATE utf8_unicode_ci';
-						}
-					}
-
-					$sql .= ",\n";
-				break;
-
-				case 'sqlite':
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-					{
-						$sql .= "\t{$column_name} INTEGER PRIMARY KEY ";
-						$generator = $column_name;
-					}
-					else
-					{
-						$sql .= "\t{$column_name} {$column_type} ";
-					}
-
-					$sql .= 'NOT NULL ';
-					$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
-					$sql .= ",\n";
-				break;
-
-				case 'firebird':
-					$sql .= "\t{$column_name} {$column_type} ";
-
-					if (!is_null($column_data[1]))
-					{
-						$sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
-					}
-
-					$sql .= 'NOT NULL';
-
-					// This is a UNICODE column and thus should be given it's fair share
-					if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0]))
-					{
-						$sql .= ' COLLATE UNICODE';
-					}
-
-					$sql .= ",\n";
-
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-					{
-						$generator = $column_name;
-					}
-				break;
-
-				case 'mssql':
-					if ($column_type == '[text]')
-					{
-						$textimage = true;
-					}
-
-					$sql .= "\t[{$column_name}] {$column_type} ";
-
-					if (!is_null($column_data[1]))
-					{
-						// For hexadecimal values do not use single quotes
-						if (strpos($column_data[1], '0x') === 0)
-						{
-							$sql .= 'DEFAULT (' . $column_data[1] . ') ';
-						}
-						else
-						{
-							$sql .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
-						}
-					}
-
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-					{
-						$sql .= 'IDENTITY (1, 1) ';
-					}
-
-					$sql .= 'NOT NULL';
-					$sql .= " ,\n";
-				break;
-
-				case 'oracle':
-					$sql .= "\t{$column_name} {$column_type} ";
-					$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
-
-					// In Oracle empty strings ('') are treated as NULL.
-					// Therefore in oracle we allow NULL's for all DEFAULT '' entries
-					$sql .= ($column_data[1] === '') ? ",\n" : "NOT NULL,\n";
-
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-					{
-						$generator = $column_name;
-					}
-				break;
-
-				case 'postgres':
-					$sql .= "\t{$column_name} {$column_type} ";
-
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-					{
-						$sql .= "DEFAULT nextval('{$table_name}_seq'),\n";
-
-						// Make sure the sequence will be created before creating the table
-						$sql = "CREATE SEQUENCE {$table_name}_seq;\n\n" . $sql;
-					}
-					else
-					{
-						$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
-						$sql .= "NOT NULL";
-
-						// Unsigned? Then add a CHECK contraint
-						if (in_array($orig_column_type, $unsigned_types))
-						{
-							$sql .= " CHECK ({$column_name} >= 0)";
-						}
-
-						$sql .= ",\n";
-					}
-				break;
-			}
-		}
-
-		switch ($dbms)
-		{
-			case 'firebird':
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n);;\n\n";
-			break;
-
-			case 'mssql':
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n) ON [PRIMARY]" . (($textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '') . "\n";
-				$sql .= "GO\n\n";
-			break;
-		}
-
-		// Write primary key
-		if (isset($table_data['PRIMARY_KEY']))
-		{
-			if (!is_array($table_data['PRIMARY_KEY']))
-			{
-				$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
-			}
-
-			switch ($dbms)
-			{
-				case 'mysql_40':
-				case 'mysql_41':
-				case 'postgres':
-					$sql .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
-				break;
-
-				case 'firebird':
-					$sql .= "ALTER TABLE {$table_name} ADD PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ");;\n\n";
-				break;
-
-				case 'sqlite':
-					if ($generator === false || !in_array($generator, $table_data['PRIMARY_KEY']))
-					{
-						$sql .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
-					}
-				break;
-
-				case 'mssql':
-					$sql .= "ALTER TABLE [{$table_name}] WITH NOCHECK ADD \n";
-					$sql .= "\tCONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED \n";
-					$sql .= "\t(\n";
-					$sql .= "\t\t[" . implode("],\n\t\t[", $table_data['PRIMARY_KEY']) . "]\n";
-					$sql .= "\t)  ON [PRIMARY] \n";
-					$sql .= "GO\n\n";
-				break;
-
-				case 'oracle':
-					$sql .= "\tCONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
-				break;
-			}
-		}
-
-		switch ($dbms)
-		{
-			case 'oracle':
-				// UNIQUE contrains to be added?
-				if (isset($table_data['KEYS']))
-				{
-					foreach ($table_data['KEYS'] as $key_name => $key_data)
-					{
-						if (!is_array($key_data[1]))
-						{
-							$key_data[1] = array($key_data[1]);
-						}
-
-						if ($key_data[0] == 'UNIQUE')
-						{
-							$sql .= "\tCONSTRAINT u_phpbb_{$key_name} UNIQUE (" . implode(', ', $key_data[1]) . "),\n";
-						}
-					}
-				}
-
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n)\n/\n\n";
-			break;
-
-			case 'postgres':
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n);\n\n";
-			break;
-
-			case 'sqlite':
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n);\n\n";
-			break;
-		}
-
-		// Write Keys
-		if (isset($table_data['KEYS']))
-		{
-			foreach ($table_data['KEYS'] as $key_name => $key_data)
-			{
-				if (!is_array($key_data[1]))
-				{
-					$key_data[1] = array($key_data[1]);
-				}
-
-				switch ($dbms)
-				{
-					case 'mysql_40':
-					case 'mysql_41':
-						$sql .= ($key_data[0] == 'INDEX') ? "\tKEY" : '';
-						$sql .= ($key_data[0] == 'UNIQUE') ? "\tUNIQUE" : '';
-						foreach ($key_data[1] as $key => $col_name)
-						{
-							if (isset($modded_array[$col_name]))
-							{
-								switch ($modded_array[$col_name])
-								{
-									case 'text':
-									case 'blob':
-										$key_data[1][$key] = $col_name . '(255)';
-									break;
-								}
-							}
-						}
-						$sql .= ' ' . $key_name . ' (' . implode(', ', $key_data[1]) . "),\n";
-					break;
-
-					case 'firebird':
-						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
-						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
-
-						$sql .= ' ' . $table_name . '_' . $key_name . ' ON ' . $table_name . '(' . implode(', ', $key_data[1]) . ");;\n";
-					break;
-
-					case 'mssql':
-						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE  INDEX' : '';
-						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE  UNIQUE  INDEX' : '';
-						$sql .= " [{$key_name}] ON [{$table_name}]([" . implode('], [', $key_data[1]) . "]) ON [PRIMARY]\n";
-						$sql .= "GO\n\n";
-					break;
-
-					case 'oracle':
-						if ($key_data[0] == 'UNIQUE')
-						{
-							continue;
-						}
-
-						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
-
-						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ")\n";
-						$sql .= "/\n";
-					break;
-
-					case 'sqlite':
-						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
-						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
-
-						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n";
-					break;
-
-					case 'postgres':
-						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
-						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
-
-						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n";
-					break;
-				}
-			}
-		}
-
-		switch ($dbms)
-		{
-			case 'mysql_40':
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n);\n\n";
-			break;
-
-			case 'mysql_41':
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n) CHARACTER SET utf8 COLLATE utf8_bin;\n\n";
-			break;
-
-			// Create Generator
-			case 'firebird':
-				if ($generator !== false)
-				{
-					$sql .= "\nCREATE GENERATOR {$table_name}_gen;;\n";
-					$sql .= 'SET GENERATOR ' . $table_name . "_gen TO 0;;\n\n";
-
-					$sql .= 'CREATE TRIGGER t_' . $table_name . ' FOR ' . $table_name . "\n";
-					$sql .= "BEFORE INSERT\nAS\nBEGIN\n";
-					$sql .= "\tNEW.{$generator} = GEN_ID({$table_name}_gen, 1);\nEND;;\n\n";
-				}
-			break;
-
-			case 'oracle':
-				if ($generator !== false)
-				{
-					$sql .= "\nCREATE SEQUENCE {$table_name}_seq\n/\n\n";
-
-					$sql .= "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
-					$sql .= "BEFORE INSERT ON {$table_name}\n";
-					$sql .= "FOR EACH ROW WHEN (\n";
-					$sql .= "\tnew.{$generator} IS NULL OR new.{$generator} = 0\n";
-					$sql .= ")\nBEGIN\n";
-					$sql .= "\tSELECT {$table_name}_seq.nextval\n";
-					$sql .= "\tINTO :new.{$generator}\n";
-					$sql .= "\tFROM dual;\nEND;\n/\n\n";
-				}
-			break;
-		}
-
-		return $sql;
-	}
-
-	/**
-	* Get the real table name
-	* By A_Jelly_Doughnut
-	*
-	* @param string $table_name The table name to get the real table name from
-	*/
-	function get_table_name(&$table_name)
-	{
-		// Use the global table prefix if a custom one is not specified
-		if ($this->table_prefix === false)
-		{
-			global $table_prefix;
-		}
-		else
-		{
-			$table_prefix = $this->table_prefix;
-		}
-
-		static $constants = NULL;
-
-		if (is_null($constants))
-		{
-			$constants = get_defined_constants();
-		}
-
-		/**
-		* only do the replace if the table prefix is not already present
-		* this is required since UMIL supports specifying a table via phpbb_foo
-		* (where a replace would be needed)
-		* or by FOO_TABLE (where a replace is already done at constant-define time)
-		*/
-		if (!preg_match('#^' . preg_quote($table_prefix, '#') . '#', $table_name) || !in_array($table_name, $constants, true))
-		{
-			$table_name = preg_replace('#^phpbb_#i', $table_prefix, $table_name);
-		}
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 912a7b34ba..9f94273c63 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -45,10 +45,10 @@ class phpbb_db_migrator
 	* @param string			$phpbb_root_path
 	* @param string			$php_ext
 	*/
-	function phpbb_db_migrator(&$db, &$db_tools, $table_prefix, $migrations_table, $phpbb_root_path, $php_ext)
+	function phpbb_db_migrator($db, $db_tools, $table_prefix, $migrations_table, $phpbb_root_path, $php_ext)
 	{
-		$this->db = &$db;
-		$this->db_tools = &$db_tools;
+		$this->db = $db;
+		$this->db_tools = $db_tools;
 		$this->table_prefix = $table_prefix;
 		$this->migrations_table = $migrations_table;
 		$this->migrations = array();
@@ -131,7 +131,7 @@ class phpbb_db_migrator
 			return false;
 		}
 
-		$migration =& new $name($this->db, $this->db_tools, $this->table_prefix, $this->phpbb_root_path, $this->php_ext);
+		$migration = new $name($this->db, $this->db_tools, $this->table_prefix, $this->phpbb_root_path, $this->php_ext);
 		$state = (isset($this->migration_state[$name])) ?
 			$this->migration_state[$name] :
 			array(
@@ -182,7 +182,7 @@ class phpbb_db_migrator
 		return true;
 	}
 
-	function process_data_step(&$migration)
+	function process_data_step($migration)
 	{
 		$continue = false;
 		$steps = $migration->update_data();
@@ -199,7 +199,7 @@ class phpbb_db_migrator
 		return $continue;
 	}
 
-	function run_step(&$step)
+	function run_step($step)
 	{
 
 	}
@@ -234,7 +234,7 @@ class phpbb_db_migrator
 			return true;
 		}
 
-		$migration =& new $name($this->db, $this->db_tools, $this->table_prefix, $this->phpbb_root_path, $this->php_ext);
+		$migration = new $name($this->db, $this->db_tools, $this->table_prefix, $this->phpbb_root_path, $this->php_ext);
 		$depends = $migration->depends_on();
 
 		foreach ($depends as $depend)
-- 
cgit v1.2.1


From 41de95bc11c0b64eafa294f03432f619d3d712d5 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 11 Nov 2012 12:12:05 +0100
Subject: [feature/migrations] Process migration steps and move to PHP5 code

---
 phpBB/includes/db/migration.php |  26 ++++-----
 phpBB/includes/db/migrator.php  | 126 ++++++++++++++++++++++++++++++++++------
 2 files changed, 120 insertions(+), 32 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
index c98ac8728a..4e83d2570c 100644
--- a/phpBB/includes/db/migration.php
+++ b/phpBB/includes/db/migration.php
@@ -26,14 +26,14 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_db_migration
 {
-	var $db;
-	var $db_tools;
-	var $table_prefix;
+	protected $db;
+	protected $db_tools;
+	protected $table_prefix;
 
-	var $phpbb_root_path;
-	var $php_ext;
+	protected $phpbb_root_path;
+	protected $php_ext;
 
-	var $errors;
+	protected $errors;
 
 	/**
 	* Migration constructor
@@ -44,7 +44,7 @@ class phpbb_db_migration
 	* @param string			$phpbb_root_path
 	* @param string			$php_ext
 	*/
-	function phpbb_db_migration($db, $db_tools, $table_prefix, $phpbb_root_path, $php_ext)
+	public function phpbb_db_migration($db, $db_tools, $table_prefix, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;
 		$this->db_tools = $db_tools;
@@ -61,7 +61,7 @@ class phpbb_db_migration
 	*
 	* @return array An array of migration class names
 	*/
-	function depends_on()
+	public function depends_on()
 	{
 		return array();
 	}
@@ -71,24 +71,24 @@ class phpbb_db_migration
 	*
 	* @return array
 	*/
-	function update_schema()
+	public function update_schema()
 	{
 		return array();
 	}
 
 	/**
-	* Updates data
+	* Updates data by returning a list of instructions to be executed
 	*
-	* @return null
+	* @return array
 	*/
-	function update_data()
+	public function update_data()
 	{
 	}
 
 	/**
 	* Wrapper for running queries to generate user feedback on updates
 	*/
-	function sql_query($sql)
+	protected function sql_query($sql)
 	{
 		if (defined('DEBUG_EXTRA'))
 		{
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 9f94273c63..9187e09869 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -22,17 +22,17 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_db_migrator
 {
-	var $db;
-	var $db_tools;
-	var $table_prefix;
+	protected $db;
+	protected $db_tools;
+	protected $table_prefix;
 
-	var $phpbb_root_path;
-	var $php_ext;
+	protected $phpbb_root_path;
+	protected $php_ext;
 
-	var $migrations_table;
-	var $migration_state;
+	protected $migrations_table;
+	protected $migration_state;
 
-	var $migrations;
+	protected $migrations;
 
 	/**
 	* Constructor of the database migrator
@@ -45,7 +45,7 @@ class phpbb_db_migrator
 	* @param string			$phpbb_root_path
 	* @param string			$php_ext
 	*/
-	function phpbb_db_migrator($db, $db_tools, $table_prefix, $migrations_table, $phpbb_root_path, $php_ext)
+	public function phpbb_db_migrator($db, $db_tools, $table_prefix, $migrations_table, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;
 		$this->db_tools = $db_tools;
@@ -64,7 +64,7 @@ class phpbb_db_migrator
 	*
 	* @return null
 	*/
-	function load_migration_state()
+	public function load_migration_state()
 	{
 		$sql = "SELECT *
 			FROM " . $this->migrations_table;
@@ -85,7 +85,7 @@ class phpbb_db_migrator
 	* @param array $class_names An array of migration class names
 	* @return null
 	*/
-	function set_migrations($class_names)
+	public function set_migrations($class_names)
 	{
 		$this->migrations = $class_names;
 	}
@@ -98,7 +98,7 @@ class phpbb_db_migrator
 	*
 	* @return null
 	*/
-	function update()
+	public function update()
 	{
 		foreach ($this->migrations as $name)
 		{
@@ -124,7 +124,7 @@ class phpbb_db_migrator
 	* @param	string	The class name of the migration
 	* @return	bool	Whether any update step was successfully run
 	*/
-	function try_apply($name)
+	protected function try_apply($name)
 	{
 		if (!class_exists($name))
 		{
@@ -182,7 +182,7 @@ class phpbb_db_migrator
 		return true;
 	}
 
-	function process_data_step($migration)
+	protected function process_data_step($migration)
 	{
 		$continue = false;
 		$steps = $migration->update_data();
@@ -190,6 +190,7 @@ class phpbb_db_migrator
 		foreach ($steps as $step)
 		{
 			$continue = $this->run_step($step);
+
 			if (!$continue)
 			{
 				return false;
@@ -199,12 +200,99 @@ class phpbb_db_migrator
 		return $continue;
 	}
 
-	function run_step($step)
+	protected function run_step($step)
 	{
+		try
+		{
+			$callable_and_parameters = $this->get_callable_from_step($step);
+			$callable = $callable_and_parameters[0];
+			$parameters = $callable_and_parameters[1];
+
+			call_user_func_array($callable, $parameters);
+
+			return false;
+		}
+		catch (phpbb_db_migration_exception $e)
+		{
+			echo $e;die();
+		}
+	}
 
+	public function get_callable_from_step($step)
+	{
+		$type = $step[0];
+		$parameters = $step[1];
+
+		$parts = explode('.', $type);
+
+		$class = $parts[0];
+		$method = false;
+
+		if (isset($parts[1]))
+		{
+			$method = $parts[1];
+		}
+
+		switch ($class)
+		{
+			case 'if':
+				if (!isset($parameters[0]))
+				{
+					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_MISSING_CONDITION', $step);
+				}
+
+				if (!isset($parameters[1]))
+				{
+					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_MISSING_STEP', $step);
+				}
+
+				$condition = $parameters[0];
+				$step = $parameters[1];
+
+				$callable_and_parameters = $this->get_callable_from_step($step);
+				$callable = $callable_and_parameters[0];
+				$sub_parameters = $callable_and_parameters[1];
+				return array(
+					function ($condition) use ($callable, $sub_parameters) {
+						return call_user_func_array($callable, $sub_parameters);
+					},
+					array($condition)
+				);
+			break;
+			case 'custom':
+				if (!is_callable($parameters[0]))
+				{
+					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_CUSTOM_NOT_CALLABLE', $step);
+				}
+
+				return array($parameters[0], array());
+			break;
+
+			default:
+				if (!$method)
+				{
+					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_UNKNOWN_TYPE', $step);
+				}
+
+				if (!isset($this->tools[$class]))
+				{
+					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_UNDEFINED_TOOL', $step);
+				}
+
+				if (!method_exists(get_class($this->tools[$class]), $method))
+				{
+					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_UNDEFINED_METHOD', $step);
+				}
+
+				return array(
+					array($this->tools[$class], $method),
+					$parameters
+				);
+			break;
+		}
 	}
 
-	function insert_migration($name, $state)
+	protected function insert_migration($name, $state)
 	{
 		$migration_row = $state;
 		$migration_row['migration_name'] = $name;
@@ -222,7 +310,7 @@ class phpbb_db_migrator
 	* @param	string	$name	The class name of the migration
 	* @return	bool			Whether the migration cannot be fulfilled
 	*/
-	function unfulfillable($name)
+	public function unfulfillable($name)
 	{
 		if (isset($this->migration_state[$name]))
 		{
@@ -253,7 +341,7 @@ class phpbb_db_migrator
 	*
 	* @return bool Whether the migrations have been applied
 	*/
-	function finished()
+	public function finished()
 	{
 		foreach ($this->migrations as $name)
 		{
@@ -279,7 +367,7 @@ class phpbb_db_migrator
 		return true;
 	}
 
-	function apply_schema_changes($schema_changes)
+	protected function apply_schema_changes($schema_changes)
 	{
 		$this->db_tools->perform_schema_changes($schema_changes);
 	}
-- 
cgit v1.2.1


From 6c44dadecbf50d6550f98dd1e1694519f39be680 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 8 Jan 2013 22:07:26 -0600
Subject: [feature/migrations] Move migrator to service container

Version numbers

3.1 updates

Restore database_update.php file to what it was in develop

Get first forum to place global announcements in

PHPBB3-9737
---
 phpBB/includes/db/db_tools.php                     |  10 +
 phpBB/includes/db/migration.php                    |  20 +-
 phpBB/includes/db/migration/data/3_0_1.php         |   3 +
 phpBB/includes/db/migration/data/3_0_10.php        |   3 +
 phpBB/includes/db/migration/data/3_0_10_rc1.php    |   2 +
 phpBB/includes/db/migration/data/3_0_10_rc2.php    |   3 +
 phpBB/includes/db/migration/data/3_0_10_rc3.php    |   3 +
 phpBB/includes/db/migration/data/3_0_11.php        |   3 +
 phpBB/includes/db/migration/data/3_0_11_rc1.php    |   2 +
 phpBB/includes/db/migration/data/3_0_11_rc2        |  31 ---
 phpBB/includes/db/migration/data/3_0_11_rc2.php    |  34 +++
 phpBB/includes/db/migration/data/3_0_12_rc1.php    |   8 +-
 phpBB/includes/db/migration/data/3_0_1_rc1.php     |   2 +
 phpBB/includes/db/migration/data/3_0_2.php         |   3 +
 phpBB/includes/db/migration/data/3_0_2_rc1.php     |   4 +-
 phpBB/includes/db/migration/data/3_0_2_rc2.php     |   3 +
 phpBB/includes/db/migration/data/3_0_3.php         |   5 +-
 phpBB/includes/db/migration/data/3_0_3_rc1.php     |   2 +
 phpBB/includes/db/migration/data/3_0_4.php         |   2 +
 phpBB/includes/db/migration/data/3_0_4_rc1.php     |   2 +
 phpBB/includes/db/migration/data/3_0_5.php         |   3 +
 .../includes/db/migration/data/3_0_5_rc1part2.php  |   3 +
 phpBB/includes/db/migration/data/3_0_6.php         |   3 +
 phpBB/includes/db/migration/data/3_0_6_rc1.php     |   2 +
 phpBB/includes/db/migration/data/3_0_6_rc2.php     |   3 +
 phpBB/includes/db/migration/data/3_0_6_rc3.php     |   2 +
 phpBB/includes/db/migration/data/3_0_6_rc4.php     |   3 +
 phpBB/includes/db/migration/data/3_0_7.php         |   3 +
 phpBB/includes/db/migration/data/3_0_7_pl1.php     |   3 +
 phpBB/includes/db/migration/data/3_0_7_rc1.php     |   2 +
 phpBB/includes/db/migration/data/3_0_7_rc2.php     |   2 +
 phpBB/includes/db/migration/data/3_0_8.php         |   3 +
 phpBB/includes/db/migration/data/3_0_8_rc1.php     |   2 +
 phpBB/includes/db/migration/data/3_0_9.php         |   3 +
 phpBB/includes/db/migration/data/3_0_9_rc1.php     |   2 +
 phpBB/includes/db/migration/data/3_0_9_rc2.php     |   3 +
 phpBB/includes/db/migration/data/3_0_9_rc3.php     |   3 +
 phpBB/includes/db/migration/data/3_0_9_rc4.php     |   3 +
 phpBB/includes/db/migration/data/3_1_0_dev.php     | 283 +++++++++++++++++++++
 phpBB/includes/db/migration/data/extensions.php    |  48 ++++
 .../includes/db/migration/data/style_update_p1.php |  99 +++++++
 .../includes/db/migration/data/style_update_p2.php |  83 ++++++
 phpBB/includes/db/migration/data/timezone.php      | 158 ++++++++++++
 phpBB/includes/db/migration/tools/base.php         |  47 ----
 phpBB/includes/db/migration/tools/config.php       |  26 +-
 phpBB/includes/db/migration/tools/module.php       |  38 ++-
 phpBB/includes/db/migration/tools/permission.php   |  26 +-
 phpBB/includes/db/migrator.php                     |  35 +--
 phpBB/includes/update_helpers.php                  | 112 --------
 49 files changed, 906 insertions(+), 242 deletions(-)
 delete mode 100644 phpBB/includes/db/migration/data/3_0_11_rc2
 create mode 100644 phpBB/includes/db/migration/data/3_0_11_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_1_0_dev.php
 create mode 100644 phpBB/includes/db/migration/data/extensions.php
 create mode 100644 phpBB/includes/db/migration/data/style_update_p1.php
 create mode 100644 phpBB/includes/db/migration/data/style_update_p2.php
 create mode 100644 phpBB/includes/db/migration/data/timezone.php
 delete mode 100644 phpBB/includes/db/migration/tools/base.php
 delete mode 100644 phpBB/includes/update_helpers.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 2bb016cebd..5329d871c8 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -345,6 +345,16 @@ class phpbb_db_tools
 		}
 	}
 
+	/**
+	* Setter for {@link $return_statements return_statements}.
+	*
+	* @param bool $return_statements True if SQL should not be executed but returned as strings
+	*/
+	public function set_return_statements($return_statements)
+	{
+		$this->return_statements = $return_statements;
+	}
+
 	/**
 	* Gets a list of tables in the database.
 	*
diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
index 4e83d2570c..1acef2d429 100644
--- a/phpBB/includes/db/migration.php
+++ b/phpBB/includes/db/migration.php
@@ -26,6 +26,7 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_db_migration
 {
+	protected $config;
 	protected $db;
 	protected $db_tools;
 	protected $table_prefix;
@@ -38,20 +39,17 @@ class phpbb_db_migration
 	/**
 	* Migration constructor
 	*
-	* @param dbal			$db			Connected database abstraction instance
-	* @param phpbb_db_tools	$db_tools	Instance of db schema manipulation tools
-	* @param string			$table_prefix The prefix for all table names
-	* @param string			$phpbb_root_path
-	* @param string			$php_ext
+	* @param \Symfony\Component\DependencyInjection\ContainerInterface	$container	Container supplying dependencies
 	*/
-	public function phpbb_db_migration($db, $db_tools, $table_prefix, $phpbb_root_path, $php_ext)
+	public function phpbb_db_migration(\Symfony\Component\DependencyInjection\ContainerInterface $container)
 	{
-		$this->db = $db;
-		$this->db_tools = $db_tools;
-		$this->table_prefix = $table_prefix;
+		$this->config = $this->container->get('config');
+		$this->db = $this->container->get('dbal.conn');
+		$this->db_tools = $this->container->get('dbal.tools');
+		$this->table_prefix = $this->container->getParameters('core.table_prefix');
 
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
+		$this->phpbb_root_path = $this->container->getParameters('core.root_path');
+		$this->php_ext = $this->container->getParameters('core.php_ext');
 
 		$this->errors = array();
 	}
diff --git a/phpBB/includes/db/migration/data/3_0_1.php b/phpBB/includes/db/migration/data/3_0_1.php
index 294db3d946..a2332c9b59 100644
--- a/phpBB/includes/db/migration/data/3_0_1.php
+++ b/phpBB/includes/db/migration/data/3_0_1.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_1 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.1')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_10.php b/phpBB/includes/db/migration/data/3_0_10.php
index 6d39969d48..07410c5ba1 100644
--- a/phpBB/includes/db/migration/data/3_0_10.php
+++ b/phpBB/includes/db/migration/data/3_0_10.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_10 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.10')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc1.php b/phpBB/includes/db/migration/data/3_0_10_rc1.php
index 06105c5b0d..daac50a631 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc1.php
@@ -23,6 +23,8 @@ class phpbb_db_migration_data_3_0_10_rc1 extends phpbb_db_migration
 	{
 		return array(
 			array('config.add', array('email_max_chunk_size', 50)),
+
+			array('config.update', array('version', '3.0.10-rc1')),
 		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc2.php b/phpBB/includes/db/migration/data/3_0_10_rc2.php
index 04161caf28..234e4c5fc7 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc2.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_10_rc2 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.10-rc2')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc3.php b/phpBB/includes/db/migration/data/3_0_10_rc3.php
index 539f0b8fec..075ce35e3e 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc3.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_10_rc3 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.10-rc3')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_11.php b/phpBB/includes/db/migration/data/3_0_11.php
index 3404272ef9..0bc9b6c4a5 100644
--- a/phpBB/includes/db/migration/data/3_0_11.php
+++ b/phpBB/includes/db/migration/data/3_0_11.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_11 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.11')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc1.php b/phpBB/includes/db/migration/data/3_0_11_rc1.php
index f44226df02..1509120f68 100644
--- a/phpBB/includes/db/migration/data/3_0_11_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_11_rc1.php
@@ -24,6 +24,8 @@ class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
 		return array(
 			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
 			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
+
+			array('config.update', array('version', '3.0.11-rc1')),
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc2 b/phpBB/includes/db/migration/data/3_0_11_rc2
deleted file mode 100644
index 6add980c73..0000000000
--- a/phpBB/includes/db/migration/data/3_0_11_rc2
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_11_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11_rc1');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_novalue' => array('BOOL', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc2.php b/phpBB/includes/db/migration/data/3_0_11_rc2.php
new file mode 100644
index 0000000000..f2bed54085
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_11_rc2.php
@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_11_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11_rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_novalue' => array('BOOL', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.11-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_12_rc1.php b/phpBB/includes/db/migration/data/3_0_12_rc1.php
index 734a57ecee..e5ff8c5814 100644
--- a/phpBB/includes/db/migration/data/3_0_12_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_12_rc1.php
@@ -7,6 +7,9 @@
 *
 */
 
+/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 **/
+
+/*
 class phpbb_db_migration_data_3_0_12_rc1 extends phpbb_db_migration
 {
 	function depends_on()
@@ -16,11 +19,14 @@ class phpbb_db_migration_data_3_0_12_rc1 extends phpbb_db_migration
 
 	function update_schema()
 	{
-		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */
 		return array();
 	}
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.12-rc1')),
+		);
 	}
 }
+*/
\ No newline at end of file
diff --git a/phpBB/includes/db/migration/data/3_0_1_rc1.php b/phpBB/includes/db/migration/data/3_0_1_rc1.php
index 1a696e0003..a3b4810d21 100644
--- a/phpBB/includes/db/migration/data/3_0_1_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_1_rc1.php
@@ -44,6 +44,8 @@ class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
 		return array(
 			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
 			array('custom', array(array(&$this, 'reset_smiley_size'))),
+
+			array('config.update', array('version', '3.0.1-rc1')),
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/3_0_2.php b/phpBB/includes/db/migration/data/3_0_2.php
index a5f94e644b..3469d8d178 100644
--- a/phpBB/includes/db/migration/data/3_0_2.php
+++ b/phpBB/includes/db/migration/data/3_0_2.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_2 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.2')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc1.php b/phpBB/includes/db/migration/data/3_0_2_rc1.php
index 1b4d3bc2b8..d3c2200f14 100644
--- a/phpBB/includes/db/migration/data/3_0_2_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_2_rc1.php
@@ -7,7 +7,7 @@
 *
 */
 
-class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
+class phpbb_db_migration_data_3_0_2_rc1 extends phpbb_db_migration
 {
 	function depends_on()
 	{
@@ -25,6 +25,8 @@ class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
 			array('config.add', array('referer_validation', '1')),
 			array('config.add', array('check_attachment_content', '1')),
 			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
+
+			array('config.update', array('version', '3.0.2-rc1')),
 		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc2.php b/phpBB/includes/db/migration/data/3_0_2_rc2.php
index 9ddeb60a14..67fd1faec6 100644
--- a/phpBB/includes/db/migration/data/3_0_2_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_2_rc2.php
@@ -48,5 +48,8 @@ class phpbb_db_migration_data_3_0_2_rc2 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.2-rc2')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_3.php b/phpBB/includes/db/migration/data/3_0_3.php
index f989eea025..dff375f438 100644
--- a/phpBB/includes/db/migration/data/3_0_3.php
+++ b/phpBB/includes/db/migration/data/3_0_3.php
@@ -11,7 +11,7 @@ class phpbb_db_migration_data_3_0_3 extends phpbb_db_migration
 {
 	function depends_on()
 	{
-		return array('phpbb_db_migration_data_3_0_2_rc2');
+		return array('phpbb_db_migration_data_3_0_3_rc1');
 	}
 
 	function update_schema()
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_3 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.3')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_3_rc1.php b/phpBB/includes/db/migration/data/3_0_3_rc1.php
index 737eab4bd3..d5c110eb7d 100644
--- a/phpBB/includes/db/migration/data/3_0_3_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_3_rc1.php
@@ -39,6 +39,8 @@ class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
 			array('config.add', array('dbms_version', '')),
 			array('permission.add', array('u_masspm_group', phpbb_auth::IS_GLOBAL),
 			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
+
+			array('config.update', array('version', '3.0.3-rc1')),
 		));
 	}
 
diff --git a/phpBB/includes/db/migration/data/3_0_4.php b/phpBB/includes/db/migration/data/3_0_4.php
index cd34fda9ab..4965ac38d0 100644
--- a/phpBB/includes/db/migration/data/3_0_4.php
+++ b/phpBB/includes/db/migration/data/3_0_4.php
@@ -23,6 +23,8 @@ class phpbb_db_migration_data_3_0_4 extends phpbb_db_migration
 	{
 		return array(
 			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
+
+			array('config.update', array('version', '3.0.4')),
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/3_0_4_rc1.php b/phpBB/includes/db/migration/data/3_0_4_rc1.php
index 342f1fa910..2964dcebc9 100644
--- a/phpBB/includes/db/migration/data/3_0_4_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_4_rc1.php
@@ -59,6 +59,8 @@ class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
 	{
 		return array(
 			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
+
+			array('config.update', array('version', '3.0.4-rc1')),
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/3_0_5.php b/phpBB/includes/db/migration/data/3_0_5.php
index 5671832a82..2f80970781 100644
--- a/phpBB/includes/db/migration/data/3_0_5.php
+++ b/phpBB/includes/db/migration/data/3_0_5.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_5 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.5')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
index 6be8ea9845..1fab0f8873 100644
--- a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
+++ b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
@@ -30,5 +30,8 @@ class phpbb_db_migration_data_3_0_5_rc1part2 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.5-rc1')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_6.php b/phpBB/includes/db/migration/data/3_0_6.php
index c2cb59e62a..26176b9437 100644
--- a/phpBB/includes/db/migration/data/3_0_6.php
+++ b/phpBB/includes/db/migration/data/3_0_6.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_6 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.6')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc1.php b/phpBB/includes/db/migration/data/3_0_6_rc1.php
index eefdc1692d..a868d70684 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc1.php
@@ -155,6 +155,8 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 			)),
 			array('custom', array(array(&$this, 'add_newly_registered_group'))),
 			array('custom', array(array(&$this, 'set_user_options_default'))),
+
+			array('config.update', array('version', '3.0.6-rc1')),
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc2.php b/phpBB/includes/db/migration/data/3_0_6_rc2.php
index 07b31a53b9..4092a5fa61 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc2.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_6_rc2 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.6-rc2')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc3.php b/phpBB/includes/db/migration/data/3_0_6_rc3.php
index c19a792bad..ec22d1da77 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc3.php
@@ -23,6 +23,8 @@ class phpbb_db_migration_data_3_0_6_rc3 extends phpbb_db_migration
 	{
 		return array(
 			array('custom', array(array(&$this, 'update_cp_fields'))),
+
+			array('config.update', array('version', '3.0.6-rc3')),
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc4.php b/phpBB/includes/db/migration/data/3_0_6_rc4.php
index c48b1ca394..e748c7a4ff 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc4.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc4.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_6_rc4 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.6-rc4')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_7.php b/phpBB/includes/db/migration/data/3_0_7.php
index 05781b7b49..f27b56f778 100644
--- a/phpBB/includes/db/migration/data/3_0_7.php
+++ b/phpBB/includes/db/migration/data/3_0_7.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_7 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.7')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_7_pl1.php b/phpBB/includes/db/migration/data/3_0_7_pl1.php
index cee7a91a2e..5543d6437a 100644
--- a/phpBB/includes/db/migration/data/3_0_7_pl1.php
+++ b/phpBB/includes/db/migration/data/3_0_7_pl1.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_7_pl1 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.7-pl1')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc1.php b/phpBB/includes/db/migration/data/3_0_7_rc1.php
index b2d49cce63..71584382e8 100644
--- a/phpBB/includes/db/migration/data/3_0_7_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_7_rc1.php
@@ -38,6 +38,8 @@ class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
 			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
 			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
 			array('custom', array(array(&$this, 'delete_text_templates'))),
+
+			array('config.update', array('version', '3.0.7-rc1')),
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc2.php b/phpBB/includes/db/migration/data/3_0_7_rc2.php
index 8a751328bf..e043f35705 100644
--- a/phpBB/includes/db/migration/data/3_0_7_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_7_rc2.php
@@ -23,6 +23,8 @@ class phpbb_db_migration_data_3_0_7_rc2 extends phpbb_db_migration
 	{
 		return array(
 			array('custom', array(array(&$this, 'update_email_hash'))),
+
+			array('config.update', array('version', '3.0.7-rc2')),
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/3_0_8.php b/phpBB/includes/db/migration/data/3_0_8.php
index a714a3d2f6..a5defc8278 100644
--- a/phpBB/includes/db/migration/data/3_0_8.php
+++ b/phpBB/includes/db/migration/data/3_0_8.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_8 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.8')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_8_rc1.php b/phpBB/includes/db/migration/data/3_0_8_rc1.php
index 73838d9d29..3f51806fd9 100644
--- a/phpBB/includes/db/migration/data/3_0_8_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_8_rc1.php
@@ -37,6 +37,8 @@ class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
 			array('config.add', array('load_unreads_search', 1)),
 			array('config.update_if_equals', array(600, 'queue_interval', 60)),
 			array('config.update_if_equals', array(50, 'email_package_size', 20)),
+
+			array('config.update', array('version', '3.0.8-rc1')),
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/3_0_9.php b/phpBB/includes/db/migration/data/3_0_9.php
index 4b2c08a256..eb359e2697 100644
--- a/phpBB/includes/db/migration/data/3_0_9.php
+++ b/phpBB/includes/db/migration/data/3_0_9.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_9 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.9')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc1.php b/phpBB/includes/db/migration/data/3_0_9_rc1.php
index 98d3a26481..256426849c 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc1.php
@@ -59,6 +59,8 @@ class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
 			array('config.add', array('ip_login_limit_use_forwarded', 0)),
 			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
 			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
+
+			array('config.update', array('version', '3.0.9-rc1')),
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc2.php b/phpBB/includes/db/migration/data/3_0_9_rc2.php
index 589047670a..e3c4716665 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc2.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_9_rc2 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc2')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc3.php b/phpBB/includes/db/migration/data/3_0_9_rc3.php
index 06061cbcb6..3cdecb96ae 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc3.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_9_rc3 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc3')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc4.php b/phpBB/includes/db/migration/data/3_0_9_rc4.php
index 04b3ae4b39..c2a92e618a 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc4.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc4.php
@@ -21,5 +21,8 @@ class phpbb_db_migration_data_3_0_9_rc4 extends phpbb_db_migration
 
 	function update_data()
 	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc4')),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_1_0_dev.php b/phpBB/includes/db/migration/data/3_1_0_dev.php
new file mode 100644
index 0000000000..987ab94646
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_1_0_dev.php
@@ -0,0 +1,283 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_extensions extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array(
+			'phpbb_db_migration_data_3_0_11',
+			'phpbb_db_migration_data_extensions',
+			'phpbb_db_migration_data_style_update_p2',
+			'phpbb_db_migration_data_timezone',
+		);
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns'		=> array(
+				GROUPS_TABLE		=> array(
+					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
+				),
+				PROFILE_FIELDS_TABLE	=> array(
+					'field_show_on_pm'		=> array('BOOL', 0),
+				),
+				STYLES_TABLE		=> array(
+					'style_path'			=> array('VCHAR:100', ''),
+					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+					'style_parent_id'		=> array('UINT:4', 0),
+					'style_parent_tree'		=> array('TEXT', ''),
+				),
+				REPORTS_TABLE		=> array(
+					'reported_post_text'		=> array('MTEXT_UNI', ''),
+					'reported_post_uid'			=> array('VCHAR:8', ''),
+					'reported_post_bitfield'	=> array('VCHAR:255', ''),
+				),
+			),
+			'change_columns'	=> array(
+				GROUPS_TABLE		=> array(
+					'group_legend'		=> array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
+
+			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
+			array('config.add', array('fulltext_postgres_min_word_len', 4)),
+			array('config.add', array('fulltext_postgres_max_word_len', 254)),
+			array('config.add', array('fulltext_sphinx_stopwords', 0)),
+			array('config.add', array('fulltext_sphinx_indexer_mem_limit', 512)),
+
+			array('config.add', array('load_jquery_cdn', 0)),
+			array('config.add', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js')),
+
+			array('config.add', array('use_system_cron', 0)),
+
+			array('config.add', array('legend_sort_groupname', 0)),
+			array('config.add', array('teampage_forums', 1)),
+			array('config.add', array('teampage_memberships', 1)),
+
+			array('config.add', array('load_cpf_pm', 0)),
+
+			array('config.add', array('display_last_subject', 1)),
+
+			array('config.add', array('assets_version', 1)),
+
+			array('config.add', array('site_home_url', '')),
+			array('config.add', array('site_home_text', '')),
+
+			array('module.add', array(
+				'acp',
+				'ACP_GROUPS',
+				array(
+					'module_basename'	=> 'acp_groups',
+					'modes'				=> array('position'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_ATTACHMENTS',
+				array(
+					'module_basename'	=> 'acp_attachments',
+					'modes'				=> array('manage'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_STYLE_MANAGEMENT',
+				array(
+					'module_basename'	=> 'acp_styles',
+					'modes'				=> array('install', 'cache'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'UCP_PROFILE',
+				array(
+					'module_basename'	=> 'ucp_profile',
+					'modes'				=> array('autologin_keys'),
+				),
+			)),
+
+			array('module.remove', array(
+				'acp',
+				'ACP_CAT_STYLES',
+				array(
+					'module_basename'	=> 'styles',
+					'modes'				=> array('imageset', 'theme', 'template'),
+				),
+			)),
+
+			array('custom', array(array($this, 'rename_module_basenames'))),
+			array('custom', array(array($this, 'add_group_teampage'))),
+			array('custom', array(array($this, 'update_group_legend'))),
+			array('custom', array(array($this, 'localise_global_announcements'))),
+		);
+	}
+
+	public function rename_module_basenames()
+	{
+		// rename all module basenames to full classname
+		$sql = 'SELECT module_id, module_basename, module_class
+			FROM ' . MODULES_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$module_id = (int) $row['module_id'];
+			unset($row['module_id']);
+
+			if (!empty($row['module_basename']) && !empty($row['module_class']))
+			{
+				// all the class names start with class name or with phpbb_ for auto loading
+				if (strpos($row['module_basename'], $row['module_class'] . '_') !== 0 &&
+					strpos($row['module_basename'], 'phpbb_') !== 0)
+				{
+					$row['module_basename'] = $row['module_class'] . '_' . $row['module_basename'];
+
+					$sql_update = $this->db->sql_build_array('UPDATE', $row);
+
+					$sql = 'UPDATE ' . MODULES_TABLE . '
+						SET ' . $sql_update . '
+						WHERE module_id = ' . $module_id;
+					$this->sql_query($sql);
+				}
+			}
+		}
+
+		$this->db->sql_freeresult($result);
+	}
+
+	public function add_group_teampage()
+	{
+		$sql = 'UPDATE ' . GROUPS_TABLE . '
+			SET group_teampage = 1
+			WHERE group_type = ' . GROUP_SPECIAL . "
+				AND group_name = 'ADMINISTRATORS'";
+		$this->sql_query($sql);
+
+		$sql = 'UPDATE ' . GROUPS_TABLE . '
+			SET group_teampage = 2
+			WHERE group_type = ' . GROUP_SPECIAL . "
+				AND group_name = 'GLOBAL_MODERATORS'";
+		$this->sql_query($sql);
+	}
+
+	public function update_group_legend()
+	{
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . '
+			WHERE group_legend = 1
+			ORDER BY group_name ASC';
+		$result = $this->db->sql_query($sql);
+
+		$next_legend = 1;
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql = 'UPDATE ' . GROUPS_TABLE . '
+				SET group_legend = ' . $next_legend . '
+				WHERE group_id = ' . (int) $row['group_id'];
+			$this->sql_query($sql);
+
+			$next_legend++;
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function localise_global_announcements()
+	{
+		// Localise Global Announcements
+		$sql = 'SELECT topic_id, topic_approved, (topic_replies + 1) AS topic_posts, topic_last_post_id, topic_last_post_subject, topic_last_post_time, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour
+			FROM ' . TOPICS_TABLE . '
+			WHERE forum_id = 0
+				AND topic_type = ' . POST_GLOBAL;
+		$result = $this->db->sql_query($sql);
+
+		$global_announcements = $update_lastpost_data = array();
+		$update_lastpost_data['forum_last_post_time'] = 0;
+		$update_forum_data = array(
+			'forum_posts'		=> 0,
+			'forum_topics'		=> 0,
+			'forum_topics_real'	=> 0,
+		);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$global_announcements[] = (int) $row['topic_id'];
+
+			$update_forum_data['forum_posts'] += (int) $row['topic_posts'];
+			$update_forum_data['forum_topics_real']++;
+			if ($row['topic_approved'])
+			{
+				$update_forum_data['forum_topics']++;
+			}
+
+			if ($update_lastpost_data['forum_last_post_time'] < $row['topic_last_post_time'])
+			{
+				$update_lastpost_data = array(
+					'forum_last_post_id'		=> (int) $row['topic_last_post_id'],
+					'forum_last_post_subject'	=> $row['topic_last_post_subject'],
+					'forum_last_post_time'		=> (int) $row['topic_last_post_time'],
+					'forum_last_poster_id'		=> (int) $row['topic_last_poster_id'],
+					'forum_last_poster_name'	=> $row['topic_last_poster_name'],
+					'forum_last_poster_colour'	=> $row['topic_last_poster_colour'],
+				);
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($global_announcements))
+		{
+			// Update the post/topic-count for the forum and the last-post if needed
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type = ' . FORUM_POST;
+			$result = $this->db->sql_query_limit($sql, 1);
+			$ga_forum_id = $this->db->sql_fetchfield('forum_id');
+			$this->db->sql_freeresult($result);
+
+			$sql = 'SELECT forum_last_post_time
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_id = ' . $ga_forum_id;
+			$result = $this->db->sql_query($sql);
+			$lastpost = (int) $this->db->sql_fetchfield('forum_last_post_time');
+			$this->db->sql_freeresult($result);
+
+			$sql_update = 'forum_posts = forum_posts + ' . $update_forum_data['forum_posts'] . ', ';
+			$sql_update .= 'forum_topics_real = forum_topics_real + ' . $update_forum_data['forum_topics_real'] . ', ';
+			$sql_update .= 'forum_topics = forum_topics + ' . $update_forum_data['forum_topics'];
+			if ($lastpost < $update_lastpost_data['forum_last_post_time'])
+			{
+				$sql_update .= ', ' . $this->db->sql_build_array('UPDATE', $update_lastpost_data);
+			}
+
+			$sql = 'UPDATE ' . FORUMS_TABLE . '
+				SET ' . $sql_update . '
+				WHERE forum_id = ' . $ga_forum_id;
+			$this->sql_query($sql);
+
+			// Update some forum_ids
+			$table_ary = array(TOPICS_TABLE, POSTS_TABLE, LOG_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE);
+			foreach ($table_ary as $table)
+			{
+				$sql = "UPDATE $table
+					SET forum_id = $ga_forum_id
+					WHERE " . $this->db->sql_in_set('topic_id', $global_announcements);
+				$this->sql_query($sql);
+			}
+			unset($table_ary);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/extensions.php b/phpBB/includes/db/migration/data/extensions.php
new file mode 100644
index 0000000000..85d5511ef0
--- /dev/null
+++ b/phpBB/includes/db/migration/data/extensions.php
@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_extensions extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables'		=> array(
+				EXT_TABLE				=> array(
+					'COLUMNS'			=> array(
+						'ext_name'		=> array('VCHAR', ''),
+						'ext_active'	=> array('BOOL', 0),
+						'ext_state'		=> array('TEXT', ''),
+					),
+					'KEYS'				=> array(
+						'ext_name'		=> array('UNIQUE', 'ext_name'),
+					),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('module.add', array(
+				'acp',
+				'ACP_GENERAL_TASKS',
+				array(
+					'module_basename'	=> 'extensions',
+					'modes'				=> array('main'),
+				),
+			)),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/style_update_p1.php b/phpBB/includes/db/migration/data/style_update_p1.php
new file mode 100644
index 0000000000..d570caae04
--- /dev/null
+++ b/phpBB/includes/db/migration/data/style_update_p1.php
@@ -0,0 +1,99 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_style_update_p1 extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array();
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'styles_update'))),
+		);
+	}
+
+	public function styles_update()
+	{
+		// Get list of valid 3.1 styles
+		$available_styles = array('prosilver');
+
+		$iterator = new DirectoryIterator($phpbb_root_path . 'styles');
+		$skip_dirs = array('.', '..', 'prosilver');
+		foreach ($iterator as $fileinfo)
+		{
+			if ($fileinfo->isDir() && !in_array($fileinfo->getFilename(), $skip_dirs) && file_exists($fileinfo->getPathname() . '/style.cfg'))
+			{
+				$style_cfg = parse_cfg_file($fileinfo->getPathname() . '/style.cfg');
+				if (isset($style_cfg['phpbb_version']) && version_compare($style_cfg['phpbb_version'], '3.1.0-dev', '>='))
+				{
+					// 3.1 style
+					$available_styles[] = $fileinfo->getFilename();
+				}
+			}
+		}
+
+		// Get all installed styles
+		if ($this->db_tools->sql_table_exists(STYLES_IMAGESET_TABLE))
+		{
+			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id, i.imageset_path
+				FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
+				WHERE t.template_id = s.template_id
+					AND c.theme_id = s.theme_id
+					AND i.imageset_id = s.imageset_id";
+		}
+		else
+		{
+			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id
+				FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . " c
+				WHERE t.template_id = s.template_id
+					AND c.theme_id = s.theme_id";
+		}
+		$result = $this->db->sql_query($sql);
+
+		$styles = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$styles[] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		// Decide which styles to keep, all others will be deleted
+		$valid_styles = array();
+		foreach ($styles as $style_row)
+		{
+			if (
+				// Delete styles with parent style (not supported yet)
+				$style_row['template_inherits_id'] == 0 &&
+				// Check if components match
+				$style_row['template_path'] == $style_row['theme_path'] && (!isset($style_row['imageset_path']) || $style_row['template_path'] == $style_row['imageset_path']) &&
+				// Check if components are valid
+				in_array($style_row['template_path'], $available_styles)
+				)
+			{
+				// Valid style. Keep it
+				$sql_ary = array(
+					'style_path'	=> $style_row['template_path'],
+					'bbcode_bitfield'	=> $style_row['bbcode_bitfield'],
+					'style_parent_id'	=> 0,
+					'style_parent_tree'	=> '',
+				);
+				$this->sql_query('UPDATE ' . STYLES_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE style_id = ' . $style_row['style_id'], $errored, $error_ary);
+				$valid_styles[] = (int) $style_row['style_id'];
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/style_update_p2.php b/phpBB/includes/db/migration/data/style_update_p2.php
new file mode 100644
index 0000000000..2c0991de59
--- /dev/null
+++ b/phpBB/includes/db/migration/data/style_update_p2.php
@@ -0,0 +1,83 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_style_update_p2 extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array('phpbb_db_migration_data_style_update_p1');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_columns'	=> array(
+				STYLES_TABLE		=> array(
+					'imageset_id',
+					'template_id',
+					'theme_id',
+				),
+			),
+
+			'drop_tables'	=> array(
+				STYLES_IMAGESET_TABLE,
+				STYLES_IMAGESET_DATA_TABLE,
+				STYLES_TEMPLATE_TABLE,
+				STYLES_TEMPLATE_DATA_TABLE,
+				STYLES_THEME_TABLE,
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'styles_update'))),
+		);
+	}
+
+	public function styles_update()
+	{
+		// Remove old entries from styles table
+		if (!sizeof($valid_styles))
+		{
+			// No valid styles: remove everything and add prosilver
+			$this->sql_query('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
+
+			$sql = 'INSERT INTO ' . STYLES_TABLE . " (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '&copy; phpBB Group', 1, 'prosilver', 'kNg=', 0, '')";
+			$this->sql_query($sql);
+
+			$sql = 'SELECT style_id
+				FROM ' . $table . "
+				WHERE style_name = 'prosilver'";
+			$result = $this->sql_query($sql);
+			$default_style = $this->db->sql_fetchfield($result);
+			$this->db->sql_freeresult($result);
+
+			set_config('default_style', $default_style);
+
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
+			$this->sql_query($sql);
+		}
+		else
+		{
+			// There are valid styles in styles table. Remove styles that are outdated
+			$this->sql_query('DELETE FROM ' . STYLES_TABLE . ' WHERE ' . $this->db->sql_in_set('style_id', $valid_styles, true), $errored, $error_ary);
+
+			// Change default style
+			if (!in_array($config['default_style'], $valid_styles))
+			{
+				set_config('default_style', $valid_styles[0]);
+			}
+
+			// Reset styles for users
+			$this->sql_query('UPDATE ' . USERS_TABLE . ' SET user_style = 0 WHERE ' . $this->db->sql_in_set('user_style', $valid_styles, true), $errored, $error_ary);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/timezone.php b/phpBB/includes/db/migration/data/timezone.php
new file mode 100644
index 0000000000..89fafbad28
--- /dev/null
+++ b/phpBB/includes/db/migration/data/timezone.php
@@ -0,0 +1,158 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_timezone extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				USERS_TABLE			=> array(
+					'user_timezone'		=> array('VCHAR:100', ''),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_timezones'))),
+		);
+	}
+
+	public function update_timezones()
+	{
+		// Update user timezones
+		$sql = 'SELECT user_dst, user_timezone
+			FROM ' . USERS_TABLE . '
+			GROUP BY user_timezone, user_dst';
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . "
+				SET user_timezone = '" . $this->db->sql_escape($this->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
+				WHERE user_timezone = '" . $this->db->sql_escape($row['user_timezone']) . "'
+					AND user_dst = " . (int) $row['user_dst'];
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+
+		// Update board default timezone
+		set_config('board_timezone', $this->convert_phpbb30_timezone($config['board_timezone'], $config['board_dst']));
+
+		// After we have calculated the timezones we can delete user_dst column from user table.
+		$this->db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
+	}
+
+	/**
+	* Determine the new timezone for a given phpBB 3.0 timezone and
+	* "Daylight Saving Time" option
+	*
+	*	@param	$timezone	float	Users timezone in 3.0
+	*	@param	$dst		int		Users daylight saving time
+	*	@return		string		Users new php Timezone which is used since 3.1
+	*/
+	public function convert_phpbb30_timezone($timezone, $dst)
+	{
+		$offset = $timezone + $dst;
+
+		switch ($timezone)
+		{
+			case '-12':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 12] Baker Island Time'
+			case '-11':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 11] Niue Time, Samoa Standard Time'
+			case '-10':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
+			case '-9.5':
+				return 'Pacific/Marquesas';			//'[UTC - 9:30] Marquesas Islands Time'
+			case '-9':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
+			case '-8':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 8] Pacific Standard Time'
+			case '-7':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 7] Mountain Standard Time'
+			case '-6':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 6] Central Standard Time'
+			case '-5':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 5] Eastern Standard Time'
+			case '-4.5':
+				return 'America/Caracas';			//'[UTC - 4:30] Venezuelan Standard Time'
+			case '-4':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 4] Atlantic Standard Time'
+			case '-3.5':
+				return 'America/St_Johns';			//'[UTC - 3:30] Newfoundland Standard Time'
+			case '-3':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
+			case '-2':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
+			case '-1':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
+			case '0':
+				return (!$dst) ? 'UTC' : 'Etc/GMT-1';	//'[UTC] Western European Time, Greenwich Mean Time'
+			case '1':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 1] Central European Time, West African Time'
+			case '2':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 2] Eastern European Time, Central African Time'
+			case '3':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 3] Moscow Standard Time, Eastern African Time'
+			case '3.5':
+				return 'Asia/Tehran';				//'[UTC + 3:30] Iran Standard Time'
+			case '4':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
+			case '4.5':
+				return 'Asia/Kabul';				//'[UTC + 4:30] Afghanistan Time'
+			case '5':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
+			case '5.5':
+				return 'Asia/Kolkata';				//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
+			case '5.75':
+				return 'Asia/Kathmandu';			//'[UTC + 5:45] Nepal Time'
+			case '6':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
+			case '6.5':
+				return 'Indian/Cocos';				//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
+			case '7':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
+			case '8':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
+			case '8.75':
+				return 'Australia/Eucla';			//'[UTC + 8:45] Southeastern Western Australia Standard Time'
+			case '9':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
+			case '9.5':
+				return 'Australia/ACT';				//'[UTC + 9:30] Australian Central Standard Time'
+			case '10':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
+			case '10.5':
+				return 'Australia/Lord_Howe';		//'[UTC + 10:30] Lord Howe Standard Time'
+			case '11':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
+			case '11.5':
+				return 'Pacific/Norfolk';			//'[UTC + 11:30] Norfolk Island Time'
+			case '12':
+				return 'Etc/GMT-12';				//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
+			case '12.75':
+				return 'Pacific/Chatham';			//'[UTC + 12:45] Chatham Islands Time'
+			case '13':
+				return 'Pacific/Tongatapu';			//'[UTC + 13] Tonga Time, Phoenix Islands Time'
+			case '14':
+				return 'Pacific/Kiritimati';		//'[UTC + 14] Line Island Time'
+			default:
+				return 'UTC';
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/tools/base.php b/phpBB/includes/db/migration/tools/base.php
deleted file mode 100644
index 61116d8b55..0000000000
--- a/phpBB/includes/db/migration/tools/base.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_tools_base
-{
-	/** @var phpbb_auth */
-	protected $auth = null;
-
-	/** @var phpbb_cache_service */
-	protected $cache = null;
-
-	/** @var phpbb_config */
-	protected $config = null;
-
-	/** @var dbal */
-	protected $db = null;
-
-	/** @var phpbb_template */
-	protected $template = null;
-
-	/** @var phpbb_user */
-	protected $user = null;
-
-	/** @var string */
-	protected $phpbb_root_path = null;
-
-	/** @var string */
-	protected $php_ext = null;
-
-	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_template $template, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
-	{
-		$this->db = $db;
-		$this->cache = $cache;
-		$this->template = $template;
-		$this->user = $user;
-		$this->auth = $auth;
-		$this->config = $config;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-}
\ No newline at end of file
diff --git a/phpBB/includes/db/migration/tools/config.php b/phpBB/includes/db/migration/tools/config.php
index 965ba1d136..2d58c8093c 100644
--- a/phpBB/includes/db/migration/tools/config.php
+++ b/phpBB/includes/db/migration/tools/config.php
@@ -7,20 +7,14 @@
 *
 */
 
-class phpbb_db_migration_tools_config extends phpbb_db_migration_tools_base
+class phpbb_db_migration_tools_config
 {
-	/**
-	* Config Exists
-	*
-	* This function is to check to see if a config variable exists or if it does not.
-	*
-	* @param string $config_name The name of the config setting you wish to check for.
-	*
-	* @return bool true/false if config exists
-	*/
-	public function exists($config_name)
+	/** @var phpbb_config */
+	protected $config = null;
+
+	public function __construct(phpbb_config $config)
 	{
-		return (bool) $this->config->offsetExists($config_name);
+		$this->config = $config;
 	}
 
 	/**
@@ -34,7 +28,7 @@ class phpbb_db_migration_tools_config extends phpbb_db_migration_tools_base
 	*/
 	public function add($config_name, $config_value = '', $is_dynamic = false)
 	{
-		if ($this->config_exists($config_name))
+		if (isset($this->config[$config_name]))
 		{
 			throw new phpbb_db_migration_exception('CONFIG_ALREADY_EXISTS', $config_name);
 		}
@@ -54,7 +48,7 @@ class phpbb_db_migration_tools_config extends phpbb_db_migration_tools_base
 	*/
 	public function update($config_name, $config_value = '')
 	{
-		if (!$this->config_exists($config_name))
+		if (!isset($this->config[$config_name]))
 		{
 			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
 		}
@@ -75,7 +69,7 @@ class phpbb_db_migration_tools_config extends phpbb_db_migration_tools_base
 	*/
 	public function update_if_equals($compare, $config_name, $config_value = '')
 	{
-		if (!$this->config_exists($config_name))
+		if (!isset($this->config[$config_name]))
 		{
 			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
 		}
@@ -94,7 +88,7 @@ class phpbb_db_migration_tools_config extends phpbb_db_migration_tools_base
 	*/
 	public function remove($config_name)
 	{
-		if (!$this->config_exists($config_name))
+		if (!isset($this->config[$config_name]))
 		{
 			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
 		}
diff --git a/phpBB/includes/db/migration/tools/module.php b/phpBB/includes/db/migration/tools/module.php
index df1912a022..e17197d73e 100644
--- a/phpBB/includes/db/migration/tools/module.php
+++ b/phpBB/includes/db/migration/tools/module.php
@@ -7,8 +7,32 @@
 *
 */
 
-class phpbb_db_migration_tools_module extends phpbb_db_migration_tools_base
+class phpbb_db_migration_tools_module
 {
+	/** @var phpbb_cache_service */
+	protected $cache = null;
+
+	/** @var dbal */
+	protected $db = null;
+
+	/** @var phpbb_user */
+	protected $user = null;
+
+	/** @var string */
+	protected $phpbb_root_path = null;
+
+	/** @var string */
+	protected $php_ext = null;
+
+	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, $user, $phpbb_root_path, $php_ext)
+	{
+		$this->db = $db;
+		$this->cache = $cache;
+		$this->user = $user;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+	}
+
 	/**
 	* Module Exists
 	*
@@ -117,11 +141,15 @@ class phpbb_db_migration_tools_module extends phpbb_db_migration_tools_base
 
 		if (!isset($data['module_langname']))
 		{
+			/**
+			* @TODO does not work with 3.1 modules yet, but must continue for old 3.0 versions for
+			* upgrades from a 3.0.x version to 3.1
+			*/
 			// The "automatic" way
 			$basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
 			$basename = str_replace(array('/', '\\'), '', $basename);
 			$class = str_replace(array('/', '\\'), '', $class);
-			$info_file = "$class/info/{$class}_$basename.$this->phpEx";
+			$info_file = "$class/info/{$class}_$basename.{$this->php_ext}";
 
 			// The manual and automatic ways both failed...
 			if (!file_exists((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file))
@@ -196,7 +224,7 @@ class phpbb_db_migration_tools_module extends phpbb_db_migration_tools_base
 
 		if (!class_exists('acp_modules'))
 		{
-			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->phpEx);
+			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
 			$this->user->add_lang('acp/modules');
 		}
 		$acp_modules = new acp_modules();
@@ -302,7 +330,7 @@ class phpbb_db_migration_tools_module extends phpbb_db_migration_tools_base
 			// Automatic method
 			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
 			$class = str_replace(array('/', '\\'), '', $class);
-			$info_file = "$class/info/{$class}_$basename.$this->phpEx";
+			$info_file = "$class/info/{$class}_$basename.{$this->php_ext}";
 
 			if (!file_exists((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file))
 			{
@@ -396,7 +424,7 @@ class phpbb_db_migration_tools_module extends phpbb_db_migration_tools_base
 
 			if (!class_exists('acp_modules'))
 			{
-				include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->phpEx);
+				include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
 				$this->user->add_lang('acp/modules');
 			}
 			$acp_modules = new acp_modules();
diff --git a/phpBB/includes/db/migration/tools/permission.php b/phpBB/includes/db/migration/tools/permission.php
index 3fbe7c649c..7694bae0cb 100644
--- a/phpBB/includes/db/migration/tools/permission.php
+++ b/phpBB/includes/db/migration/tools/permission.php
@@ -9,6 +9,30 @@
 
 class phpbb_db_migration_tools_permission extends phpbb_db_migration_tools_base
 {
+	/** @var phpbb_auth */
+	protected $auth = null;
+
+	/** @var phpbb_cache_service */
+	protected $cache = null;
+
+	/** @var dbal */
+	protected $db = null;
+
+	/** @var string */
+	protected $phpbb_root_path = null;
+
+	/** @var string */
+	protected $php_ext = null;
+
+	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_auth $auth, $phpbb_root_path, $php_ext)
+	{
+		$this->db = $db;
+		$this->cache = $cache;
+		$this->auth = $auth;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+	}
+
 	/**
 	* Permission Exists
 	*
@@ -69,7 +93,7 @@ class phpbb_db_migration_tools_permission extends phpbb_db_migration_tools_base
 
 		if (!class_exists('auth_admin'))
 		{
-			include($this->phpbb_root_path . 'includes/acp/auth.' . $this->phpEx);
+			include($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
 		}
 		$auth_admin = new auth_admin();
 
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 9187e09869..c9590fccf6 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -22,6 +22,7 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_db_migrator
 {
+	protected $container;
 	protected $db;
 	protected $db_tools;
 	protected $table_prefix;
@@ -37,24 +38,26 @@ class phpbb_db_migrator
 	/**
 	* Constructor of the database migrator
 	*
-	* @param dbal			$db			Connected database abstraction instance
-	* @param phpbb_db_tools	$db_tools	Instance of db schema manipulation tools
-	* @param string			$table_prefix The prefix for all table names
-	* @param string			$migrations_table The name of the db table storing
-	*									information on applied migrations
-	* @param string			$phpbb_root_path
-	* @param string			$php_ext
+	* @param \Symfony\Component\DependencyInjection\ContainerInterface	$container	Container supplying dependencies
 	*/
-	public function phpbb_db_migrator($db, $db_tools, $table_prefix, $migrations_table, $phpbb_root_path, $php_ext)
+	public function phpbb_db_migrator(\Symfony\Component\DependencyInjection\ContainerInterface $container, $migrations)
 	{
-		$this->db = $db;
-		$this->db_tools = $db_tools;
-		$this->table_prefix = $table_prefix;
-		$this->migrations_table = $migrations_table;
-		$this->migrations = array();
-
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
+		$this->container = $container;
+		$this->db = $this->container->get('dbal.conn');
+		$this->db_tools = $this->container->get('dbal.tools');
+		$this->table_prefix = $this->container->getParameters('core.table_prefix');
+		$this->migrations_table = $this->container->getParameters('tables.migrations');
+		$this->migrations = $migrations;
+
+		$this->phpbb_root_path = $this->container->getParameters('core.root_path');
+		$this->php_ext = $this->container->getParameters('core.php_ext');
+
+		/** @todo replace with collection_pass when merged */
+		$this->tools = array(
+			'config' => new phpbb_db_migration_tools_config,
+			'module' => new phpbb_db_migration_tools_module,
+			'permission' => new phpbb_db_migration_tools_permission,
+		);
 
 		$this->load_migration_state();
 	}
diff --git a/phpBB/includes/update_helpers.php b/phpBB/includes/update_helpers.php
deleted file mode 100644
index 69d678b2f8..0000000000
--- a/phpBB/includes/update_helpers.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*/
-
-/**
-* phpBB Update Helpers
-*/
-class phpbb_update_helpers
-{
-	/**
-	* Determine the new timezone for a given phpBB 3.0 timezone and
-	* "Daylight Saving Time" option
-	*
-	*	@param	$timezone	float	Users timezone in 3.0
-	*	@param	$dst		int		Users daylight saving time
-	*	@return		string		Users new php Timezone which is used since 3.1
-	*/
-	function convert_phpbb30_timezone($timezone, $dst)
-	{
-		$offset = $timezone + $dst;
-
-		switch ($timezone)
-		{
-			case '-12':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 12] Baker Island Time'
-			case '-11':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 11] Niue Time, Samoa Standard Time'
-			case '-10':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
-			case '-9.5':
-				return 'Pacific/Marquesas';			//'[UTC - 9:30] Marquesas Islands Time'
-			case '-9':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
-			case '-8':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 8] Pacific Standard Time'
-			case '-7':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 7] Mountain Standard Time'
-			case '-6':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 6] Central Standard Time'
-			case '-5':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 5] Eastern Standard Time'
-			case '-4.5':
-				return 'America/Caracas';			//'[UTC - 4:30] Venezuelan Standard Time'
-			case '-4':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 4] Atlantic Standard Time'
-			case '-3.5':
-				return 'America/St_Johns';			//'[UTC - 3:30] Newfoundland Standard Time'
-			case '-3':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
-			case '-2':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
-			case '-1':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
-			case '0':
-				return (!$dst) ? 'UTC' : 'Etc/GMT-1';	//'[UTC] Western European Time, Greenwich Mean Time'
-			case '1':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 1] Central European Time, West African Time'
-			case '2':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 2] Eastern European Time, Central African Time'
-			case '3':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 3] Moscow Standard Time, Eastern African Time'
-			case '3.5':
-				return 'Asia/Tehran';				//'[UTC + 3:30] Iran Standard Time'
-			case '4':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
-			case '4.5':
-				return 'Asia/Kabul';				//'[UTC + 4:30] Afghanistan Time'
-			case '5':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
-			case '5.5':
-				return 'Asia/Kolkata';				//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
-			case '5.75':
-				return 'Asia/Kathmandu';			//'[UTC + 5:45] Nepal Time'
-			case '6':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
-			case '6.5':
-				return 'Indian/Cocos';				//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
-			case '7':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
-			case '8':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
-			case '8.75':
-				return 'Australia/Eucla';			//'[UTC + 8:45] Southeastern Western Australia Standard Time'
-			case '9':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
-			case '9.5':
-				return 'Australia/ACT';				//'[UTC + 9:30] Australian Central Standard Time'
-			case '10':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
-			case '10.5':
-				return 'Australia/Lord_Howe';		//'[UTC + 10:30] Lord Howe Standard Time'
-			case '11':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
-			case '11.5':
-				return 'Pacific/Norfolk';			//'[UTC + 11:30] Norfolk Island Time'
-			case '12':
-				return 'Etc/GMT-12';				//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
-			case '12.75':
-				return 'Pacific/Chatham';			//'[UTC + 12:45] Chatham Islands Time'
-			case '13':
-				return 'Pacific/Tongatapu';			//'[UTC + 13] Tonga Time, Phoenix Islands Time'
-			case '14':
-				return 'Pacific/Kiritimati';		//'[UTC + 14] Line Island Time'
-			default:
-				return 'UTC';
-		}
-	}
-}
-- 
cgit v1.2.1


From ced035788b0654614e07f483bf4b6f9f9ea4eac2 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 12 Nov 2012 16:41:02 -0500
Subject: [feature/migrations] Update phpbb_db_migration class for PHP 5.3.3

PHPBB3-9737
---
 phpBB/includes/db/migration.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
index 1acef2d429..fb030ded44 100644
--- a/phpBB/includes/db/migration.php
+++ b/phpBB/includes/db/migration.php
@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package db
 */
-class phpbb_db_migration
+abstract class phpbb_db_migration
 {
 	protected $config;
 	protected $db;
@@ -88,7 +88,7 @@ class phpbb_db_migration
 	*/
 	protected function sql_query($sql)
 	{
-		if (defined('DEBUG_EXTRA'))
+		if (defined('DEBUG'))
 		{
 			echo "<br />\n{$sql}\n<br />";
 		}
-- 
cgit v1.2.1


From 61debcf14ca14afbb503b2535ef392a75002e8ae Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 12 Nov 2012 16:46:19 -0500
Subject: [feature/migrations] Update phpbb_db_migrator class for PHP 5.3.3

PHPBB3-9737
---
 phpBB/includes/db/migrator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index c9590fccf6..216faf9866 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -40,7 +40,7 @@ class phpbb_db_migrator
 	*
 	* @param \Symfony\Component\DependencyInjection\ContainerInterface	$container	Container supplying dependencies
 	*/
-	public function phpbb_db_migrator(\Symfony\Component\DependencyInjection\ContainerInterface $container, $migrations)
+	public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $migrations)
 	{
 		$this->container = $container;
 		$this->db = $this->container->get('dbal.conn');
-- 
cgit v1.2.1


From 826607a40509d40ba5a85e5b0bc72a54f77d41d6 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 12 Nov 2012 16:54:10 -0500
Subject: [feature/migrations] Add method and property visibility, use
 __construct()

PHPBB3-9737
---
 phpBB/includes/db/migration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
index fb030ded44..10f7b71551 100644
--- a/phpBB/includes/db/migration.php
+++ b/phpBB/includes/db/migration.php
@@ -41,7 +41,7 @@ abstract class phpbb_db_migration
 	*
 	* @param \Symfony\Component\DependencyInjection\ContainerInterface	$container	Container supplying dependencies
 	*/
-	public function phpbb_db_migration(\Symfony\Component\DependencyInjection\ContainerInterface $container)
+	public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container)
 	{
 		$this->config = $this->container->get('config');
 		$this->db = $this->container->get('dbal.conn');
-- 
cgit v1.2.1


From 5c91e2569cb3a400acd20bf06cc0e609dd63a778 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 8 Jan 2013 22:09:14 -0600
Subject: [feature/migrations] Migrations now somewhat works

PHPBB3-9737
---
 phpBB/includes/db/driver/mysqli.php                |    1 +
 phpBB/includes/db/migration.php                    |  122 -
 phpBB/includes/db/migration/data/3_0_11_rc1.php    |    2 +-
 phpBB/includes/db/migration/data/3_0_12_rc1.php    |  101 +-
 phpBB/includes/db/migration/data/3_0_3_rc1.php     |    6 +-
 phpBB/includes/db/migration/data/3_0_4.php         |    2 +-
 phpBB/includes/db/migration/data/3_0_4_rc1.php     |    4 +-
 phpBB/includes/db/migration/data/3_0_5_rc1.php     |    8 +-
 phpBB/includes/db/migration/data/3_0_6_rc1.php     |   60 +-
 phpBB/includes/db/migration/data/3_0_7_rc2.php     |    2 +-
 phpBB/includes/db/migration/data/3_0_8_rc1.php     |   10 +-
 phpBB/includes/db/migration/data/3_0_9_rc1.php     |    2 +-
 phpBB/includes/db/migration/data/3_1_0_dev.php     |  100 +-
 phpBB/includes/db/migration/data/extensions.php    |    3 +-
 .../includes/db/migration/data/style_update_p1.php |   62 +-
 .../includes/db/migration/data/style_update_p2.php |   43 +-
 phpBB/includes/db/migration/data/timezone.php      |    5 +-
 phpBB/includes/db/migration/exception.php          |   40 +
 phpBB/includes/db/migration/migration.php          |  129 +
 phpBB/includes/db/migration/tool/config.php        |  108 +
 phpBB/includes/db/migration/tool/interface.php     |   18 +
 phpBB/includes/db/migration/tool/module.php        |  471 +++
 phpBB/includes/db/migration/tool/permission.php    |  562 ++++
 phpBB/includes/db/migration/tools/config.php       |  100 -
 phpBB/includes/db/migration/tools/module.php       |  447 ---
 phpBB/includes/db/migration/tools/permission.php   |  504 ----
 phpBB/includes/db/migration/tools/umil.php         | 3037 --------------------
 phpBB/includes/db/migrator.php                     |  113 +-
 phpBB/includes/functions.php                       |    3 +-
 29 files changed, 1705 insertions(+), 4360 deletions(-)
 delete mode 100644 phpBB/includes/db/migration.php
 create mode 100644 phpBB/includes/db/migration/exception.php
 create mode 100644 phpBB/includes/db/migration/migration.php
 create mode 100644 phpBB/includes/db/migration/tool/config.php
 create mode 100644 phpBB/includes/db/migration/tool/interface.php
 create mode 100644 phpBB/includes/db/migration/tool/module.php
 create mode 100644 phpBB/includes/db/migration/tool/permission.php
 delete mode 100644 phpBB/includes/db/migration/tools/config.php
 delete mode 100644 phpBB/includes/db/migration/tools/module.php
 delete mode 100644 phpBB/includes/db/migration/tools/permission.php
 delete mode 100644 phpBB/includes/db/migration/tools/umil.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/includes/db/driver/mysqli.php
index 7448bf1670..94921a22b7 100644
--- a/phpBB/includes/db/driver/mysqli.php
+++ b/phpBB/includes/db/driver/mysqli.php
@@ -24,6 +24,7 @@ if (!defined('IN_PHPBB'))
 class phpbb_db_driver_mysqli extends phpbb_db_driver
 {
 	var $multi_insert = true;
+
 	var $connect_error = '';
 
 	/**
diff --git a/phpBB/includes/db/migration.php b/phpBB/includes/db/migration.php
deleted file mode 100644
index 10f7b71551..0000000000
--- a/phpBB/includes/db/migration.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
-*
-* @package db
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Abstract base class for database migrations
-*
-* Each migration consists of a set of schema and data changes to be implemented
-* in a subclass. This class provides various utility methods to simplify editing
-* a phpBB.
-*
-* @package db
-*/
-abstract class phpbb_db_migration
-{
-	protected $config;
-	protected $db;
-	protected $db_tools;
-	protected $table_prefix;
-
-	protected $phpbb_root_path;
-	protected $php_ext;
-
-	protected $errors;
-
-	/**
-	* Migration constructor
-	*
-	* @param \Symfony\Component\DependencyInjection\ContainerInterface	$container	Container supplying dependencies
-	*/
-	public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container)
-	{
-		$this->config = $this->container->get('config');
-		$this->db = $this->container->get('dbal.conn');
-		$this->db_tools = $this->container->get('dbal.tools');
-		$this->table_prefix = $this->container->getParameters('core.table_prefix');
-
-		$this->phpbb_root_path = $this->container->getParameters('core.root_path');
-		$this->php_ext = $this->container->getParameters('core.php_ext');
-
-		$this->errors = array();
-	}
-
-	/**
-	* Defines other migrationsto be applied first (abstract method)
-	*
-	* @return array An array of migration class names
-	*/
-	public function depends_on()
-	{
-		return array();
-	}
-
-	/**
-	* Updates the database schema by providing a set of change instructions
-	*
-	* @return array
-	*/
-	public function update_schema()
-	{
-		return array();
-	}
-
-	/**
-	* Updates data by returning a list of instructions to be executed
-	*
-	* @return array
-	*/
-	public function update_data()
-	{
-	}
-
-	/**
-	* Wrapper for running queries to generate user feedback on updates
-	*/
-	protected function sql_query($sql)
-	{
-		if (defined('DEBUG'))
-		{
-			echo "<br />\n{$sql}\n<br />";
-		}
-
-		$this->db->sql_return_on_error(true);
-
-		if ($sql === 'begin')
-		{
-			$result = $this->db->sql_transaction('begin');
-		}
-		else if ($sql === 'commit')
-		{
-			$result = $this->db->sql_transaction('commit');
-		}
-		else
-		{
-			$result = $this->db->sql_query($sql);
-			if ($this->db->sql_error_triggered)
-			{
-				$this->errors[] = array(
-					'sql'	=> $this->db->sql_error_sql,
-					'code'	=> $this->db->sql_error_returned,
-				);
-			}
-		}
-
-		$this->db->sql_return_on_error(false);
-
-		return $result;
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc1.php b/phpBB/includes/db/migration/data/3_0_11_rc1.php
index 1509120f68..daf106accf 100644
--- a/phpBB/includes/db/migration/data/3_0_11_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_11_rc1.php
@@ -80,7 +80,7 @@ class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
 		{
 			$delete_pms[] = (int) $row['msg_id'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (!empty($delete_pms))
 		{
diff --git a/phpBB/includes/db/migration/data/3_0_12_rc1.php b/phpBB/includes/db/migration/data/3_0_12_rc1.php
index e5ff8c5814..0d8702f19e 100644
--- a/phpBB/includes/db/migration/data/3_0_12_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_12_rc1.php
@@ -9,24 +9,115 @@
 
 /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 **/
 
-/*
 class phpbb_db_migration_data_3_0_12_rc1 extends phpbb_db_migration
 {
-	function depends_on()
+	public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11');
 	}
 
-	function update_schema()
+	public function update_schema()
 	{
 		return array();
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
+			array('custom', array(array(&$this, 'update_module_auth'))),
+			array('custom', array(array(&$this, 'update_bots'))),
+			array('custom', array(array(&$this, 'disable_bots_from_receiving_pms'))),
+
 			array('config.update', array('version', '3.0.12-rc1')),
 		);
 	}
+
+	public function disable_bots_from_receiving_pms()
+	{
+		// Disable receiving pms for bots
+		$sql = 'SELECT user_id
+			FROM ' . BOTS_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		$bot_user_ids = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$bot_user_ids[] = (int) $row['user_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($bot_user_ids))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_allow_pm = 0
+				WHERE ' . $this->db->sql_in_set('user_id', $bot_user_ids);
+			$this->sql_query($sql);
+		}
+	}
+
+	public function update_module_auth()
+	{
+		$sql = 'UPDATE ' . MODULES_TABLE . '
+			SET module_auth = \'acl_u_sig\'
+			WHERE module_class = \'ucp\'
+				AND module_basename = \'profile\'
+				AND module_mode = \'signature\'';
+		$this->sql_query($sql);
+	}
+
+	public function update_bots()
+	{
+		// Update bots
+		if (!function_exists('user_delete'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		}
+
+		$bots_updates = array(
+			// Bot Deletions
+			'NG-Search [Bot]'		=> false,
+			'Nutch/CVS [Bot]'		=> false,
+			'OmniExplorer [Bot]'	=> false,
+			'Seekport [Bot]'		=> false,
+			'Synoo [Bot]'			=> false,
+			'WiseNut [Bot]'			=> false,
+
+			// Bot Updates
+			// Bot name to bot user agent map
+			'Baidu [Spider]'	=> 'Baiduspider',
+			'Exabot [Bot]'		=> 'Exabot',
+			'Voyager [Bot]'		=> 'voyager/',
+			'W3C [Validator]'	=> 'W3C_Validator',
+		);
+
+		foreach ($bots_updates as $bot_name => $bot_agent)
+		{
+			$sql = 'SELECT user_id
+				FROM ' . USERS_TABLE . '
+				WHERE user_type = ' . USER_IGNORE . "
+					AND username_clean = '" . $this->db->sql_escape(utf8_clean_string($bot_name)) . "'";
+			$result = $this->db->sql_query($sql);
+			$bot_user_id = (int) $this->db->sql_fetchfield('user_id');
+			$this->db->sql_freeresult($result);
+
+			if ($bot_user_id)
+			{
+				if ($bot_agent === false)
+				{
+					$sql = 'DELETE FROM ' . BOTS_TABLE . "
+						WHERE user_id = $bot_user_id";
+					$this->sql_query($sql);
+
+					user_delete('remove', $bot_user_id);
+				}
+				else
+				{
+					$sql = 'UPDATE ' . BOTS_TABLE . "
+						SET bot_agent = '" .  $this->db->sql_escape($bot_agent) . "'
+						WHERE user_id = $bot_user_id";
+					$this->sql_query($sql);
+				}
+			}
+		}
+	}
 }
-*/
\ No newline at end of file
diff --git a/phpBB/includes/db/migration/data/3_0_3_rc1.php b/phpBB/includes/db/migration/data/3_0_3_rc1.php
index d5c110eb7d..2320c4ac4b 100644
--- a/phpBB/includes/db/migration/data/3_0_3_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_3_rc1.php
@@ -36,12 +36,12 @@ class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
 			array('config.add', array('queue_trigger_posts', '3')),
 			array('config.add', array('pm_max_recipients', '0')),
 			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
-			array('config.add', array('dbms_version', '')),
-			array('permission.add', array('u_masspm_group', phpbb_auth::IS_GLOBAL),
+			array('config.add', array('dbms_version', $this->db->sql_server_info(true))),
+			array('permission.add', array('u_masspm_group', true, 'u_masspm')),
 			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
 
 			array('config.update', array('version', '3.0.3-rc1')),
-		));
+		);
 	}
 
 	function correct_acp_email_permissions()
diff --git a/phpBB/includes/db/migration/data/3_0_4.php b/phpBB/includes/db/migration/data/3_0_4.php
index 4965ac38d0..1af4508331 100644
--- a/phpBB/includes/db/migration/data/3_0_4.php
+++ b/phpBB/includes/db/migration/data/3_0_4.php
@@ -30,7 +30,7 @@ class phpbb_db_migration_data_3_0_4 extends phpbb_db_migration
 
 	function rename_log_delete_topic()
 	{
-		if ($db->sql_layer == 'oracle')
+		if ($this->db->sql_layer == 'oracle')
 		{
 			// log_operation is CLOB - but we can change this later
 			$sql = 'UPDATE ' . $this->table_prefix . "log
diff --git a/phpBB/includes/db/migration/data/3_0_4_rc1.php b/phpBB/includes/db/migration/data/3_0_4_rc1.php
index 2964dcebc9..e9bb0e01f5 100644
--- a/phpBB/includes/db/migration/data/3_0_4_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_4_rc1.php
@@ -69,7 +69,7 @@ class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
 		// Update the Custom Profile Fields based on previous settings to the new format
 		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
 				FROM ' . PROFILE_FIELDS_TABLE;
-		$result = $this->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
@@ -101,5 +101,7 @@ class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
 
 			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
 		}
+
+		$this->db->sql_freeresult($result);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1.php b/phpBB/includes/db/migration/data/3_0_5_rc1.php
index 9205f0d5f8..cbf28c0be6 100644
--- a/phpBB/includes/db/migration/data/3_0_5_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_5_rc1.php
@@ -32,7 +32,7 @@ class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
 		return array(
 			array('config.add', array('captcha_gd_wave', 0)),
 			array('config.add', array('captcha_gd_3d_noise', 1)),
-			array('config.add', array('captcha_gd_refresh', 1)),
+			array('config.add', array('captcha_gd_fonts', 1)),
 			array('config.add', array('confirm_refresh', 1)),
 			array('config.add', array('max_num_search_keywords', 10)),
 			array('config.remove', array('search_indexing_state')),
@@ -47,7 +47,7 @@ class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
 		$sql = 'SELECT user_id, user_password
 				FROM ' . $this->table_prefix . 'users
 				WHERE user_pass_convert = 1';
-		$result = $this->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
@@ -60,7 +60,7 @@ class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
 				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
 			}
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 	}
 
 	function update_ichiro_bot()
@@ -99,7 +99,7 @@ class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
 					WHERE auth_option = '" . $db->sql_escape($option) . "'
 					ORDER BY auth_option_id DESC";
 				// sql_query_limit not possible here, due to bug in postgresql layer
-				$result = $this->sql_query($sql);
+				$result = $this->db->sql_query($sql);
 
 				// Skip first row, this is our original auth option we want to preserve
 				$row = $this->db->sql_fetchrow($result);
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc1.php b/phpBB/includes/db/migration/data/3_0_6_rc1.php
index a868d70684..35adcf52be 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc1.php
@@ -35,7 +35,7 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 				$this->table_prefix . 'reports' => array(
 					'pm_id' => array('UINT', 0),
 				),
-				$this->table_prefix . 'fields'			=> array(
+				$this->table_prefix . 'profile_fields'	=> array(
 					'field_show_on_vt' => array('BOOL', 0),
 				),
 				$this->table_prefix . 'forums' => array(
@@ -89,19 +89,19 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 			array('config.add', array('allow_avatar', 0)),
 			array('if', array(
 				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
-				array('config.add', array('allow_avatar', 1)),
+				array('config.update', array('allow_avatar', 1)),
 			)),
 			array('config.add', array('allow_avatar_remote_upload', 0)),
 			array('if', array(
 				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
-				array('config.add', array('allow_avatar_remote_upload', 1)),
+				array('config.update', array('allow_avatar_remote_upload', 1)),
 			)),
 
 			array('module.add', array(
 				'acp',
 				'ACP_BOARD_CONFIGURATION',
 				array(
-					'module_basename'	=> 'board',
+					'module_basename'	=> 'acp_board',
 					'modes'				=> array('feed'),
 				),
 			)),
@@ -109,7 +109,7 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 				'acp',
 				'ACP_CAT_USERS',
 				array(
-					'module_basename'	=> 'users',
+					'module_basename'	=> 'acp_users',
 					'modes'				=> array('warnings'),
 				),
 			)),
@@ -117,7 +117,7 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 				'acp',
 				'ACP_SERVER_CONFIGURATION',
 				array(
-					'module_basename'	=> 'send_statistics',
+					'module_basename'	=> 'acp_send_statistics',
 					'modes'				=> array('send_statistics'),
 				),
 			)),
@@ -125,7 +125,7 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 				'acp',
 				'ACP_FORUM_BASED_PERMISSIONS',
 				array(
-					'module_basename'	=> 'permissions',
+					'module_basename'	=> 'acp_permissions',
 					'modes'				=> array('setting_forum_copy'),
 				),
 			)),
@@ -133,24 +133,8 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 				'mcp',
 				'MCP_REPORTS',
 				array(
-					'module_basename'	=> 'pm_reports',
-					'modes'				=> array('pm_reports'),
-				),
-			)),
-			array('module.add', array(
-				'mcp',
-				'MCP_REPORTS',
-				array(
-					'module_basename'	=> 'pm_reports',
-					'modes'				=> array('pm_reports_closed'),
-				),
-			)),
-			array('module.add', array(
-				'mcp',
-				'MCP_REPORTS',
-				array(
-					'module_basename'	=> 'pm_reports',
-					'modes'				=> array('pm_report_details'),
+					'module_basename'	=> 'mcp_pm_reports',
+					'modes'				=> array('pm_reports','pm_reports_closed','pm_report_details'),
 				),
 			)),
 			array('custom', array(array(&$this, 'add_newly_registered_group'))),
@@ -209,17 +193,14 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 			$this->sql_query($sql);
 			$u_role = $this->db->sql_nextid();
 
-			if (!$errored)
-			{
-				// Now add the correct data to the roles...
-				// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
-				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
-				$this->sql_query($sql);
+			// Now add the correct data to the roles...
+			// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
+			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
+			$this->sql_query($sql);
 
-				// Add user role to group
-				$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
-				$this->sql_query($sql);
-			}
+			// Add user role to group
+			$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
+			$this->sql_query($sql);
 		}
 
 		// Insert new forum role
@@ -246,11 +227,8 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 			$this->sql_query($sql);
 			$f_role = $this->db->sql_nextid();
 
-			if (!$errored)
-			{
-				$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
-				$this->sql_query($sql);
-			}
+			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
+			$this->sql_query($sql);
 		}
 
 		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
@@ -294,7 +272,7 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 		}
 
 		// Clear permissions...
-		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->phpEx);
+		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
 		$auth_admin = new auth_admin();
 		$auth_admin->acl_clear_prefetch();
 	}
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc2.php b/phpBB/includes/db/migration/data/3_0_7_rc2.php
index e043f35705..e2c6acce1e 100644
--- a/phpBB/includes/db/migration/data/3_0_7_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_7_rc2.php
@@ -59,7 +59,7 @@ class phpbb_db_migration_data_3_0_7_rc2 extends phpbb_db_migration
 				$this->sql_query($sql);
 			}
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if ($i < $limit)
 		{
diff --git a/phpBB/includes/db/migration/data/3_0_8_rc1.php b/phpBB/includes/db/migration/data/3_0_8_rc1.php
index 3f51806fd9..b58b0966a5 100644
--- a/phpBB/includes/db/migration/data/3_0_8_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_8_rc1.php
@@ -30,7 +30,7 @@ class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
 				'acp',
 				'ACP_MESSAGES',
 				array(
-					'module_basename'	=> 'board',
+					'module_basename'	=> 'acp_board',
 					'modes'				=> array('post'),
 				),
 			)),
@@ -60,9 +60,9 @@ class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
 			// On an already updated board, they can also already be in language/.../acp/attachments.php
 			// in the board root.
 			$lang_files = array(
-				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.$this->phpEx",
-				"{$this->phpbb_root_path}language/$lang_dir/install.$this->phpEx",
-				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.$this->phpEx",
+				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.{$this->php_ext}",
+				"{$this->phpbb_root_path}language/$lang_dir/install.{$this->php_ext}",
+				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.{$this->php_ext}",
 			);
 
 			foreach ($lang_files as $lang_file)
@@ -140,7 +140,7 @@ class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
 
 			if (!function_exists('user_add'))
 			{
-				include($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
+				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 			}
 
 			$user_row = array(
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc1.php b/phpBB/includes/db/migration/data/3_0_9_rc1.php
index 256426849c..ea49cdbba9 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc1.php
@@ -44,7 +44,7 @@ class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
 				),
 			),
 			'change_columns' => array(
-				$this->table_prefix . 'bbcode' => array(
+				$this->table_prefix . 'bbcodes' => array(
 					'bbcode_id' => array('USINT', 0),
 				),
 			),
diff --git a/phpBB/includes/db/migration/data/3_1_0_dev.php b/phpBB/includes/db/migration/data/3_1_0_dev.php
index 987ab94646..6eb5a6ddee 100644
--- a/phpBB/includes/db/migration/data/3_1_0_dev.php
+++ b/phpBB/includes/db/migration/data/3_1_0_dev.php
@@ -7,7 +7,7 @@
 *
 */
 
-class phpbb_db_migration_data_extensions extends phpbb_db_migration
+class phpbb_db_migration_data_3_1_0_dev extends phpbb_db_migration
 {
 	public function depends_on()
 	{
@@ -78,6 +78,8 @@ class phpbb_db_migration_data_extensions extends phpbb_db_migration
 			array('config.add', array('site_home_url', '')),
 			array('config.add', array('site_home_text', '')),
 
+			array('permission.add', array('u_chgprofileinfo', true, 'u_sig')),
+
 			array('module.add', array(
 				'acp',
 				'ACP_GROUPS',
@@ -103,7 +105,7 @@ class phpbb_db_migration_data_extensions extends phpbb_db_migration
 				),
 			)),
 			array('module.add', array(
-				'acp',
+				'ucp',
 				'UCP_PROFILE',
 				array(
 					'module_basename'	=> 'ucp_profile',
@@ -113,20 +115,104 @@ class phpbb_db_migration_data_extensions extends phpbb_db_migration
 
 			array('module.remove', array(
 				'acp',
-				'ACP_CAT_STYLES',
-				array(
-					'module_basename'	=> 'styles',
-					'modes'				=> array('imageset', 'theme', 'template'),
-				),
+				false,
+				'ACP_TEMPLATES',
+			)),
+			array('module.remove', array(
+				'acp',
+				false,
+				'ACP_THEMES',
+			)),
+			array('module.remove', array(
+				'acp',
+				false,
+				'ACP_IMAGESETS',
 			)),
 
 			array('custom', array(array($this, 'rename_module_basenames'))),
+			array('custom', array(array($this, 'rename_styles_module'))),
 			array('custom', array(array($this, 'add_group_teampage'))),
 			array('custom', array(array($this, 'update_group_legend'))),
 			array('custom', array(array($this, 'localise_global_announcements'))),
+			array('custom', array(array($this, 'update_ucp_pm_basename'))),
+			array('custom', array(array($this, 'update_ucp_profile_auth'))),
+			array('custom', array(array($this, 'move_customise_modules'))),
+
+			array('config.update', array('version', '3.1.0-dev')),
 		);
 	}
 
+	public function move_customise_modules()
+	{
+		// Move language management to new location in the Customise tab
+		// First get language module id
+		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+			WHERE module_basename = 'acp_language'";
+		$result = $this->db->sql_query($sql);
+		$language_module_id = $this->db->sql_fetchfield('module_id');
+		$this->db->sql_freeresult($result);
+		// Next get language management module id of the one just created
+		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+			WHERE module_langname = 'ACP_LANGUAGE'";
+		$result = $this->db->sql_query($sql);
+		$language_management_module_id = $this->db->sql_fetchfield('module_id');
+		$this->db->sql_freeresult($result);
+
+		if (!class_exists('acp_modules'))
+		{
+			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
+		}
+		// acp_modules calls adm_back_link, which is undefined at this point
+		if (!function_exists('adm_back_link'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
+		}
+		$module_manager = new acp_modules();
+		$module_manager->module_class = 'acp';
+		$module_manager->move_module($language_module_id, $language_management_module_id);
+	}
+
+	public function update_ucp_pm_basename()
+	{
+		$sql = 'SELECT module_id, module_basename
+			FROM ' . MODULES_TABLE . "
+			WHERE module_basename <> 'ucp_pm' AND
+				module_langname='UCP_PM'";
+		$result = $this->db->sql_query_limit($sql, 1);
+
+		if ($row = $this->db->sql_fetchrow($result))
+		{
+			// This update is still not applied. Applying it
+
+			$sql = 'UPDATE ' . MODULES_TABLE . "
+				SET module_basename = 'ucp_pm'
+				WHERE  module_id = " . (int) $row['module_id'];
+
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function update_ucp_profile_auth()
+	{
+		// Update the auth setting for the module
+		$sql = 'UPDATE ' . MODULES_TABLE . "
+			SET module_auth = 'acl_u_chgprofileinfo'
+			WHERE module_class = 'ucp'
+				AND module_basename = 'ucp_profile'
+				AND module_mode = 'profile_info'";
+		$this->sql_query($sql);
+	}
+
+	public function rename_styles_module()
+	{
+		// Rename styles module to Customise
+		$sql = 'UPDATE ' . MODULES_TABLE . "
+			SET module_langname = 'ACP_CAT_CUSTOMISE'
+			WHERE module_langname = 'ACP_CAT_STYLES'";
+		$this->sql_query($sql);
+	}
+
 	public function rename_module_basenames()
 	{
 		// rename all module basenames to full classname
diff --git a/phpBB/includes/db/migration/data/extensions.php b/phpBB/includes/db/migration/data/extensions.php
index 85d5511ef0..d28e0ebabb 100644
--- a/phpBB/includes/db/migration/data/extensions.php
+++ b/phpBB/includes/db/migration/data/extensions.php
@@ -39,10 +39,11 @@ class phpbb_db_migration_data_extensions extends phpbb_db_migration
 				'acp',
 				'ACP_GENERAL_TASKS',
 				array(
-					'module_basename'	=> 'extensions',
+					'module_basename'	=> 'acp_extensions',
 					'modes'				=> array('main'),
 				),
 			)),
+			array('permission.add', array('a_extensions', true, 'a_styles')),
 		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/style_update_p1.php b/phpBB/includes/db/migration/data/style_update_p1.php
index d570caae04..1c46e4147b 100644
--- a/phpBB/includes/db/migration/data/style_update_p1.php
+++ b/phpBB/includes/db/migration/data/style_update_p1.php
@@ -31,7 +31,7 @@ class phpbb_db_migration_data_style_update_p1 extends phpbb_db_migration
 		// Get list of valid 3.1 styles
 		$available_styles = array('prosilver');
 
-		$iterator = new DirectoryIterator($phpbb_root_path . 'styles');
+		$iterator = new DirectoryIterator($this->phpbb_root_path . 'styles');
 		$skip_dirs = array('.', '..', 'prosilver');
 		foreach ($iterator as $fileinfo)
 		{
@@ -91,9 +91,67 @@ class phpbb_db_migration_data_style_update_p1 extends phpbb_db_migration
 					'style_parent_id'	=> 0,
 					'style_parent_tree'	=> '',
 				);
-				$this->sql_query('UPDATE ' . STYLES_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE style_id = ' . $style_row['style_id'], $errored, $error_ary);
+				$this->sql_query('UPDATE ' . STYLES_TABLE . '
+					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE style_id = ' . $style_row['style_id']);
 				$valid_styles[] = (int) $style_row['style_id'];
 			}
 		}
+
+		// Remove old entries from styles table
+		if (!sizeof($valid_styles))
+		{
+			// No valid styles: remove everything and add prosilver
+			$this->sql_query('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
+
+			$sql_ary = array(
+				'style_name'		=> 'prosilver',
+				'style_copyright'	=> '&copy; phpBB Group',
+				'style_active'		=> 1,
+				'style_path'		=> 'prosilver',
+				'bbcode_bitfield'	=> 'kNg=',
+				'style_parent_id'	=> 0,
+				'style_parent_tree'	=> '',
+
+				// Will be removed in the next step
+				'imageset_id'		=> 0,
+				'template_id'		=> 0,
+				'theme_id'			=> 0,
+			);
+
+			$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+			$this->sql_query($sql);
+
+			$sql = 'SELECT style_id
+				FROM ' . $table . "
+				WHERE style_name = 'prosilver'";
+			$result = $this->sql_query($sql);
+			$default_style = $this->db->sql_fetchfield($result);
+			$this->db->sql_freeresult($result);
+
+			set_config('default_style', $default_style);
+
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
+			$this->sql_query($sql);
+		}
+		else
+		{
+			// There are valid styles in styles table. Remove styles that are outdated
+			$this->sql_query('DELETE FROM ' . STYLES_TABLE . '
+				WHERE ' . $this->db->sql_in_set('style_id', $valid_styles, true));
+
+			// Change default style
+			if (!in_array($this->config['default_style'], $valid_styles))
+			{
+				$this->sql_query('UPDATE ' . CONFIG_TABLE . "
+					SET config_value = '" . $valid_styles[0] . "'
+					WHERE config_name = 'default_style'");
+			}
+
+			// Reset styles for users
+			$this->sql_query('UPDATE ' . USERS_TABLE . '
+				SET user_style = 0
+				WHERE ' . $this->db->sql_in_set('user_style', $valid_styles, true));
+		}
 	}
 }
diff --git a/phpBB/includes/db/migration/data/style_update_p2.php b/phpBB/includes/db/migration/data/style_update_p2.php
index 2c0991de59..db4b7f1753 100644
--- a/phpBB/includes/db/migration/data/style_update_p2.php
+++ b/phpBB/includes/db/migration/data/style_update_p2.php
@@ -37,47 +37,6 @@ class phpbb_db_migration_data_style_update_p2 extends phpbb_db_migration
 
 	public function update_data()
 	{
-		return array(
-			array('custom', array(array($this, 'styles_update'))),
-		);
-	}
-
-	public function styles_update()
-	{
-		// Remove old entries from styles table
-		if (!sizeof($valid_styles))
-		{
-			// No valid styles: remove everything and add prosilver
-			$this->sql_query('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
-
-			$sql = 'INSERT INTO ' . STYLES_TABLE . " (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '&copy; phpBB Group', 1, 'prosilver', 'kNg=', 0, '')";
-			$this->sql_query($sql);
-
-			$sql = 'SELECT style_id
-				FROM ' . $table . "
-				WHERE style_name = 'prosilver'";
-			$result = $this->sql_query($sql);
-			$default_style = $this->db->sql_fetchfield($result);
-			$this->db->sql_freeresult($result);
-
-			set_config('default_style', $default_style);
-
-			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
-			$this->sql_query($sql);
-		}
-		else
-		{
-			// There are valid styles in styles table. Remove styles that are outdated
-			$this->sql_query('DELETE FROM ' . STYLES_TABLE . ' WHERE ' . $this->db->sql_in_set('style_id', $valid_styles, true), $errored, $error_ary);
-
-			// Change default style
-			if (!in_array($config['default_style'], $valid_styles))
-			{
-				set_config('default_style', $valid_styles[0]);
-			}
-
-			// Reset styles for users
-			$this->sql_query('UPDATE ' . USERS_TABLE . ' SET user_style = 0 WHERE ' . $this->db->sql_in_set('user_style', $valid_styles, true), $errored, $error_ary);
-		}
+		return array();
 	}
 }
diff --git a/phpBB/includes/db/migration/data/timezone.php b/phpBB/includes/db/migration/data/timezone.php
index 89fafbad28..7734ed4b76 100644
--- a/phpBB/includes/db/migration/data/timezone.php
+++ b/phpBB/includes/db/migration/data/timezone.php
@@ -51,7 +51,10 @@ class phpbb_db_migration_data_timezone extends phpbb_db_migration
 		$this->db->sql_freeresult($result);
 
 		// Update board default timezone
-		set_config('board_timezone', $this->convert_phpbb30_timezone($config['board_timezone'], $config['board_dst']));
+		$sql = 'UPDATE ' . CONFIG_TABLE . "
+			SET config_value = '" . $this->convert_phpbb30_timezone($this->config['board_timezone'], $this->config['board_dst']) . "'
+			WHERE config_name = 'board_timezone'";
+		$this->sql_query($sql);
 
 		// After we have calculated the timezones we can delete user_dst column from user table.
 		$this->db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
diff --git a/phpBB/includes/db/migration/exception.php b/phpBB/includes/db/migration/exception.php
new file mode 100644
index 0000000000..19fb39ab23
--- /dev/null
+++ b/phpBB/includes/db/migration/exception.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package db
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* The migrator is responsible for applying new migrations in the correct order.
+*
+* @package db
+*/
+class phpbb_db_migration_exception extends \Exception
+{
+	protected $parameters;
+
+	public function __construct()
+	{
+		$parameters = func_get_args();
+		$message = array_shift($parameters);
+		parent::__construct($message);
+
+		$this->parameters = $parameters;
+	}
+
+	public function __toString()
+	{
+		return $this->message . ': ' . var_export($this->parameters, true);
+	}
+}
diff --git a/phpBB/includes/db/migration/migration.php b/phpBB/includes/db/migration/migration.php
new file mode 100644
index 0000000000..c2c6da855b
--- /dev/null
+++ b/phpBB/includes/db/migration/migration.php
@@ -0,0 +1,129 @@
+<?php
+/**
+*
+* @package db
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Abstract base class for database migrations
+*
+* Each migration consists of a set of schema and data changes to be implemented
+* in a subclass. This class provides various utility methods to simplify editing
+* a phpBB.
+*
+* @package db
+*/
+abstract class phpbb_db_migration
+{
+	protected $config;
+	protected $db;
+	protected $db_tools;
+	protected $table_prefix;
+
+	protected $phpbb_root_path;
+	protected $php_ext;
+
+	protected $errors;
+
+	private $queries = array();
+
+	/**
+	* Migration constructor
+	*/
+	public function __construct($config, phpbb_db_driver $db, $db_tools, $phpbb_root_path, $php_ext, $table_prefix)
+	{
+		$this->config = $config;
+		$this->db = $db;
+		$this->db_tools = $db_tools;
+		$this->table_prefix = $table_prefix;
+
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+
+		$this->errors = array();
+	}
+
+	/**
+	* Defines other migrationsto be applied first (abstract method)
+	*
+	* @return array An array of migration class names
+	*/
+	public function depends_on()
+	{
+		return array();
+	}
+
+	/**
+	* Updates the database schema by providing a set of change instructions
+	*
+	* @return array
+	*/
+	public function update_schema()
+	{
+		return array();
+	}
+
+	/**
+	* Updates data by returning a list of instructions to be executed
+	*
+	* @return array
+	*/
+	public function update_data()
+	{
+	}
+
+	/**
+	* Wrapper for running queries to generate user feedback on updates
+	*/
+	protected function sql_query($sql)
+	{
+		$this->queries[] = $sql;
+
+		$this->db->sql_return_on_error(true);
+
+		if ($sql === 'begin')
+		{
+			$result = $this->db->sql_transaction('begin');
+		}
+		else if ($sql === 'commit')
+		{
+			$result = $this->db->sql_transaction('commit');
+		}
+		else
+		{
+			$result = $this->db->sql_query($sql);
+			if ($this->db->sql_error_triggered)
+			{
+				$this->errors[] = array(
+					'sql'	=> $this->db->sql_error_sql,
+					'code'	=> $this->db->sql_error_returned,
+				);
+			}
+		}
+
+		$this->db->sql_return_on_error(false);
+
+		return $result;
+	}
+
+	/**
+	* Get the list of queries run
+	*
+	* @return array
+	*/
+	public function get_queries()
+	{
+		return $this->queries;
+	}
+}
diff --git a/phpBB/includes/db/migration/tool/config.php b/phpBB/includes/db/migration/tool/config.php
new file mode 100644
index 0000000000..35fa3ce566
--- /dev/null
+++ b/phpBB/includes/db/migration/tool/config.php
@@ -0,0 +1,108 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interface
+{
+	/** @var phpbb_config */
+	protected $config = null;
+
+	public function __construct(phpbb_config $config)
+	{
+		$this->config = $config;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_name()
+	{
+		return 'config';
+	}
+
+	/**
+	* Config Add
+	*
+	* This function allows you to add a config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to add
+	* @param mixed $config_value The value of the config setting
+	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
+	*/
+	public function add($config_name, $config_value = '', $is_dynamic = false)
+	{
+		if (isset($this->config[$config_name]))
+		{
+			throw new phpbb_db_migration_exception('CONFIG_ALREADY_EXISTS', $config_name);
+		}
+
+		$this->config->set($config_name, $config_value, !$is_dynamic);
+
+		return false;
+	}
+
+	/**
+	* Config Update
+	*
+	* This function allows you to update an existing config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to update
+	* @param mixed $config_value The value of the config setting
+	*/
+	public function update($config_name, $config_value = '')
+	{
+		if (!isset($this->config[$config_name]))
+		{
+			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		$this->config->set($config_name, $config_value);
+
+		return false;
+	}
+
+	/**
+	* Config Update If Equals
+	*
+	* This function allows you to update a config setting if the first argument equal to the current config value
+	*
+	* @param bool $compare If equal to the current config value, will be updated to the new config value, otherwise not
+	* @param string $config_name The name of the config setting you would like to update
+	* @param mixed $config_value The value of the config setting
+	*/
+	public function update_if_equals($compare, $config_name, $config_value = '')
+	{
+		if (!isset($this->config[$config_name]))
+		{
+			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		$this->config->set_atomic($config_name, $compare, $config_value);
+
+		return false;
+	}
+
+	/**
+	* Config Remove
+	*
+	* This function allows you to remove an existing config setting.
+	*
+	* @param string $config_name The name of the config setting you would like to remove
+	*/
+	public function remove($config_name)
+	{
+		if (!isset($this->config[$config_name]))
+		{
+			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
+		}
+
+		$this->config->delete($config_name);
+
+		return false;
+	}
+}
diff --git a/phpBB/includes/db/migration/tool/interface.php b/phpBB/includes/db/migration/tool/interface.php
new file mode 100644
index 0000000000..1815f5e8a2
--- /dev/null
+++ b/phpBB/includes/db/migration/tool/interface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+interface phpbb_db_migration_tool_interface
+{
+	/**
+	* Retrieve a short name used for commands in migrations.
+	*
+	* @return string short name
+	*/
+	public function get_name();
+}
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
new file mode 100644
index 0000000000..a503f08c01
--- /dev/null
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -0,0 +1,471 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interface
+{
+	/** @var phpbb_cache_service */
+	protected $cache = null;
+
+	/** @var dbal */
+	protected $db = null;
+
+	/** @var phpbb_user */
+	protected $user = null;
+
+	/** @var string */
+	protected $phpbb_root_path = null;
+
+	/** @var string */
+	protected $php_ext = null;
+
+	/** @var string */
+	protected $modules_table = null;
+
+	public function __construct(phpbb_db_driver $db, $cache, $user, $phpbb_root_path, $php_ext, $modules_table)
+	{
+		$this->db = $db;
+		$this->cache = $cache;
+		$this->user = $user;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+		$this->modules_table = $modules_table;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_name()
+	{
+		return 'module';
+	}
+
+	/**
+	* Module Exists
+	*
+	* Check if a module exists
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
+	* @param int|string $module The module_id|module_langname you would like to check for to see if it exists
+	*
+	* @return bool true/false if module exists
+	*/
+	public function exists($class, $parent, $module)
+	{
+		// the main root directory should return true
+		if (!$module)
+		{
+			return true;
+		}
+
+		$class = $this->db->sql_escape($class);
+		$module = $this->db->sql_escape($module);
+
+		$parent_sql = '';
+		if ($parent !== false)
+		{
+			// Allows '' to be sent as 0
+			$parent = (!$parent) ? 0 : $parent;
+
+			if (!is_numeric($parent))
+			{
+				$sql = 'SELECT module_id
+					FROM ' . $this->modules_table . "
+					WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+						AND module_class = '$class'";
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				if (!$row)
+				{
+					return false;
+				}
+
+				$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
+			}
+			else
+			{
+				$parent_sql = 'AND parent_id = ' . (int) $parent;
+			}
+		}
+
+		$sql = 'SELECT module_id
+			FROM ' . $this->modules_table . "
+			WHERE module_class = '$class'
+				$parent_sql
+				AND " . ((is_numeric($module)) ? 'module_id = ' . (int) $module : "module_langname = '$module'");
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Module Add
+	*
+	* Add a new module
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string $parent The parent module_id|module_langname (0 for no parent)
+	* @param array $data an array of the data on the new module.  This can be setup in two different ways.
+	*	1. The "manual" way.  For inserting a category or one at a time.  It will be merged with the base array shown a bit below,
+	*		but at the least requires 'module_langname' to be sent, and, if you want to create a module (instead of just a category) you must send module_basename and module_mode.
+	* array(
+	*		'module_enabled'	=> 1,
+	*		'module_display'	=> 1,
+	*		'module_basename'	=> '',
+	*		'module_class'		=> $class,
+	*		'parent_id'			=> (int) $parent,
+	*		'module_langname'	=> '',
+	*		'module_mode'		=> '',
+	*		'module_auth'		=> '',
+	*	)
+	*	2. The "automatic" way.  For inserting multiple at a time based on the specs in the info file for the module(s).  For this to work the modules must be correctly setup in the info file.
+	*		An example follows (this would insert the settings, log, and flag modes from the includes/acp/info/acp_asacp.php file):
+	* array(
+	* 		'module_basename'	=> 'asacp',
+	* 		'modes'				=> array('settings', 'log', 'flag'),
+	* )
+	* 		Optionally you may not send 'modes' and it will insert all of the modules in that info file.
+	*  @param string|bool $include_path If you would like to use a custom include path, specify that here
+	*/
+	public function add($class, $parent = 0, $data = array(), $include_path = false)
+	{
+        // Allows '' to be sent as 0
+		$parent = (!$parent) ? 0 : $parent;
+
+		// allow sending the name as a string in $data to create a category
+		if (!is_array($data))
+		{
+			$data = array('module_langname' => $data);
+		}
+
+		if (!isset($data['module_langname']))
+		{
+			/**
+			* @TODO does not work with 3.1 modules yet, but must continue for old 3.0 versions for
+			* upgrades from a 3.0.x version to 3.1
+			*/
+			// The "automatic" way
+			$basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
+			$basename = str_replace(array('/', '\\'), '', $basename);
+			$class = str_replace(array('/', '\\'), '', $class);
+			$info_file = "$class/info/$basename.{$this->php_ext}";
+
+			// The manual and automatic ways both failed...
+			if (!file_exists((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file))
+			{
+				throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $info_file);
+			}
+
+			$classname = "{$basename}_info";
+
+			if (!class_exists($classname))
+			{
+				include((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file);
+			}
+
+			$info = new $classname;
+			$module = $info->module();
+			unset($info);
+
+			$result = '';
+			foreach ($module['modes'] as $mode => $module_info)
+			{
+				if (!isset($data['modes']) || in_array($mode, $data['modes']))
+				{
+					$new_module = array(
+						'module_basename'	=> $basename,
+						'module_langname'	=> $module_info['title'],
+						'module_mode'		=> $mode,
+						'module_auth'		=> $module_info['auth'],
+						'module_display'	=> (isset($module_info['display'])) ? $module_info['display'] : true,
+						'before'			=> (isset($module_info['before'])) ? $module_info['before'] : false,
+						'after'				=> (isset($module_info['after'])) ? $module_info['after'] : false,
+					);
+
+					// Run the "manual" way with the data we've collected.
+					$result .= ((isset($data['spacer'])) ? $data['spacer'] : '<br />') . $this->add($class, $parent, $new_module);
+				}
+			}
+
+			return $result;
+		}
+
+		// The "manual" way
+		add_log('admin', 'LOG_MODULE_ADD', ((isset($this->user->lang[$data['module_langname']])) ? $this->user->lang[$data['module_langname']] : $data['module_langname']));
+
+		$class = $this->db->sql_escape($class);
+
+		if (!is_numeric($parent))
+		{
+			$sql = 'SELECT module_id
+				FROM ' . $this->modules_table . "
+				WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+					AND module_class = '$class'";
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$row)
+			{
+				throw new phpbb_db_migration_exception('MODULE_PARENT_NOT_EXIST', $parent);
+			}
+
+			$parent = $data['parent_id'] = $row['module_id'];
+		}
+		else if (!$this->exists($class, false, $parent))
+		{
+			throw new phpbb_db_migration_exception('MODULE_PARENT_NOT_EXIST', $parent);
+		}
+
+		if ($this->exists($class, $parent, $data['module_langname']))
+		{
+			throw new phpbb_db_migration_exception('MODULE_ALREADY_EXIST', $data['module_langname']);
+		}
+
+		if (!class_exists('acp_modules'))
+		{
+			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
+			$this->user->add_lang('acp/modules');
+		}
+		$acp_modules = new acp_modules();
+
+		$module_data = array(
+			'module_enabled'	=> (isset($data['module_enabled'])) ? $data['module_enabled'] : 1,
+			'module_display'	=> (isset($data['module_display'])) ? $data['module_display'] : 1,
+			'module_basename'	=> (isset($data['module_basename'])) ? $data['module_basename'] : '',
+			'module_class'		=> $class,
+			'parent_id'			=> (int) $parent,
+			'module_langname'	=> (isset($data['module_langname'])) ? $data['module_langname'] : '',
+			'module_mode'		=> (isset($data['module_mode'])) ? $data['module_mode'] : '',
+			'module_auth'		=> (isset($data['module_auth'])) ? $data['module_auth'] : '',
+		);
+		$result = $acp_modules->update_module_data($module_data, true);
+
+		// update_module_data can either return a string or an empty array...
+		if (is_string($result))
+		{
+			// Error
+			throw new phpbb_db_migration_exception('MODULE_ERROR', $result);
+		}
+		else
+		{
+			// Success
+
+			// Move the module if requested above/below an existing one
+			if (isset($data['before']) && $data['before'])
+			{
+				$sql = 'SELECT left_id
+					FROM ' . $this->modules_table . '
+					WHERE module_class = \'' . $class . '\'
+						AND parent_id = ' . (int) $parent . '
+						AND module_langname = \'' . $this->db->sql_escape($data['before']) . '\'';
+				$this->db->sql_query($sql);
+				$to_left = $this->db->sql_fetchfield('left_id');
+
+				$sql = 'UPDATE ' . $this->modules_table . "
+					SET left_id = left_id + 2, right_id = right_id + 2
+					WHERE module_class = '$class'
+						AND left_id >= $to_left
+						AND left_id < {$module_data['left_id']}";
+				$this->db->sql_query($sql);
+
+				$sql = 'UPDATE ' . $this->modules_table . "
+					SET left_id = $to_left, right_id = " . ($to_left + 1) . "
+					WHERE module_class = '$class'
+						AND module_id = {$module_data['module_id']}";
+				$this->db->sql_query($sql);
+			}
+			else if (isset($data['after']) && $data['after'])
+			{
+				$sql = 'SELECT right_id
+					FROM ' . $this->modules_table . '
+					WHERE module_class = \'' . $class . '\'
+						AND parent_id = ' . (int) $parent . '
+						AND module_langname = \'' . $this->db->sql_escape($data['after']) . '\'';
+				$this->db->sql_query($sql);
+				$to_right = $this->db->sql_fetchfield('right_id');
+
+				$sql = 'UPDATE ' . $this->modules_table . "
+					SET left_id = left_id + 2, right_id = right_id + 2
+					WHERE module_class = '$class'
+						AND left_id >= $to_right
+						AND left_id < {$module_data['left_id']}";
+				$this->db->sql_query($sql);
+
+				$sql = 'UPDATE ' . $this->modules_table . '
+					SET left_id = ' . ($to_right + 1) . ', right_id = ' . ($to_right + 2) . "
+					WHERE module_class = '$class'
+						AND module_id = {$module_data['module_id']}";
+				$this->db->sql_query($sql);
+			}
+		}
+
+		// Clear the Modules Cache
+		$this->cache->destroy("_modules_$class");
+
+		return false;
+	}
+
+	/**
+	* Module Remove
+	*
+	* Remove a module
+	*
+	* @param string $class The module class(acp|mcp|ucp)
+	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
+	* @param int|string $module The module id|module_langname
+	* @param string|bool $include_path If you would like to use a custom include path, specify that here
+	*/
+	public function remove($class, $parent = 0, $module = '', $include_path = false)
+	{
+		// Imitation of module_add's "automatic" and "manual" method so the uninstaller works from the same set of instructions for umil_auto
+		if (is_array($module))
+		{
+			if (isset($module['module_langname']))
+			{
+				// Manual Method
+				return $this->remove($class, $parent, $module['module_langname'], $include_path);
+			}
+
+			// Failed.
+			if (!isset($module['module_basename']))
+			{
+				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST');
+			}
+
+			// Automatic method
+			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
+			$class = str_replace(array('/', '\\'), '', $class);
+			$info_file = "$class/info/$basename.{$this->php_ext}";
+
+			if (!file_exists((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file))
+			{
+				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $info_file);
+			}
+
+			$classname = "{$basename}_info";
+
+			if (!class_exists($classname))
+			{
+				include((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file);
+			}
+
+			$info = new $classname;
+			$module_info = $info->module();
+			unset($info);
+
+			foreach ($module_info['modes'] as $mode => $info)
+			{
+				if (!isset($module['modes']) || in_array($mode, $module['modes']))
+				{
+					$this->remove($class, $parent, $info['title']) . '<br />';
+				}
+			}
+			return false;
+		}
+		else
+		{
+			$class = $this->db->sql_escape($class);
+
+			if (!$this->exists($class, $parent, $module))
+			{
+				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', ((isset($this->user->lang[$module])) ? $this->user->lang[$module] : $module));
+			}
+
+			$parent_sql = '';
+			if ($parent !== false)
+			{
+				// Allows '' to be sent as 0
+				$parent = (!$parent) ? 0 : $parent;
+
+				if (!is_numeric($parent))
+				{
+					$sql = 'SELECT module_id
+						FROM ' . $this->modules_table . "
+						WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
+							AND module_class = '$class'";
+					$result = $this->db->sql_query($sql);
+					$row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					// we know it exists from the module_exists check
+					$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
+				}
+				else
+				{
+					$parent_sql = 'AND parent_id = ' . (int) $parent;
+				}
+			}
+
+			$module_ids = array();
+			if (!is_numeric($module))
+			{
+				$module = $this->db->sql_escape($module);
+				$sql = 'SELECT module_id
+					FROM ' . $this->modules_table . "
+					WHERE module_langname = '$module'
+						AND module_class = '$class'
+					$parent_sql";
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$module_ids[] = (int) $row['module_id'];
+				}
+				$this->db->sql_freeresult($result);
+
+				$module_name = $module;
+			}
+			else
+			{
+				$module = (int) $module;
+				$sql = 'SELECT module_langname
+					FROM ' . $this->modules_table . "
+					WHERE module_id = $module
+						AND module_class = '$class'
+					$parent_sql";
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				$module_name = $row['module_langname'];
+				$module_ids[] = $module;
+			}
+
+			if (!class_exists('acp_modules'))
+			{
+				include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
+				$this->user->add_lang('acp/modules');
+			}
+			$acp_modules = new acp_modules();
+			$acp_modules->module_class = $class;
+
+			foreach ($module_ids as $module_id)
+			{
+				$result = $acp_modules->delete_module($module_id);
+				if (!empty($result))
+				{
+					throw new phpbb_db_migration_exception('CANNOT_REMOVE_MODULE', $module_id);
+				}
+			}
+
+			$this->cache->destroy("_modules_$class");
+
+			return false;
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php
new file mode 100644
index 0000000000..ebe404bc62
--- /dev/null
+++ b/phpBB/includes/db/migration/tool/permission.php
@@ -0,0 +1,562 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_interface
+{
+	/** @var phpbb_auth */
+	protected $auth = null;
+
+	/** @var phpbb_cache_service */
+	protected $cache = null;
+
+	/** @var dbal */
+	protected $db = null;
+
+	/** @var string */
+	protected $phpbb_root_path = null;
+
+	/** @var string */
+	protected $php_ext = null;
+
+	public function __construct(phpbb_db_driver $db, $cache, phpbb_auth $auth, $phpbb_root_path, $php_ext)
+	{
+		$this->db = $db;
+		$this->cache = $cache;
+		$this->auth = $auth;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_name()
+	{
+		return 'permission';
+	}
+
+	/**
+	* Permission Exists
+	*
+	* Check if a permission (auth) setting exists
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return bool true if it exists, false if not
+	*/
+	public function exists($auth_option, $global = true)
+	{
+		if ($global)
+		{
+			$type_sql = ' AND is_global = 1';
+		}
+		else
+		{
+			$type_sql = ' AND is_local = 1';
+		}
+
+		$sql = 'SELECT auth_option_id
+			FROM ' . ACL_OPTIONS_TABLE . "
+			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'"
+				. $type_sql;
+		$result = $this->db->sql_query($sql);
+
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if ($row)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Permission Add
+	*
+	* Add a permission (auth) option
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return result
+	*/
+	public function add($auth_option, $global = true, $copy_from = false)
+	{
+		if ($this->exists($auth_option, $global))
+		{
+			throw new phpbb_db_migration_exception('PERMISSION_ALREADY_EXISTS', $auth_option);
+		}
+
+		// We've added permissions, so set to true to notify the user.
+		$this->permissions_added = true;
+
+		if (!class_exists('auth_admin'))
+		{
+			include($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
+		}
+		$auth_admin = new auth_admin();
+
+		// We have to add a check to see if the !$global (if global, local, and if local, global) permission already exists.  If it does, acl_add_option currently has a bug which would break the ACL system, so we are having a work-around here.
+		if ($this->exists($auth_option, !$global))
+		{
+			$sql_ary = array(
+				'is_global'	=> 1,
+				'is_local'	=> 1,
+			);
+			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+				WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'";
+			$this->db->sql_query($sql);
+		}
+		else
+		{
+			if ($global)
+			{
+				$auth_admin->acl_add_option(array('global' => array($auth_option)));
+			}
+			else
+			{
+				$auth_admin->acl_add_option(array('local' => array($auth_option)));
+			}
+		}
+
+		// The permission has been added, now we can copy it if needed
+		if ($copy_from && isset($auth_admin->acl_options['id'][$copy_from]))
+		{
+			$old_id = $auth_admin->acl_options['id'][$copy_from];
+			$new_id = $auth_admin->acl_options['id'][$auth_option];
+
+			$tables = array(ACL_GROUPS_TABLE, ACL_ROLES_DATA_TABLE, ACL_USERS_TABLE);
+
+			foreach ($tables as $table)
+			{
+				$sql = 'SELECT *
+					FROM ' . $table . '
+					WHERE auth_option_id = ' . $old_id;
+				$result = $this->db->sql_query($sql);
+
+				$sql_ary = array();
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$row['auth_option_id'] = $new_id;
+					$sql_ary[] = $row;
+				}
+				$this->db->sql_freeresult($result);
+
+				if (sizeof($sql_ary))
+				{
+					$this->db->sql_multi_insert($table, $sql_ary);
+				}
+			}
+
+			$auth_admin->acl_clear_prefetch();
+		}
+
+		return false;
+	}
+
+	/**
+	* Permission Remove
+	*
+	* Remove a permission (auth) option
+	*
+	* @param string $auth_option The name of the permission (auth) option
+	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	*
+	* @return result
+	*/
+	public function remove($auth_option, $global = true)
+	{
+		if (!$this->exists($auth_option, $global))
+		{
+			throw new phpbb_db_migration_exception('PERMISSION_NOT_EXIST', $auth_option);
+		}
+
+		if ($global)
+		{
+			$type_sql = ' AND is_global = 1';
+		}
+		else
+		{
+			$type_sql = ' AND is_local = 1';
+		}
+		$sql = 'SELECT auth_option_id, is_global, is_local
+			FROM ' . ACL_OPTIONS_TABLE . "
+			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'" .
+				$type_sql;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$id = $row['auth_option_id'];
+
+		// If it is a local and global permission, do not remove the row! :P
+		if ($row['is_global'] && $row['is_local'])
+		{
+			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
+				SET ' . (($global) ? 'is_global = 0' : 'is_local = 0') . '
+				WHERE auth_option_id = ' . $id;
+			$this->db->sql_query($sql);
+		}
+		else
+		{
+			// Delete time
+			$this->db->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $id);
+			$this->db->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $id);
+		}
+
+		// Purge the auth cache
+		$this->cache->destroy('_acl_options');
+		$this->auth->acl_clear_prefetch();
+
+		return false;
+	}
+
+	/**
+	* Add a new permission role
+	*
+	* @param string $role_name The new role name
+	* @param sting $role_type The type (u_, m_, a_)
+	*/
+	public function role_add($role_name, $role_type = '', $role_description = '')
+	{
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = '" . $this->db->sql_escape($role_name) . "'";
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if ($role_id)
+		{
+			throw new phpbb_db_migration_exception('ROLE_ALREADY_EXISTS', $old_role_name);
+		}
+
+		$sql = 'SELECT MAX(role_order) AS max
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_type = '" . $this->db->sql_escape($role_type) . "'";
+		$this->db->sql_query($sql);
+		$role_order = $this->db->sql_fetchfield('max');
+		$role_order = (!$role_order) ? 1 : $role_order + 1;
+
+		$sql_ary = array(
+			'role_name'			=> $role_name,
+			'role_description'	=> $role_description,
+			'role_type'			=> $role_type,
+			'role_order'		=> $role_order,
+		);
+
+		$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+		$this->db->sql_query($sql);
+
+		return false;
+	}
+
+	/**
+	* Update the name on a permission role
+	*
+	* @param string $old_role_name The old role name
+	* @param string $new_role_name The new role name
+	*/
+	public function role_update($old_role_name, $new_role_name = '')
+	{
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = '" . $this->db->sql_escape($old_role_name) . "'";
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if (!$role_id)
+		{
+			throw new phpbb_db_migration_exception('ROLE_NOT_EXISTS', $old_role_name);
+		}
+
+		$sql = 'UPDATE ' . ACL_ROLES_TABLE . "
+			SET role_name = '" . $this->db->sql_escape($new_role_name) . "'
+			WHERE role_name = '" . $this->db->sql_escape($old_role_name) . "'";
+		$this->db->sql_query($sql);
+
+		return false;
+	}
+
+	/**
+	* Remove a permission role
+	*
+	* @param string $role_name The role name to remove
+	*/
+	public function role_remove($role_name)
+	{
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = '" . $this->db->sql_escape($role_name) . "'";
+		$this->db->sql_query($sql);
+		$role_id = $this->db->sql_fetchfield('role_id');
+
+		if (!$role_id)
+		{
+			throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $role_name);
+		}
+
+		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
+			WHERE role_id = ' . $role_id;
+		$this->db->sql_query($sql);
+
+		$sql = 'DELETE FROM ' . ACL_ROLES_TABLE . '
+			WHERE role_id = ' . $role_id;
+		$this->db->sql_query($sql);
+
+		$this->auth->acl_clear_prefetch();
+
+		return false;
+	}
+
+	/**
+	* Permission Set
+	*
+	* Allows you to set permissions for a certain group/role
+	*
+	* @param string $name The name of the role/group
+	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
+	* @param string $type The type (role|group)
+	* @param bool $has_permission True if you want to give them permission, false if you want to deny them permission
+	*/
+	public function permission_set($name, $auth_option = array(), $type = 'role', $has_permission = true)
+	{
+		if (!is_array($auth_option))
+		{
+			$auth_option = array($auth_option);
+		}
+
+		$new_auth = array();
+		$sql = 'SELECT auth_option_id
+			FROM ' . ACL_OPTIONS_TABLE . '
+			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$new_auth[] = $row['auth_option_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!sizeof($new_auth))
+		{
+			return false;
+		}
+
+		$current_auth = array();
+
+		$type = (string) $type; // Prevent PHP bug.
+
+		switch ($type)
+		{
+			case 'role' :
+				$sql = 'SELECT role_id
+					FROM ' . ACL_ROLES_TABLE . "
+					WHERE role_name = '" . $this->db->sql_escape($name) . "'";
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('role_id');
+
+				if (!$role_id)
+				{
+					throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name);
+				}
+
+				$sql = 'SELECT auth_option_id, auth_setting
+					FROM ' . ACL_ROLES_DATA_TABLE . '
+					WHERE role_id = ' . $role_id;
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
+				}
+				$this->db->sql_freeresult($result);
+			break;
+
+			case 'group' :
+				$sql = 'SELECT group_id
+					FROM ' . GROUPS_TABLE . "
+					WHERE group_name = '" . $this->db->sql_escape($name) . "'";
+				$this->db->sql_query($sql);
+				$group_id = $this->db->sql_fetchfield('group_id');
+
+				if (!$group_id)
+				{
+					throw new phpbb_db_migration_exception('GROUP_NOT_EXIST', $name);
+				}
+
+				// If the group has a role set for them we will add the requested permissions to that role.
+				$sql = 'SELECT auth_role_id
+					FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id . '
+						AND auth_role_id <> 0
+						AND forum_id = 0';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('auth_role_id');
+				if ($role_id)
+				{
+					$sql = 'SELECT role_name
+						FROM ' . ACL_ROLES_TABLE . '
+						WHERE role_id = ' . $role_id;
+					$this->db->sql_query($sql);
+					$role_name = $this->db->sql_fetchfield('role_name');
+
+					return $this->set($role_name, $auth_option, 'role', $has_permission);
+				}
+
+				$sql = 'SELECT auth_option_id, auth_setting
+					FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id;
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
+				}
+				$this->db->sql_freeresult($result);
+			break;
+		}
+
+		$sql_ary = array();
+		switch ($type)
+		{
+			case 'role' :
+				foreach ($new_auth as $auth_option_id)
+				{
+					if (!isset($current_auth[$auth_option_id]))
+					{
+						$sql_ary[] = array(
+							'role_id'			=> $role_id,
+							'auth_option_id'	=> $auth_option_id,
+							'auth_setting'		=> $has_permission,
+				        );
+					}
+				}
+
+				$this->db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary);
+			break;
+
+			case 'group' :
+				foreach ($new_auth as $auth_option_id)
+				{
+					if (!isset($current_auth[$auth_option_id]))
+					{
+						$sql_ary[] = array(
+							'group_id'			=> $group_id,
+							'auth_option_id'	=> $auth_option_id,
+							'auth_setting'		=> $has_permission,
+				        );
+					}
+				}
+
+				$this->db->sql_multi_insert(ACL_GROUPS_TABLE, $sql_ary);
+			break;
+		}
+
+		$this->auth->acl_clear_prefetch();
+
+		return false;
+	}
+
+	/**
+	* Permission Unset
+	*
+	* Allows you to unset (remove) permissions for a certain group/role
+	*
+	* @param string $name The name of the role/group
+	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
+	* @param string $type The type (role|group)
+	*/
+	public function permission_unset($name, $auth_option = array(), $type = 'role')
+	{
+		if (!is_array($auth_option))
+		{
+			$auth_option = array($auth_option);
+		}
+
+		$to_remove = array();
+		$sql = 'SELECT auth_option_id
+			FROM ' . ACL_OPTIONS_TABLE . '
+			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$to_remove[] = $row['auth_option_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!sizeof($to_remove))
+		{
+			return false;
+		}
+
+		$type = (string) $type; // Prevent PHP bug.
+
+		switch ($type)
+		{
+			case 'role' :
+				$sql = 'SELECT role_id
+					FROM ' . ACL_ROLES_TABLE . "
+					WHERE role_name = '" . $this->db->sql_escape($name) . "'";
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('role_id');
+
+				if (!$role_id)
+				{
+				throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name);
+				}
+
+				$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
+					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
+				$this->db->sql_query($sql);
+			break;
+
+			case 'group' :
+				$sql = 'SELECT group_id
+					FROM ' . GROUPS_TABLE . "
+					WHERE group_name = '" . $this->db->sql_escape($name) . "'";
+				$this->db->sql_query($sql);
+				$group_id = $this->db->sql_fetchfield('group_id');
+
+				if (!$group_id)
+				{
+					throw new phpbb_db_migration_exception('GROUP_NOT_EXIST', $name);
+				}
+
+				// If the group has a role set for them we will remove the requested permissions from that role.
+				$sql = 'SELECT auth_role_id
+					FROM ' . ACL_GROUPS_TABLE . '
+					WHERE group_id = ' . $group_id . '
+						AND auth_role_id <> 0';
+				$this->db->sql_query($sql);
+				$role_id = $this->db->sql_fetchfield('auth_role_id');
+				if ($role_id)
+				{
+					$sql = 'SELECT role_name
+						FROM ' . ACL_ROLES_TABLE . '
+						WHERE role_id = ' . $role_id;
+					$this->db->sql_query($sql);
+					$role_name = $this->db->sql_fetchfield('role_name');
+
+					return $this->permission_unset($role_name, $auth_option, 'role');
+				}
+
+				$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
+					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
+				$this->db->sql_query($sql);
+			break;
+		}
+
+		$this->auth->acl_clear_prefetch();
+
+		return false;
+	}
+}
diff --git a/phpBB/includes/db/migration/tools/config.php b/phpBB/includes/db/migration/tools/config.php
deleted file mode 100644
index 2d58c8093c..0000000000
--- a/phpBB/includes/db/migration/tools/config.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_tools_config
-{
-	/** @var phpbb_config */
-	protected $config = null;
-
-	public function __construct(phpbb_config $config)
-	{
-		$this->config = $config;
-	}
-
-	/**
-	* Config Add
-	*
-	* This function allows you to add a config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to add
-	* @param mixed $config_value The value of the config setting
-	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
-	*/
-	public function add($config_name, $config_value = '', $is_dynamic = false)
-	{
-		if (isset($this->config[$config_name]))
-		{
-			throw new phpbb_db_migration_exception('CONFIG_ALREADY_EXISTS', $config_name);
-		}
-
-		$this->config->set($config_name, $config_value, $is_dynamic);
-
-		return false;
-	}
-
-	/**
-	* Config Update
-	*
-	* This function allows you to update an existing config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to update
-	* @param mixed $config_value The value of the config setting
-	*/
-	public function update($config_name, $config_value = '')
-	{
-		if (!isset($this->config[$config_name]))
-		{
-			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
-		}
-
-		$this->config->set($config_name, $config_value);
-
-		return false;
-	}
-
-	/**
-	* Config Update If Equals
-	*
-	* This function allows you to update a config setting if the first argument equal to the current config value
-	*
-	* @param bool $compare If equal to the current config value, will be updated to the new config value, otherwise not
-	* @param string $config_name The name of the config setting you would like to update
-	* @param mixed $config_value The value of the config setting
-	*/
-	public function update_if_equals($compare, $config_name, $config_value = '')
-	{
-		if (!isset($this->config[$config_name]))
-		{
-			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
-		}
-
-		$this->config->set_atomic($config_name, $compare, $config_value);
-
-		return false;
-	}
-
-	/**
-	* Config Remove
-	*
-	* This function allows you to remove an existing config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to remove
-	*/
-	public function remove($config_name)
-	{
-		if (!isset($this->config[$config_name]))
-		{
-			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
-		}
-
-		$this->config->delete($config_name);
-
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/phpBB/includes/db/migration/tools/module.php b/phpBB/includes/db/migration/tools/module.php
deleted file mode 100644
index e17197d73e..0000000000
--- a/phpBB/includes/db/migration/tools/module.php
+++ /dev/null
@@ -1,447 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_tools_module
-{
-	/** @var phpbb_cache_service */
-	protected $cache = null;
-
-	/** @var dbal */
-	protected $db = null;
-
-	/** @var phpbb_user */
-	protected $user = null;
-
-	/** @var string */
-	protected $phpbb_root_path = null;
-
-	/** @var string */
-	protected $php_ext = null;
-
-	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, $user, $phpbb_root_path, $php_ext)
-	{
-		$this->db = $db;
-		$this->cache = $cache;
-		$this->user = $user;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	* Module Exists
-	*
-	* Check if a module exists
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
-	* @param int|string $module The module_id|module_langname you would like to check for to see if it exists
-	*
-	* @return bool true/false if module exists
-	*/
-	public function exists($class, $parent, $module)
-	{
-		// the main root directory should return true
-		if (!$module)
-		{
-			return true;
-		}
-
-		$class = $this->db->sql_escape($class);
-		$module = $this->db->sql_escape($module);
-
-		$parent_sql = '';
-		if ($parent !== false)
-		{
-			// Allows '' to be sent as 0
-			$parent = (!$parent) ? 0 : $parent;
-
-			if (!is_numeric($parent))
-			{
-				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-					WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-						AND module_class = '$class'";
-				$result = $this->db->sql_query($sql);
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					return false;
-				}
-
-				$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
-			}
-			else
-			{
-				$parent_sql = 'AND parent_id = ' . (int) $parent;
-			}
-		}
-
-		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-			WHERE module_class = '$class'
-				$parent_sql
-				AND " . ((is_numeric($module)) ? 'module_id = ' . (int) $module : "module_langname = '$module'");
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Module Add
-	*
-	* Add a new module
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string $parent The parent module_id|module_langname (0 for no parent)
-	* @param array $data an array of the data on the new module.  This can be setup in two different ways.
-	*	1. The "manual" way.  For inserting a category or one at a time.  It will be merged with the base array shown a bit below,
-	*		but at the least requires 'module_langname' to be sent, and, if you want to create a module (instead of just a category) you must send module_basename and module_mode.
-	* array(
-	*		'module_enabled'	=> 1,
-	*		'module_display'	=> 1,
-	*		'module_basename'	=> '',
-	*		'module_class'		=> $class,
-	*		'parent_id'			=> (int) $parent,
-	*		'module_langname'	=> '',
-	*		'module_mode'		=> '',
-	*		'module_auth'		=> '',
-	*	)
-	*	2. The "automatic" way.  For inserting multiple at a time based on the specs in the info file for the module(s).  For this to work the modules must be correctly setup in the info file.
-	*		An example follows (this would insert the settings, log, and flag modes from the includes/acp/info/acp_asacp.php file):
-	* array(
-	* 		'module_basename'	=> 'asacp',
-	* 		'modes'				=> array('settings', 'log', 'flag'),
-	* )
-	* 		Optionally you may not send 'modes' and it will insert all of the modules in that info file.
-	*  @param string|bool $include_path If you would like to use a custom include path, specify that here
-	*/
-	public function add($class, $parent = 0, $data = array(), $include_path = false)
-	{
-        // Allows '' to be sent as 0
-		$parent = (!$parent) ? 0 : $parent;
-
-		// allow sending the name as a string in $data to create a category
-		if (!is_array($data))
-		{
-			$data = array('module_langname' => $data);
-		}
-
-		if (!isset($data['module_langname']))
-		{
-			/**
-			* @TODO does not work with 3.1 modules yet, but must continue for old 3.0 versions for
-			* upgrades from a 3.0.x version to 3.1
-			*/
-			// The "automatic" way
-			$basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
-			$basename = str_replace(array('/', '\\'), '', $basename);
-			$class = str_replace(array('/', '\\'), '', $class);
-			$info_file = "$class/info/{$class}_$basename.{$this->php_ext}";
-
-			// The manual and automatic ways both failed...
-			if (!file_exists((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file))
-			{
-				throw new phpbb_db_migration_exception('MODULE_ADD', $class, $info_file);
-			}
-
-			$classname = "{$class}_{$basename}_info";
-
-			if (!class_exists($classname))
-			{
-				include((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file);
-			}
-
-			$info = new $classname;
-			$module = $info->module();
-			unset($info);
-
-			$result = '';
-			foreach ($module['modes'] as $mode => $module_info)
-			{
-				if (!isset($data['modes']) || in_array($mode, $data['modes']))
-				{
-					$new_module = array(
-						'module_basename'	=> $basename,
-						'module_langname'	=> $module_info['title'],
-						'module_mode'		=> $mode,
-						'module_auth'		=> $module_info['auth'],
-						'module_display'	=> (isset($module_info['display'])) ? $module_info['display'] : true,
-						'before'			=> (isset($module_info['before'])) ? $module_info['before'] : false,
-						'after'				=> (isset($module_info['after'])) ? $module_info['after'] : false,
-					);
-
-					// Run the "manual" way with the data we've collected.
-					$result .= ((isset($data['spacer'])) ? $data['spacer'] : '<br />') . $this->add($class, $parent, $new_module);
-				}
-			}
-
-			return $result;
-		}
-
-		// The "manual" way
-		add_log('admin', 'LOG_MODULE_ADD', ((isset($this->user->lang[$data['module_langname']])) ? $this->user->lang[$data['module_langname']] : $data['module_langname']));
-
-		$class = $this->db->sql_escape($class);
-
-		if (!is_numeric($parent))
-		{
-			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-				WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-					AND module_class = '$class'";
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$row)
-			{
-				throw new phpbb_db_migration_exception('MODULE_PARENT_NOT_EXIST', $parent);
-			}
-
-			$parent = $data['parent_id'] = $row['module_id'];
-		}
-		else if (!$this->exists($class, false, $parent))
-		{
-			throw new phpbb_db_migration_exception('MODULE_PARENT_NOT_EXIST', $parent);
-		}
-
-		if ($this->exists($class, $parent, $data['module_langname']))
-		{
-			throw new phpbb_db_migration_exception('MODULE_ALREADY_EXIST', $data['module_langname']);
-		}
-
-		if (!class_exists('acp_modules'))
-		{
-			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
-			$this->user->add_lang('acp/modules');
-		}
-		$acp_modules = new acp_modules();
-
-		$module_data = array(
-			'module_enabled'	=> (isset($data['module_enabled'])) ? $data['module_enabled'] : 1,
-			'module_display'	=> (isset($data['module_display'])) ? $data['module_display'] : 1,
-			'module_basename'	=> (isset($data['module_basename'])) ? $data['module_basename'] : '',
-			'module_class'		=> $class,
-			'parent_id'			=> (int) $parent,
-			'module_langname'	=> (isset($data['module_langname'])) ? $data['module_langname'] : '',
-			'module_mode'		=> (isset($data['module_mode'])) ? $data['module_mode'] : '',
-			'module_auth'		=> (isset($data['module_auth'])) ? $data['module_auth'] : '',
-		);
-		$result = $acp_modules->update_module_data($module_data, true);
-
-		// update_module_data can either return a string or an empty array...
-		if (is_string($result))
-		{
-			// Error
-			throw new phpbb_db_migration_exception('MODULE_ERROR', $result);
-		}
-		else
-		{
-			// Success
-
-			// Move the module if requested above/below an existing one
-			if (isset($data['before']) && $data['before'])
-			{
-				$sql = 'SELECT left_id FROM ' . MODULES_TABLE . '
-					WHERE module_class = \'' . $class . '\'
-						AND parent_id = ' . (int) $parent . '
-						AND module_langname = \'' . $this->db->sql_escape($data['before']) . '\'';
-				$this->db->sql_query($sql);
-				$to_left = $this->db->sql_fetchfield('left_id');
-
-				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE module_class = '$class'
-						AND left_id >= $to_left
-						AND left_id < {$module_data['left_id']}";
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = $to_left, right_id = " . ($to_left + 1) . "
-					WHERE module_class = '$class'
-						AND module_id = {$module_data['module_id']}";
-				$this->db->sql_query($sql);
-			}
-			else if (isset($data['after']) && $data['after'])
-			{
-				$sql = 'SELECT right_id FROM ' . MODULES_TABLE . '
-					WHERE module_class = \'' . $class . '\'
-						AND parent_id = ' . (int) $parent . '
-						AND module_langname = \'' . $this->db->sql_escape($data['after']) . '\'';
-				$this->db->sql_query($sql);
-				$to_right = $this->db->sql_fetchfield('right_id');
-
-				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE module_class = '$class'
-						AND left_id >= $to_right
-						AND left_id < {$module_data['left_id']}";
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . MODULES_TABLE . ' SET left_id = ' . ($to_right + 1) . ', right_id = ' . ($to_right + 2) . "
-					WHERE module_class = '$class'
-						AND module_id = {$module_data['module_id']}";
-				$this->db->sql_query($sql);
-			}
-		}
-
-		// Clear the Modules Cache
-		$this->cache->destroy("_modules_$class");
-
-		return false;
-	}
-
-	/**
-	* Module Remove
-	*
-	* Remove a module
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
-	* @param int|string $module The module id|module_langname
-	* @param string|bool $include_path If you would like to use a custom include path, specify that here
-	*/
-	public function remove($class, $parent = 0, $module = '', $include_path = false)
-	{
-		// Imitation of module_add's "automatic" and "manual" method so the uninstaller works from the same set of instructions for umil_auto
-		if (is_array($module))
-		{
-			if (isset($module['module_langname']))
-			{
-				// Manual Method
-				return $this->remove($class, $parent, $module['module_langname'], $include_path);
-			}
-
-			// Failed.
-			if (!isset($module['module_basename']))
-			{
-				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST');
-			}
-
-			// Automatic method
-			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
-			$class = str_replace(array('/', '\\'), '', $class);
-			$info_file = "$class/info/{$class}_$basename.{$this->php_ext}";
-
-			if (!file_exists((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file))
-			{
-				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $info_file);
-			}
-
-			$classname = "{$class}_{$basename}_info";
-
-			if (!class_exists($classname))
-			{
-				include((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file);
-			}
-
-			$info = new $classname;
-			$module_info = $info->module();
-			unset($info);
-
-			foreach ($module_info['modes'] as $mode => $info)
-			{
-				if (!isset($module['modes']) || in_array($mode, $module['modes']))
-				{
-					$this->remove($class, $parent, $info['title']) . '<br />';
-				}
-			}
-			return false;
-		}
-		else
-		{
-			$class = $this->db->sql_escape($class);
-
-			if (!$this->exists($class, $parent, $module))
-			{
-				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', ((isset($this->user->lang[$module])) ? $this->user->lang[$module] : $module));
-			}
-
-			$parent_sql = '';
-			if ($parent !== false)
-			{
-				// Allows '' to be sent as 0
-				$parent = (!$parent) ? 0 : $parent;
-
-				if (!is_numeric($parent))
-				{
-					$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-						WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-							AND module_class = '$class'";
-					$result = $this->db->sql_query($sql);
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					// we know it exists from the module_exists check
-					$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
-				}
-				else
-				{
-					$parent_sql = 'AND parent_id = ' . (int) $parent;
-				}
-			}
-
-			$module_ids = array();
-			if (!is_numeric($module))
-			{
-				$module = $this->db->sql_escape($module);
-				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-					WHERE module_langname = '$module'
-						AND module_class = '$class'
-					$parent_sql";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$module_ids[] = (int) $row['module_id'];
-				}
-				$this->db->sql_freeresult($result);
-
-				$module_name = $module;
-			}
-			else
-			{
-				$module = (int) $module;
-				$sql = 'SELECT module_langname FROM ' . MODULES_TABLE . "
-					WHERE module_id = $module
-						AND module_class = '$class'
-					$parent_sql";
-				$result = $this->db->sql_query($sql);
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$module_name = $row['module_langname'];
-				$module_ids[] = $module;
-			}
-
-			if (!class_exists('acp_modules'))
-			{
-				include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
-				$this->user->add_lang('acp/modules');
-			}
-			$acp_modules = new acp_modules();
-			$acp_modules->module_class = $class;
-
-			foreach ($module_ids as $module_id)
-			{
-				$result = $acp_modules->delete_module($module_id);
-				if (!empty($result))
-				{
-					throw new phpbb_db_migration_exception('CANNOT_REMOVE_MODULE', $module_id);
-				}
-			}
-
-			$cache->destroy("_modules_$class");
-
-			return false;
-		}
-	}
-}
\ No newline at end of file
diff --git a/phpBB/includes/db/migration/tools/permission.php b/phpBB/includes/db/migration/tools/permission.php
deleted file mode 100644
index 7694bae0cb..0000000000
--- a/phpBB/includes/db/migration/tools/permission.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_tools_permission extends phpbb_db_migration_tools_base
-{
-	/** @var phpbb_auth */
-	protected $auth = null;
-
-	/** @var phpbb_cache_service */
-	protected $cache = null;
-
-	/** @var dbal */
-	protected $db = null;
-
-	/** @var string */
-	protected $phpbb_root_path = null;
-
-	/** @var string */
-	protected $php_ext = null;
-
-	public function __construct(dbal $db, phpbb_cache_driver_interface $cache, phpbb_auth $auth, $phpbb_root_path, $php_ext)
-	{
-		$this->db = $db;
-		$this->cache = $cache;
-		$this->auth = $auth;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	* Permission Exists
-	*
-	* Check if a permission (auth) setting exists
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
-	* @return bool true if it exists, false if not
-	*/
-	public function exists($auth_option, $global = true)
-	{
-		if ($global)
-		{
-			$type_sql = ' AND is_global = 1';
-		}
-		else
-		{
-			$type_sql = ' AND is_local = 1';
-		}
-
-		$sql = 'SELECT auth_option_id
-			FROM ' . ACL_OPTIONS_TABLE . "
-			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'"
-				. $type_sql;
-		$result = $this->db->sql_query($sql);
-
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Permission Add
-	*
-	* Add a permission (auth) option
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
-	* @return result
-	*/
-	public function add($auth_option, $global = true)
-	{
-		if ($this->exists($auth_option, $global))
-		{
-			throw new phpbb_db_migration_exception('PERMISSION_ALREADY_EXISTS', $auth_option);
-		}
-
-		// We've added permissions, so set to true to notify the user.
-		$this->permissions_added = true;
-
-		if (!class_exists('auth_admin'))
-		{
-			include($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
-		}
-		$auth_admin = new auth_admin();
-
-		// We have to add a check to see if the !$global (if global, local, and if local, global) permission already exists.  If it does, acl_add_option currently has a bug which would break the ACL system, so we are having a work-around here.
-		if ($this->exists($auth_option, !$global))
-		{
-			$sql_ary = array(
-				'is_global'	=> 1,
-				'is_local'	=> 1,
-			);
-			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE auth_option = \'' . $this->db->sql_escape($auth_option) . "'";
-			$this->db->sql_query($sql);
-		}
-		else
-		{
-			if ($global)
-			{
-				$auth_admin->acl_add_option(array('global' => array($auth_option)));
-			}
-			else
-			{
-				$auth_admin->acl_add_option(array('local' => array($auth_option)));
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Permission Remove
-	*
-	* Remove a permission (auth) option
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
-	* @return result
-	*/
-	public function remove($auth_option, $global = true)
-	{
-		if (!$this->exists($auth_option, $global))
-		{
-			throw new phpbb_db_migration_exception('PERMISSION_NOT_EXIST', $auth_option);
-		}
-
-		if ($global)
-		{
-			$type_sql = ' AND is_global = 1';
-		}
-		else
-		{
-			$type_sql = ' AND is_local = 1';
-		}
-		$sql = 'SELECT auth_option_id, is_global, is_local FROM ' . ACL_OPTIONS_TABLE . "
-			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'" .
-				$type_sql;
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		$id = $row['auth_option_id'];
-
-		// If it is a local and global permission, do not remove the row! :P
-		if ($row['is_global'] && $row['is_local'])
-		{
-			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
-				SET ' . (($global) ? 'is_global = 0' : 'is_local = 0') . '
-				WHERE auth_option_id = ' . $id;
-			$this->db->sql_query($sql);
-		}
-		else
-		{
-			// Delete time
-			$this->db->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $id);
-		}
-
-		// Purge the auth cache
-		$this->cache->destroy('_acl_options');
-		$this->auth->acl_clear_prefetch();
-
-		return false;
-	}
-
-	/**
-	* Add a new permission role
-	*
-	* @param string $role_name The new role name
-	* @param sting $role_type The type (u_, m_, a_)
-	*/
-	public function role_add($role_name, $role_type = '', $role_description = '')
-	{
-		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
-		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
-
-		if ($role_id)
-		{
-			throw new phpbb_db_migration_exception('ROLE_ALREADY_EXISTS', $old_role_name);
-		}
-
-		$sql = 'SELECT MAX(role_order) AS max FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_type = \'' . $this->db->sql_escape($role_type) . '\'';
-		$this->db->sql_query($sql);
-		$role_order = $this->db->sql_fetchfield('max');
-		$role_order = (!$role_order) ? 1 : $role_order + 1;
-
-		$sql_ary = array(
-			'role_name'			=> $role_name,
-			'role_description'	=> $role_description,
-			'role_type'			=> $role_type,
-			'role_order'		=> $role_order,
-		);
-
-		$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
-		$this->db->sql_query($sql);
-
-		return false;
-	}
-
-	/**
-	* Update the name on a permission role
-	*
-	* @param string $old_role_name The old role name
-	* @param string $new_role_name The new role name
-	*/
-	public function role_update($old_role_name, $new_role_name = '')
-	{
-		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
-		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
-
-		if (!$role_id)
-		{
-			throw new phpbb_db_migration_exception('ROLE_NOT_EXISTS', $old_role_name);
-		}
-
-		$sql = 'UPDATE ' . ACL_ROLES_TABLE . '
-			SET role_name = \'' . $this->db->sql_escape($new_role_name) . '\'
-			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
-		$this->db->sql_query($sql);
-
-		return false;
-	}
-
-	/**
-	* Remove a permission role
-	*
-	* @param string $role_name The role name to remove
-	*/
-	public function role_remove($role_name)
-	{
-		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
-		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
-
-		if (!$role_id)
-		{
-			throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $role_name);
-		}
-
-		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-			WHERE role_id = ' . $role_id;
-		$this->db->sql_query($sql);
-
-		$sql = 'DELETE FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_id = ' . $role_id;
-		$this->db->sql_query($sql);
-
-		$this->auth->acl_clear_prefetch();
-
-		return false;
-	}
-
-	/**
-	* Permission Set
-	*
-	* Allows you to set permissions for a certain group/role
-	*
-	* @param string $name The name of the role/group
-	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
-	* @param string $type The type (role|group)
-	* @param bool $has_permission True if you want to give them permission, false if you want to deny them permission
-	*/
-	public function permission_set($name, $auth_option = array(), $type = 'role', $has_permission = true)
-	{
-		if (!is_array($auth_option))
-		{
-			$auth_option = array($auth_option);
-		}
-
-		$new_auth = array();
-		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$new_auth[] = $row['auth_option_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!sizeof($new_auth))
-		{
-			return false;
-		}
-
-		$current_auth = array();
-
-		$type = (string) $type; // Prevent PHP bug.
-
-		switch ($type)
-		{
-			case 'role' :
-				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('role_id');
-
-				if (!$role_id)
-				{
-					throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name);
-				}
-
-				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_ROLES_DATA_TABLE . '
-					WHERE role_id = ' . $role_id;
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
-				}
-				$this->db->sql_freeresult($result);
-			break;
-
-			case 'group' :
-				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . ' WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$group_id = $this->db->sql_fetchfield('group_id');
-
-				if (!$group_id)
-				{
-					throw new phpbb_db_migration_exception('GROUP_NOT_EXIST', $name);
-				}
-
-				// If the group has a role set for them we will add the requested permissions to that role.
-				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id . '
-						AND auth_role_id <> 0
-						AND forum_id = 0';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('auth_role_id');
-				if ($role_id)
-				{
-					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
-						WHERE role_id = ' . $role_id;
-					$this->db->sql_query($sql);
-					$role_name = $this->db->sql_fetchfield('role_name');
-
-					return $this->set($role_name, $auth_option, 'role', $has_permission);
-				}
-
-				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id;
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
-				}
-				$this->db->sql_freeresult($result);
-			break;
-		}
-
-		$sql_ary = array();
-		switch ($type)
-		{
-			case 'role' :
-				foreach ($new_auth as $auth_option_id)
-				{
-					if (!isset($current_auth[$auth_option_id]))
-					{
-						$sql_ary[] = array(
-							'role_id'			=> $role_id,
-							'auth_option_id'	=> $auth_option_id,
-							'auth_setting'		=> $has_permission,
-				        );
-					}
-				}
-
-				$this->db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary);
-			break;
-
-			case 'group' :
-				foreach ($new_auth as $auth_option_id)
-				{
-					if (!isset($current_auth[$auth_option_id]))
-					{
-						$sql_ary[] = array(
-							'group_id'			=> $group_id,
-							'auth_option_id'	=> $auth_option_id,
-							'auth_setting'		=> $has_permission,
-				        );
-					}
-				}
-
-				$this->db->sql_multi_insert(ACL_GROUPS_TABLE, $sql_ary);
-			break;
-		}
-
-		$this->auth->acl_clear_prefetch();
-
-		return false;
-	}
-
-	/**
-	* Permission Unset
-	*
-	* Allows you to unset (remove) permissions for a certain group/role
-	*
-	* @param string $name The name of the role/group
-	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
-	* @param string $type The type (role|group)
-	*/
-	public function permission_unset($name, $auth_option = array(), $type = 'role')
-	{
-		if (!is_array($auth_option))
-		{
-			$auth_option = array($auth_option);
-		}
-
-		$to_remove = array();
-		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$to_remove[] = $row['auth_option_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!sizeof($to_remove))
-		{
-			return false;
-		}
-
-		$type = (string) $type; // Prevent PHP bug.
-
-		switch ($type)
-		{
-			case 'role' :
-				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('role_id');
-
-				if (!$role_id)
-				{
-				throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name);
-				}
-
-				$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
-				$this->db->sql_query($sql);
-			break;
-
-			case 'group' :
-				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . '
-					WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$group_id = $this->db->sql_fetchfield('group_id');
-
-				if (!$group_id)
-				{
-					throw new phpbb_db_migration_exception('GROUP_NOT_EXIST', $name);
-				}
-
-				// If the group has a role set for them we will remove the requested permissions from that role.
-				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id . '
-						AND auth_role_id <> 0';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('auth_role_id');
-				if ($role_id)
-				{
-					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
-						WHERE role_id = ' . $role_id;
-					$this->db->sql_query($sql);
-					$role_name = $this->db->sql_fetchfield('role_name');
-
-					return $this->permission_unset($role_name, $auth_option, 'role');
-				}
-
-				$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
-					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
-				$this->db->sql_query($sql);
-			break;
-		}
-
-		$this->auth->acl_clear_prefetch();
-
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/phpBB/includes/db/migration/tools/umil.php b/phpBB/includes/db/migration/tools/umil.php
deleted file mode 100644
index ce7b8ff3be..0000000000
--- a/phpBB/includes/db/migration/tools/umil.php
+++ /dev/null
@@ -1,3037 +0,0 @@
-<?php
-/**
- *
- * @author Nathan Guse (EXreaction) http://lithiumstudios.org
- * @author David Lewis (Highway of Life) highwayoflife@gmail.com
- * @package umil
- * @version $Id$
- * @copyright (c) 2008 phpBB Group
- * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
- *
- */
-
-/**
- * @ignore
- */
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-define('UMIL_VERSION', '1.0.4');
-
-/**
-* Multicall instructions
-*
-* With the "multicall" (as I am calling it) you can make a single function call and have it repeat the actions multiple times on information sent from an array.
-*
-* To do this (it does not work on the _exists functions), all you must do is send the first variable in the function call as an array and for each item, send an array for each of the variables in order.
-*
-* Example:
-* $umil->config_add(array(
-*	array('config_name', 'config_value'),
-*	array('config_name1', 'config_value1'),
-*	array('config_name2', 'config_value2', true),
-*	array('config_name3', 'config_value3', true),
-* );
-*/
-
-/**
-* UMIL - Unified MOD Installation Library class
-*
-* Cache Functions
-*	cache_purge($type = '', $style_id = 0)
-*
-* Config Functions:
-*	config_exists($config_name, $return_result = false)
-*	config_add($config_name, $config_value = '', $is_dynamic = false)
-*	config_update($config_name, $config_value, $is_dynamic = false)
-*	config_remove($config_name)
-*
-* Module Functions
-*	module_exists($class, $parent, $module)
-*	module_add($class, $parent = 0, $data = array())
-*	module_remove($class, $parent = 0, $module = '')
-*
-* Permissions/Auth Functions
-*	permission_exists($auth_option, $global = true)
-*	permission_add($auth_option, $global = true)
-*	permission_remove($auth_option, $global = true)
-*	permission_set($name, $auth_option = array(), $type = 'role', $global = true, $has_permission = true)
-*	permission_unset($name, $auth_option = array(), $type = 'role', $global = true)
-*
-* Table Functions
-*	table_exists($table_name)
-*	table_add($table_name, $table_data = array())
-*	table_remove($table_name)
-*
-* Table Column Functions
-*	table_column_exists($table_name, $column_name)
-*	table_column_add($table_name, $column_name = '', $column_data = array())
-*	table_column_update($table_name, $column_name = '', $column_data = array())
-*	table_column_remove($table_name, $column_name = '')
-*
-* Table Key/Index Functions
-*	table_index_exists($table_name, $index_name)
-*	table_index_add($table_name, $index_name = '', $column = array())
-*	table_index_remove($table_name, $index_name = '')
-*
-* Table Row Functions (note that these actions are not reversed automatically during uninstallation)
-*	table_row_insert($table_name, $data = array())
-*	table_row_remove($table_name, $data = array())
-*	table_row_update($table_name, $data = array(), $new_data = array())
-*
-* Version Check Function
-* 	version_check($url, $path, $file)
-*/
-class umil
-{
-	/**
-	* This will hold the text output for the inputted command (if the mod author would like to display the command that was ran)
-	*
-	* @var string
-	*/
-	var $command = '';
-
-	/**
-	* This will hold the text output for the result of the command.  $user->lang['SUCCESS'] if everything worked.
-	*
-	* @var string
-	*/
-	var $result = '';
-
-	/**
-	* Auto run $this->display_results after running a command
-	*/
-	var $auto_display_results = false;
-
-	/**
-	* Stand Alone option (this makes it possible to just use the single umil file and not worry about any language stuff
-	*/
-	var $stand_alone = false;
-
-	/**
-	* Were any new permissions added (used in umil_frontend)?
-	*/
-	var $permissions_added = false;
-
-	/**
-	* Database Object
-	*/
-	var $db = false;
-
-	/**
-	* Database Tools Object
-	*/
-	var $db_tools = false;
-
-	/**
-	* Do we want a custom prefix besides the phpBB table prefix?  You *probably* should not change this...
-	*/
-	var $table_prefix = false;
-
-	/**
-	* Constructor
-	*/
-	function umil($stand_alone = false, $db = false)
-	{
-		// Setup $this->db
-		if ($db !== false)
-		{
-			if (!is_object($db) || !method_exists($db, 'sql_query'))
-			{
-				trigger_error('Invalid $db Object');
-			}
-
-			$this->db = $db;
-		}
-		else
-		{
-			global $db;
-			$this->db = $db;
-		}
-
-		// Setup $this->db_tools
-		if (!class_exists('phpbb_db_tools'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include($phpbb_root_path . 'includes/db/db_tools.' . $phpEx);
-		}
-		$this->db_tools = new phpbb_db_tools($this->db);
-
-		$this->stand_alone = $stand_alone;
-
-		if (!$stand_alone)
-		{
-			global $config, $user, $phpbb_root_path, $phpEx;
-
-			/* Does not have the fall back option to use en/ if the user's language file does not exist, so we will not use it...unless that is changed.
-			if (method_exists('user', 'set_custom_lang_path'))
-			{
-				$user->set_custom_lang_path($phpbb_root_path . 'umil/language/');
-				$user->add_lang('umil');
-				$user->set_custom_lang_path($phpbb_root_path . 'language/');
-			}
-			else
-			{*/
-				// Include the umil language file.  First we check if the language file for the user's language is available, if not we check if the board's default language is available, if not we use the english file.
-				if (isset($user->data['user_lang']) && file_exists("{$phpbb_root_path}umil/language/{$user->data['user_lang']}/umil.$phpEx"))
-				{
-					$path = $user->data['user_lang'];
-				}
-				else if (file_exists("{$phpbb_root_path}umil/language/" . basename($config['default_lang']) . "/umil.$phpEx"))
-				{
-					$path = basename($config['default_lang']);
-				}
-				else if (file_exists("{$phpbb_root_path}umil/language/en/umil.$phpEx"))
-				{
-					$path = 'en';
-				}
-				else
-				{
-					trigger_error('Language Files Missing.<br /><br />Please download the latest UMIL (Unified MOD Install Library) from: <a href="http://www.phpbb.com/mods/umil/">phpBB.com/mods/umil</a>', E_USER_ERROR);
-				}
-
-				$user->add_lang('./../../umil/language/' . $path . '/umil');
-			//}
-
-			$user->add_lang(array('acp/common', 'acp/permissions'));
-
-			// Check to see if a newer version is available.
-			$info = $this->version_check('version.phpbb.com', '/umil', ((defined('PHPBB_QA')) ? 'umil_qa.txt' : 'umil.txt'));
-			if (is_array($info) && isset($info[0]) && isset($info[1]))
-			{
-				if (version_compare(UMIL_VERSION, $info[0], '<'))
-				{
-					global $template;
-
-					// Make sure user->setup() has been called
-					if (empty($user->lang))
-					{
-						$user->setup();
-					}
-
-					page_header('', false);
-
-					$user->lang['UPDATE_UMIL'] = (isset($user->lang['UPDATE_UMIL'])) ? $user->lang['UPDATE_UMIL'] : 'This version of UMIL is outdated.<br /><br />Please download the latest UMIL (Unified MOD Install Library) from: <a href="%1$s">%1$s</a>';
-					$template->assign_vars(array(
-						'S_BOARD_DISABLED'		=> true,
-						'L_BOARD_DISABLED'		=> sprintf($user->lang['UPDATE_UMIL'], $info[1]),
-					));
-				}
-			}
-		}
-	}
-
-	/**
-	* umil_start
-	*
-	* A function which runs (almost) every time a function here is ran
-	*/
-	function umil_start()
-	{
-		global $user;
-
-		// Set up the command.  This will get the arguments sent to the function.
-		$args = func_get_args();
-		$this->command = call_user_func_array(array($this, 'get_output_text'), $args);
-
-		$this->result = (isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS';
-		$this->db->sql_return_on_error(true);
-
-		//$this->db->sql_transaction('begin');
-	}
-
-	/**
-	* umil_end
-	*
-	* A function which runs (almost) every time a function here is ran
-	*/
-	function umil_end()
-	{
-		global $user;
-
-		// Set up the result.  This will get the arguments sent to the function.
-		$args = func_get_args();
-		$result = call_user_func_array(array($this, 'get_output_text'), $args);
-		$this->result = ($result) ? $result : $this->result;
-
-		if ($this->db->sql_error_triggered)
-		{
-			if ($this->result == ((isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS'))
-			{
-				$this->result = 'SQL ERROR ' . $this->db->sql_error_returned['message'];
-			}
-			else
-			{
-				$this->result .= '<br /><br />SQL ERROR ' . $this->db->sql_error_returned['message'];
-			}
-
-			//$this->db->sql_transaction('rollback');
-		}
-		else
-		{
-			//$this->db->sql_transaction('commit');
-		}
-
-		$this->db->sql_return_on_error(false);
-
-		// Auto output if requested.
-		if ($this->auto_display_results && method_exists($this, 'display_results'))
-		{
-			$this->display_results();
-		}
-
-		return '<strong>' . $this->command . '</strong><br />' . $this->result;
-	}
-
-	/**
-	* Get text for output
-	*
-	* Takes the given arguments and prepares them for the UI
-	*
-	* First argument sent is used as the language key
-	* Further arguments (if send) are used on the language key through vsprintf()
-	*
-	* @return string Returns the prepared string for output
-	*/
-	function get_output_text()
-	{
-		global $user;
-
-		// Set up the command.  This will get the arguments sent to the function.
-		$args = func_get_args();
-		if (sizeof($args))
-		{
-			$lang_key = array_shift($args);
-
-			if (sizeof($args))
-			{
-				$lang_args = array();
-				foreach ($args as $arg)
-				{
-					$lang_args[] = (isset($user->lang[$arg])) ? $user->lang[$arg] : $arg;
-				}
-
-				return @vsprintf(((isset($user->lang[$lang_key])) ? $user->lang[$lang_key] : $lang_key), $lang_args);
-			}
-			else
-			{
-				return ((isset($user->lang[$lang_key])) ? $user->lang[$lang_key] : $lang_key);
-			}
-		}
-
-		return '';
-	}
-
-	/**
-	* Run Actions
-	*
-	* Do-It-All function that can do everything required for installing/updating/uninstalling a mod based on an array of actions and the versions.
-	*
-	* @param string $action The action. install|update|uninstall
-	* @param array $versions The array of versions and the actions for each
-	* @param string $version_config_name The name of the config setting which holds/will hold the currently installed version
-	* @param string $version_select Added for the UMIL Auto system to allow you to select the version you want to install/update/uninstall to.
-	*/
-	function run_actions($action, $versions, $version_config_name, $version_select = '')
-	{
-		// We will sort the actions to prevent issues from mod authors incorrectly listing the version numbers
-		uksort($versions, 'version_compare');
-
-		// Find the current version to install
-		$current_version = '0.0.0';
-		foreach ($versions as $version => $actions)
-		{
-			$current_version = $version;
-		}
-
-		$db_version = '';
-		if ($this->config_exists($version_config_name))
-		{
-			global $config;
-			$db_version = $config[$version_config_name];
-		}
-
-		// Set the action to install from update if nothing is currently installed
-		if ($action == 'update' && !$db_version)
-		{
-			$action = 'install';
-		}
-
-		if ($action == 'install' || $action == 'update')
-		{
-			$version_installed = $db_version;
-			foreach ($versions as $version => $version_actions)
-			{
-				// If we are updating
-				if ($db_version && version_compare($version, $db_version, '<='))
-				{
-					continue;
-				}
-
-				if ($version_select && version_compare($version, $version_select, '>'))
-				{
-					break;
-				}
-
-				foreach ($version_actions as $method => $params)
-				{
-					if ($method == 'custom')
-					{
-						$this->_call_custom_function($params, $action, $version);
-					}
-					else
-					{
-						if (method_exists($this, $method))
-						{
-							call_user_func(array($this, $method), $params);
-						}
-					}
-				}
-
-				$version_installed = $version;
-			}
-
-			// update the version number or add it
-			if ($this->config_exists($version_config_name))
-			{
-				$this->config_update($version_config_name, $version_installed);
-			}
-			else
-			{
-				$this->config_add($version_config_name, $version_installed);
-			}
-		}
-		else if ($action == 'uninstall' && $db_version)
-		{
-			// reverse version list
-			$versions = array_reverse($versions);
-
-			foreach ($versions as $version => $version_actions)
-			{
-				// Uninstalling and this listed version is newer than installed
-				if (version_compare($version, $db_version, '>'))
-				{
-					continue;
-				}
-
-				// Version selection stuff
-				if ($version_select && version_compare($version, $version_select, '<='))
-				{
-					// update the version number
-					$this->config_update($version_config_name, $version);
-					break;
-				}
-
-				$cache_purge = false;
-				$version_actions = array_reverse($version_actions);
-				foreach ($version_actions as $method => $params)
-				{
-					if ($method == 'custom')
-					{
-						$this->_call_custom_function($params, $action, $version);
-					}
-					else
-					{
-						// This way we always run the cache purge at the end of the version (done for the uninstall because the instructions are reversed, which would cause the cache purge to be run at the beginning if it was meant to run at the end).
-						if ($method == 'cache_purge')
-						{
-							$cache_purge = $params;
-							continue;
-						}
-
-						// A few things are not possible for uninstallations update actions and table_row actions
-						if (strpos($method, 'update') !== false || strpos($method, 'table_insert') !== false || strpos($method, 'table_row_') !== false)
-						{
-							continue;
-						}
-
-						// reverse function call
-						$method = str_replace(array('add', 'remove', 'temp'), array('temp', 'add', 'remove'), $method);
-						$method = str_replace(array('set', 'unset', 'temp'), array('temp', 'set', 'unset'), $method);
-
-						if (method_exists($this, $method))
-						{
-							call_user_func(array($this, $method), ((is_array($params) ? array_reverse($params) : $params)));
-						}
-					}
-				}
-
-				if ($cache_purge !== false)
-				{
-					$this->cache_purge($cache_purge);
-				}
-			}
-
-			if (!$version_select)
-			{
-				// Unset the version number
-				$this->config_remove($version_config_name);
-			}
-		}
-	}
-
-	/**
-	* Call custom function helper
-	*/
-	function _call_custom_function($functions, $action, $version)
-	{
-		if (!is_array($functions))
-		{
-			$functions = array($functions);
-		}
-
-		$return = '';
-
-		foreach ($functions as $function)
-		{
-			if (function_exists($function))
-			{
-				// Must reset before calling the function
-				$this->umil_start();
-
-				$returned = call_user_func($function, $action, $version);
-				if (is_string($returned))
-				{
-					$this->command = $this->get_output_text($returned);
-				}
-				else if (is_array($returned) && isset($returned['command']))
-				{
-					if (is_array($returned['command']))
-					{
-						$this->command = call_user_func_array(array($this, 'get_output_text'), $returned['command']);
-					}
-					else
-					{
-						$this->command = $this->get_output_text($returned['command']);
-					}
-
-					if (isset($returned['result']))
-					{
-						$this->result = $this->get_output_text($returned['result']);
-					}
-				}
-				else
-				{
-					$this->command = $this->get_output_text('UNKNOWN');
-				}
-
-				$return .= $this->umil_end() . '<br />';
-			}
-		}
-
-		return $return;
-	}
-
-	/**
-	* Multicall Helper
-	*
-	* @param mixed $function Function name to call
-	* @param mixed $params The parameters array
-	*
-	* @return bool True if we have done a multicall ($params is an array), false if not ($params is not an array)
-	*/
-	function multicall($function, $params)
-	{
-		if (is_array($params) && !empty($params))
-		{
-			foreach ($params as $param)
-			{
-				if (!is_array($param))
-				{
-					call_user_func(array($this, $function), $param);
-				}
-				else
-				{
-					call_user_func_array(array($this, $function), $param);
-				}
-			}
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Cache Purge
-	*
-	* This function is for purging either phpBB3’s data cache, authorization cache, or the styles cache.
-	*
-	* @param string $type The type of cache you want purged.  Available types: auth, imageset, template, theme.  Anything else sent will purge the forum's cache.
-	* @param int $style_id The id of the item you want purged (if the type selected is imageset/template/theme, 0 for all items in that section)
-	*/
-	function cache_purge($type = '', $style_id = 0)
-	{
-		global $auth, $cache, $user, $phpbb_root_path, $phpEx;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $type))
-		{
-			return;
-		}
-
-		$style_id = (int) $style_id;
-		$type = (string) $type; // Prevent PHP bug.
-
-		switch ($type)
-		{
-			case 'auth' :
-				$this->umil_start('AUTH_CACHE_PURGE');
-				$cache->destroy('_acl_options');
-				$auth->acl_clear_prefetch();
-
-				return $this->umil_end();
-			break;
-
-			case 'imageset' :
-				if ($style_id == 0)
-				{
-					$return = array();
-					$sql = 'SELECT imageset_id
-						FROM ' . STYLES_IMAGESET_TABLE;
-					$result = $this->db->sql_query($sql);
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						$return[] = $this->cache_purge('imageset', $row['imageset_id']);
-					}
-					$this->db->sql_freeresult($result);
-
-					return implode('<br /><br />', $return);
-				}
-				else
-				{
-					$sql = 'SELECT *
-						FROM ' . STYLES_IMAGESET_TABLE . "
-						WHERE imageset_id = $style_id";
-					$result = $this->db->sql_query($sql);
-					$imageset_row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					if (!$imageset_row)
-					{
-						$this->umil_start('IMAGESET_CACHE_PURGE', 'UNKNOWN');
-						return $this->umil_end('FAIL');
-					}
-
-					$this->umil_start('IMAGESET_CACHE_PURGE', $imageset_row['imageset_name']);
-
-					// The following is from includes/acp/acp_styles.php (edited)
-					$sql_ary = array();
-
-					$cfg_data_imageset = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/imageset.cfg");
-
-					$sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . '
-						WHERE imageset_id = ' . $style_id;
-					$result = $this->db->sql_query($sql);
-
-					foreach ($cfg_data_imageset as $image_name => $value)
-					{
-						if (strpos($value, '*') !== false)
-						{
-							if (substr($value, -1, 1) === '*')
-							{
-								list($image_filename, $image_height) = explode('*', $value);
-								$image_width = 0;
-							}
-							else
-							{
-								list($image_filename, $image_height, $image_width) = explode('*', $value);
-							}
-						}
-						else
-						{
-							$image_filename = $value;
-							$image_height = $image_width = 0;
-						}
-
-						if (strpos($image_name, 'img_') === 0 && $image_filename)
-						{
-							$image_name = substr($image_name, 4);
-
-							$sql_ary[] = array(
-								'image_name'		=> (string) $image_name,
-								'image_filename'	=> (string) $image_filename,
-								'image_height'		=> (int) $image_height,
-								'image_width'		=> (int) $image_width,
-								'imageset_id'		=> (int) $style_id,
-								'image_lang'		=> '',
-							);
-						}
-					}
-
-					$sql = 'SELECT lang_dir
-						FROM ' . LANG_TABLE;
-					$result = $this->db->sql_query($sql);
-
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						if (@file_exists("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg"))
-						{
-							$cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg");
-							foreach ($cfg_data_imageset_data as $image_name => $value)
-							{
-								if (strpos($value, '*') !== false)
-								{
-									if (substr($value, -1, 1) === '*')
-									{
-										list($image_filename, $image_height) = explode('*', $value);
-										$image_width = 0;
-									}
-									else
-									{
-										list($image_filename, $image_height, $image_width) = explode('*', $value);
-									}
-								}
-								else
-								{
-									$image_filename = $value;
-									$image_height = $image_width = 0;
-								}
-
-								if (strpos($image_name, 'img_') === 0 && $image_filename)
-								{
-									$image_name = substr($image_name, 4);
-									$sql_ary[] = array(
-										'image_name'		=> (string) $image_name,
-										'image_filename'	=> (string) $image_filename,
-										'image_height'		=> (int) $image_height,
-										'image_width'		=> (int) $image_width,
-										'imageset_id'		=> (int) $style_id,
-										'image_lang'		=> (string) $row['lang_dir'],
-									);
-								}
-							}
-						}
-					}
-					$this->db->sql_freeresult($result);
-
-					$this->db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
-
-					$cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE);
-
-					return $this->umil_end();
-				}
-			break;
-			//case 'imageset' :
-
-			case 'template' :
-				if ($style_id == 0)
-				{
-					$return = array();
-					$sql = 'SELECT template_id
-						FROM ' . STYLES_TEMPLATE_TABLE;
-					$result = $this->db->sql_query($sql);
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						$return[] = $this->cache_purge('template', $row['template_id']);
-					}
-					$this->db->sql_freeresult($result);
-
-					return implode('<br /><br />', $return);
-				}
-				else
-				{
-					$sql = 'SELECT *
-						FROM ' . STYLES_TEMPLATE_TABLE . "
-						WHERE template_id = $style_id";
-					$result = $this->db->sql_query($sql);
-					$template_row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					if (!$template_row)
-					{
-						$this->umil_start('TEMPLATE_CACHE_PURGE', 'UNKNOWN');
-						return $this->umil_end('FAIL');
-					}
-
-					$this->umil_start('TEMPLATE_CACHE_PURGE', $template_row['template_name']);
-
-					// The following is from includes/acp/acp_styles.php
-					if ($template_row['template_storedb'] && file_exists("{$phpbb_root_path}styles/{$template_row['template_path']}/template/"))
-					{
-						$filelist = array('' => array());
-
-						$sql = 'SELECT template_filename, template_mtime
-							FROM ' . STYLES_TEMPLATE_DATA_TABLE . "
-							WHERE template_id = $style_id";
-						$result = $this->db->sql_query($sql);
-
-						while ($row = $this->db->sql_fetchrow($result))
-						{
-//							if (@filemtime("{$phpbb_root_path}styles/{$template_row['template_path']}/template/" . $row['template_filename']) > $row['template_mtime'])
-//							{
-								// get folder info from the filename
-								if (($slash_pos = strrpos($row['template_filename'], '/')) === false)
-								{
-									$filelist[''][] = $row['template_filename'];
-								}
-								else
-								{
-									$filelist[substr($row['template_filename'], 0, $slash_pos + 1)][] = substr($row['template_filename'], $slash_pos + 1, strlen($row['template_filename']) - $slash_pos - 1);
-								}
-//							}
-						}
-						$this->db->sql_freeresult($result);
-
-						$includes = array();
-						foreach ($filelist as $pathfile => $file_ary)
-						{
-							foreach ($file_ary as $file)
-							{
-								if (!($fp = @fopen("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file", 'r')))
-								{
-									return $this->umil_end('FILE_COULD_NOT_READ', "{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file");
-								}
-								$template_data = fread($fp, filesize("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"));
-								fclose($fp);
-
-								if (preg_match_all('#<!-- INCLUDE (.*?\.html) -->#is', $template_data, $matches))
-								{
-									foreach ($matches[1] as $match)
-									{
-										$includes[trim($match)][] = $file;
-									}
-								}
-							}
-						}
-
-						foreach ($filelist as $pathfile => $file_ary)
-						{
-							foreach ($file_ary as $file)
-							{
-								// Skip index.
-								if (strpos($file, 'index.') === 0)
-								{
-									continue;
-								}
-
-								// We could do this using extended inserts ... but that could be one
-								// heck of a lot of data ...
-								$sql_ary = array(
-									'template_id'			=> (int) $style_id,
-									'template_filename'		=> "$pathfile$file",
-									'template_included'		=> (isset($includes[$file])) ? implode(':', $includes[$file]) . ':' : '',
-									'template_mtime'		=> (int) filemtime("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"),
-									'template_data'			=> (string) file_get_contents("{$phpbb_root_path}styles/{$template_row['template_path']}$pathfile$file"),
-								);
-
-								$sql = 'UPDATE ' . STYLES_TEMPLATE_DATA_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
-									WHERE template_id = $style_id
-										AND template_filename = '" . $this->db->sql_escape("$pathfile$file") . "'";
-								$this->db->sql_query($sql);
-							}
-						}
-						unset($filelist);
-					}
-
-					// Purge the forum's cache as well.
-					$cache->purge();
-
-					return $this->umil_end();
-				}
-			break;
-			//case 'template' :
-
-			case 'theme' :
-				if ($style_id == 0)
-				{
-					$return = array();
-					$sql = 'SELECT theme_id
-						FROM ' . STYLES_THEME_TABLE;
-					$result = $this->db->sql_query($sql);
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						$return[] = $this->cache_purge('theme', $row['theme_id']);
-					}
-					$this->db->sql_freeresult($result);
-
-					return implode('<br /><br />', $return);
-				}
-				else
-				{
-					$sql = 'SELECT *
-						FROM ' . STYLES_THEME_TABLE . "
-						WHERE theme_id = $style_id";
-					$result = $this->db->sql_query($sql);
-					$theme_row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					if (!$theme_row)
-					{
-						$this->umil_start('THEME_CACHE_PURGE', 'UNKNOWN');
-						return $this->umil_end('FAIL');
-					}
-
-					$this->umil_start('THEME_CACHE_PURGE', $theme_row['theme_name']);
-
-					// The following is from includes/acp/acp_styles.php
-					if ($theme_row['theme_storedb'] && file_exists("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css"))
-					{
-						$stylesheet = file_get_contents($phpbb_root_path . 'styles/' . $theme_row['theme_path'] . '/theme/stylesheet.css');
-
-						// Match CSS imports
-						$matches = array();
-						preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches);
-
-						if (sizeof($matches))
-						{
-							foreach ($matches[0] as $idx => $match)
-							{
-								if (!file_exists("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/{$matches[1][$idx]}"))
-								{
-									continue;
-								}
-
-								$content = trim(file_get_contents("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/{$matches[1][$idx]}"));
-								$stylesheet = str_replace($match, $content, $stylesheet);
-							}
-						}
-
-						// adjust paths
-						$db_theme_data = str_replace('./', 'styles/' . $theme_row['theme_path'] . '/theme/', $stylesheet);
-
-						// Save CSS contents
-						$sql_ary = array(
-							'theme_mtime'	=> (int) filemtime("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css"),
-							'theme_data'	=> $db_theme_data,
-						);
-
-						$sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
-							WHERE theme_id = $style_id";
-						$this->db->sql_query($sql);
-
-						$cache->destroy('sql', STYLES_THEME_TABLE);
-					}
-
-					return $this->umil_end();
-				}
-			break;
-			//case 'theme' :
-
-			default:
-				$this->umil_start('CACHE_PURGE');
-				$cache->purge();
-
-				return $this->umil_end();
-			break;
-		}
-	}
-
-	/**
-	* Config Exists
-	*
-	* This function is to check to see if a config variable exists or if it does not.
-	*
-	* @param string $config_name The name of the config setting you wish to check for.
-	* @param bool $return_result - return the config value/default if true : default false.
-	*
-	* @return bool true/false if config exists
-	*/
-	function config_exists($config_name, $return_result = false)
-	{
-		global $config, $cache;
-
-		$sql = 'SELECT *
-				FROM ' . CONFIG_TABLE . "
-				WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row)
-		{
-			if (!isset($config[$config_name]))
-			{
-				$config[$config_name] = $row['config_value'];
-
-				if (!$row['is_dynamic'])
-				{
-					$cache->destroy('config');
-				}
-			}
-
-			return ($return_result) ? $row : true;
-		}
-
-		// this should never happen, but if it does, we need to remove the config from the array
-		if (isset($config[$config_name]))
-		{
-			unset($config[$config_name]);
-			$cache->destroy('config');
-		}
-
-		return false;
-	}
-
-	/**
-	* Config Add
-	*
-	* This function allows you to add a config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to add
-	* @param mixed $config_value The value of the config setting
-	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
-	*
-	* @return result
-	*/
-	function config_add($config_name, $config_value = '', $is_dynamic = false)
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $config_name))
-		{
-			return;
-		}
-
-		$this->umil_start('CONFIG_ADD', $config_name);
-
-		if ($this->config_exists($config_name))
-		{
-			return $this->umil_end('CONFIG_ALREADY_EXISTS', $config_name);
-		}
-
-		set_config($config_name, $config_value, $is_dynamic);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Config Update
-	*
-	* This function allows you to update an existing config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to update
-	* @param mixed $config_value The value of the config setting
-	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
-	*
-	* @return result
-	*/
-	function config_update($config_name, $config_value = '', $is_dynamic = false)
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $config_name))
-		{
-			return;
-		}
-
-		$this->umil_start('CONFIG_UPDATE', $config_name);
-
-		if (!$this->config_exists($config_name))
-		{
-			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
-		}
-
-		set_config($config_name, $config_value, $is_dynamic);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Config Remove
-	*
-	* This function allows you to remove an existing config setting.
-	*
-	* @param string $config_name The name of the config setting you would like to remove
-	*
-	* @return result
-	*/
-	function config_remove($config_name)
-	{
-		global $cache, $config;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $config_name))
-		{
-			return;
-		}
-
-		$this->umil_start('CONFIG_REMOVE', $config_name);
-
-		if (!$this->config_exists($config_name))
-		{
-			return $this->umil_end('CONFIG_NOT_EXIST', $config_name);
-		}
-
-		$sql = 'DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = '" . $this->db->sql_escape($config_name) . "'";
-		$this->db->sql_query($sql);
-
-		unset($config[$config_name]);
-		$cache->destroy('config');
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Module Exists
-	*
-	* Check if a module exists
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
-	* @param int|string $module The module_id|module_langname you would like to check for to see if it exists
-	*/
-	function module_exists($class, $parent, $module)
-	{
-		// the main root directory should return true
-		if (!$module)
-		{
-			return true;
-		}
-
-		$class = $this->db->sql_escape($class);
-		$module = $this->db->sql_escape($module);
-
-		$parent_sql = '';
-		if ($parent !== false)
-		{
-			// Allows '' to be sent as 0
-			$parent = (!$parent) ? 0 : $parent;
-
-			if (!is_numeric($parent))
-			{
-				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-					WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-					AND module_class = '$class'";
-				$result = $this->db->sql_query($sql);
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					return false;
-				}
-
-				$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
-			}
-			else
-			{
-				$parent_sql = 'AND parent_id = ' . (int) $parent;
-			}
-		}
-
-		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-			WHERE module_class = '$class'
-			$parent_sql
-			AND " . ((is_numeric($module)) ? 'module_id = ' . (int) $module : "module_langname = '$module'");
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Module Add
-	*
-	* Add a new module
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string $parent The parent module_id|module_langname (0 for no parent)
-	* @param array $data an array of the data on the new module.  This can be setup in two different ways.
-	*	1. The "manual" way.  For inserting a category or one at a time.  It will be merged with the base array shown a bit below,
-	*		but at the least requires 'module_langname' to be sent, and, if you want to create a module (instead of just a category) you must send module_basename and module_mode.
-	* array(
-	*		'module_enabled'	=> 1,
-	*		'module_display'	=> 1,
-	*		'module_basename'	=> '',
-	*		'module_class'		=> $class,
-	*		'parent_id'			=> (int) $parent,
-	*		'module_langname'	=> '',
-	*		'module_mode'		=> '',
-	*		'module_auth'		=> '',
-	*	)
-	*	2. The "automatic" way.  For inserting multiple at a time based on the specs in the info file for the module(s).  For this to work the modules must be correctly setup in the info file.
-	*		An example follows (this would insert the settings, log, and flag modes from the includes/acp/info/acp_asacp.php file):
-	* array(
-	* 		'module_basename'	=> 'asacp',
-	* 		'modes'				=> array('settings', 'log', 'flag'),
-	* )
-	* 		Optionally you may not send 'modes' and it will insert all of the modules in that info file.
-	*  @param string|bool $include_path If you would like to use a custom include path, specify that here
-	*/
-	function module_add($class, $parent = 0, $data = array(), $include_path = false)
-	{
-		global $cache, $user, $phpbb_root_path, $phpEx;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $class))
-		{
-			return;
-		}
-
-		// Prevent stupid things like trying to add a module with no name or any data on it
-		if (empty($data))
-		{
-			$this->umil_start('MODULE_ADD', $class, 'UNKNOWN');
-			return $this->umil_end('FAIL');
-		}
-
-        // Allows '' to be sent as 0
-		$parent = (!$parent) ? 0 : $parent;
-
-		// allow sending the name as a string in $data to create a category
-		if (!is_array($data))
-		{
-			$data = array('module_langname' => $data);
-		}
-
-		if (!isset($data['module_langname']))
-		{
-			// The "automatic" way
-			$basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
-			$basename = str_replace(array('/', '\\'), '', $basename);
-			$class = str_replace(array('/', '\\'), '', $class);
-			$info_file = "$class/info/{$class}_$basename.$phpEx";
-
-			// The manual and automatic ways both failed...
-			if (!file_exists((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file))
-			{
-				$this->umil_start('MODULE_ADD', $class, $info_file);
-				return $this->umil_end('FAIL');
-			}
-
-			$classname = "{$class}_{$basename}_info";
-
-			if (!class_exists($classname))
-			{
-				include((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file);
-			}
-
-			$info = new $classname;
-			$module = $info->module();
-			unset($info);
-
-			$result = '';
-			foreach ($module['modes'] as $mode => $module_info)
-			{
-				if (!isset($data['modes']) || in_array($mode, $data['modes']))
-				{
-					$new_module = array(
-						'module_basename'	=> $basename,
-						'module_langname'	=> $module_info['title'],
-						'module_mode'		=> $mode,
-						'module_auth'		=> $module_info['auth'],
-						'module_display'	=> (isset($module_info['display'])) ? $module_info['display'] : true,
-						'before'			=> (isset($module_info['before'])) ? $module_info['before'] : false,
-						'after'				=> (isset($module_info['after'])) ? $module_info['after'] : false,
-					);
-
-					// Run the "manual" way with the data we've collected.
-					$result .= ((isset($data['spacer'])) ? $data['spacer'] : '<br />') . $this->module_add($class, $parent, $new_module);
-				}
-			}
-
-			return $result;
-		}
-
-		// The "manual" way
-		$this->umil_start('MODULE_ADD', $class, ((isset($user->lang[$data['module_langname']])) ? $user->lang[$data['module_langname']] : $data['module_langname']));
-		add_log('admin', 'LOG_MODULE_ADD', ((isset($user->lang[$data['module_langname']])) ? $user->lang[$data['module_langname']] : $data['module_langname']));
-
-		$class = $this->db->sql_escape($class);
-
-		if (!is_numeric($parent))
-		{
-			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-				WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-				AND module_class = '$class'";
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$row)
-			{
-				return $this->umil_end('PARENT_NOT_EXIST');
-			}
-
-			$parent = $data['parent_id'] = $row['module_id'];
-		}
-		else if (!$this->module_exists($class, false, $parent))
-		{
-			return $this->umil_end('PARENT_NOT_EXIST');
-		}
-
-		if ($this->module_exists($class, $parent, $data['module_langname']))
-		{
-			return $this->umil_end('MODULE_ALREADY_EXIST');
-		}
-
-		if (!class_exists('acp_modules'))
-		{
-			include($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
-			$user->add_lang('acp/modules');
-		}
-		$acp_modules = new acp_modules();
-
-		$module_data = array(
-			'module_enabled'	=> (isset($data['module_enabled'])) ? $data['module_enabled'] : 1,
-			'module_display'	=> (isset($data['module_display'])) ? $data['module_display'] : 1,
-			'module_basename'	=> (isset($data['module_basename'])) ? $data['module_basename'] : '',
-			'module_class'		=> $class,
-			'parent_id'			=> (int) $parent,
-			'module_langname'	=> (isset($data['module_langname'])) ? $data['module_langname'] : '',
-			'module_mode'		=> (isset($data['module_mode'])) ? $data['module_mode'] : '',
-			'module_auth'		=> (isset($data['module_auth'])) ? $data['module_auth'] : '',
-		);
-		$result = $acp_modules->update_module_data($module_data, true);
-
-		// update_module_data can either return a string or an empty array...
-		if (is_string($result))
-		{
-			// Error
-			$this->result = $this->get_output_text($result);
-		}
-		else
-		{
-			// Success
-
-			// Move the module if requested above/below an existing one
-			if (isset($data['before']) && $data['before'])
-			{
-				$sql = 'SELECT left_id FROM ' . MODULES_TABLE . '
-					WHERE module_class = \'' . $class . '\'
-					AND parent_id = ' . (int) $parent . '
-					AND module_langname = \'' . $this->db->sql_escape($data['before']) . '\'';
-				$this->db->sql_query($sql);
-				$to_left = $this->db->sql_fetchfield('left_id');
-
-				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE module_class = '$class'
-					AND left_id >= $to_left
-					AND left_id < {$module_data['left_id']}";
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = $to_left, right_id = " . ($to_left + 1) . "
-					WHERE module_class = '$class'
-					AND module_id = {$module_data['module_id']}";
-				$this->db->sql_query($sql);
-			}
-			else if (isset($data['after']) && $data['after'])
-			{
-				$sql = 'SELECT right_id FROM ' . MODULES_TABLE . '
-					WHERE module_class = \'' . $class . '\'
-					AND parent_id = ' . (int) $parent . '
-					AND module_langname = \'' . $this->db->sql_escape($data['after']) . '\'';
-				$this->db->sql_query($sql);
-				$to_right = $this->db->sql_fetchfield('right_id');
-
-				$sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE module_class = '$class'
-					AND left_id >= $to_right
-					AND left_id < {$module_data['left_id']}";
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . MODULES_TABLE . ' SET left_id = ' . ($to_right + 1) . ', right_id = ' . ($to_right + 2) . "
-					WHERE module_class = '$class'
-					AND module_id = {$module_data['module_id']}";
-				$this->db->sql_query($sql);
-			}
-		}
-
-		// Clear the Modules Cache
-		$cache->destroy("_modules_$class");
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Module Remove
-	*
-	* Remove a module
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
-	* @param int|string $module The module id|module_langname
-	* @param string|bool $include_path If you would like to use a custom include path, specify that here
-	*/
-	function module_remove($class, $parent = 0, $module = '', $include_path = false)
-	{
-		global $cache, $user, $phpbb_root_path, $phpEx;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $class))
-		{
-			return;
-		}
-
-		// Imitation of module_add's "automatic" and "manual" method so the uninstaller works from the same set of instructions for umil_auto
-		if (is_array($module))
-		{
-			if (isset($module['module_langname']))
-			{
-				// Manual Method
-				return $this->module_remove($class, $parent, $module['module_langname'], $include_path);
-			}
-
-			// Failed.
-			if (!isset($module['module_basename']))
-			{
-				$this->umil_start('MODULE_REMOVE', $class, 'UNKNOWN');
-				return $this->umil_end('FAIL');
-			}
-
-			// Automatic method
-			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
-			$class = str_replace(array('/', '\\'), '', $class);
-			$info_file = "$class/info/{$class}_$basename.$phpEx";
-
-			if (!file_exists((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file))
-			{
-				$this->umil_start('MODULE_REMOVE', $class, $info_file);
-				return $this->umil_end('FAIL');
-			}
-
-			$classname = "{$class}_{$basename}_info";
-
-			if (!class_exists($classname))
-			{
-				include((($include_path === false) ? $phpbb_root_path . 'includes/' : $include_path) . $info_file);
-			}
-
-			$info = new $classname;
-			$module_info = $info->module();
-			unset($info);
-
-			$result = '';
-			foreach ($module_info['modes'] as $mode => $info)
-			{
-				if (!isset($module['modes']) || in_array($mode, $module['modes']))
-				{
-					$result .= $this->module_remove($class, $parent, $info['title']) . '<br />';
-				}
-			}
-			return $result;
-		}
-		else
-		{
-			$class = $this->db->sql_escape($class);
-
-			if (!$this->module_exists($class, $parent, $module))
-			{
-				$this->umil_start('MODULE_REMOVE', $class, ((isset($user->lang[$module])) ? $user->lang[$module] : $module));
-				return $this->umil_end('MODULE_NOT_EXIST');
-			}
-
-			$parent_sql = '';
-			if ($parent !== false)
-			{
-				// Allows '' to be sent as 0
-				$parent = (!$parent) ? 0 : $parent;
-
-				if (!is_numeric($parent))
-				{
-					$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-						WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-						AND module_class = '$class'";
-					$result = $this->db->sql_query($sql);
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					// we know it exists from the module_exists check
-					$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
-				}
-				else
-				{
-					$parent_sql = 'AND parent_id = ' . (int) $parent;
-				}
-			}
-
-			$module_ids = array();
-			if (!is_numeric($module))
-			{
-				$module = $this->db->sql_escape($module);
-				$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-					WHERE module_langname = '$module'
-					AND module_class = '$class'
-					$parent_sql";
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$module_ids[] = (int) $row['module_id'];
-				}
-				$this->db->sql_freeresult($result);
-
-				$module_name = $module;
-			}
-			else
-			{
-				$module = (int) $module;
-				$sql = 'SELECT module_langname FROM ' . MODULES_TABLE . "
-					WHERE module_id = $module
-					AND module_class = '$class'
-					$parent_sql";
-				$result = $this->db->sql_query($sql);
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$module_name = $row['module_langname'];
-				$module_ids[] = $module;
-			}
-
-			$this->umil_start('MODULE_REMOVE', $class, ((isset($user->lang[$module_name])) ? $user->lang[$module_name] : $module_name));
-			add_log('admin', 'LOG_MODULE_REMOVED', ((isset($user->lang[$module_name])) ? $user->lang[$module_name] : $module_name));
-
-			if (!class_exists('acp_modules'))
-			{
-				include($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
-				$user->add_lang('acp/modules');
-			}
-			$acp_modules = new acp_modules();
-			$acp_modules->module_class = $class;
-
-			foreach ($module_ids as $module_id)
-			{
-				$result = $acp_modules->delete_module($module_id);
-				if (!empty($result))
-				{
-					if ($this->result == ((isset($user->lang['SUCCESS'])) ? $user->lang['SUCCESS'] : 'SUCCESS'))
-					{
-						$this->result = implode('<br />', $result);
-					}
-					else
-					{
-						$this->result .= '<br />' . implode('<br />', $result);
-					}
-				}
-			}
-
-			$cache->destroy("_modules_$class");
-
-			return $this->umil_end();
-		}
-	}
-
-	/**
-	* Permission Exists
-	*
-	* Check if a permission (auth) setting exists
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
-	* @return bool true if it exists, false if not
-	*/
-	function permission_exists($auth_option, $global = true)
-	{
-		if ($global)
-		{
-			$type_sql = ' AND is_global = 1';
-		}
-		else
-		{
-			$type_sql = ' AND is_local = 1';
-		}
-
-		$sql = 'SELECT auth_option_id
-				FROM ' . ACL_OPTIONS_TABLE . "
-				WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'"
-				. $type_sql;
-		$result = $this->db->sql_query($sql);
-
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Permission Add
-	*
-	* Add a permission (auth) option
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
-	* @return result
-	*/
-	function permission_add($auth_option, $global = true)
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $auth_option))
-		{
-			return;
-		}
-
-		$this->umil_start('PERMISSION_ADD', $auth_option);
-
-		if ($this->permission_exists($auth_option, $global))
-		{
-			return $this->umil_end('PERMISSION_ALREADY_EXISTS', $auth_option);
-		}
-
-		// We've added permissions, so set to true to notify the user.
-		$this->permissions_added = true;
-
-		if (!class_exists('auth_admin'))
-		{
-			global $phpbb_root_path, $phpEx;
-
-			include($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
-		}
-		$auth_admin = new auth_admin();
-
-		// We have to add a check to see if the !$global (if global, local, and if local, global) permission already exists.  If it does, acl_add_option currently has a bug which would break the ACL system, so we are having a work-around here.
-		if ($this->permission_exists($auth_option, !$global))
-		{
-			$sql_ary = array(
-				'is_global'	=> 1,
-				'is_local'	=> 1,
-			);
-			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE auth_option = \'' . $this->db->sql_escape($auth_option) . "'";
-			$this->db->sql_query($sql);
-		}
-		else
-		{
-			if ($global)
-			{
-				$auth_admin->acl_add_option(array('global' => array($auth_option)));
-			}
-			else
-			{
-				$auth_admin->acl_add_option(array('local' => array($auth_option)));
-			}
-		}
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Permission Remove
-	*
-	* Remove a permission (auth) option
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
-	* @return result
-	*/
-	function permission_remove($auth_option, $global = true)
-	{
-		global $auth, $cache;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $auth_option))
-		{
-			return;
-		}
-
-		$this->umil_start('PERMISSION_REMOVE', $auth_option);
-
-		if (!$this->permission_exists($auth_option, $global))
-		{
-			return $this->umil_end('PERMISSION_NOT_EXIST', $auth_option);
-		}
-
-		if ($global)
-		{
-			$type_sql = ' AND is_global = 1';
-		}
-		else
-		{
-			$type_sql = ' AND is_local = 1';
-		}
-		$sql = 'SELECT auth_option_id, is_global, is_local FROM ' . ACL_OPTIONS_TABLE . "
-			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'" .
-			$type_sql;
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		$id = $row['auth_option_id'];
-
-		// If it is a local and global permission, do not remove the row! :P
-		if ($row['is_global'] && $row['is_local'])
-		{
-			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
-				SET ' . (($global) ? 'is_global = 0' : 'is_local = 0') . '
-				WHERE auth_option_id = ' . $id;
-			$this->db->sql_query($sql);
-		}
-		else
-		{
-			// Delete time
-			$this->db->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $id);
-		}
-
-		// Purge the auth cache
-		$cache->destroy('_acl_options');
-		$auth->acl_clear_prefetch();
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Add a new permission role
-	*
-	* @param string $role_name The new role name
-	* @param sting $role_type The type (u_, m_, a_)
-	*/
-	function permission_role_add($role_name, $role_type = '', $role_description = '')
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $role_name))
-		{
-			return;
-		}
-
-		$this->umil_start('PERMISSION_ROLE_ADD', $role_name);
-
-		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
-		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
-
-		if ($role_id)
-		{
-			return $this->umil_end('ROLE_ALREADY_EXISTS', $old_role_name);
-		}
-
-		$sql = 'SELECT MAX(role_order) AS max FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_type = \'' . $this->db->sql_escape($role_type) . '\'';
-		$this->db->sql_query($sql);
-		$role_order = $this->db->sql_fetchfield('max');
-		$role_order = (!$role_order) ? 1 : $role_order + 1;
-
-		$sql_ary = array(
-			'role_name'			=> $role_name,
-			'role_description'	=> $role_description,
-			'role_type'			=> $role_type,
-			'role_order'		=> $role_order,
-		);
-
-		$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
-		$this->db->sql_query($sql);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Update the name on a permission role
-	*
-	* @param string $old_role_name The old role name
-	* @param string $new_role_name The new role name
-	*/
-	function permission_role_update($old_role_name, $new_role_name = '')
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $role_name))
-		{
-			return;
-		}
-
-		$this->umil_start('PERMISSION_ROLE_UPDATE', $old_role_name);
-
-		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
-		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
-
-		if (!$role_id)
-		{
-			return $this->umil_end('ROLE_NOT_EXIST', $old_role_name);
-		}
-
-		$sql = 'UPDATE ' . ACL_ROLES_TABLE . '
-			SET role_name = \'' . $this->db->sql_escape($new_role_name) . '\'
-			WHERE role_name = \'' . $this->db->sql_escape($old_role_name) . '\'';
-		$this->db->sql_query($sql);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Remove a permission role
-	*
-	* @param string $role_name The role name to remove
-	*/
-	function permission_role_remove($role_name)
-	{
-		global $auth;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $role_name))
-		{
-			return;
-		}
-
-		$this->umil_start('PERMISSION_ROLE_REMOVE', $role_name);
-
-		$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_name = \'' . $this->db->sql_escape($role_name) . '\'';
-		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
-
-		if (!$role_id)
-		{
-			return $this->umil_end('ROLE_NOT_EXIST', $role_name);
-		}
-
-		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-			WHERE role_id = ' . $role_id;
-		$this->db->sql_query($sql);
-
-		$sql = 'DELETE FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_id = ' . $role_id;
-		$this->db->sql_query($sql);
-
-		$auth->acl_clear_prefetch();
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Permission Set
-	*
-	* Allows you to set permissions for a certain group/role
-	*
-	* @param string $name The name of the role/group
-	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
-	* @param string $type The type (role|group)
-	* @param bool $has_permission True if you want to give them permission, false if you want to deny them permission
-	*/
-	function permission_set($name, $auth_option = array(), $type = 'role', $has_permission = true)
-	{
-		global $auth;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $name))
-		{
-			return;
-		}
-
-		if (!is_array($auth_option))
-		{
-			$auth_option = array($auth_option);
-		}
-
-		$new_auth = array();
-		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$new_auth[] = $row['auth_option_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!sizeof($new_auth))
-		{
-			return false;
-		}
-
-		$current_auth = array();
-
-		$type = (string) $type; // Prevent PHP bug.
-
-		switch ($type)
-		{
-			case 'role' :
-				$this->umil_start('PERMISSION_SET_ROLE', $name);
-
-				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('role_id');
-
-				if (!$role_id)
-				{
-					return $this->umil_end('ROLE_NOT_EXIST');
-				}
-
-				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_ROLES_DATA_TABLE . '
-					WHERE role_id = ' . $role_id;
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
-				}
-				$this->db->sql_freeresult($result);
-			break;
-
-			case 'group' :
-				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . ' WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$group_id = $this->db->sql_fetchfield('group_id');
-
-				if (!$group_id)
-				{
-					$this->umil_start('PERMISSION_SET_GROUP', $name);
-					return $this->umil_end('GROUP_NOT_EXIST');
-				}
-
-				// If the group has a role set for them we will add the requested permissions to that role.
-				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id . '
-					AND auth_role_id <> 0
-					AND forum_id = 0';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('auth_role_id');
-				if ($role_id)
-				{
-					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
-						WHERE role_id = ' . $role_id;
-					$this->db->sql_query($sql);
-					$role_name = $this->db->sql_fetchfield('role_name');
-
-					return $this->permission_set($role_name, $auth_option, 'role', $has_permission);
-				}
-
-				$this->umil_start('PERMISSION_SET_GROUP', $name);
-
-				$sql = 'SELECT auth_option_id, auth_setting FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id;
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
-				}
-				$this->db->sql_freeresult($result);
-			break;
-		}
-
-		$sql_ary = array();
-		switch ($type)
-		{
-			case 'role' :
-				foreach ($new_auth as $auth_option_id)
-				{
-					if (!isset($current_auth[$auth_option_id]))
-					{
-						$sql_ary[] = array(
-							'role_id'			=> $role_id,
-							'auth_option_id'	=> $auth_option_id,
-							'auth_setting'		=> $has_permission,
-				        );
-					}
-				}
-
-				$this->db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary);
-			break;
-
-			case 'group' :
-				foreach ($new_auth as $auth_option_id)
-				{
-					if (!isset($current_auth[$auth_option_id]))
-					{
-						$sql_ary[] = array(
-							'group_id'			=> $group_id,
-							'auth_option_id'	=> $auth_option_id,
-							'auth_setting'		=> $has_permission,
-				        );
-					}
-				}
-
-				$this->db->sql_multi_insert(ACL_GROUPS_TABLE, $sql_ary);
-			break;
-		}
-
-		$auth->acl_clear_prefetch();
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Permission Unset
-	*
-	* Allows you to unset (remove) permissions for a certain group/role
-	*
-	* @param string $name The name of the role/group
-	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
-	* @param string $type The type (role|group)
-	*/
-	function permission_unset($name, $auth_option = array(), $type = 'role')
-	{
-		global $auth;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $name))
-		{
-			return;
-		}
-
-		if (!is_array($auth_option))
-		{
-			$auth_option = array($auth_option);
-		}
-
-		$to_remove = array();
-		$sql = 'SELECT auth_option_id FROM ' . ACL_OPTIONS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$to_remove[] = $row['auth_option_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!sizeof($to_remove))
-		{
-			return false;
-		}
-
-		$type = (string) $type; // Prevent PHP bug.
-
-		switch ($type)
-		{
-			case 'role' :
-				$this->umil_start('PERMISSION_UNSET_ROLE', $name);
-
-				$sql = 'SELECT role_id FROM ' . ACL_ROLES_TABLE . '
-					WHERE role_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('role_id');
-
-				if (!$role_id)
-				{
-					return $this->umil_end('ROLE_NOT_EXIST');
-				}
-
-				$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
-				$this->db->sql_query($sql);
-			break;
-
-			case 'group' :
-				$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . ' WHERE group_name = \'' . $this->db->sql_escape($name) . '\'';
-				$this->db->sql_query($sql);
-				$group_id = $this->db->sql_fetchfield('group_id');
-
-				if (!$group_id)
-				{
-					$this->umil_start('PERMISSION_UNSET_GROUP', $name);
-					return $this->umil_end('GROUP_NOT_EXIST');
-				}
-
-				// If the group has a role set for them we will remove the requested permissions from that role.
-				$sql = 'SELECT auth_role_id FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id . '
-					AND auth_role_id <> 0';
-				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('auth_role_id');
-				if ($role_id)
-				{
-					$sql = 'SELECT role_name FROM ' . ACL_ROLES_TABLE . '
-						WHERE role_id = ' . $role_id;
-					$this->db->sql_query($sql);
-					$role_name = $this->db->sql_fetchfield('role_name');
-
-					return $this->permission_unset($role_name, $auth_option, 'role');
-				}
-
-				$this->umil_start('PERMISSION_UNSET_GROUP', $name);
-
-				$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
-					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
-				$this->db->sql_query($sql);
-			break;
-		}
-
-		$auth->acl_clear_prefetch();
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Exists
-	*
-	* Check if a table exists in the DB or not
-	*
-	* @param string $table_name The table name to check for
-	*
-	* @return bool true if the table exists, false if not
-	*/
-	function table_exists($table_name)
-	{
-		$this->get_table_name($table_name);
-
-		// Use sql_table_exists if available
-		if (method_exists($this->db_tools, 'sql_table_exists'))
-		{
-			$roe = $this->db->return_on_error;
-			$result = $this->db_tools->sql_table_exists($table_name);
-
-			// db_tools::sql_table_exists resets the return_on_error to false always after completing, so we must make sure we set it to true again if it was before
-			if ($roe)
-			{
-				$this->db->sql_return_on_error(true);
-			}
-
-			return $result;
-		}
-
-		if (!function_exists('get_tables'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include($phpbb_root_path . 'includes/functions_install.' . $phpEx);
-		}
-
-		$tables = get_tables($this->db);
-
-		if (in_array($table_name, $tables))
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	* Table Add
-	*
-	* This only supports input from the array format of db_tools or create_schema_files.
-	*/
-	function table_add($table_name, $table_data = array())
-	{
-		global $dbms, $user;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		/**
-		* $table_data can be empty when uninstalling a mod and table_remove was used, but no 2rd argument was given.
-		* In that case we'll assume that it was a column previously added by the mod (if not the author should specify a 2rd argument) and skip this to prevent an error
-		*/
-		if (empty($table_data))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_ADD', $table_name);
-
-		if ($this->table_exists($table_name))
-		{
-			return $this->umil_end('TABLE_ALREADY_EXISTS', $table_name);
-		}
-
-		if (!is_array($table_data))
-		{
-			return $this->umil_end('NO_TABLE_DATA');
-		}
-
-		if (!function_exists('get_available_dbms'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include("{$phpbb_root_path}includes/functions_install.$phpEx");
-		}
-
-		/*
-		* This function has had numerous problems and is currently broken, so until phpBB uses it I will not be anymore
-		if (method_exists($this->db_tools, 'sql_create_table'))
-		{
-			// Added in 3.0.5
-			$this->db_tools->sql_create_table($table_name, $table_data);
-		}
-		else
-		{*/
-			$available_dbms = get_available_dbms($dbms);
-
-			$sql_query = $this->create_table_sql($table_name, $table_data);
-			$sql_query = split_sql_file($sql_query, $available_dbms[$dbms]['DELIM']);
-
-			foreach ($sql_query as $sql)
-			{
-				$this->db->sql_query($sql);
-			}
-		//}
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Remove
-	*
-	* Delete/Drop a DB table
-	*/
-	function table_remove($table_name)
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_REMOVE', $table_name);
-
-		if (!$this->table_exists($table_name))
-		{
-			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
-		}
-
-		if (method_exists($this->db_tools, 'sql_table_drop'))
-		{
-			// Added in 3.0.5
-			$this->db_tools->sql_table_drop($table_name);
-		}
-		else
-		{
-			$this->db->sql_query('DROP TABLE ' . $table_name);
-		}
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Column Exists
-	*
-	* Check to see if a column exists in a table
-	*/
-	function table_column_exists($table_name, $column_name)
-	{
-		$this->get_table_name($table_name);
-
-		return $this->db_tools->sql_column_exists($table_name, $column_name);
-	}
-
-	/**
-	* Table Column Add
-	*
-	* Add a new column to a table.
-	*/
-	function table_column_add($table_name, $column_name = '', $column_data = array())
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		/**
-		* $column_data can be empty when uninstalling a mod and table_column_remove was used, but no 3rd argument was given.
-		* In that case we'll assume that it was a column previously added by the mod (if not the author should specify a 3rd argument) and skip this to prevent an error
-		*/
-		if (empty($column_data))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_COLUMN_ADD', $table_name, $column_name);
-
-		if ($this->table_column_exists($table_name, $column_name))
-		{
-			return $this->umil_end('TABLE_COLUMN_ALREADY_EXISTS', $table_name, $column_name);
-		}
-
-		$this->db_tools->sql_column_add($table_name, $column_name, $column_data);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Column Update
-	*
-	* Alter/Update a column in a table.  You can not change a column name with this.
-	*/
-	function table_column_update($table_name, $column_name = '', $column_data = array())
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_COLUMN_UPDATE', $table_name, $column_name);
-
-		if (!$this->table_column_exists($table_name, $column_name))
-		{
-			return $this->umil_end('TABLE_COLUMN_NOT_EXIST', $table_name, $column_name);
-		}
-
-		$this->db_tools->sql_column_change($table_name, $column_name, $column_data);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Column Remove
-	*
-	* Remove a column from a table
-	*/
-	function table_column_remove($table_name, $column_name = '')
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_COLUMN_REMOVE', $table_name, $column_name);
-
-		if (!$this->table_column_exists($table_name, $column_name))
-		{
-			return $this->umil_end('TABLE_COLUMN_NOT_EXIST', $table_name, $column_name);
-		}
-
-		$this->db_tools->sql_column_remove($table_name, $column_name);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Index Exists
-	*
-	* Check if a table key/index exists on a table (can not check primary or unique)
-	*/
-	function table_index_exists($table_name, $index_name)
-	{
-		$this->get_table_name($table_name);
-
-		$indexes = $this->db_tools->sql_list_index($table_name);
-
-		if (in_array($index_name, $indexes))
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Table Index Add
-	*
-	* Add a new key/index to a table
-	*/
-	function table_index_add($table_name, $index_name = '', $column = array())
-	{
-		global $config;
-
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		// Let them skip the column field and just use the index name in that case as the column as well
-		if (empty($column))
-		{
-			$column = array($index_name);
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_KEY_ADD', $table_name, $index_name);
-
-		if ($this->table_index_exists($table_name, $index_name))
-		{
-			return $this->umil_end('TABLE_KEY_ALREADY_EXIST', $table_name, $index_name);
-		}
-
-		if (!is_array($column))
-		{
-			$column = array($column);
-		}
-
-		// remove index length if we are before 3.0.8
-		// the feature (required for some types when using MySQL4)
-		// was added in that release (ticket PHPBB3-8944)
-		if (version_compare($config['version'], '3.0.7-pl1', '<='))
-		{
-			$column = preg_replace('#:.*$#', '', $column);
-		}
-
-		$this->db_tools->sql_create_index($table_name, $index_name, $column);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Index Remove
-	*
-	* Remove a key/index from a table
-	*/
-	function table_index_remove($table_name, $index_name = '')
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_KEY_REMOVE', $table_name, $index_name);
-
-		if (!$this->table_index_exists($table_name, $index_name))
-		{
-			return $this->umil_end('TABLE_KEY_NOT_EXIST', $table_name, $index_name);
-		}
-
-		$this->db_tools->sql_index_drop($table_name, $index_name);
-
-		return $this->umil_end();
-	}
-
-	// Ignore, function was renamed to table_row_insert and keeping for backwards compatibility
-	function table_insert($table_name, $data = array()) { $this->table_row_insert($table_name, $data); }
-
-	/**
-	* Table Insert
-	*
-	* Insert data into a table
-	*/
-	function table_row_insert($table_name, $data = array())
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_ROW_INSERT_DATA', $table_name);
-
-		if (!$this->table_exists($table_name))
-		{
-			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
-		}
-
-		$this->db->sql_multi_insert($table_name, $data);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Row Update
-	*
-	* Update a row in a table
-	*
-	* $data should be an array with the column names as keys and values as the items to check for each column.  Example:
-	* array('user_id' => 123, 'user_name' => 'test user') would become:
-	* WHERE user_id = 123 AND user_name = 'test user'
-	*
-	* $new_data is the new data it will be updated to (same format as you'd enter into $db->sql_build_array('UPDATE' ).
-	*/
-	function table_row_update($table_name, $data = array(), $new_data = array())
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		if (!sizeof($data))
-		{
-			return $this->umil_end('FAIL');
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_ROW_UPDATE_DATA', $table_name);
-
-		if (!$this->table_exists($table_name))
-		{
-			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
-		}
-
-		$sql = 'UPDATE ' . $table_name . '
-			SET ' . $this->db->sql_build_array('UPDATE', $new_data) . '
-			WHERE ' . $this->db->sql_build_array('SELECT', $data);
-		$this->db->sql_query($sql);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Table Row Remove
-	*
-	* Remove a row from a table
-	*
-	* $data should be an array with the column names as keys and values as the items to check for each column.  Example:
-	* array('user_id' => 123, 'user_name' => 'test user') would become:
-	* WHERE user_id = 123 AND user_name = 'test user'
-	*/
-	function table_row_remove($table_name, $data = array())
-	{
-		// Multicall
-		if ($this->multicall(__FUNCTION__, $table_name))
-		{
-			return;
-		}
-
-		if (!sizeof($data))
-		{
-			return $this->umil_end('FAIL');
-		}
-
-		$this->get_table_name($table_name);
-
-		$this->umil_start('TABLE_ROW_REMOVE_DATA', $table_name);
-
-		if (!$this->table_exists($table_name))
-		{
-			return $this->umil_end('TABLE_NOT_EXIST', $table_name);
-		}
-
-		$sql = 'DELETE FROM ' . $table_name . ' WHERE ' . $this->db->sql_build_array('SELECT', $data);
-		$this->db->sql_query($sql);
-
-		return $this->umil_end();
-	}
-
-	/**
-	* Version Checker
-	*
-	* Format the file like the following:
-	* http://www.phpbb.com/updatecheck/30x.txt
-	*
-	* @param string $url The url to access (ex: www.phpbb.com)
-	* @param string $path The path to access (ex: /updatecheck)
-	* @param string $file The name of the file to access (ex: 30x.txt)
-	*
-	* @return array|string Error Message if there was any error, or an array (each line in the file as a value)
-	*/
-	function version_check($url, $path, $file, $timeout = 10, $port = 80)
-	{
-		if (!function_exists('get_remote_file'))
-		{
-			global $phpbb_root_path, $phpEx;
-
-			include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
-		}
-
-		$errstr = $errno = '';
-
-		$info = get_remote_file($url, $path, $file, $errstr, $errno, $port, $timeout);
-
-		if ($info === false)
-		{
-			return $errstr . ' [ ' . $errno . ' ]';
-		}
-
-		$info = str_replace("\r\n", "\n", $info);
-		$info = explode("\n", $info);
-
-		return $info;
-	}
-
-	/**
-	* Create table SQL
-	*
-	* Create the SQL query for the specified DBMS on the fly from a create_schema_files type of table array
-	*
-	* @param string $table_name The name of the table
-	* @param array $table_data The table data (formatted in the array format used by create_schema_files)
-	* @param string $dbms The dbms this will be built for (for testing only, leave blank to use the current DBMS)
-	*
-	* @return The sql query to run for the submitted dbms to insert the table
-	*/
-	function create_table_sql($table_name, $table_data, $dbms = '')
-	{
-		// To allow testing
-		$dbms = ($dbms) ? $dbms : $this->db_tools->sql_layer;
-
-		// A list of types being unsigned for better reference in some db's
-		$unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
-		$supported_dbms = array('firebird', 'mssql', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite');
-
-		$sql = '';
-
-		// Create Table statement
-		$generator = $textimage = false;
-
-		switch ($dbms)
-		{
-			case 'mysql_40':
-			case 'mysql_41':
-			case 'firebird':
-			case 'oracle':
-			case 'sqlite':
-			case 'postgres':
-				$sql .= "CREATE TABLE {$table_name} (\n";
-			break;
-
-			case 'mssql':
-				$sql .= "CREATE TABLE [{$table_name}] (\n";
-			break;
-		}
-
-		// Table specific so we don't get overlap
-		$modded_array = array();
-
-		// Write columns one by one...
-		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
-		{
-			// Get type
-			if (strpos($column_data[0], ':') !== false)
-			{
-				list($orig_column_type, $column_length) = explode(':', $column_data[0]);
-				if (!is_array($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']))
-				{
-					$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'], $column_length);
-				}
-				else
-				{
-					if (isset($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule']))
-					{
-						switch ($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule'][0])
-						{
-							case 'div':
-								$column_length /= $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['rule'][1];
-								$column_length = ceil($column_length);
-								$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length);
-							break;
-						}
-					}
-
-					if (isset($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit']))
-					{
-						switch ($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][0])
-						{
-							case 'mult':
-								$column_length *= $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][1];
-								if ($column_length > $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][2])
-								{
-									$column_type = $this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':']['limit'][3];
-									$modded_array[$column_name] = $column_type;
-								}
-								else
-								{
-									$column_type = sprintf($this->db_tools->dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length);
-								}
-							break;
-						}
-					}
-				}
-				$orig_column_type .= ':';
-			}
-			else
-			{
-				$orig_column_type = $column_data[0];
-				$column_type = $this->db_tools->dbms_type_map[$dbms][$column_data[0]];
-				if ($column_type == 'text' || $column_type == 'blob')
-				{
-					$modded_array[$column_name] = $column_type;
-				}
-			}
-
-			// Adjust default value if db-dependant specified
-			if (is_array($column_data[1]))
-			{
-				$column_data[1] = (isset($column_data[1][$dbms])) ? $column_data[1][$dbms] : $column_data[1]['default'];
-			}
-
-			switch ($dbms)
-			{
-				case 'mysql_40':
-				case 'mysql_41':
-					$sql .= "\t{$column_name} {$column_type} ";
-
-					// For hexadecimal values do not use single quotes
-					if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
-					{
-						$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
-					}
-					$sql .= 'NOT NULL';
-
-					if (isset($column_data[2]))
-					{
-						if ($column_data[2] == 'auto_increment')
-						{
-							$sql .= ' auto_increment';
-						}
-						else if ($dbms === 'mysql_41' && $column_data[2] == 'true_sort')
-						{
-							$sql .= ' COLLATE utf8_unicode_ci';
-						}
-					}
-
-					$sql .= ",\n";
-				break;
-
-				case 'sqlite':
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-					{
-						$sql .= "\t{$column_name} INTEGER PRIMARY KEY ";
-						$generator = $column_name;
-					}
-					else
-					{
-						$sql .= "\t{$column_name} {$column_type} ";
-					}
-
-					$sql .= 'NOT NULL ';
-					$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
-					$sql .= ",\n";
-				break;
-
-				case 'firebird':
-					$sql .= "\t{$column_name} {$column_type} ";
-
-					if (!is_null($column_data[1]))
-					{
-						$sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
-					}
-
-					$sql .= 'NOT NULL';
-
-					// This is a UNICODE column and thus should be given it's fair share
-					if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0]))
-					{
-						$sql .= ' COLLATE UNICODE';
-					}
-
-					$sql .= ",\n";
-
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-					{
-						$generator = $column_name;
-					}
-				break;
-
-				case 'mssql':
-					if ($column_type == '[text]')
-					{
-						$textimage = true;
-					}
-
-					$sql .= "\t[{$column_name}] {$column_type} ";
-
-					if (!is_null($column_data[1]))
-					{
-						// For hexadecimal values do not use single quotes
-						if (strpos($column_data[1], '0x') === 0)
-						{
-							$sql .= 'DEFAULT (' . $column_data[1] . ') ';
-						}
-						else
-						{
-							$sql .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
-						}
-					}
-
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-					{
-						$sql .= 'IDENTITY (1, 1) ';
-					}
-
-					$sql .= 'NOT NULL';
-					$sql .= " ,\n";
-				break;
-
-				case 'oracle':
-					$sql .= "\t{$column_name} {$column_type} ";
-					$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
-
-					// In Oracle empty strings ('') are treated as NULL.
-					// Therefore in oracle we allow NULL's for all DEFAULT '' entries
-					$sql .= ($column_data[1] === '') ? ",\n" : "NOT NULL,\n";
-
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-					{
-						$generator = $column_name;
-					}
-				break;
-
-				case 'postgres':
-					$sql .= "\t{$column_name} {$column_type} ";
-
-					if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-					{
-						$sql .= "DEFAULT nextval('{$table_name}_seq'),\n";
-
-						// Make sure the sequence will be created before creating the table
-						$sql = "CREATE SEQUENCE {$table_name}_seq;\n\n" . $sql;
-					}
-					else
-					{
-						$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
-						$sql .= "NOT NULL";
-
-						// Unsigned? Then add a CHECK contraint
-						if (in_array($orig_column_type, $unsigned_types))
-						{
-							$sql .= " CHECK ({$column_name} >= 0)";
-						}
-
-						$sql .= ",\n";
-					}
-				break;
-			}
-		}
-
-		switch ($dbms)
-		{
-			case 'firebird':
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n);;\n\n";
-			break;
-
-			case 'mssql':
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n) ON [PRIMARY]" . (($textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '') . "\n";
-				$sql .= "GO\n\n";
-			break;
-		}
-
-		// Write primary key
-		if (isset($table_data['PRIMARY_KEY']))
-		{
-			if (!is_array($table_data['PRIMARY_KEY']))
-			{
-				$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
-			}
-
-			switch ($dbms)
-			{
-				case 'mysql_40':
-				case 'mysql_41':
-				case 'postgres':
-					$sql .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
-				break;
-
-				case 'firebird':
-					$sql .= "ALTER TABLE {$table_name} ADD PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ");;\n\n";
-				break;
-
-				case 'sqlite':
-					if ($generator === false || !in_array($generator, $table_data['PRIMARY_KEY']))
-					{
-						$sql .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
-					}
-				break;
-
-				case 'mssql':
-					$sql .= "ALTER TABLE [{$table_name}] WITH NOCHECK ADD \n";
-					$sql .= "\tCONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED \n";
-					$sql .= "\t(\n";
-					$sql .= "\t\t[" . implode("],\n\t\t[", $table_data['PRIMARY_KEY']) . "]\n";
-					$sql .= "\t)  ON [PRIMARY] \n";
-					$sql .= "GO\n\n";
-				break;
-
-				case 'oracle':
-					$sql .= "\tCONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n";
-				break;
-			}
-		}
-
-		switch ($dbms)
-		{
-			case 'oracle':
-				// UNIQUE contrains to be added?
-				if (isset($table_data['KEYS']))
-				{
-					foreach ($table_data['KEYS'] as $key_name => $key_data)
-					{
-						if (!is_array($key_data[1]))
-						{
-							$key_data[1] = array($key_data[1]);
-						}
-
-						if ($key_data[0] == 'UNIQUE')
-						{
-							$sql .= "\tCONSTRAINT u_phpbb_{$key_name} UNIQUE (" . implode(', ', $key_data[1]) . "),\n";
-						}
-					}
-				}
-
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n)\n/\n\n";
-			break;
-
-			case 'postgres':
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n);\n\n";
-			break;
-
-			case 'sqlite':
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n);\n\n";
-			break;
-		}
-
-		// Write Keys
-		if (isset($table_data['KEYS']))
-		{
-			foreach ($table_data['KEYS'] as $key_name => $key_data)
-			{
-				if (!is_array($key_data[1]))
-				{
-					$key_data[1] = array($key_data[1]);
-				}
-
-				switch ($dbms)
-				{
-					case 'mysql_40':
-					case 'mysql_41':
-						$sql .= ($key_data[0] == 'INDEX') ? "\tKEY" : '';
-						$sql .= ($key_data[0] == 'UNIQUE') ? "\tUNIQUE" : '';
-						foreach ($key_data[1] as $key => $col_name)
-						{
-							if (isset($modded_array[$col_name]))
-							{
-								switch ($modded_array[$col_name])
-								{
-									case 'text':
-									case 'blob':
-										$key_data[1][$key] = $col_name . '(255)';
-									break;
-								}
-							}
-						}
-						$sql .= ' ' . $key_name . ' (' . implode(', ', $key_data[1]) . "),\n";
-					break;
-
-					case 'firebird':
-						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
-						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
-
-						$sql .= ' ' . $table_name . '_' . $key_name . ' ON ' . $table_name . '(' . implode(', ', $key_data[1]) . ");;\n";
-					break;
-
-					case 'mssql':
-						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE  INDEX' : '';
-						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE  UNIQUE  INDEX' : '';
-						$sql .= " [{$key_name}] ON [{$table_name}]([" . implode('], [', $key_data[1]) . "]) ON [PRIMARY]\n";
-						$sql .= "GO\n\n";
-					break;
-
-					case 'oracle':
-						if ($key_data[0] == 'UNIQUE')
-						{
-							continue;
-						}
-
-						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
-
-						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ")\n";
-						$sql .= "/\n";
-					break;
-
-					case 'sqlite':
-						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
-						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
-
-						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n";
-					break;
-
-					case 'postgres':
-						$sql .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : '';
-						$sql .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : '';
-
-						$sql .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n";
-					break;
-				}
-			}
-		}
-
-		switch ($dbms)
-		{
-			case 'mysql_40':
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n);\n\n";
-			break;
-
-			case 'mysql_41':
-				// Remove last line delimiter...
-				$sql = substr($sql, 0, -2);
-				$sql .= "\n) CHARACTER SET utf8 COLLATE utf8_bin;\n\n";
-			break;
-
-			// Create Generator
-			case 'firebird':
-				if ($generator !== false)
-				{
-					$sql .= "\nCREATE GENERATOR {$table_name}_gen;;\n";
-					$sql .= 'SET GENERATOR ' . $table_name . "_gen TO 0;;\n\n";
-
-					$sql .= 'CREATE TRIGGER t_' . $table_name . ' FOR ' . $table_name . "\n";
-					$sql .= "BEFORE INSERT\nAS\nBEGIN\n";
-					$sql .= "\tNEW.{$generator} = GEN_ID({$table_name}_gen, 1);\nEND;;\n\n";
-				}
-			break;
-
-			case 'oracle':
-				if ($generator !== false)
-				{
-					$sql .= "\nCREATE SEQUENCE {$table_name}_seq\n/\n\n";
-
-					$sql .= "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
-					$sql .= "BEFORE INSERT ON {$table_name}\n";
-					$sql .= "FOR EACH ROW WHEN (\n";
-					$sql .= "\tnew.{$generator} IS NULL OR new.{$generator} = 0\n";
-					$sql .= ")\nBEGIN\n";
-					$sql .= "\tSELECT {$table_name}_seq.nextval\n";
-					$sql .= "\tINTO :new.{$generator}\n";
-					$sql .= "\tFROM dual;\nEND;\n/\n\n";
-				}
-			break;
-		}
-
-		return $sql;
-	}
-
-	/**
-	* Get the real table name
-	* By A_Jelly_Doughnut
-	*
-	* @param string $table_name The table name to get the real table name from
-	*/
-	function get_table_name(&$table_name)
-	{
-		// Use the global table prefix if a custom one is not specified
-		if ($this->table_prefix === false)
-		{
-			global $table_prefix;
-		}
-		else
-		{
-			$table_prefix = $this->table_prefix;
-		}
-
-		static $constants = NULL;
-
-		if (is_null($constants))
-		{
-			$constants = get_defined_constants();
-		}
-
-		/**
-		* only do the replace if the table prefix is not already present
-		* this is required since UMIL supports specifying a table via phpbb_foo
-		* (where a replace would be needed)
-		* or by FOO_TABLE (where a replace is already done at constant-define time)
-		*/
-		if (!preg_match('#^' . preg_quote($table_prefix, '#') . '#', $table_name) || !in_array($table_name, $constants, true))
-		{
-			$table_name = preg_replace('#^phpbb_#i', $table_prefix, $table_name);
-		}
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 216faf9866..2fd795b659 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -22,7 +22,7 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_db_migrator
 {
-	protected $container;
+	protected $config;
 	protected $db;
 	protected $db_tools;
 	protected $table_prefix;
@@ -33,31 +33,31 @@ class phpbb_db_migrator
 	protected $migrations_table;
 	protected $migration_state;
 
-	protected $migrations;
+	protected $migrations = array();
+
+	/** @var string Name of the last migration run */
+	public $last_run_migration = false;
 
 	/**
 	* Constructor of the database migrator
-	*
-	* @param \Symfony\Component\DependencyInjection\ContainerInterface	$container	Container supplying dependencies
 	*/
-	public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $migrations)
+	public function __construct($config, phpbb_db_driver $db, $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools)
 	{
-		$this->container = $container;
-		$this->db = $this->container->get('dbal.conn');
-		$this->db_tools = $this->container->get('dbal.tools');
-		$this->table_prefix = $this->container->getParameters('core.table_prefix');
-		$this->migrations_table = $this->container->getParameters('tables.migrations');
-		$this->migrations = $migrations;
-
-		$this->phpbb_root_path = $this->container->getParameters('core.root_path');
-		$this->php_ext = $this->container->getParameters('core.php_ext');
-
-		/** @todo replace with collection_pass when merged */
-		$this->tools = array(
-			'config' => new phpbb_db_migration_tools_config,
-			'module' => new phpbb_db_migration_tools_module,
-			'permission' => new phpbb_db_migration_tools_permission,
-		);
+		$this->config = $config;
+		$this->db = $db;
+		$this->db_tools = $db_tools;
+
+		$this->migrations_table = $migrations_table;
+
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+
+		$this->table_prefix = $table_prefix;
+
+		foreach ($tools as $tool)
+		{
+			$this->tools[$tool->get_name()] = $tool;
+		}
 
 		$this->load_migration_state();
 	}
@@ -93,13 +93,44 @@ class phpbb_db_migrator
 		$this->migrations = $class_names;
 	}
 
+	/**
+	* Load migration data files from a directory
+	*
+	* @param string $path
+	* @return array Array of migrations with names
+	*/
+	public function load_migrations($path)
+	{
+		$handle = opendir($path);
+		while (($file = readdir($handle)) !== false)
+		{
+			if (strpos($file, '_') !== 0 && strrpos($file, '.' . $this->php_ext) === (strlen($file) - strlen($this->php_ext) - 1))
+			{
+				$name = 'phpbb_db_migration_data_' . substr($file, 0, -(strlen($this->php_ext) + 1));
+
+				if (!in_array($name, $this->migrations))
+				{
+					$this->migrations[] = $name;
+				}
+			}
+		}
+
+		foreach ($this->migrations as $name)
+		{
+			if ($this->unfulfillable($name))
+			{
+				throw new phpbb_db_migration_exception('MIGRATION NOT FULFILLABLE', $name);
+			}
+		}
+
+		return $this->migrations;
+	}
+
 	/**
 	* Runs a single update step from the next migration to be applied.
 	*
 	* The update step can either be a schema or a (partial) data update. To
 	* check if update() needs to be called again use the finished() method.
-	*
-	* @return null
 	*/
 	public function update()
 	{
@@ -134,7 +165,8 @@ class phpbb_db_migrator
 			return false;
 		}
 
-		$migration = new $name($this->db, $this->db_tools, $this->table_prefix, $this->phpbb_root_path, $this->php_ext);
+		$migration = $this->get_migration($name);
+
 		$state = (isset($this->migration_state[$name])) ?
 			$this->migration_state[$name] :
 			array(
@@ -157,6 +189,11 @@ class phpbb_db_migrator
 			}
 		}
 
+		$this->last_run_migration = array(
+			'name'	=> $name,
+			'class'	=> $migration,
+		);
+
 		if (!isset($this->migration_state[$name]))
 		{
 			$state['migration_start_time'] = time();
@@ -187,20 +224,20 @@ class phpbb_db_migrator
 
 	protected function process_data_step($migration)
 	{
-		$continue = false;
+		//$continue = false;
 		$steps = $migration->update_data();
 
 		foreach ($steps as $step)
 		{
 			$continue = $this->run_step($step);
 
-			if (!$continue)
+			/*if ($continue === false)
 			{
 				return false;
-			}
+			}*/
 		}
 
-		return $continue;
+		//return $continue;
 	}
 
 	protected function run_step($step)
@@ -211,13 +248,12 @@ class phpbb_db_migrator
 			$callable = $callable_and_parameters[0];
 			$parameters = $callable_and_parameters[1];
 
-			call_user_func_array($callable, $parameters);
-
-			return false;
+			return call_user_func_array($callable, $parameters);
 		}
 		catch (phpbb_db_migration_exception $e)
 		{
-			echo $e;die();
+			echo $e;
+			die();
 		}
 	}
 
@@ -325,7 +361,7 @@ class phpbb_db_migrator
 			return true;
 		}
 
-		$migration = new $name($this->db, $this->db_tools, $this->table_prefix, $this->phpbb_root_path, $this->php_ext);
+		$migration = $this->get_migration($name);
 		$depends = $migration->depends_on();
 
 		foreach ($depends as $depend)
@@ -374,4 +410,15 @@ class phpbb_db_migrator
 	{
 		$this->db_tools->perform_schema_changes($schema_changes);
 	}
+
+	/**
+	* Helper to get a migration
+	*
+	* @param string $name Name of the migration
+	* @return phpbb_db_migration
+	*/
+	protected function get_migration($name)
+	{
+		return new $name($this->config, $this->db, $this->db_tools, $this->phpbb_root_path, $this->php_ext, $this->table_prefix);
+	}
 }
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d0ef2759d5..057bdba0e3 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2868,6 +2868,7 @@ function send_status_line($code, $message)
 	else
 	{
 		$version = phpbb_request_http_version();
+
 		header("$version $code $message", true, $code);
 	}
 }
@@ -5582,7 +5583,7 @@ function phpbb_convert_30_dbms_to_31($dbms)
 
 		/*
 		$reflection = new \ReflectionClass($dbms);
-   	 
+
 		if ($reflection->isSubclassOf('phpbb_db_driver'))
 		{
 			return $dbms;
-- 
cgit v1.2.1


From aceadfd77b620677a838c61085c88db4d28e4a8a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 8 Jan 2013 22:19:56 -0600
Subject: [feature/migrations] Remove migration data (separate PR)

PHPBB3-9737
---
 phpBB/includes/db/migration/data/3_0_1.php         |  28 --
 phpBB/includes/db/migration/data/3_0_10.php        |  28 --
 phpBB/includes/db/migration/data/3_0_10_rc1.php    |  30 --
 phpBB/includes/db/migration/data/3_0_10_rc2.php    |  28 --
 phpBB/includes/db/migration/data/3_0_10_rc3.php    |  28 --
 phpBB/includes/db/migration/data/3_0_11.php        |  28 --
 phpBB/includes/db/migration/data/3_0_11_rc1.php    |  98 ------
 phpBB/includes/db/migration/data/3_0_11_rc2.php    |  34 --
 phpBB/includes/db/migration/data/3_0_12_rc1.php    | 123 -------
 phpBB/includes/db/migration/data/3_0_1_rc1.php     |  79 -----
 phpBB/includes/db/migration/data/3_0_2.php         |  28 --
 phpBB/includes/db/migration/data/3_0_2_rc1.php     |  32 --
 phpBB/includes/db/migration/data/3_0_2_rc2.php     |  55 ---
 phpBB/includes/db/migration/data/3_0_3.php         |  28 --
 phpBB/includes/db/migration/data/3_0_3_rc1.php     |  63 ----
 phpBB/includes/db/migration/data/3_0_4.php         |  49 ---
 phpBB/includes/db/migration/data/3_0_4_rc1.php     | 107 ------
 phpBB/includes/db/migration/data/3_0_5.php         |  28 --
 phpBB/includes/db/migration/data/3_0_5_rc1.php     | 119 -------
 .../includes/db/migration/data/3_0_5_rc1part2.php  |  37 ---
 phpBB/includes/db/migration/data/3_0_6.php         |  28 --
 phpBB/includes/db/migration/data/3_0_6_rc1.php     | 279 ----------------
 phpBB/includes/db/migration/data/3_0_6_rc2.php     |  28 --
 phpBB/includes/db/migration/data/3_0_6_rc3.php     |  40 ---
 phpBB/includes/db/migration/data/3_0_6_rc4.php     |  28 --
 phpBB/includes/db/migration/data/3_0_7.php         |  28 --
 phpBB/includes/db/migration/data/3_0_7_pl1.php     |  28 --
 phpBB/includes/db/migration/data/3_0_7_rc1.php     |  53 ---
 phpBB/includes/db/migration/data/3_0_7_rc2.php     |  72 ----
 phpBB/includes/db/migration/data/3_0_8.php         |  28 --
 phpBB/includes/db/migration/data/3_0_8_rc1.php     | 225 -------------
 phpBB/includes/db/migration/data/3_0_9.php         |  28 --
 phpBB/includes/db/migration/data/3_0_9_rc1.php     | 110 ------
 phpBB/includes/db/migration/data/3_0_9_rc2.php     |  28 --
 phpBB/includes/db/migration/data/3_0_9_rc3.php     |  28 --
 phpBB/includes/db/migration/data/3_0_9_rc4.php     |  28 --
 phpBB/includes/db/migration/data/3_1_0_dev.php     | 369 ---------------------
 phpBB/includes/db/migration/data/extensions.php    |  49 ---
 .../includes/db/migration/data/style_update_p1.php | 157 ---------
 .../includes/db/migration/data/style_update_p2.php |  42 ---
 phpBB/includes/db/migration/data/timezone.php      | 161 ---------
 41 files changed, 2887 deletions(-)
 delete mode 100644 phpBB/includes/db/migration/data/3_0_1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_10.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_10_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_10_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_10_rc3.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_11.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_11_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_11_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_12_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_1_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_2_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_2_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_3.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_3_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_4.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_4_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_5.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_5_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_5_rc1part2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_6.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_6_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_6_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_6_rc3.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_6_rc4.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_7.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_7_pl1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_7_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_7_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_8.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_8_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_9.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_9_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_9_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_9_rc3.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_9_rc4.php
 delete mode 100644 phpBB/includes/db/migration/data/3_1_0_dev.php
 delete mode 100644 phpBB/includes/db/migration/data/extensions.php
 delete mode 100644 phpBB/includes/db/migration/data/style_update_p1.php
 delete mode 100644 phpBB/includes/db/migration/data/style_update_p2.php
 delete mode 100644 phpBB/includes/db/migration/data/timezone.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/3_0_1.php b/phpBB/includes/db/migration/data/3_0_1.php
deleted file mode 100644
index a2332c9b59..0000000000
--- a/phpBB/includes/db/migration/data/3_0_1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_1_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_10.php b/phpBB/includes/db/migration/data/3_0_10.php
deleted file mode 100644
index 07410c5ba1..0000000000
--- a/phpBB/includes/db/migration/data/3_0_10.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_10 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_10_rc3');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.10')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc1.php b/phpBB/includes/db/migration/data/3_0_10_rc1.php
deleted file mode 100644
index daac50a631..0000000000
--- a/phpBB/includes/db/migration/data/3_0_10_rc1.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_10_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_9');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('email_max_chunk_size', 50)),
-
-			array('config.update', array('version', '3.0.10-rc1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc2.php b/phpBB/includes/db/migration/data/3_0_10_rc2.php
deleted file mode 100644
index 234e4c5fc7..0000000000
--- a/phpBB/includes/db/migration/data/3_0_10_rc2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_10_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_10_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.10-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc3.php b/phpBB/includes/db/migration/data/3_0_10_rc3.php
deleted file mode 100644
index 075ce35e3e..0000000000
--- a/phpBB/includes/db/migration/data/3_0_10_rc3.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_10_rc3 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_10_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.10-rc3')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_11.php b/phpBB/includes/db/migration/data/3_0_11.php
deleted file mode 100644
index 0bc9b6c4a5..0000000000
--- a/phpBB/includes/db/migration/data/3_0_11.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_11 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.11')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc1.php b/phpBB/includes/db/migration/data/3_0_11_rc1.php
deleted file mode 100644
index daf106accf..0000000000
--- a/phpBB/includes/db/migration/data/3_0_11_rc1.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_10');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
-			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
-
-			array('config.update', array('version', '3.0.11-rc1')),
-		);
-	}
-
-	function cleanup_deactivated_styles()
-	{
-		// Updates users having current style a deactivated one
-		$sql = 'SELECT style_id
-			FROM ' . STYLES_TABLE . '
-			WHERE style_active = 0';
-		$result = $this->sql_query($sql);
-
-		$deactivated_style_ids = array();
-		while ($style_id = $this->db->sql_fetchfield('style_id', false, $result))
-		{
-			$deactivated_style_ids[] = (int) $style_id;
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($deactivated_style_ids))
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_style = ' . (int) $this->config['default_style'] .'
-				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
-			$this->sql_query($sql);
-		}
-	}
-
-	function delete_orphan_private_messages()
-	{
-		// Delete orphan private messages
-		$batch_size = 500;
-
-		$sql_array = array(
-			'SELECT'	=> 'p.msg_id',
-			'FROM'		=> array(
-				PRIVMSGS_TABLE	=> 'p',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
-					'ON'	=> 'p.msg_id = t.msg_id',
-				),
-			),
-			'WHERE'		=> 't.user_id IS NULL',
-		);
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-
-		$result = $this->db->sql_query_limit($sql, $batch_size);
-
-		$delete_pms = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$delete_pms[] = (int) $row['msg_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($delete_pms))
-		{
-			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
-			$this->sql_query($sql);
-
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc2.php b/phpBB/includes/db/migration/data/3_0_11_rc2.php
deleted file mode 100644
index f2bed54085..0000000000
--- a/phpBB/includes/db/migration/data/3_0_11_rc2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_11_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11_rc1');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_novalue' => array('BOOL', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.11-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_12_rc1.php b/phpBB/includes/db/migration/data/3_0_12_rc1.php
deleted file mode 100644
index 0d8702f19e..0000000000
--- a/phpBB/includes/db/migration/data/3_0_12_rc1.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 **/
-
-class phpbb_db_migration_data_3_0_12_rc1 extends phpbb_db_migration
-{
-	public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array();
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_module_auth'))),
-			array('custom', array(array(&$this, 'update_bots'))),
-			array('custom', array(array(&$this, 'disable_bots_from_receiving_pms'))),
-
-			array('config.update', array('version', '3.0.12-rc1')),
-		);
-	}
-
-	public function disable_bots_from_receiving_pms()
-	{
-		// Disable receiving pms for bots
-		$sql = 'SELECT user_id
-			FROM ' . BOTS_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		$bot_user_ids = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$bot_user_ids[] = (int) $row['user_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($bot_user_ids))
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_allow_pm = 0
-				WHERE ' . $this->db->sql_in_set('user_id', $bot_user_ids);
-			$this->sql_query($sql);
-		}
-	}
-
-	public function update_module_auth()
-	{
-		$sql = 'UPDATE ' . MODULES_TABLE . '
-			SET module_auth = \'acl_u_sig\'
-			WHERE module_class = \'ucp\'
-				AND module_basename = \'profile\'
-				AND module_mode = \'signature\'';
-		$this->sql_query($sql);
-	}
-
-	public function update_bots()
-	{
-		// Update bots
-		if (!function_exists('user_delete'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-		}
-
-		$bots_updates = array(
-			// Bot Deletions
-			'NG-Search [Bot]'		=> false,
-			'Nutch/CVS [Bot]'		=> false,
-			'OmniExplorer [Bot]'	=> false,
-			'Seekport [Bot]'		=> false,
-			'Synoo [Bot]'			=> false,
-			'WiseNut [Bot]'			=> false,
-
-			// Bot Updates
-			// Bot name to bot user agent map
-			'Baidu [Spider]'	=> 'Baiduspider',
-			'Exabot [Bot]'		=> 'Exabot',
-			'Voyager [Bot]'		=> 'voyager/',
-			'W3C [Validator]'	=> 'W3C_Validator',
-		);
-
-		foreach ($bots_updates as $bot_name => $bot_agent)
-		{
-			$sql = 'SELECT user_id
-				FROM ' . USERS_TABLE . '
-				WHERE user_type = ' . USER_IGNORE . "
-					AND username_clean = '" . $this->db->sql_escape(utf8_clean_string($bot_name)) . "'";
-			$result = $this->db->sql_query($sql);
-			$bot_user_id = (int) $this->db->sql_fetchfield('user_id');
-			$this->db->sql_freeresult($result);
-
-			if ($bot_user_id)
-			{
-				if ($bot_agent === false)
-				{
-					$sql = 'DELETE FROM ' . BOTS_TABLE . "
-						WHERE user_id = $bot_user_id";
-					$this->sql_query($sql);
-
-					user_delete('remove', $bot_user_id);
-				}
-				else
-				{
-					$sql = 'UPDATE ' . BOTS_TABLE . "
-						SET bot_agent = '" .  $this->db->sql_escape($bot_agent) . "'
-						WHERE user_id = $bot_user_id";
-					$this->sql_query($sql);
-				}
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_1_rc1.php b/phpBB/includes/db/migration/data/3_0_1_rc1.php
deleted file mode 100644
index a3b4810d21..0000000000
--- a/phpBB/includes/db/migration/data/3_0_1_rc1.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array();
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'display_subforum_list' => array('BOOL', 1),
-				),
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array('UINT', 0),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'groups' => array('group_legend'),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array('session_forum_id'),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_legend_name' => array('group_legend', 'group_name'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
-			array('custom', array(array(&$this, 'reset_smiley_size'))),
-
-			array('config.update', array('version', '3.0.1-rc1')),
-		);
-	}
-
-	function fix_unset_last_view_time()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . "topics
-			SET topic_last_view_time = topic_last_post_time
-			WHERE topic_last_view_time = 0";
-		$this->sql_query($sql);
-	}
-
-	function reset_smiley_size()
-	{
-		// Update smiley sizes
-		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
-
-		foreach ($smileys as $smiley)
-		{
-			if (file_exists($this->phpbb_root_path . 'images/smilies/' . $smiley))
-			{
-				list($width, $height) = getimagesize($this->phpbb_root_path . 'images/smilies/' . $smiley);
-
-				$sql = 'UPDATE ' . SMILIES_TABLE . '
-					SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
-					WHERE smiley_url = '" . $this->db->sql_escape($smiley) . "'";
-
-				$this->sql_query($sql);
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_2.php b/phpBB/includes/db/migration/data/3_0_2.php
deleted file mode 100644
index 3469d8d178..0000000000
--- a/phpBB/includes/db/migration/data/3_0_2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_2_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc1.php b/phpBB/includes/db/migration/data/3_0_2_rc1.php
deleted file mode 100644
index d3c2200f14..0000000000
--- a/phpBB/includes/db/migration/data/3_0_2_rc1.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_2_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('referer_validation', '1')),
-			array('config.add', array('check_attachment_content', '1')),
-			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
-
-			array('config.update', array('version', '3.0.2-rc1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc2.php b/phpBB/includes/db/migration/data/3_0_2_rc2.php
deleted file mode 100644
index 67fd1faec6..0000000000
--- a/phpBB/includes/db/migration/data/3_0_2_rc2.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_2_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_2_rc1');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'change_columns' => array(
-				$this->table_prefix . 'drafts' => array(
-					'draft_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_last_post_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_subject' => array('STEXT_UNI', '', 'true_sort'),
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'topics' => array(
-					'topic_title' => array('STEXT_UNI', '', 'true_sort'),
-					'topic_last_post_subject' => array('STEXT_UNI', ''),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'sessions' => array('session_forum_id'),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_fid' => array('session_forum_id'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.2-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_3.php b/phpBB/includes/db/migration/data/3_0_3.php
deleted file mode 100644
index dff375f438..0000000000
--- a/phpBB/includes/db/migration/data/3_0_3.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_3 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_3_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.3')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_3_rc1.php b/phpBB/includes/db/migration/data/3_0_3_rc1.php
deleted file mode 100644
index 2320c4ac4b..0000000000
--- a/phpBB/includes/db/migration/data/3_0_3_rc1.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_2');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'styles_template' => array(
-					'template_inherits_id' => array('UINT:4', 0),
-					'template_inherit_path' => array('VCHAR', ''),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_max_recipients' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('enable_queue_trigger', '0')),
-			array('config.add', array('queue_trigger_posts', '3')),
-			array('config.add', array('pm_max_recipients', '0')),
-			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
-			array('config.add', array('dbms_version', $this->db->sql_server_info(true))),
-			array('permission.add', array('u_masspm_group', true, 'u_masspm')),
-			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
-
-			array('config.update', array('version', '3.0.3-rc1')),
-		);
-	}
-
-	function correct_acp_email_permissions()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . 'modules
-			SET module_auth = \'acl_a_email && cfg_email_enable\'
-			WHERE module_class = \'acp\'
-				AND module_basename = \'email\'';
-		$this->sql_query($sql);
-	}
-
-	function set_group_default_max_recipients()
-	{
-		// Set maximum number of recipients for the registered users, bots, guests group
-		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
-			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_4.php b/phpBB/includes/db/migration/data/3_0_4.php
deleted file mode 100644
index 1af4508331..0000000000
--- a/phpBB/includes/db/migration/data/3_0_4.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_4 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_4_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
-
-			array('config.update', array('version', '3.0.4')),
-		);
-	}
-
-	function rename_log_delete_topic()
-	{
-		if ($this->db->sql_layer == 'oracle')
-		{
-			// log_operation is CLOB - but we can change this later
-			$sql = 'UPDATE ' . $this->table_prefix . "log
-				SET log_operation = 'LOG_DELETE_TOPIC'
-				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
-			$this->sql_query($sql);
-		}
-		else
-		{
-			$sql = 'UPDATE ' . $this->table_prefix . "log
-				SET log_operation = 'LOG_DELETE_TOPIC'
-				WHERE log_operation = 'LOG_TOPIC_DELETED'";
-			$this->sql_query($sql);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_4_rc1.php b/phpBB/includes/db/migration/data/3_0_4_rc1.php
deleted file mode 100644
index e9bb0e01f5..0000000000
--- a/phpBB/includes/db/migration/data/3_0_4_rc1.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_3');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_profile' => array('BOOL', 0),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'styles' => array(
-					'style_id' => array('UINT', NULL, 'auto_increment'),
-					'template_id' => array('UINT', 0),
-					'theme_id' => array('UINT', 0),
-					'imageset_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'styles_imageset' => array(
-					'imageset_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_imageset_data' => array(
-					'image_id' => array('UINT', NULL, 'auto_increment'),
-					'imageset_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'styles_theme' => array(
-					'theme_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_template' => array(
-					'template_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_template_data' => array(
-					'template_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_style' => array('UINT', 0),
-				),
-				$this->table_prefix . 'users' => array(
-					'user_style' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
-
-			array('config.update', array('version', '3.0.4-rc1')),
-		);
-	}
-
-	function update_custom_profile_fields()
-	{
-		// Update the Custom Profile Fields based on previous settings to the new format
-		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
-				FROM ' . PROFILE_FIELDS_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql_ary = array(
-				'field_required'	=> 0,
-				'field_show_on_reg'	=> 0,
-				'field_hide'		=> 0,
-				'field_show_profile'=> 0,
-			);
-
-			if ($row['field_required'])
-			{
-				$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
-			}
-			else if ($row['field_show_on_reg'])
-			{
-				$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
-			}
-			else if ($row['field_hide'])
-			{
-				// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
-				$sql_ary['field_hide'] = 1;
-			}
-			else
-			{
-				// equivelant to "none", which is the "Display in user control panel" option
-				$sql_ary['field_show_profile'] = 1;
-			}
-
-			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
-		}
-
-		$this->db->sql_freeresult($result);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_5.php b/phpBB/includes/db/migration/data/3_0_5.php
deleted file mode 100644
index 2f80970781..0000000000
--- a/phpBB/includes/db/migration/data/3_0_5.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_5 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_5_rc1part2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.5')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1.php b/phpBB/includes/db/migration/data/3_0_5_rc1.php
deleted file mode 100644
index cbf28c0be6..0000000000
--- a/phpBB/includes/db/migration/data/3_0_5_rc1.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_4');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'change_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'forum_style' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		$search_indexing_state = $this->config['search_indexing_state'];
-
-		return array(
-			array('config.add', array('captcha_gd_wave', 0)),
-			array('config.add', array('captcha_gd_3d_noise', 1)),
-			array('config.add', array('captcha_gd_fonts', 1)),
-			array('config.add', array('confirm_refresh', 1)),
-			array('config.add', array('max_num_search_keywords', 10)),
-			array('config.remove', array('search_indexing_state')),
-			array('config.add', array('search_indexing_state', $search_indexing_state, true)),
-			array('custom', array(array(&$this, 'hash_old_passwords'))),
-			array('custom', array(array(&$this, 'update_ichiro_bot'))),
-		);
-	}
-
-	function hash_old_passwords()
-	{
-		$sql = 'SELECT user_id, user_password
-				FROM ' . $this->table_prefix . 'users
-				WHERE user_pass_convert = 1';
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (strlen($row['user_password']) == 32)
-			{
-				$sql_ary = array(
-					'user_password'	=> phpbb_hash($row['user_password']),
-				);
-
-				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
-			}
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	function update_ichiro_bot()
-	{
-		// Adjust bot entry
-		$sql = 'UPDATE ' . $this->table_prefix . "bots
-			SET bot_agent = 'ichiro/'
-			WHERE bot_agent = 'ichiro/2'";
-		$this->sql_query($sql);
-	}
-
-	function remove_duplicate_auth_options()
-	{
-		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
-		$sql = 'SELECT auth_option
-			FROM ' . $this->table_prefix . 'acl_options
-			GROUP BY auth_option
-			HAVING COUNT(*) >= 2';
-		$result = $this->db->sql_query($sql);
-
-		$auth_options = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$auth_options[] = $row['auth_option'];
-		}
-		$this->db->sql_freeresult($result);
-
-		// Remove specific auth options
-		if (!empty($auth_options))
-		{
-			foreach ($auth_options as $option)
-			{
-				// Select auth_option_ids... the largest id will be preserved
-				$sql = 'SELECT auth_option_id
-					FROM ' . ACL_OPTIONS_TABLE . "
-					WHERE auth_option = '" . $db->sql_escape($option) . "'
-					ORDER BY auth_option_id DESC";
-				// sql_query_limit not possible here, due to bug in postgresql layer
-				$result = $this->db->sql_query($sql);
-
-				// Skip first row, this is our original auth option we want to preserve
-				$row = $this->db->sql_fetchrow($result);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// Ok, remove this auth option...
-					$this->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-				}
-				$this->db->sql_freeresult($result);
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
deleted file mode 100644
index 1fab0f8873..0000000000
--- a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_5_rc1part2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_5_rc1');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'drop_keys'			=> array(
-				ACL_OPTIONS_TABLE		=> array('auth_option'),
-			),
-			'add_unique_index'	=> array(
-				ACL_OPTIONS_TABLE		=> array(
-					'auth_option'		=> array('auth_option'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.5-rc1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_6.php b/phpBB/includes/db/migration/data/3_0_6.php
deleted file mode 100644
index 26176b9437..0000000000
--- a/phpBB/includes/db/migration/data/3_0_6.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_6 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_6_rc4');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.6')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc1.php b/phpBB/includes/db/migration/data/3_0_6_rc1.php
deleted file mode 100644
index 35adcf52be..0000000000
--- a/phpBB/includes/db/migration/data/3_0_6_rc1.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_5');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'confirm' => array(
-					'attempts' => array('UINT', 0),
-				),
-				$this->table_prefix . 'users' => array(
-					'user_new' => array('BOOL', 1),
-					'user_reminded' => array('TINT:4', 0),
-					'user_reminded_time' => array('TIMESTAMP', 0),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_reported' => array('BOOL', 0),
-				),
-				$this->table_prefix . 'reports' => array(
-					'pm_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'profile_fields'	=> array(
-					'field_show_on_vt' => array('BOOL', 0),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_options' => array('UINT:20', 0),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'users' => array(
-					'user_options' => array('UINT:11', 230271),
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'reports' => array(
-					'post_id' => array('post_id'),
-					'pm_id' => array('pm_id'),
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_username' => array('post_username:255'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
-			array('if', array(
-				($this->config['captcha_gd']),
-				array('config.update', array('captcha_plugin', 'phpbb_captcha_gd')),
-			)),
-
-			array('config.add', array('feed_enable', 0)),
-			array('config.add', array('feed_limit', 10)),
-			array('config.add', array('feed_overall_forums', 1)),
-			array('config.add', array('feed_overall_forums_limit', 15)),
-			array('config.add', array('feed_overall_topics', 0)),
-			array('config.add', array('feed_overall_topics_limit', 15)),
-			array('config.add', array('feed_forum', 1)),
-			array('config.add', array('feed_topic', 1)),
-			array('config.add', array('feed_item_statistics', 1)),
-
-			array('config.add', array('smilies_per_page', 50)),
-			array('config.add', array('allow_pm_report', 1)),
-			array('config.add', array('min_post_chars', 1)),
-			array('config.add', array('allow_quick_reply', 1)),
-			array('config.add', array('new_member_post_limit', 0)),
-			array('config.add', array('new_member_group_default', 0)),
-			array('config.add', array('delete_time', $this->config['edit_time'])),
-
-			array('config.add', array('allow_avatar', 0)),
-			array('if', array(
-				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
-				array('config.update', array('allow_avatar', 1)),
-			)),
-			array('config.add', array('allow_avatar_remote_upload', 0)),
-			array('if', array(
-				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
-				array('config.update', array('allow_avatar_remote_upload', 1)),
-			)),
-
-			array('module.add', array(
-				'acp',
-				'ACP_BOARD_CONFIGURATION',
-				array(
-					'module_basename'	=> 'acp_board',
-					'modes'				=> array('feed'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_CAT_USERS',
-				array(
-					'module_basename'	=> 'acp_users',
-					'modes'				=> array('warnings'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_SERVER_CONFIGURATION',
-				array(
-					'module_basename'	=> 'acp_send_statistics',
-					'modes'				=> array('send_statistics'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_FORUM_BASED_PERMISSIONS',
-				array(
-					'module_basename'	=> 'acp_permissions',
-					'modes'				=> array('setting_forum_copy'),
-				),
-			)),
-			array('module.add', array(
-				'mcp',
-				'MCP_REPORTS',
-				array(
-					'module_basename'	=> 'mcp_pm_reports',
-					'modes'				=> array('pm_reports','pm_reports_closed','pm_report_details'),
-				),
-			)),
-			array('custom', array(array(&$this, 'add_newly_registered_group'))),
-			array('custom', array(array(&$this, 'set_user_options_default'))),
-
-			array('config.update', array('version', '3.0.6-rc1')),
-		);
-	}
-
-	function set_user_options_default()
-	{
-		// 229376 is the added value to enable all three signature options
-		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
-		$this->sql_query($sql);
-	}
-
-	function add_newly_registered_group()
-	{
-		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = 'NEWLY_REGISTERED'";
-		$result = $this->db->sql_query($sql);
-		$group_id = (int) $this->db->sql_fetchfield('group_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$group_id)
-		{
-			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
-			$this->sql_query($sql);
-
-			$group_id = $this->db->sql_nextid();
-		}
-
-		// Insert new user role... at the end of the chain
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
-				AND role_type = 'u_'";
-		$result = $this->db->sql_query($sql);
-		$u_role = (int) $this->db->sql_fetchfield('role_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$u_role)
-		{
-			$sql = 'SELECT MAX(role_order) as max_order_id
-				FROM ' . ACL_ROLES_TABLE . "
-				WHERE role_type = 'u_'";
-			$result = $this->db->sql_query($sql);
-			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
-			$this->db->sql_freeresult($result);
-
-			$next_order_id++;
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
-			$this->sql_query($sql);
-			$u_role = $this->db->sql_nextid();
-
-			// Now add the correct data to the roles...
-			// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
-			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
-			$this->sql_query($sql);
-
-			// Add user role to group
-			$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
-			$this->sql_query($sql);
-		}
-
-		// Insert new forum role
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
-				AND role_type = 'f_'";
-		$result = $this->db->sql_query($sql);
-		$f_role = (int) $this->db->sql_fetchfield('role_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$f_role)
-		{
-			$sql = 'SELECT MAX(role_order) as max_order_id
-				FROM ' . ACL_ROLES_TABLE . "
-				WHERE role_type = 'f_'";
-			$result = $this->db->sql_query($sql);
-			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
-			$this->db->sql_freeresult($result);
-
-			$next_order_id++;
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
-			$this->sql_query($sql);
-			$f_role = $this->db->sql_nextid();
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
-			$this->sql_query($sql);
-		}
-
-		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
-		$sql = 'SELECT 1
-			FROM ' . USERS_TABLE . '
-			WHERE user_new = 0';
-		$result = $this->db->sql_query_limit($sql, 1);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
-			$this->sql_query($sql);
-		}
-
-		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
-		// Check if the role is already assigned...
-		$sql = 'SELECT forum_id
-			FROM ' . ACL_GROUPS_TABLE . '
-			WHERE group_id = ' . $group_id . '
-				AND auth_role_id = ' . $f_role;
-		$result = $this->db->sql_query($sql);
-		$is_options = (int) $this->db->sql_fetchfield('forum_id');
-		$this->db->sql_freeresult($result);
-
-		// Not assigned at all... :/
-		if (!$is_options)
-		{
-			// Get postable forums
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_type != ' . FORUM_LINK;
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$this->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)');
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		// Clear permissions...
-		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
-		$auth_admin = new auth_admin();
-		$auth_admin->acl_clear_prefetch();
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc2.php b/phpBB/includes/db/migration/data/3_0_6_rc2.php
deleted file mode 100644
index 4092a5fa61..0000000000
--- a/phpBB/includes/db/migration/data/3_0_6_rc2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_6_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_6_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.6-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc3.php b/phpBB/includes/db/migration/data/3_0_6_rc3.php
deleted file mode 100644
index ec22d1da77..0000000000
--- a/phpBB/includes/db/migration/data/3_0_6_rc3.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_6_rc3 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_6_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_cp_fields'))),
-
-			array('config.update', array('version', '3.0.6-rc3')),
-		);
-	}
-
-	function update_cp_fields()
-	{
-		// Update the Custom Profile Fields based on previous settings to the new format
-		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
-			SET field_show_on_vt = 1
-			WHERE field_hide = 0
-				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc4.php b/phpBB/includes/db/migration/data/3_0_6_rc4.php
deleted file mode 100644
index e748c7a4ff..0000000000
--- a/phpBB/includes/db/migration/data/3_0_6_rc4.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_6_rc4 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_6_rc3');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.6-rc4')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_7.php b/phpBB/includes/db/migration/data/3_0_7.php
deleted file mode 100644
index f27b56f778..0000000000
--- a/phpBB/includes/db/migration/data/3_0_7.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_7 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_7_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.7')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_7_pl1.php b/phpBB/includes/db/migration/data/3_0_7_pl1.php
deleted file mode 100644
index 5543d6437a..0000000000
--- a/phpBB/includes/db/migration/data/3_0_7_pl1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_7_pl1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_7');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.7-pl1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc1.php b/phpBB/includes/db/migration/data/3_0_7_rc1.php
deleted file mode 100644
index 71584382e8..0000000000
--- a/phpBB/includes/db/migration/data/3_0_7_rc1.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_6');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'drop_keys' => array(
-				$this->table_prefix . 'log' => array('log_time'),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'topics_track' => array(
-					'topic_id' => array('topic_id'),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('feed_overall', 1)),
-			array('config.add', array('feed_http_auth', 0)),
-			array('config.add', array('feed_limit_post', $this->config['feed_limit'])),
-			array('config.add', array('feed_limit_topic', $this->config['feed_overall_topics_limit'])),
-			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
-			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
-			array('custom', array(array(&$this, 'delete_text_templates'))),
-
-			array('config.update', array('version', '3.0.7-rc1')),
-		);
-	}
-
-	function delete_text_templates()
-	{
-		// Delete all text-templates from the template_data
-		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
-			WHERE template_filename ' . $this->db->sql_like_expression($this->db->any_char . '.txt');
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc2.php b/phpBB/includes/db/migration/data/3_0_7_rc2.php
deleted file mode 100644
index e2c6acce1e..0000000000
--- a/phpBB/includes/db/migration/data/3_0_7_rc2.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_7_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_7_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_email_hash'))),
-
-			array('config.update', array('version', '3.0.7-rc2')),
-		);
-	}
-
-	function update_email_hash($start = 0)
-	{
-		$limit = 1000;
-
-		$sql = 'SELECT user_id, user_email, user_email_hash
-			FROM ' . USERS_TABLE . '
-			WHERE user_type <> ' . USER_IGNORE . "
-				AND user_email <> ''";
-		$result = $this->db->sql_query_limit($sql, $limit, $start);
-
-		$i = 0;
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$i++;
-
-			// Snapshot of the phpbb_email_hash() function
-			// We cannot call it directly because the auto updater updates the DB first. :/
-			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
-
-			if ($user_email_hash != $row['user_email_hash'])
-			{
-				$sql_ary = array(
-					'user_email_hash'	=> $user_email_hash,
-				);
-
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE user_id = ' . (int) $row['user_id'];
-				$this->sql_query($sql);
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		if ($i < $limit)
-		{
-			// Completed
-			return false;
-		}
-
-		return $start + $limit;
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_8.php b/phpBB/includes/db/migration/data/3_0_8.php
deleted file mode 100644
index a5defc8278..0000000000
--- a/phpBB/includes/db/migration/data/3_0_8.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_8 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_8_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.8')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_8_rc1.php b/phpBB/includes/db/migration/data/3_0_8_rc1.php
deleted file mode 100644
index b58b0966a5..0000000000
--- a/phpBB/includes/db/migration/data/3_0_8_rc1.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_7_pl1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
-			array('custom', array(array(&$this, 'update_module_auth'))),
-			array('custom', array(array(&$this, 'update_bots'))),
-			array('custom', array(array(&$this, 'delete_orphan_shadow_topics'))),
-			array('module.add', array(
-				'acp',
-				'ACP_MESSAGES',
-				array(
-					'module_basename'	=> 'acp_board',
-					'modes'				=> array('post'),
-				),
-			)),
-			array('config.add', array('load_unreads_search', 1)),
-			array('config.update_if_equals', array(600, 'queue_interval', 60)),
-			array('config.update_if_equals', array(50, 'email_package_size', 20)),
-
-			array('config.update', array('version', '3.0.8-rc1')),
-		);
-	}
-
-	function update_file_extension_group_names()
-	{
-		// Update file extension group names to use language strings.
-		$sql = 'SELECT lang_dir
-			FROM ' . LANG_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		$extension_groups_updated = array();
-		while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
-		{
-			$lang_dir = basename($lang_dir);
-
-			// The language strings we need are either in language/.../acp/attachments.php
-			// in the update package if we're updating to 3.0.8-RC1 or later,
-			// or they are in language/.../install.php when we're updating from 3.0.7-PL1 or earlier.
-			// On an already updated board, they can also already be in language/.../acp/attachments.php
-			// in the board root.
-			$lang_files = array(
-				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.{$this->php_ext}",
-				"{$this->phpbb_root_path}language/$lang_dir/install.{$this->php_ext}",
-				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.{$this->php_ext}",
-			);
-
-			foreach ($lang_files as $lang_file)
-			{
-				if (!file_exists($lang_file))
-				{
-					continue;
-				}
-
-				$lang = array();
-				include($lang_file);
-
-				foreach($lang as $lang_key => $lang_val)
-				{
-					if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
-					{
-						continue;
-					}
-
-					$sql_ary = array(
-						'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
-					);
-
-					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-						SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
-						WHERE group_name = '" . $this->db->sql_escape($lang_val) . "'";
-					$this->sql_query($sql);
-
-					$extension_groups_updated[$lang_key] = true;
-				}
-			}
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	function update_module_auth()
-	{
-		$sql = 'UPDATE ' . MODULES_TABLE . '
-			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
-			WHERE module_class = \'ucp\'
-				AND module_basename = \'profile\'
-				AND module_mode = \'avatar\'';
-		$this->sql_query($sql);
-	}
-
-	function update_bots()
-	{
-		$bot_name = 'Bing [Bot]';
-		$bot_name_clean = utf8_clean_string($bot_name);
-
-		$sql = 'SELECT user_id
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . $this->db->sql_escape($bot_name_clean) . "'";
-		$result = $this->db->sql_query($sql);
-		$bing_already_added = (bool) $this->db->sql_fetchfield('user_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$bing_already_added)
-		{
-			$bot_agent = 'bingbot/';
-			$bot_ip = '';
-			$sql = 'SELECT group_id, group_colour
-				FROM ' . GROUPS_TABLE . "
-				WHERE group_name = 'BOTS'";
-			$result = $this->db->sql_query($sql);
-			$group_row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$group_row)
-			{
-				// default fallback, should never get here
-				$group_row['group_id'] = 6;
-				$group_row['group_colour'] = '9E8DA7';
-			}
-
-			if (!function_exists('user_add'))
-			{
-				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-			}
-
-			$user_row = array(
-				'user_type'				=> USER_IGNORE,
-				'group_id'				=> $group_row['group_id'],
-				'username'				=> $bot_name,
-				'user_regdate'			=> time(),
-				'user_password'			=> '',
-				'user_colour'			=> $group_row['group_colour'],
-				'user_email'			=> '',
-				'user_lang'				=> $this->config['default_lang'],
-				'user_style'			=> $this->config['default_style'],
-				'user_timezone'			=> 0,
-				'user_dateformat'		=> $this->config['default_dateformat'],
-				'user_allow_massemail'	=> 0,
-			);
-
-			$user_id = user_add($user_row);
-
-			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
-				'bot_active'	=> 1,
-				'bot_name'		=> (string) $bot_name,
-				'user_id'		=> (int) $user_id,
-				'bot_agent'		=> (string) $bot_agent,
-				'bot_ip'		=> (string) $bot_ip,
-			));
-
-			$this->sql_query($sql);
-		}
-	}
-
-	function delete_orphan_shadow_topics()
-	{
-		// Delete shadow topics pointing to not existing topics
-		$batch_size = 500;
-
-		// Set of affected forums we have to resync
-		$sync_forum_ids = array();
-
-		$sql_array = array(
-			'SELECT'	=> 't1.topic_id, t1.forum_id',
-			'FROM'		=> array(
-				TOPICS_TABLE	=> 't1',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(TOPICS_TABLE	=> 't2'),
-					'ON'	=> 't1.topic_moved_id = t2.topic_id',
-				),
-			),
-			'WHERE'		=> 't1.topic_moved_id <> 0
-						AND t2.topic_id IS NULL',
-		);
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-		$result = $this->db->sql_query_limit($sql, $batch_size);
-
-		$topic_ids = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$topic_ids[] = (int) $row['topic_id'];
-
-			$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($topic_ids))
-		{
-			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
-			$this->db->sql_query($sql);
-
-			// Sync the forums we have deleted shadow topics from.
-			sync('forum', 'forum_id', $sync_forum_ids, true, true);
-
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_9.php b/phpBB/includes/db/migration/data/3_0_9.php
deleted file mode 100644
index eb359e2697..0000000000
--- a/phpBB/includes/db/migration/data/3_0_9.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_9 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_9_rc4');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc1.php b/phpBB/includes/db/migration/data/3_0_9_rc1.php
deleted file mode 100644
index ea49cdbba9..0000000000
--- a/phpBB/includes/db/migration/data/3_0_9_rc1.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_8');
-	}
-
-	function update_schema()
-	{
-		return array(
-			'add_tables' => array(
-				$this->table_prefix . 'login_attempts' => array(
-					'COLUMNS' => array(
-						// this column was removed from the database updater
-						// after 3.0.9-RC3 was released. It might still exist
-						// in 3.0.9-RCX installations and has to be dropped in
-						// 3.0.12 after the db_tools class is capable of properly
-						// removing a primary key.
-						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
-						'attempt_ip'			=> array('VCHAR:40', ''),
-						'attempt_browser'		=> array('VCHAR:150', ''),
-						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
-						'attempt_time'			=> array('TIMESTAMP', 0),
-						'user_id'				=> array('UINT', 0),
-						'username'				=> array('VCHAR_UNI:255', 0),
-						'username_clean'		=> array('VCHAR_CI', 0),
-					),
-					//'PRIMARY_KEY' => 'attempt_id',
-					'KEYS' => array(
-						'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
-						'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
-						'att_time' => array('INDEX', array('attempt_time')),
-						'user_id' => array('INDEX', 'user_id'),
-					),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'bbcodes' => array(
-					'bbcode_id' => array('USINT', 0),
-				),
-			),
-		);
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.add', array('ip_login_limit_max', 50)),
-			array('config.add', array('ip_login_limit_time', 21600)),
-			array('config.add', array('ip_login_limit_use_forwarded', 0)),
-			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
-			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
-
-			array('config.update', array('version', '3.0.9-rc1')),
-		);
-	}
-
-	function update_file_extension_group_names()
-	{
-		// Update file extension group names to use language strings, again.
-		$sql = 'SELECT group_id, group_name
-			FROM ' . EXTENSION_GROUPS_TABLE . '
-			WHERE group_name ' . $this->db->sql_like_expression('EXT_GROUP_' . $this->db->any_char);
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql_ary = array(
-				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
-			);
-
-			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE group_id = ' . $row['group_id'];
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	function fix_firebird_qa_captcha()
-	{
-		// Recover from potentially broken Q&A CAPTCHA table on firebird
-		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
-		// without data loss
-		if ($this->db_tools->sql_layer == 'firebird')
-		{
-			$tables = array(
-				$this->table_prefix . 'captcha_questions',
-				$this->table_prefix . 'captcha_answers',
-				$this->table_prefix . 'qa_confirm',
-			);
-			foreach ($tables as $table)
-			{
-				if ($this->db_tools->sql_table_exists($table))
-				{
-					$this->db_tools->sql_table_drop($table);
-				}
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc2.php b/phpBB/includes/db/migration/data/3_0_9_rc2.php
deleted file mode 100644
index e3c4716665..0000000000
--- a/phpBB/includes/db/migration/data/3_0_9_rc2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_9_rc2 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_9_rc1');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc3.php b/phpBB/includes/db/migration/data/3_0_9_rc3.php
deleted file mode 100644
index 3cdecb96ae..0000000000
--- a/phpBB/includes/db/migration/data/3_0_9_rc3.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_9_rc3 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_9_rc2');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9-rc3')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc4.php b/phpBB/includes/db/migration/data/3_0_9_rc4.php
deleted file mode 100644
index c2a92e618a..0000000000
--- a/phpBB/includes/db/migration/data/3_0_9_rc4.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_9_rc4 extends phpbb_db_migration
-{
-	function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_9_rc3');
-	}
-
-	function update_schema()
-	{
-		return array();
-	}
-
-	function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9-rc4')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_1_0_dev.php b/phpBB/includes/db/migration/data/3_1_0_dev.php
deleted file mode 100644
index 6eb5a6ddee..0000000000
--- a/phpBB/includes/db/migration/data/3_1_0_dev.php
+++ /dev/null
@@ -1,369 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_1_0_dev extends phpbb_db_migration
-{
-	public function depends_on()
-	{
-		return array(
-			'phpbb_db_migration_data_3_0_11',
-			'phpbb_db_migration_data_extensions',
-			'phpbb_db_migration_data_style_update_p2',
-			'phpbb_db_migration_data_timezone',
-		);
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns'		=> array(
-				GROUPS_TABLE		=> array(
-					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
-				),
-				PROFILE_FIELDS_TABLE	=> array(
-					'field_show_on_pm'		=> array('BOOL', 0),
-				),
-				STYLES_TABLE		=> array(
-					'style_path'			=> array('VCHAR:100', ''),
-					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
-					'style_parent_id'		=> array('UINT:4', 0),
-					'style_parent_tree'		=> array('TEXT', ''),
-				),
-				REPORTS_TABLE		=> array(
-					'reported_post_text'		=> array('MTEXT_UNI', ''),
-					'reported_post_uid'			=> array('VCHAR:8', ''),
-					'reported_post_bitfield'	=> array('VCHAR:255', ''),
-				),
-			),
-			'change_columns'	=> array(
-				GROUPS_TABLE		=> array(
-					'group_legend'		=> array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
-
-			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
-			array('config.add', array('fulltext_postgres_min_word_len', 4)),
-			array('config.add', array('fulltext_postgres_max_word_len', 254)),
-			array('config.add', array('fulltext_sphinx_stopwords', 0)),
-			array('config.add', array('fulltext_sphinx_indexer_mem_limit', 512)),
-
-			array('config.add', array('load_jquery_cdn', 0)),
-			array('config.add', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js')),
-
-			array('config.add', array('use_system_cron', 0)),
-
-			array('config.add', array('legend_sort_groupname', 0)),
-			array('config.add', array('teampage_forums', 1)),
-			array('config.add', array('teampage_memberships', 1)),
-
-			array('config.add', array('load_cpf_pm', 0)),
-
-			array('config.add', array('display_last_subject', 1)),
-
-			array('config.add', array('assets_version', 1)),
-
-			array('config.add', array('site_home_url', '')),
-			array('config.add', array('site_home_text', '')),
-
-			array('permission.add', array('u_chgprofileinfo', true, 'u_sig')),
-
-			array('module.add', array(
-				'acp',
-				'ACP_GROUPS',
-				array(
-					'module_basename'	=> 'acp_groups',
-					'modes'				=> array('position'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_ATTACHMENTS',
-				array(
-					'module_basename'	=> 'acp_attachments',
-					'modes'				=> array('manage'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_STYLE_MANAGEMENT',
-				array(
-					'module_basename'	=> 'acp_styles',
-					'modes'				=> array('install', 'cache'),
-				),
-			)),
-			array('module.add', array(
-				'ucp',
-				'UCP_PROFILE',
-				array(
-					'module_basename'	=> 'ucp_profile',
-					'modes'				=> array('autologin_keys'),
-				),
-			)),
-
-			array('module.remove', array(
-				'acp',
-				false,
-				'ACP_TEMPLATES',
-			)),
-			array('module.remove', array(
-				'acp',
-				false,
-				'ACP_THEMES',
-			)),
-			array('module.remove', array(
-				'acp',
-				false,
-				'ACP_IMAGESETS',
-			)),
-
-			array('custom', array(array($this, 'rename_module_basenames'))),
-			array('custom', array(array($this, 'rename_styles_module'))),
-			array('custom', array(array($this, 'add_group_teampage'))),
-			array('custom', array(array($this, 'update_group_legend'))),
-			array('custom', array(array($this, 'localise_global_announcements'))),
-			array('custom', array(array($this, 'update_ucp_pm_basename'))),
-			array('custom', array(array($this, 'update_ucp_profile_auth'))),
-			array('custom', array(array($this, 'move_customise_modules'))),
-
-			array('config.update', array('version', '3.1.0-dev')),
-		);
-	}
-
-	public function move_customise_modules()
-	{
-		// Move language management to new location in the Customise tab
-		// First get language module id
-		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-			WHERE module_basename = 'acp_language'";
-		$result = $this->db->sql_query($sql);
-		$language_module_id = $this->db->sql_fetchfield('module_id');
-		$this->db->sql_freeresult($result);
-		// Next get language management module id of the one just created
-		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-			WHERE module_langname = 'ACP_LANGUAGE'";
-		$result = $this->db->sql_query($sql);
-		$language_management_module_id = $this->db->sql_fetchfield('module_id');
-		$this->db->sql_freeresult($result);
-
-		if (!class_exists('acp_modules'))
-		{
-			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
-		}
-		// acp_modules calls adm_back_link, which is undefined at this point
-		if (!function_exists('adm_back_link'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
-		}
-		$module_manager = new acp_modules();
-		$module_manager->module_class = 'acp';
-		$module_manager->move_module($language_module_id, $language_management_module_id);
-	}
-
-	public function update_ucp_pm_basename()
-	{
-		$sql = 'SELECT module_id, module_basename
-			FROM ' . MODULES_TABLE . "
-			WHERE module_basename <> 'ucp_pm' AND
-				module_langname='UCP_PM'";
-		$result = $this->db->sql_query_limit($sql, 1);
-
-		if ($row = $this->db->sql_fetchrow($result))
-		{
-			// This update is still not applied. Applying it
-
-			$sql = 'UPDATE ' . MODULES_TABLE . "
-				SET module_basename = 'ucp_pm'
-				WHERE  module_id = " . (int) $row['module_id'];
-
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function update_ucp_profile_auth()
-	{
-		// Update the auth setting for the module
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET module_auth = 'acl_u_chgprofileinfo'
-			WHERE module_class = 'ucp'
-				AND module_basename = 'ucp_profile'
-				AND module_mode = 'profile_info'";
-		$this->sql_query($sql);
-	}
-
-	public function rename_styles_module()
-	{
-		// Rename styles module to Customise
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET module_langname = 'ACP_CAT_CUSTOMISE'
-			WHERE module_langname = 'ACP_CAT_STYLES'";
-		$this->sql_query($sql);
-	}
-
-	public function rename_module_basenames()
-	{
-		// rename all module basenames to full classname
-		$sql = 'SELECT module_id, module_basename, module_class
-			FROM ' . MODULES_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$module_id = (int) $row['module_id'];
-			unset($row['module_id']);
-
-			if (!empty($row['module_basename']) && !empty($row['module_class']))
-			{
-				// all the class names start with class name or with phpbb_ for auto loading
-				if (strpos($row['module_basename'], $row['module_class'] . '_') !== 0 &&
-					strpos($row['module_basename'], 'phpbb_') !== 0)
-				{
-					$row['module_basename'] = $row['module_class'] . '_' . $row['module_basename'];
-
-					$sql_update = $this->db->sql_build_array('UPDATE', $row);
-
-					$sql = 'UPDATE ' . MODULES_TABLE . '
-						SET ' . $sql_update . '
-						WHERE module_id = ' . $module_id;
-					$this->sql_query($sql);
-				}
-			}
-		}
-
-		$this->db->sql_freeresult($result);
-	}
-
-	public function add_group_teampage()
-	{
-		$sql = 'UPDATE ' . GROUPS_TABLE . '
-			SET group_teampage = 1
-			WHERE group_type = ' . GROUP_SPECIAL . "
-				AND group_name = 'ADMINISTRATORS'";
-		$this->sql_query($sql);
-
-		$sql = 'UPDATE ' . GROUPS_TABLE . '
-			SET group_teampage = 2
-			WHERE group_type = ' . GROUP_SPECIAL . "
-				AND group_name = 'GLOBAL_MODERATORS'";
-		$this->sql_query($sql);
-	}
-
-	public function update_group_legend()
-	{
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . '
-			WHERE group_legend = 1
-			ORDER BY group_name ASC';
-		$result = $this->db->sql_query($sql);
-
-		$next_legend = 1;
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET group_legend = ' . $next_legend . '
-				WHERE group_id = ' . (int) $row['group_id'];
-			$this->sql_query($sql);
-
-			$next_legend++;
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function localise_global_announcements()
-	{
-		// Localise Global Announcements
-		$sql = 'SELECT topic_id, topic_approved, (topic_replies + 1) AS topic_posts, topic_last_post_id, topic_last_post_subject, topic_last_post_time, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour
-			FROM ' . TOPICS_TABLE . '
-			WHERE forum_id = 0
-				AND topic_type = ' . POST_GLOBAL;
-		$result = $this->db->sql_query($sql);
-
-		$global_announcements = $update_lastpost_data = array();
-		$update_lastpost_data['forum_last_post_time'] = 0;
-		$update_forum_data = array(
-			'forum_posts'		=> 0,
-			'forum_topics'		=> 0,
-			'forum_topics_real'	=> 0,
-		);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$global_announcements[] = (int) $row['topic_id'];
-
-			$update_forum_data['forum_posts'] += (int) $row['topic_posts'];
-			$update_forum_data['forum_topics_real']++;
-			if ($row['topic_approved'])
-			{
-				$update_forum_data['forum_topics']++;
-			}
-
-			if ($update_lastpost_data['forum_last_post_time'] < $row['topic_last_post_time'])
-			{
-				$update_lastpost_data = array(
-					'forum_last_post_id'		=> (int) $row['topic_last_post_id'],
-					'forum_last_post_subject'	=> $row['topic_last_post_subject'],
-					'forum_last_post_time'		=> (int) $row['topic_last_post_time'],
-					'forum_last_poster_id'		=> (int) $row['topic_last_poster_id'],
-					'forum_last_poster_name'	=> $row['topic_last_poster_name'],
-					'forum_last_poster_colour'	=> $row['topic_last_poster_colour'],
-				);
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($global_announcements))
-		{
-			// Update the post/topic-count for the forum and the last-post if needed
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_type = ' . FORUM_POST;
-			$result = $this->db->sql_query_limit($sql, 1);
-			$ga_forum_id = $this->db->sql_fetchfield('forum_id');
-			$this->db->sql_freeresult($result);
-
-			$sql = 'SELECT forum_last_post_time
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_id = ' . $ga_forum_id;
-			$result = $this->db->sql_query($sql);
-			$lastpost = (int) $this->db->sql_fetchfield('forum_last_post_time');
-			$this->db->sql_freeresult($result);
-
-			$sql_update = 'forum_posts = forum_posts + ' . $update_forum_data['forum_posts'] . ', ';
-			$sql_update .= 'forum_topics_real = forum_topics_real + ' . $update_forum_data['forum_topics_real'] . ', ';
-			$sql_update .= 'forum_topics = forum_topics + ' . $update_forum_data['forum_topics'];
-			if ($lastpost < $update_lastpost_data['forum_last_post_time'])
-			{
-				$sql_update .= ', ' . $this->db->sql_build_array('UPDATE', $update_lastpost_data);
-			}
-
-			$sql = 'UPDATE ' . FORUMS_TABLE . '
-				SET ' . $sql_update . '
-				WHERE forum_id = ' . $ga_forum_id;
-			$this->sql_query($sql);
-
-			// Update some forum_ids
-			$table_ary = array(TOPICS_TABLE, POSTS_TABLE, LOG_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE);
-			foreach ($table_ary as $table)
-			{
-				$sql = "UPDATE $table
-					SET forum_id = $ga_forum_id
-					WHERE " . $this->db->sql_in_set('topic_id', $global_announcements);
-				$this->sql_query($sql);
-			}
-			unset($table_ary);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/extensions.php b/phpBB/includes/db/migration/data/extensions.php
deleted file mode 100644
index d28e0ebabb..0000000000
--- a/phpBB/includes/db/migration/data/extensions.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_extensions extends phpbb_db_migration
-{
-	public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_tables'		=> array(
-				EXT_TABLE				=> array(
-					'COLUMNS'			=> array(
-						'ext_name'		=> array('VCHAR', ''),
-						'ext_active'	=> array('BOOL', 0),
-						'ext_state'		=> array('TEXT', ''),
-					),
-					'KEYS'				=> array(
-						'ext_name'		=> array('UNIQUE', 'ext_name'),
-					),
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('module.add', array(
-				'acp',
-				'ACP_GENERAL_TASKS',
-				array(
-					'module_basename'	=> 'acp_extensions',
-					'modes'				=> array('main'),
-				),
-			)),
-			array('permission.add', array('a_extensions', true, 'a_styles')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/style_update_p1.php b/phpBB/includes/db/migration/data/style_update_p1.php
deleted file mode 100644
index 1c46e4147b..0000000000
--- a/phpBB/includes/db/migration/data/style_update_p1.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_style_update_p1 extends phpbb_db_migration
-{
-	public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array();
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'styles_update'))),
-		);
-	}
-
-	public function styles_update()
-	{
-		// Get list of valid 3.1 styles
-		$available_styles = array('prosilver');
-
-		$iterator = new DirectoryIterator($this->phpbb_root_path . 'styles');
-		$skip_dirs = array('.', '..', 'prosilver');
-		foreach ($iterator as $fileinfo)
-		{
-			if ($fileinfo->isDir() && !in_array($fileinfo->getFilename(), $skip_dirs) && file_exists($fileinfo->getPathname() . '/style.cfg'))
-			{
-				$style_cfg = parse_cfg_file($fileinfo->getPathname() . '/style.cfg');
-				if (isset($style_cfg['phpbb_version']) && version_compare($style_cfg['phpbb_version'], '3.1.0-dev', '>='))
-				{
-					// 3.1 style
-					$available_styles[] = $fileinfo->getFilename();
-				}
-			}
-		}
-
-		// Get all installed styles
-		if ($this->db_tools->sql_table_exists(STYLES_IMAGESET_TABLE))
-		{
-			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id, i.imageset_path
-				FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
-				WHERE t.template_id = s.template_id
-					AND c.theme_id = s.theme_id
-					AND i.imageset_id = s.imageset_id";
-		}
-		else
-		{
-			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id
-				FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . " c
-				WHERE t.template_id = s.template_id
-					AND c.theme_id = s.theme_id";
-		}
-		$result = $this->db->sql_query($sql);
-
-		$styles = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$styles[] = $row;
-		}
-		$this->db->sql_freeresult($result);
-
-		// Decide which styles to keep, all others will be deleted
-		$valid_styles = array();
-		foreach ($styles as $style_row)
-		{
-			if (
-				// Delete styles with parent style (not supported yet)
-				$style_row['template_inherits_id'] == 0 &&
-				// Check if components match
-				$style_row['template_path'] == $style_row['theme_path'] && (!isset($style_row['imageset_path']) || $style_row['template_path'] == $style_row['imageset_path']) &&
-				// Check if components are valid
-				in_array($style_row['template_path'], $available_styles)
-				)
-			{
-				// Valid style. Keep it
-				$sql_ary = array(
-					'style_path'	=> $style_row['template_path'],
-					'bbcode_bitfield'	=> $style_row['bbcode_bitfield'],
-					'style_parent_id'	=> 0,
-					'style_parent_tree'	=> '',
-				);
-				$this->sql_query('UPDATE ' . STYLES_TABLE . '
-					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE style_id = ' . $style_row['style_id']);
-				$valid_styles[] = (int) $style_row['style_id'];
-			}
-		}
-
-		// Remove old entries from styles table
-		if (!sizeof($valid_styles))
-		{
-			// No valid styles: remove everything and add prosilver
-			$this->sql_query('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
-
-			$sql_ary = array(
-				'style_name'		=> 'prosilver',
-				'style_copyright'	=> '&copy; phpBB Group',
-				'style_active'		=> 1,
-				'style_path'		=> 'prosilver',
-				'bbcode_bitfield'	=> 'kNg=',
-				'style_parent_id'	=> 0,
-				'style_parent_tree'	=> '',
-
-				// Will be removed in the next step
-				'imageset_id'		=> 0,
-				'template_id'		=> 0,
-				'theme_id'			=> 0,
-			);
-
-			$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
-			$this->sql_query($sql);
-
-			$sql = 'SELECT style_id
-				FROM ' . $table . "
-				WHERE style_name = 'prosilver'";
-			$result = $this->sql_query($sql);
-			$default_style = $this->db->sql_fetchfield($result);
-			$this->db->sql_freeresult($result);
-
-			set_config('default_style', $default_style);
-
-			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
-			$this->sql_query($sql);
-		}
-		else
-		{
-			// There are valid styles in styles table. Remove styles that are outdated
-			$this->sql_query('DELETE FROM ' . STYLES_TABLE . '
-				WHERE ' . $this->db->sql_in_set('style_id', $valid_styles, true));
-
-			// Change default style
-			if (!in_array($this->config['default_style'], $valid_styles))
-			{
-				$this->sql_query('UPDATE ' . CONFIG_TABLE . "
-					SET config_value = '" . $valid_styles[0] . "'
-					WHERE config_name = 'default_style'");
-			}
-
-			// Reset styles for users
-			$this->sql_query('UPDATE ' . USERS_TABLE . '
-				SET user_style = 0
-				WHERE ' . $this->db->sql_in_set('user_style', $valid_styles, true));
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/style_update_p2.php b/phpBB/includes/db/migration/data/style_update_p2.php
deleted file mode 100644
index db4b7f1753..0000000000
--- a/phpBB/includes/db/migration/data/style_update_p2.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_style_update_p2 extends phpbb_db_migration
-{
-	public function depends_on()
-	{
-		return array('phpbb_db_migration_data_style_update_p1');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_columns'	=> array(
-				STYLES_TABLE		=> array(
-					'imageset_id',
-					'template_id',
-					'theme_id',
-				),
-			),
-
-			'drop_tables'	=> array(
-				STYLES_IMAGESET_TABLE,
-				STYLES_IMAGESET_DATA_TABLE,
-				STYLES_TEMPLATE_TABLE,
-				STYLES_TEMPLATE_DATA_TABLE,
-				STYLES_THEME_TABLE,
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array();
-	}
-}
diff --git a/phpBB/includes/db/migration/data/timezone.php b/phpBB/includes/db/migration/data/timezone.php
deleted file mode 100644
index 7734ed4b76..0000000000
--- a/phpBB/includes/db/migration/data/timezone.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_timezone extends phpbb_db_migration
-{
-	public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'change_columns'	=> array(
-				USERS_TABLE			=> array(
-					'user_timezone'		=> array('VCHAR:100', ''),
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'update_timezones'))),
-		);
-	}
-
-	public function update_timezones()
-	{
-		// Update user timezones
-		$sql = 'SELECT user_dst, user_timezone
-			FROM ' . USERS_TABLE . '
-			GROUP BY user_timezone, user_dst';
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . "
-				SET user_timezone = '" . $this->db->sql_escape($this->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
-				WHERE user_timezone = '" . $this->db->sql_escape($row['user_timezone']) . "'
-					AND user_dst = " . (int) $row['user_dst'];
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-
-		// Update board default timezone
-		$sql = 'UPDATE ' . CONFIG_TABLE . "
-			SET config_value = '" . $this->convert_phpbb30_timezone($this->config['board_timezone'], $this->config['board_dst']) . "'
-			WHERE config_name = 'board_timezone'";
-		$this->sql_query($sql);
-
-		// After we have calculated the timezones we can delete user_dst column from user table.
-		$this->db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
-	}
-
-	/**
-	* Determine the new timezone for a given phpBB 3.0 timezone and
-	* "Daylight Saving Time" option
-	*
-	*	@param	$timezone	float	Users timezone in 3.0
-	*	@param	$dst		int		Users daylight saving time
-	*	@return		string		Users new php Timezone which is used since 3.1
-	*/
-	public function convert_phpbb30_timezone($timezone, $dst)
-	{
-		$offset = $timezone + $dst;
-
-		switch ($timezone)
-		{
-			case '-12':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 12] Baker Island Time'
-			case '-11':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 11] Niue Time, Samoa Standard Time'
-			case '-10':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
-			case '-9.5':
-				return 'Pacific/Marquesas';			//'[UTC - 9:30] Marquesas Islands Time'
-			case '-9':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
-			case '-8':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 8] Pacific Standard Time'
-			case '-7':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 7] Mountain Standard Time'
-			case '-6':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 6] Central Standard Time'
-			case '-5':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 5] Eastern Standard Time'
-			case '-4.5':
-				return 'America/Caracas';			//'[UTC - 4:30] Venezuelan Standard Time'
-			case '-4':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 4] Atlantic Standard Time'
-			case '-3.5':
-				return 'America/St_Johns';			//'[UTC - 3:30] Newfoundland Standard Time'
-			case '-3':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
-			case '-2':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
-			case '-1':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
-			case '0':
-				return (!$dst) ? 'UTC' : 'Etc/GMT-1';	//'[UTC] Western European Time, Greenwich Mean Time'
-			case '1':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 1] Central European Time, West African Time'
-			case '2':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 2] Eastern European Time, Central African Time'
-			case '3':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 3] Moscow Standard Time, Eastern African Time'
-			case '3.5':
-				return 'Asia/Tehran';				//'[UTC + 3:30] Iran Standard Time'
-			case '4':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
-			case '4.5':
-				return 'Asia/Kabul';				//'[UTC + 4:30] Afghanistan Time'
-			case '5':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
-			case '5.5':
-				return 'Asia/Kolkata';				//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
-			case '5.75':
-				return 'Asia/Kathmandu';			//'[UTC + 5:45] Nepal Time'
-			case '6':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
-			case '6.5':
-				return 'Indian/Cocos';				//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
-			case '7':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
-			case '8':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
-			case '8.75':
-				return 'Australia/Eucla';			//'[UTC + 8:45] Southeastern Western Australia Standard Time'
-			case '9':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
-			case '9.5':
-				return 'Australia/ACT';				//'[UTC + 9:30] Australian Central Standard Time'
-			case '10':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
-			case '10.5':
-				return 'Australia/Lord_Howe';		//'[UTC + 10:30] Lord Howe Standard Time'
-			case '11':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
-			case '11.5':
-				return 'Pacific/Norfolk';			//'[UTC + 11:30] Norfolk Island Time'
-			case '12':
-				return 'Etc/GMT-12';				//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
-			case '12.75':
-				return 'Pacific/Chatham';			//'[UTC + 12:45] Chatham Islands Time'
-			case '13':
-				return 'Pacific/Tongatapu';			//'[UTC + 13] Tonga Time, Phoenix Islands Time'
-			case '14':
-				return 'Pacific/Kiritimati';		//'[UTC + 14] Line Island Time'
-			default:
-				return 'UTC';
-		}
-	}
-}
-- 
cgit v1.2.1


From e9bcea5d82fd086ebcf7634ab386623f34ea8d03 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 8 Jan 2013 22:22:44 -0600
Subject: [feature/migrations] Restore update_helpers.php file

This should be removed by the data branch

PHPBB3-9737
---
 phpBB/includes/update_helpers.php | 112 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 phpBB/includes/update_helpers.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/update_helpers.php b/phpBB/includes/update_helpers.php
new file mode 100644
index 0000000000..69d678b2f8
--- /dev/null
+++ b/phpBB/includes/update_helpers.php
@@ -0,0 +1,112 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*/
+
+/**
+* phpBB Update Helpers
+*/
+class phpbb_update_helpers
+{
+	/**
+	* Determine the new timezone for a given phpBB 3.0 timezone and
+	* "Daylight Saving Time" option
+	*
+	*	@param	$timezone	float	Users timezone in 3.0
+	*	@param	$dst		int		Users daylight saving time
+	*	@return		string		Users new php Timezone which is used since 3.1
+	*/
+	function convert_phpbb30_timezone($timezone, $dst)
+	{
+		$offset = $timezone + $dst;
+
+		switch ($timezone)
+		{
+			case '-12':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 12] Baker Island Time'
+			case '-11':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 11] Niue Time, Samoa Standard Time'
+			case '-10':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
+			case '-9.5':
+				return 'Pacific/Marquesas';			//'[UTC - 9:30] Marquesas Islands Time'
+			case '-9':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
+			case '-8':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 8] Pacific Standard Time'
+			case '-7':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 7] Mountain Standard Time'
+			case '-6':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 6] Central Standard Time'
+			case '-5':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 5] Eastern Standard Time'
+			case '-4.5':
+				return 'America/Caracas';			//'[UTC - 4:30] Venezuelan Standard Time'
+			case '-4':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 4] Atlantic Standard Time'
+			case '-3.5':
+				return 'America/St_Johns';			//'[UTC - 3:30] Newfoundland Standard Time'
+			case '-3':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
+			case '-2':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
+			case '-1':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
+			case '0':
+				return (!$dst) ? 'UTC' : 'Etc/GMT-1';	//'[UTC] Western European Time, Greenwich Mean Time'
+			case '1':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 1] Central European Time, West African Time'
+			case '2':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 2] Eastern European Time, Central African Time'
+			case '3':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 3] Moscow Standard Time, Eastern African Time'
+			case '3.5':
+				return 'Asia/Tehran';				//'[UTC + 3:30] Iran Standard Time'
+			case '4':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
+			case '4.5':
+				return 'Asia/Kabul';				//'[UTC + 4:30] Afghanistan Time'
+			case '5':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
+			case '5.5':
+				return 'Asia/Kolkata';				//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
+			case '5.75':
+				return 'Asia/Kathmandu';			//'[UTC + 5:45] Nepal Time'
+			case '6':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
+			case '6.5':
+				return 'Indian/Cocos';				//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
+			case '7':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
+			case '8':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
+			case '8.75':
+				return 'Australia/Eucla';			//'[UTC + 8:45] Southeastern Western Australia Standard Time'
+			case '9':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
+			case '9.5':
+				return 'Australia/ACT';				//'[UTC + 9:30] Australian Central Standard Time'
+			case '10':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
+			case '10.5':
+				return 'Australia/Lord_Howe';		//'[UTC + 10:30] Lord Howe Standard Time'
+			case '11':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
+			case '11.5':
+				return 'Pacific/Norfolk';			//'[UTC + 11:30] Norfolk Island Time'
+			case '12':
+				return 'Etc/GMT-12';				//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
+			case '12.75':
+				return 'Pacific/Chatham';			//'[UTC + 12:45] Chatham Islands Time'
+			case '13':
+				return 'Pacific/Tongatapu';			//'[UTC + 13] Tonga Time, Phoenix Islands Time'
+			case '14':
+				return 'Pacific/Kiritimati';		//'[UTC + 14] Line Island Time'
+			default:
+				return 'UTC';
+		}
+	}
+}
-- 
cgit v1.2.1


From e3737978f76a962385a26de910959607d0ae0d30 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 9 Jan 2013 14:27:01 -0600
Subject: [feature/migrations] Fixing returns of callables and handling data
 state

Lots of comments and some other miscellaneous fixes.

PHPBB3-9737
---
 phpBB/includes/db/db_tools.php                  |   1 +
 phpBB/includes/db/driver/mysqli.php             |   1 -
 phpBB/includes/db/migration/exception.php       |  10 ++
 phpBB/includes/db/migration/migration.php       |  35 ++++-
 phpBB/includes/db/migration/tool/config.php     |  40 +++---
 phpBB/includes/db/migration/tool/interface.php  |   5 +
 phpBB/includes/db/migration/tool/module.php     | 177 ++++++++++++------------
 phpBB/includes/db/migration/tool/permission.php | 106 +++++++-------
 phpBB/includes/db/migrator.php                  | 158 ++++++++++++++++-----
 9 files changed, 329 insertions(+), 204 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 5329d871c8..1d6823d37a 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -349,6 +349,7 @@ class phpbb_db_tools
 	* Setter for {@link $return_statements return_statements}.
 	*
 	* @param bool $return_statements True if SQL should not be executed but returned as strings
+	* @return null
 	*/
 	public function set_return_statements($return_statements)
 	{
diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/includes/db/driver/mysqli.php
index 94921a22b7..7448bf1670 100644
--- a/phpBB/includes/db/driver/mysqli.php
+++ b/phpBB/includes/db/driver/mysqli.php
@@ -24,7 +24,6 @@ if (!defined('IN_PHPBB'))
 class phpbb_db_driver_mysqli extends phpbb_db_driver
 {
 	var $multi_insert = true;
-
 	var $connect_error = '';
 
 	/**
diff --git a/phpBB/includes/db/migration/exception.php b/phpBB/includes/db/migration/exception.php
index 19fb39ab23..bd46a4e064 100644
--- a/phpBB/includes/db/migration/exception.php
+++ b/phpBB/includes/db/migration/exception.php
@@ -22,8 +22,15 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_db_migration_exception extends \Exception
 {
+	/** @var array Extra parameters sent to exception to aid in debugging */
 	protected $parameters;
 
+	/**
+	* Throw an exception.
+	*
+	* First argument is the error message.
+	* Additional arguments will be output with the error message.
+	*/
 	public function __construct()
 	{
 		$parameters = func_get_args();
@@ -33,6 +40,9 @@ class phpbb_db_migration_exception extends \Exception
 		$this->parameters = $parameters;
 	}
 
+	/**
+	* Output the error as a string
+	*/
 	public function __toString()
 	{
 		return $this->message . ': ' . var_export($this->parameters, true);
diff --git a/phpBB/includes/db/migration/migration.php b/phpBB/includes/db/migration/migration.php
index c2c6da855b..5f1f0443db 100644
--- a/phpBB/includes/db/migration/migration.php
+++ b/phpBB/includes/db/migration/migration.php
@@ -26,22 +26,41 @@ if (!defined('IN_PHPBB'))
 */
 abstract class phpbb_db_migration
 {
+	/** @var phpbb_config */
 	protected $config;
+
+	/** @var phpbb_db_driver */
 	protected $db;
+
+	/** @var phpbb_db_tools */
 	protected $db_tools;
+
+	/** @var string */
 	protected $table_prefix;
 
+	/** @var string */
 	protected $phpbb_root_path;
+
+	/** @var string */
 	protected $php_ext;
 
+	/** @var array Errors, if any occured */
 	protected $errors;
 
-	private $queries = array();
+	/** @var array List of queries executed through $this->sql_query() */
+	protected $queries = array();
 
 	/**
-	* Migration constructor
+	* Constructor
+	*
+	* @param phpbb_config $config
+	* @param phpbb_db_driver $db
+	* @param phpbb_db_tools $db_tools
+	* @param string $phpbb_root_path
+	* @param string $php_ext
+	* @param string $table_prefix
 	*/
-	public function __construct($config, phpbb_db_driver $db, $db_tools, $phpbb_root_path, $php_ext, $table_prefix)
+	public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, $phpbb_root_path, $php_ext, $table_prefix)
 	{
 		$this->config = $config;
 		$this->db = $db;
@@ -55,7 +74,7 @@ abstract class phpbb_db_migration
 	}
 
 	/**
-	* Defines other migrationsto be applied first (abstract method)
+	* Defines other migrations to be applied first (abstract method)
 	*
 	* @return array An array of migration class names
 	*/
@@ -67,7 +86,7 @@ abstract class phpbb_db_migration
 	/**
 	* Updates the database schema by providing a set of change instructions
 	*
-	* @return array
+	* @return array Array of schema changes (compatible with db_tools->perform_schema_changes())
 	*/
 	public function update_schema()
 	{
@@ -77,14 +96,18 @@ abstract class phpbb_db_migration
 	/**
 	* Updates data by returning a list of instructions to be executed
 	*
-	* @return array
+	* @return array Array of data update instructions
 	*/
 	public function update_data()
 	{
+		return array();
 	}
 
 	/**
 	* Wrapper for running queries to generate user feedback on updates
+	*
+	* @param string $sql SQL query to run on the database
+	* @return mixed Query result from db->sql_query()
 	*/
 	protected function sql_query($sql)
 	{
diff --git a/phpBB/includes/db/migration/tool/config.php b/phpBB/includes/db/migration/tool/config.php
index 35fa3ce566..e7239436d2 100644
--- a/phpBB/includes/db/migration/tool/config.php
+++ b/phpBB/includes/db/migration/tool/config.php
@@ -7,11 +7,21 @@
 *
 */
 
+/**
+* Migration config tool
+*
+* @package db
+*/
 class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interface
 {
 	/** @var phpbb_config */
-	protected $config = null;
+	protected $config;
 
+	/**
+	* Constructor
+	*
+	* @param phpbb_config $config
+	*/
 	public function __construct(phpbb_config $config)
 	{
 		$this->config = $config;
@@ -26,13 +36,12 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 	}
 
 	/**
-	* Config Add
-	*
-	* This function allows you to add a config setting.
+	* Add a config setting.
 	*
 	* @param string $config_name The name of the config setting you would like to add
 	* @param mixed $config_value The value of the config setting
 	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
+	* @return null
 	*/
 	public function add($config_name, $config_value = '', $is_dynamic = false)
 	{
@@ -42,17 +51,14 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 		}
 
 		$this->config->set($config_name, $config_value, !$is_dynamic);
-
-		return false;
 	}
 
 	/**
-	* Config Update
-	*
-	* This function allows you to update an existing config setting.
+	* Update an existing config setting.
 	*
 	* @param string $config_name The name of the config setting you would like to update
 	* @param mixed $config_value The value of the config setting
+	* @return null
 	*/
 	public function update($config_name, $config_value = '')
 	{
@@ -62,18 +68,15 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 		}
 
 		$this->config->set($config_name, $config_value);
-
-		return false;
 	}
 
 	/**
-	* Config Update If Equals
-	*
-	* This function allows you to update a config setting if the first argument equal to the current config value
+	* Update a config setting if the first argument equal to the current config value
 	*
 	* @param bool $compare If equal to the current config value, will be updated to the new config value, otherwise not
 	* @param string $config_name The name of the config setting you would like to update
 	* @param mixed $config_value The value of the config setting
+	* @return null
 	*/
 	public function update_if_equals($compare, $config_name, $config_value = '')
 	{
@@ -83,16 +86,13 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 		}
 
 		$this->config->set_atomic($config_name, $compare, $config_value);
-
-		return false;
 	}
 
 	/**
-	* Config Remove
-	*
-	* This function allows you to remove an existing config setting.
+	* Remove an existing config setting.
 	*
 	* @param string $config_name The name of the config setting you would like to remove
+	* @return null
 	*/
 	public function remove($config_name)
 	{
@@ -102,7 +102,5 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 		}
 
 		$this->config->delete($config_name);
-
-		return false;
 	}
 }
diff --git a/phpBB/includes/db/migration/tool/interface.php b/phpBB/includes/db/migration/tool/interface.php
index 1815f5e8a2..5d10246ba1 100644
--- a/phpBB/includes/db/migration/tool/interface.php
+++ b/phpBB/includes/db/migration/tool/interface.php
@@ -7,6 +7,11 @@
 *
 */
 
+/**
+* Migration tool interface
+*
+* @package db
+*/
 interface phpbb_db_migration_tool_interface
 {
 	/**
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index a503f08c01..f1b527bf21 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -7,27 +7,42 @@
 *
 */
 
+/**
+* Migration module management tool
+*
+* @package db
+*/
 class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interface
 {
 	/** @var phpbb_cache_service */
-	protected $cache = null;
+	protected $cache;
 
 	/** @var dbal */
-	protected $db = null;
+	protected $db;
 
 	/** @var phpbb_user */
-	protected $user = null;
+	protected $user;
 
 	/** @var string */
-	protected $phpbb_root_path = null;
+	protected $phpbb_root_path;
 
 	/** @var string */
-	protected $php_ext = null;
+	protected $php_ext;
 
 	/** @var string */
-	protected $modules_table = null;
+	protected $modules_table;
 
-	public function __construct(phpbb_db_driver $db, $cache, $user, $phpbb_root_path, $php_ext, $modules_table)
+	/**
+	* Constructor
+	*
+	* @param phpbb_db_driver $db
+	* @param mixed $cache
+	* @param phpbb_user $user
+	* @param string $phpbb_root_path
+	* @param string $php_ext
+	* @param string $modules_table
+	*/
+	public function __construct(phpbb_db_driver $db, phpbb_cache_service $cache, phpbb_user $user, $phpbb_root_path, $php_ext, $modules_table)
 	{
 		$this->db = $db;
 		$this->cache = $cache;
@@ -53,7 +68,6 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 	* @param string $class The module class(acp|mcp|ucp)
 	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
 	* @param int|string $module The module_id|module_langname you would like to check for to see if it exists
-	*
 	* @return bool true/false if module exists
 	*/
 	public function exists($class, $parent, $module)
@@ -64,31 +78,28 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			return true;
 		}
 
-		$class = $this->db->sql_escape($class);
-		$module = $this->db->sql_escape($module);
-
 		$parent_sql = '';
 		if ($parent !== false)
 		{
 			// Allows '' to be sent as 0
-			$parent = (!$parent) ? 0 : $parent;
+			$parent = $parent ?: 0;
 
 			if (!is_numeric($parent))
 			{
 				$sql = 'SELECT module_id
 					FROM ' . $this->modules_table . "
 					WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-						AND module_class = '$class'";
+						AND module_class = '" . $this->db->sql_escape($class) . "'";
 				$result = $this->db->sql_query($sql);
-				$row = $this->db->sql_fetchrow($result);
+				$module_id = $this->db->sql_fetchfield('module_id');
 				$this->db->sql_freeresult($result);
 
-				if (!$row)
+				if (!$module_id)
 				{
 					return false;
 				}
 
-				$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
+				$parent_sql = 'AND parent_id = ' . (int) $module_id;
 			}
 			else
 			{
@@ -98,14 +109,14 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 
 		$sql = 'SELECT module_id
 			FROM ' . $this->modules_table . "
-			WHERE module_class = '$class'
+			WHERE module_class = '" . $this->db->sql_escape($class) . "'
 				$parent_sql
-				AND " . ((is_numeric($module)) ? 'module_id = ' . (int) $module : "module_langname = '$module'");
+				AND " . ((is_numeric($module)) ? 'module_id = ' . (int) $module : "module_langname = '" . $this->db->sql_escape($module) . "'");
 		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
+		$module_id = $this->db->sql_fetchfield('module_id');
 		$this->db->sql_freeresult($result);
 
-		if ($row)
+		if ($module_id)
 		{
 			return true;
 		}
@@ -123,29 +134,30 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 	* @param array $data an array of the data on the new module.  This can be setup in two different ways.
 	*	1. The "manual" way.  For inserting a category or one at a time.  It will be merged with the base array shown a bit below,
 	*		but at the least requires 'module_langname' to be sent, and, if you want to create a module (instead of just a category) you must send module_basename and module_mode.
-	* array(
-	*		'module_enabled'	=> 1,
-	*		'module_display'	=> 1,
-	*		'module_basename'	=> '',
-	*		'module_class'		=> $class,
-	*		'parent_id'			=> (int) $parent,
-	*		'module_langname'	=> '',
-	*		'module_mode'		=> '',
-	*		'module_auth'		=> '',
-	*	)
+	* 		array(
+	*			'module_enabled'	=> 1,
+	*			'module_display'	=> 1,
+	*	   		'module_basename'	=> '',
+	*			'module_class'		=> $class,
+	*	   		'parent_id'			=> (int) $parent,
+	*			'module_langname'	=> '',
+	*	   		'module_mode'		=> '',
+	*	   		'module_auth'		=> '',
+	*		)
 	*	2. The "automatic" way.  For inserting multiple at a time based on the specs in the info file for the module(s).  For this to work the modules must be correctly setup in the info file.
 	*		An example follows (this would insert the settings, log, and flag modes from the includes/acp/info/acp_asacp.php file):
-	* array(
-	* 		'module_basename'	=> 'asacp',
-	* 		'modes'				=> array('settings', 'log', 'flag'),
-	* )
+	* 		array(
+	* 			'module_basename'	=> 'asacp',
+	* 			'modes'				=> array('settings', 'log', 'flag'),
+	* 		)
 	* 		Optionally you may not send 'modes' and it will insert all of the modules in that info file.
-	*  @param string|bool $include_path If you would like to use a custom include path, specify that here
+	* @param string|bool $include_path If you would like to use a custom include path, specify that here
+	* @return null
 	*/
 	public function add($class, $parent = 0, $data = array(), $include_path = false)
 	{
-        // Allows '' to be sent as 0
-		$parent = (!$parent) ? 0 : $parent;
+		// Allows '' to be sent as 0
+		$parent = $parent ?: 0;
 
 		// allow sending the name as a string in $data to create a category
 		if (!is_array($data))
@@ -155,18 +167,16 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 
 		if (!isset($data['module_langname']))
 		{
-			/**
-			* @TODO does not work with 3.1 modules yet, but must continue for old 3.0 versions for
-			* upgrades from a 3.0.x version to 3.1
-			*/
 			// The "automatic" way
 			$basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
 			$basename = str_replace(array('/', '\\'), '', $basename);
 			$class = str_replace(array('/', '\\'), '', $class);
+
+			$include_path = ($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path;
 			$info_file = "$class/info/$basename.{$this->php_ext}";
 
 			// The manual and automatic ways both failed...
-			if (!file_exists((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file))
+			if (!file_exists($include_path . $info_file))
 			{
 				throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $info_file);
 			}
@@ -175,7 +185,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 
 			if (!class_exists($classname))
 			{
-				include((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file);
+				include($include_path . $info_file);
 			}
 
 			$info = new $classname;
@@ -206,26 +216,25 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 		}
 
 		// The "manual" way
-		add_log('admin', 'LOG_MODULE_ADD', ((isset($this->user->lang[$data['module_langname']])) ? $this->user->lang[$data['module_langname']] : $data['module_langname']));
-
-		$class = $this->db->sql_escape($class);
+		$module_log_name = ((isset($this->user->lang[$data['module_langname']])) ? $this->user->lang[$data['module_langname']] : $data['module_langname']);
+		add_log('admin', 'LOG_MODULE_ADD', $module_log_name);
 
 		if (!is_numeric($parent))
 		{
 			$sql = 'SELECT module_id
 				FROM ' . $this->modules_table . "
 				WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-					AND module_class = '$class'";
+					AND module_class = '" . $this->db->sql_escape($class) . "'";
 			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
+			$module_id = $this->db->sql_fetchfield('module_id');
 			$this->db->sql_freeresult($result);
 
-			if (!$row)
+			if (!$module_id)
 			{
 				throw new phpbb_db_migration_exception('MODULE_PARENT_NOT_EXIST', $parent);
 			}
 
-			$parent = $data['parent_id'] = $row['module_id'];
+			$parent = $data['parent_id'] = $module_id;
 		}
 		else if (!$this->exists($class, false, $parent))
 		{
@@ -270,46 +279,46 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			if (isset($data['before']) && $data['before'])
 			{
 				$sql = 'SELECT left_id
-					FROM ' . $this->modules_table . '
-					WHERE module_class = \'' . $class . '\'
-						AND parent_id = ' . (int) $parent . '
-						AND module_langname = \'' . $this->db->sql_escape($data['before']) . '\'';
+					FROM ' . $this->modules_table . "
+					WHERE module_class = '" . $this->db->sql_escape($class) . "'
+						AND parent_id = " . (int) $parent . "
+						AND module_langname = '" . $this->db->sql_escape($data['before']) . "'";
 				$this->db->sql_query($sql);
-				$to_left = $this->db->sql_fetchfield('left_id');
+				$to_left = (int) $this->db->sql_fetchfield('left_id');
 
 				$sql = 'UPDATE ' . $this->modules_table . "
 					SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE module_class = '$class'
+					WHERE module_class = '" . $this->db->sql_escape($class) . "'
 						AND left_id >= $to_left
 						AND left_id < {$module_data['left_id']}";
 				$this->db->sql_query($sql);
 
 				$sql = 'UPDATE ' . $this->modules_table . "
 					SET left_id = $to_left, right_id = " . ($to_left + 1) . "
-					WHERE module_class = '$class'
+					WHERE module_class = '" . $this->db->sql_escape($class) . "'
 						AND module_id = {$module_data['module_id']}";
 				$this->db->sql_query($sql);
 			}
 			else if (isset($data['after']) && $data['after'])
 			{
 				$sql = 'SELECT right_id
-					FROM ' . $this->modules_table . '
-					WHERE module_class = \'' . $class . '\'
-						AND parent_id = ' . (int) $parent . '
-						AND module_langname = \'' . $this->db->sql_escape($data['after']) . '\'';
+					FROM ' . $this->modules_table . "
+					WHERE module_class = '" . $this->db->sql_escape($class) . "'
+						AND parent_id = " . (int) $parent . "
+						AND module_langname = '" . $this->db->sql_escape($data['after']) . "'";
 				$this->db->sql_query($sql);
-				$to_right = $this->db->sql_fetchfield('right_id');
+				$to_right = (int) $this->db->sql_fetchfield('right_id');
 
 				$sql = 'UPDATE ' . $this->modules_table . "
 					SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE module_class = '$class'
+					WHERE module_class = '" . $this->db->sql_escape($class) . "'
 						AND left_id >= $to_right
 						AND left_id < {$module_data['left_id']}";
 				$this->db->sql_query($sql);
 
 				$sql = 'UPDATE ' . $this->modules_table . '
 					SET left_id = ' . ($to_right + 1) . ', right_id = ' . ($to_right + 2) . "
-					WHERE module_class = '$class'
+					WHERE module_class = '" . $this->db->sql_escape($class) . "'
 						AND module_id = {$module_data['module_id']}";
 				$this->db->sql_query($sql);
 			}
@@ -317,8 +326,6 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 
 		// Clear the Modules Cache
 		$this->cache->destroy("_modules_$class");
-
-		return false;
 	}
 
 	/**
@@ -330,6 +337,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
 	* @param int|string $module The module id|module_langname
 	* @param string|bool $include_path If you would like to use a custom include path, specify that here
+	* @return null
 	*/
 	public function remove($class, $parent = 0, $module = '', $include_path = false)
 	{
@@ -351,9 +359,11 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			// Automatic method
 			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
 			$class = str_replace(array('/', '\\'), '', $class);
+
+			$include_path = ($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path;
 			$info_file = "$class/info/$basename.{$this->php_ext}";
 
-			if (!file_exists((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file))
+			if (!file_exists($include_path . $info_file))
 			{
 				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $info_file);
 			}
@@ -362,7 +372,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 
 			if (!class_exists($classname))
 			{
-				include((($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path) . $info_file);
+				include($include_path . $info_file);
 			}
 
 			$info = new $classname;
@@ -376,12 +386,9 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 					$this->remove($class, $parent, $info['title']) . '<br />';
 				}
 			}
-			return false;
 		}
 		else
 		{
-			$class = $this->db->sql_escape($class);
-
 			if (!$this->exists($class, $parent, $module))
 			{
 				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', ((isset($this->user->lang[$module])) ? $this->user->lang[$module] : $module));
@@ -391,20 +398,20 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			if ($parent !== false)
 			{
 				// Allows '' to be sent as 0
-				$parent = (!$parent) ? 0 : $parent;
+				$parent = ($parent) ?: 0;
 
 				if (!is_numeric($parent))
 				{
 					$sql = 'SELECT module_id
 						FROM ' . $this->modules_table . "
 						WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-							AND module_class = '$class'";
+							AND module_class = '" . $this->db->sql_escape($class) . "'";
 					$result = $this->db->sql_query($sql);
-					$row = $this->db->sql_fetchrow($result);
+					$module_id = $this->db->sql_fetchfield('module_id');
 					$this->db->sql_freeresult($result);
 
 					// we know it exists from the module_exists check
-					$parent_sql = 'AND parent_id = ' . (int) $row['module_id'];
+					$parent_sql = 'AND parent_id = ' . (int) $module_id;
 				}
 				else
 				{
@@ -415,16 +422,15 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			$module_ids = array();
 			if (!is_numeric($module))
 			{
-				$module = $this->db->sql_escape($module);
 				$sql = 'SELECT module_id
 					FROM ' . $this->modules_table . "
-					WHERE module_langname = '$module'
-						AND module_class = '$class'
-					$parent_sql";
+					WHERE module_langname = '" . $this->db->sql_escape($module) . "'
+						AND module_class = '" . $this->db->sql_escape($class) . "'
+						$parent_sql";
 				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
+				while ($module_id = $this->db->sql_fetchfield('module_id'))
 				{
-					$module_ids[] = (int) $row['module_id'];
+					$module_ids[] = (int) $module_id;
 				}
 				$this->db->sql_freeresult($result);
 
@@ -436,13 +442,12 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 				$sql = 'SELECT module_langname
 					FROM ' . $this->modules_table . "
 					WHERE module_id = $module
-						AND module_class = '$class'
-					$parent_sql";
+						AND module_class = '" . $this->db->sql_escape($class) . "'
+						$parent_sql";
 				$result = $this->db->sql_query($sql);
-				$row = $this->db->sql_fetchrow($result);
+				$module_name = $this->db->sql_fetchfield('module_id');
 				$this->db->sql_freeresult($result);
 
-				$module_name = $row['module_langname'];
 				$module_ids[] = $module;
 			}
 
@@ -464,8 +469,6 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			}
 
 			$this->cache->destroy("_modules_$class");
-
-			return false;
 		}
 	}
 }
diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php
index ebe404bc62..97fdbc0df9 100644
--- a/phpBB/includes/db/migration/tool/permission.php
+++ b/phpBB/includes/db/migration/tool/permission.php
@@ -7,24 +7,38 @@
 *
 */
 
+/**
+* Migration permission management tool
+*
+* @package db
+*/
 class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_interface
 {
 	/** @var phpbb_auth */
-	protected $auth = null;
+	protected $auth;
 
 	/** @var phpbb_cache_service */
-	protected $cache = null;
+	protected $cache;
 
 	/** @var dbal */
-	protected $db = null;
+	protected $db;
 
 	/** @var string */
-	protected $phpbb_root_path = null;
+	protected $phpbb_root_path;
 
 	/** @var string */
-	protected $php_ext = null;
+	protected $php_ext;
 
-	public function __construct(phpbb_db_driver $db, $cache, phpbb_auth $auth, $phpbb_root_path, $php_ext)
+	/**
+	* Constructor
+	*
+	* @param phpbb_db_driver $db
+	* @param mixed $cache
+	* @param phpbb_auth $auth
+	* @param string $phpbb_root_path
+	* @param string $php_ext
+	*/
+	public function __construct(phpbb_db_driver $db, phpbb_cache_service $cache, phpbb_auth $auth, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;
 		$this->cache = $cache;
@@ -48,7 +62,6 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	*
 	* @param string $auth_option The name of the permission (auth) option
 	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
 	* @return bool true if it exists, false if not
 	*/
 	public function exists($auth_option, $global = true)
@@ -86,8 +99,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	*
 	* @param string $auth_option The name of the permission (auth) option
 	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
-	* @return result
+	* @return null
 	*/
 	public function add($auth_option, $global = true, $copy_from = false)
 	{
@@ -152,7 +164,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 				}
 				$this->db->sql_freeresult($result);
 
-				if (sizeof($sql_ary))
+				if (!empty($sql_ary))
 				{
 					$this->db->sql_multi_insert($table, $sql_ary);
 				}
@@ -160,8 +172,6 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 
 			$auth_admin->acl_clear_prefetch();
 		}
-
-		return false;
 	}
 
 	/**
@@ -171,8 +181,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	*
 	* @param string $auth_option The name of the permission (auth) option
 	* @param bool $global True for checking a global permission setting, False for a local permission setting
-	*
-	* @return result
+	* @return null
 	*/
 	public function remove($auth_option, $global = true)
 	{
@@ -197,7 +206,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
 
-		$id = $row['auth_option_id'];
+		$id = (int) $row['auth_option_id'];
 
 		// If it is a local and global permission, do not remove the row! :P
 		if ($row['is_global'] && $row['is_local'])
@@ -210,17 +219,17 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 		else
 		{
 			// Delete time
-			$this->db->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $id);
-			$this->db->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $id);
+			$tables = array(ACL_GROUPS_TABLE, ACL_ROLES_DATA_TABLE, ACL_USERS_TABLE, ACL_OPTIONS_TABLE);
+			foreach ($tables as $table)
+			{
+				$this->db->sql_query('DELETE FROM ' . $table . '
+					WHERE auth_option_id = ' . $id);
+			}
 		}
 
 		// Purge the auth cache
 		$this->cache->destroy('_acl_options');
 		$this->auth->acl_clear_prefetch();
-
-		return false;
 	}
 
 	/**
@@ -228,6 +237,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	*
 	* @param string $role_name The new role name
 	* @param sting $role_type The type (u_, m_, a_)
+	* @return null
 	*/
 	public function role_add($role_name, $role_type = '', $role_description = '')
 	{
@@ -235,18 +245,18 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 			FROM ' . ACL_ROLES_TABLE . "
 			WHERE role_name = '" . $this->db->sql_escape($role_name) . "'";
 		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
+		$role_id = (int) $this->db->sql_fetchfield('role_id');
 
 		if ($role_id)
 		{
 			throw new phpbb_db_migration_exception('ROLE_ALREADY_EXISTS', $old_role_name);
 		}
 
-		$sql = 'SELECT MAX(role_order) AS max
+		$sql = 'SELECT MAX(role_order) AS max_role_order
 			FROM ' . ACL_ROLES_TABLE . "
 			WHERE role_type = '" . $this->db->sql_escape($role_type) . "'";
 		$this->db->sql_query($sql);
-		$role_order = $this->db->sql_fetchfield('max');
+		$role_order = (int) $this->db->sql_fetchfield('max_role_order');
 		$role_order = (!$role_order) ? 1 : $role_order + 1;
 
 		$sql_ary = array(
@@ -258,8 +268,6 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 
 		$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
 		$this->db->sql_query($sql);
-
-		return false;
 	}
 
 	/**
@@ -267,6 +275,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	*
 	* @param string $old_role_name The old role name
 	* @param string $new_role_name The new role name
+	* @return null
 	*/
 	public function role_update($old_role_name, $new_role_name = '')
 	{
@@ -274,7 +283,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 			FROM ' . ACL_ROLES_TABLE . "
 			WHERE role_name = '" . $this->db->sql_escape($old_role_name) . "'";
 		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
+		$role_id = (int) $this->db->sql_fetchfield('role_id');
 
 		if (!$role_id)
 		{
@@ -285,14 +294,13 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 			SET role_name = '" . $this->db->sql_escape($new_role_name) . "'
 			WHERE role_name = '" . $this->db->sql_escape($old_role_name) . "'";
 		$this->db->sql_query($sql);
-
-		return false;
 	}
 
 	/**
 	* Remove a permission role
 	*
 	* @param string $role_name The role name to remove
+	* @return null
 	*/
 	public function role_remove($role_name)
 	{
@@ -300,7 +308,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 			FROM ' . ACL_ROLES_TABLE . "
 			WHERE role_name = '" . $this->db->sql_escape($role_name) . "'";
 		$this->db->sql_query($sql);
-		$role_id = $this->db->sql_fetchfield('role_id');
+		$role_id = (int) $this->db->sql_fetchfield('role_id');
 
 		if (!$role_id)
 		{
@@ -316,8 +324,6 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 		$this->db->sql_query($sql);
 
 		$this->auth->acl_clear_prefetch();
-
-		return false;
 	}
 
 	/**
@@ -329,6 +335,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
 	* @param string $type The type (role|group)
 	* @param bool $has_permission True if you want to give them permission, false if you want to deny them permission
+	* @return null
 	*/
 	public function permission_set($name, $auth_option = array(), $type = 'role', $has_permission = true)
 	{
@@ -344,13 +351,13 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$new_auth[] = $row['auth_option_id'];
+			$new_auth[] = (int) $row['auth_option_id'];
 		}
 		$this->db->sql_freeresult($result);
 
-		if (!sizeof($new_auth))
+		if (empty($new_auth))
 		{
-			return false;
+			return;
 		}
 
 		$current_auth = array();
@@ -364,7 +371,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 					FROM ' . ACL_ROLES_TABLE . "
 					WHERE role_name = '" . $this->db->sql_escape($name) . "'";
 				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('role_id');
+				$role_id = (int) $this->db->sql_fetchfield('role_id');
 
 				if (!$role_id)
 				{
@@ -387,7 +394,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 					FROM ' . GROUPS_TABLE . "
 					WHERE group_name = '" . $this->db->sql_escape($name) . "'";
 				$this->db->sql_query($sql);
-				$group_id = $this->db->sql_fetchfield('group_id');
+				$group_id = (int) $this->db->sql_fetchfield('group_id');
 
 				if (!$group_id)
 				{
@@ -401,7 +408,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 						AND auth_role_id <> 0
 						AND forum_id = 0';
 				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('auth_role_id');
+				$role_id = (int) $this->db->sql_fetchfield('auth_role_id');
 				if ($role_id)
 				{
 					$sql = 'SELECT role_name
@@ -437,7 +444,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 							'role_id'			=> $role_id,
 							'auth_option_id'	=> $auth_option_id,
 							'auth_setting'		=> $has_permission,
-				        );
+						);
 					}
 				}
 
@@ -453,7 +460,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 							'group_id'			=> $group_id,
 							'auth_option_id'	=> $auth_option_id,
 							'auth_setting'		=> $has_permission,
-				        );
+						);
 					}
 				}
 
@@ -462,8 +469,6 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 		}
 
 		$this->auth->acl_clear_prefetch();
-
-		return false;
 	}
 
 	/**
@@ -474,6 +479,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	* @param string $name The name of the role/group
 	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
 	* @param string $type The type (role|group)
+	* @return null
 	*/
 	public function permission_unset($name, $auth_option = array(), $type = 'role')
 	{
@@ -489,13 +495,13 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$to_remove[] = $row['auth_option_id'];
+			$to_remove[] = (int) $row['auth_option_id'];
 		}
 		$this->db->sql_freeresult($result);
 
-		if (!sizeof($to_remove))
+		if (empty($to_remove))
 		{
-			return false;
+			return;
 		}
 
 		$type = (string) $type; // Prevent PHP bug.
@@ -507,11 +513,11 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 					FROM ' . ACL_ROLES_TABLE . "
 					WHERE role_name = '" . $this->db->sql_escape($name) . "'";
 				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('role_id');
+				$role_id = (int) $this->db->sql_fetchfield('role_id');
 
 				if (!$role_id)
 				{
-				throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name);
+					throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name);
 				}
 
 				$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
@@ -524,7 +530,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 					FROM ' . GROUPS_TABLE . "
 					WHERE group_name = '" . $this->db->sql_escape($name) . "'";
 				$this->db->sql_query($sql);
-				$group_id = $this->db->sql_fetchfield('group_id');
+				$group_id = (int) $this->db->sql_fetchfield('group_id');
 
 				if (!$group_id)
 				{
@@ -537,7 +543,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 					WHERE group_id = ' . $group_id . '
 						AND auth_role_id <> 0';
 				$this->db->sql_query($sql);
-				$role_id = $this->db->sql_fetchfield('auth_role_id');
+				$role_id = (int) $this->db->sql_fetchfield('auth_role_id');
 				if ($role_id)
 				{
 					$sql = 'SELECT role_name
@@ -556,7 +562,5 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 		}
 
 		$this->auth->acl_clear_prefetch();
-
-		return false;
 	}
 }
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 2fd795b659..2ba1eba427 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -22,26 +22,40 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_db_migrator
 {
+	/** @var phpbb_config */
 	protected $config;
+
+	/** @var phpbb_db_driver */
 	protected $db;
+
+	/** @var phpbb_db_tools */
 	protected $db_tools;
+
+	/** @var string */
 	protected $table_prefix;
 
+	/** @var string */
 	protected $phpbb_root_path;
+
+	/** @var string */
 	protected $php_ext;
 
+	/** @var string */
 	protected $migrations_table;
+
+	/** @var array State of all migrations (SELECT * FROM migrations table) */
 	protected $migration_state;
 
+	/** @var array Array of all migrations available to be run */
 	protected $migrations = array();
 
-	/** @var string Name of the last migration run */
+	/** @var array 'name' and 'class' of the last migration run */
 	public $last_run_migration = false;
 
 	/**
 	* Constructor of the database migrator
 	*/
-	public function __construct($config, phpbb_db_driver $db, $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools)
+	public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools)
 	{
 		$this->config = $config;
 		$this->db = $db;
@@ -96,17 +110,42 @@ class phpbb_db_migrator
 	/**
 	* Load migration data files from a directory
 	*
-	* @param string $path
+	* This does not loop through sub-directories.
+	* Migration data files loaded with this function MUST contain
+	* 	ONLY ONE class in them (or an exception will be thrown).
+	*
+	* @param string $path Path to migration data files
+	* @param bool $check_fulfillable If TRUE (default), we will check
+	* 	if all of the migrations are fulfillable after loading them.
+	* 	If FALSE, we will not check. You SHOULD check at least once
+	* 	to prevent errors (if including multiple directories, check
+	* 	with the last call to prevent throwing errors unnecessarily).
 	* @return array Array of migrations with names
 	*/
-	public function load_migrations($path)
+	public function load_migrations($path, $check_fulfillable = true)
 	{
 		$handle = opendir($path);
 		while (($file = readdir($handle)) !== false)
 		{
 			if (strpos($file, '_') !== 0 && strrpos($file, '.' . $this->php_ext) === (strlen($file) - strlen($this->php_ext) - 1))
 			{
-				$name = 'phpbb_db_migration_data_' . substr($file, 0, -(strlen($this->php_ext) + 1));
+				// We try to find what class existed by comparing the classes declared before and after including the file.
+				$declared_classes = get_declared_classes();
+
+				include ($path . $file);
+
+				$added_classes = array_diff(get_declared_classes(), $declared_classes);
+
+				if (
+					// The phpbb_db_migrations class may not have been loaded until now, so make sure to ignore it.
+					!(sizeof($added_classes) == 2 && in_array('phpbb_db_migration', $added_classes)) &&
+					sizeof($added_classes) != 1
+				)
+				{
+					throw new phpbb_db_migration_exception('MIGRATION DATA FILE INVALID', $path . $file);
+				}
+
+				$name = array_pop($added_classes);
 
 				if (!in_array($name, $this->migrations))
 				{
@@ -115,11 +154,14 @@ class phpbb_db_migrator
 			}
 		}
 
-		foreach ($this->migrations as $name)
+		if ($check_fulfillable)
 		{
-			if ($this->unfulfillable($name))
+			foreach ($this->migrations as $name)
 			{
-				throw new phpbb_db_migration_exception('MIGRATION NOT FULFILLABLE', $name);
+				if ($this->unfulfillable($name))
+				{
+					throw new phpbb_db_migration_exception('MIGRATION NOT FULFILLABLE', $name);
+				}
 			}
 		}
 
@@ -131,6 +173,8 @@ class phpbb_db_migrator
 	*
 	* The update step can either be a schema or a (partial) data update. To
 	* check if update() needs to be called again use the finished() method.
+	*
+	* @return null
 	*/
 	public function update()
 	{
@@ -207,9 +251,11 @@ class phpbb_db_migrator
 		}
 		else
 		{
-			$this->process_data_step($migration);
-			$state['migration_data_done'] = true;
-			$state['migration_end_time'] = time();
+			$state = $this->process_data_step($migration);
+
+			$state['migration_data_state'] = $state;
+			$state['migration_data_done'] = ($state === true);
+			$state['migration_end_time'] = ($state === true) ? time() : 0;
 		}
 
 		$sql = 'UPDATE ' . $this->migrations_table . '
@@ -222,41 +268,74 @@ class phpbb_db_migrator
 		return true;
 	}
 
+	/**
+	* Apply schema changes from a migration
+	*
+	* Just calls db_tools->perform_schema_changes
+	*
+	* @param array $schema_changes from migration
+	*/
+	protected function apply_schema_changes($schema_changes)
+	{
+		$this->db_tools->perform_schema_changes($schema_changes);
+	}
+
+	/**
+	* Process the data step of the migration
+	*
+	* @param phpbb_db_migration $migration
+	* @return mixed migration status or bool true if everything completed successfully
+	*/
 	protected function process_data_step($migration)
 	{
-		//$continue = false;
 		$steps = $migration->update_data();
 
 		foreach ($steps as $step)
 		{
-			$continue = $this->run_step($step);
-
-			/*if ($continue === false)
+			try
 			{
-				return false;
-			}*/
+				// Result will be null or true if everything completed correctly
+				$result = $this->run_step($step);
+				if ($result !== null && $result !== true)
+				{
+					return $result;
+				}
+			}
+			catch (phpbb_db_migration_exception $e)
+			{
+				// We should try rolling back here
+
+				echo $e;
+				die();
+			}
 		}
 
-		//return $continue;
+		return true;
 	}
 
+	/**
+	* Run a single step
+	*
+	* An exception should be thrown if an error occurs
+	*
+	* @param mixed $step
+	* @return null
+	*/
 	protected function run_step($step)
 	{
-		try
-		{
-			$callable_and_parameters = $this->get_callable_from_step($step);
-			$callable = $callable_and_parameters[0];
-			$parameters = $callable_and_parameters[1];
+		$callable_and_parameters = $this->get_callable_from_step($step);
+		$callable = $callable_and_parameters[0];
+		$parameters = $callable_and_parameters[1];
 
-			return call_user_func_array($callable, $parameters);
-		}
-		catch (phpbb_db_migration_exception $e)
-		{
-			echo $e;
-			die();
-		}
+		return call_user_func_array($callable, $parameters);
 	}
 
+	/**
+	* Get a callable statement from a data step
+	*
+	* @param mixed $step Data step from migration
+	* @return array Array with parameters for call_user_func_array(), 0 is the callable, 1 is parameters
+	*/
 	public function get_callable_from_step($step)
 	{
 		$type = $step[0];
@@ -291,6 +370,7 @@ class phpbb_db_migrator
 				$callable_and_parameters = $this->get_callable_from_step($step);
 				$callable = $callable_and_parameters[0];
 				$sub_parameters = $callable_and_parameters[1];
+
 				return array(
 					function ($condition) use ($callable, $sub_parameters) {
 						return call_user_func_array($callable, $sub_parameters);
@@ -325,12 +405,19 @@ class phpbb_db_migrator
 
 				return array(
 					array($this->tools[$class], $method),
-					$parameters
+					$parameters,
 				);
 			break;
 		}
 	}
 
+	/**
+	* Insert migration row into the database
+	*
+	* @param string $name Name of the migration
+	* @param array $state
+	* @return null
+	*/
 	protected function insert_migration($name, $state)
 	{
 		$migration_row = $state;
@@ -346,8 +433,8 @@ class phpbb_db_migrator
 	/**
 	* Checks if a migration's dependencies can even theoretically be satisfied.
 	*
-	* @param	string	$name	The class name of the migration
-	* @return	bool			Whether the migration cannot be fulfilled
+	* @param string	$name The class name of the migration
+	* @return bool Whether the migration cannot be fulfilled
 	*/
 	public function unfulfillable($name)
 	{
@@ -406,11 +493,6 @@ class phpbb_db_migrator
 		return true;
 	}
 
-	protected function apply_schema_changes($schema_changes)
-	{
-		$this->db_tools->perform_schema_changes($schema_changes);
-	}
-
 	/**
 	* Helper to get a migration
 	*
-- 
cgit v1.2.1


From edf693e3bd4352ab75c62311b34f12fc98e7ef63 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 9 Jan 2013 15:28:08 -0600
Subject: [feature/migrations] Store state properly and send past result to
 callable

Fix return on module add

PHPBB3-9737
---
 phpBB/includes/db/migration/tool/module.php |  4 +--
 phpBB/includes/db/migrator.php              | 56 +++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index f1b527bf21..70a246849a 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -208,11 +208,11 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 					);
 
 					// Run the "manual" way with the data we've collected.
-					$result .= ((isset($data['spacer'])) ? $data['spacer'] : '<br />') . $this->add($class, $parent, $new_module);
+					$this->add($class, $parent, $new_module);
 				}
 			}
 
-			return $result;
+			return;
 		}
 
 		// The "manual" way
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 2ba1eba427..7aa4cfa719 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -251,11 +251,11 @@ class phpbb_db_migrator
 		}
 		else
 		{
-			$state = $this->process_data_step($migration);
+			$result = $this->process_data_step($migration, $state['migration_data_state']);
 
-			$state['migration_data_state'] = $state;
-			$state['migration_data_done'] = ($state === true);
-			$state['migration_end_time'] = ($state === true) ? time() : 0;
+			$state['migration_data_state'] = ($result === true) ? '' : $result;
+			$state['migration_data_done'] = ($result === true);
+			$state['migration_end_time'] = ($result === true) ? time() : 0;
 		}
 
 		$sql = 'UPDATE ' . $this->migrations_table . '
@@ -284,27 +284,50 @@ class phpbb_db_migrator
 	* Process the data step of the migration
 	*
 	* @param phpbb_db_migration $migration
-	* @return mixed migration status or bool true if everything completed successfully
+	* @param bool|string $state Current state of the migration
+	* @return bool|string migration state. True if completed, serialized array if not finished
 	*/
-	protected function process_data_step($migration)
+	protected function process_data_step($migration, $state)
 	{
+		$state = ($state) ? unserialize($state) : false;
+
 		$steps = $migration->update_data();
 
 		foreach ($steps as $step)
 		{
+			$last_result = false;
+			if ($state)
+			{
+				// Continue until we reach the step that matches the last step called
+				if ($state['step'] != $step)
+				{
+					continue;
+				}
+
+				// We send the result from last time to the callable function
+				$last_result = $state['result'];
+
+				// Set state to false since we reached the point we were at
+				$state = false;
+			}
+
 			try
 			{
 				// Result will be null or true if everything completed correctly
-				$result = $this->run_step($step);
+				$result = $this->run_step($step, $last_result);
 				if ($result !== null && $result !== true)
 				{
-					return $result;
+					return serialize(array(
+						'result'	=> $result,
+						'step'		=> $step,
+					));
 				}
 			}
 			catch (phpbb_db_migration_exception $e)
 			{
 				// We should try rolling back here
 
+				var_dump($step);
 				echo $e;
 				die();
 			}
@@ -318,12 +341,13 @@ class phpbb_db_migrator
 	*
 	* An exception should be thrown if an error occurs
 	*
-	* @param mixed $step
+	* @param mixed $step Data step from migration
+	* @param mixed $last_result Result to pass to the callable (only for 'custom' method)
 	* @return null
 	*/
-	protected function run_step($step)
+	protected function run_step($step, $last_result = false)
 	{
-		$callable_and_parameters = $this->get_callable_from_step($step);
+		$callable_and_parameters = $this->get_callable_from_step($step, $last_result);
 		$callable = $callable_and_parameters[0];
 		$parameters = $callable_and_parameters[1];
 
@@ -334,9 +358,10 @@ class phpbb_db_migrator
 	* Get a callable statement from a data step
 	*
 	* @param mixed $step Data step from migration
+	* @param mixed $last_result Result to pass to the callable (only for 'custom' method)
 	* @return array Array with parameters for call_user_func_array(), 0 is the callable, 1 is parameters
 	*/
-	public function get_callable_from_step($step)
+	public function get_callable_from_step($step, $last_result = false)
 	{
 		$type = $step[0];
 		$parameters = $step[1];
@@ -375,7 +400,7 @@ class phpbb_db_migrator
 					function ($condition) use ($callable, $sub_parameters) {
 						return call_user_func_array($callable, $sub_parameters);
 					},
-					array($condition)
+					array($condition),
 				);
 			break;
 			case 'custom':
@@ -384,7 +409,10 @@ class phpbb_db_migrator
 					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_CUSTOM_NOT_CALLABLE', $step);
 				}
 
-				return array($parameters[0], array());
+				return array(
+					$parameters[0],
+					array($last_result),
+				);
 			break;
 
 			default:
-- 
cgit v1.2.1


From f56e400cd36b6d17ffde90a91e6e221cb83d2dbd Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 9 Jan 2013 15:41:04 -0600
Subject: [feature/migrations] Comments

PHPBB3-9737
---
 phpBB/includes/db/migration/tool/permission.php | 12 +++++------
 phpBB/includes/db/migrator.php                  | 28 +++++++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php
index 97fdbc0df9..7b45b24361 100644
--- a/phpBB/includes/db/migration/tool/permission.php
+++ b/phpBB/includes/db/migration/tool/permission.php
@@ -366,7 +366,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 
 		switch ($type)
 		{
-			case 'role' :
+			case 'role':
 				$sql = 'SELECT role_id
 					FROM ' . ACL_ROLES_TABLE . "
 					WHERE role_name = '" . $this->db->sql_escape($name) . "'";
@@ -389,7 +389,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 				$this->db->sql_freeresult($result);
 			break;
 
-			case 'group' :
+			case 'group':
 				$sql = 'SELECT group_id
 					FROM ' . GROUPS_TABLE . "
 					WHERE group_name = '" . $this->db->sql_escape($name) . "'";
@@ -435,7 +435,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 		$sql_ary = array();
 		switch ($type)
 		{
-			case 'role' :
+			case 'role':
 				foreach ($new_auth as $auth_option_id)
 				{
 					if (!isset($current_auth[$auth_option_id]))
@@ -451,7 +451,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 				$this->db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary);
 			break;
 
-			case 'group' :
+			case 'group':
 				foreach ($new_auth as $auth_option_id)
 				{
 					if (!isset($current_auth[$auth_option_id]))
@@ -508,7 +508,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 
 		switch ($type)
 		{
-			case 'role' :
+			case 'role':
 				$sql = 'SELECT role_id
 					FROM ' . ACL_ROLES_TABLE . "
 					WHERE role_name = '" . $this->db->sql_escape($name) . "'";
@@ -525,7 +525,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 				$this->db->sql_query($sql);
 			break;
 
-			case 'group' :
+			case 'group':
 				$sql = 'SELECT group_id
 					FROM ' . GROUPS_TABLE . "
 					WHERE group_name = '" . $this->db->sql_escape($name) . "'";
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 7aa4cfa719..5d8dc12f58 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -43,13 +43,27 @@ class phpbb_db_migrator
 	/** @var string */
 	protected $migrations_table;
 
-	/** @var array State of all migrations (SELECT * FROM migrations table) */
-	protected $migration_state;
+	/**
+	* State of all migrations
+	*
+	* (SELECT * FROM migrations table)
+	*
+	* @var array
+	*/
+	protected $migration_state = array();
 
-	/** @var array Array of all migrations available to be run */
+	/**
+	* Array of all migrations available to be run
+	*
+	* @var array
+	*/
 	protected $migrations = array();
 
-	/** @var array 'name' and 'class' of the last migration run */
+	/**
+	* 'name' and 'class' of the last migration run
+	*
+	* @var array
+	*/
 	public $last_run_migration = false;
 
 	/**
@@ -83,11 +97,12 @@ class phpbb_db_migrator
 	*/
 	public function load_migration_state()
 	{
+		$this->migration_state = array();
+
 		$sql = "SELECT *
 			FROM " . $this->migrations_table;
 		$result = $this->db->sql_query($sql);
 
-		$this->migration_state = array();
 		while ($migration = $this->db->sql_fetchrow($result))
 		{
 			$this->migration_state[$migration['migration_name']] = $migration;
@@ -137,8 +152,9 @@ class phpbb_db_migrator
 				$added_classes = array_diff(get_declared_classes(), $declared_classes);
 
 				if (
-					// The phpbb_db_migrations class may not have been loaded until now, so make sure to ignore it.
+					// If two classes have been added and phpbb_db_migration is one of them, we've only added one real migration
 					!(sizeof($added_classes) == 2 && in_array('phpbb_db_migration', $added_classes)) &&
+					// Otherwise there should only be one class added
 					sizeof($added_classes) != 1
 				)
 				{
-- 
cgit v1.2.1


From 445667a62e80c42b5406c981d1116ef99a23df3b Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 9 Jan 2013 16:31:56 -0600
Subject: [feature/migrations] Fix if method (and create a test for it)

PHPBB3-9737
---
 phpBB/includes/db/migrator.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 5d8dc12f58..1042b767e8 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -364,6 +364,12 @@ class phpbb_db_migrator
 	protected function run_step($step, $last_result = false)
 	{
 		$callable_and_parameters = $this->get_callable_from_step($step, $last_result);
+
+		if ($callable_and_parameters === false)
+		{
+			return;
+		}
+
 		$callable = $callable_and_parameters[0];
 		$parameters = $callable_and_parameters[1];
 
@@ -377,7 +383,7 @@ class phpbb_db_migrator
 	* @param mixed $last_result Result to pass to the callable (only for 'custom' method)
 	* @return array Array with parameters for call_user_func_array(), 0 is the callable, 1 is parameters
 	*/
-	public function get_callable_from_step($step, $last_result = false)
+	protected function get_callable_from_step($step, $last_result = false)
 	{
 		$type = $step[0];
 		$parameters = $step[1];
@@ -406,6 +412,12 @@ class phpbb_db_migrator
 				}
 
 				$condition = $parameters[0];
+
+				if (!$condition)
+				{
+					return false;
+				}
+
 				$step = $parameters[1];
 
 				$callable_and_parameters = $this->get_callable_from_step($step);
@@ -413,10 +425,8 @@ class phpbb_db_migrator
 				$sub_parameters = $callable_and_parameters[1];
 
 				return array(
-					function ($condition) use ($callable, $sub_parameters) {
-						return call_user_func_array($callable, $sub_parameters);
-					},
-					array($condition),
+					$callable,
+					$sub_parameters,
 				);
 			break;
 			case 'custom':
-- 
cgit v1.2.1


From 5f9e1f1e89f8df5420fd82b5256a461de0f98604 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 9 Jan 2013 16:56:26 -0600
Subject: [feature/migrations] Make sure the path sent to load_migrations is a
 directory

Prevent a lot++ of errors

PHPBB3-9737
---
 phpBB/includes/db/migrator.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 1042b767e8..359c34bf5d 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -139,6 +139,11 @@ class phpbb_db_migrator
 	*/
 	public function load_migrations($path, $check_fulfillable = true)
 	{
+		if (!is_dir($path))
+		{
+			throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path);
+		}
+
 		$handle = opendir($path);
 		while (($file = readdir($handle)) !== false)
 		{
-- 
cgit v1.2.1


From 3d4c00619f1c96df7a4c6f8bc1c03eb21abf49d7 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 9 Jan 2013 18:24:32 -0600
Subject: [feature/migrations] Reverse data functionality

If data step fails, attempt to roll back any previous calls from the
migration that failed.

Fix some failing tests

PHPBB3-9737
---
 phpBB/includes/db/migration/tool/config.php     | 42 +++++++++++++++++++
 phpBB/includes/db/migration/tool/interface.php  | 10 +++++
 phpBB/includes/db/migration/tool/module.php     | 31 ++++++++++++++
 phpBB/includes/db/migration/tool/permission.php | 55 +++++++++++++++++++++++++
 phpBB/includes/db/migrator.php                  | 37 ++++++++++++-----
 5 files changed, 164 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/tool/config.php b/phpBB/includes/db/migration/tool/config.php
index e7239436d2..6ae419d5e7 100644
--- a/phpBB/includes/db/migration/tool/config.php
+++ b/phpBB/includes/db/migration/tool/config.php
@@ -103,4 +103,46 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 
 		$this->config->delete($config_name);
 	}
+
+	/**
+	* Reverse an original install action
+	*
+	* First argument is the original call to the class (e.g. add, remove)
+	* After the first argument, send the original arguments to the function in the original call
+	*
+	* @return null
+	*/
+	public function reverse()
+	{
+		$arguments = func_get_args();
+		$original_call = array_shift($arguments);
+
+		$call = false;
+		switch ($original_call)
+		{
+			case 'add':
+				$call = 'remove';
+			break;
+
+			case 'remove':
+				$call = 'add';
+			break;
+
+			case 'update_if_equals':
+				$call = 'update_if_equals';
+
+				// Set to the original value if the current value is what we compared to originally
+				$arguments = array(
+					$arguments[2],
+					$arguments[1],
+					$arguments[0],
+				);
+			break;
+		}
+
+		if ($call)
+		{
+			return call_user_func_array(array(&$this, $call), $arguments);
+		}
+	}
 }
diff --git a/phpBB/includes/db/migration/tool/interface.php b/phpBB/includes/db/migration/tool/interface.php
index 5d10246ba1..ced53b2023 100644
--- a/phpBB/includes/db/migration/tool/interface.php
+++ b/phpBB/includes/db/migration/tool/interface.php
@@ -20,4 +20,14 @@ interface phpbb_db_migration_tool_interface
 	* @return string short name
 	*/
 	public function get_name();
+
+	/**
+	* Reverse an original install action
+	*
+	* First argument is the original call to the class (e.g. add, remove)
+	* After the first argument, send the original arguments to the function in the original call
+	*
+	* @return null
+	*/
+	public function reverse();
 }
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index 70a246849a..561faac552 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -471,4 +471,35 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			$this->cache->destroy("_modules_$class");
 		}
 	}
+
+	/**
+	* Reverse an original install action
+	*
+	* First argument is the original call to the class (e.g. add, remove)
+	* After the first argument, send the original arguments to the function in the original call
+	*
+	* @return null
+	*/
+	public function reverse()
+	{
+		$arguments = func_get_args();
+		$original_call = array_shift($arguments);
+
+		$call = false;
+		switch ($original_call)
+		{
+			case 'add':
+				$call = 'remove';
+			break;
+
+			case 'remove':
+				$call = 'add';
+			break;
+		}
+
+		if ($call)
+		{
+			return call_user_func_array(array(&$this, $call), $arguments);
+		}
+	}
 }
diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php
index 7b45b24361..a25fdb345e 100644
--- a/phpBB/includes/db/migration/tool/permission.php
+++ b/phpBB/includes/db/migration/tool/permission.php
@@ -563,4 +563,59 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 
 		$this->auth->acl_clear_prefetch();
 	}
+
+	/**
+	* Reverse an original install action
+	*
+	* First argument is the original call to the class (e.g. add, remove)
+	* After the first argument, send the original arguments to the function in the original call
+	*
+	* @return null
+	*/
+	public function reverse()
+	{
+		$arguments = func_get_args();
+		$original_call = array_shift($arguments);
+
+		$call = false;
+		switch ($original_call)
+		{
+			case 'add':
+				$call = 'remove';
+			break;
+
+			case 'remove':
+				$call = 'add';
+			break;
+
+			case 'permission_set':
+				$call = 'permission_unset';
+			break;
+
+			case 'permission_unset':
+				$call = 'permission_set';
+			break;
+
+			case 'role_add':
+				$call = 'role_remove';
+			break;
+
+			case 'role_remove':
+				$call = 'role_add';
+			break;
+
+			case 'role_update':
+				// Set to the original value if the current value is what we compared to originally
+				$arguments = array(
+					$arguments[1],
+					$arguments[0],
+				);
+			break;
+		}
+
+		if ($call)
+		{
+			return call_user_func_array(array(&$this, $call), $arguments);
+		}
+	}
 }
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 359c34bf5d..dc2c746559 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -347,6 +347,17 @@ class phpbb_db_migrator
 			catch (phpbb_db_migration_exception $e)
 			{
 				// We should try rolling back here
+				foreach ($steps as $reverse_step)
+				{
+					// Reverse the step that was run
+					$result = $this->run_step($step, false, true);
+
+					// If we've reached the current step we can break because we reversed everything that was run
+					if ($reverse_step === $step)
+					{
+						break;
+					}
+				}
 
 				var_dump($step);
 				echo $e;
@@ -364,11 +375,12 @@ class phpbb_db_migrator
 	*
 	* @param mixed $step Data step from migration
 	* @param mixed $last_result Result to pass to the callable (only for 'custom' method)
+	* @param bool $reverse False to install, True to attempt uninstallation by reversing the call
 	* @return null
 	*/
-	protected function run_step($step, $last_result = false)
+	protected function run_step($step, $last_result = false, $reverse = false)
 	{
-		$callable_and_parameters = $this->get_callable_from_step($step, $last_result);
+		$callable_and_parameters = $this->get_callable_from_step($step, $last_result, $reverse);
 
 		if ($callable_and_parameters === false)
 		{
@@ -386,9 +398,10 @@ class phpbb_db_migrator
 	*
 	* @param mixed $step Data step from migration
 	* @param mixed $last_result Result to pass to the callable (only for 'custom' method)
+	* @param bool $reverse False to install, True to attempt uninstallation by reversing the call
 	* @return array Array with parameters for call_user_func_array(), 0 is the callable, 1 is parameters
 	*/
-	protected function get_callable_from_step($step, $last_result = false)
+	protected function get_callable_from_step($step, $last_result = false, $reverse = false)
 	{
 		$type = $step[0];
 		$parameters = $step[1];
@@ -425,14 +438,7 @@ class phpbb_db_migrator
 
 				$step = $parameters[1];
 
-				$callable_and_parameters = $this->get_callable_from_step($step);
-				$callable = $callable_and_parameters[0];
-				$sub_parameters = $callable_and_parameters[1];
-
-				return array(
-					$callable,
-					$sub_parameters,
-				);
+				return $this->get_callable_from_step($step);
 			break;
 			case 'custom':
 				if (!is_callable($parameters[0]))
@@ -462,6 +468,15 @@ class phpbb_db_migrator
 					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_UNDEFINED_METHOD', $step);
 				}
 
+				// Attempt to reverse operations
+				if ($reverse)
+				{
+					return array(
+						array($this->tools[$class], 'reverse'),
+						array_unshift($parameters, $method),
+					);
+				}
+
 				return array(
 					array($this->tools[$class], $method),
 					$parameters,
-- 
cgit v1.2.1


From 595246f9bf17f1bef69c285ba8e78534cd91054a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 9 Jan 2013 18:55:55 -0600
Subject: [feature/migrations] Some comments in db_tools

PHPBB3-9737
---
 phpBB/includes/db/db_tools.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 1d6823d37a..b13d4fe978 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -685,6 +685,8 @@ class phpbb_db_tools
 	* Handle passed database update array.
 	* Expected structure...
 	* Key being one of the following
+	*	drop_tables: Drop tables
+	*	add_tables: Add tables
 	*	change_columns: Column changes (only type, not name)
 	*	add_columns: Add columns to a table
 	*	drop_keys: Dropping keys
-- 
cgit v1.2.1


From 44c10f661ee548ae08fe81ba76f47f1c8134b96f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 9 Jan 2013 18:59:15 -0600
Subject: [feature/migrations] Creating revert method to attempt reverting a
 migration

This code is in progress

PHPBB3-9737
---
 phpBB/includes/db/migration/migration.php |  23 +++++++
 phpBB/includes/db/migrator.php            | 100 ++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/migration.php b/phpBB/includes/db/migration/migration.php
index 5f1f0443db..61fbf04320 100644
--- a/phpBB/includes/db/migration/migration.php
+++ b/phpBB/includes/db/migration/migration.php
@@ -93,6 +93,16 @@ abstract class phpbb_db_migration
 		return array();
 	}
 
+	/**
+	* Reverts the database schema by providing a set of change instructions
+	*
+	* @return array Array of schema changes (compatible with db_tools->perform_schema_changes())
+	*/
+	public function revert_schema()
+	{
+		return array();
+	}
+
 	/**
 	* Updates data by returning a list of instructions to be executed
 	*
@@ -103,6 +113,19 @@ abstract class phpbb_db_migration
 		return array();
 	}
 
+	/**
+	* Reverts data by returning a list of instructions to be executed
+	*
+	* @return array Array of data instructions that will be performed on revert
+	* 	NOTE: calls to tools (such as config.add) are automatically reverted when
+	* 		possible, so you should not attempt to revert those, this is mostly for
+	* 		otherwise unrevertable calls (custom functions for example)
+	*/
+	public function revert_data()
+	{
+		return array();
+	}
+
 	/**
 	* Wrapper for running queries to generate user feedback on updates
 	*
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index dc2c746559..e8d3735974 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -289,6 +289,91 @@ class phpbb_db_migrator
 		return true;
 	}
 
+	/**
+	* Runs a single revert step from the last migration installed
+	*
+	* The revert step can either be a schema or a (partial) data revert. To
+	* check if revert() needs to be called again use the migration_installed() method.
+	*
+	* @param string $migration String migration name to revert (including any that depend on this migration)
+	* @return null
+	*/
+	public function revert($migration)
+	{
+		if (!isset($this->migration_state[$name]))
+		{
+			// Not installed
+			return;
+		}
+
+		// Iterate through all installed migrations and make sure any dependencies are removed first
+		foreach ($this->migration_state as $name => $state)
+		{
+			$migration_class = $this->get_migration($name);
+
+			if (in_array($migration, $migration_class->depends_on()))
+			{
+				$this->revert($name);
+			}
+		}
+
+		$this->try_revert($migration);
+	}
+
+	/**
+	* Attempts to apply a step of the given migration or one of its dependencies
+	*
+	* @param	string	The class name of the migration
+	* @return	bool	Whether any update step was successfully run
+	*/
+	protected function try_revert($name)
+	{
+		if (!class_exists($name))
+		{
+			return false;
+		}
+
+		$migration = $this->get_migration($name);
+
+		$state = $this->migration_state[$name];
+
+		$this->last_run_migration = array(
+			'name'	=> $name,
+			'class'	=> $migration,
+		);
+
+		// Left off here
+
+		if (!isset($this->migration_state[$name]))
+		{
+			$state['migration_start_time'] = time();
+			$this->insert_migration($name, $state);
+		}
+
+		if (!$state['migration_schema_done'])
+		{
+			$this->apply_schema_changes($migration->update_schema());
+			$state['migration_schema_done'] = true;
+		}
+		else
+		{
+			$result = $this->process_data_step($migration, $state['migration_data_state']);
+
+			$state['migration_data_state'] = ($result === true) ? '' : $result;
+			$state['migration_data_done'] = ($result === true);
+			$state['migration_end_time'] = ($result === true) ? time() : 0;
+		}
+
+		$sql = 'UPDATE ' . $this->migrations_table . '
+			SET ' . $this->db->sql_build_array('UPDATE', $state) . "
+			WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
+		$this->db->sql_query($sql);
+
+		$this->migration_state[$name] = $state;
+
+		return true;
+	}
+
 	/**
 	* Apply schema changes from a migration
 	*
@@ -359,6 +444,7 @@ class phpbb_db_migrator
 					}
 				}
 
+				/** TODO Revert Schema **/
 				var_dump($step);
 				echo $e;
 				die();
@@ -567,6 +653,20 @@ class phpbb_db_migrator
 		return true;
 	}
 
+	/**
+	* Checks whether a migration is installed
+	*
+	* @param string $migration String migration name to check if it is installed
+	* @return bool Whether the migrations have been applied
+	*/
+	public function migration_installed($migration)
+	{
+		if (isset($this->migration_state[$migration]))
+		{
+			return true;
+		}
+	}
+
 	/**
 	* Helper to get a migration
 	*
-- 
cgit v1.2.1


From dbe71bb170dc684311174bb025696c81f1d50883 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 13:53:09 -0600
Subject: [feature/migrations] Revert method completed

PHPBB3-9737
---
 phpBB/includes/db/migrator.php | 74 +++++++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index e8d3735974..13114e7df1 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -272,7 +272,7 @@ class phpbb_db_migrator
 		}
 		else
 		{
-			$result = $this->process_data_step($migration, $state['migration_data_state']);
+			$result = $this->process_data_step($migration->update_data(), $state['migration_data_state']);
 
 			$state['migration_data_state'] = ($result === true) ? '' : $result;
 			$state['migration_data_done'] = ($result === true);
@@ -300,7 +300,7 @@ class phpbb_db_migrator
 	*/
 	public function revert($migration)
 	{
-		if (!isset($this->migration_state[$name]))
+		if (!isset($this->migration_state[$migration]))
 		{
 			// Not installed
 			return;
@@ -342,34 +342,39 @@ class phpbb_db_migrator
 			'class'	=> $migration,
 		);
 
-		// Left off here
-
-		if (!isset($this->migration_state[$name]))
+		if ($state['migration_data_done'])
 		{
-			$state['migration_start_time'] = time();
-			$this->insert_migration($name, $state);
-		}
+			if ($state['migration_data_state'] !== 'revert_data')
+			{
+				$result = $this->process_data_step($migration->update_data(), $state['migration_data_state'], true);
 
-		if (!$state['migration_schema_done'])
-		{
-			$this->apply_schema_changes($migration->update_schema());
-			$state['migration_schema_done'] = true;
+				$state['migration_data_state'] = ($result === true) ? 'revert_data' : $result;
+			}
+			else
+			{
+				$result = $this->process_data_step($migration->revert_data(), $state['migration_data_state'], false);
+
+				$state['migration_data_state'] = ($result === true) ? '' : $result;
+				$state['migration_data_done'] = ($result === true) ? false : true;
+			}
+
+			$sql = 'UPDATE ' . $this->migrations_table . '
+				SET ' . $this->db->sql_build_array('UPDATE', $state) . "
+				WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
+			$this->db->sql_query($sql);
+
+			$this->migration_state[$name] = $state;
 		}
 		else
 		{
-			$result = $this->process_data_step($migration, $state['migration_data_state']);
-
-			$state['migration_data_state'] = ($result === true) ? '' : $result;
-			$state['migration_data_done'] = ($result === true);
-			$state['migration_end_time'] = ($result === true) ? time() : 0;
-		}
+			$this->apply_schema_changes($migration->revert_schema());
 
-		$sql = 'UPDATE ' . $this->migrations_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $state) . "
-			WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
-		$this->db->sql_query($sql);
+			$sql = 'DELETE FROM ' . $this->migrations_table . "
+				WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
+			$this->db->sql_query($sql);
 
-		$this->migration_state[$name] = $state;
+			unset($this->migration_state[$name]);
+		}
 
 		return true;
 	}
@@ -389,23 +394,22 @@ class phpbb_db_migrator
 	/**
 	* Process the data step of the migration
 	*
-	* @param phpbb_db_migration $migration
+	* @param array $steps The steps to run
 	* @param bool|string $state Current state of the migration
+	* @param bool $revert true to revert a data step
 	* @return bool|string migration state. True if completed, serialized array if not finished
 	*/
-	protected function process_data_step($migration, $state)
+	protected function process_data_step($steps, $state, $revert = false)
 	{
 		$state = ($state) ? unserialize($state) : false;
 
-		$steps = $migration->update_data();
-
-		foreach ($steps as $step)
+		foreach ($steps as $step_identifier => $step)
 		{
 			$last_result = false;
 			if ($state)
 			{
 				// Continue until we reach the step that matches the last step called
-				if ($state['step'] != $step)
+				if ($state['step'] != $step_identifier)
 				{
 					continue;
 				}
@@ -420,12 +424,12 @@ class phpbb_db_migrator
 			try
 			{
 				// Result will be null or true if everything completed correctly
-				$result = $this->run_step($step, $last_result);
+				$result = $this->run_step($step, $last_result, $revert);
 				if ($result !== null && $result !== true)
 				{
 					return serialize(array(
 						'result'	=> $result,
-						'step'		=> $step,
+						'step'		=> $step_identifier,
 					));
 				}
 			}
@@ -435,7 +439,7 @@ class phpbb_db_migrator
 				foreach ($steps as $reverse_step)
 				{
 					// Reverse the step that was run
-					$result = $this->run_step($step, false, true);
+					$result = $this->run_step($step, false, !$revert);
 
 					// If we've reached the current step we can break because we reversed everything that was run
 					if ($reverse_step === $step)
@@ -557,9 +561,11 @@ class phpbb_db_migrator
 				// Attempt to reverse operations
 				if ($reverse)
 				{
+					array_unshift($parameters, $method);
+
 					return array(
 						array($this->tools[$class], 'reverse'),
-						array_unshift($parameters, $method),
+						$parameters,
 					);
 				}
 
@@ -665,6 +671,8 @@ class phpbb_db_migrator
 		{
 			return true;
 		}
+
+		return false;
 	}
 
 	/**
-- 
cgit v1.2.1


From d50500860fe44a78c8f29e0f2382b96da17c0b62 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 15:09:51 -0600
Subject: [feature/migrations] Store depends on in the database (serialized)

This is required so that when migrations are reverted we can check through
all installed migrations and make sure that all dependencies are handled
properly and so that we are only required to load the migrations files
that could be dependent on the ones installed.

I believe in normal proper use the old way might have worked, but in case
something happens and an unrelated migration file is installed, but cannot
be loaded, this makes sure we do not stop everything unless we absolutely
must (one of those files is dependent on something we want to revert).

PHPBB3-9737
---
 phpBB/includes/db/migrator.php | 79 ++++++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 33 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 13114e7df1..2ec44a5a45 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -106,6 +106,8 @@ class phpbb_db_migrator
 		while ($migration = $this->db->sql_fetchrow($result))
 		{
 			$this->migration_state[$migration['migration_name']] = $migration;
+
+			$this->migration_state[$migration['migration_name']]['migration_depends_on'] = unserialize($migration['migration_depends_on']);
 		}
 
 		$this->db->sql_freeresult($result);
@@ -235,16 +237,15 @@ class phpbb_db_migrator
 		$state = (isset($this->migration_state[$name])) ?
 			$this->migration_state[$name] :
 			array(
+				'migration_depends_on'	=> $migration->depends_on(),
 				'migration_schema_done' => false,
-				'migration_data_done' => false,
-				'migration_data_state' => '',
-				'migration_start_time' => 0,
-				'migration_end_time' => 0,
+				'migration_data_done'	=> false,
+				'migration_data_state'	=> '',
+				'migration_start_time'	=> 0,
+				'migration_end_time'	=> 0,
 			);
 
-		$depends = $migration->depends_on();
-
-		foreach ($depends as $depend)
+		foreach ($state['migration_depends_on'] as $depend)
 		{
 			if (!isset($this->migration_state[$depend]) ||
 				!$this->migration_state[$depend]['migration_schema_done'] ||
@@ -272,15 +273,28 @@ class phpbb_db_migrator
 		}
 		else
 		{
-			$result = $this->process_data_step($migration->update_data(), $state['migration_data_state']);
+			try
+			{
+				$result = $this->process_data_step($migration->update_data(), $state['migration_data_state']);
+
+				$state['migration_data_state'] = ($result === true) ? '' : $result;
+				$state['migration_data_done'] = ($result === true);
+				$state['migration_end_time'] = ($result === true) ? time() : 0;
+			}
+			catch (phpbb_db_migration_exception $e)
+			{
+				// Revert the schema changes
+				$this->revert($name);
 
-			$state['migration_data_state'] = ($result === true) ? '' : $result;
-			$state['migration_data_done'] = ($result === true);
-			$state['migration_end_time'] = ($result === true) ? time() : 0;
+				// Rethrow exception
+				throw $e;
+			}
 		}
 
+		$insert = $state;
+		$insert['migration_depends_on'] = serialize($state['migration_depends_on']);
 		$sql = 'UPDATE ' . $this->migrations_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $state) . "
+			SET ' . $this->db->sql_build_array('UPDATE', $insert) . "
 			WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
 		$this->db->sql_query($sql);
 
@@ -292,8 +306,9 @@ class phpbb_db_migrator
 	/**
 	* Runs a single revert step from the last migration installed
 	*
+	* YOU MUST ADD/SET ALL MIGRATIONS THAT COULD BE DEPENDENT ON THE MIGRATION TO REVERT TO BEFORE CALLING THIS METHOD!
 	* The revert step can either be a schema or a (partial) data revert. To
-	* check if revert() needs to be called again use the migration_installed() method.
+	* check if revert() needs to be called again use the migration_state() method.
 	*
 	* @param string $migration String migration name to revert (including any that depend on this migration)
 	* @return null
@@ -306,12 +321,9 @@ class phpbb_db_migrator
 			return;
 		}
 
-		// Iterate through all installed migrations and make sure any dependencies are removed first
 		foreach ($this->migration_state as $name => $state)
 		{
-			$migration_class = $this->get_migration($name);
-
-			if (in_array($migration, $migration_class->depends_on()))
+			if (!empty($state['migration_depends_on']) && in_array($migration, $state['migration_depends_on']))
 			{
 				$this->revert($name);
 			}
@@ -358,8 +370,10 @@ class phpbb_db_migrator
 				$state['migration_data_done'] = ($result === true) ? false : true;
 			}
 
+			$insert = $state;
+			$insert['migration_depends_on'] = serialize($state['migration_depends_on']);
 			$sql = 'UPDATE ' . $this->migrations_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $state) . "
+				SET ' . $this->db->sql_build_array('UPDATE', $insert) . "
 				WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
 			$this->db->sql_query($sql);
 
@@ -436,22 +450,20 @@ class phpbb_db_migrator
 			catch (phpbb_db_migration_exception $e)
 			{
 				// We should try rolling back here
-				foreach ($steps as $reverse_step)
+				foreach ($steps as $reverse_step_identifier => $reverse_step)
 				{
-					// Reverse the step that was run
-					$result = $this->run_step($step, false, !$revert);
-
 					// If we've reached the current step we can break because we reversed everything that was run
-					if ($reverse_step === $step)
+					if ($reverse_step_identifier == $step_identifier)
 					{
 						break;
 					}
+
+					// Reverse the step that was run
+					$result = $this->run_step($reverse_step, false, !$revert);
 				}
 
-				/** TODO Revert Schema **/
-				var_dump($step);
-				echo $e;
-				die();
+				// rethrow the exception
+				throw $e;
 			}
 		}
 
@@ -588,6 +600,7 @@ class phpbb_db_migrator
 	{
 		$migration_row = $state;
 		$migration_row['migration_name'] = $name;
+		$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);
 
 		$sql = 'INSERT INTO ' . $this->migrations_table . '
 			' . $this->db->sql_build_array('INSERT', $migration_row);
@@ -660,19 +673,19 @@ class phpbb_db_migrator
 	}
 
 	/**
-	* Checks whether a migration is installed
+	* Gets a migration state (whether it is installed and to what extent)
 	*
 	* @param string $migration String migration name to check if it is installed
-	* @return bool Whether the migrations have been applied
+	* @return bool|array False if the migration has not at all been installed, array
 	*/
-	public function migration_installed($migration)
+	public function migration_state($migration)
 	{
-		if (isset($this->migration_state[$migration]))
+		if (!isset($this->migration_state[$migration]))
 		{
-			return true;
+			return false;
 		}
 
-		return false;
+		return $this->migration_state[$migration];
 	}
 
 	/**
-- 
cgit v1.2.1


From db4fcab3bb4aefcabe93dd4acd1f12e8517cf340 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 22:29:49 -0600
Subject: [feature/migrations] Make depends_on static to call it without
 dependencies

PHPBB3-11318
---
 phpBB/includes/db/migration/migration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/migration.php b/phpBB/includes/db/migration/migration.php
index 61fbf04320..4271751362 100644
--- a/phpBB/includes/db/migration/migration.php
+++ b/phpBB/includes/db/migration/migration.php
@@ -78,7 +78,7 @@ abstract class phpbb_db_migration
 	*
 	* @return array An array of migration class names
 	*/
-	public function depends_on()
+	static public function depends_on()
 	{
 		return array();
 	}
-- 
cgit v1.2.1


From 9affd6f7e7b95442f1ef14894858d8213f3fbd2a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 11 Jan 2013 00:41:03 +0100
Subject: [ticket/11201] Remove MSN/WLM fields

WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype
uses a different login ID and service, the values in this field are useless.
So we can safely remove the field and the links/functions we create.

PHPBB3-11201
---
 phpBB/includes/acp/acp_users.php          | 4 ----
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 1 -
 phpBB/includes/ucp/ucp_profile.php        | 4 ----
 3 files changed, 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 82d8ef5cbb..2bdbf1441a 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1352,7 +1352,6 @@ class acp_users
 				$data = array(
 					'icq'			=> request_var('icq', $user_row['user_icq']),
 					'aim'			=> request_var('aim', $user_row['user_aim']),
-					'msn'			=> request_var('msn', $user_row['user_msnm']),
 					'yim'			=> request_var('yim', $user_row['user_yim']),
 					'jabber'		=> utf8_normalize_nfc(request_var('jabber', $user_row['user_jabber'], true)),
 					'website'		=> request_var('website', $user_row['user_website']),
@@ -1382,7 +1381,6 @@ class acp_users
 							array('string', true, 3, 15),
 							array('match', true, '#^[0-9]+$#i')),
 						'aim'			=> array('string', true, 3, 255),
-						'msn'			=> array('string', true, 5, 255),
 						'jabber'		=> array(
 							array('string', true, 5, 255),
 							array('jabber')),
@@ -1416,7 +1414,6 @@ class acp_users
 						$sql_ary = array(
 							'user_icq'		=> $data['icq'],
 							'user_aim'		=> $data['aim'],
-							'user_msnm'		=> $data['msn'],
 							'user_yim'		=> $data['yim'],
 							'user_jabber'	=> $data['jabber'],
 							'user_website'	=> $data['website'],
@@ -1469,7 +1466,6 @@ class acp_users
 					'ICQ'			=> $data['icq'],
 					'YIM'			=> $data['yim'],
 					'AIM'			=> $data['aim'],
-					'MSN'			=> $data['msn'],
 					'JABBER'		=> $data['jabber'],
 					'WEBSITE'		=> $data['website'],
 					'LOCATION'		=> $data['location'],
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index c85b05f144..a1001cfa74 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -241,7 +241,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'U_ICQ'			=> ($user_info['user_icq']) ? 'http://www.icq.com/people/' . urlencode($user_info['user_icq']) . '/' : '',
 		'U_AIM'			=> ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $author_id) : '',
 		'U_YIM'			=> ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&amp;.src=pg' : '',
-		'U_MSN'			=> ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $author_id) : '',
 		'U_JABBER'		=> ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $author_id) : '',
 
 		'U_DELETE'			=> ($auth->acl_get('u_pm_delete')) ? "$url&amp;mode=compose&amp;action=delete&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index e7cea06a45..c1ad9955b6 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -266,7 +266,6 @@ class ucp_profile
 				$data = array(
 					'icq'			=> request_var('icq', $user->data['user_icq']),
 					'aim'			=> request_var('aim', $user->data['user_aim']),
-					'msn'			=> request_var('msn', $user->data['user_msnm']),
 					'yim'			=> request_var('yim', $user->data['user_yim']),
 					'jabber'		=> utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)),
 					'website'		=> request_var('website', $user->data['user_website']),
@@ -299,7 +298,6 @@ class ucp_profile
 							array('string', true, 3, 15),
 							array('match', true, '#^[0-9]+$#i')),
 						'aim'			=> array('string', true, 3, 255),
-						'msn'			=> array('string', true, 5, 255),
 						'jabber'		=> array(
 							array('string', true, 5, 255),
 							array('jabber')),
@@ -351,7 +349,6 @@ class ucp_profile
 						$sql_ary = array(
 							'user_icq'		=> $data['icq'],
 							'user_aim'		=> $data['aim'],
-							'user_msnm'		=> $data['msn'],
 							'user_yim'		=> $data['yim'],
 							'user_jabber'	=> $data['jabber'],
 							'user_website'	=> $data['website'],
@@ -423,7 +420,6 @@ class ucp_profile
 					'ICQ'		=> $data['icq'],
 					'YIM'		=> $data['yim'],
 					'AIM'		=> $data['aim'],
-					'MSN'		=> $data['msn'],
 					'JABBER'	=> $data['jabber'],
 					'WEBSITE'	=> $data['website'],
 					'LOCATION'	=> $data['location'],
-- 
cgit v1.2.1


From 93f9ebbb258a06e34198cffda0f5fd8dfdf29597 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 12 Jan 2013 18:27:33 -0600
Subject: [feature/migrations] Make load_migrations recursive (optionally)

PHPBB3-9737
---
 phpBB/includes/db/migrator.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 2ec44a5a45..6b249e3ee0 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -127,7 +127,6 @@ class phpbb_db_migrator
 	/**
 	* Load migration data files from a directory
 	*
-	* This does not loop through sub-directories.
 	* Migration data files loaded with this function MUST contain
 	* 	ONLY ONE class in them (or an exception will be thrown).
 	*
@@ -137,9 +136,10 @@ class phpbb_db_migrator
 	* 	If FALSE, we will not check. You SHOULD check at least once
 	* 	to prevent errors (if including multiple directories, check
 	* 	with the last call to prevent throwing errors unnecessarily).
-	* @return array Array of migrations with names
+	* @param bool $recursive Set to true to also load data files from subdirectories
+	* @return array Array of migration names
 	*/
-	public function load_migrations($path, $check_fulfillable = true)
+	public function load_migrations($path, $check_fulfillable = true, $recursive = true)
 	{
 		if (!is_dir($path))
 		{
@@ -149,6 +149,17 @@ class phpbb_db_migrator
 		$handle = opendir($path);
 		while (($file = readdir($handle)) !== false)
 		{
+			if ($file == '.' || $file == '..')
+			{
+				continue;
+			}
+
+			// Recursion through subdirectories
+			if (is_dir($path . $file) && $recursive)
+			{
+				$this->load_migrations($path . $file . '/', $check_fulfillable, $recursive);
+			}
+
 			if (strpos($file, '_') !== 0 && strrpos($file, '.' . $this->php_ext) === (strlen($file) - strlen($this->php_ext) - 1))
 			{
 				// We try to find what class existed by comparing the classes declared before and after including the file.
-- 
cgit v1.2.1


From 26c16559c3496f5496ad6e83e55c40f03edda5bd Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 13 Jan 2013 12:39:08 -0600
Subject: [feature/migrations] Function effectively_installed() in migrations

Allows you to check if the migration is effectively installed
(entirely optionall)

This function is intended to help moving to migrations from a
previous database updater, where some migrations may have been
installed already even though they are not yet listed in the
migrations table.

PHPBB3-9737
---
 phpBB/includes/db/migration/migration.php | 15 +++++++++++++++
 phpBB/includes/db/migrator.php            | 20 +++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/migration.php b/phpBB/includes/db/migration/migration.php
index 4271751362..cf1e97b3b1 100644
--- a/phpBB/includes/db/migration/migration.php
+++ b/phpBB/includes/db/migration/migration.php
@@ -83,6 +83,21 @@ abstract class phpbb_db_migration
 		return array();
 	}
 
+	/**
+	* Allows you to check if the migration is effectively installed (entirely optionall)
+	*
+	* This is checked when a migration is installed. If true is returned, the migration will be set as
+	* installed without performing the database changes.
+	* This function is intended to help moving to migrations from a previous database updater, where some
+	* migrations may have been installed already even though they are not yet listed in the migrations table.
+	*
+	* @return bool True if this migration is installed, False if this migration is not installed (checked on install)
+	*/
+	public function effectively_installed()
+	{
+		return false;
+	}
+
 	/**
 	* Updates the database schema by providing a set of change instructions
 	*
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 6b249e3ee0..b56da95b1a 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -271,10 +271,24 @@ class phpbb_db_migrator
 			'class'	=> $migration,
 		);
 
-		if (!isset($this->migration_state[$name]))
+		if ($migration->effectively_installed())
 		{
-			$state['migration_start_time'] = time();
-			$this->insert_migration($name, $state);
+			$state = array(
+				'migration_depends_on'	=> $migration->depends_on(),
+				'migration_schema_done' => true,
+				'migration_data_done'	=> true,
+				'migration_data_state'	=> '',
+				'migration_start_time'	=> 0,
+				'migration_end_time'	=> 0,
+			);
+		}
+		else
+		{
+			if (!isset($this->migration_state[$name]))
+			{
+				$state['migration_start_time'] = time();
+				$this->insert_migration($name, $state);
+			}
 		}
 
 		if (!$state['migration_schema_done'])
-- 
cgit v1.2.1


From 000b8fefd2788c7f9f6aa6efc1d93658a00e48bd Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 13 Jan 2013 13:21:01 -0600
Subject: [feature/migrations] Function to populate the migrations table (for
 install)

PHPBB3-9737
---
 phpBB/includes/db/migrator.php | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index b56da95b1a..69a5a4dd9c 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -124,6 +124,42 @@ class phpbb_db_migrator
 		$this->migrations = $class_names;
 	}
 
+	/**
+	* This function adds all migrations in a specified directory to the migrations table
+	*
+	* THIS SHOULD NOT GENERALLY BE USED! THIS IS FOR THE PHPBB INSTALLER.
+	* THIS WILL THROW ERRORS IF MIGRATIONS ALREADY EXIST IN THE TABLE, DO NOT CALL MORE THAN ONCE!
+	*
+	* @param string $path Path to migration data files
+	* @param bool $recursive Set to true to also load data files from subdirectories
+	* @return null
+	*/
+	public function populate_migrations_from_directory($path, $recursive = true)
+	{
+		$existing_migrations = $this->migrations;
+
+		$this->migrations = array();
+		$this->load_migrations($path, true, $recursive);
+
+		foreach ($this->migrations as $name)
+		{
+			if ($this->migration_state($name) === false)
+			{
+				$state = array(
+					'migration_depends_on'	=> $name::depends_on(),
+					'migration_schema_done' => true,
+					'migration_data_done'	=> true,
+					'migration_data_state'	=> '',
+					'migration_start_time'	=> time(),
+					'migration_end_time'	=> time(),
+				);
+				$this->insert_migration($name, $state);
+			}
+		}
+
+		$this->migrations = $existing_migrations;
+	}
+
 	/**
 	* Load migration data files from a directory
 	*
-- 
cgit v1.2.1


From ccd08e21f6ae97ff0ff628ff29935a70bdd7a58d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 13 Jan 2013 13:34:16 -0600
Subject: [feature/migrations] Make sure migration data not done before running
 data step

PHPBB3-9737
---
 phpBB/includes/db/migrator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 69a5a4dd9c..d95283ae01 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -332,7 +332,7 @@ class phpbb_db_migrator
 			$this->apply_schema_changes($migration->update_schema());
 			$state['migration_schema_done'] = true;
 		}
-		else
+		else if (!$state['migration_data_done'])
 		{
 			try
 			{
-- 
cgit v1.2.1


From 46b75f4cf925ee0da852beeb6c4932e4fcb37992 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 15 Jan 2013 13:20:35 +0100
Subject: [ticket/10411] Add a comment why we left join the group table

We left join the group table because we want to check that the group
does exist there aswell.

PHPBB3-10411
---
 phpBB/includes/groupposition/teampage.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/includes/groupposition/teampage.php
index a189d5def9..2c488dd8a9 100644
--- a/phpBB/includes/groupposition/teampage.php
+++ b/phpBB/includes/groupposition/teampage.php
@@ -88,6 +88,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	*/
 	public function get_group_value($group_id)
 	{
+		// The join is required to ensure that the group itself exists
 		$sql = 'SELECT g.group_id, t.teampage_position
 			FROM ' . GROUPS_TABLE . ' g
 			LEFT JOIN ' . TEAMPAGE_TABLE . ' t
@@ -114,6 +115,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	*/
 	public function get_group_values($group_id)
 	{
+		// The join is required to ensure that the group itself exists
 		$sql = 'SELECT *
 			FROM ' . GROUPS_TABLE . ' g
 			LEFT JOIN ' . TEAMPAGE_TABLE . ' t
-- 
cgit v1.2.1


From 07282a30ae077825ea81a4e26839ac0473dc97b7 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 15 Jan 2013 12:10:07 -0600
Subject: [ticket/11103] Fix some various issues, better comments

PHPBB3-11103
---
 phpBB/includes/notification/manager.php     | 40 +++++++++----
 phpBB/includes/notification/method/base.php | 40 +++++++++----
 phpBB/includes/notification/type/base.php   | 92 +++++++++++++++++++++++------
 3 files changed, 130 insertions(+), 42 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 52cfa77388..a289ec0dfa 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -22,38 +22,54 @@ if (!defined('IN_PHPBB'))
 class phpbb_notification_manager
 {
 	/** @var array */
-	protected $notification_types = null;
+	protected $notification_types;
 
 	/** @var array */
-	protected $notification_methods = null;
+	protected $notification_methods;
 
 	/** @var ContainerBuilder */
-	protected $phpbb_container = null;
+	protected $phpbb_container;
 
 	/** @var phpbb_user_loader */
-	protected $user_loader = null;
+	protected $user_loader;
 
 	/** @var phpbb_db_driver */
-	protected $db = null;
+	protected $db;
 
 	/** @var phpbb_user */
-	protected $user = null;
+	protected $user;
 
 	/** @var string */
-	protected $phpbb_root_path = null;
+	protected $phpbb_root_path;
 
 	/** @var string */
-	protected $php_ext = null;
+	protected $php_ext;
 
 	/** @var string */
-	protected $notification_types_table = null;
+	protected $notification_types_table;
 
 	/** @var string */
-	protected $notifications_table = null;
+	protected $notifications_table;
 
 	/** @var string */
-	protected $user_notifications_table = null;
+	protected $user_notifications_table;
 
+	/**
+	* Notification Constructor
+	* 
+	* @param array $notification_types
+	* @param array $notification_methods
+	* @param ContainerBuilder $phpbb_container
+	* @param phpbb_user_loader $user_loader
+	* @param phpbb_db_driver $db
+	* @param phpbb_user $user
+	* @param string $phpbb_root_path
+	* @param string $php_ext
+	* @param string $notification_types_table
+	* @param string $notifications_table
+	* @param string $user_notifications_table
+	* @return phpbb_notification_manager
+	*/
 	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, phpbb_db_driver $db, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
 	{
 		$this->notification_types = $notification_types;
@@ -78,7 +94,7 @@ class phpbb_notification_manager
 	* @param array $options Optional options to control what notifications are loaded
 	*				notification_id		Notification id to load (or array of notification ids)
 	*				user_id				User id to load notifications for (Default: $user->data['user_id'])
-	*				order_by			Order by (Default: time)
+	*				order_by			Order by (Default: notification_time)
 	*				order_dir			Order direction (Default: DESC)
 	* 				limit				Number of notifications to load (Default: 5)
 	* 				start				Notifications offset (Default: 0)
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index f37e7e7845..c4c0a64ae0 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -22,37 +22,37 @@ if (!defined('IN_PHPBB'))
 abstract class phpbb_notification_method_base implements phpbb_notification_method_interface
 {
 	/** @var phpbb_notification_manager */
-	protected $notification_manager = null;
+	protected $notification_manager;
 
 	/** @var phpbb_user_loader */
-	protected $user_loader = null;
+	protected $user_loader;
 
 	/** @var phpbb_db_driver */
-	protected $db = null;
+	protected $db;
 
 	/** @var phpbb_cache_service */
-	protected $cache = null;
+	protected $cache;
 
 	/** @var phpbb_template */
-	protected $template = null;
+	protected $template;
 
 	/** @var phpbb_extension_manager */
-	protected $extension_manager = null;
+	protected $extension_manager;
 
 	/** @var phpbb_user */
-	protected $user = null;
+	protected $user;
 
 	/** @var phpbb_auth */
-	protected $auth = null;
+	protected $auth;
 
 	/** @var phpbb_config */
-	protected $config = null;
+	protected $config;
 
 	/** @var string */
-	protected $phpbb_root_path = null;
+	protected $phpbb_root_path;
 
 	/** @var string */
-	protected $php_ext = null;
+	protected $php_ext;
 
 	/**
 	* Queue of messages to be sent
@@ -61,6 +61,19 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	*/
 	protected $queue = array();
 
+	/**
+	* Notification Method Base Constructor
+	* 
+	* @param phpbb_user_loader $user_loader
+	* @param phpbb_db_driver $db
+	* @param phpbb_cache_driver_interface $cache
+	* @param mixed $user
+	* @param phpbb_auth $auth
+	* @param phpbb_config $config
+	* @param mixed $phpbb_root_path
+	* @param mixed $php_ext
+	* @return phpbb_notification_method_base
+	*/
 	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
 		$this->user_loader = $user_loader;
@@ -73,6 +86,11 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 		$this->php_ext = $php_ext;
 	}
 
+	/**
+	* Set notification manager (required)
+	* 
+	* @param phpbb_notification_manager $notification_manager
+	*/
 	public function set_notification_manager(phpbb_notification_manager $notification_manager)
 	{
 		$this->notification_manager = $notification_manager;
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 315bcb04c9..f52f14c09e 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -22,40 +22,43 @@ if (!defined('IN_PHPBB'))
 abstract class phpbb_notification_type_base implements phpbb_notification_type_interface
 {
 	/** @var phpbb_notification_manager */
-	protected $notification_manager = null;
+	protected $notification_manager;
 
 	/** @var phpbb_user_loader */
-	protected $user_loader = null;
+	protected $user_loader;
 
 	/** @var phpbb_db_driver */
-	protected $db = null;
+	protected $db;
 
 	/** @var phpbb_cache_service */
-	protected $cache = null;
+	protected $cache;
 
 	/** @var phpbb_template */
-	protected $template = null;
+	protected $template;
 
 	/** @var phpbb_user */
-	protected $user = null;
+	protected $user;
 
 	/** @var phpbb_auth */
-	protected $auth = null;
+	protected $auth;
 
 	/** @var phpbb_config */
-	protected $config = null;
+	protected $config;
 
 	/** @var string */
-	protected $phpbb_root_path = null;
+	protected $phpbb_root_path;
 
 	/** @var string */
-	protected $php_ext = null;
+	protected $php_ext;
 
 	/** @var string */
-	protected $notifications_table = null;
+	protected $notification_types_table;
 
 	/** @var string */
-	protected $user_notifications_table = null;
+	protected $notifications_table;
+
+	/** @var string */
+	protected $user_notifications_table;
 
 	/**
 	* Notification option data (for outputting to the user)
@@ -80,7 +83,23 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	private $data = array();
 
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
+	/**
+	* Notification Type Base Constructor
+	* 
+	* @param phpbb_user_loader $user_loader
+	* @param phpbb_db_driver $db
+	* @param phpbb_cache_driver_interface $cache
+	* @param phpbb_user $user
+	* @param phpbb_auth $auth
+	* @param phpbb_config $config
+	* @param string $phpbb_root_path
+	* @param string $php_ext
+	* @param string $notification_types_table
+	* @param string $notifications_table
+	* @param string $user_notifications_table
+	* @return phpbb_notification_type_base
+	*/
+	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
@@ -92,10 +111,16 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 
+		$this->notification_types_table = $notification_types_table;
 		$this->notifications_table = $notifications_table;
 		$this->user_notifications_table = $user_notifications_table;
 	}
 
+	/**
+	* Set notification manager (required)
+	* 
+	* @param phpbb_notification_manager $notification_manager
+	*/
 	public function set_notification_manager(phpbb_notification_manager $notification_manager)
 	{
 		$this->notification_manager = $notification_manager;
@@ -113,16 +138,38 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		$this->data['notification_data'] = (isset($this->data['notification_data'])) ? unserialize($this->data['notification_data']) : array();
 	}
 
+	/**
+	* Magic method to get data from this notification
+	* 
+	* @param mixed $name
+	* @return mixed
+	*/
 	public function __get($name)
 	{
 		return (!isset($this->data[$name])) ? null : $this->data[$name];
 	}
 
+
+	/**
+	* Magic method to set data on this notification
+	* 
+	* @param mixed $name
+	* @return mixed
+	*/
 	public function __set($name, $value)
 	{
 		$this->data[$name] = $value;
 	}
 
+
+	/**
+	* Magic method to get a string of this notification
+	* 
+	* Primarily for testing
+	* 
+	* @param string $name
+	* @return mixed
+	*/
 	public function __toString()
 	{
 		return (!empty($this->data)) ? var_export($this->data, true) : $this->get_type();
@@ -132,7 +179,6 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* Get special data (only important for the classes that extend this)
 	*
 	* @param string $name Name of the variable to get
-	*
 	* @return mixed
 	*/
 	protected function get_data($name)
@@ -157,7 +203,6 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*
 	* @param array $type_data Data unique to this notification type
 	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
 	* @return array Array of data ready to be inserted into the database
 	*/
 	public function create_insert_array($type_data, $pre_create_data = array())
@@ -186,7 +231,6 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* (The service handles insertion)
 	*
 	* @param array $type_data Data unique to this notification type
-	*
 	* @return array Array of data ready to be updated in the database
 	*/
 	public function create_update_array($type_data)
@@ -208,7 +252,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* Mark this item read
 	*
 	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
+	* @return string|null If $return is False, nothing will be returned, else the sql code to update this item
 	*/
 	public function mark_read($return = false)
 	{
@@ -219,7 +263,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* Mark this item unread
 	*
 	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
+	* @return string|null If $return is False, nothing will be returned, else the sql code to update this item
 	*/
 	public function mark_unread($return = false)
 	{
@@ -228,6 +272,8 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 	/**
 	* Prepare to output the notification to the template
+	* 
+	* @return array Template variables
 	*/
 	public function prepare_for_display()
 	{
@@ -274,6 +320,8 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 	/**
 	* Get the user's avatar (fall back)
+	* 
+	* @return string
 	*/
 	public function get_avatar()
 	{
@@ -282,6 +330,8 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 	/**
 	* Get the special items to load (fall back)
+	* 
+	* @return array
 	*/
 	public function get_load_special()
 	{
@@ -298,6 +348,8 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 	/**
 	* Is available (fall back)
+	* 
+	* @return bool
 	*/
 	public function is_available()
 	{
@@ -306,6 +358,8 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 
 	/**
 	* Pre create insert array function (fall back)
+	* 
+	* @return array
 	*/
 	public function pre_create_insert_array($type_data, $notify_users)
 	{
@@ -398,7 +452,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*
 	* @param bool $unread Unread (True/False) (Default: False)
 	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
+	* @return string|null If $return is False, nothing will be returned, else the sql code to update this item
 	*/
 	protected function mark($unread = true, $return = false)
 	{
-- 
cgit v1.2.1


From f089e099fed38b1bdae5316fb09f0c8ed847d495 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 15 Jan 2013 12:29:20 -0600
Subject: [ticket/11103] Including the set call in the declaration throws
 errors

Call the set_notification_manager from the load_object function instead.

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index a289ec0dfa..5c1016335a 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -841,6 +841,13 @@ class phpbb_notification_manager
 	*/
 	protected function load_object($object_name)
 	{
-		return $this->phpbb_container->get($object_name);
+		$object = $this->phpbb_container->get($object_name);
+		
+		if (method_exists($object, 'set_notification_manager'))
+		{
+			$object->set_notification_manager($this);
+		}
+		
+		return $object;
 	}
 }
-- 
cgit v1.2.1


From bd499425522a61ddd617e9ac4cfed9a7859bf949 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 15 Jan 2013 12:54:39 -0600
Subject: [ticket/11103] Correcting constructor comments

PHPBB3-11103
---
 phpBB/includes/notification/method/base.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index c4c0a64ae0..22418c9be8 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -67,11 +67,11 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	* @param phpbb_user_loader $user_loader
 	* @param phpbb_db_driver $db
 	* @param phpbb_cache_driver_interface $cache
-	* @param mixed $user
+	* @param phpbb_user $user
 	* @param phpbb_auth $auth
 	* @param phpbb_config $config
-	* @param mixed $phpbb_root_path
-	* @param mixed $php_ext
+	* @param string $phpbb_root_path
+	* @param string $php_ext
 	* @return phpbb_notification_method_base
 	*/
 	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
-- 
cgit v1.2.1


From 37014abd022be4f7824a590b93a329f74aef442c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 16 Jan 2013 14:18:09 +0100
Subject: [ticket/10714] Fix several comments and variable names

PHPBB3-10714
---
 phpBB/includes/log/interface.php | 20 +++++-----
 phpBB/includes/log/log.php       | 85 +++++++++++++++++++---------------------
 2 files changed, 52 insertions(+), 53 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/interface.php b/phpBB/includes/log/interface.php
index b85dc3a474..254b65cb19 100644
--- a/phpBB/includes/log/interface.php
+++ b/phpBB/includes/log/interface.php
@@ -25,40 +25,42 @@ interface phpbb_log_interface
 	/**
 	* This function returns the state of the log system.
 	*
-	* @param	string	$type	The log type we want to check. Empty to get global log status.
+	* @param	string	$type	The log type we want to check. Empty to get
+	*							global log status.
 	*
 	* @return	bool	True if log for the type is enabled
 	*/
 	public function is_enabled($type = '');
 
 	/**
-	* This function allows disable the log system. When add_log is called, the log will not be added to the database.
+	* This function allows disabling the log system. When add_log is called
+	* and the type is disabled, the log will not be added to the database.
 	*
-	* @param	mixed	$type	The log type we want to disable. Empty to disable all logs.
-	*							Can also be an array of types
+	* @param	mixed	$type	The log type we want to disable. Empty to
+	*						disable all logs. Can also be an array of types.
 	*
 	* @return	null
 	*/
 	public function disable($type = '');
 
 	/**
-	* This function allows re-enable the log system.
+	* This function allows re-enabling the log system.
 	*
-	* @param	mixed	$type	The log type we want to enable. Empty to enable all logs.
-	*							Can also be an array of types
+	* @param	mixed	$type	The log type we want to enable. Empty to
+	*						enable all logs. Can also be an array of types.
 	*
 	* @return	null
 	*/
 	public function enable($type = '');
 
 	/**
-	* Adds a log to the database
+	* Adds a log entry to the database
 	*
 	* @param	string	$mode				The mode defines which log_type is used and in which log the entry is displayed.
 	* @param	int		$user_id			User ID of the user
 	* @param	string	$log_ip				IP address of the user
 	* @param	string	$log_operation		Name of the operation
-	* @param	int		$log_time			Timestamp when the log was added.
+	* @param	int		$log_time			Timestamp when the log entry was added.
 	* @param	array	$additional_data	More arguments can be added, depending on the log_type
 	*
 	* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 521a998d8e..0ee3c9561f 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -23,19 +23,21 @@ if (!defined('IN_PHPBB'))
 class phpbb_log implements phpbb_log_interface
 {
 	/**
-	* Keeps the status of the log system. Is the log enabled or disabled?
+	* An array with the disabled log types. Logs of such types will not be
+	* added when add_log() is called.
+	* @var array
 	*/
-	protected $disabled_logs;
+	protected $disabled_types;
 
 	/**
 	* Keeps the total log count of the last call to get_logs()
 	*/
-	protected $logs_total;
+	protected $entry_count;
 
 	/**
 	* Keeps the offset of the last valid page of the last call to get_logs()
 	*/
-	protected $logs_offset;
+	protected $last_page_offset;
 
 	/**
 	* The table we use to store our logs.
@@ -111,7 +113,8 @@ class phpbb_log implements phpbb_log_interface
 	}
 
 	/**
-	* Set phpbb_admin_path and is_in_admin in order to return administrative user profile links in get_logs()
+	* Set phpbb_admin_path and is_in_admin in order to return administrative
+	* user profile links in get_logs()
 	*
 	* @param	string	$phpbb_admin_path	Full path from current file to admin root
 	* @param	bool	$is_in_admin		Are we called from within the acp?
@@ -137,26 +140,22 @@ class phpbb_log implements phpbb_log_interface
 	/**
 	* This function returns the state of the log system.
 	*
-	* @param	string	$type	The log type we want to check. Empty to get global log status.
-	*
-	* @return	bool	True if log for the type is enabled
+	* {@inheritDoc}
 	*/
 	public function is_enabled($type = '')
 	{
 		if ($type == '' || $type == 'all')
 		{
-			return !isset($this->disabled_logs['all']);
+			return !isset($this->disabled_types['all']);
 		}
-		return !isset($this->disabled_logs[$type]) && !isset($this->disabled_logs['all']);
+		return !isset($this->disabled_types[$type]) && !isset($this->disabled_types['all']);
 	}
 
 	/**
-	* This function allows disable the log system. When add_log is called, the log will not be added to the database.
-	*
-	* @param	mixed	$type	The log type we want to enable. Empty to disable all logs.
-	*							Can also be an array of types
+	* This function allows disabling the log system. When add_log is called
+	* and the type is disabled, the log will not be added to the database.
 	*
-	* @return	null
+	* {@inheritDoc}
 	*/
 	public function disable($type = '')
 	{
@@ -169,20 +168,18 @@ class phpbb_log implements phpbb_log_interface
 			return;
 		}
 
-		if ($type == '' || $type == 'all')
+		// Empty string is an equivalent for all types.
+		if ($type == '')
 		{
-			$this->disabled_logs['all'] = true;
-			return;
+			$type = 'all';
 		}
-		$this->disabled_logs[$type] = true;
+		$this->disabled_types[$type] = true;
 	}
 
 	/**
-	* This function allows re-enable the log system.
-	*
-	* @param	mixed	$type	The log type we want to enable. Empty to enable all logs.
+	* This function allows re-enabling the log system.
 	*
-	* @return	null
+	* {@inheritDoc}
 	*/
 	public function enable($type = '')
 	{
@@ -197,10 +194,10 @@ class phpbb_log implements phpbb_log_interface
 
 		if ($type == '' || $type == 'all')
 		{
-			$this->disabled_logs = array();
+			$this->disabled_types = array();
 			return;
 		}
-		unset($this->disabled_logs[$type]);
+		unset($this->disabled_types[$type]);
 	}
 
 	/**
@@ -269,7 +266,7 @@ class phpbb_log implements phpbb_log_interface
 		}
 
 		/**
-		* Allow to modify log data before we add them to the database
+		* Allows to modify log data before we add it to the database
 		*
 		* NOTE: if sql_ary does not contain a log_type value, the entry will
 		* not be stored in the database. So ensure to set it, if needed.
@@ -307,8 +304,8 @@ class phpbb_log implements phpbb_log_interface
 	*/
 	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '')
 	{
-		$this->logs_total = 0;
-		$this->logs_offset = $offset;
+		$this->entry_count = 0;
+		$this->last_page_offset = $offset;
 
 		$topic_id_list = $reportee_id_list = array();
 
@@ -389,7 +386,7 @@ class phpbb_log implements phpbb_log_interface
 
 		if ($log_type === false)
 		{
-			$this->logs_offset = 0;
+			$this->last_page_offset = 0;
 			return array();
 		}
 
@@ -410,20 +407,20 @@ class phpbb_log implements phpbb_log_interface
 					$sql_keywords
 					$sql_additional";
 			$result = $this->db->sql_query($sql);
-			$this->logs_total = (int) $this->db->sql_fetchfield('total_entries');
+			$this->entry_count = (int) $this->db->sql_fetchfield('total_entries');
 			$this->db->sql_freeresult($result);
 
-			if ($this->logs_total == 0)
+			if ($this->entry_count == 0)
 			{
 				// Save the queries, because there are no logs to display
-				$this->logs_offset = 0;
+				$this->last_page_offset = 0;
 				return array();
 			}
 
 			// Return the user to the last page that is valid
-			while ($this->logs_offset >= $this->logs_total)
+			while ($this->last_page_offset >= $this->entry_count)
 			{
-				$this->logs_offset = max(0, $this->logs_offset - $limit);
+				$this->last_page_offset = max(0, $this->last_page_offset - $limit);
 			}
 		}
 
@@ -435,7 +432,7 @@ class phpbb_log implements phpbb_log_interface
 				$sql_keywords
 				$sql_additional
 			ORDER BY $sort_by";
-		$result = $this->db->sql_query_limit($sql, $limit, $this->logs_offset);
+		$result = $this->db->sql_query_limit($sql, $limit, $this->last_page_offset);
 
 		$i = 0;
 		$log = array();
@@ -487,7 +484,7 @@ class phpbb_log implements phpbb_log_interface
 
 			if (!empty($row['log_data']))
 			{
-				$log_data_ary = @unserialize($row['log_data']);
+				$log_data_ary = unserialize($row['log_data']);
 				$log_data_ary = ($log_data_ary !== false) ? $log_data_ary : array();
 
 				if (isset($this->user->lang[$row['log_operation']]))
@@ -571,13 +568,13 @@ class phpbb_log implements phpbb_log_interface
 	}
 
 	/**
-	* Generates a sql condition out of the specified keywords
+	* Generates a sql condition for the specified keywords
 	*
 	* @param	string	$keywords	The keywords the user specified to search for
 	*
 	* @return	string		Returns the SQL condition searching for the keywords
 	*/
-	private function generate_sql_keyword($keywords)
+	protected function generate_sql_keyword($keywords)
 	{
 		// Use no preg_quote for $keywords because this would lead to sole backslashes being added
 		// We also use an OR connection here for spaces and the | string. Currently, regex is not supported for searching (but may come later).
@@ -630,7 +627,7 @@ class phpbb_log implements phpbb_log_interface
 	*							),
 	*						),
 	*/
-	private function get_topic_auth($topic_ids)
+	protected function get_topic_auth(array $topic_ids)
 	{
 		$forum_auth = array('f_read' => array(), 'm_' => array());
 		$topic_ids = array_unique($topic_ids);
@@ -667,7 +664,7 @@ class phpbb_log implements phpbb_log_interface
 	*
 	* @return	array		Returns an array with the reportee data
 	*/
-	private function get_reportee_data($reportee_ids)
+	protected function get_reportee_data(array $reportee_ids)
 	{
 		$reportee_ids = array_unique($reportee_ids);
 		$reportee_data_list = array();
@@ -689,20 +686,20 @@ class phpbb_log implements phpbb_log_interface
 	/**
 	* Get total log count
 	*
-	* @return	int			Returns the number of matching logs from the last call to get_logs()
+	* {@inheritDoc}
 	*/
 	public function get_log_count()
 	{
-		return ($this->logs_total) ? $this->logs_total : 0;
+		return ($this->entry_count) ? $this->entry_count : 0;
 	}
 
 	/**
 	* Get offset of the last valid log page
 	*
-	* @return	int			Returns the offset of the last valid page from the last call to get_logs()
+	* {@inheritDoc}
 	*/
 	public function get_valid_offset()
 	{
-		return ($this->logs_offset) ? $this->logs_offset : 0;
+		return ($this->last_page_offset) ? $this->last_page_offset : 0;
 	}
 }
-- 
cgit v1.2.1


From 786e2438d5138213447003272b36b4185cad2b42 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 16 Jan 2013 16:23:41 +0100
Subject: [ticket/10714] Use new core.adm_relative_path to create the object.

PHPBB3-10714
---
 phpBB/includes/log/log.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 0ee3c9561f..092fdb6a89 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -94,35 +94,40 @@ class phpbb_log implements phpbb_log_interface
 	* @param	phpbb_auth		$auth	Auth object
 	* @param	phpbb_dispatcher	$phpbb_dispatcher	Event dispatcher
 	* @param	string		$phpbb_root_path		Root path
+	* @param	string		$relative_admin_path	Relative admin root path
 	* @param	string		$php_ext			PHP Extension
 	* @param	string		$log_table		Name of the table we use to store our logs
 	* @return	null
 	*/
-	public function __construct($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, $php_ext, $log_table)
+	public function __construct($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, $relative_admin_path, $php_ext, $log_table)
 	{
 		$this->db = $db;
 		$this->user = $user;
 		$this->auth = $auth;
 		$this->dispatcher = $phpbb_dispatcher;
 		$this->phpbb_root_path = $phpbb_root_path;
+		$this->phpbb_admin_path = $this->phpbb_root_path . $relative_admin_path;
 		$this->php_ext = $php_ext;
 		$this->log_table = $log_table;
 
+		/*
+		* IN_ADMIN is set after the session was created,
+		* so we need to take ADMIN_START into account aswell, otherwise
+		* it will not work for the phpbb_log object we create in common.php
+		*/
+		$this->set_is_admin((defined('ADMIN_START') && ADMIN_START) || (defined('IN_ADMIN') && IN_ADMIN));
 		$this->enable();
-		$this->set_admin_path('', false);
 	}
 
 	/**
-	* Set phpbb_admin_path and is_in_admin in order to return administrative
-	* user profile links in get_logs()
+	* Set is_in_admin in order to return administrative user profile links
+	* in get_logs()
 	*
-	* @param	string	$phpbb_admin_path	Full path from current file to admin root
 	* @param	bool	$is_in_admin		Are we called from within the acp?
 	* @return	null
 	*/
-	public function set_admin_path($phpbb_admin_path, $is_in_admin)
+	public function set_is_admin($is_in_admin)
 	{
-		$this->phpbb_admin_path = $phpbb_admin_path;
 		$this->is_in_admin = (bool) $is_in_admin;
 	}
 
-- 
cgit v1.2.1


From 3122aeff263b5fee51440ff49274897ccb6ea46f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 17 Jan 2013 14:32:15 +0100
Subject: [ticket/9492] Retain custom ranks and avatars when setting users
 default group

PHPBB3-9492
---
 phpBB/includes/functions_user.php | 83 +++++++++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 30 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 6abcdee8f2..22272b20f3 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -3208,8 +3208,8 @@ function remove_default_avatar($group_id, $user_ids)
 			user_avatar_width = 0,
 			user_avatar_height = 0
 		WHERE group_id = " . (int) $group_id . "
-		AND user_avatar = '" . $db->sql_escape($row['group_avatar']) . "'
-		AND " . $db->sql_in_set('user_id', $user_ids);
+			AND user_avatar = '" . $db->sql_escape($row['group_avatar']) . "'
+			AND " . $db->sql_in_set('user_id', $user_ids);
 
 	$db->sql_query($sql);
 }
@@ -3246,9 +3246,9 @@ function remove_default_rank($group_id, $user_ids)
 	$sql = 'UPDATE ' . USERS_TABLE . '
 		SET user_rank = 0
 		WHERE group_id = ' . (int)$group_id . '
-		AND user_rank <> 0
-		AND user_rank = ' . (int)$row['group_rank'] . '
-		AND ' . $db->sql_in_set('user_id', $user_ids);
+			AND user_rank <> 0
+			AND user_rank = ' . (int)$row['group_rank'] . '
+			AND ' . $db->sql_in_set('user_id', $user_ids);
 	$db->sql_query($sql);
 }
 
@@ -3277,7 +3277,8 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
 		case 'demote':
 		case 'promote':
 
-			$sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . "
+			$sql = 'SELECT user_id
+				FROM ' . USER_GROUP_TABLE . "
 				WHERE group_id = $group_id
 					AND user_pending = 1
 					AND " . $db->sql_in_set('user_id', $user_id_ary);
@@ -3375,7 +3376,8 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
 				return 'NO_USERS';
 			}
 
-			$sql = 'SELECT user_id, group_id FROM ' . USERS_TABLE . '
+			$sql = 'SELECT user_id, group_id
+				FROM ' . USERS_TABLE . '
 				WHERE ' . $db->sql_in_set('user_id', $user_id_ary, false, true);
 			$result = $db->sql_query($sql);
 
@@ -3509,45 +3511,63 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal
 		}
 	}
 
-	// Before we update the user attributes, we will make a list of those having now the group avatar assigned
+	$updated_sql_ary = $sql_ary;
+
+	// Before we update the user attributes, we will update the rank for users that don't have a custom rank
+	if (isset($sql_ary['user_rank']))
+	{
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET ' . $db->sql_build_array('UPDATE', array('user_rank' => $sql_ary['user_rank'])) . '
+			WHERE user_rank = 0
+				AND ' . $db->sql_in_set('user_id', $user_id_ary);
+		$db->sql_query($sql);
+		unset($sql_ary['user_rank']);
+	}
+
+	// Before we update the user attributes, we will update the avatar for users that don't have a custom avatar
 	if (isset($sql_ary['user_avatar']))
 	{
-		// Ok, get the original avatar data from users having an uploaded one (we need to remove these from the filesystem)
-		$sql = 'SELECT user_id, group_id, user_avatar
-			FROM ' . USERS_TABLE . '
-			WHERE ' . $db->sql_in_set('user_id', $user_id_ary) . '
-				AND user_avatar_type = ' . AVATAR_UPLOAD;
-		$result = $db->sql_query($sql);
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET ' . $db->sql_build_array('UPDATE', array(
+				'user_avatar'      => $sql_ary['user_avatar'],
+				'user_avatar_type'    => $sql_ary['user_avatar_type'],
+				'user_avatar_height'  => $sql_ary['user_avatar_height'],
+				'user_avatar_width'    => $sql_ary['user_avatar_width'],
+			)) . "
+			WHERE user_avatar = ''
+				AND " . $db->sql_in_set('user_id', $user_id_ary);
+		$db->sql_query($sql);
 
-		while ($row = $db->sql_fetchrow($result))
-		{
-			avatar_delete('user', $row);
-		}
-		$db->sql_freeresult($result);
+		unset($sql_ary['user_avatar']);
 	}
-	else
+
+	unset($sql_ary['user_avatar_type']);
+	unset($sql_ary['user_avatar_height']);
+	unset($sql_ary['user_avatar_width']);
+
+	if (!empty($sql_ary))
 	{
-		unset($sql_ary['user_avatar_type']);
-		unset($sql_ary['user_avatar_height']);
-		unset($sql_ary['user_avatar_width']);
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+			WHERE ' . $db->sql_in_set('user_id', $user_id_ary);
+		$db->sql_query($sql);
 	}
 
-	$sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-		WHERE ' . $db->sql_in_set('user_id', $user_id_ary);
-	$db->sql_query($sql);
-
 	if (isset($sql_ary['user_colour']))
 	{
 		// Update any cached colour information for these users
-		$sql = 'UPDATE ' . FORUMS_TABLE . " SET forum_last_poster_colour = '" . $db->sql_escape($sql_ary['user_colour']) . "'
+		$sql = 'UPDATE ' . FORUMS_TABLE . "
+			SET forum_last_poster_colour = '" . $db->sql_escape($sql_ary['user_colour']) . "'
 			WHERE " . $db->sql_in_set('forum_last_poster_id', $user_id_ary);
 		$db->sql_query($sql);
 
-		$sql = 'UPDATE ' . TOPICS_TABLE . " SET topic_first_poster_colour = '" . $db->sql_escape($sql_ary['user_colour']) . "'
+		$sql = 'UPDATE ' . TOPICS_TABLE . "
+			SET topic_first_poster_colour = '" . $db->sql_escape($sql_ary['user_colour']) . "'
 			WHERE " . $db->sql_in_set('topic_poster', $user_id_ary);
 		$db->sql_query($sql);
 
-		$sql = 'UPDATE ' . TOPICS_TABLE . " SET topic_last_poster_colour = '" . $db->sql_escape($sql_ary['user_colour']) . "'
+		$sql = 'UPDATE ' . TOPICS_TABLE . "
+			SET topic_last_poster_colour = '" . $db->sql_escape($sql_ary['user_colour']) . "'
 			WHERE " . $db->sql_in_set('topic_last_poster_id', $user_id_ary);
 		$db->sql_query($sql);
 
@@ -3559,6 +3579,9 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal
 		}
 	}
 
+	// Make all values available for the event
+	$sql_ary = $updated_sql_ary;
+
 	/**
 	* Event when the default group is set for an array of users
 	*
-- 
cgit v1.2.1


From 64c27013d4835f9bede202f208679e34fb0ec7bf Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 17 Jan 2013 14:40:58 +0100
Subject: [ticket/9492] Fix undefined user_avatar_* values when updating the
 group avatar

PHPBB3-9492
---
 phpBB/includes/functions_user.php | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 22272b20f3..3b7c9eea92 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -3525,25 +3525,31 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal
 	}
 
 	// Before we update the user attributes, we will update the avatar for users that don't have a custom avatar
+	$avatar_options = array('user_avatar', 'user_avatar_type', 'user_avatar_height', 'user_avatar_width');
+
 	if (isset($sql_ary['user_avatar']))
 	{
+		$avatar_sql_ary = array();
+		foreach ($avatar_options as $avatar_option)
+		{
+			if (isset($sql_ary[$avatar_option]))
+			{
+				$avatar_sql_ary[$avatar_option] = $sql_ary[$avatar_option];
+				}
+			}
+
 		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET ' . $db->sql_build_array('UPDATE', array(
-				'user_avatar'      => $sql_ary['user_avatar'],
-				'user_avatar_type'    => $sql_ary['user_avatar_type'],
-				'user_avatar_height'  => $sql_ary['user_avatar_height'],
-				'user_avatar_width'    => $sql_ary['user_avatar_width'],
-			)) . "
+			SSET ' . $db->sql_build_array('UPDATE', $avatar_sql_ary) . "
 			WHERE user_avatar = ''
 				AND " . $db->sql_in_set('user_id', $user_id_ary);
 		$db->sql_query($sql);
-
-		unset($sql_ary['user_avatar']);
 	}
 
-	unset($sql_ary['user_avatar_type']);
-	unset($sql_ary['user_avatar_height']);
-	unset($sql_ary['user_avatar_width']);
+	// Remove the avatar options, as we already updated them
+	foreach ($avatar_options as $avatar_option)
+	{
+		unset($sql_ary[$avatar_option]);
+	}
 
 	if (!empty($sql_ary))
 	{
-- 
cgit v1.2.1


From bd87b068587a519b4a6275209525e069e7690ded Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 17 Jan 2013 14:43:00 +0100
Subject: [ticket/9492] Ensure to update all avatar values when the avatar is
 changed

PHPBB3-9492
---
 phpBB/includes/acp/acp_groups.php | 2 +-
 phpBB/includes/ucp/ucp_groups.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index b604e20094..9145a20400 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -439,7 +439,7 @@ class acp_groups
 
 						foreach ($test_variables as $test => $type)
 						{
-							if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || in_array($test, $set_attributes)))
+							if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || isset($group_attributes['group_avatar']) && strpos($test, 'avatar') === 0 || in_array($test, $set_attributes)))
 							{
 								settype($submit_ary[$test], $type);
 								$group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test];
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index d92aea91f8..b9a06bc3b4 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -618,7 +618,7 @@ class ucp_groups
 
 								foreach ($test_variables as $test => $type)
 								{
-									if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test]))
+									if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || isset($group_attributes['group_avatar']) && strpos($test, 'avatar') === 0))
 									{
 										settype($submit_ary[$test], $type);
 										$group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test];
-- 
cgit v1.2.1


From 9a6219d8b391eedbbd5626f845b00c3acd738e12 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 17 Jan 2013 14:45:40 +0100
Subject: [ticket/9492] Ensure to delete the avatar/rank data when we change it

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 3b7c9eea92..d47e04cbe5 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2698,12 +2698,12 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 			}
 			$db->sql_freeresult($result);
 
-			if (isset($sql_ary['group_avatar']) && !$sql_ary['group_avatar'])
+			if (isset($sql_ary['group_avatar']))
 			{
 				remove_default_avatar($group_id, $user_ary);
 			}
 
-			if (isset($sql_ary['group_rank']) && !$sql_ary['group_rank'])
+			if (isset($sql_ary['group_rank']))
 			{
 				remove_default_rank($group_id, $user_ary);
 			}
-- 
cgit v1.2.1


From 6a972da4c7d0cc8008ff95d41b5fb71cb17e107e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 20 Jan 2013 20:58:46 +0100
Subject: [ticket/9492] Fix typo in SQL query

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index d47e04cbe5..b7878ddfc7 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -3539,7 +3539,7 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal
 			}
 
 		$sql = 'UPDATE ' . USERS_TABLE . '
-			SSET ' . $db->sql_build_array('UPDATE', $avatar_sql_ary) . "
+			SET ' . $db->sql_build_array('UPDATE', $avatar_sql_ary) . "
 			WHERE user_avatar = ''
 				AND " . $db->sql_in_set('user_id', $user_id_ary);
 		$db->sql_query($sql);
-- 
cgit v1.2.1


From c0ab3f3ddddefa8f902ffa57c864e6db5bf1f440 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 22 Jan 2013 15:45:20 +0100
Subject: [ticket/10714] Fix several doc blocks and comments

PHPBB3-10714
---
 phpBB/includes/functions_admin.php |  4 ++--
 phpBB/includes/log/interface.php   | 10 +++++-----
 phpBB/includes/log/log.php         |  5 ++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 18b11182d0..60591e98d3 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2489,12 +2489,12 @@ function cache_moderators()
 /**
 * View log
 *
-* @param	string	$mode			The mode defines which log_type is used and in which log the entry is displayed.
+* @param	string	$mode			The mode defines which log_type is used and from which log the entry is retrieved
 * @param	array	&$log			The result array with the logs
 * @param	mixed	&$log_count		If $log_count is set to false, we will skip counting all entries in the database.
 *									Otherwise an integer with the number of total matching entries is returned.
 * @param	int		$limit			Limit the number of entries that are returned
-* @param	int		$offset			Offset when fetching the log entries, f.e. on paginations
+* @param	int		$offset			Offset when fetching the log entries, f.e. when paginating
 * @param	mixed	$forum_id		Restrict the log entries to the given forum_id (can also be an array of forum_ids)
 * @param	int		$topic_id		Restrict the log entries to the given topic_id
 * @param	int		$user_id		Restrict the log entries to the given user_id
diff --git a/phpBB/includes/log/interface.php b/phpBB/includes/log/interface.php
index 254b65cb19..24bf412ce0 100644
--- a/phpBB/includes/log/interface.php
+++ b/phpBB/includes/log/interface.php
@@ -56,24 +56,24 @@ interface phpbb_log_interface
 	/**
 	* Adds a log entry to the database
 	*
-	* @param	string	$mode				The mode defines which log_type is used and in which log the entry is displayed.
+	* @param	string	$mode				The mode defines which log_type is used and from which log the entry is retrieved
 	* @param	int		$user_id			User ID of the user
 	* @param	string	$log_ip				IP address of the user
 	* @param	string	$log_operation		Name of the operation
-	* @param	int		$log_time			Timestamp when the log entry was added.
+	* @param	int		$log_time			Timestamp when the log entry was added, if empty time() will be used
 	* @param	array	$additional_data	More arguments can be added, depending on the log_type
 	*
 	* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
 	*/
-	public function add($mode, $user_id, $log_ip, $log_operation, $log_time, $additional_data);
+	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array());
 
 	/**
 	* Grab the logs from the database
 	*
-	* @param	string	$mode			The mode defines which log_type is used and in which log the entry is displayed.
+	* @param	string	$mode			The mode defines which log_type is used and ifrom which log the entry is retrieved
 	* @param	bool	$count_logs		Shall we count all matching log entries?
 	* @param	int		$limit			Limit the number of entries that are returned
-	* @param	int		$offset			Offset when fetching the log entries, f.e. on paginations
+	* @param	int		$offset			Offset when fetching the log entries, f.e. when paginating
 	* @param	mixed	$forum_id		Restrict the log entries to the given forum_id (can also be an array of forum_ids)
 	* @param	int		$topic_id		Restrict the log entries to the given topic_id
 	* @param	int		$user_id		Restrict the log entries to the given user_id
diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 092fdb6a89..33c558695c 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -31,16 +31,19 @@ class phpbb_log implements phpbb_log_interface
 
 	/**
 	* Keeps the total log count of the last call to get_logs()
+	* @var int
 	*/
 	protected $entry_count;
 
 	/**
 	* Keeps the offset of the last valid page of the last call to get_logs()
+	* @var int
 	*/
 	protected $last_page_offset;
 
 	/**
 	* The table we use to store our logs.
+	* @var string
 	*/
 	protected $log_table;
 
@@ -112,7 +115,7 @@ class phpbb_log implements phpbb_log_interface
 
 		/*
 		* IN_ADMIN is set after the session was created,
-		* so we need to take ADMIN_START into account aswell, otherwise
+		* so we need to take ADMIN_START into account as well, otherwise
 		* it will not work for the phpbb_log object we create in common.php
 		*/
 		$this->set_is_admin((defined('ADMIN_START') && ADMIN_START) || (defined('IN_ADMIN') && IN_ADMIN));
-- 
cgit v1.2.1


From ffde887aadfcb9d3db2c42cf09e22745e5d62430 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 22 Jan 2013 15:46:48 +0100
Subject: [ticket/10714] Cast values to integer before using them in the query

PHPBB3-10714
---
 phpBB/includes/log/log.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 33c558695c..841612f7bd 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -408,10 +408,10 @@ class phpbb_log implements phpbb_log_interface
 		if ($count_logs)
 		{
 			$sql = 'SELECT COUNT(l.log_id) AS total_entries
-				FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . " u
-				WHERE l.log_type = $log_type
+				FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . ' u
+				WHERE l.log_type = ' . (int) $log_type . '
 					AND l.user_id = u.user_id
-					AND l.log_time >= $log_time
+					AND l.log_time >= ' . (int) $log_time . "
 					$sql_keywords
 					$sql_additional";
 			$result = $this->db->sql_query($sql);
@@ -433,10 +433,10 @@ class phpbb_log implements phpbb_log_interface
 		}
 
 		$sql = 'SELECT l.*, u.username, u.username_clean, u.user_colour
-			FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . " u
-			WHERE l.log_type = $log_type
+			FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . ' u
+			WHERE l.log_type = ' . (int) $log_type . '
 				AND u.user_id = l.user_id
-				" . (($log_time) ? "AND l.log_time >= $log_time" : '') . "
+				' . (($log_time) ? 'AND l.log_time >= ' . (int) $log_time : '') . "
 				$sql_keywords
 				$sql_additional
 			ORDER BY $sort_by";
-- 
cgit v1.2.1


From c2504e9300608feea540ab162e4cc0ac79cda7a0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 22 Jan 2013 15:56:34 +0100
Subject: [ticket/10714] Fix more comments

PHPBB3-10714
---
 phpBB/includes/log/log.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 841612f7bd..09dff10ae5 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -497,8 +497,10 @@ class phpbb_log implements phpbb_log_interface
 
 				if (isset($this->user->lang[$row['log_operation']]))
 				{
-					// Check if there are more occurrences of % than arguments, if there are we fill out the arguments array
-					// It doesn't matter if we add more arguments than placeholders
+					// Check if there are more occurrences of % than
+					// arguments, if there are we fill out the arguments
+					// array. It doesn't matter if we add more arguments than
+					// placeholders.
 					if ((substr_count($log[$i]['action'], '%') - sizeof($log_data_ary)) > 0)
 					{
 						$log_data_ary = array_merge($log_data_ary, array_fill(0, substr_count($log[$i]['action'], '%') - sizeof($log_data_ary), ''));
@@ -507,7 +509,7 @@ class phpbb_log implements phpbb_log_interface
 					$log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary);
 
 					// If within the admin panel we do not censor text out
-					if (defined('IN_ADMIN'))
+					if ($this->is_in_admin)
 					{
 						$log[$i]['action'] = bbcode_nl2br($log[$i]['action']);
 					}
@@ -584,8 +586,10 @@ class phpbb_log implements phpbb_log_interface
 	*/
 	protected function generate_sql_keyword($keywords)
 	{
-		// Use no preg_quote for $keywords because this would lead to sole backslashes being added
-		// We also use an OR connection here for spaces and the | string. Currently, regex is not supported for searching (but may come later).
+		// Use no preg_quote for $keywords because this would lead to sole
+		// backslashes being added. We also use an OR connection here for
+		// spaces and the | string. Currently, regex is not supported for
+		// searching (but may come later).
 		$keywords = preg_split('#[\s|]+#u', utf8_strtolower($keywords), 0, PREG_SPLIT_NO_EMPTY);
 		$sql_keywords = '';
 
-- 
cgit v1.2.1


From d5d282005c74a4b9539c3b37d3df723ba6e2c456 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 22 Jan 2013 16:47:05 +0100
Subject: [ticket/10714] Add getter for is_in_admin and use it

PHPBB3-10714
---
 phpBB/includes/log/log.php | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 09dff10ae5..8da8b63391 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -22,6 +22,13 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_log implements phpbb_log_interface
 {
+	/**
+	* If set, administrative user profile links will be returned and messages
+	* will not be censored.
+	* @var bool
+	*/
+	protected $is_in_admin;
+
 	/**
 	* An array with the disabled log types. Logs of such types will not be
 	* added when add_log() is called.
@@ -114,7 +121,7 @@ class phpbb_log implements phpbb_log_interface
 		$this->log_table = $log_table;
 
 		/*
-		* IN_ADMIN is set after the session was created,
+		* IN_ADMIN is set after the session is created,
 		* so we need to take ADMIN_START into account as well, otherwise
 		* it will not work for the phpbb_log object we create in common.php
 		*/
@@ -134,6 +141,16 @@ class phpbb_log implements phpbb_log_interface
 		$this->is_in_admin = (bool) $is_in_admin;
 	}
 
+	/**
+	* Returns the is_in_admin option
+	*
+	* @return	bool
+	*/
+	public function get_is_admin()
+	{
+		return $this->is_in_admin;
+	}
+
 	/**
 	* Set table name
 	*
@@ -317,7 +334,7 @@ class phpbb_log implements phpbb_log_interface
 
 		$topic_id_list = $reportee_id_list = array();
 
-		$profile_url = ($this->is_in_admin && $this->phpbb_admin_path) ? append_sid("{$this->phpbb_admin_path}index.{$this->php_ext}", 'i=users&amp;mode=overview') : append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=viewprofile');
+		$profile_url = ($this->get_is_admin() && $this->phpbb_admin_path) ? append_sid("{$this->phpbb_admin_path}index.{$this->php_ext}", 'i=users&amp;mode=overview') : append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=viewprofile');
 
 		switch ($mode)
 		{
@@ -509,7 +526,7 @@ class phpbb_log implements phpbb_log_interface
 					$log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary);
 
 					// If within the admin panel we do not censor text out
-					if ($this->is_in_admin)
+					if ($this->get_is_admin())
 					{
 						$log[$i]['action'] = bbcode_nl2br($log[$i]['action']);
 					}
-- 
cgit v1.2.1


From 79356f54415f901a8ff743817121216cbefb16ee Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 22 Jan 2013 17:21:49 +0100
Subject: [feature/avatars] Add compatibility function for get_user_avatar()

PHPBB3-10018
---
 phpBB/includes/functions_compatibility.php | 41 ++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 phpBB/includes/functions_compatibility.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
new file mode 100644
index 0000000000..68298449c1
--- /dev/null
+++ b/phpBB/includes/functions_compatibility.php
@@ -0,0 +1,41 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Get user avatar
+*
+* @param string $avatar Users assigned avatar name
+* @param int $avatar_type Type of avatar
+* @param string $avatar_width Width of users avatar
+* @param string $avatar_height Height of users avatar
+* @param string $alt Optional language string for alt tag within image, can be a language key or text
+* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
+*
+* @return string Avatar image
+*/
+function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false)
+{
+	// map arguments to new function phpbb_get_avatar()
+	$row = array(
+		'avatar'		=> $avatar,
+		'avatar_type'	=> $avatar_type,
+		'avatar_width'	=> $avatar_width,
+		'avatar_height'	=> $avatar_height,
+	);
+
+	return phpbb_get_avatar($row, $alt, $ignore_config);
+}
-- 
cgit v1.2.1


From dfabdbca508a3fbd60c8df57ea756a974f4f135b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 22 Jan 2013 13:19:49 -0600
Subject: [ticket/9737] Fix a few minor things in migrations

PHPBB3-9737
---
 phpBB/includes/db/migration/exception.php | 7 ++++++-
 phpBB/includes/db/migrator.php            | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/exception.php b/phpBB/includes/db/migration/exception.php
index bd46a4e064..ffdcd97780 100644
--- a/phpBB/includes/db/migration/exception.php
+++ b/phpBB/includes/db/migration/exception.php
@@ -22,7 +22,10 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_db_migration_exception extends \Exception
 {
-	/** @var array Extra parameters sent to exception to aid in debugging */
+	/**
+	* Extra parameters sent to exception to aid in debugging
+	* @var array
+	*/
 	protected $parameters;
 
 	/**
@@ -42,6 +45,8 @@ class phpbb_db_migration_exception extends \Exception
 
 	/**
 	* Output the error as a string
+	*
+	* @return string
 	*/
 	public function __toString()
 	{
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index d95283ae01..4456600b0a 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -394,7 +394,7 @@ class phpbb_db_migrator
 	}
 
 	/**
-	* Attempts to apply a step of the given migration or one of its dependencies
+	* Attempts to revert a step of the given migration or one of its dependencies
 	*
 	* @param	string	The class name of the migration
 	* @return	bool	Whether any update step was successfully run
@@ -559,12 +559,12 @@ class phpbb_db_migrator
 	/**
 	* Get a callable statement from a data step
 	*
-	* @param mixed $step Data step from migration
+	* @param array $step Data step from migration
 	* @param mixed $last_result Result to pass to the callable (only for 'custom' method)
 	* @param bool $reverse False to install, True to attempt uninstallation by reversing the call
 	* @return array Array with parameters for call_user_func_array(), 0 is the callable, 1 is parameters
 	*/
-	protected function get_callable_from_step($step, $last_result = false, $reverse = false)
+	protected function get_callable_from_step(array $step, $last_result = false, $reverse = false)
 	{
 		$type = $step[0];
 		$parameters = $step[1];
-- 
cgit v1.2.1


From e841453d03003ff0f2c932f5936c17739476ef4f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 22 Jan 2013 21:05:31 +0100
Subject: [feature/avatars] Add note about when compatibility function was
 added

PHPBB3-10018
---
 phpBB/includes/functions_compatibility.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index 68298449c1..11ef982a40 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -17,7 +17,8 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Get user avatar
-*
+* Added in phpBB 3.1.0-A1
+* 
 * @param string $avatar Users assigned avatar name
 * @param int $avatar_type Type of avatar
 * @param string $avatar_width Width of users avatar
-- 
cgit v1.2.1


From e8fd8b9a4b37f7d7d3955cd2b0d79139a2c0222d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 22 Jan 2013 22:40:53 +0100
Subject: [ticket/10714] Fix missing parameter and global phpbb_log in unit
 tests

PHPBB3-10714
---
 phpBB/includes/functions_container.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index a3ed21c35b..36c5ad507e 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -57,6 +57,7 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext)
 	$container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext);
 
 	$container->setParameter('core.root_path', $phpbb_root_path);
+	$container->setParameter('core.adm_relative_path', 'adm/');
 	$container->setParameter('core.php_ext', $php_ext);
 	$container->setParameter('core.table_prefix', '');
 
-- 
cgit v1.2.1


From 447e845274daedd12bc40f813680fb5df64d114a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 23 Jan 2013 00:21:01 +0100
Subject: [ticket/10714] Remove fallback code from previous commits and move
 global

PHPBB3-10714
---
 phpBB/includes/functions.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 590fc15aa7..6f9d8ad8d6 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3512,16 +3512,9 @@ function parse_cfg_file($filename, $lines = false)
 */
 function add_log()
 {
-	global $phpbb_log;
+	global $phpbb_log, $user;
 
 	$args = func_get_args();
-	$log = (isset($args[0])) ? $args[0] : false;
-
-	if ($log === false)
-	{
-		return false;
-	}
-
 	$mode = array_shift($args);
 
 	// This looks kind of dirty, but add_log has some additional data before the log_operation
@@ -3539,11 +3532,10 @@ function add_log()
 			$additional_data['reportee_id'] = array_shift($args);
 		break;
 	}
+
 	$log_operation = array_shift($args);
 	$additional_data = array_merge($additional_data, $args);
 
-	global $user;
-
 	$user_id = (empty($user->data)) ? ANONYMOUS : $user->data['user_id'];
 	$user_ip = (empty($user->ip)) ? '' : $user->ip;
 
-- 
cgit v1.2.1


From 7338bfe3f08b829b97a2045b6bb029dd6b3ba54a Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 23 Jan 2013 09:45:20 -0600
Subject: [ticket/9737] Fix some comments

PHPBB3-9737
---
 phpBB/includes/db/migration/migration.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/migration.php b/phpBB/includes/db/migration/migration.php
index cf1e97b3b1..5f14a6953c 100644
--- a/phpBB/includes/db/migration/migration.php
+++ b/phpBB/includes/db/migration/migration.php
@@ -74,7 +74,7 @@ abstract class phpbb_db_migration
 	}
 
 	/**
-	* Defines other migrations to be applied first (abstract method)
+	* Defines other migrations to be applied first
 	*
 	* @return array An array of migration class names
 	*/
@@ -84,7 +84,7 @@ abstract class phpbb_db_migration
 	}
 
 	/**
-	* Allows you to check if the migration is effectively installed (entirely optionall)
+	* Allows you to check if the migration is effectively installed (entirely optional)
 	*
 	* This is checked when a migration is installed. If true is returned, the migration will be set as
 	* installed without performing the database changes.
-- 
cgit v1.2.1


From 869de98f52e636fd5b9f2a9f5b75d665e7009463 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 24 Jan 2013 00:23:45 +0100
Subject: [feature/avatars] Add include of functions_display.php in BC function

The needed function phpbb_get_avatar() is defined in
includes/functions_display.php. Include that file in the backwards
compatible function get_user_avatar().

PHPBB3-10018
---
 phpBB/includes/functions_compatibility.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index 11ef982a40..4f96e46417 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Get user avatar
-* Added in phpBB 3.1.0-A1
+* Compatibility function added: phpBB 3.1.0-A1
 * 
 * @param string $avatar Users assigned avatar name
 * @param int $avatar_type Type of avatar
@@ -30,6 +30,8 @@ if (!defined('IN_PHPBB'))
 */
 function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false)
 {
+	global $phpbb_root_path, $phpEx;
+
 	// map arguments to new function phpbb_get_avatar()
 	$row = array(
 		'avatar'		=> $avatar,
@@ -38,5 +40,10 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
 		'avatar_height'	=> $avatar_height,
 	);
 
+	if (!function_exists('phpbb_get_avatar'))
+	{
+		include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+	}
+
 	return phpbb_get_avatar($row, $alt, $ignore_config);
 }
-- 
cgit v1.2.1


From 9c3538eb0e29c491d2f8c15c44c772e29631f4e3 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 25 Jan 2013 01:24:15 +0100
Subject: [feature/avatars] Move list of supported formats to avatar driver
 class

Using the regex and turning it into an array if necessary seemed like the
cleanest approach to achieve this.

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php | 5 +++++
 phpBB/includes/avatar/driver/local.php  | 2 +-
 phpBB/includes/avatar/driver/remote.php | 2 +-
 phpBB/includes/avatar/driver/upload.php | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index e03ef72b3a..d7fe915d03 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -51,6 +51,11 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	*/
 	protected $cache;
 
+	/**
+	* Regex for allowed avatar image extensions
+	*/
+	const REGEX_ALLOWED_EXT = 'gif|jpg|jpeg|png';
+
 	/**
 	* Construct a driver object
 	*
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index b96b602f85..5132ecd389 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -162,7 +162,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 				$image = $file_info->getFilename();
 
 				// Match all images in the gallery folder
-				if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $image) && is_file($file_path . '/' . $image))
+				if (preg_match('#^[^&\'"<>]+\.(?:'. self::REGEX_ALLOWED_EXT . ')$#i', $image) && is_file($file_path . '/' . $image))
 				{
 					if (function_exists('getimagesize'))
 					{
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index e8f182063e..9b481f983e 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -84,7 +84,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 
 		// Check if this url looks alright
 		// This isn't perfect, but it's what phpBB 3.0 did, and might as well make sure everything is compatible
-		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $url))
+		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.('. self::REGEX_ALLOWED_EXT . ')$#i', $url))
 		{
 			$error[] = 'AVATAR_URL_INVALID';
 			return false;
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 1e3c876299..ae39eb6920 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -66,7 +66,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 			include($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
 		}
 
-		$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
+		$upload = new fileupload('AVATAR_', explode('|', self::REGEX_ALLOWED_EXT), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
 		$url = $request->variable('avatar_upload_url', '');
 		$upload_file = $request->file('avatar_upload_file');
-- 
cgit v1.2.1


From 305b2b8f4876e9a11c30a36b10a92b112db47864 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 25 Jan 2013 19:49:02 +0100
Subject: [ticket/11343] Use === when checking stored user_actkey against user
 input.

Use strict comparison when checking whether stored user_actkey is equal to user
input.

PHPBB3-11343
---
 phpBB/includes/ucp/ucp_activate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index 82c1937919..1177d55c12 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -51,7 +51,7 @@ class ucp_activate
 			trigger_error('ALREADY_ACTIVATED');
 		}
 
-		if (($user_row['user_inactive_reason'] ==  INACTIVE_MANUAL) || $user_row['user_actkey'] != $key)
+		if (($user_row['user_inactive_reason'] ==  INACTIVE_MANUAL) || $user_row['user_actkey'] !== $key)
 		{
 			trigger_error('WRONG_ACTIVATION');
 		}
-- 
cgit v1.2.1


From 8421aa0b0e5607765593126de959bab113427272 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 25 Jan 2013 19:51:17 +0100
Subject: [ticket/11343] Remove spare space.

PHPBB3-11343
---
 phpBB/includes/ucp/ucp_activate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index 1177d55c12..9e545cd747 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -51,7 +51,7 @@ class ucp_activate
 			trigger_error('ALREADY_ACTIVATED');
 		}
 
-		if (($user_row['user_inactive_reason'] ==  INACTIVE_MANUAL) || $user_row['user_actkey'] !== $key)
+		if (($user_row['user_inactive_reason'] == INACTIVE_MANUAL) || $user_row['user_actkey'] !== $key)
 		{
 			trigger_error('WRONG_ACTIVATION');
 		}
-- 
cgit v1.2.1


From 5a146df07f62f9963b3ec313ef27a72183f295db Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 25 Jan 2013 19:52:02 +0100
Subject: [ticket/11343] Remove spare parentheses.

PHPBB3-11343
---
 phpBB/includes/ucp/ucp_activate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index 9e545cd747..b262dc5c1c 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -51,7 +51,7 @@ class ucp_activate
 			trigger_error('ALREADY_ACTIVATED');
 		}
 
-		if (($user_row['user_inactive_reason'] == INACTIVE_MANUAL) || $user_row['user_actkey'] !== $key)
+		if ($user_row['user_inactive_reason'] == INACTIVE_MANUAL || $user_row['user_actkey'] !== $key)
 		{
 			trigger_error('WRONG_ACTIVATION');
 		}
-- 
cgit v1.2.1


From 36b7d7560e55ee570a2e2f5991982be6c8e66487 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Mon, 28 Jan 2013 22:26:20 +0530
Subject: [ticket/11233] prohibit selecting anonymous user as a PM recipient

While composing pm, it should not be allowed to add
anonymous user as a PM recipient

PHPBB3-11233
---
 phpBB/includes/ucp/ucp_pm_compose.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index d1786dd9ba..8e82188aff 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -359,7 +359,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		$message_attachment = 0;
 		$message_text = $message_subject = '';
 
-		if ($to_user_id && $action == 'post')
+		if ($to_user_id && $to_user_id != ANONYMOUS && $action == 'post')
 		{
 			$address_list['u'][$to_user_id] = 'to';
 		}
-- 
cgit v1.2.1


From 75244eafd946bb157ec5e54d5ec2ba3a309ae3ab Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 30 Jan 2013 16:20:50 -0600
Subject: [feature/migrations] Revert unrelated changes to functions.php

PHPBB3-9737
---
 phpBB/includes/functions.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 057bdba0e3..d0ef2759d5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2868,7 +2868,6 @@ function send_status_line($code, $message)
 	else
 	{
 		$version = phpbb_request_http_version();
-
 		header("$version $code $message", true, $code);
 	}
 }
@@ -5583,7 +5582,7 @@ function phpbb_convert_30_dbms_to_31($dbms)
 
 		/*
 		$reflection = new \ReflectionClass($dbms);
-
+   	 
 		if ($reflection->isSubclassOf('phpbb_db_driver'))
 		{
 			return $dbms;
-- 
cgit v1.2.1


From f322f4eac923a960e6b6ff44c27783000affb3ee Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 3 Feb 2013 23:02:35 +0100
Subject: [feature/avatars] Correct license, copyright and package info

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php    | 6 +++---
 phpBB/includes/avatar/driver/gravatar.php  | 8 ++++----
 phpBB/includes/avatar/driver/interface.php | 6 +++---
 phpBB/includes/avatar/driver/local.php     | 6 +++---
 phpBB/includes/avatar/driver/remote.php    | 6 +++---
 phpBB/includes/avatar/driver/upload.php    | 6 +++---
 phpBB/includes/avatar/manager.php          | 4 ++--
 phpBB/includes/functions_compatibility.php | 2 +-
 8 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index d7fe915d03..5a54c3ee37 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 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
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Base class for avatar drivers
-* @package avatars
+* @package phpBB3
 */
 abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 {
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 79cac75e28..b54aae94b7 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Handles avatars hosted at gravatar.com
-* @package avatars
+* @package phpBB3
 */
 class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 {
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 5d6d6b10ac..9364699b5f 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 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
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Interface for avatar drivers
-* @package avatars
+* @package phpBB3
 */
 interface phpbb_avatar_driver_interface
 {
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 5132ecd389..a789cd391d 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 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
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Handles avatars selected from the board gallery
-* @package avatars
+* @package phpBB3
 */
 class phpbb_avatar_driver_local extends phpbb_avatar_driver
 {
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 9b481f983e..9845db4b7f 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 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
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Handles avatars hosted remotely
-* @package avatars
+* @package phpBB3
 */
 class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 {
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index ae39eb6920..282e0a21ff 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 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
 *
 */
 
@@ -17,7 +17,7 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Handles avatars uploaded to the board
-* @package avatars
+* @package phpBB3
 */
 class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 {
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 4284e2262d..9c60436de8 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -1,9 +1,9 @@
 <?php
 /**
 *
-* @package avatar
+* @package phpBB3
 * @copyright (c) 2011 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
 *
 */
 
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index 4f96e46417..b0655ff291 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package phpBB3
-* @copyright (c) 2005 phpBB Group
+* @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
-- 
cgit v1.2.1


From 11aff559d4fcde5c2935aa6ebdfcfbe162d91f64 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 3 Feb 2013 23:06:30 +0100
Subject: [feature/avatars] Use deprecated for compatibility function

Also moved use of global variables inside the only if statement they are
used in.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index b0655ff291..2197815087 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -17,8 +17,9 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Get user avatar
-* Compatibility function added: phpBB 3.1.0-A1
-* 
+*
+* @deprecated 3.1.0-a1 (To be removed: 3.3.0)
+*
 * @param string $avatar Users assigned avatar name
 * @param int $avatar_type Type of avatar
 * @param string $avatar_width Width of users avatar
@@ -30,8 +31,6 @@ if (!defined('IN_PHPBB'))
 */
 function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false)
 {
-	global $phpbb_root_path, $phpEx;
-
 	// map arguments to new function phpbb_get_avatar()
 	$row = array(
 		'avatar'		=> $avatar,
@@ -42,6 +41,8 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
 
 	if (!function_exists('phpbb_get_avatar'))
 	{
+		global $phpbb_root_path, $phpEx;
+
 		include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 	}
 
-- 
cgit v1.2.1


From 336187151a2010197ddda1bcdabc311fd10c1c87 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Feb 2013 01:30:04 +0100
Subject: [ticket/11201] Revert WLM dropping because it is still used in China.

Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.

This commit reverts commits
 - 460470229d972b93ef5a98b0d1d97a2a970d684f
 - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.

PHPBB3-11201
---
 phpBB/includes/acp/acp_users.php          | 4 ++++
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 1 +
 phpBB/includes/ucp/ucp_profile.php        | 4 ++++
 3 files changed, 9 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 2bdbf1441a..82d8ef5cbb 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1352,6 +1352,7 @@ class acp_users
 				$data = array(
 					'icq'			=> request_var('icq', $user_row['user_icq']),
 					'aim'			=> request_var('aim', $user_row['user_aim']),
+					'msn'			=> request_var('msn', $user_row['user_msnm']),
 					'yim'			=> request_var('yim', $user_row['user_yim']),
 					'jabber'		=> utf8_normalize_nfc(request_var('jabber', $user_row['user_jabber'], true)),
 					'website'		=> request_var('website', $user_row['user_website']),
@@ -1381,6 +1382,7 @@ class acp_users
 							array('string', true, 3, 15),
 							array('match', true, '#^[0-9]+$#i')),
 						'aim'			=> array('string', true, 3, 255),
+						'msn'			=> array('string', true, 5, 255),
 						'jabber'		=> array(
 							array('string', true, 5, 255),
 							array('jabber')),
@@ -1414,6 +1416,7 @@ class acp_users
 						$sql_ary = array(
 							'user_icq'		=> $data['icq'],
 							'user_aim'		=> $data['aim'],
+							'user_msnm'		=> $data['msn'],
 							'user_yim'		=> $data['yim'],
 							'user_jabber'	=> $data['jabber'],
 							'user_website'	=> $data['website'],
@@ -1466,6 +1469,7 @@ class acp_users
 					'ICQ'			=> $data['icq'],
 					'YIM'			=> $data['yim'],
 					'AIM'			=> $data['aim'],
+					'MSN'			=> $data['msn'],
 					'JABBER'		=> $data['jabber'],
 					'WEBSITE'		=> $data['website'],
 					'LOCATION'		=> $data['location'],
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index a1001cfa74..c85b05f144 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -241,6 +241,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'U_ICQ'			=> ($user_info['user_icq']) ? 'http://www.icq.com/people/' . urlencode($user_info['user_icq']) . '/' : '',
 		'U_AIM'			=> ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $author_id) : '',
 		'U_YIM'			=> ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&amp;.src=pg' : '',
+		'U_MSN'			=> ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $author_id) : '',
 		'U_JABBER'		=> ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $author_id) : '',
 
 		'U_DELETE'			=> ($auth->acl_get('u_pm_delete')) ? "$url&amp;mode=compose&amp;action=delete&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index c1ad9955b6..e7cea06a45 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -266,6 +266,7 @@ class ucp_profile
 				$data = array(
 					'icq'			=> request_var('icq', $user->data['user_icq']),
 					'aim'			=> request_var('aim', $user->data['user_aim']),
+					'msn'			=> request_var('msn', $user->data['user_msnm']),
 					'yim'			=> request_var('yim', $user->data['user_yim']),
 					'jabber'		=> utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)),
 					'website'		=> request_var('website', $user->data['user_website']),
@@ -298,6 +299,7 @@ class ucp_profile
 							array('string', true, 3, 15),
 							array('match', true, '#^[0-9]+$#i')),
 						'aim'			=> array('string', true, 3, 255),
+						'msn'			=> array('string', true, 5, 255),
 						'jabber'		=> array(
 							array('string', true, 5, 255),
 							array('jabber')),
@@ -349,6 +351,7 @@ class ucp_profile
 						$sql_ary = array(
 							'user_icq'		=> $data['icq'],
 							'user_aim'		=> $data['aim'],
+							'user_msnm'		=> $data['msn'],
 							'user_yim'		=> $data['yim'],
 							'user_jabber'	=> $data['jabber'],
 							'user_website'	=> $data['website'],
@@ -420,6 +423,7 @@ class ucp_profile
 					'ICQ'		=> $data['icq'],
 					'YIM'		=> $data['yim'],
 					'AIM'		=> $data['aim'],
+					'MSN'		=> $data['msn'],
 					'JABBER'	=> $data['jabber'],
 					'WEBSITE'	=> $data['website'],
 					'LOCATION'	=> $data['location'],
-- 
cgit v1.2.1


From 77df9109b61ec93c28a8120a8d81a045961b24ac Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 4 Feb 2013 13:46:23 -0600
Subject: [feature/migrations] Remove default values from necessary parameters

Clean up some comments

PHPBB3-9737
---
 phpBB/includes/db/migration/tool/config.php     | 34 ++++++++++---------
 phpBB/includes/db/migration/tool/module.php     | 44 +++++++++++++++----------
 phpBB/includes/db/migration/tool/permission.php | 33 ++++++++++---------
 3 files changed, 61 insertions(+), 50 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/tool/config.php b/phpBB/includes/db/migration/tool/config.php
index 6ae419d5e7..d9cc20053e 100644
--- a/phpBB/includes/db/migration/tool/config.php
+++ b/phpBB/includes/db/migration/tool/config.php
@@ -38,12 +38,14 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 	/**
 	* Add a config setting.
 	*
-	* @param string $config_name The name of the config setting you would like to add
+	* @param string $config_name The name of the config setting
+	* 	you would like to add
 	* @param mixed $config_value The value of the config setting
-	* @param bool $is_dynamic True if it is dynamic (changes very often) and should not be stored in the cache, false if not.
+	* @param bool $is_dynamic True if it is dynamic (changes very often)
+	* 	and should not be stored in the cache, false if not.
 	* @return null
 	*/
-	public function add($config_name, $config_value = '', $is_dynamic = false)
+	public function add($config_name, $config_value, $is_dynamic = false)
 	{
 		if (isset($this->config[$config_name]))
 		{
@@ -56,11 +58,12 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 	/**
 	* Update an existing config setting.
 	*
-	* @param string $config_name The name of the config setting you would like to update
+	* @param string $config_name The name of the config setting you would
+	* 	like to update
 	* @param mixed $config_value The value of the config setting
 	* @return null
 	*/
-	public function update($config_name, $config_value = '')
+	public function update($config_name, $config_value)
 	{
 		if (!isset($this->config[$config_name]))
 		{
@@ -71,14 +74,17 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 	}
 
 	/**
-	* Update a config setting if the first argument equal to the current config value
+	* Update a config setting if the first argument equal to the
+	* current config value
 	*
-	* @param bool $compare If equal to the current config value, will be updated to the new config value, otherwise not
-	* @param string $config_name The name of the config setting you would like to update
+	* @param string $compare If equal to the current config value, will be
+	* 	updated to the new config value, otherwise not
+	* @param string $config_name The name of the config setting you would
+	* 	like to update
 	* @param mixed $config_value The value of the config setting
 	* @return null
 	*/
-	public function update_if_equals($compare, $config_name, $config_value = '')
+	public function update_if_equals($compare, $config_name, $config_value)
 	{
 		if (!isset($this->config[$config_name]))
 		{
@@ -91,7 +97,8 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 	/**
 	* Remove an existing config setting.
 	*
-	* @param string $config_name The name of the config setting you would like to remove
+	* @param string $config_name The name of the config setting you would
+	* 	like to remove
 	* @return null
 	*/
 	public function remove($config_name)
@@ -105,12 +112,7 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 	}
 
 	/**
-	* Reverse an original install action
-	*
-	* First argument is the original call to the class (e.g. add, remove)
-	* After the first argument, send the original arguments to the function in the original call
-	*
-	* @return null
+	* {@inheritdoc}
 	*/
 	public function reverse()
 	{
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index 561faac552..afe1f21ec5 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -66,8 +66,10 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 	* Check if a module exists
 	*
 	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
-	* @param int|string $module The module_id|module_langname you would like to check for to see if it exists
+	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).
+	*		Use false to ignore the parent check and check class wide.
+	* @param int|string $module The module_id|module_langname you would like to
+	* 		check for to see if it exists
 	* @return bool true/false if module exists
 	*/
 	public function exists($class, $parent, $module)
@@ -131,10 +133,14 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 	*
 	* @param string $class The module class(acp|mcp|ucp)
 	* @param int|string $parent The parent module_id|module_langname (0 for no parent)
-	* @param array $data an array of the data on the new module.  This can be setup in two different ways.
-	*	1. The "manual" way.  For inserting a category or one at a time.  It will be merged with the base array shown a bit below,
-	*		but at the least requires 'module_langname' to be sent, and, if you want to create a module (instead of just a category) you must send module_basename and module_mode.
-	* 		array(
+	* @param array $data an array of the data on the new module.
+	* 	This can be setup in two different ways.
+	*	1. The "manual" way.  For inserting a category or one at a time.
+	*		It will be merged with the base array shown a bit below,
+	*			but at the least requires 'module_langname' to be sent, and,
+	*			if you want to create a module (instead of just a category) you must
+	*			send module_basename and module_mode.
+	*		array(
 	*			'module_enabled'	=> 1,
 	*			'module_display'	=> 1,
 	*	   		'module_basename'	=> '',
@@ -144,14 +150,19 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 	*	   		'module_mode'		=> '',
 	*	   		'module_auth'		=> '',
 	*		)
-	*	2. The "automatic" way.  For inserting multiple at a time based on the specs in the info file for the module(s).  For this to work the modules must be correctly setup in the info file.
-	*		An example follows (this would insert the settings, log, and flag modes from the includes/acp/info/acp_asacp.php file):
+	*	2. The "automatic" way.  For inserting multiple at a time based on the
+	*			specs in the info file for the module(s).  For this to work the
+	*			modules must be correctly setup in the info file.
+	*		An example follows (this would insert the settings, log, and flag
+	*			modes from the includes/acp/info/acp_asacp.php file):
 	* 		array(
 	* 			'module_basename'	=> 'asacp',
 	* 			'modes'				=> array('settings', 'log', 'flag'),
 	* 		)
-	* 		Optionally you may not send 'modes' and it will insert all of the modules in that info file.
-	* @param string|bool $include_path If you would like to use a custom include path, specify that here
+	* 		Optionally you may not send 'modes' and it will insert all of the
+	* 			modules in that info file.
+	* @param string|bool $include_path If you would like to use a custom include
+	* 	path, specify that here
 	* @return null
 	*/
 	public function add($class, $parent = 0, $data = array(), $include_path = false)
@@ -334,9 +345,11 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 	* Remove a module
 	*
 	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).  Use false to ignore the parent check and check class wide.
+	* @param int|string|bool $parent The parent module_id|module_langname(0 for no parent).
+	* 	Use false to ignore the parent check and check class wide.
 	* @param int|string $module The module id|module_langname
-	* @param string|bool $include_path If you would like to use a custom include path, specify that here
+	* @param string|bool $include_path If you would like to use a custom include path,
+	* 	specify that here
 	* @return null
 	*/
 	public function remove($class, $parent = 0, $module = '', $include_path = false)
@@ -473,12 +486,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 	}
 
 	/**
-	* Reverse an original install action
-	*
-	* First argument is the original call to the class (e.g. add, remove)
-	* After the first argument, send the original arguments to the function in the original call
-	*
-	* @return null
+	* {@inheritdoc}
 	*/
 	public function reverse()
 	{
diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php
index a25fdb345e..001d090f5a 100644
--- a/phpBB/includes/db/migration/tool/permission.php
+++ b/phpBB/includes/db/migration/tool/permission.php
@@ -61,7 +61,8 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	* Check if a permission (auth) setting exists
 	*
 	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	* @param bool $global True for checking a global permission setting,
+	* 	False for a local permission setting
 	* @return bool true if it exists, false if not
 	*/
 	public function exists($auth_option, $global = true)
@@ -98,7 +99,8 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	* Add a permission (auth) option
 	*
 	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	* @param bool $global True for checking a global permission setting,
+	* 	False for a local permission setting
 	* @return null
 	*/
 	public function add($auth_option, $global = true, $copy_from = false)
@@ -180,7 +182,8 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	* Remove a permission (auth) option
 	*
 	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting, False for a local permission setting
+	* @param bool $global True for checking a global permission setting,
+	* 	False for a local permission setting
 	* @return null
 	*/
 	public function remove($auth_option, $global = true)
@@ -239,7 +242,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	* @param sting $role_type The type (u_, m_, a_)
 	* @return null
 	*/
-	public function role_add($role_name, $role_type = '', $role_description = '')
+	public function role_add($role_name, $role_type, $role_description = '')
 	{
 		$sql = 'SELECT role_id
 			FROM ' . ACL_ROLES_TABLE . "
@@ -277,7 +280,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	* @param string $new_role_name The new role name
 	* @return null
 	*/
-	public function role_update($old_role_name, $new_role_name = '')
+	public function role_update($old_role_name, $new_role_name)
 	{
 		$sql = 'SELECT role_id
 			FROM ' . ACL_ROLES_TABLE . "
@@ -332,12 +335,14 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	* Allows you to set permissions for a certain group/role
 	*
 	* @param string $name The name of the role/group
-	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
+	* @param string|array $auth_option The auth_option or array of
+	* 	auth_options you would like to set
 	* @param string $type The type (role|group)
-	* @param bool $has_permission True if you want to give them permission, false if you want to deny them permission
+	* @param bool $has_permission True if you want to give them permission,
+	* 	false if you want to deny them permission
 	* @return null
 	*/
-	public function permission_set($name, $auth_option = array(), $type = 'role', $has_permission = true)
+	public function permission_set($name, $auth_option, $type = 'role', $has_permission = true)
 	{
 		if (!is_array($auth_option))
 		{
@@ -477,11 +482,12 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	* Allows you to unset (remove) permissions for a certain group/role
 	*
 	* @param string $name The name of the role/group
-	* @param string|array $auth_option The auth_option or array of auth_options you would like to set
+	* @param string|array $auth_option The auth_option or array of
+	* 	auth_options you would like to set
 	* @param string $type The type (role|group)
 	* @return null
 	*/
-	public function permission_unset($name, $auth_option = array(), $type = 'role')
+	public function permission_unset($name, $auth_option, $type = 'role')
 	{
 		if (!is_array($auth_option))
 		{
@@ -565,12 +571,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	}
 
 	/**
-	* Reverse an original install action
-	*
-	* First argument is the original call to the class (e.g. add, remove)
-	* After the first argument, send the original arguments to the function in the original call
-	*
-	* @return null
+	* {@inheritdoc}
 	*/
 	public function reverse()
 	{
-- 
cgit v1.2.1


From 293b65e3efbf94f6521acebe1b9f3e7bbca20286 Mon Sep 17 00:00:00 2001
From: David Tobin <dtobin08@gmail.com>
Date: Thu, 5 Jul 2012 02:47:49 +0100
Subject: [ticket/10896] Adds email validation to email settings in ACP

Adds a new validation type to the ACP validate_config_vars function
and implements it on the board_contact and board_email settings.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index f437dca8f9..ebbf66657e 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -408,8 +408,8 @@ class acp_board
 						'board_email_form'		=> array('lang' => 'BOARD_EMAIL_FORM',		'validate' => 'bool',	'type' => 'radio:enabled_disabled', 'explain' => true),
 						'email_function_name'	=> array('lang' => 'EMAIL_FUNCTION_NAME',	'validate' => 'string',	'type' => 'text:20:50', 'explain' => true),
 						'email_package_size'	=> array('lang' => 'EMAIL_PACKAGE_SIZE',	'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true),
-						'board_contact'			=> array('lang' => 'CONTACT_EMAIL',			'validate' => 'string',	'type' => 'text:25:100', 'explain' => true),
-						'board_email'			=> array('lang' => 'ADMIN_EMAIL',			'validate' => 'string',	'type' => 'text:25:100', 'explain' => true),
+						'board_contact'			=> array('lang' => 'CONTACT_EMAIL',			'validate' => 'email',	'type' => 'text:25:100', 'explain' => true),
+						'board_email'			=> array('lang' => 'ADMIN_EMAIL',			'validate' => 'email',	'type' => 'text:25:100', 'explain' => true),
 						'board_email_sig'		=> array('lang' => 'EMAIL_SIG',				'validate' => 'string',	'type' => 'textarea:5:30', 'explain' => true),
 						'board_hide_emails'		=> array('lang' => 'BOARD_HIDE_EMAILS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
-- 
cgit v1.2.1


From 8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 19:32:39 -0600
Subject: [feature/migrations] Make the container available to extension
 installers

This allows extensions to load and install migrations easily as per their
needs.

PHPBB3-11318
---
 phpBB/includes/extension/base.php    | 15 +++++++++++++++
 phpBB/includes/extension/manager.php | 13 ++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/base.php b/phpBB/includes/extension/base.php
index 9d076eb6c5..d51589d719 100644
--- a/phpBB/includes/extension/base.php
+++ b/phpBB/includes/extension/base.php
@@ -15,6 +15,8 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
 /**
 * A base class for extensions without custom enable/disable/purge code.
 *
@@ -22,6 +24,19 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_extension_base implements phpbb_extension_interface
 {
+	/** @var ContainerInterface */
+	protected $container;
+
+	/**
+	* Constructor
+	*
+	* @param ContainerInterface $container Container object
+	*/
+	public function __construct(ContainerInterface $container)
+	{
+		$this->container = $container;
+	}
+
 	/**
 	* Single enable step that does nothing
 	*
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index de6f364320..8136dfa90b 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -15,6 +15,8 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
 /**
 * The extension manager provides means to activate/deactivate extensions.
 *
@@ -22,6 +24,9 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_extension_manager
 {
+	/** @var ContainerInterface */
+	protected $container;
+
 	protected $db;
 	protected $config;
 	protected $cache;
@@ -34,6 +39,7 @@ class phpbb_extension_manager
 	/**
 	* Creates a manager and loads information from database
 	*
+	* @param ContainerInterface $container A container
 	* @param phpbb_db_driver $db A database connection
 	* @param phpbb_config $config phpbb_config
 	* @param string $extension_table The name of the table holding extensions
@@ -42,8 +48,9 @@ class phpbb_extension_manager
 	* @param phpbb_cache_driver_interface $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
+	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
 	{
+		$this->container = $container;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->db = $db;
 		$this->config = $config;
@@ -126,11 +133,11 @@ class phpbb_extension_manager
 
 		if (class_exists($extension_class_name))
 		{
-			return new $extension_class_name;
+			return new $extension_class_name($this->container);
 		}
 		else
 		{
-			return new phpbb_extension_base;
+			return new phpbb_extension_base($this->container);
 		}
 	}
 
-- 
cgit v1.2.1


From aa67fa6dd83e329c3b6edbb356eae3eeda1ba69f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 31 Jan 2013 13:53:33 -0600
Subject: [feature/migrations] Automatically install/revert migrations for
 extensions

Migrations from ext/ext_name/migrations/ are automatically installed
when enabling the extension and automatically reverted when the
extension is purged.

PHPBB3-11318
---
 phpBB/includes/extension/manager.php | 62 ++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 8136dfa90b..018324d5d6 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -173,6 +173,12 @@ class phpbb_extension_manager
 
 		$old_state = (isset($this->extensions[$name]['ext_state'])) ? unserialize($this->extensions[$name]['ext_state']) : false;
 
+		// Returns false if not completed
+		if (!$this->handle_migrations($name, 'enable'))
+		{
+			return true;
+		}
+
 		$extension = $this->get_extension($name);
 		$state = $extension->enable_step($old_state);
 
@@ -324,6 +330,12 @@ class phpbb_extension_manager
 
 		$old_state = unserialize($this->extensions[$name]['ext_state']);
 
+		// Returns false if not completed
+		if (!$this->handle_migrations($name, 'purge'))
+		{
+			return true;
+		}
+
 		$extension = $this->get_extension($name);
 		$state = $extension->purge_step($old_state);
 
@@ -497,4 +509,54 @@ class phpbb_extension_manager
 	{
 		return new phpbb_extension_finder($this, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder');
 	}
+
+	/**
+	* Handle installing/reverting migrations
+	*
+	* @param string $extension_name Name of the extension
+	* @param string $mode enable or purge
+	* @return bool True if completed, False if not completed
+	*/
+	protected function handle_migrations($extension_name, $mode)
+	{
+		$migrator = $this->container->get('migrator');
+		$migrations_path = $this->get_extension_path($extension_name) . 'migrations';
+		if (file_exists($migrations_path) && is_dir($migrations_path))
+		{
+			$migrator->load_migrations($migrations_path);
+		}
+
+		// What is a safe limit of execution time? Half the max execution time should be safe.
+		$safe_time_limit = (ini_get('max_execution_time') / 2);
+		$start_time = time();
+
+		if ($mode == 'enable')
+		{
+			while (!$migrator->finished())
+			{
+				$migrator->update();
+
+				// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+				if ((time() - $start_time) >= $safe_time_limit)
+				{
+					return false;
+				}
+			}
+		}
+		else if ($mode == 'purge')
+		{
+			while ($migrator->migration_state() !== false)
+			{
+				$migrator->revert();
+
+				// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+				if ((time() - $start_time) >= $safe_time_limit)
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
 }
-- 
cgit v1.2.1


From fb4f7470d481bd73dd505e7ce0522907f67773ef Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 15:34:03 -0600
Subject: [feature/migrations] Rebuilding migrations data on develop

So this is easy to merge later.

PHPBB3-9737
---
 phpBB/includes/db/migration/data/3_0_1.php         |  28 ++
 phpBB/includes/db/migration/data/3_0_10.php        |  28 ++
 phpBB/includes/db/migration/data/3_0_10_rc1.php    |  30 ++
 phpBB/includes/db/migration/data/3_0_10_rc2.php    |  28 ++
 phpBB/includes/db/migration/data/3_0_10_rc3.php    |  28 ++
 phpBB/includes/db/migration/data/3_0_11.php        |  28 ++
 phpBB/includes/db/migration/data/3_0_11_rc1.php    |  94 ++++++
 phpBB/includes/db/migration/data/3_0_11_rc2.php    |  34 ++
 phpBB/includes/db/migration/data/3_0_12_rc1.php    | 123 +++++++
 phpBB/includes/db/migration/data/3_0_1_rc1.php     | 102 ++++++
 phpBB/includes/db/migration/data/3_0_2.php         |  28 ++
 phpBB/includes/db/migration/data/3_0_2_rc1.php     |  32 ++
 phpBB/includes/db/migration/data/3_0_2_rc2.php     |  55 +++
 phpBB/includes/db/migration/data/3_0_3.php         |  28 ++
 phpBB/includes/db/migration/data/3_0_3_rc1.php     |  63 ++++
 phpBB/includes/db/migration/data/3_0_4.php         |  49 +++
 phpBB/includes/db/migration/data/3_0_4_rc1.php     | 107 ++++++
 phpBB/includes/db/migration/data/3_0_5.php         |  28 ++
 phpBB/includes/db/migration/data/3_0_5_rc1.php     | 119 +++++++
 .../includes/db/migration/data/3_0_5_rc1part2.php  |  37 ++
 phpBB/includes/db/migration/data/3_0_6.php         |  28 ++
 phpBB/includes/db/migration/data/3_0_6_rc1.php     | 279 +++++++++++++++
 phpBB/includes/db/migration/data/3_0_6_rc2.php     |  28 ++
 phpBB/includes/db/migration/data/3_0_6_rc3.php     |  40 +++
 phpBB/includes/db/migration/data/3_0_6_rc4.php     |  28 ++
 phpBB/includes/db/migration/data/3_0_7.php         |  28 ++
 phpBB/includes/db/migration/data/3_0_7_pl1.php     |  28 ++
 phpBB/includes/db/migration/data/3_0_7_rc1.php     |  53 +++
 phpBB/includes/db/migration/data/3_0_7_rc2.php     |  72 ++++
 phpBB/includes/db/migration/data/3_0_8.php         |  28 ++
 phpBB/includes/db/migration/data/3_0_8_rc1.php     | 221 ++++++++++++
 phpBB/includes/db/migration/data/3_0_9.php         |  28 ++
 phpBB/includes/db/migration/data/3_0_9_rc1.php     | 110 ++++++
 phpBB/includes/db/migration/data/3_0_9_rc2.php     |  28 ++
 phpBB/includes/db/migration/data/3_0_9_rc3.php     |  28 ++
 phpBB/includes/db/migration/data/3_0_9_rc4.php     |  28 ++
 phpBB/includes/db/migration/data/3_1_0_dev.php     | 375 +++++++++++++++++++++
 phpBB/includes/db/migration/data/extensions.php    |  55 +++
 .../includes/db/migration/data/style_update_p1.php | 157 +++++++++
 .../includes/db/migration/data/style_update_p2.php |  42 +++
 phpBB/includes/db/migration/data/timezone.php      | 161 +++++++++
 phpBB/includes/update_helpers.php                  | 112 ------
 42 files changed, 2914 insertions(+), 112 deletions(-)
 create mode 100644 phpBB/includes/db/migration/data/3_0_1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_10.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_10_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_10_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_10_rc3.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_11.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_11_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_11_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_12_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_1_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_2_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_2_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_3.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_3_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_4.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_4_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_5.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_5_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_5_rc1part2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_6.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_6_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_6_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_6_rc3.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_6_rc4.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_7.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_7_pl1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_7_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_7_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_8.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_8_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_9.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_9_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_9_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_9_rc3.php
 create mode 100644 phpBB/includes/db/migration/data/3_0_9_rc4.php
 create mode 100644 phpBB/includes/db/migration/data/3_1_0_dev.php
 create mode 100644 phpBB/includes/db/migration/data/extensions.php
 create mode 100644 phpBB/includes/db/migration/data/style_update_p1.php
 create mode 100644 phpBB/includes/db/migration/data/style_update_p2.php
 create mode 100644 phpBB/includes/db/migration/data/timezone.php
 delete mode 100644 phpBB/includes/update_helpers.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/3_0_1.php b/phpBB/includes/db/migration/data/3_0_1.php
new file mode 100644
index 0000000000..a2332c9b59
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_1.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_1_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_10.php b/phpBB/includes/db/migration/data/3_0_10.php
new file mode 100644
index 0000000000..07410c5ba1
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_10.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_10 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_10_rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.10')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc1.php b/phpBB/includes/db/migration/data/3_0_10_rc1.php
new file mode 100644
index 0000000000..daac50a631
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_10_rc1.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_10_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_9');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('email_max_chunk_size', 50)),
+
+			array('config.update', array('version', '3.0.10-rc1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc2.php b/phpBB/includes/db/migration/data/3_0_10_rc2.php
new file mode 100644
index 0000000000..234e4c5fc7
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_10_rc2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_10_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_10_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.10-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc3.php b/phpBB/includes/db/migration/data/3_0_10_rc3.php
new file mode 100644
index 0000000000..075ce35e3e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_10_rc3.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_10_rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_10_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.10-rc3')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_11.php b/phpBB/includes/db/migration/data/3_0_11.php
new file mode 100644
index 0000000000..0bc9b6c4a5
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_11.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_11 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.11')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc1.php b/phpBB/includes/db/migration/data/3_0_11_rc1.php
new file mode 100644
index 0000000000..752efd72b2
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_11_rc1.php
@@ -0,0 +1,94 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_10');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
+			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
+
+			array('config.update', array('version', '3.0.11-rc1')),
+		);
+	}
+
+	function cleanup_deactivated_styles()
+	{
+		// Updates users having current style a deactivated one
+		$sql = 'SELECT style_id
+			FROM ' . STYLES_TABLE . '
+			WHERE style_active = 0';
+		$result = $this->sql_query($sql);
+
+		$deactivated_style_ids = array();
+		while ($style_id = $this->db->sql_fetchfield('style_id', false, $result))
+		{
+			$deactivated_style_ids[] = (int) $style_id;
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($deactivated_style_ids))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_style = ' . (int) $this->config['default_style'] .'
+				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
+			$this->sql_query($sql);
+		}
+	}
+
+	function delete_orphan_private_messages()
+	{
+		// Delete orphan private messages
+		$batch_size = 500;
+
+		$sql_array = array(
+			'SELECT'	=> 'p.msg_id',
+			'FROM'		=> array(
+				PRIVMSGS_TABLE	=> 'p',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
+					'ON'	=> 'p.msg_id = t.msg_id',
+				),
+			),
+			'WHERE'		=> 't.user_id IS NULL',
+		);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+
+		$result = $this->db->sql_query_limit($sql, $batch_size);
+
+		$delete_pms = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$delete_pms[] = (int) $row['msg_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($delete_pms))
+		{
+			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
+			$this->sql_query($sql);
+
+			return false;
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc2.php b/phpBB/includes/db/migration/data/3_0_11_rc2.php
new file mode 100644
index 0000000000..f2bed54085
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_11_rc2.php
@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_11_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11_rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_novalue' => array('BOOL', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.11-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_12_rc1.php b/phpBB/includes/db/migration/data/3_0_12_rc1.php
new file mode 100644
index 0000000000..0d8702f19e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_12_rc1.php
@@ -0,0 +1,123 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 **/
+
+class phpbb_db_migration_data_3_0_12_rc1 extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array();
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_module_auth'))),
+			array('custom', array(array(&$this, 'update_bots'))),
+			array('custom', array(array(&$this, 'disable_bots_from_receiving_pms'))),
+
+			array('config.update', array('version', '3.0.12-rc1')),
+		);
+	}
+
+	public function disable_bots_from_receiving_pms()
+	{
+		// Disable receiving pms for bots
+		$sql = 'SELECT user_id
+			FROM ' . BOTS_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		$bot_user_ids = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$bot_user_ids[] = (int) $row['user_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($bot_user_ids))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_allow_pm = 0
+				WHERE ' . $this->db->sql_in_set('user_id', $bot_user_ids);
+			$this->sql_query($sql);
+		}
+	}
+
+	public function update_module_auth()
+	{
+		$sql = 'UPDATE ' . MODULES_TABLE . '
+			SET module_auth = \'acl_u_sig\'
+			WHERE module_class = \'ucp\'
+				AND module_basename = \'profile\'
+				AND module_mode = \'signature\'';
+		$this->sql_query($sql);
+	}
+
+	public function update_bots()
+	{
+		// Update bots
+		if (!function_exists('user_delete'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		}
+
+		$bots_updates = array(
+			// Bot Deletions
+			'NG-Search [Bot]'		=> false,
+			'Nutch/CVS [Bot]'		=> false,
+			'OmniExplorer [Bot]'	=> false,
+			'Seekport [Bot]'		=> false,
+			'Synoo [Bot]'			=> false,
+			'WiseNut [Bot]'			=> false,
+
+			// Bot Updates
+			// Bot name to bot user agent map
+			'Baidu [Spider]'	=> 'Baiduspider',
+			'Exabot [Bot]'		=> 'Exabot',
+			'Voyager [Bot]'		=> 'voyager/',
+			'W3C [Validator]'	=> 'W3C_Validator',
+		);
+
+		foreach ($bots_updates as $bot_name => $bot_agent)
+		{
+			$sql = 'SELECT user_id
+				FROM ' . USERS_TABLE . '
+				WHERE user_type = ' . USER_IGNORE . "
+					AND username_clean = '" . $this->db->sql_escape(utf8_clean_string($bot_name)) . "'";
+			$result = $this->db->sql_query($sql);
+			$bot_user_id = (int) $this->db->sql_fetchfield('user_id');
+			$this->db->sql_freeresult($result);
+
+			if ($bot_user_id)
+			{
+				if ($bot_agent === false)
+				{
+					$sql = 'DELETE FROM ' . BOTS_TABLE . "
+						WHERE user_id = $bot_user_id";
+					$this->sql_query($sql);
+
+					user_delete('remove', $bot_user_id);
+				}
+				else
+				{
+					$sql = 'UPDATE ' . BOTS_TABLE . "
+						SET bot_agent = '" .  $this->db->sql_escape($bot_agent) . "'
+						WHERE user_id = $bot_user_id";
+					$this->sql_query($sql);
+				}
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_1_rc1.php b/phpBB/includes/db/migration/data/3_0_1_rc1.php
new file mode 100644
index 0000000000..cf067d2e2c
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_1_rc1.php
@@ -0,0 +1,102 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array();
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'display_subforum_list' => array('BOOL', 1),
+				),
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('UINT', 0),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'groups' => array('group_legend'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('session_forum_id'),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_legend_name' => array('group_legend', 'group_name'),
+				),
+			),
+		);
+	}
+
+	function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'display_subforum_list',
+				),
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id',
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'groups' => array(
+					'group_legend' => 'group_legend',
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array('session_forum_id'),
+				$this->table_prefix . 'groups' => array('group_legend_name'),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
+			array('custom', array(array(&$this, 'reset_smiley_size'))),
+
+			array('config.update', array('version', '3.0.1-rc1')),
+		);
+	}
+
+	function fix_unset_last_view_time()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . "topics
+			SET topic_last_view_time = topic_last_post_time
+			WHERE topic_last_view_time = 0";
+		$this->sql_query($sql);
+	}
+
+	function reset_smiley_size()
+	{
+		// Update smiley sizes
+		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
+
+		foreach ($smileys as $smiley)
+		{
+			if (file_exists($this->phpbb_root_path . 'images/smilies/' . $smiley))
+			{
+				list($width, $height) = getimagesize($this->phpbb_root_path . 'images/smilies/' . $smiley);
+
+				$sql = 'UPDATE ' . SMILIES_TABLE . '
+					SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
+					WHERE smiley_url = '" . $this->db->sql_escape($smiley) . "'";
+
+				$this->sql_query($sql);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_2.php b/phpBB/includes/db/migration/data/3_0_2.php
new file mode 100644
index 0000000000..3469d8d178
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_2_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc1.php b/phpBB/includes/db/migration/data/3_0_2_rc1.php
new file mode 100644
index 0000000000..d3c2200f14
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_2_rc1.php
@@ -0,0 +1,32 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_2_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('referer_validation', '1')),
+			array('config.add', array('check_attachment_content', '1')),
+			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
+
+			array('config.update', array('version', '3.0.2-rc1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc2.php b/phpBB/includes/db/migration/data/3_0_2_rc2.php
new file mode 100644
index 0000000000..67fd1faec6
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_2_rc2.php
@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_2_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_2_rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'drafts' => array(
+					'draft_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_last_post_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_subject' => array('STEXT_UNI', '', 'true_sort'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'topics' => array(
+					'topic_title' => array('STEXT_UNI', '', 'true_sort'),
+					'topic_last_post_subject' => array('STEXT_UNI', ''),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array('session_forum_id'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_fid' => array('session_forum_id'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.2-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_3.php b/phpBB/includes/db/migration/data/3_0_3.php
new file mode 100644
index 0000000000..dff375f438
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_3.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_3_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.3')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_3_rc1.php b/phpBB/includes/db/migration/data/3_0_3_rc1.php
new file mode 100644
index 0000000000..2320c4ac4b
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_3_rc1.php
@@ -0,0 +1,63 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_2');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'styles_template' => array(
+					'template_inherits_id' => array('UINT:4', 0),
+					'template_inherit_path' => array('VCHAR', ''),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_max_recipients' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('enable_queue_trigger', '0')),
+			array('config.add', array('queue_trigger_posts', '3')),
+			array('config.add', array('pm_max_recipients', '0')),
+			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
+			array('config.add', array('dbms_version', $this->db->sql_server_info(true))),
+			array('permission.add', array('u_masspm_group', true, 'u_masspm')),
+			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
+
+			array('config.update', array('version', '3.0.3-rc1')),
+		);
+	}
+
+	function correct_acp_email_permissions()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . 'modules
+			SET module_auth = \'acl_a_email && cfg_email_enable\'
+			WHERE module_class = \'acp\'
+				AND module_basename = \'email\'';
+		$this->sql_query($sql);
+	}
+
+	function set_group_default_max_recipients()
+	{
+		// Set maximum number of recipients for the registered users, bots, guests group
+		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
+			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_4.php b/phpBB/includes/db/migration/data/3_0_4.php
new file mode 100644
index 0000000000..1af4508331
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_4.php
@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_4 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_4_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
+
+			array('config.update', array('version', '3.0.4')),
+		);
+	}
+
+	function rename_log_delete_topic()
+	{
+		if ($this->db->sql_layer == 'oracle')
+		{
+			// log_operation is CLOB - but we can change this later
+			$sql = 'UPDATE ' . $this->table_prefix . "log
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
+			$this->sql_query($sql);
+		}
+		else
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . "log
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation = 'LOG_TOPIC_DELETED'";
+			$this->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_4_rc1.php b/phpBB/includes/db/migration/data/3_0_4_rc1.php
new file mode 100644
index 0000000000..e9bb0e01f5
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_4_rc1.php
@@ -0,0 +1,107 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_3');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_profile' => array('BOOL', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'styles' => array(
+					'style_id' => array('UINT', NULL, 'auto_increment'),
+					'template_id' => array('UINT', 0),
+					'theme_id' => array('UINT', 0),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_imageset' => array(
+					'imageset_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_imageset_data' => array(
+					'image_id' => array('UINT', NULL, 'auto_increment'),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_theme' => array(
+					'theme_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template' => array(
+					'template_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template_data' => array(
+					'template_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
+
+			array('config.update', array('version', '3.0.4-rc1')),
+		);
+	}
+
+	function update_custom_profile_fields()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
+				FROM ' . PROFILE_FIELDS_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'field_required'	=> 0,
+				'field_show_on_reg'	=> 0,
+				'field_hide'		=> 0,
+				'field_show_profile'=> 0,
+			);
+
+			if ($row['field_required'])
+			{
+				$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_show_on_reg'])
+			{
+				$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_hide'])
+			{
+				// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
+				$sql_ary['field_hide'] = 1;
+			}
+			else
+			{
+				// equivelant to "none", which is the "Display in user control panel" option
+				$sql_ary['field_show_profile'] = 1;
+			}
+
+			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
+		}
+
+		$this->db->sql_freeresult($result);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_5.php b/phpBB/includes/db/migration/data/3_0_5.php
new file mode 100644
index 0000000000..2f80970781
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_5.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_5 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_5_rc1part2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.5')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1.php b/phpBB/includes/db/migration/data/3_0_5_rc1.php
new file mode 100644
index 0000000000..cbf28c0be6
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_5_rc1.php
@@ -0,0 +1,119 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_4');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		$search_indexing_state = $this->config['search_indexing_state'];
+
+		return array(
+			array('config.add', array('captcha_gd_wave', 0)),
+			array('config.add', array('captcha_gd_3d_noise', 1)),
+			array('config.add', array('captcha_gd_fonts', 1)),
+			array('config.add', array('confirm_refresh', 1)),
+			array('config.add', array('max_num_search_keywords', 10)),
+			array('config.remove', array('search_indexing_state')),
+			array('config.add', array('search_indexing_state', $search_indexing_state, true)),
+			array('custom', array(array(&$this, 'hash_old_passwords'))),
+			array('custom', array(array(&$this, 'update_ichiro_bot'))),
+		);
+	}
+
+	function hash_old_passwords()
+	{
+		$sql = 'SELECT user_id, user_password
+				FROM ' . $this->table_prefix . 'users
+				WHERE user_pass_convert = 1';
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (strlen($row['user_password']) == 32)
+			{
+				$sql_ary = array(
+					'user_password'	=> phpbb_hash($row['user_password']),
+				);
+
+				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
+			}
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	function update_ichiro_bot()
+	{
+		// Adjust bot entry
+		$sql = 'UPDATE ' . $this->table_prefix . "bots
+			SET bot_agent = 'ichiro/'
+			WHERE bot_agent = 'ichiro/2'";
+		$this->sql_query($sql);
+	}
+
+	function remove_duplicate_auth_options()
+	{
+		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
+		$sql = 'SELECT auth_option
+			FROM ' . $this->table_prefix . 'acl_options
+			GROUP BY auth_option
+			HAVING COUNT(*) >= 2';
+		$result = $this->db->sql_query($sql);
+
+		$auth_options = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$auth_options[] = $row['auth_option'];
+		}
+		$this->db->sql_freeresult($result);
+
+		// Remove specific auth options
+		if (!empty($auth_options))
+		{
+			foreach ($auth_options as $option)
+			{
+				// Select auth_option_ids... the largest id will be preserved
+				$sql = 'SELECT auth_option_id
+					FROM ' . ACL_OPTIONS_TABLE . "
+					WHERE auth_option = '" . $db->sql_escape($option) . "'
+					ORDER BY auth_option_id DESC";
+				// sql_query_limit not possible here, due to bug in postgresql layer
+				$result = $this->db->sql_query($sql);
+
+				// Skip first row, this is our original auth option we want to preserve
+				$row = $this->db->sql_fetchrow($result);
+
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					// Ok, remove this auth option...
+					$this->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+				}
+				$this->db->sql_freeresult($result);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
new file mode 100644
index 0000000000..1fab0f8873
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
@@ -0,0 +1,37 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_5_rc1part2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_5_rc1');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'drop_keys'			=> array(
+				ACL_OPTIONS_TABLE		=> array('auth_option'),
+			),
+			'add_unique_index'	=> array(
+				ACL_OPTIONS_TABLE		=> array(
+					'auth_option'		=> array('auth_option'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.5-rc1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_6.php b/phpBB/includes/db/migration/data/3_0_6.php
new file mode 100644
index 0000000000..26176b9437
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_6.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_6 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_6_rc4');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.6')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc1.php b/phpBB/includes/db/migration/data/3_0_6_rc1.php
new file mode 100644
index 0000000000..35adcf52be
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_6_rc1.php
@@ -0,0 +1,279 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_5');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'confirm' => array(
+					'attempts' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_new' => array('BOOL', 1),
+					'user_reminded' => array('TINT:4', 0),
+					'user_reminded_time' => array('TIMESTAMP', 0),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_reported' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'reports' => array(
+					'pm_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_show_on_vt' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_options' => array('UINT:20', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'users' => array(
+					'user_options' => array('UINT:11', 230271),
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'reports' => array(
+					'post_id' => array('post_id'),
+					'pm_id' => array('pm_id'),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_username' => array('post_username:255'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
+			array('if', array(
+				($this->config['captcha_gd']),
+				array('config.update', array('captcha_plugin', 'phpbb_captcha_gd')),
+			)),
+
+			array('config.add', array('feed_enable', 0)),
+			array('config.add', array('feed_limit', 10)),
+			array('config.add', array('feed_overall_forums', 1)),
+			array('config.add', array('feed_overall_forums_limit', 15)),
+			array('config.add', array('feed_overall_topics', 0)),
+			array('config.add', array('feed_overall_topics_limit', 15)),
+			array('config.add', array('feed_forum', 1)),
+			array('config.add', array('feed_topic', 1)),
+			array('config.add', array('feed_item_statistics', 1)),
+
+			array('config.add', array('smilies_per_page', 50)),
+			array('config.add', array('allow_pm_report', 1)),
+			array('config.add', array('min_post_chars', 1)),
+			array('config.add', array('allow_quick_reply', 1)),
+			array('config.add', array('new_member_post_limit', 0)),
+			array('config.add', array('new_member_group_default', 0)),
+			array('config.add', array('delete_time', $this->config['edit_time'])),
+
+			array('config.add', array('allow_avatar', 0)),
+			array('if', array(
+				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
+				array('config.update', array('allow_avatar', 1)),
+			)),
+			array('config.add', array('allow_avatar_remote_upload', 0)),
+			array('if', array(
+				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
+				array('config.update', array('allow_avatar_remote_upload', 1)),
+			)),
+
+			array('module.add', array(
+				'acp',
+				'ACP_BOARD_CONFIGURATION',
+				array(
+					'module_basename'	=> 'acp_board',
+					'modes'				=> array('feed'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_CAT_USERS',
+				array(
+					'module_basename'	=> 'acp_users',
+					'modes'				=> array('warnings'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_SERVER_CONFIGURATION',
+				array(
+					'module_basename'	=> 'acp_send_statistics',
+					'modes'				=> array('send_statistics'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_FORUM_BASED_PERMISSIONS',
+				array(
+					'module_basename'	=> 'acp_permissions',
+					'modes'				=> array('setting_forum_copy'),
+				),
+			)),
+			array('module.add', array(
+				'mcp',
+				'MCP_REPORTS',
+				array(
+					'module_basename'	=> 'mcp_pm_reports',
+					'modes'				=> array('pm_reports','pm_reports_closed','pm_report_details'),
+				),
+			)),
+			array('custom', array(array(&$this, 'add_newly_registered_group'))),
+			array('custom', array(array(&$this, 'set_user_options_default'))),
+
+			array('config.update', array('version', '3.0.6-rc1')),
+		);
+	}
+
+	function set_user_options_default()
+	{
+		// 229376 is the added value to enable all three signature options
+		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
+		$this->sql_query($sql);
+	}
+
+	function add_newly_registered_group()
+	{
+		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . "
+			WHERE group_name = 'NEWLY_REGISTERED'";
+		$result = $this->db->sql_query($sql);
+		$group_id = (int) $this->db->sql_fetchfield('group_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$group_id)
+		{
+			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
+			$this->sql_query($sql);
+
+			$group_id = $this->db->sql_nextid();
+		}
+
+		// Insert new user role... at the end of the chain
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
+				AND role_type = 'u_'";
+		$result = $this->db->sql_query($sql);
+		$u_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$u_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'u_'";
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
+			$this->sql_query($sql);
+			$u_role = $this->db->sql_nextid();
+
+			// Now add the correct data to the roles...
+			// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
+			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
+			$this->sql_query($sql);
+
+			// Add user role to group
+			$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
+			$this->sql_query($sql);
+		}
+
+		// Insert new forum role
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
+				AND role_type = 'f_'";
+		$result = $this->db->sql_query($sql);
+		$f_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$f_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'f_'";
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
+			$this->sql_query($sql);
+			$f_role = $this->db->sql_nextid();
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
+			$this->sql_query($sql);
+		}
+
+		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
+		$sql = 'SELECT 1
+			FROM ' . USERS_TABLE . '
+			WHERE user_new = 0';
+		$result = $this->db->sql_query_limit($sql, 1);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$row)
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
+			$this->sql_query($sql);
+		}
+
+		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
+		// Check if the role is already assigned...
+		$sql = 'SELECT forum_id
+			FROM ' . ACL_GROUPS_TABLE . '
+			WHERE group_id = ' . $group_id . '
+				AND auth_role_id = ' . $f_role;
+		$result = $this->db->sql_query($sql);
+		$is_options = (int) $this->db->sql_fetchfield('forum_id');
+		$this->db->sql_freeresult($result);
+
+		// Not assigned at all... :/
+		if (!$is_options)
+		{
+			// Get postable forums
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type != ' . FORUM_LINK;
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$this->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)');
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		// Clear permissions...
+		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
+		$auth_admin = new auth_admin();
+		$auth_admin->acl_clear_prefetch();
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc2.php b/phpBB/includes/db/migration/data/3_0_6_rc2.php
new file mode 100644
index 0000000000..4092a5fa61
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_6_rc2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_6_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_6_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.6-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc3.php b/phpBB/includes/db/migration/data/3_0_6_rc3.php
new file mode 100644
index 0000000000..ec22d1da77
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_6_rc3.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_6_rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_6_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_cp_fields'))),
+
+			array('config.update', array('version', '3.0.6-rc3')),
+		);
+	}
+
+	function update_cp_fields()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
+			SET field_show_on_vt = 1
+			WHERE field_hide = 0
+				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc4.php b/phpBB/includes/db/migration/data/3_0_6_rc4.php
new file mode 100644
index 0000000000..e748c7a4ff
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_6_rc4.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_6_rc4 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_6_rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.6-rc4')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_7.php b/phpBB/includes/db/migration/data/3_0_7.php
new file mode 100644
index 0000000000..f27b56f778
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_7.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_7 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_7_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.7')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_7_pl1.php b/phpBB/includes/db/migration/data/3_0_7_pl1.php
new file mode 100644
index 0000000000..5543d6437a
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_7_pl1.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_7_pl1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_7');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.7-pl1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc1.php b/phpBB/includes/db/migration/data/3_0_7_rc1.php
new file mode 100644
index 0000000000..71584382e8
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_7_rc1.php
@@ -0,0 +1,53 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_6');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'drop_keys' => array(
+				$this->table_prefix . 'log' => array('log_time'),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'topics_track' => array(
+					'topic_id' => array('topic_id'),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('feed_overall', 1)),
+			array('config.add', array('feed_http_auth', 0)),
+			array('config.add', array('feed_limit_post', $this->config['feed_limit'])),
+			array('config.add', array('feed_limit_topic', $this->config['feed_overall_topics_limit'])),
+			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
+			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
+			array('custom', array(array(&$this, 'delete_text_templates'))),
+
+			array('config.update', array('version', '3.0.7-rc1')),
+		);
+	}
+
+	function delete_text_templates()
+	{
+		// Delete all text-templates from the template_data
+		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
+			WHERE template_filename ' . $this->db->sql_like_expression($this->db->any_char . '.txt');
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc2.php b/phpBB/includes/db/migration/data/3_0_7_rc2.php
new file mode 100644
index 0000000000..4e380c810d
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_7_rc2.php
@@ -0,0 +1,72 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_7_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_7_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_email_hash'))),
+
+			array('config.update', array('version', '3.0.7-rc2')),
+		);
+	}
+
+	function update_email_hash($start = 0)
+	{
+		$limit = 1000;
+
+		$sql = 'SELECT user_id, user_email, user_email_hash
+			FROM ' . USERS_TABLE . '
+			WHERE user_type <> ' . USER_IGNORE . "
+				AND user_email <> ''";
+		$result = $this->db->sql_query_limit($sql, $limit, $start);
+
+		$i = 0;
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$i++;
+
+			// Snapshot of the phpbb_email_hash() function
+			// We cannot call it directly because the auto updater updates the DB first. :/
+			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
+
+			if ($user_email_hash != $row['user_email_hash'])
+			{
+				$sql_ary = array(
+					'user_email_hash'	=> $user_email_hash,
+				);
+
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE user_id = ' . (int) $row['user_id'];
+				$this->sql_query($sql);
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		if ($i < $limit)
+		{
+			// Completed
+			return;
+		}
+
+		return $start + $limit;
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_8.php b/phpBB/includes/db/migration/data/3_0_8.php
new file mode 100644
index 0000000000..a5defc8278
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_8.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_8 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_8_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.8')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_8_rc1.php b/phpBB/includes/db/migration/data/3_0_8_rc1.php
new file mode 100644
index 0000000000..78db06b512
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_8_rc1.php
@@ -0,0 +1,221 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_7_pl1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'update_module_auth'))),
+			array('custom', array(array(&$this, 'update_bots'))),
+			array('custom', array(array(&$this, 'delete_orphan_shadow_topics'))),
+			array('module.add', array(
+				'acp',
+				'ACP_MESSAGES',
+				array(
+					'module_basename'	=> 'acp_board',
+					'modes'				=> array('post'),
+				),
+			)),
+			array('config.add', array('load_unreads_search', 1)),
+			array('config.update_if_equals', array(600, 'queue_interval', 60)),
+			array('config.update_if_equals', array(50, 'email_package_size', 20)),
+
+			array('config.update', array('version', '3.0.8-rc1')),
+		);
+	}
+
+	function update_file_extension_group_names()
+	{
+		// Update file extension group names to use language strings.
+		$sql = 'SELECT lang_dir
+			FROM ' . LANG_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		$extension_groups_updated = array();
+		while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
+		{
+			$lang_dir = basename($lang_dir);
+
+			// The language strings we need are either in language/.../acp/attachments.php
+			// in the update package if we're updating to 3.0.8-RC1 or later,
+			// or they are in language/.../install.php when we're updating from 3.0.7-PL1 or earlier.
+			// On an already updated board, they can also already be in language/.../acp/attachments.php
+			// in the board root.
+			$lang_files = array(
+				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.{$this->php_ext}",
+				"{$this->phpbb_root_path}language/$lang_dir/install.{$this->php_ext}",
+				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.{$this->php_ext}",
+			);
+
+			foreach ($lang_files as $lang_file)
+			{
+				if (!file_exists($lang_file))
+				{
+					continue;
+				}
+
+				$lang = array();
+				include($lang_file);
+
+				foreach($lang as $lang_key => $lang_val)
+				{
+					if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
+					{
+						continue;
+					}
+
+					$sql_ary = array(
+						'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
+					);
+
+					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+						SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+						WHERE group_name = '" . $this->db->sql_escape($lang_val) . "'";
+					$this->sql_query($sql);
+
+					$extension_groups_updated[$lang_key] = true;
+				}
+			}
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	function update_module_auth()
+	{
+		$sql = 'UPDATE ' . MODULES_TABLE . '
+			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
+			WHERE module_class = \'ucp\'
+				AND module_basename = \'profile\'
+				AND module_mode = \'avatar\'';
+		$this->sql_query($sql);
+	}
+
+	function update_bots()
+	{
+		$bot_name = 'Bing [Bot]';
+		$bot_name_clean = utf8_clean_string($bot_name);
+
+		$sql = 'SELECT user_id
+			FROM ' . USERS_TABLE . "
+			WHERE username_clean = '" . $this->db->sql_escape($bot_name_clean) . "'";
+		$result = $this->db->sql_query($sql);
+		$bing_already_added = (bool) $this->db->sql_fetchfield('user_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$bing_already_added)
+		{
+			$bot_agent = 'bingbot/';
+			$bot_ip = '';
+			$sql = 'SELECT group_id, group_colour
+				FROM ' . GROUPS_TABLE . "
+				WHERE group_name = 'BOTS'";
+			$result = $this->db->sql_query($sql);
+			$group_row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$group_row)
+			{
+				// default fallback, should never get here
+				$group_row['group_id'] = 6;
+				$group_row['group_colour'] = '9E8DA7';
+			}
+
+			if (!function_exists('user_add'))
+			{
+				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+			}
+
+			$user_row = array(
+				'user_type'				=> USER_IGNORE,
+				'group_id'				=> $group_row['group_id'],
+				'username'				=> $bot_name,
+				'user_regdate'			=> time(),
+				'user_password'			=> '',
+				'user_colour'			=> $group_row['group_colour'],
+				'user_email'			=> '',
+				'user_lang'				=> $this->config['default_lang'],
+				'user_style'			=> $this->config['default_style'],
+				'user_timezone'			=> 0,
+				'user_dateformat'		=> $this->config['default_dateformat'],
+				'user_allow_massemail'	=> 0,
+			);
+
+			$user_id = user_add($user_row);
+
+			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
+				'bot_active'	=> 1,
+				'bot_name'		=> (string) $bot_name,
+				'user_id'		=> (int) $user_id,
+				'bot_agent'		=> (string) $bot_agent,
+				'bot_ip'		=> (string) $bot_ip,
+			));
+
+			$this->sql_query($sql);
+		}
+	}
+
+	function delete_orphan_shadow_topics()
+	{
+		// Delete shadow topics pointing to not existing topics
+		$batch_size = 500;
+
+		// Set of affected forums we have to resync
+		$sync_forum_ids = array();
+
+		$sql_array = array(
+			'SELECT'	=> 't1.topic_id, t1.forum_id',
+			'FROM'		=> array(
+				TOPICS_TABLE	=> 't1',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(TOPICS_TABLE	=> 't2'),
+					'ON'	=> 't1.topic_moved_id = t2.topic_id',
+				),
+			),
+			'WHERE'		=> 't1.topic_moved_id <> 0
+						AND t2.topic_id IS NULL',
+		);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query_limit($sql, $batch_size);
+
+		$topic_ids = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$topic_ids[] = (int) $row['topic_id'];
+
+			$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($topic_ids))
+		{
+			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
+			$this->db->sql_query($sql);
+
+			// Sync the forums we have deleted shadow topics from.
+			sync('forum', 'forum_id', $sync_forum_ids, true, true);
+
+			return false;
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_9.php b/phpBB/includes/db/migration/data/3_0_9.php
new file mode 100644
index 0000000000..eb359e2697
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_9.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_9 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_9_rc4');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc1.php b/phpBB/includes/db/migration/data/3_0_9_rc1.php
new file mode 100644
index 0000000000..ea49cdbba9
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_9_rc1.php
@@ -0,0 +1,110 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_8');
+	}
+
+	function update_schema()
+	{
+		return array(
+			'add_tables' => array(
+				$this->table_prefix . 'login_attempts' => array(
+					'COLUMNS' => array(
+						// this column was removed from the database updater
+						// after 3.0.9-RC3 was released. It might still exist
+						// in 3.0.9-RCX installations and has to be dropped in
+						// 3.0.12 after the db_tools class is capable of properly
+						// removing a primary key.
+						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
+						'attempt_ip'			=> array('VCHAR:40', ''),
+						'attempt_browser'		=> array('VCHAR:150', ''),
+						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
+						'attempt_time'			=> array('TIMESTAMP', 0),
+						'user_id'				=> array('UINT', 0),
+						'username'				=> array('VCHAR_UNI:255', 0),
+						'username_clean'		=> array('VCHAR_CI', 0),
+					),
+					//'PRIMARY_KEY' => 'attempt_id',
+					'KEYS' => array(
+						'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
+						'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+						'att_time' => array('INDEX', array('attempt_time')),
+						'user_id' => array('INDEX', 'user_id'),
+					),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'bbcodes' => array(
+					'bbcode_id' => array('USINT', 0),
+				),
+			),
+		);
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.add', array('ip_login_limit_max', 50)),
+			array('config.add', array('ip_login_limit_time', 21600)),
+			array('config.add', array('ip_login_limit_use_forwarded', 0)),
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
+
+			array('config.update', array('version', '3.0.9-rc1')),
+		);
+	}
+
+	function update_file_extension_group_names()
+	{
+		// Update file extension group names to use language strings, again.
+		$sql = 'SELECT group_id, group_name
+			FROM ' . EXTENSION_GROUPS_TABLE . '
+			WHERE group_name ' . $this->db->sql_like_expression('EXT_GROUP_' . $this->db->any_char);
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
+			);
+
+			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+				WHERE group_id = ' . $row['group_id'];
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	function fix_firebird_qa_captcha()
+	{
+		// Recover from potentially broken Q&A CAPTCHA table on firebird
+		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
+		// without data loss
+		if ($this->db_tools->sql_layer == 'firebird')
+		{
+			$tables = array(
+				$this->table_prefix . 'captcha_questions',
+				$this->table_prefix . 'captcha_answers',
+				$this->table_prefix . 'qa_confirm',
+			);
+			foreach ($tables as $table)
+			{
+				if ($this->db_tools->sql_table_exists($table))
+				{
+					$this->db_tools->sql_table_drop($table);
+				}
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc2.php b/phpBB/includes/db/migration/data/3_0_9_rc2.php
new file mode 100644
index 0000000000..e3c4716665
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_9_rc2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_9_rc2 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_9_rc1');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc3.php b/phpBB/includes/db/migration/data/3_0_9_rc3.php
new file mode 100644
index 0000000000..3cdecb96ae
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_9_rc3.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_9_rc3 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_9_rc2');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc3')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc4.php b/phpBB/includes/db/migration/data/3_0_9_rc4.php
new file mode 100644
index 0000000000..c2a92e618a
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_0_9_rc4.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_0_9_rc4 extends phpbb_db_migration
+{
+	function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_9_rc3');
+	}
+
+	function update_schema()
+	{
+		return array();
+	}
+
+	function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc4')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_1_0_dev.php b/phpBB/includes/db/migration/data/3_1_0_dev.php
new file mode 100644
index 0000000000..2771d82d83
--- /dev/null
+++ b/phpBB/includes/db/migration/data/3_1_0_dev.php
@@ -0,0 +1,375 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_3_1_0_dev extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array(
+			'phpbb_db_migration_data_3_0_11',
+			'phpbb_db_migration_data_extensions',
+			'phpbb_db_migration_data_style_update_p2',
+			'phpbb_db_migration_data_timezone',
+		);
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns'		=> array(
+				GROUPS_TABLE		=> array(
+					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
+				),
+				PROFILE_FIELDS_TABLE	=> array(
+					'field_show_on_pm'		=> array('BOOL', 0),
+				),
+				STYLES_TABLE		=> array(
+					'style_path'			=> array('VCHAR:100', ''),
+					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+					'style_parent_id'		=> array('UINT:4', 0),
+					'style_parent_tree'		=> array('TEXT', ''),
+				),
+				REPORTS_TABLE		=> array(
+					'reported_post_text'		=> array('MTEXT_UNI', ''),
+					'reported_post_uid'			=> array('VCHAR:8', ''),
+					'reported_post_bitfield'	=> array('VCHAR:255', ''),
+				),
+			),
+			'change_columns'	=> array(
+				GROUPS_TABLE		=> array(
+					'group_legend'		=> array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
+
+			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
+			array('config.add', array('fulltext_postgres_min_word_len', 4)),
+			array('config.add', array('fulltext_postgres_max_word_len', 254)),
+			array('config.add', array('fulltext_sphinx_stopwords', 0)),
+			array('config.add', array('fulltext_sphinx_indexer_mem_limit', 512)),
+
+			array('config.add', array('load_jquery_cdn', 0)),
+			array('config.add', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js')),
+
+			array('config.add', array('use_system_cron', 0)),
+
+			array('config.add', array('legend_sort_groupname', 0)),
+			array('config.add', array('teampage_forums', 1)),
+			array('config.add', array('teampage_memberships', 1)),
+
+			array('config.add', array('load_cpf_pm', 0)),
+
+			array('config.add', array('display_last_subject', 1)),
+
+			array('config.add', array('assets_version', 1)),
+
+			array('config.add', array('site_home_url', '')),
+			array('config.add', array('site_home_text', '')),
+
+			array('permission.add', array('u_chgprofileinfo', true, 'u_sig')),
+
+			array('module.add', array(
+				'acp',
+				'ACP_GROUPS',
+				array(
+					'module_basename'	=> 'acp_groups',
+					'modes'				=> array('position'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_ATTACHMENTS',
+				array(
+					'module_basename'	=> 'acp_attachments',
+					'modes'				=> array('manage'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_STYLE_MANAGEMENT',
+				array(
+					'module_basename'	=> 'acp_styles',
+					'modes'				=> array('install', 'cache'),
+				),
+			)),
+			array('module.add', array(
+				'ucp',
+				'UCP_PROFILE',
+				array(
+					'module_basename'	=> 'ucp_profile',
+					'modes'				=> array('autologin_keys'),
+				),
+			)),
+			// Module will be renamed later
+			array('module.add', array(
+				'acp',
+				'ACP_CAT_STYLES',
+				'ACP_LANGUAGE'
+			)),
+
+			array('module.remove', array(
+				'acp',
+				false,
+				'ACP_TEMPLATES',
+			)),
+			array('module.remove', array(
+				'acp',
+				false,
+				'ACP_THEMES',
+			)),
+			array('module.remove', array(
+				'acp',
+				false,
+				'ACP_IMAGESETS',
+			)),
+
+			array('custom', array(array($this, 'rename_module_basenames'))),
+			array('custom', array(array($this, 'rename_styles_module'))),
+			array('custom', array(array($this, 'add_group_teampage'))),
+			array('custom', array(array($this, 'update_group_legend'))),
+			array('custom', array(array($this, 'localise_global_announcements'))),
+			array('custom', array(array($this, 'update_ucp_pm_basename'))),
+			array('custom', array(array($this, 'update_ucp_profile_auth'))),
+			array('custom', array(array($this, 'move_customise_modules'))),
+
+			array('config.update', array('version', '3.1.0-dev')),
+		);
+	}
+
+	public function move_customise_modules()
+	{
+		// Move language management to new location in the Customise tab
+		// First get language module id
+		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+			WHERE module_basename = 'acp_language'";
+		$result = $this->db->sql_query($sql);
+		$language_module_id = $this->db->sql_fetchfield('module_id');
+		$this->db->sql_freeresult($result);
+		// Next get language management module id of the one just created
+		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+			WHERE module_langname = 'ACP_LANGUAGE'";
+		$result = $this->db->sql_query($sql);
+		$language_management_module_id = $this->db->sql_fetchfield('module_id');
+		$this->db->sql_freeresult($result);
+
+		if (!class_exists('acp_modules'))
+		{
+			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
+		}
+		// acp_modules calls adm_back_link, which is undefined at this point
+		if (!function_exists('adm_back_link'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
+		}
+		$module_manager = new acp_modules();
+		$module_manager->module_class = 'acp';
+		$module_manager->move_module($language_module_id, $language_management_module_id);
+	}
+
+	public function update_ucp_pm_basename()
+	{
+		$sql = 'SELECT module_id, module_basename
+			FROM ' . MODULES_TABLE . "
+			WHERE module_basename <> 'ucp_pm' AND
+				module_langname='UCP_PM'";
+		$result = $this->db->sql_query_limit($sql, 1);
+
+		if ($row = $this->db->sql_fetchrow($result))
+		{
+			// This update is still not applied. Applying it
+
+			$sql = 'UPDATE ' . MODULES_TABLE . "
+				SET module_basename = 'ucp_pm'
+				WHERE  module_id = " . (int) $row['module_id'];
+
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function update_ucp_profile_auth()
+	{
+		// Update the auth setting for the module
+		$sql = 'UPDATE ' . MODULES_TABLE . "
+			SET module_auth = 'acl_u_chgprofileinfo'
+			WHERE module_class = 'ucp'
+				AND module_basename = 'ucp_profile'
+				AND module_mode = 'profile_info'";
+		$this->sql_query($sql);
+	}
+
+	public function rename_styles_module()
+	{
+		// Rename styles module to Customise
+		$sql = 'UPDATE ' . MODULES_TABLE . "
+			SET module_langname = 'ACP_CAT_CUSTOMISE'
+			WHERE module_langname = 'ACP_CAT_STYLES'";
+		$this->sql_query($sql);
+	}
+
+	public function rename_module_basenames()
+	{
+		// rename all module basenames to full classname
+		$sql = 'SELECT module_id, module_basename, module_class
+			FROM ' . MODULES_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$module_id = (int) $row['module_id'];
+			unset($row['module_id']);
+
+			if (!empty($row['module_basename']) && !empty($row['module_class']))
+			{
+				// all the class names start with class name or with phpbb_ for auto loading
+				if (strpos($row['module_basename'], $row['module_class'] . '_') !== 0 &&
+					strpos($row['module_basename'], 'phpbb_') !== 0)
+				{
+					$row['module_basename'] = $row['module_class'] . '_' . $row['module_basename'];
+
+					$sql_update = $this->db->sql_build_array('UPDATE', $row);
+
+					$sql = 'UPDATE ' . MODULES_TABLE . '
+						SET ' . $sql_update . '
+						WHERE module_id = ' . $module_id;
+					$this->sql_query($sql);
+				}
+			}
+		}
+
+		$this->db->sql_freeresult($result);
+	}
+
+	public function add_group_teampage()
+	{
+		$sql = 'UPDATE ' . GROUPS_TABLE . '
+			SET group_teampage = 1
+			WHERE group_type = ' . GROUP_SPECIAL . "
+				AND group_name = 'ADMINISTRATORS'";
+		$this->sql_query($sql);
+
+		$sql = 'UPDATE ' . GROUPS_TABLE . '
+			SET group_teampage = 2
+			WHERE group_type = ' . GROUP_SPECIAL . "
+				AND group_name = 'GLOBAL_MODERATORS'";
+		$this->sql_query($sql);
+	}
+
+	public function update_group_legend()
+	{
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . '
+			WHERE group_legend = 1
+			ORDER BY group_name ASC';
+		$result = $this->db->sql_query($sql);
+
+		$next_legend = 1;
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql = 'UPDATE ' . GROUPS_TABLE . '
+				SET group_legend = ' . $next_legend . '
+				WHERE group_id = ' . (int) $row['group_id'];
+			$this->sql_query($sql);
+
+			$next_legend++;
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function localise_global_announcements()
+	{
+		// Localise Global Announcements
+		$sql = 'SELECT topic_id, topic_approved, (topic_replies + 1) AS topic_posts, topic_last_post_id, topic_last_post_subject, topic_last_post_time, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour
+			FROM ' . TOPICS_TABLE . '
+			WHERE forum_id = 0
+				AND topic_type = ' . POST_GLOBAL;
+		$result = $this->db->sql_query($sql);
+
+		$global_announcements = $update_lastpost_data = array();
+		$update_lastpost_data['forum_last_post_time'] = 0;
+		$update_forum_data = array(
+			'forum_posts'		=> 0,
+			'forum_topics'		=> 0,
+			'forum_topics_real'	=> 0,
+		);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$global_announcements[] = (int) $row['topic_id'];
+
+			$update_forum_data['forum_posts'] += (int) $row['topic_posts'];
+			$update_forum_data['forum_topics_real']++;
+			if ($row['topic_approved'])
+			{
+				$update_forum_data['forum_topics']++;
+			}
+
+			if ($update_lastpost_data['forum_last_post_time'] < $row['topic_last_post_time'])
+			{
+				$update_lastpost_data = array(
+					'forum_last_post_id'		=> (int) $row['topic_last_post_id'],
+					'forum_last_post_subject'	=> $row['topic_last_post_subject'],
+					'forum_last_post_time'		=> (int) $row['topic_last_post_time'],
+					'forum_last_poster_id'		=> (int) $row['topic_last_poster_id'],
+					'forum_last_poster_name'	=> $row['topic_last_poster_name'],
+					'forum_last_poster_colour'	=> $row['topic_last_poster_colour'],
+				);
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($global_announcements))
+		{
+			// Update the post/topic-count for the forum and the last-post if needed
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type = ' . FORUM_POST;
+			$result = $this->db->sql_query_limit($sql, 1);
+			$ga_forum_id = $this->db->sql_fetchfield('forum_id');
+			$this->db->sql_freeresult($result);
+
+			$sql = 'SELECT forum_last_post_time
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_id = ' . $ga_forum_id;
+			$result = $this->db->sql_query($sql);
+			$lastpost = (int) $this->db->sql_fetchfield('forum_last_post_time');
+			$this->db->sql_freeresult($result);
+
+			$sql_update = 'forum_posts = forum_posts + ' . $update_forum_data['forum_posts'] . ', ';
+			$sql_update .= 'forum_topics_real = forum_topics_real + ' . $update_forum_data['forum_topics_real'] . ', ';
+			$sql_update .= 'forum_topics = forum_topics + ' . $update_forum_data['forum_topics'];
+			if ($lastpost < $update_lastpost_data['forum_last_post_time'])
+			{
+				$sql_update .= ', ' . $this->db->sql_build_array('UPDATE', $update_lastpost_data);
+			}
+
+			$sql = 'UPDATE ' . FORUMS_TABLE . '
+				SET ' . $sql_update . '
+				WHERE forum_id = ' . $ga_forum_id;
+			$this->sql_query($sql);
+
+			// Update some forum_ids
+			$table_ary = array(TOPICS_TABLE, POSTS_TABLE, LOG_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE);
+			foreach ($table_ary as $table)
+			{
+				$sql = "UPDATE $table
+					SET forum_id = $ga_forum_id
+					WHERE " . $this->db->sql_in_set('topic_id', $global_announcements);
+				$this->sql_query($sql);
+			}
+			unset($table_ary);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/extensions.php b/phpBB/includes/db/migration/data/extensions.php
new file mode 100644
index 0000000000..b8379483a3
--- /dev/null
+++ b/phpBB/includes/db/migration/data/extensions.php
@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_extensions extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables'		=> array(
+				EXT_TABLE				=> array(
+					'COLUMNS'			=> array(
+						'ext_name'		=> array('VCHAR', ''),
+						'ext_active'	=> array('BOOL', 0),
+						'ext_state'		=> array('TEXT', ''),
+					),
+					'KEYS'				=> array(
+						'ext_name'		=> array('UNIQUE', 'ext_name'),
+					),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			// Module will be renamed later
+			array('module.add', array(
+				'acp',
+				'ACP_CAT_STYLES',
+				'ACP_EXTENSION_MANAGEMENT'
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_EXTENSION_MANAGEMENT',
+				array(
+					'module_basename'	=> 'acp_extensions',
+					'modes'				=> array('main'),
+				),
+			)),
+			array('permission.add', array('a_extensions', true, 'a_styles')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/style_update_p1.php b/phpBB/includes/db/migration/data/style_update_p1.php
new file mode 100644
index 0000000000..387b37de8e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/style_update_p1.php
@@ -0,0 +1,157 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_style_update_p1 extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array();
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'styles_update'))),
+		);
+	}
+
+	public function styles_update()
+	{
+		// Get list of valid 3.1 styles
+		$available_styles = array('prosilver');
+
+		$iterator = new DirectoryIterator($this->phpbb_root_path . 'styles');
+		$skip_dirs = array('.', '..', 'prosilver');
+		foreach ($iterator as $fileinfo)
+		{
+			if ($fileinfo->isDir() && !in_array($fileinfo->getFilename(), $skip_dirs) && file_exists($fileinfo->getPathname() . '/style.cfg'))
+			{
+				$style_cfg = parse_cfg_file($fileinfo->getPathname() . '/style.cfg');
+				if (isset($style_cfg['phpbb_version']) && version_compare($style_cfg['phpbb_version'], '3.1.0-dev', '>='))
+				{
+					// 3.1 style
+					$available_styles[] = $fileinfo->getFilename();
+				}
+			}
+		}
+
+		// Get all installed styles
+		if ($this->db_tools->sql_table_exists(STYLES_IMAGESET_TABLE))
+		{
+			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id, i.imageset_path
+				FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
+				WHERE t.template_id = s.template_id
+					AND c.theme_id = s.theme_id
+					AND i.imageset_id = s.imageset_id";
+		}
+		else
+		{
+			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id
+				FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . " c
+				WHERE t.template_id = s.template_id
+					AND c.theme_id = s.theme_id";
+		}
+		$result = $this->db->sql_query($sql);
+
+		$styles = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$styles[] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		// Decide which styles to keep, all others will be deleted
+		$valid_styles = array();
+		foreach ($styles as $style_row)
+		{
+			if (
+				// Delete styles with parent style (not supported yet)
+				$style_row['template_inherits_id'] == 0 &&
+				// Check if components match
+				$style_row['template_path'] == $style_row['theme_path'] && (!isset($style_row['imageset_path']) || $style_row['template_path'] == $style_row['imageset_path']) &&
+				// Check if components are valid
+				in_array($style_row['template_path'], $available_styles)
+				)
+			{
+				// Valid style. Keep it
+				$sql_ary = array(
+					'style_path'	=> $style_row['template_path'],
+					'bbcode_bitfield'	=> $style_row['bbcode_bitfield'],
+					'style_parent_id'	=> 0,
+					'style_parent_tree'	=> '',
+				);
+				$this->sql_query('UPDATE ' . STYLES_TABLE . '
+					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE style_id = ' . $style_row['style_id']);
+				$valid_styles[] = (int) $style_row['style_id'];
+			}
+		}
+
+		// Remove old entries from styles table
+		if (!sizeof($valid_styles))
+		{
+			// No valid styles: remove everything and add prosilver
+			$this->sql_query('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
+
+			$sql_ary = array(
+				'style_name'		=> 'prosilver',
+				'style_copyright'	=> '&copy; phpBB Group',
+				'style_active'		=> 1,
+				'style_path'		=> 'prosilver',
+				'bbcode_bitfield'	=> 'lNg=',
+				'style_parent_id'	=> 0,
+				'style_parent_tree'	=> '',
+
+				// Will be removed in the next step
+				'imageset_id'		=> 0,
+				'template_id'		=> 0,
+				'theme_id'			=> 0,
+			);
+
+			$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+			$this->sql_query($sql);
+
+			$sql = 'SELECT style_id
+				FROM ' . $table . "
+				WHERE style_name = 'prosilver'";
+			$result = $this->sql_query($sql);
+			$default_style = $this->db->sql_fetchfield($result);
+			$this->db->sql_freeresult($result);
+
+			set_config('default_style', $default_style);
+
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
+			$this->sql_query($sql);
+		}
+		else
+		{
+			// There are valid styles in styles table. Remove styles that are outdated
+			$this->sql_query('DELETE FROM ' . STYLES_TABLE . '
+				WHERE ' . $this->db->sql_in_set('style_id', $valid_styles, true));
+
+			// Change default style
+			if (!in_array($this->config['default_style'], $valid_styles))
+			{
+				$this->sql_query('UPDATE ' . CONFIG_TABLE . "
+					SET config_value = '" . $valid_styles[0] . "'
+					WHERE config_name = 'default_style'");
+			}
+
+			// Reset styles for users
+			$this->sql_query('UPDATE ' . USERS_TABLE . '
+				SET user_style = 0
+				WHERE ' . $this->db->sql_in_set('user_style', $valid_styles, true));
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/style_update_p2.php b/phpBB/includes/db/migration/data/style_update_p2.php
new file mode 100644
index 0000000000..db4b7f1753
--- /dev/null
+++ b/phpBB/includes/db/migration/data/style_update_p2.php
@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_style_update_p2 extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array('phpbb_db_migration_data_style_update_p1');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_columns'	=> array(
+				STYLES_TABLE		=> array(
+					'imageset_id',
+					'template_id',
+					'theme_id',
+				),
+			),
+
+			'drop_tables'	=> array(
+				STYLES_IMAGESET_TABLE,
+				STYLES_IMAGESET_DATA_TABLE,
+				STYLES_TEMPLATE_TABLE,
+				STYLES_TEMPLATE_DATA_TABLE,
+				STYLES_THEME_TABLE,
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array();
+	}
+}
diff --git a/phpBB/includes/db/migration/data/timezone.php b/phpBB/includes/db/migration/data/timezone.php
new file mode 100644
index 0000000000..7734ed4b76
--- /dev/null
+++ b/phpBB/includes/db/migration/data/timezone.php
@@ -0,0 +1,161 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_timezone extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array('phpbb_db_migration_data_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				USERS_TABLE			=> array(
+					'user_timezone'		=> array('VCHAR:100', ''),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_timezones'))),
+		);
+	}
+
+	public function update_timezones()
+	{
+		// Update user timezones
+		$sql = 'SELECT user_dst, user_timezone
+			FROM ' . USERS_TABLE . '
+			GROUP BY user_timezone, user_dst';
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . "
+				SET user_timezone = '" . $this->db->sql_escape($this->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
+				WHERE user_timezone = '" . $this->db->sql_escape($row['user_timezone']) . "'
+					AND user_dst = " . (int) $row['user_dst'];
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+
+		// Update board default timezone
+		$sql = 'UPDATE ' . CONFIG_TABLE . "
+			SET config_value = '" . $this->convert_phpbb30_timezone($this->config['board_timezone'], $this->config['board_dst']) . "'
+			WHERE config_name = 'board_timezone'";
+		$this->sql_query($sql);
+
+		// After we have calculated the timezones we can delete user_dst column from user table.
+		$this->db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
+	}
+
+	/**
+	* Determine the new timezone for a given phpBB 3.0 timezone and
+	* "Daylight Saving Time" option
+	*
+	*	@param	$timezone	float	Users timezone in 3.0
+	*	@param	$dst		int		Users daylight saving time
+	*	@return		string		Users new php Timezone which is used since 3.1
+	*/
+	public function convert_phpbb30_timezone($timezone, $dst)
+	{
+		$offset = $timezone + $dst;
+
+		switch ($timezone)
+		{
+			case '-12':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 12] Baker Island Time'
+			case '-11':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 11] Niue Time, Samoa Standard Time'
+			case '-10':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
+			case '-9.5':
+				return 'Pacific/Marquesas';			//'[UTC - 9:30] Marquesas Islands Time'
+			case '-9':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
+			case '-8':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 8] Pacific Standard Time'
+			case '-7':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 7] Mountain Standard Time'
+			case '-6':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 6] Central Standard Time'
+			case '-5':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 5] Eastern Standard Time'
+			case '-4.5':
+				return 'America/Caracas';			//'[UTC - 4:30] Venezuelan Standard Time'
+			case '-4':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 4] Atlantic Standard Time'
+			case '-3.5':
+				return 'America/St_Johns';			//'[UTC - 3:30] Newfoundland Standard Time'
+			case '-3':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
+			case '-2':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
+			case '-1':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
+			case '0':
+				return (!$dst) ? 'UTC' : 'Etc/GMT-1';	//'[UTC] Western European Time, Greenwich Mean Time'
+			case '1':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 1] Central European Time, West African Time'
+			case '2':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 2] Eastern European Time, Central African Time'
+			case '3':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 3] Moscow Standard Time, Eastern African Time'
+			case '3.5':
+				return 'Asia/Tehran';				//'[UTC + 3:30] Iran Standard Time'
+			case '4':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
+			case '4.5':
+				return 'Asia/Kabul';				//'[UTC + 4:30] Afghanistan Time'
+			case '5':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
+			case '5.5':
+				return 'Asia/Kolkata';				//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
+			case '5.75':
+				return 'Asia/Kathmandu';			//'[UTC + 5:45] Nepal Time'
+			case '6':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
+			case '6.5':
+				return 'Indian/Cocos';				//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
+			case '7':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
+			case '8':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
+			case '8.75':
+				return 'Australia/Eucla';			//'[UTC + 8:45] Southeastern Western Australia Standard Time'
+			case '9':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
+			case '9.5':
+				return 'Australia/ACT';				//'[UTC + 9:30] Australian Central Standard Time'
+			case '10':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
+			case '10.5':
+				return 'Australia/Lord_Howe';		//'[UTC + 10:30] Lord Howe Standard Time'
+			case '11':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
+			case '11.5':
+				return 'Pacific/Norfolk';			//'[UTC + 11:30] Norfolk Island Time'
+			case '12':
+				return 'Etc/GMT-12';				//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
+			case '12.75':
+				return 'Pacific/Chatham';			//'[UTC + 12:45] Chatham Islands Time'
+			case '13':
+				return 'Pacific/Tongatapu';			//'[UTC + 13] Tonga Time, Phoenix Islands Time'
+			case '14':
+				return 'Pacific/Kiritimati';		//'[UTC + 14] Line Island Time'
+			default:
+				return 'UTC';
+		}
+	}
+}
diff --git a/phpBB/includes/update_helpers.php b/phpBB/includes/update_helpers.php
deleted file mode 100644
index 69d678b2f8..0000000000
--- a/phpBB/includes/update_helpers.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*/
-
-/**
-* phpBB Update Helpers
-*/
-class phpbb_update_helpers
-{
-	/**
-	* Determine the new timezone for a given phpBB 3.0 timezone and
-	* "Daylight Saving Time" option
-	*
-	*	@param	$timezone	float	Users timezone in 3.0
-	*	@param	$dst		int		Users daylight saving time
-	*	@return		string		Users new php Timezone which is used since 3.1
-	*/
-	function convert_phpbb30_timezone($timezone, $dst)
-	{
-		$offset = $timezone + $dst;
-
-		switch ($timezone)
-		{
-			case '-12':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 12] Baker Island Time'
-			case '-11':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 11] Niue Time, Samoa Standard Time'
-			case '-10':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
-			case '-9.5':
-				return 'Pacific/Marquesas';			//'[UTC - 9:30] Marquesas Islands Time'
-			case '-9':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
-			case '-8':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 8] Pacific Standard Time'
-			case '-7':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 7] Mountain Standard Time'
-			case '-6':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 6] Central Standard Time'
-			case '-5':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 5] Eastern Standard Time'
-			case '-4.5':
-				return 'America/Caracas';			//'[UTC - 4:30] Venezuelan Standard Time'
-			case '-4':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 4] Atlantic Standard Time'
-			case '-3.5':
-				return 'America/St_Johns';			//'[UTC - 3:30] Newfoundland Standard Time'
-			case '-3':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
-			case '-2':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
-			case '-1':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
-			case '0':
-				return (!$dst) ? 'UTC' : 'Etc/GMT-1';	//'[UTC] Western European Time, Greenwich Mean Time'
-			case '1':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 1] Central European Time, West African Time'
-			case '2':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 2] Eastern European Time, Central African Time'
-			case '3':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 3] Moscow Standard Time, Eastern African Time'
-			case '3.5':
-				return 'Asia/Tehran';				//'[UTC + 3:30] Iran Standard Time'
-			case '4':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
-			case '4.5':
-				return 'Asia/Kabul';				//'[UTC + 4:30] Afghanistan Time'
-			case '5':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
-			case '5.5':
-				return 'Asia/Kolkata';				//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
-			case '5.75':
-				return 'Asia/Kathmandu';			//'[UTC + 5:45] Nepal Time'
-			case '6':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
-			case '6.5':
-				return 'Indian/Cocos';				//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
-			case '7':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
-			case '8':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
-			case '8.75':
-				return 'Australia/Eucla';			//'[UTC + 8:45] Southeastern Western Australia Standard Time'
-			case '9':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
-			case '9.5':
-				return 'Australia/ACT';				//'[UTC + 9:30] Australian Central Standard Time'
-			case '10':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
-			case '10.5':
-				return 'Australia/Lord_Howe';		//'[UTC + 10:30] Lord Howe Standard Time'
-			case '11':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
-			case '11.5':
-				return 'Pacific/Norfolk';			//'[UTC + 11:30] Norfolk Island Time'
-			case '12':
-				return 'Etc/GMT-12';				//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
-			case '12.75':
-				return 'Pacific/Chatham';			//'[UTC + 12:45] Chatham Islands Time'
-			case '13':
-				return 'Pacific/Tongatapu';			//'[UTC + 13] Tonga Time, Phoenix Islands Time'
-			case '14':
-				return 'Pacific/Kiritimati';		//'[UTC + 14] Line Island Time'
-			default:
-				return 'UTC';
-		}
-	}
-}
-- 
cgit v1.2.1


From ca55f6c4817d85b94562597cba79037ae440d973 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 17:18:12 -0600
Subject: [feature/migrations] Revert schema for migration data

PHPBB3-9737
---
 phpBB/includes/db/migration/data/3_0_1.php         |  5 --
 phpBB/includes/db/migration/data/3_0_10.php        |  5 --
 phpBB/includes/db/migration/data/3_0_10_rc1.php    |  5 --
 phpBB/includes/db/migration/data/3_0_10_rc2.php    |  5 --
 phpBB/includes/db/migration/data/3_0_10_rc3.php    |  5 --
 phpBB/includes/db/migration/data/3_0_11.php        |  5 --
 phpBB/includes/db/migration/data/3_0_11_rc1.php    |  5 --
 phpBB/includes/db/migration/data/3_0_11_rc2.php    | 11 +++
 phpBB/includes/db/migration/data/3_0_12_rc1.php    |  5 --
 phpBB/includes/db/migration/data/3_0_1_rc1.php     | 14 +++-
 phpBB/includes/db/migration/data/3_0_2.php         |  5 --
 phpBB/includes/db/migration/data/3_0_2_rc1.php     |  5 --
 phpBB/includes/db/migration/data/3_0_2_rc2.php     | 22 ++++-
 phpBB/includes/db/migration/data/3_0_3.php         |  5 --
 phpBB/includes/db/migration/data/3_0_3_rc1.php     | 15 ++++
 phpBB/includes/db/migration/data/3_0_4.php         |  5 --
 phpBB/includes/db/migration/data/3_0_4_rc1.php     | 11 +++
 phpBB/includes/db/migration/data/3_0_5.php         |  5 --
 .../includes/db/migration/data/3_0_5_rc1part2.php  |  4 +-
 phpBB/includes/db/migration/data/3_0_6.php         |  5 --
 phpBB/includes/db/migration/data/3_0_6_rc1.php     | 40 +++++++++
 phpBB/includes/db/migration/data/3_0_6_rc2.php     |  5 --
 phpBB/includes/db/migration/data/3_0_6_rc3.php     |  5 --
 phpBB/includes/db/migration/data/3_0_6_rc4.php     |  5 --
 phpBB/includes/db/migration/data/3_0_7.php         |  5 --
 phpBB/includes/db/migration/data/3_0_7_pl1.php     |  5 --
 phpBB/includes/db/migration/data/3_0_7_rc1.php     | 20 ++++-
 phpBB/includes/db/migration/data/3_0_7_rc2.php     |  5 --
 phpBB/includes/db/migration/data/3_0_8.php         |  5 --
 phpBB/includes/db/migration/data/3_0_8_rc1.php     |  5 --
 phpBB/includes/db/migration/data/3_0_9.php         |  5 --
 phpBB/includes/db/migration/data/3_0_9_rc1.php     |  9 ++
 phpBB/includes/db/migration/data/3_0_9_rc2.php     |  5 --
 phpBB/includes/db/migration/data/3_0_9_rc3.php     |  5 --
 phpBB/includes/db/migration/data/3_0_9_rc4.php     |  5 --
 phpBB/includes/db/migration/data/3_1_0_dev.php     | 37 ++++++--
 phpBB/includes/db/migration/data/extensions.php    | 11 ++-
 .../includes/db/migration/data/style_update_p1.php | 11 +--
 .../includes/db/migration/data/style_update_p2.php | 98 ++++++++++++++++++++--
 phpBB/includes/db/migration/data/timezone.php      | 11 +--
 phpBB/includes/db/migration/data/timezone_p2.php   | 38 +++++++++
 41 files changed, 314 insertions(+), 168 deletions(-)
 create mode 100644 phpBB/includes/db/migration/data/timezone_p2.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/3_0_1.php b/phpBB/includes/db/migration/data/3_0_1.php
index a2332c9b59..d71288c64b 100644
--- a/phpBB/includes/db/migration/data/3_0_1.php
+++ b/phpBB/includes/db/migration/data/3_0_1.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_1 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_1_rc1');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_10.php b/phpBB/includes/db/migration/data/3_0_10.php
index 07410c5ba1..17472562f2 100644
--- a/phpBB/includes/db/migration/data/3_0_10.php
+++ b/phpBB/includes/db/migration/data/3_0_10.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_10 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_10_rc3');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc1.php b/phpBB/includes/db/migration/data/3_0_10_rc1.php
index daac50a631..eebee44e39 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc1.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_10_rc1 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_9');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc2.php b/phpBB/includes/db/migration/data/3_0_10_rc2.php
index 234e4c5fc7..b81fde9bcb 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc2.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_10_rc2 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_10_rc1');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc3.php b/phpBB/includes/db/migration/data/3_0_10_rc3.php
index 075ce35e3e..d97b0b4aec 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc3.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_10_rc3 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_10_rc2');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_11.php b/phpBB/includes/db/migration/data/3_0_11.php
index 0bc9b6c4a5..b149cd374c 100644
--- a/phpBB/includes/db/migration/data/3_0_11.php
+++ b/phpBB/includes/db/migration/data/3_0_11.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_11 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_11_rc2');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc1.php b/phpBB/includes/db/migration/data/3_0_11_rc1.php
index 752efd72b2..3d4920bf49 100644
--- a/phpBB/includes/db/migration/data/3_0_11_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_11_rc1.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_10');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc2.php b/phpBB/includes/db/migration/data/3_0_11_rc2.php
index f2bed54085..e0638f02d7 100644
--- a/phpBB/includes/db/migration/data/3_0_11_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_11_rc2.php
@@ -25,6 +25,17 @@ class phpbb_db_migration_data_3_0_11_rc2 extends phpbb_db_migration
 		);
 	}
 
+	function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_novalue',
+				),
+			),
+		);
+	}
+
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_12_rc1.php b/phpBB/includes/db/migration/data/3_0_12_rc1.php
index 0d8702f19e..0b35de2ed5 100644
--- a/phpBB/includes/db/migration/data/3_0_12_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_12_rc1.php
@@ -16,11 +16,6 @@ class phpbb_db_migration_data_3_0_12_rc1 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_11');
 	}
 
-	public function update_schema()
-	{
-		return array();
-	}
-
 	public function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_1_rc1.php b/phpBB/includes/db/migration/data/3_0_1_rc1.php
index cf067d2e2c..a7af5d052d 100644
--- a/phpBB/includes/db/migration/data/3_0_1_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_1_rc1.php
@@ -26,7 +26,9 @@ class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
 				),
 			),
 			'drop_keys' => array(
-				$this->table_prefix . 'groups' => array('group_legend'),
+				$this->table_prefix . 'groups' => array(
+					'group_legend',
+				),
 			),
 			'add_index' => array(
 				$this->table_prefix . 'sessions' => array(
@@ -52,12 +54,16 @@ class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
 			),
 			'add_index' => array(
 				$this->table_prefix . 'groups' => array(
-					'group_legend' => 'group_legend',
+					'group_legend' => array('group_legend'),
 				),
 			),
 			'drop_keys' => array(
-				$this->table_prefix . 'sessions' => array('session_forum_id'),
-				$this->table_prefix . 'groups' => array('group_legend_name'),
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id',
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_legend_name',
+				),
 			),
 		);
 	}
diff --git a/phpBB/includes/db/migration/data/3_0_2.php b/phpBB/includes/db/migration/data/3_0_2.php
index 3469d8d178..19e9213262 100644
--- a/phpBB/includes/db/migration/data/3_0_2.php
+++ b/phpBB/includes/db/migration/data/3_0_2.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_2 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_2_rc2');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc1.php b/phpBB/includes/db/migration/data/3_0_2_rc1.php
index d3c2200f14..7dd321d83c 100644
--- a/phpBB/includes/db/migration/data/3_0_2_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_2_rc1.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_2_rc1 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_1');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc2.php b/phpBB/includes/db/migration/data/3_0_2_rc2.php
index 67fd1faec6..d73f9587c3 100644
--- a/phpBB/includes/db/migration/data/3_0_2_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_2_rc2.php
@@ -36,7 +36,9 @@ class phpbb_db_migration_data_3_0_2_rc2 extends phpbb_db_migration
 				),
 			),
 			'drop_keys' => array(
-				$this->table_prefix . 'sessions' => array('session_forum_id'),
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id',
+				),
 			),
 			'add_index' => array(
 				$this->table_prefix . 'sessions' => array(
@@ -46,6 +48,24 @@ class phpbb_db_migration_data_3_0_2_rc2 extends phpbb_db_migration
 		);
 	}
 
+	function revert_schema()
+	{
+		return array(
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array(
+						'session_forum_id',
+					),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_fid',
+				),
+			),
+		);
+	}
+
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_3.php b/phpBB/includes/db/migration/data/3_0_3.php
index dff375f438..d671b0cac3 100644
--- a/phpBB/includes/db/migration/data/3_0_3.php
+++ b/phpBB/includes/db/migration/data/3_0_3.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_3 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_3_rc1');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_3_rc1.php b/phpBB/includes/db/migration/data/3_0_3_rc1.php
index 2320c4ac4b..9cce80be74 100644
--- a/phpBB/includes/db/migration/data/3_0_3_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_3_rc1.php
@@ -29,6 +29,21 @@ class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
 		);
 	}
 
+	function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'styles_template' => array(
+					'template_inherits_id',
+					'template_inherit_path',
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_max_recipients',
+				),
+			),
+		);
+	}
+
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_4.php b/phpBB/includes/db/migration/data/3_0_4.php
index 1af4508331..e734814530 100644
--- a/phpBB/includes/db/migration/data/3_0_4.php
+++ b/phpBB/includes/db/migration/data/3_0_4.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_4 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_4_rc1');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_4_rc1.php b/phpBB/includes/db/migration/data/3_0_4_rc1.php
index e9bb0e01f5..eb2fcb8d0e 100644
--- a/phpBB/includes/db/migration/data/3_0_4_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_4_rc1.php
@@ -55,6 +55,17 @@ class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
 		);
 	}
 
+	function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_profile',
+				),
+			),
+		);
+	}
+
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_5.php b/phpBB/includes/db/migration/data/3_0_5.php
index 2f80970781..6d61793d08 100644
--- a/phpBB/includes/db/migration/data/3_0_5.php
+++ b/phpBB/includes/db/migration/data/3_0_5.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_5 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_5_rc1part2');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
index 1fab0f8873..354de748c8 100644
--- a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
+++ b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
@@ -18,10 +18,10 @@ class phpbb_db_migration_data_3_0_5_rc1part2 extends phpbb_db_migration
 	{
 		return array(
 			'drop_keys'			=> array(
-				ACL_OPTIONS_TABLE		=> array('auth_option'),
+				$this->table_prefix . 'acl_options'		=> array('auth_option'),
 			),
 			'add_unique_index'	=> array(
-				ACL_OPTIONS_TABLE		=> array(
+				$this->table_prefix . 'acl_options'		=> array(
 					'auth_option'		=> array('auth_option'),
 				),
 			),
diff --git a/phpBB/includes/db/migration/data/3_0_6.php b/phpBB/includes/db/migration/data/3_0_6.php
index 26176b9437..cc6fccaae2 100644
--- a/phpBB/includes/db/migration/data/3_0_6.php
+++ b/phpBB/includes/db/migration/data/3_0_6.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_6 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_6_rc4');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc1.php b/phpBB/includes/db/migration/data/3_0_6_rc1.php
index 35adcf52be..b520bda6d0 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc1.php
@@ -59,6 +59,46 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 		);
 	}
 
+	function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'confirm' => array(
+					'attempts',
+				),
+				$this->table_prefix . 'users' => array(
+					'user_new',
+					'user_reminded',
+					'user_reminded_time',
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_skip_auth',
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_reported',
+				),
+				$this->table_prefix . 'reports' => array(
+					'pm_id',
+				),
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_show_on_vt',
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_options',
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'reports' => array(
+					'post_id',
+					'pm_id',
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_username',
+				),
+			),
+		);
+	}
+
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc2.php b/phpBB/includes/db/migration/data/3_0_6_rc2.php
index 4092a5fa61..d61c296445 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc2.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_6_rc2 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_6_rc1');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc3.php b/phpBB/includes/db/migration/data/3_0_6_rc3.php
index ec22d1da77..a3f0dcacdf 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc3.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_6_rc3 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_6_rc2');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc4.php b/phpBB/includes/db/migration/data/3_0_6_rc4.php
index e748c7a4ff..3855b85551 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc4.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc4.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_6_rc4 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_6_rc3');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_7.php b/phpBB/includes/db/migration/data/3_0_7.php
index f27b56f778..59779c9cb0 100644
--- a/phpBB/includes/db/migration/data/3_0_7.php
+++ b/phpBB/includes/db/migration/data/3_0_7.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_7 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_7_rc2');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_7_pl1.php b/phpBB/includes/db/migration/data/3_0_7_pl1.php
index 5543d6437a..5570a5dc06 100644
--- a/phpBB/includes/db/migration/data/3_0_7_pl1.php
+++ b/phpBB/includes/db/migration/data/3_0_7_pl1.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_7_pl1 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_7');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc1.php b/phpBB/includes/db/migration/data/3_0_7_rc1.php
index 71584382e8..84b8f798a8 100644
--- a/phpBB/includes/db/migration/data/3_0_7_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_7_rc1.php
@@ -18,7 +18,9 @@ class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
 	{
 		return array(
 			'drop_keys' => array(
-				$this->table_prefix . 'log' => array('log_time'),
+				$this->table_prefix . 'log' => array(
+					'log_time',
+				),
 			),
 			'add_index' => array(
 				$this->table_prefix . 'topics_track' => array(
@@ -28,6 +30,22 @@ class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
 		);
 	}
 
+	function revert_schema()
+	{
+		return array(
+			'add_index' => array(
+				$this->table_prefix . 'log' => array(
+					'log_time'	=> array('log_time'),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'topics_track' => array(
+					'topic_id',
+				),
+			),
+		);
+	}
+
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc2.php b/phpBB/includes/db/migration/data/3_0_7_rc2.php
index 4e380c810d..48aa818ba3 100644
--- a/phpBB/includes/db/migration/data/3_0_7_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_7_rc2.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_7_rc2 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_7_rc1');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_8.php b/phpBB/includes/db/migration/data/3_0_8.php
index a5defc8278..d94fe869fb 100644
--- a/phpBB/includes/db/migration/data/3_0_8.php
+++ b/phpBB/includes/db/migration/data/3_0_8.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_8 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_8_rc1');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_8_rc1.php b/phpBB/includes/db/migration/data/3_0_8_rc1.php
index 78db06b512..eb4cc5bd1a 100644
--- a/phpBB/includes/db/migration/data/3_0_8_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_8_rc1.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_7_pl1');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_9.php b/phpBB/includes/db/migration/data/3_0_9.php
index eb359e2697..d19a24b45e 100644
--- a/phpBB/includes/db/migration/data/3_0_9.php
+++ b/phpBB/includes/db/migration/data/3_0_9.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_9 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_9_rc4');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc1.php b/phpBB/includes/db/migration/data/3_0_9_rc1.php
index ea49cdbba9..4ed48061a4 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc1.php
@@ -51,6 +51,15 @@ class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
 		);
 	}
 
+	function revert_schema()
+	{
+		return array(
+			'drop_tables' => array(
+				$this->table_prefix . 'login_attempts',
+			),
+		);
+	}
+
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc2.php b/phpBB/includes/db/migration/data/3_0_9_rc2.php
index e3c4716665..98ef232cb4 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc2.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_9_rc2 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_9_rc1');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc3.php b/phpBB/includes/db/migration/data/3_0_9_rc3.php
index 3cdecb96ae..b84d61031e 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc3.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_9_rc3 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_9_rc2');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc4.php b/phpBB/includes/db/migration/data/3_0_9_rc4.php
index c2a92e618a..2a00bba843 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc4.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc4.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_3_0_9_rc4 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_9_rc3');
 	}
 
-	function update_schema()
-	{
-		return array();
-	}
-
 	function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_1_0_dev.php b/phpBB/includes/db/migration/data/3_1_0_dev.php
index 2771d82d83..4f7ed07158 100644
--- a/phpBB/includes/db/migration/data/3_1_0_dev.php
+++ b/phpBB/includes/db/migration/data/3_1_0_dev.php
@@ -15,7 +15,7 @@ class phpbb_db_migration_data_3_1_0_dev extends phpbb_db_migration
 			'phpbb_db_migration_data_3_0_11',
 			'phpbb_db_migration_data_extensions',
 			'phpbb_db_migration_data_style_update_p2',
-			'phpbb_db_migration_data_timezone',
+			'phpbb_db_migration_data_timezone_p2',
 		);
 	}
 
@@ -23,32 +23,57 @@ class phpbb_db_migration_data_3_1_0_dev extends phpbb_db_migration
 	{
 		return array(
 			'add_columns'		=> array(
-				GROUPS_TABLE		=> array(
+				$this->table_prefix . 'groups'		=> array(
 					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
 				),
-				PROFILE_FIELDS_TABLE	=> array(
+				$this->table_prefix . 'profile_fields'	=> array(
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
-				STYLES_TABLE		=> array(
+				$this->table_prefix . 'styles'		=> array(
 					'style_path'			=> array('VCHAR:100', ''),
 					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
 					'style_parent_id'		=> array('UINT:4', 0),
 					'style_parent_tree'		=> array('TEXT', ''),
 				),
-				REPORTS_TABLE		=> array(
+				$this->table_prefix . 'reports'		=> array(
 					'reported_post_text'		=> array('MTEXT_UNI', ''),
 					'reported_post_uid'			=> array('VCHAR:8', ''),
 					'reported_post_bitfield'	=> array('VCHAR:255', ''),
 				),
 			),
 			'change_columns'	=> array(
-				GROUPS_TABLE		=> array(
+				$this->table_prefix . 'groups'		=> array(
 					'group_legend'		=> array('UINT', 0),
 				),
 			),
 		);
 	}
 
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns'		=> array(
+				$this->table_prefix . 'groups'		=> array(
+					'group_teampage',
+				),
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_show_on_pm',
+				),
+				$this->table_prefix . 'styles'		=> array(
+					'style_path',
+					'bbcode_bitfield',
+					'style_parent_id',
+					'style_parent_tree',
+				),
+				$this->table_prefix . 'reports'		=> array(
+					'reported_post_text',
+					'reported_post_uid',
+					'reported_post_bitfield',
+				),
+			),
+		);
+	}
+
 	public function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/extensions.php b/phpBB/includes/db/migration/data/extensions.php
index b8379483a3..b5f5b792cf 100644
--- a/phpBB/includes/db/migration/data/extensions.php
+++ b/phpBB/includes/db/migration/data/extensions.php
@@ -18,7 +18,7 @@ class phpbb_db_migration_data_extensions extends phpbb_db_migration
 	{
 		return array(
 			'add_tables'		=> array(
-				EXT_TABLE				=> array(
+				$this->table_prefix . 'ext'	=> array(
 					'COLUMNS'			=> array(
 						'ext_name'		=> array('VCHAR', ''),
 						'ext_active'	=> array('BOOL', 0),
@@ -32,6 +32,15 @@ class phpbb_db_migration_data_extensions extends phpbb_db_migration
 		);
 	}
 
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'		=> array(
+				$this->table_prefix . 'ext',
+			),
+		);
+	}
+
 	public function update_data()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/style_update_p1.php b/phpBB/includes/db/migration/data/style_update_p1.php
index 387b37de8e..f1b26f525a 100644
--- a/phpBB/includes/db/migration/data/style_update_p1.php
+++ b/phpBB/includes/db/migration/data/style_update_p1.php
@@ -14,11 +14,6 @@ class phpbb_db_migration_data_style_update_p1 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_3_0_11');
 	}
 
-	public function update_schema()
-	{
-		return array();
-	}
-
 	public function update_data()
 	{
 		return array(
@@ -47,10 +42,10 @@ class phpbb_db_migration_data_style_update_p1 extends phpbb_db_migration
 		}
 
 		// Get all installed styles
-		if ($this->db_tools->sql_table_exists(STYLES_IMAGESET_TABLE))
+		if ($this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset'))
 		{
 			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id, i.imageset_path
-				FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
+				FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . 'styles_theme c, ' . $this->table_prefix . "styles_imageset i
 				WHERE t.template_id = s.template_id
 					AND c.theme_id = s.theme_id
 					AND i.imageset_id = s.imageset_id";
@@ -58,7 +53,7 @@ class phpbb_db_migration_data_style_update_p1 extends phpbb_db_migration
 		else
 		{
 			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id
-				FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . " c
+				FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . "stles_theme c
 				WHERE t.template_id = s.template_id
 					AND c.theme_id = s.theme_id";
 		}
diff --git a/phpBB/includes/db/migration/data/style_update_p2.php b/phpBB/includes/db/migration/data/style_update_p2.php
index db4b7f1753..361eb5a389 100644
--- a/phpBB/includes/db/migration/data/style_update_p2.php
+++ b/phpBB/includes/db/migration/data/style_update_p2.php
@@ -18,7 +18,7 @@ class phpbb_db_migration_data_style_update_p2 extends phpbb_db_migration
 	{
 		return array(
 			'drop_columns'	=> array(
-				STYLES_TABLE		=> array(
+				$this->table_prefix . 'styles'		=> array(
 					'imageset_id',
 					'template_id',
 					'theme_id',
@@ -26,17 +26,99 @@ class phpbb_db_migration_data_style_update_p2 extends phpbb_db_migration
 			),
 
 			'drop_tables'	=> array(
-				STYLES_IMAGESET_TABLE,
-				STYLES_IMAGESET_DATA_TABLE,
-				STYLES_TEMPLATE_TABLE,
-				STYLES_TEMPLATE_DATA_TABLE,
-				STYLES_THEME_TABLE,
+				$this->table_prefix . 'styles_imageset',
+				$this->table_prefix . 'styles_imageset_data',
+				$this->table_prefix . 'styles_template',
+				$this->table_prefix . 'styles_template_data',
+				$this->table_prefix . 'styles_theme',
 			),
 		);
 	}
 
-	public function update_data()
+	public function revert_schema()
 	{
-		return array();
+		return array(
+			'add_columns'	=> array(
+				$this->table_prefix . 'styles'		=> array(
+					'imageset_id'	=> array('UINT', 0),
+					'template_id'	=> array('UINT', 0),
+					'theme_id'		=> array('UINT', 0),
+				),
+			),
+
+			'add_tables'	=> array(
+				$this->table_prefix . 'styles_imageset'		=> array(
+					'COLUMNS'		=> array(
+						'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
+						'imageset_name'				=> array('VCHAR_UNI:255', ''),
+						'imageset_copyright'		=> array('VCHAR_UNI', ''),
+						'imageset_path'				=> array('VCHAR:100', ''),
+					),
+					'PRIMARY_KEY'		=> 'imageset_id',
+					'KEYS'				=> array(
+						'imgset_nm'			=> array('UNIQUE', 'imageset_name'),
+					),
+				),
+				$this->table_prefix . 'styles_imageset_data'	=> array(
+					'COLUMNS'		=> array(
+						'image_id'				=> array('UINT', NULL, 'auto_increment'),
+						'image_name'			=> array('VCHAR:200', ''),
+						'image_filename'		=> array('VCHAR:200', ''),
+						'image_lang'			=> array('VCHAR:30', ''),
+						'image_height'			=> array('USINT', 0),
+						'image_width'			=> array('USINT', 0),
+						'imageset_id'			=> array('UINT', 0),
+					),
+					'PRIMARY_KEY'		=> 'image_id',
+					'KEYS'				=> array(
+						'i_d'			=> array('INDEX', 'imageset_id'),
+					),
+				),
+				$this->table_prefix . 'styles_template'		=> array(
+					'COLUMNS'		=> array(
+						'template_id'			=> array('UINT', NULL, 'auto_increment'),
+						'template_name'			=> array('VCHAR_UNI:255', ''),
+						'template_copyright'	=> array('VCHAR_UNI', ''),
+						'template_path'			=> array('VCHAR:100', ''),
+						'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+						'template_storedb'		=> array('BOOL', 0),
+						'template_inherits_id'		=> array('UINT:4', 0),
+						'template_inherit_path'		=> array('VCHAR', ''),
+					),
+					'PRIMARY_KEY'	=> 'template_id',
+					'KEYS'			=> array(
+						'tmplte_nm'				=> array('UNIQUE', 'template_name'),
+					),
+				),
+				$this->table_prefix . 'styles_template_data'	=> array(
+					'COLUMNS'		=> array(
+						'template_id'			=> array('UINT', 0),
+						'template_filename'		=> array('VCHAR:100', ''),
+						'template_included'		=> array('TEXT', ''),
+						'template_mtime'		=> array('TIMESTAMP', 0),
+						'template_data'			=> array('MTEXT_UNI', ''),
+					),
+					'KEYS'			=> array(
+						'tid'					=> array('INDEX', 'template_id'),
+						'tfn'					=> array('INDEX', 'template_filename'),
+					),
+				),
+				$this->table_prefix . 'styles_theme'			=> array(
+					'COLUMNS'		=> array(
+						'theme_id'				=> array('UINT', NULL, 'auto_increment'),
+						'theme_name'			=> array('VCHAR_UNI:255', ''),
+						'theme_copyright'		=> array('VCHAR_UNI', ''),
+						'theme_path'			=> array('VCHAR:100', ''),
+						'theme_storedb'			=> array('BOOL', 0),
+						'theme_mtime'			=> array('TIMESTAMP', 0),
+						'theme_data'			=> array('MTEXT_UNI', ''),
+					),
+					'PRIMARY_KEY'	=> 'theme_id',
+					'KEYS'			=> array(
+						'theme_name'		=> array('UNIQUE', 'theme_name'),
+					),
+				),
+			),
+		);
 	}
 }
diff --git a/phpBB/includes/db/migration/data/timezone.php b/phpBB/includes/db/migration/data/timezone.php
index 7734ed4b76..1a7dfe1e19 100644
--- a/phpBB/includes/db/migration/data/timezone.php
+++ b/phpBB/includes/db/migration/data/timezone.php
@@ -18,7 +18,7 @@ class phpbb_db_migration_data_timezone extends phpbb_db_migration
 	{
 		return array(
 			'change_columns'	=> array(
-				USERS_TABLE			=> array(
+				$this->table_prefix . 'users'			=> array(
 					'user_timezone'		=> array('VCHAR:100', ''),
 				),
 			),
@@ -36,13 +36,13 @@ class phpbb_db_migration_data_timezone extends phpbb_db_migration
 	{
 		// Update user timezones
 		$sql = 'SELECT user_dst, user_timezone
-			FROM ' . USERS_TABLE . '
+			FROM ' . $this->table_prefix . 'users
 			GROUP BY user_timezone, user_dst';
 		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$sql = 'UPDATE ' . USERS_TABLE . "
+			$sql = 'UPDATE ' . $this->table_prefix . "users
 				SET user_timezone = '" . $this->db->sql_escape($this->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
 				WHERE user_timezone = '" . $this->db->sql_escape($row['user_timezone']) . "'
 					AND user_dst = " . (int) $row['user_dst'];
@@ -51,13 +51,10 @@ class phpbb_db_migration_data_timezone extends phpbb_db_migration
 		$this->db->sql_freeresult($result);
 
 		// Update board default timezone
-		$sql = 'UPDATE ' . CONFIG_TABLE . "
+		$sql = 'UPDATE ' . $this->table_prefix . "config
 			SET config_value = '" . $this->convert_phpbb30_timezone($this->config['board_timezone'], $this->config['board_dst']) . "'
 			WHERE config_name = 'board_timezone'";
 		$this->sql_query($sql);
-
-		// After we have calculated the timezones we can delete user_dst column from user table.
-		$this->db_tools->sql_column_remove(USERS_TABLE, 'user_dst');
 	}
 
 	/**
diff --git a/phpBB/includes/db/migration/data/timezone_p2.php b/phpBB/includes/db/migration/data/timezone_p2.php
new file mode 100644
index 0000000000..85c1cf9456
--- /dev/null
+++ b/phpBB/includes/db/migration/data/timezone_p2.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_timezone_p2 extends phpbb_db_migration
+{
+	public function depends_on()
+	{
+		return array('phpbb_db_migration_data_timezone');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_dst',
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_dst'		=> array('BOOL', 0),
+				),
+			),
+		);
+	}
+}
-- 
cgit v1.2.1


From 74f4397451dae0ab83d977d97d96ed9549bf3ab9 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 22:28:48 -0600
Subject: [feature/migrations] Make depends_on static to call it without
 dependencies

Move installing migrations to migration/install.php and handle figuring
out what migrations have been installed based on phpBB version.

PHPBB3-11318
---
 phpBB/includes/db/migration/data/3_0_1.php         |   4 +-
 phpBB/includes/db/migration/data/3_0_10.php        |   4 +-
 phpBB/includes/db/migration/data/3_0_10_rc1.php    |   4 +-
 phpBB/includes/db/migration/data/3_0_10_rc2.php    |   4 +-
 phpBB/includes/db/migration/data/3_0_10_rc3.php    |   4 +-
 phpBB/includes/db/migration/data/3_0_11.php        |   4 +-
 phpBB/includes/db/migration/data/3_0_11_rc1.php    |   8 +-
 phpBB/includes/db/migration/data/3_0_11_rc2.php    |   8 +-
 phpBB/includes/db/migration/data/3_0_12_rc1.php    |   2 +-
 phpBB/includes/db/migration/data/3_0_1_rc1.php     |  15 +--
 phpBB/includes/db/migration/data/3_0_2.php         |   4 +-
 phpBB/includes/db/migration/data/3_0_2_rc1.php     |   4 +-
 phpBB/includes/db/migration/data/3_0_2_rc2.php     |   8 +-
 phpBB/includes/db/migration/data/3_0_3.php         |   4 +-
 phpBB/includes/db/migration/data/3_0_3_rc1.php     |  12 +-
 phpBB/includes/db/migration/data/3_0_4.php         |   6 +-
 phpBB/includes/db/migration/data/3_0_4_rc1.php     |  10 +-
 phpBB/includes/db/migration/data/3_0_5.php         |   4 +-
 phpBB/includes/db/migration/data/3_0_5_rc1.php     |  12 +-
 .../includes/db/migration/data/3_0_5_rc1part2.php  |   6 +-
 phpBB/includes/db/migration/data/3_0_6.php         |   4 +-
 phpBB/includes/db/migration/data/3_0_6_rc1.php     |  12 +-
 phpBB/includes/db/migration/data/3_0_6_rc2.php     |   4 +-
 phpBB/includes/db/migration/data/3_0_6_rc3.php     |   6 +-
 phpBB/includes/db/migration/data/3_0_6_rc4.php     |   4 +-
 phpBB/includes/db/migration/data/3_0_7.php         |   4 +-
 phpBB/includes/db/migration/data/3_0_7_pl1.php     |   4 +-
 phpBB/includes/db/migration/data/3_0_7_rc1.php     |  10 +-
 phpBB/includes/db/migration/data/3_0_7_rc2.php     |   6 +-
 phpBB/includes/db/migration/data/3_0_8.php         |   4 +-
 phpBB/includes/db/migration/data/3_0_8_rc1.php     |  12 +-
 phpBB/includes/db/migration/data/3_0_9.php         |   4 +-
 phpBB/includes/db/migration/data/3_0_9_rc1.php     |  12 +-
 phpBB/includes/db/migration/data/3_0_9_rc2.php     |   4 +-
 phpBB/includes/db/migration/data/3_0_9_rc3.php     |   4 +-
 phpBB/includes/db/migration/data/3_0_9_rc4.php     |   4 +-
 phpBB/includes/db/migration/data/3_1_0_dev.php     |   2 +-
 phpBB/includes/db/migration/data/extensions.php    |   2 +-
 .../includes/db/migration/data/style_update_p1.php |   2 +-
 .../includes/db/migration/data/style_update_p2.php |   2 +-
 phpBB/includes/db/migration/data/timezone.php      |   2 +-
 phpBB/includes/db/migration/data/timezone_p2.php   |   2 +-
 phpBB/includes/db/migration/install.php            | 129 +++++++++++++++++++++
 43 files changed, 245 insertions(+), 121 deletions(-)
 create mode 100644 phpBB/includes/db/migration/install.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/3_0_1.php b/phpBB/includes/db/migration/data/3_0_1.php
index d71288c64b..a9eac6f110 100644
--- a/phpBB/includes/db/migration/data/3_0_1.php
+++ b/phpBB/includes/db/migration/data/3_0_1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_1_rc1');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.1')),
diff --git a/phpBB/includes/db/migration/data/3_0_10.php b/phpBB/includes/db/migration/data/3_0_10.php
index 17472562f2..89afb8a432 100644
--- a/phpBB/includes/db/migration/data/3_0_10.php
+++ b/phpBB/includes/db/migration/data/3_0_10.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_10 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_10_rc3');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.10')),
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc1.php b/phpBB/includes/db/migration/data/3_0_10_rc1.php
index eebee44e39..ca8fadec61 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_10_rc1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_9');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.add', array('email_max_chunk_size', 50)),
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc2.php b/phpBB/includes/db/migration/data/3_0_10_rc2.php
index b81fde9bcb..1f39ea48e0 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc2.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_10_rc2 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_10_rc1');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.10-rc2')),
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc3.php b/phpBB/includes/db/migration/data/3_0_10_rc3.php
index d97b0b4aec..cd82bb573e 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc3.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_10_rc3 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_10_rc2');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.10-rc3')),
diff --git a/phpBB/includes/db/migration/data/3_0_11.php b/phpBB/includes/db/migration/data/3_0_11.php
index b149cd374c..9f25f0e489 100644
--- a/phpBB/includes/db/migration/data/3_0_11.php
+++ b/phpBB/includes/db/migration/data/3_0_11.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_11 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11_rc2');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.11')),
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc1.php b/phpBB/includes/db/migration/data/3_0_11_rc1.php
index 3d4920bf49..676e6baa87 100644
--- a/phpBB/includes/db/migration/data/3_0_11_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_11_rc1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_10');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
@@ -24,7 +24,7 @@ class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function cleanup_deactivated_styles()
+	public function cleanup_deactivated_styles()
 	{
 		// Updates users having current style a deactivated one
 		$sql = 'SELECT style_id
@@ -48,7 +48,7 @@ class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
 		}
 	}
 
-	function delete_orphan_private_messages()
+	public function delete_orphan_private_messages()
 	{
 		// Delete orphan private messages
 		$batch_size = 500;
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc2.php b/phpBB/includes/db/migration/data/3_0_11_rc2.php
index e0638f02d7..e5bb3e44a6 100644
--- a/phpBB/includes/db/migration/data/3_0_11_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_11_rc2.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_11_rc2 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11_rc1');
 	}
 
-	function update_schema()
+	public function update_schema()
 	{
 		return array(
 			'add_columns' => array(
@@ -25,7 +25,7 @@ class phpbb_db_migration_data_3_0_11_rc2 extends phpbb_db_migration
 		);
 	}
 
-	function revert_schema()
+	public function revert_schema()
 	{
 		return array(
 			'drop_columns' => array(
@@ -36,7 +36,7 @@ class phpbb_db_migration_data_3_0_11_rc2 extends phpbb_db_migration
 		);
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.11-rc2')),
diff --git a/phpBB/includes/db/migration/data/3_0_12_rc1.php b/phpBB/includes/db/migration/data/3_0_12_rc1.php
index 0b35de2ed5..4fe0828716 100644
--- a/phpBB/includes/db/migration/data/3_0_12_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_12_rc1.php
@@ -11,7 +11,7 @@
 
 class phpbb_db_migration_data_3_0_12_rc1 extends phpbb_db_migration
 {
-	public function depends_on()
+ 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11');
 	}
diff --git a/phpBB/includes/db/migration/data/3_0_1_rc1.php b/phpBB/includes/db/migration/data/3_0_1_rc1.php
index a7af5d052d..9f1c04809d 100644
--- a/phpBB/includes/db/migration/data/3_0_1_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_1_rc1.php
@@ -9,12 +9,7 @@
 
 class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
 {
-	function depends_on()
-	{
-		return array();
-	}
-
-	function update_schema()
+	public function update_schema()
 	{
 		return array(
 			'add_columns' => array(
@@ -41,7 +36,7 @@ class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function revert_schema()
+	public function revert_schema()
 	{
 		return array(
 			'drop_columns' => array(
@@ -68,7 +63,7 @@ class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
@@ -78,7 +73,7 @@ class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function fix_unset_last_view_time()
+	public function fix_unset_last_view_time()
 	{
 		$sql = 'UPDATE ' . $this->table_prefix . "topics
 			SET topic_last_view_time = topic_last_post_time
@@ -86,7 +81,7 @@ class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
 		$this->sql_query($sql);
 	}
 
-	function reset_smiley_size()
+	public function reset_smiley_size()
 	{
 		// Update smiley sizes
 		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
diff --git a/phpBB/includes/db/migration/data/3_0_2.php b/phpBB/includes/db/migration/data/3_0_2.php
index 19e9213262..8661578281 100644
--- a/phpBB/includes/db/migration/data/3_0_2.php
+++ b/phpBB/includes/db/migration/data/3_0_2.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_2 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_2_rc2');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.2')),
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc1.php b/phpBB/includes/db/migration/data/3_0_2_rc1.php
index 7dd321d83c..851060c3b5 100644
--- a/phpBB/includes/db/migration/data/3_0_2_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_2_rc1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_2_rc1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_1');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.add', array('referer_validation', '1')),
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc2.php b/phpBB/includes/db/migration/data/3_0_2_rc2.php
index d73f9587c3..c255e55aef 100644
--- a/phpBB/includes/db/migration/data/3_0_2_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_2_rc2.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_2_rc2 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_2_rc1');
 	}
 
-	function update_schema()
+	public function update_schema()
 	{
 		return array(
 			'change_columns' => array(
@@ -48,7 +48,7 @@ class phpbb_db_migration_data_3_0_2_rc2 extends phpbb_db_migration
 		);
 	}
 
-	function revert_schema()
+	public function revert_schema()
 	{
 		return array(
 			'add_index' => array(
@@ -66,7 +66,7 @@ class phpbb_db_migration_data_3_0_2_rc2 extends phpbb_db_migration
 		);
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.2-rc2')),
diff --git a/phpBB/includes/db/migration/data/3_0_3.php b/phpBB/includes/db/migration/data/3_0_3.php
index d671b0cac3..2873c798fd 100644
--- a/phpBB/includes/db/migration/data/3_0_3.php
+++ b/phpBB/includes/db/migration/data/3_0_3.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_3 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_3_rc1');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.3')),
diff --git a/phpBB/includes/db/migration/data/3_0_3_rc1.php b/phpBB/includes/db/migration/data/3_0_3_rc1.php
index 9cce80be74..49e4170c3f 100644
--- a/phpBB/includes/db/migration/data/3_0_3_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_3_rc1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_2');
 	}
 
-	function update_schema()
+	public function update_schema()
 	{
 		return array(
 			'add_columns' => array(
@@ -29,7 +29,7 @@ class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function revert_schema()
+	public function revert_schema()
 	{
 		return array(
 			'drop_columns' => array(
@@ -44,7 +44,7 @@ class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.add', array('enable_queue_trigger', '0')),
@@ -59,7 +59,7 @@ class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function correct_acp_email_permissions()
+	public function correct_acp_email_permissions()
 	{
 		$sql = 'UPDATE ' . $this->table_prefix . 'modules
 			SET module_auth = \'acl_a_email && cfg_email_enable\'
@@ -68,7 +68,7 @@ class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
 		$this->sql_query($sql);
 	}
 
-	function set_group_default_max_recipients()
+	public function set_group_default_max_recipients()
 	{
 		// Set maximum number of recipients for the registered users, bots, guests group
 		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
diff --git a/phpBB/includes/db/migration/data/3_0_4.php b/phpBB/includes/db/migration/data/3_0_4.php
index e734814530..590ae3c69f 100644
--- a/phpBB/includes/db/migration/data/3_0_4.php
+++ b/phpBB/includes/db/migration/data/3_0_4.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_4 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_4_rc1');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
@@ -23,7 +23,7 @@ class phpbb_db_migration_data_3_0_4 extends phpbb_db_migration
 		);
 	}
 
-	function rename_log_delete_topic()
+	public function rename_log_delete_topic()
 	{
 		if ($this->db->sql_layer == 'oracle')
 		{
diff --git a/phpBB/includes/db/migration/data/3_0_4_rc1.php b/phpBB/includes/db/migration/data/3_0_4_rc1.php
index eb2fcb8d0e..8f44baf046 100644
--- a/phpBB/includes/db/migration/data/3_0_4_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_4_rc1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_3');
 	}
 
-	function update_schema()
+	public function update_schema()
 	{
 		return array(
 			'add_columns' => array(
@@ -55,7 +55,7 @@ class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function revert_schema()
+	public function revert_schema()
 	{
 		return array(
 			'drop_columns' => array(
@@ -66,7 +66,7 @@ class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
@@ -75,7 +75,7 @@ class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function update_custom_profile_fields()
+	public function update_custom_profile_fields()
 	{
 		// Update the Custom Profile Fields based on previous settings to the new format
 		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
diff --git a/phpBB/includes/db/migration/data/3_0_5.php b/phpBB/includes/db/migration/data/3_0_5.php
index 6d61793d08..65b292207e 100644
--- a/phpBB/includes/db/migration/data/3_0_5.php
+++ b/phpBB/includes/db/migration/data/3_0_5.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_5 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_5_rc1part2');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.5')),
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1.php b/phpBB/includes/db/migration/data/3_0_5_rc1.php
index cbf28c0be6..a0893a0dbb 100644
--- a/phpBB/includes/db/migration/data/3_0_5_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_5_rc1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_4');
 	}
 
-	function update_schema()
+	public function update_schema()
 	{
 		return array(
 			'change_columns' => array(
@@ -25,7 +25,7 @@ class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		$search_indexing_state = $this->config['search_indexing_state'];
 
@@ -42,7 +42,7 @@ class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function hash_old_passwords()
+	public function hash_old_passwords()
 	{
 		$sql = 'SELECT user_id, user_password
 				FROM ' . $this->table_prefix . 'users
@@ -63,7 +63,7 @@ class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
 		$this->db->sql_freeresult($result);
 	}
 
-	function update_ichiro_bot()
+	public function update_ichiro_bot()
 	{
 		// Adjust bot entry
 		$sql = 'UPDATE ' . $this->table_prefix . "bots
@@ -72,7 +72,7 @@ class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
 		$this->sql_query($sql);
 	}
 
-	function remove_duplicate_auth_options()
+	public function remove_duplicate_auth_options()
 	{
 		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
 		$sql = 'SELECT auth_option
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
index 354de748c8..0597fc0ff8 100644
--- a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
+++ b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_5_rc1part2 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_5_rc1');
 	}
 
-	function update_schema()
+	public function update_schema()
 	{
 		return array(
 			'drop_keys'			=> array(
@@ -28,7 +28,7 @@ class phpbb_db_migration_data_3_0_5_rc1part2 extends phpbb_db_migration
 		);
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.5-rc1')),
diff --git a/phpBB/includes/db/migration/data/3_0_6.php b/phpBB/includes/db/migration/data/3_0_6.php
index cc6fccaae2..a7b88e510a 100644
--- a/phpBB/includes/db/migration/data/3_0_6.php
+++ b/phpBB/includes/db/migration/data/3_0_6.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_6 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_6_rc4');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.6')),
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc1.php b/phpBB/includes/db/migration/data/3_0_6_rc1.php
index b520bda6d0..5ebeceeed7 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_5');
 	}
 
-	function update_schema()
+	public function update_schema()
 	{
 		return array(
 			'add_columns' => array(
@@ -59,7 +59,7 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function revert_schema()
+	public function revert_schema()
 	{
 		return array(
 			'drop_columns' => array(
@@ -99,7 +99,7 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
@@ -184,14 +184,14 @@ class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function set_user_options_default()
+	public function set_user_options_default()
 	{
 		// 229376 is the added value to enable all three signature options
 		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
 		$this->sql_query($sql);
 	}
 
-	function add_newly_registered_group()
+	public function add_newly_registered_group()
 	{
 		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
 		$sql = 'SELECT group_id
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc2.php b/phpBB/includes/db/migration/data/3_0_6_rc2.php
index d61c296445..7cbda4c616 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc2.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_6_rc2 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_6_rc1');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.6-rc2')),
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc3.php b/phpBB/includes/db/migration/data/3_0_6_rc3.php
index a3f0dcacdf..209057ec70 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc3.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_6_rc3 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_6_rc2');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('custom', array(array(&$this, 'update_cp_fields'))),
@@ -23,7 +23,7 @@ class phpbb_db_migration_data_3_0_6_rc3 extends phpbb_db_migration
 		);
 	}
 
-	function update_cp_fields()
+	public function update_cp_fields()
 	{
 		// Update the Custom Profile Fields based on previous settings to the new format
 		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc4.php b/phpBB/includes/db/migration/data/3_0_6_rc4.php
index 3855b85551..62f0e91a7d 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc4.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc4.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_6_rc4 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_6_rc3');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.6-rc4')),
diff --git a/phpBB/includes/db/migration/data/3_0_7.php b/phpBB/includes/db/migration/data/3_0_7.php
index 59779c9cb0..3e215ff905 100644
--- a/phpBB/includes/db/migration/data/3_0_7.php
+++ b/phpBB/includes/db/migration/data/3_0_7.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_7 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_7_rc2');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.7')),
diff --git a/phpBB/includes/db/migration/data/3_0_7_pl1.php b/phpBB/includes/db/migration/data/3_0_7_pl1.php
index 5570a5dc06..ffe0836d02 100644
--- a/phpBB/includes/db/migration/data/3_0_7_pl1.php
+++ b/phpBB/includes/db/migration/data/3_0_7_pl1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_7_pl1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_7');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.7-pl1')),
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc1.php b/phpBB/includes/db/migration/data/3_0_7_rc1.php
index 84b8f798a8..b30830c21d 100644
--- a/phpBB/includes/db/migration/data/3_0_7_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_7_rc1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_6');
 	}
 
-	function update_schema()
+	public function update_schema()
 	{
 		return array(
 			'drop_keys' => array(
@@ -30,7 +30,7 @@ class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function revert_schema()
+	public function revert_schema()
 	{
 		return array(
 			'add_index' => array(
@@ -46,7 +46,7 @@ class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.add', array('feed_overall', 1)),
@@ -61,7 +61,7 @@ class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function delete_text_templates()
+	public function delete_text_templates()
 	{
 		// Delete all text-templates from the template_data
 		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc2.php b/phpBB/includes/db/migration/data/3_0_7_rc2.php
index 48aa818ba3..e986be23bf 100644
--- a/phpBB/includes/db/migration/data/3_0_7_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_7_rc2.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_7_rc2 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_7_rc1');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('custom', array(array(&$this, 'update_email_hash'))),
@@ -23,7 +23,7 @@ class phpbb_db_migration_data_3_0_7_rc2 extends phpbb_db_migration
 		);
 	}
 
-	function update_email_hash($start = 0)
+	public function update_email_hash($start = 0)
 	{
 		$limit = 1000;
 
diff --git a/phpBB/includes/db/migration/data/3_0_8.php b/phpBB/includes/db/migration/data/3_0_8.php
index d94fe869fb..8043b934b0 100644
--- a/phpBB/includes/db/migration/data/3_0_8.php
+++ b/phpBB/includes/db/migration/data/3_0_8.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_8 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_8_rc1');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.8')),
diff --git a/phpBB/includes/db/migration/data/3_0_8_rc1.php b/phpBB/includes/db/migration/data/3_0_8_rc1.php
index eb4cc5bd1a..8214f44f17 100644
--- a/phpBB/includes/db/migration/data/3_0_8_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_8_rc1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_7_pl1');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
@@ -37,7 +37,7 @@ class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function update_file_extension_group_names()
+	public function update_file_extension_group_names()
 	{
 		// Update file extension group names to use language strings.
 		$sql = 'SELECT lang_dir
@@ -93,7 +93,7 @@ class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
 		$this->db->sql_freeresult($result);
 	}
 
-	function update_module_auth()
+	public function update_module_auth()
 	{
 		$sql = 'UPDATE ' . MODULES_TABLE . '
 			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
@@ -103,7 +103,7 @@ class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
 		$this->sql_query($sql);
 	}
 
-	function update_bots()
+	public function update_bots()
 	{
 		$bot_name = 'Bing [Bot]';
 		$bot_name_clean = utf8_clean_string($bot_name);
@@ -167,7 +167,7 @@ class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
 		}
 	}
 
-	function delete_orphan_shadow_topics()
+	public function delete_orphan_shadow_topics()
 	{
 		// Delete shadow topics pointing to not existing topics
 		$batch_size = 500;
diff --git a/phpBB/includes/db/migration/data/3_0_9.php b/phpBB/includes/db/migration/data/3_0_9.php
index d19a24b45e..c562f1f2cf 100644
--- a/phpBB/includes/db/migration/data/3_0_9.php
+++ b/phpBB/includes/db/migration/data/3_0_9.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_9 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_9_rc4');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.9')),
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc1.php b/phpBB/includes/db/migration/data/3_0_9_rc1.php
index 4ed48061a4..367bb25734 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc1.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_8');
 	}
 
-	function update_schema()
+	public function update_schema()
 	{
 		return array(
 			'add_tables' => array(
@@ -51,7 +51,7 @@ class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function revert_schema()
+	public function revert_schema()
 	{
 		return array(
 			'drop_tables' => array(
@@ -60,7 +60,7 @@ class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.add', array('ip_login_limit_max', 50)),
@@ -73,7 +73,7 @@ class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
 		);
 	}
 
-	function update_file_extension_group_names()
+	public function update_file_extension_group_names()
 	{
 		// Update file extension group names to use language strings, again.
 		$sql = 'SELECT group_id, group_name
@@ -95,7 +95,7 @@ class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
 		$this->db->sql_freeresult($result);
 	}
 
-	function fix_firebird_qa_captcha()
+	public function fix_firebird_qa_captcha()
 	{
 		// Recover from potentially broken Q&A CAPTCHA table on firebird
 		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc2.php b/phpBB/includes/db/migration/data/3_0_9_rc2.php
index 98ef232cb4..c8566d54a5 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc2.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_9_rc2 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_9_rc1');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.9-rc2')),
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc3.php b/phpBB/includes/db/migration/data/3_0_9_rc3.php
index b84d61031e..da977e9666 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc3.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_9_rc3 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_9_rc2');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.9-rc3')),
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc4.php b/phpBB/includes/db/migration/data/3_0_9_rc4.php
index 2a00bba843..0bfe26985c 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc4.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc4.php
@@ -9,12 +9,12 @@
 
 class phpbb_db_migration_data_3_0_9_rc4 extends phpbb_db_migration
 {
-	function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_9_rc3');
 	}
 
-	function update_data()
+	public function update_data()
 	{
 		return array(
 			array('config.update', array('version', '3.0.9-rc4')),
diff --git a/phpBB/includes/db/migration/data/3_1_0_dev.php b/phpBB/includes/db/migration/data/3_1_0_dev.php
index 4f7ed07158..14953591d1 100644
--- a/phpBB/includes/db/migration/data/3_1_0_dev.php
+++ b/phpBB/includes/db/migration/data/3_1_0_dev.php
@@ -9,7 +9,7 @@
 
 class phpbb_db_migration_data_3_1_0_dev extends phpbb_db_migration
 {
-	public function depends_on()
+	static public function depends_on()
 	{
 		return array(
 			'phpbb_db_migration_data_3_0_11',
diff --git a/phpBB/includes/db/migration/data/extensions.php b/phpBB/includes/db/migration/data/extensions.php
index b5f5b792cf..ff54d0d933 100644
--- a/phpBB/includes/db/migration/data/extensions.php
+++ b/phpBB/includes/db/migration/data/extensions.php
@@ -9,7 +9,7 @@
 
 class phpbb_db_migration_data_extensions extends phpbb_db_migration
 {
-	public function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11');
 	}
diff --git a/phpBB/includes/db/migration/data/style_update_p1.php b/phpBB/includes/db/migration/data/style_update_p1.php
index f1b26f525a..701afc0d78 100644
--- a/phpBB/includes/db/migration/data/style_update_p1.php
+++ b/phpBB/includes/db/migration/data/style_update_p1.php
@@ -9,7 +9,7 @@
 
 class phpbb_db_migration_data_style_update_p1 extends phpbb_db_migration
 {
-	public function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11');
 	}
diff --git a/phpBB/includes/db/migration/data/style_update_p2.php b/phpBB/includes/db/migration/data/style_update_p2.php
index 361eb5a389..1a8cc9da58 100644
--- a/phpBB/includes/db/migration/data/style_update_p2.php
+++ b/phpBB/includes/db/migration/data/style_update_p2.php
@@ -9,7 +9,7 @@
 
 class phpbb_db_migration_data_style_update_p2 extends phpbb_db_migration
 {
-	public function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_style_update_p1');
 	}
diff --git a/phpBB/includes/db/migration/data/timezone.php b/phpBB/includes/db/migration/data/timezone.php
index 1a7dfe1e19..3658120629 100644
--- a/phpBB/includes/db/migration/data/timezone.php
+++ b/phpBB/includes/db/migration/data/timezone.php
@@ -9,7 +9,7 @@
 
 class phpbb_db_migration_data_timezone extends phpbb_db_migration
 {
-	public function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11');
 	}
diff --git a/phpBB/includes/db/migration/data/timezone_p2.php b/phpBB/includes/db/migration/data/timezone_p2.php
index 85c1cf9456..15f1a3e414 100644
--- a/phpBB/includes/db/migration/data/timezone_p2.php
+++ b/phpBB/includes/db/migration/data/timezone_p2.php
@@ -9,7 +9,7 @@
 
 class phpbb_db_migration_data_timezone_p2 extends phpbb_db_migration
 {
-	public function depends_on()
+	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_timezone');
 	}
diff --git a/phpBB/includes/db/migration/install.php b/phpBB/includes/db/migration/install.php
new file mode 100644
index 0000000000..af2ba392b1
--- /dev/null
+++ b/phpBB/includes/db/migration/install.php
@@ -0,0 +1,129 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_install
+{
+	/**
+	* List of phpBB versions/what migration identifier
+	* 	contains the updates that should have been installed already
+	*
+	* @var array
+	*/
+	protected $version_to_migration = array(
+		'3.0.1-rc1'		=> 'phpbb_db_migration_data_3_0_1_rc1',
+		'3.0.1'	   		=> 'phpbb_db_migration_data_3_0_1',
+		'3.0.2-rc1'		=> 'phpbb_db_migration_data_3_0_2_rc1',
+		'3.0.2-rc2'		=> 'phpbb_db_migration_data_3_0_2_rc2',
+		'3.0.2'	   		=> 'phpbb_db_migration_data_3_0_2',
+		'3.0.3-rc1'		=> 'phpbb_db_migration_data_3_0_3_rc1',
+		'3.0.3'	   		=> 'phpbb_db_migration_data_3_0_3',
+		'3.0.4-rc1'		=> 'phpbb_db_migration_data_3_0_4_rc1',
+		'3.0.4'	   		=> 'phpbb_db_migration_data_3_0_4',
+		'3.0.5-rc1'		=> array(
+			'phpbb_db_migration_data_3_0_5_rc1',
+			'phpbb_db_migration_data_3_0_5_rc1part2',
+		),
+		'3.0.5'	   		=> 'phpbb_db_migration_data_3_0_5',
+		'3.0.6-rc1'		=> 'phpbb_db_migration_data_3_0_6_rc1',
+		'3.0.6-rc2'		=> 'phpbb_db_migration_data_3_0_6_rc2',
+		'3.0.6-rc3'		=> 'phpbb_db_migration_data_3_0_6_rc3',
+		'3.0.6-rc4'		=> 'phpbb_db_migration_data_3_0_6_rc4',
+		'3.0.6'	   		=> 'phpbb_db_migration_data_3_0_6',
+		'3.0.7-rc1'		=> 'phpbb_db_migration_data_3_0_7_rc1',
+		'3.0.7-rc2'		=> 'phpbb_db_migration_data_3_0_7_rc2',
+		'3.0.7'	   		=> 'phpbb_db_migration_data_3_0_7',
+		'3.0.7-pl1'		=> 'phpbb_db_migration_data_3_0_7_pl1',
+		'3.0.8-rc1'		=> 'phpbb_db_migration_data_3_0_8_rc1',
+		'3.0.8'			=> 'phpbb_db_migration_data_3_0_8',
+		'3.0.9-rc1'     => 'phpbb_db_migration_data_3_0_9_rc1',
+		'3.0.9-rc2'     => 'phpbb_db_migration_data_3_0_9_rc2',
+		'3.0.9-rc3'     => 'phpbb_db_migration_data_3_0_9_rc3',
+		'3.0.9-rc4'     => 'phpbb_db_migration_data_3_0_9_rc4',
+		'3.0.9'			=> 'phpbb_db_migration_data_3_0_9',
+		'3.0.10-rc1'    => 'phpbb_db_migration_data_3_0_10_rc1',
+		'3.0.10-rc2'    => 'phpbb_db_migration_data_3_0_10_rc2',
+		'3.0.10-rc3'    => 'phpbb_db_migration_data_3_0_10_rc3',
+		'3.0.10'		=> 'phpbb_db_migration_data_3_0_10',
+		'3.0.11-rc1'	=> 'phpbb_db_migration_data_3_0_11_rc1',
+		'3.0.11-rc2'	=> 'phpbb_db_migration_data_3_0_11_rc2',
+		'3.0.11'		=> 'phpbb_db_migration_data_3_0_11',
+		'3.0.12-rc1'	=> 'phpbb_db_migration_data_3_0_12_rc1',
+		'3.1.0-dev'		=> array(
+			'phpbb_db_migration_data_style_update_p1',
+			'phpbb_db_migration_data_style_update_p2',
+			'phpbb_db_migration_data_timezone',
+			'phpbb_db_migration_data_timezone_p2',
+			'phpbb_db_migration_data_extensions',
+			'phpbb_db_migration_data_3_1_0_dev',
+		),
+	);
+
+	public function install(phpbb_db_driver $db, phpbb_db_tools $db_tools, $table_prefix, $version)
+	{
+		$this->create_table($db_tools);
+
+		$this->guess_installed_migrations($db, $table_prefix, $version);
+	}
+
+	protected function create_table(phpbb_db_tools $db_tools)
+	{
+		if (!$db_tools->sql_table_exists(MIGRATIONS_TABLE))
+		{
+			$db_tools->sql_create_table(MIGRATIONS_TABLE, array(
+				'COLUMNS'		=> array(
+					'migration_name'			=> array('VCHAR', ''),
+					'migration_depends_on'		=> array('TEXT', ''),
+					'migration_schema_done'		=> array('BOOL', 0),
+					'migration_data_done'		=> array('BOOL', 0),
+					'migration_data_state'		=> array('TEXT', ''),
+					'migration_start_time'		=> array('TIMESTAMP', 0),
+					'migration_end_time'		=> array('TIMESTAMP', 0),
+				),
+				'PRIMARY_KEY'	=> 'migration_name',
+			));
+		}
+	}
+
+	/**
+	* Guess what migrations have been installed based on phpBB version
+	*
+	* @param mixed $version
+	*/
+	protected function guess_installed_migrations(phpbb_db_driver $db, $table_prefix, $version)
+	{
+		$installed = array();
+		foreach ($this->version_to_migration as $compare => $migration_list)
+		{
+			if (version_compare($version, $compare, '<='))
+			{
+				// The migration should have effectively been installed already
+				if (!is_array($migration_list))
+				{
+					$migration_list = array($migration_list);
+				}
+
+				foreach ($migration_list as $migration_name)
+				{
+					$sql_ary = array(
+						'migration_name'			=> $migration_name,
+						'migration_depends_on'		=> $migration_name::depends_on(),
+						'migration_schema_done'		=> 1,
+						'migration_data_done'		=> 1,
+						'migration_data_state'		=> '',
+						'migration_start_time'		=> 0,
+						'migration_end_time'		=> 0,
+					);
+					$sql = 'INSERT INTO ' . $table_prefix . 'migrations ' .
+						$db->sql_build_array('INSERT', $sql_ary);
+					$db->sql_query($sql);
+				}
+			}
+		}
+	}
+}
-- 
cgit v1.2.1


From 8baceacc36f06c2c14d4a4c08cecb3c80b3c76d3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 10 Jan 2013 22:45:26 -0600
Subject: [feature/migrations] Fix migrations installer, schema for
 schema_data.sql

PHPBB3-11318
---
 phpBB/includes/db/migration/install.php | 43 ++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/install.php b/phpBB/includes/db/migration/install.php
index af2ba392b1..95f3a3b994 100644
--- a/phpBB/includes/db/migration/install.php
+++ b/phpBB/includes/db/migration/install.php
@@ -66,16 +66,16 @@ class phpbb_db_migration_install
 
 	public function install(phpbb_db_driver $db, phpbb_db_tools $db_tools, $table_prefix, $version)
 	{
-		$this->create_table($db_tools);
+		$this->create_table($db_tools, $table_prefix);
 
 		$this->guess_installed_migrations($db, $table_prefix, $version);
 	}
 
-	protected function create_table(phpbb_db_tools $db_tools)
+	protected function create_table(phpbb_db_tools $db_tools, $table_prefix)
 	{
-		if (!$db_tools->sql_table_exists(MIGRATIONS_TABLE))
+		if (!$db_tools->sql_table_exists($table_prefix . 'migrations'))
 		{
-			$db_tools->sql_create_table(MIGRATIONS_TABLE, array(
+			$db_tools->sql_create_table($table_prefix . 'migrations', array(
 				'COLUMNS'		=> array(
 					'migration_name'			=> array('VCHAR', ''),
 					'migration_depends_on'		=> array('TEXT', ''),
@@ -100,7 +100,7 @@ class phpbb_db_migration_install
 		$installed = array();
 		foreach ($this->version_to_migration as $compare => $migration_list)
 		{
-			if (version_compare($version, $compare, '<='))
+			if (version_compare($version, $compare, '>='))
 			{
 				// The migration should have effectively been installed already
 				if (!is_array($migration_list))
@@ -110,18 +110,27 @@ class phpbb_db_migration_install
 
 				foreach ($migration_list as $migration_name)
 				{
-					$sql_ary = array(
-						'migration_name'			=> $migration_name,
-						'migration_depends_on'		=> $migration_name::depends_on(),
-						'migration_schema_done'		=> 1,
-						'migration_data_done'		=> 1,
-						'migration_data_state'		=> '',
-						'migration_start_time'		=> 0,
-						'migration_end_time'		=> 0,
-					);
-					$sql = 'INSERT INTO ' . $table_prefix . 'migrations ' .
-						$db->sql_build_array('INSERT', $sql_ary);
-					$db->sql_query($sql);
+					$sql = 'SELECT 1 FROM ' . $table_prefix . "migrations
+						WHERE migration_name = '" . $db->sql_escape($migration_name) . "'";
+					$result = $db->sql_query($sql);
+					$row = $db->sql_fetchrow($result);
+					$db->sql_freeresult($result);
+
+					if (!$row)
+					{
+						$sql_ary = array(
+							'migration_name'			=> $migration_name,
+							'migration_depends_on'		=> serialize($migration_name::depends_on()),
+							'migration_schema_done'		=> 1,
+							'migration_data_done'		=> 1,
+							'migration_data_state'		=> '',
+							'migration_start_time'		=> 0,
+							'migration_end_time'		=> 0,
+						);
+						$sql = 'INSERT INTO ' . $table_prefix . 'migrations ' .
+							$db->sql_build_array('INSERT', $sql_ary);
+						$db->sql_query($sql);
+					}
 				}
 			}
 		}
-- 
cgit v1.2.1


From dfcf9966e95fce074a5ed6eb4036393f5b62de7c Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 12 Jan 2013 19:45:20 -0600
Subject: [feature/migrations] Comments for the return in the custom functions

PHPBB3-11318
---
 phpBB/includes/db/migration/data/3_0_11_rc1.php | 1 +
 phpBB/includes/db/migration/data/3_0_7_rc2.php  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/3_0_11_rc1.php b/phpBB/includes/db/migration/data/3_0_11_rc1.php
index 676e6baa87..43e0156760 100644
--- a/phpBB/includes/db/migration/data/3_0_11_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_11_rc1.php
@@ -83,6 +83,7 @@ class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
 				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
 			$this->sql_query($sql);
 
+			// Return false to have the Migrator call this function again
 			return false;
 		}
 	}
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc2.php b/phpBB/includes/db/migration/data/3_0_7_rc2.php
index e986be23bf..c2720b532f 100644
--- a/phpBB/includes/db/migration/data/3_0_7_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_7_rc2.php
@@ -62,6 +62,7 @@ class phpbb_db_migration_data_3_0_7_rc2 extends phpbb_db_migration
 			return;
 		}
 
+		// Return the next start, will be sent to $start when this function is called again
 		return $start + $limit;
 	}
 }
-- 
cgit v1.2.1


From 5e69e1a7612a4dbe24620cc5cad33720cb0c2885 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 13 Jan 2013 13:23:02 -0600
Subject: [feature/migrations] effectively installed check for migration data

PHPBB3-9737
---
 phpBB/includes/db/migration/data/3_0_1.php         |   5 +
 phpBB/includes/db/migration/data/3_0_10.php        |   5 +
 phpBB/includes/db/migration/data/3_0_10_rc1.php    |   5 +
 phpBB/includes/db/migration/data/3_0_10_rc2.php    |   5 +
 phpBB/includes/db/migration/data/3_0_10_rc3.php    |   5 +
 phpBB/includes/db/migration/data/3_0_11.php        |   5 +
 phpBB/includes/db/migration/data/3_0_11_rc1.php    |   5 +
 phpBB/includes/db/migration/data/3_0_11_rc2.php    |   5 +
 phpBB/includes/db/migration/data/3_0_12_rc1.php    |   5 +
 phpBB/includes/db/migration/data/3_0_1_rc1.php     |   5 +
 phpBB/includes/db/migration/data/3_0_2.php         |   5 +
 phpBB/includes/db/migration/data/3_0_2_rc1.php     |   5 +
 phpBB/includes/db/migration/data/3_0_2_rc2.php     |   5 +
 phpBB/includes/db/migration/data/3_0_3.php         |   5 +
 phpBB/includes/db/migration/data/3_0_3_rc1.php     |   5 +
 phpBB/includes/db/migration/data/3_0_4.php         |   5 +
 phpBB/includes/db/migration/data/3_0_4_rc1.php     |   5 +
 phpBB/includes/db/migration/data/3_0_5.php         |   5 +
 phpBB/includes/db/migration/data/3_0_5_rc1.php     |   5 +
 .../includes/db/migration/data/3_0_5_rc1part2.php  |   5 +
 phpBB/includes/db/migration/data/3_0_6.php         |   5 +
 phpBB/includes/db/migration/data/3_0_6_rc1.php     |   5 +
 phpBB/includes/db/migration/data/3_0_6_rc2.php     |   5 +
 phpBB/includes/db/migration/data/3_0_6_rc3.php     |   5 +
 phpBB/includes/db/migration/data/3_0_6_rc4.php     |   5 +
 phpBB/includes/db/migration/data/3_0_7.php         |   5 +
 phpBB/includes/db/migration/data/3_0_7_pl1.php     |   5 +
 phpBB/includes/db/migration/data/3_0_7_rc1.php     |   5 +
 phpBB/includes/db/migration/data/3_0_7_rc2.php     |   5 +
 phpBB/includes/db/migration/data/3_0_8.php         |   5 +
 phpBB/includes/db/migration/data/3_0_8_rc1.php     |   5 +
 phpBB/includes/db/migration/data/3_0_9.php         |   5 +
 phpBB/includes/db/migration/data/3_0_9_rc1.php     |   5 +
 phpBB/includes/db/migration/data/3_0_9_rc2.php     |   5 +
 phpBB/includes/db/migration/data/3_0_9_rc3.php     |   5 +
 phpBB/includes/db/migration/data/3_0_9_rc4.php     |   5 +
 phpBB/includes/db/migration/data/3_1_0_dev.php     |   5 +
 phpBB/includes/db/migration/data/extensions.php    |   5 +
 .../includes/db/migration/data/style_update_p1.php |   5 +
 .../includes/db/migration/data/style_update_p2.php |   5 +
 phpBB/includes/db/migration/data/timezone.php      |   5 +
 phpBB/includes/db/migration/data/timezone_p2.php   |   5 +
 phpBB/includes/db/migration/install.php            | 138 ---------------------
 43 files changed, 210 insertions(+), 138 deletions(-)
 delete mode 100644 phpBB/includes/db/migration/install.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/3_0_1.php b/phpBB/includes/db/migration/data/3_0_1.php
index a9eac6f110..8b7c6f0f7c 100644
--- a/phpBB/includes/db/migration/data/3_0_1.php
+++ b/phpBB/includes/db/migration/data/3_0_1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_1_rc1');
diff --git a/phpBB/includes/db/migration/data/3_0_10.php b/phpBB/includes/db/migration/data/3_0_10.php
index 89afb8a432..b24a876bac 100644
--- a/phpBB/includes/db/migration/data/3_0_10.php
+++ b/phpBB/includes/db/migration/data/3_0_10.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_10 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_10_rc3');
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc1.php b/phpBB/includes/db/migration/data/3_0_10_rc1.php
index ca8fadec61..46b7db4e59 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_10_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10-rc1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_9');
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc2.php b/phpBB/includes/db/migration/data/3_0_10_rc2.php
index 1f39ea48e0..5e85467202 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc2.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_10_rc2 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10-rc2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_10_rc1');
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc3.php b/phpBB/includes/db/migration/data/3_0_10_rc3.php
index cd82bb573e..6ff81f7776 100644
--- a/phpBB/includes/db/migration/data/3_0_10_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_10_rc3.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_10_rc3 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10-rc3', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_10_rc2');
diff --git a/phpBB/includes/db/migration/data/3_0_11.php b/phpBB/includes/db/migration/data/3_0_11.php
index 9f25f0e489..1a63508593 100644
--- a/phpBB/includes/db/migration/data/3_0_11.php
+++ b/phpBB/includes/db/migration/data/3_0_11.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_11 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.11', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11_rc2');
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc1.php b/phpBB/includes/db/migration/data/3_0_11_rc1.php
index 43e0156760..19703bcc35 100644
--- a/phpBB/includes/db/migration/data/3_0_11_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_11_rc1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.11-rc1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_10');
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc2.php b/phpBB/includes/db/migration/data/3_0_11_rc2.php
index e5bb3e44a6..219d44c4e0 100644
--- a/phpBB/includes/db/migration/data/3_0_11_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_11_rc2.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_11_rc2 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.11-rc2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11_rc1');
diff --git a/phpBB/includes/db/migration/data/3_0_12_rc1.php b/phpBB/includes/db/migration/data/3_0_12_rc1.php
index 4fe0828716..c23e8b24b8 100644
--- a/phpBB/includes/db/migration/data/3_0_12_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_12_rc1.php
@@ -11,6 +11,11 @@
 
 class phpbb_db_migration_data_3_0_12_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.12-rc1', '>=');
+	}
+
  	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11');
diff --git a/phpBB/includes/db/migration/data/3_0_1_rc1.php b/phpBB/includes/db/migration/data/3_0_1_rc1.php
index 9f1c04809d..2fc2849d04 100644
--- a/phpBB/includes/db/migration/data/3_0_1_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_1_rc1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.1-rc1', '>=');
+	}
+
 	public function update_schema()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/3_0_2.php b/phpBB/includes/db/migration/data/3_0_2.php
index 8661578281..8aa975f779 100644
--- a/phpBB/includes/db/migration/data/3_0_2.php
+++ b/phpBB/includes/db/migration/data/3_0_2.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_2 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_2_rc2');
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc1.php b/phpBB/includes/db/migration/data/3_0_2_rc1.php
index 851060c3b5..6081cd682c 100644
--- a/phpBB/includes/db/migration/data/3_0_2_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_2_rc1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_2_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.2-rc1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_1');
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc2.php b/phpBB/includes/db/migration/data/3_0_2_rc2.php
index c255e55aef..bb76c270d7 100644
--- a/phpBB/includes/db/migration/data/3_0_2_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_2_rc2.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_2_rc2 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.2-rc2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_2_rc1');
diff --git a/phpBB/includes/db/migration/data/3_0_3.php b/phpBB/includes/db/migration/data/3_0_3.php
index 2873c798fd..82039a109b 100644
--- a/phpBB/includes/db/migration/data/3_0_3.php
+++ b/phpBB/includes/db/migration/data/3_0_3.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_3 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.3', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_3_rc1');
diff --git a/phpBB/includes/db/migration/data/3_0_3_rc1.php b/phpBB/includes/db/migration/data/3_0_3_rc1.php
index 49e4170c3f..5e300962b7 100644
--- a/phpBB/includes/db/migration/data/3_0_3_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_3_rc1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.3-rc1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_2');
diff --git a/phpBB/includes/db/migration/data/3_0_4.php b/phpBB/includes/db/migration/data/3_0_4.php
index 590ae3c69f..34af9fa4ae 100644
--- a/phpBB/includes/db/migration/data/3_0_4.php
+++ b/phpBB/includes/db/migration/data/3_0_4.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_4 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.4', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_4_rc1');
diff --git a/phpBB/includes/db/migration/data/3_0_4_rc1.php b/phpBB/includes/db/migration/data/3_0_4_rc1.php
index 8f44baf046..f63bebcf75 100644
--- a/phpBB/includes/db/migration/data/3_0_4_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_4_rc1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.4-rc1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_3');
diff --git a/phpBB/includes/db/migration/data/3_0_5.php b/phpBB/includes/db/migration/data/3_0_5.php
index 65b292207e..077ed251d2 100644
--- a/phpBB/includes/db/migration/data/3_0_5.php
+++ b/phpBB/includes/db/migration/data/3_0_5.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_5 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.5', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_5_rc1part2');
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1.php b/phpBB/includes/db/migration/data/3_0_5_rc1.php
index a0893a0dbb..df85ee4f7d 100644
--- a/phpBB/includes/db/migration/data/3_0_5_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_5_rc1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_4');
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
index 0597fc0ff8..d2fad7a7f8 100644
--- a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
+++ b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_5_rc1part2 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_5_rc1');
diff --git a/phpBB/includes/db/migration/data/3_0_6.php b/phpBB/includes/db/migration/data/3_0_6.php
index a7b88e510a..1b0cbb1435 100644
--- a/phpBB/includes/db/migration/data/3_0_6.php
+++ b/phpBB/includes/db/migration/data/3_0_6.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_6 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_6_rc4');
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc1.php b/phpBB/includes/db/migration/data/3_0_6_rc1.php
index 5ebeceeed7..0f85084e65 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_5');
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc2.php b/phpBB/includes/db/migration/data/3_0_6_rc2.php
index 7cbda4c616..a9c497b3cd 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc2.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_6_rc2 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_6_rc1');
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc3.php b/phpBB/includes/db/migration/data/3_0_6_rc3.php
index 209057ec70..eca19fc2ff 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc3.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_6_rc3 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc3', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_6_rc2');
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc4.php b/phpBB/includes/db/migration/data/3_0_6_rc4.php
index 62f0e91a7d..19611d3c56 100644
--- a/phpBB/includes/db/migration/data/3_0_6_rc4.php
+++ b/phpBB/includes/db/migration/data/3_0_6_rc4.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_6_rc4 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc4', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_6_rc3');
diff --git a/phpBB/includes/db/migration/data/3_0_7.php b/phpBB/includes/db/migration/data/3_0_7.php
index 3e215ff905..97cdf4e3f1 100644
--- a/phpBB/includes/db/migration/data/3_0_7.php
+++ b/phpBB/includes/db/migration/data/3_0_7.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_7 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_7_rc2');
diff --git a/phpBB/includes/db/migration/data/3_0_7_pl1.php b/phpBB/includes/db/migration/data/3_0_7_pl1.php
index ffe0836d02..176854a8a6 100644
--- a/phpBB/includes/db/migration/data/3_0_7_pl1.php
+++ b/phpBB/includes/db/migration/data/3_0_7_pl1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_7_pl1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7-pl1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_7');
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc1.php b/phpBB/includes/db/migration/data/3_0_7_rc1.php
index b30830c21d..daf52213b9 100644
--- a/phpBB/includes/db/migration/data/3_0_7_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_7_rc1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7-rc1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_6');
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc2.php b/phpBB/includes/db/migration/data/3_0_7_rc2.php
index c2720b532f..8167d8fa40 100644
--- a/phpBB/includes/db/migration/data/3_0_7_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_7_rc2.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_7_rc2 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7-rc2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_7_rc1');
diff --git a/phpBB/includes/db/migration/data/3_0_8.php b/phpBB/includes/db/migration/data/3_0_8.php
index 8043b934b0..25baaf0f07 100644
--- a/phpBB/includes/db/migration/data/3_0_8.php
+++ b/phpBB/includes/db/migration/data/3_0_8.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_8 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.8', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_8_rc1');
diff --git a/phpBB/includes/db/migration/data/3_0_8_rc1.php b/phpBB/includes/db/migration/data/3_0_8_rc1.php
index 8214f44f17..13e68a7953 100644
--- a/phpBB/includes/db/migration/data/3_0_8_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_8_rc1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.8-rc1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_7_pl1');
diff --git a/phpBB/includes/db/migration/data/3_0_9.php b/phpBB/includes/db/migration/data/3_0_9.php
index c562f1f2cf..b35350dbb5 100644
--- a/phpBB/includes/db/migration/data/3_0_9.php
+++ b/phpBB/includes/db/migration/data/3_0_9.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_9 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_9_rc4');
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc1.php b/phpBB/includes/db/migration/data/3_0_9_rc1.php
index 367bb25734..be6ced2566 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc1.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc1', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_8');
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc2.php b/phpBB/includes/db/migration/data/3_0_9_rc2.php
index c8566d54a5..0bec42a8de 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc2.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc2.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_9_rc2 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc2', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_9_rc1');
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc3.php b/phpBB/includes/db/migration/data/3_0_9_rc3.php
index da977e9666..a339670932 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc3.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc3.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_9_rc3 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc3', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_9_rc2');
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc4.php b/phpBB/includes/db/migration/data/3_0_9_rc4.php
index 0bfe26985c..ab5c302611 100644
--- a/phpBB/includes/db/migration/data/3_0_9_rc4.php
+++ b/phpBB/includes/db/migration/data/3_0_9_rc4.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_0_9_rc4 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc4', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_9_rc3');
diff --git a/phpBB/includes/db/migration/data/3_1_0_dev.php b/phpBB/includes/db/migration/data/3_1_0_dev.php
index 14953591d1..ac8882cb3a 100644
--- a/phpBB/includes/db/migration/data/3_1_0_dev.php
+++ b/phpBB/includes/db/migration/data/3_1_0_dev.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_3_1_0_dev extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.1.0-dev', '>=');
+	}
+
 	static public function depends_on()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/extensions.php b/phpBB/includes/db/migration/data/extensions.php
index ff54d0d933..f077741883 100644
--- a/phpBB/includes/db/migration/data/extensions.php
+++ b/phpBB/includes/db/migration/data/extensions.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_extensions extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'ext');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11');
diff --git a/phpBB/includes/db/migration/data/style_update_p1.php b/phpBB/includes/db/migration/data/style_update_p1.php
index 701afc0d78..7506b7c49b 100644
--- a/phpBB/includes/db/migration/data/style_update_p1.php
+++ b/phpBB/includes/db/migration/data/style_update_p1.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_style_update_p1 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11');
diff --git a/phpBB/includes/db/migration/data/style_update_p2.php b/phpBB/includes/db/migration/data/style_update_p2.php
index 1a8cc9da58..ef13f45d9b 100644
--- a/phpBB/includes/db/migration/data/style_update_p2.php
+++ b/phpBB/includes/db/migration/data/style_update_p2.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_style_update_p2 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_style_update_p1');
diff --git a/phpBB/includes/db/migration/data/timezone.php b/phpBB/includes/db/migration/data/timezone.php
index 3658120629..66085b8872 100644
--- a/phpBB/includes/db/migration/data/timezone.php
+++ b/phpBB/includes/db/migration/data/timezone.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_timezone extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_dst');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_3_0_11');
diff --git a/phpBB/includes/db/migration/data/timezone_p2.php b/phpBB/includes/db/migration/data/timezone_p2.php
index 15f1a3e414..38347a0c63 100644
--- a/phpBB/includes/db/migration/data/timezone_p2.php
+++ b/phpBB/includes/db/migration/data/timezone_p2.php
@@ -9,6 +9,11 @@
 
 class phpbb_db_migration_data_timezone_p2 extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_dst');
+	}
+
 	static public function depends_on()
 	{
 		return array('phpbb_db_migration_data_timezone');
diff --git a/phpBB/includes/db/migration/install.php b/phpBB/includes/db/migration/install.php
deleted file mode 100644
index 95f3a3b994..0000000000
--- a/phpBB/includes/db/migration/install.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_install
-{
-	/**
-	* List of phpBB versions/what migration identifier
-	* 	contains the updates that should have been installed already
-	*
-	* @var array
-	*/
-	protected $version_to_migration = array(
-		'3.0.1-rc1'		=> 'phpbb_db_migration_data_3_0_1_rc1',
-		'3.0.1'	   		=> 'phpbb_db_migration_data_3_0_1',
-		'3.0.2-rc1'		=> 'phpbb_db_migration_data_3_0_2_rc1',
-		'3.0.2-rc2'		=> 'phpbb_db_migration_data_3_0_2_rc2',
-		'3.0.2'	   		=> 'phpbb_db_migration_data_3_0_2',
-		'3.0.3-rc1'		=> 'phpbb_db_migration_data_3_0_3_rc1',
-		'3.0.3'	   		=> 'phpbb_db_migration_data_3_0_3',
-		'3.0.4-rc1'		=> 'phpbb_db_migration_data_3_0_4_rc1',
-		'3.0.4'	   		=> 'phpbb_db_migration_data_3_0_4',
-		'3.0.5-rc1'		=> array(
-			'phpbb_db_migration_data_3_0_5_rc1',
-			'phpbb_db_migration_data_3_0_5_rc1part2',
-		),
-		'3.0.5'	   		=> 'phpbb_db_migration_data_3_0_5',
-		'3.0.6-rc1'		=> 'phpbb_db_migration_data_3_0_6_rc1',
-		'3.0.6-rc2'		=> 'phpbb_db_migration_data_3_0_6_rc2',
-		'3.0.6-rc3'		=> 'phpbb_db_migration_data_3_0_6_rc3',
-		'3.0.6-rc4'		=> 'phpbb_db_migration_data_3_0_6_rc4',
-		'3.0.6'	   		=> 'phpbb_db_migration_data_3_0_6',
-		'3.0.7-rc1'		=> 'phpbb_db_migration_data_3_0_7_rc1',
-		'3.0.7-rc2'		=> 'phpbb_db_migration_data_3_0_7_rc2',
-		'3.0.7'	   		=> 'phpbb_db_migration_data_3_0_7',
-		'3.0.7-pl1'		=> 'phpbb_db_migration_data_3_0_7_pl1',
-		'3.0.8-rc1'		=> 'phpbb_db_migration_data_3_0_8_rc1',
-		'3.0.8'			=> 'phpbb_db_migration_data_3_0_8',
-		'3.0.9-rc1'     => 'phpbb_db_migration_data_3_0_9_rc1',
-		'3.0.9-rc2'     => 'phpbb_db_migration_data_3_0_9_rc2',
-		'3.0.9-rc3'     => 'phpbb_db_migration_data_3_0_9_rc3',
-		'3.0.9-rc4'     => 'phpbb_db_migration_data_3_0_9_rc4',
-		'3.0.9'			=> 'phpbb_db_migration_data_3_0_9',
-		'3.0.10-rc1'    => 'phpbb_db_migration_data_3_0_10_rc1',
-		'3.0.10-rc2'    => 'phpbb_db_migration_data_3_0_10_rc2',
-		'3.0.10-rc3'    => 'phpbb_db_migration_data_3_0_10_rc3',
-		'3.0.10'		=> 'phpbb_db_migration_data_3_0_10',
-		'3.0.11-rc1'	=> 'phpbb_db_migration_data_3_0_11_rc1',
-		'3.0.11-rc2'	=> 'phpbb_db_migration_data_3_0_11_rc2',
-		'3.0.11'		=> 'phpbb_db_migration_data_3_0_11',
-		'3.0.12-rc1'	=> 'phpbb_db_migration_data_3_0_12_rc1',
-		'3.1.0-dev'		=> array(
-			'phpbb_db_migration_data_style_update_p1',
-			'phpbb_db_migration_data_style_update_p2',
-			'phpbb_db_migration_data_timezone',
-			'phpbb_db_migration_data_timezone_p2',
-			'phpbb_db_migration_data_extensions',
-			'phpbb_db_migration_data_3_1_0_dev',
-		),
-	);
-
-	public function install(phpbb_db_driver $db, phpbb_db_tools $db_tools, $table_prefix, $version)
-	{
-		$this->create_table($db_tools, $table_prefix);
-
-		$this->guess_installed_migrations($db, $table_prefix, $version);
-	}
-
-	protected function create_table(phpbb_db_tools $db_tools, $table_prefix)
-	{
-		if (!$db_tools->sql_table_exists($table_prefix . 'migrations'))
-		{
-			$db_tools->sql_create_table($table_prefix . 'migrations', array(
-				'COLUMNS'		=> array(
-					'migration_name'			=> array('VCHAR', ''),
-					'migration_depends_on'		=> array('TEXT', ''),
-					'migration_schema_done'		=> array('BOOL', 0),
-					'migration_data_done'		=> array('BOOL', 0),
-					'migration_data_state'		=> array('TEXT', ''),
-					'migration_start_time'		=> array('TIMESTAMP', 0),
-					'migration_end_time'		=> array('TIMESTAMP', 0),
-				),
-				'PRIMARY_KEY'	=> 'migration_name',
-			));
-		}
-	}
-
-	/**
-	* Guess what migrations have been installed based on phpBB version
-	*
-	* @param mixed $version
-	*/
-	protected function guess_installed_migrations(phpbb_db_driver $db, $table_prefix, $version)
-	{
-		$installed = array();
-		foreach ($this->version_to_migration as $compare => $migration_list)
-		{
-			if (version_compare($version, $compare, '>='))
-			{
-				// The migration should have effectively been installed already
-				if (!is_array($migration_list))
-				{
-					$migration_list = array($migration_list);
-				}
-
-				foreach ($migration_list as $migration_name)
-				{
-					$sql = 'SELECT 1 FROM ' . $table_prefix . "migrations
-						WHERE migration_name = '" . $db->sql_escape($migration_name) . "'";
-					$result = $db->sql_query($sql);
-					$row = $db->sql_fetchrow($result);
-					$db->sql_freeresult($result);
-
-					if (!$row)
-					{
-						$sql_ary = array(
-							'migration_name'			=> $migration_name,
-							'migration_depends_on'		=> serialize($migration_name::depends_on()),
-							'migration_schema_done'		=> 1,
-							'migration_data_done'		=> 1,
-							'migration_data_state'		=> '',
-							'migration_start_time'		=> 0,
-							'migration_end_time'		=> 0,
-						);
-						$sql = 'INSERT INTO ' . $table_prefix . 'migrations ' .
-							$db->sql_build_array('INSERT', $sql_ary);
-						$db->sql_query($sql);
-					}
-				}
-			}
-		}
-	}
-}
-- 
cgit v1.2.1


From 747e51491859507ad2f1891df5df4e563c23dd57 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 14 Jan 2013 12:38:14 -0600
Subject: [feature/migrations] Reports table schema changes in recent develop

PHPBB3-9737
---
 phpBB/includes/db/migration/data/3_1_0_dev.php     |  1 +
 .../db/migration/data/reported_posts_display.php   | 42 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 phpBB/includes/db/migration/data/reported_posts_display.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/3_1_0_dev.php b/phpBB/includes/db/migration/data/3_1_0_dev.php
index ac8882cb3a..8b437104e0 100644
--- a/phpBB/includes/db/migration/data/3_1_0_dev.php
+++ b/phpBB/includes/db/migration/data/3_1_0_dev.php
@@ -21,6 +21,7 @@ class phpbb_db_migration_data_3_1_0_dev extends phpbb_db_migration
 			'phpbb_db_migration_data_extensions',
 			'phpbb_db_migration_data_style_update_p2',
 			'phpbb_db_migration_data_timezone_p2',
+			'phpbb_db_migration_data_reported_posts_display',
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/reported_posts_display.php b/phpBB/includes/db/migration/data/reported_posts_display.php
new file mode 100644
index 0000000000..fa605e28e5
--- /dev/null
+++ b/phpBB/includes/db/migration/data/reported_posts_display.php
@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_reported_posts_display extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_column_exists($this->table_prefix . 'reports', 'reported_post_enable_bbcode');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns'		=> array(
+				$this->table_prefix . 'reports'		=> array(
+					'reported_post_enable_bbcode'		=> array('BOOL', 1),
+					'reported_post_enable_smilies'		=> array('BOOL', 1),
+					'reported_post_enable_magic_url'	=> array('BOOL', 1),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns'		=> array(
+				$this->table_prefix . 'reports'		=> array(
+					'reported_post_enable_bbcode',
+					'reported_post_enable_smilies',
+					'reported_post_enable_magic_url',
+				),
+			),
+		);
+	}
+}
-- 
cgit v1.2.1


From 58507f250bf11dda6a138d5f66057ec413750e03 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 14 Jan 2013 12:45:01 -0600
Subject: [feature/migrations] Subdirectories for migration data

Organization will set you free

PHPBB3-9737
---
 phpBB/includes/db/migration/data/30x/3_0_1.php     |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_10.php    |  28 ++
 .../includes/db/migration/data/30x/3_0_10_rc1.php  |  30 ++
 .../includes/db/migration/data/30x/3_0_10_rc2.php  |  28 ++
 .../includes/db/migration/data/30x/3_0_10_rc3.php  |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_11.php    |  28 ++
 .../includes/db/migration/data/30x/3_0_11_rc1.php  |  95 +++++
 .../includes/db/migration/data/30x/3_0_11_rc2.php  |  50 +++
 .../includes/db/migration/data/30x/3_0_12_rc1.php  | 123 +++++++
 phpBB/includes/db/migration/data/30x/3_0_1_rc1.php | 108 ++++++
 phpBB/includes/db/migration/data/30x/3_0_2.php     |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_2_rc1.php |  32 ++
 phpBB/includes/db/migration/data/30x/3_0_2_rc2.php |  80 ++++
 phpBB/includes/db/migration/data/30x/3_0_3.php     |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_3_rc1.php |  83 +++++
 phpBB/includes/db/migration/data/30x/3_0_4.php     |  49 +++
 phpBB/includes/db/migration/data/30x/3_0_4_rc1.php | 123 +++++++
 phpBB/includes/db/migration/data/30x/3_0_5.php     |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_5_rc1.php | 124 +++++++
 .../db/migration/data/30x/3_0_5_rc1part2.php       |  42 +++
 phpBB/includes/db/migration/data/30x/3_0_6.php     |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_6_rc1.php | 324 ++++++++++++++++
 phpBB/includes/db/migration/data/30x/3_0_6_rc2.php |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_6_rc3.php |  40 ++
 phpBB/includes/db/migration/data/30x/3_0_6_rc4.php |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_7.php     |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_7_pl1.php |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_7_rc1.php |  76 ++++
 phpBB/includes/db/migration/data/30x/3_0_7_rc2.php |  73 ++++
 phpBB/includes/db/migration/data/30x/3_0_8.php     |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_8_rc1.php | 221 +++++++++++
 phpBB/includes/db/migration/data/30x/3_0_9.php     |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_9_rc1.php | 124 +++++++
 phpBB/includes/db/migration/data/30x/3_0_9_rc2.php |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_9_rc3.php |  28 ++
 phpBB/includes/db/migration/data/30x/3_0_9_rc4.php |  28 ++
 phpBB/includes/db/migration/data/310/dev.php       | 406 +++++++++++++++++++++
 .../includes/db/migration/data/310/extensions.php  |  69 ++++
 .../migration/data/310/reported_posts_display.php  |  42 +++
 .../db/migration/data/310/style_update_p1.php      | 157 ++++++++
 .../db/migration/data/310/style_update_p2.php      | 129 +++++++
 phpBB/includes/db/migration/data/310/timezone.php  | 163 +++++++++
 .../includes/db/migration/data/310/timezone_p2.php |  43 +++
 phpBB/includes/db/migration/data/3_0_1.php         |  28 --
 phpBB/includes/db/migration/data/3_0_10.php        |  28 --
 phpBB/includes/db/migration/data/3_0_10_rc1.php    |  30 --
 phpBB/includes/db/migration/data/3_0_10_rc2.php    |  28 --
 phpBB/includes/db/migration/data/3_0_10_rc3.php    |  28 --
 phpBB/includes/db/migration/data/3_0_11.php        |  28 --
 phpBB/includes/db/migration/data/3_0_11_rc1.php    |  95 -----
 phpBB/includes/db/migration/data/3_0_11_rc2.php    |  50 ---
 phpBB/includes/db/migration/data/3_0_12_rc1.php    | 123 -------
 phpBB/includes/db/migration/data/3_0_1_rc1.php     | 108 ------
 phpBB/includes/db/migration/data/3_0_2.php         |  28 --
 phpBB/includes/db/migration/data/3_0_2_rc1.php     |  32 --
 phpBB/includes/db/migration/data/3_0_2_rc2.php     |  80 ----
 phpBB/includes/db/migration/data/3_0_3.php         |  28 --
 phpBB/includes/db/migration/data/3_0_3_rc1.php     |  83 -----
 phpBB/includes/db/migration/data/3_0_4.php         |  49 ---
 phpBB/includes/db/migration/data/3_0_4_rc1.php     | 123 -------
 phpBB/includes/db/migration/data/3_0_5.php         |  28 --
 phpBB/includes/db/migration/data/3_0_5_rc1.php     | 124 -------
 .../includes/db/migration/data/3_0_5_rc1part2.php  |  42 ---
 phpBB/includes/db/migration/data/3_0_6.php         |  28 --
 phpBB/includes/db/migration/data/3_0_6_rc1.php     | 324 ----------------
 phpBB/includes/db/migration/data/3_0_6_rc2.php     |  28 --
 phpBB/includes/db/migration/data/3_0_6_rc3.php     |  40 --
 phpBB/includes/db/migration/data/3_0_6_rc4.php     |  28 --
 phpBB/includes/db/migration/data/3_0_7.php         |  28 --
 phpBB/includes/db/migration/data/3_0_7_pl1.php     |  28 --
 phpBB/includes/db/migration/data/3_0_7_rc1.php     |  76 ----
 phpBB/includes/db/migration/data/3_0_7_rc2.php     |  73 ----
 phpBB/includes/db/migration/data/3_0_8.php         |  28 --
 phpBB/includes/db/migration/data/3_0_8_rc1.php     | 221 -----------
 phpBB/includes/db/migration/data/3_0_9.php         |  28 --
 phpBB/includes/db/migration/data/3_0_9_rc1.php     | 124 -------
 phpBB/includes/db/migration/data/3_0_9_rc2.php     |  28 --
 phpBB/includes/db/migration/data/3_0_9_rc3.php     |  28 --
 phpBB/includes/db/migration/data/3_0_9_rc4.php     |  28 --
 phpBB/includes/db/migration/data/3_1_0_dev.php     | 406 ---------------------
 phpBB/includes/db/migration/data/extensions.php    |  69 ----
 .../db/migration/data/reported_posts_display.php   |  42 ---
 .../includes/db/migration/data/style_update_p1.php | 157 --------
 .../includes/db/migration/data/style_update_p2.php | 129 -------
 phpBB/includes/db/migration/data/timezone.php      | 163 ---------
 phpBB/includes/db/migration/data/timezone_p2.php   |  43 ---
 86 files changed, 3310 insertions(+), 3310 deletions(-)
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_10.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_10_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_10_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_10_rc3.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_11.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_11_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_11_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_12_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_1_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_2.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_2_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_2_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_3.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_3_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_4.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_4_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_5.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_5_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_6.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_6_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_6_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_6_rc3.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_6_rc4.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_7.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_7_pl1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_7_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_7_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_8.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_8_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_9.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_9_rc1.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_9_rc2.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_9_rc3.php
 create mode 100644 phpBB/includes/db/migration/data/30x/3_0_9_rc4.php
 create mode 100644 phpBB/includes/db/migration/data/310/dev.php
 create mode 100644 phpBB/includes/db/migration/data/310/extensions.php
 create mode 100644 phpBB/includes/db/migration/data/310/reported_posts_display.php
 create mode 100644 phpBB/includes/db/migration/data/310/style_update_p1.php
 create mode 100644 phpBB/includes/db/migration/data/310/style_update_p2.php
 create mode 100644 phpBB/includes/db/migration/data/310/timezone.php
 create mode 100644 phpBB/includes/db/migration/data/310/timezone_p2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_10.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_10_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_10_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_10_rc3.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_11.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_11_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_11_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_12_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_1_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_2_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_2_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_3.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_3_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_4.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_4_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_5.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_5_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_5_rc1part2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_6.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_6_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_6_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_6_rc3.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_6_rc4.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_7.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_7_pl1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_7_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_7_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_8.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_8_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_9.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_9_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_9_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_9_rc3.php
 delete mode 100644 phpBB/includes/db/migration/data/3_0_9_rc4.php
 delete mode 100644 phpBB/includes/db/migration/data/3_1_0_dev.php
 delete mode 100644 phpBB/includes/db/migration/data/extensions.php
 delete mode 100644 phpBB/includes/db/migration/data/reported_posts_display.php
 delete mode 100644 phpBB/includes/db/migration/data/style_update_p1.php
 delete mode 100644 phpBB/includes/db/migration/data/style_update_p2.php
 delete mode 100644 phpBB/includes/db/migration/data/timezone.php
 delete mode 100644 phpBB/includes/db/migration/data/timezone_p2.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/30x/3_0_1.php b/phpBB/includes/db/migration/data/30x/3_0_1.php
new file mode 100644
index 0000000000..c996a0138a
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_1.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_1_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10.php b/phpBB/includes/db/migration/data/30x/3_0_10.php
new file mode 100644
index 0000000000..122f93d6b4
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_10.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_10 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_10_rc3');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.10')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php
new file mode 100644
index 0000000000..0ed05812dc
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_10_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_9');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('email_max_chunk_size', 50)),
+
+			array('config.update', array('version', '3.0.10-rc1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php
new file mode 100644
index 0000000000..b14b3b00aa
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_10_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_10_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.10-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php b/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php
new file mode 100644
index 0000000000..473057d65d
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_10_rc3 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10-rc3', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_10_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.10-rc3')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11.php b/phpBB/includes/db/migration/data/30x/3_0_11.php
new file mode 100644
index 0000000000..e063c699cc
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_11.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_11 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.11', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.11')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php
new file mode 100644
index 0000000000..dddfc0e0e7
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php
@@ -0,0 +1,95 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_11_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.11-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_10');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
+			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
+
+			array('config.update', array('version', '3.0.11-rc1')),
+		);
+	}
+
+	public function cleanup_deactivated_styles()
+	{
+		// Updates users having current style a deactivated one
+		$sql = 'SELECT style_id
+			FROM ' . STYLES_TABLE . '
+			WHERE style_active = 0';
+		$result = $this->sql_query($sql);
+
+		$deactivated_style_ids = array();
+		while ($style_id = $this->db->sql_fetchfield('style_id', false, $result))
+		{
+			$deactivated_style_ids[] = (int) $style_id;
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($deactivated_style_ids))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_style = ' . (int) $this->config['default_style'] .'
+				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
+			$this->sql_query($sql);
+		}
+	}
+
+	public function delete_orphan_private_messages()
+	{
+		// Delete orphan private messages
+		$batch_size = 500;
+
+		$sql_array = array(
+			'SELECT'	=> 'p.msg_id',
+			'FROM'		=> array(
+				PRIVMSGS_TABLE	=> 'p',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
+					'ON'	=> 'p.msg_id = t.msg_id',
+				),
+			),
+			'WHERE'		=> 't.user_id IS NULL',
+		);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+
+		$result = $this->db->sql_query_limit($sql, $batch_size);
+
+		$delete_pms = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$delete_pms[] = (int) $row['msg_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($delete_pms))
+		{
+			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
+			$this->sql_query($sql);
+
+			// Return false to have the Migrator call this function again
+			return false;
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php
new file mode 100644
index 0000000000..fac8523e8c
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_11_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.11-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11_rc1');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_novalue' => array('BOOL', 0),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_novalue',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.11-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php
new file mode 100644
index 0000000000..6a31a51201
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php
@@ -0,0 +1,123 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 **/
+
+class phpbb_db_migration_data_30x_3_0_12_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.12-rc1', '>=');
+	}
+
+ 	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_module_auth'))),
+			array('custom', array(array(&$this, 'update_bots'))),
+			array('custom', array(array(&$this, 'disable_bots_from_receiving_pms'))),
+
+			array('config.update', array('version', '3.0.12-rc1')),
+		);
+	}
+
+	public function disable_bots_from_receiving_pms()
+	{
+		// Disable receiving pms for bots
+		$sql = 'SELECT user_id
+			FROM ' . BOTS_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		$bot_user_ids = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$bot_user_ids[] = (int) $row['user_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($bot_user_ids))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_allow_pm = 0
+				WHERE ' . $this->db->sql_in_set('user_id', $bot_user_ids);
+			$this->sql_query($sql);
+		}
+	}
+
+	public function update_module_auth()
+	{
+		$sql = 'UPDATE ' . MODULES_TABLE . '
+			SET module_auth = \'acl_u_sig\'
+			WHERE module_class = \'ucp\'
+				AND module_basename = \'profile\'
+				AND module_mode = \'signature\'';
+		$this->sql_query($sql);
+	}
+
+	public function update_bots()
+	{
+		// Update bots
+		if (!function_exists('user_delete'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		}
+
+		$bots_updates = array(
+			// Bot Deletions
+			'NG-Search [Bot]'		=> false,
+			'Nutch/CVS [Bot]'		=> false,
+			'OmniExplorer [Bot]'	=> false,
+			'Seekport [Bot]'		=> false,
+			'Synoo [Bot]'			=> false,
+			'WiseNut [Bot]'			=> false,
+
+			// Bot Updates
+			// Bot name to bot user agent map
+			'Baidu [Spider]'	=> 'Baiduspider',
+			'Exabot [Bot]'		=> 'Exabot',
+			'Voyager [Bot]'		=> 'voyager/',
+			'W3C [Validator]'	=> 'W3C_Validator',
+		);
+
+		foreach ($bots_updates as $bot_name => $bot_agent)
+		{
+			$sql = 'SELECT user_id
+				FROM ' . USERS_TABLE . '
+				WHERE user_type = ' . USER_IGNORE . "
+					AND username_clean = '" . $this->db->sql_escape(utf8_clean_string($bot_name)) . "'";
+			$result = $this->db->sql_query($sql);
+			$bot_user_id = (int) $this->db->sql_fetchfield('user_id');
+			$this->db->sql_freeresult($result);
+
+			if ($bot_user_id)
+			{
+				if ($bot_agent === false)
+				{
+					$sql = 'DELETE FROM ' . BOTS_TABLE . "
+						WHERE user_id = $bot_user_id";
+					$this->sql_query($sql);
+
+					user_delete('remove', $bot_user_id);
+				}
+				else
+				{
+					$sql = 'UPDATE ' . BOTS_TABLE . "
+						SET bot_agent = '" .  $this->db->sql_escape($bot_agent) . "'
+						WHERE user_id = $bot_user_id";
+					$this->sql_query($sql);
+				}
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php
new file mode 100644
index 0000000000..562ccf077c
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php
@@ -0,0 +1,108 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_1_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.1-rc1', '>=');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'display_subforum_list' => array('BOOL', 1),
+				),
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('UINT', 0),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'groups' => array(
+					'group_legend',
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('session_forum_id'),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_legend_name' => array('group_legend', 'group_name'),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'display_subforum_list',
+				),
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id',
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'groups' => array(
+					'group_legend' => array('group_legend'),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id',
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_legend_name',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
+			array('custom', array(array(&$this, 'reset_smiley_size'))),
+
+			array('config.update', array('version', '3.0.1-rc1')),
+		);
+	}
+
+	public function fix_unset_last_view_time()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . "topics
+			SET topic_last_view_time = topic_last_post_time
+			WHERE topic_last_view_time = 0";
+		$this->sql_query($sql);
+	}
+
+	public function reset_smiley_size()
+	{
+		// Update smiley sizes
+		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
+
+		foreach ($smileys as $smiley)
+		{
+			if (file_exists($this->phpbb_root_path . 'images/smilies/' . $smiley))
+			{
+				list($width, $height) = getimagesize($this->phpbb_root_path . 'images/smilies/' . $smiley);
+
+				$sql = 'UPDATE ' . SMILIES_TABLE . '
+					SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
+					WHERE smiley_url = '" . $this->db->sql_escape($smiley) . "'";
+
+				$this->sql_query($sql);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2.php b/phpBB/includes/db/migration/data/30x/3_0_2.php
new file mode 100644
index 0000000000..eed5acef82
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_2_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php
new file mode 100644
index 0000000000..a960e90765
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php
@@ -0,0 +1,32 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_2_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.2-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('referer_validation', '1')),
+			array('config.add', array('check_attachment_content', '1')),
+			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
+
+			array('config.update', array('version', '3.0.2-rc1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php
new file mode 100644
index 0000000000..8917dfea77
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php
@@ -0,0 +1,80 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_2_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.2-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_2_rc1');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'drafts' => array(
+					'draft_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_last_post_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_subject' => array('STEXT_UNI', '', 'true_sort'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'topics' => array(
+					'topic_title' => array('STEXT_UNI', '', 'true_sort'),
+					'topic_last_post_subject' => array('STEXT_UNI', ''),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id',
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_fid' => array('session_forum_id'),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array(
+						'session_forum_id',
+					),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_fid',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.2-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_3.php b/phpBB/includes/db/migration/data/30x/3_0_3.php
new file mode 100644
index 0000000000..8984cf7b76
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_3.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_3 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.3', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_3_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.3')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php
new file mode 100644
index 0000000000..4b102e1a2e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php
@@ -0,0 +1,83 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_3_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.3-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_2');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'styles_template' => array(
+					'template_inherits_id' => array('UINT:4', 0),
+					'template_inherit_path' => array('VCHAR', ''),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_max_recipients' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'styles_template' => array(
+					'template_inherits_id',
+					'template_inherit_path',
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_max_recipients',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('enable_queue_trigger', '0')),
+			array('config.add', array('queue_trigger_posts', '3')),
+			array('config.add', array('pm_max_recipients', '0')),
+			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
+			array('config.add', array('dbms_version', $this->db->sql_server_info(true))),
+			array('permission.add', array('u_masspm_group', true, 'u_masspm')),
+			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
+
+			array('config.update', array('version', '3.0.3-rc1')),
+		);
+	}
+
+	public function correct_acp_email_permissions()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . 'modules
+			SET module_auth = \'acl_a_email && cfg_email_enable\'
+			WHERE module_class = \'acp\'
+				AND module_basename = \'email\'';
+		$this->sql_query($sql);
+	}
+
+	public function set_group_default_max_recipients()
+	{
+		// Set maximum number of recipients for the registered users, bots, guests group
+		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
+			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_4.php b/phpBB/includes/db/migration/data/30x/3_0_4.php
new file mode 100644
index 0000000000..9a0c132e78
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_4.php
@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_4 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.4', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_4_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
+
+			array('config.update', array('version', '3.0.4')),
+		);
+	}
+
+	public function rename_log_delete_topic()
+	{
+		if ($this->db->sql_layer == 'oracle')
+		{
+			// log_operation is CLOB - but we can change this later
+			$sql = 'UPDATE ' . $this->table_prefix . "log
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
+			$this->sql_query($sql);
+		}
+		else
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . "log
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation = 'LOG_TOPIC_DELETED'";
+			$this->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php
new file mode 100644
index 0000000000..8ad75a557b
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php
@@ -0,0 +1,123 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_4_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.4-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_3');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_profile' => array('BOOL', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'styles' => array(
+					'style_id' => array('UINT', NULL, 'auto_increment'),
+					'template_id' => array('UINT', 0),
+					'theme_id' => array('UINT', 0),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_imageset' => array(
+					'imageset_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_imageset_data' => array(
+					'image_id' => array('UINT', NULL, 'auto_increment'),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_theme' => array(
+					'theme_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template' => array(
+					'template_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template_data' => array(
+					'template_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_profile',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
+
+			array('config.update', array('version', '3.0.4-rc1')),
+		);
+	}
+
+	public function update_custom_profile_fields()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
+				FROM ' . PROFILE_FIELDS_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'field_required'	=> 0,
+				'field_show_on_reg'	=> 0,
+				'field_hide'		=> 0,
+				'field_show_profile'=> 0,
+			);
+
+			if ($row['field_required'])
+			{
+				$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_show_on_reg'])
+			{
+				$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_hide'])
+			{
+				// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
+				$sql_ary['field_hide'] = 1;
+			}
+			else
+			{
+				// equivelant to "none", which is the "Display in user control panel" option
+				$sql_ary['field_show_profile'] = 1;
+			}
+
+			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
+		}
+
+		$this->db->sql_freeresult($result);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5.php b/phpBB/includes/db/migration/data/30x/3_0_5.php
new file mode 100644
index 0000000000..16d2dee457
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_5.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_5 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.5', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_5_rc1part2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.5')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php
new file mode 100644
index 0000000000..ea17cc1e31
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php
@@ -0,0 +1,124 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_5_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_4');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		$search_indexing_state = $this->config['search_indexing_state'];
+
+		return array(
+			array('config.add', array('captcha_gd_wave', 0)),
+			array('config.add', array('captcha_gd_3d_noise', 1)),
+			array('config.add', array('captcha_gd_fonts', 1)),
+			array('config.add', array('confirm_refresh', 1)),
+			array('config.add', array('max_num_search_keywords', 10)),
+			array('config.remove', array('search_indexing_state')),
+			array('config.add', array('search_indexing_state', $search_indexing_state, true)),
+			array('custom', array(array(&$this, 'hash_old_passwords'))),
+			array('custom', array(array(&$this, 'update_ichiro_bot'))),
+		);
+	}
+
+	public function hash_old_passwords()
+	{
+		$sql = 'SELECT user_id, user_password
+				FROM ' . $this->table_prefix . 'users
+				WHERE user_pass_convert = 1';
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (strlen($row['user_password']) == 32)
+			{
+				$sql_ary = array(
+					'user_password'	=> phpbb_hash($row['user_password']),
+				);
+
+				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
+			}
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function update_ichiro_bot()
+	{
+		// Adjust bot entry
+		$sql = 'UPDATE ' . $this->table_prefix . "bots
+			SET bot_agent = 'ichiro/'
+			WHERE bot_agent = 'ichiro/2'";
+		$this->sql_query($sql);
+	}
+
+	public function remove_duplicate_auth_options()
+	{
+		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
+		$sql = 'SELECT auth_option
+			FROM ' . $this->table_prefix . 'acl_options
+			GROUP BY auth_option
+			HAVING COUNT(*) >= 2';
+		$result = $this->db->sql_query($sql);
+
+		$auth_options = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$auth_options[] = $row['auth_option'];
+		}
+		$this->db->sql_freeresult($result);
+
+		// Remove specific auth options
+		if (!empty($auth_options))
+		{
+			foreach ($auth_options as $option)
+			{
+				// Select auth_option_ids... the largest id will be preserved
+				$sql = 'SELECT auth_option_id
+					FROM ' . ACL_OPTIONS_TABLE . "
+					WHERE auth_option = '" . $db->sql_escape($option) . "'
+					ORDER BY auth_option_id DESC";
+				// sql_query_limit not possible here, due to bug in postgresql layer
+				$result = $this->db->sql_query($sql);
+
+				// Skip first row, this is our original auth option we want to preserve
+				$row = $this->db->sql_fetchrow($result);
+
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					// Ok, remove this auth option...
+					$this->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+				}
+				$this->db->sql_freeresult($result);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php b/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php
new file mode 100644
index 0000000000..8538347b1a
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php
@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_5_rc1part2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_5_rc1');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_keys'			=> array(
+				$this->table_prefix . 'acl_options'		=> array('auth_option'),
+			),
+			'add_unique_index'	=> array(
+				$this->table_prefix . 'acl_options'		=> array(
+					'auth_option'		=> array('auth_option'),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.5-rc1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6.php b/phpBB/includes/db/migration/data/30x/3_0_6.php
new file mode 100644
index 0000000000..bb651dc7cd
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_6.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_6 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_6_rc4');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.6')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php
new file mode 100644
index 0000000000..38c282ebf0
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php
@@ -0,0 +1,324 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_5');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'confirm' => array(
+					'attempts' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_new' => array('BOOL', 1),
+					'user_reminded' => array('TINT:4', 0),
+					'user_reminded_time' => array('TIMESTAMP', 0),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_reported' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'reports' => array(
+					'pm_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_show_on_vt' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_options' => array('UINT:20', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'users' => array(
+					'user_options' => array('UINT:11', 230271),
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'reports' => array(
+					'post_id' => array('post_id'),
+					'pm_id' => array('pm_id'),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_username' => array('post_username:255'),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'confirm' => array(
+					'attempts',
+				),
+				$this->table_prefix . 'users' => array(
+					'user_new',
+					'user_reminded',
+					'user_reminded_time',
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_skip_auth',
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_reported',
+				),
+				$this->table_prefix . 'reports' => array(
+					'pm_id',
+				),
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_show_on_vt',
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_options',
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'reports' => array(
+					'post_id',
+					'pm_id',
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_username',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
+			array('if', array(
+				($this->config['captcha_gd']),
+				array('config.update', array('captcha_plugin', 'phpbb_captcha_gd')),
+			)),
+
+			array('config.add', array('feed_enable', 0)),
+			array('config.add', array('feed_limit', 10)),
+			array('config.add', array('feed_overall_forums', 1)),
+			array('config.add', array('feed_overall_forums_limit', 15)),
+			array('config.add', array('feed_overall_topics', 0)),
+			array('config.add', array('feed_overall_topics_limit', 15)),
+			array('config.add', array('feed_forum', 1)),
+			array('config.add', array('feed_topic', 1)),
+			array('config.add', array('feed_item_statistics', 1)),
+
+			array('config.add', array('smilies_per_page', 50)),
+			array('config.add', array('allow_pm_report', 1)),
+			array('config.add', array('min_post_chars', 1)),
+			array('config.add', array('allow_quick_reply', 1)),
+			array('config.add', array('new_member_post_limit', 0)),
+			array('config.add', array('new_member_group_default', 0)),
+			array('config.add', array('delete_time', $this->config['edit_time'])),
+
+			array('config.add', array('allow_avatar', 0)),
+			array('if', array(
+				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
+				array('config.update', array('allow_avatar', 1)),
+			)),
+			array('config.add', array('allow_avatar_remote_upload', 0)),
+			array('if', array(
+				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
+				array('config.update', array('allow_avatar_remote_upload', 1)),
+			)),
+
+			array('module.add', array(
+				'acp',
+				'ACP_BOARD_CONFIGURATION',
+				array(
+					'module_basename'	=> 'acp_board',
+					'modes'				=> array('feed'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_CAT_USERS',
+				array(
+					'module_basename'	=> 'acp_users',
+					'modes'				=> array('warnings'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_SERVER_CONFIGURATION',
+				array(
+					'module_basename'	=> 'acp_send_statistics',
+					'modes'				=> array('send_statistics'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_FORUM_BASED_PERMISSIONS',
+				array(
+					'module_basename'	=> 'acp_permissions',
+					'modes'				=> array('setting_forum_copy'),
+				),
+			)),
+			array('module.add', array(
+				'mcp',
+				'MCP_REPORTS',
+				array(
+					'module_basename'	=> 'mcp_pm_reports',
+					'modes'				=> array('pm_reports','pm_reports_closed','pm_report_details'),
+				),
+			)),
+			array('custom', array(array(&$this, 'add_newly_registered_group'))),
+			array('custom', array(array(&$this, 'set_user_options_default'))),
+
+			array('config.update', array('version', '3.0.6-rc1')),
+		);
+	}
+
+	public function set_user_options_default()
+	{
+		// 229376 is the added value to enable all three signature options
+		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
+		$this->sql_query($sql);
+	}
+
+	public function add_newly_registered_group()
+	{
+		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . "
+			WHERE group_name = 'NEWLY_REGISTERED'";
+		$result = $this->db->sql_query($sql);
+		$group_id = (int) $this->db->sql_fetchfield('group_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$group_id)
+		{
+			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
+			$this->sql_query($sql);
+
+			$group_id = $this->db->sql_nextid();
+		}
+
+		// Insert new user role... at the end of the chain
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
+				AND role_type = 'u_'";
+		$result = $this->db->sql_query($sql);
+		$u_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$u_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'u_'";
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
+			$this->sql_query($sql);
+			$u_role = $this->db->sql_nextid();
+
+			// Now add the correct data to the roles...
+			// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
+			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
+			$this->sql_query($sql);
+
+			// Add user role to group
+			$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
+			$this->sql_query($sql);
+		}
+
+		// Insert new forum role
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
+				AND role_type = 'f_'";
+		$result = $this->db->sql_query($sql);
+		$f_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$f_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'f_'";
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
+			$this->sql_query($sql);
+			$f_role = $this->db->sql_nextid();
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
+			$this->sql_query($sql);
+		}
+
+		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
+		$sql = 'SELECT 1
+			FROM ' . USERS_TABLE . '
+			WHERE user_new = 0';
+		$result = $this->db->sql_query_limit($sql, 1);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$row)
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
+			$this->sql_query($sql);
+		}
+
+		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
+		// Check if the role is already assigned...
+		$sql = 'SELECT forum_id
+			FROM ' . ACL_GROUPS_TABLE . '
+			WHERE group_id = ' . $group_id . '
+				AND auth_role_id = ' . $f_role;
+		$result = $this->db->sql_query($sql);
+		$is_options = (int) $this->db->sql_fetchfield('forum_id');
+		$this->db->sql_freeresult($result);
+
+		// Not assigned at all... :/
+		if (!$is_options)
+		{
+			// Get postable forums
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type != ' . FORUM_LINK;
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$this->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)');
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		// Clear permissions...
+		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
+		$auth_admin = new auth_admin();
+		$auth_admin->acl_clear_prefetch();
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php
new file mode 100644
index 0000000000..a939dbd489
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_6_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_6_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.6-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php
new file mode 100644
index 0000000000..b3f09d8ab8
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_6_rc3 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc3', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_6_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_cp_fields'))),
+
+			array('config.update', array('version', '3.0.6-rc3')),
+		);
+	}
+
+	public function update_cp_fields()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
+			SET field_show_on_vt = 1
+			WHERE field_hide = 0
+				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php
new file mode 100644
index 0000000000..fc2923f99b
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_6_rc4 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc4', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_6_rc3');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.6-rc4')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7.php b/phpBB/includes/db/migration/data/30x/3_0_7.php
new file mode 100644
index 0000000000..9ff2e9e4ab
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_7.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_7 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_7_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.7')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php b/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php
new file mode 100644
index 0000000000..c9cc9d19ac
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_7_pl1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7-pl1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_7');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.7-pl1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php
new file mode 100644
index 0000000000..ffebf66f2d
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php
@@ -0,0 +1,76 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_7_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_6');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_keys' => array(
+				$this->table_prefix . 'log' => array(
+					'log_time',
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'topics_track' => array(
+					'topic_id' => array('topic_id'),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_index' => array(
+				$this->table_prefix . 'log' => array(
+					'log_time'	=> array('log_time'),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'topics_track' => array(
+					'topic_id',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('feed_overall', 1)),
+			array('config.add', array('feed_http_auth', 0)),
+			array('config.add', array('feed_limit_post', $this->config['feed_limit'])),
+			array('config.add', array('feed_limit_topic', $this->config['feed_overall_topics_limit'])),
+			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
+			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
+			array('custom', array(array(&$this, 'delete_text_templates'))),
+
+			array('config.update', array('version', '3.0.7-rc1')),
+		);
+	}
+
+	public function delete_text_templates()
+	{
+		// Delete all text-templates from the template_data
+		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
+			WHERE template_filename ' . $this->db->sql_like_expression($this->db->any_char . '.txt');
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php
new file mode 100644
index 0000000000..55bc2bc679
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php
@@ -0,0 +1,73 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_7_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_7_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_email_hash'))),
+
+			array('config.update', array('version', '3.0.7-rc2')),
+		);
+	}
+
+	public function update_email_hash($start = 0)
+	{
+		$limit = 1000;
+
+		$sql = 'SELECT user_id, user_email, user_email_hash
+			FROM ' . USERS_TABLE . '
+			WHERE user_type <> ' . USER_IGNORE . "
+				AND user_email <> ''";
+		$result = $this->db->sql_query_limit($sql, $limit, $start);
+
+		$i = 0;
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$i++;
+
+			// Snapshot of the phpbb_email_hash() function
+			// We cannot call it directly because the auto updater updates the DB first. :/
+			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
+
+			if ($user_email_hash != $row['user_email_hash'])
+			{
+				$sql_ary = array(
+					'user_email_hash'	=> $user_email_hash,
+				);
+
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE user_id = ' . (int) $row['user_id'];
+				$this->sql_query($sql);
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		if ($i < $limit)
+		{
+			// Completed
+			return;
+		}
+
+		// Return the next start, will be sent to $start when this function is called again
+		return $start + $limit;
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_8.php b/phpBB/includes/db/migration/data/30x/3_0_8.php
new file mode 100644
index 0000000000..8998ef9627
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_8.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_8 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.8', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_8_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.8')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php
new file mode 100644
index 0000000000..aeff35333e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php
@@ -0,0 +1,221 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_8_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.8-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_7_pl1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'update_module_auth'))),
+			array('custom', array(array(&$this, 'update_bots'))),
+			array('custom', array(array(&$this, 'delete_orphan_shadow_topics'))),
+			array('module.add', array(
+				'acp',
+				'ACP_MESSAGES',
+				array(
+					'module_basename'	=> 'acp_board',
+					'modes'				=> array('post'),
+				),
+			)),
+			array('config.add', array('load_unreads_search', 1)),
+			array('config.update_if_equals', array(600, 'queue_interval', 60)),
+			array('config.update_if_equals', array(50, 'email_package_size', 20)),
+
+			array('config.update', array('version', '3.0.8-rc1')),
+		);
+	}
+
+	public function update_file_extension_group_names()
+	{
+		// Update file extension group names to use language strings.
+		$sql = 'SELECT lang_dir
+			FROM ' . LANG_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		$extension_groups_updated = array();
+		while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
+		{
+			$lang_dir = basename($lang_dir);
+
+			// The language strings we need are either in language/.../acp/attachments.php
+			// in the update package if we're updating to 3.0.8-RC1 or later,
+			// or they are in language/.../install.php when we're updating from 3.0.7-PL1 or earlier.
+			// On an already updated board, they can also already be in language/.../acp/attachments.php
+			// in the board root.
+			$lang_files = array(
+				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.{$this->php_ext}",
+				"{$this->phpbb_root_path}language/$lang_dir/install.{$this->php_ext}",
+				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.{$this->php_ext}",
+			);
+
+			foreach ($lang_files as $lang_file)
+			{
+				if (!file_exists($lang_file))
+				{
+					continue;
+				}
+
+				$lang = array();
+				include($lang_file);
+
+				foreach($lang as $lang_key => $lang_val)
+				{
+					if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
+					{
+						continue;
+					}
+
+					$sql_ary = array(
+						'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
+					);
+
+					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+						SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+						WHERE group_name = '" . $this->db->sql_escape($lang_val) . "'";
+					$this->sql_query($sql);
+
+					$extension_groups_updated[$lang_key] = true;
+				}
+			}
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function update_module_auth()
+	{
+		$sql = 'UPDATE ' . MODULES_TABLE . '
+			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
+			WHERE module_class = \'ucp\'
+				AND module_basename = \'profile\'
+				AND module_mode = \'avatar\'';
+		$this->sql_query($sql);
+	}
+
+	public function update_bots()
+	{
+		$bot_name = 'Bing [Bot]';
+		$bot_name_clean = utf8_clean_string($bot_name);
+
+		$sql = 'SELECT user_id
+			FROM ' . USERS_TABLE . "
+			WHERE username_clean = '" . $this->db->sql_escape($bot_name_clean) . "'";
+		$result = $this->db->sql_query($sql);
+		$bing_already_added = (bool) $this->db->sql_fetchfield('user_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$bing_already_added)
+		{
+			$bot_agent = 'bingbot/';
+			$bot_ip = '';
+			$sql = 'SELECT group_id, group_colour
+				FROM ' . GROUPS_TABLE . "
+				WHERE group_name = 'BOTS'";
+			$result = $this->db->sql_query($sql);
+			$group_row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$group_row)
+			{
+				// default fallback, should never get here
+				$group_row['group_id'] = 6;
+				$group_row['group_colour'] = '9E8DA7';
+			}
+
+			if (!function_exists('user_add'))
+			{
+				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+			}
+
+			$user_row = array(
+				'user_type'				=> USER_IGNORE,
+				'group_id'				=> $group_row['group_id'],
+				'username'				=> $bot_name,
+				'user_regdate'			=> time(),
+				'user_password'			=> '',
+				'user_colour'			=> $group_row['group_colour'],
+				'user_email'			=> '',
+				'user_lang'				=> $this->config['default_lang'],
+				'user_style'			=> $this->config['default_style'],
+				'user_timezone'			=> 0,
+				'user_dateformat'		=> $this->config['default_dateformat'],
+				'user_allow_massemail'	=> 0,
+			);
+
+			$user_id = user_add($user_row);
+
+			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
+				'bot_active'	=> 1,
+				'bot_name'		=> (string) $bot_name,
+				'user_id'		=> (int) $user_id,
+				'bot_agent'		=> (string) $bot_agent,
+				'bot_ip'		=> (string) $bot_ip,
+			));
+
+			$this->sql_query($sql);
+		}
+	}
+
+	public function delete_orphan_shadow_topics()
+	{
+		// Delete shadow topics pointing to not existing topics
+		$batch_size = 500;
+
+		// Set of affected forums we have to resync
+		$sync_forum_ids = array();
+
+		$sql_array = array(
+			'SELECT'	=> 't1.topic_id, t1.forum_id',
+			'FROM'		=> array(
+				TOPICS_TABLE	=> 't1',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(TOPICS_TABLE	=> 't2'),
+					'ON'	=> 't1.topic_moved_id = t2.topic_id',
+				),
+			),
+			'WHERE'		=> 't1.topic_moved_id <> 0
+						AND t2.topic_id IS NULL',
+		);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query_limit($sql, $batch_size);
+
+		$topic_ids = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$topic_ids[] = (int) $row['topic_id'];
+
+			$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($topic_ids))
+		{
+			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
+			$this->db->sql_query($sql);
+
+			// Sync the forums we have deleted shadow topics from.
+			sync('forum', 'forum_id', $sync_forum_ids, true, true);
+
+			return false;
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9.php b/phpBB/includes/db/migration/data/30x/3_0_9.php
new file mode 100644
index 0000000000..d5269ea6f0
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_9.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_9 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_9_rc4');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php
new file mode 100644
index 0000000000..1f8622798e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php
@@ -0,0 +1,124 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_9_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_8');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables' => array(
+				$this->table_prefix . 'login_attempts' => array(
+					'COLUMNS' => array(
+						// this column was removed from the database updater
+						// after 3.0.9-RC3 was released. It might still exist
+						// in 3.0.9-RCX installations and has to be dropped in
+						// 3.0.12 after the db_tools class is capable of properly
+						// removing a primary key.
+						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
+						'attempt_ip'			=> array('VCHAR:40', ''),
+						'attempt_browser'		=> array('VCHAR:150', ''),
+						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
+						'attempt_time'			=> array('TIMESTAMP', 0),
+						'user_id'				=> array('UINT', 0),
+						'username'				=> array('VCHAR_UNI:255', 0),
+						'username_clean'		=> array('VCHAR_CI', 0),
+					),
+					//'PRIMARY_KEY' => 'attempt_id',
+					'KEYS' => array(
+						'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
+						'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+						'att_time' => array('INDEX', array('attempt_time')),
+						'user_id' => array('INDEX', 'user_id'),
+					),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'bbcodes' => array(
+					'bbcode_id' => array('USINT', 0),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables' => array(
+				$this->table_prefix . 'login_attempts',
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('ip_login_limit_max', 50)),
+			array('config.add', array('ip_login_limit_time', 21600)),
+			array('config.add', array('ip_login_limit_use_forwarded', 0)),
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
+
+			array('config.update', array('version', '3.0.9-rc1')),
+		);
+	}
+
+	public function update_file_extension_group_names()
+	{
+		// Update file extension group names to use language strings, again.
+		$sql = 'SELECT group_id, group_name
+			FROM ' . EXTENSION_GROUPS_TABLE . '
+			WHERE group_name ' . $this->db->sql_like_expression('EXT_GROUP_' . $this->db->any_char);
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
+			);
+
+			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+				WHERE group_id = ' . $row['group_id'];
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function fix_firebird_qa_captcha()
+	{
+		// Recover from potentially broken Q&A CAPTCHA table on firebird
+		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
+		// without data loss
+		if ($this->db_tools->sql_layer == 'firebird')
+		{
+			$tables = array(
+				$this->table_prefix . 'captcha_questions',
+				$this->table_prefix . 'captcha_answers',
+				$this->table_prefix . 'qa_confirm',
+			);
+			foreach ($tables as $table)
+			{
+				if ($this->db_tools->sql_table_exists($table))
+				{
+					$this->db_tools->sql_table_drop($table);
+				}
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php
new file mode 100644
index 0000000000..c0e662aa45
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_9_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_9_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php
new file mode 100644
index 0000000000..d6d1f14b2e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_9_rc3 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc3', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_9_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc3')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php
new file mode 100644
index 0000000000..e673249343
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_9_rc4 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc4', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_9_rc3');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc4')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
new file mode 100644
index 0000000000..f41750e327
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -0,0 +1,406 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_dev extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.1.0-dev', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array(
+			'phpbb_db_migration_data_30x_11',
+			'phpbb_db_migration_data_310_extensions',
+			'phpbb_db_migration_data_310_style_update_p2',
+			'phpbb_db_migration_data_310_timezone_p2',
+			'phpbb_db_migration_data_310_reported_posts_display',
+		);
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns'		=> array(
+				$this->table_prefix . 'groups'		=> array(
+					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
+				),
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_show_on_pm'		=> array('BOOL', 0),
+				),
+				$this->table_prefix . 'styles'		=> array(
+					'style_path'			=> array('VCHAR:100', ''),
+					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+					'style_parent_id'		=> array('UINT:4', 0),
+					'style_parent_tree'		=> array('TEXT', ''),
+				),
+				$this->table_prefix . 'reports'		=> array(
+					'reported_post_text'		=> array('MTEXT_UNI', ''),
+					'reported_post_uid'			=> array('VCHAR:8', ''),
+					'reported_post_bitfield'	=> array('VCHAR:255', ''),
+				),
+			),
+			'change_columns'	=> array(
+				$this->table_prefix . 'groups'		=> array(
+					'group_legend'		=> array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns'		=> array(
+				$this->table_prefix . 'groups'		=> array(
+					'group_teampage',
+				),
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_show_on_pm',
+				),
+				$this->table_prefix . 'styles'		=> array(
+					'style_path',
+					'bbcode_bitfield',
+					'style_parent_id',
+					'style_parent_tree',
+				),
+				$this->table_prefix . 'reports'		=> array(
+					'reported_post_text',
+					'reported_post_uid',
+					'reported_post_bitfield',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
+
+			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
+			array('config.add', array('fulltext_postgres_min_word_len', 4)),
+			array('config.add', array('fulltext_postgres_max_word_len', 254)),
+			array('config.add', array('fulltext_sphinx_stopwords', 0)),
+			array('config.add', array('fulltext_sphinx_indexer_mem_limit', 512)),
+
+			array('config.add', array('load_jquery_cdn', 0)),
+			array('config.add', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js')),
+
+			array('config.add', array('use_system_cron', 0)),
+
+			array('config.add', array('legend_sort_groupname', 0)),
+			array('config.add', array('teampage_forums', 1)),
+			array('config.add', array('teampage_memberships', 1)),
+
+			array('config.add', array('load_cpf_pm', 0)),
+
+			array('config.add', array('display_last_subject', 1)),
+
+			array('config.add', array('assets_version', 1)),
+
+			array('config.add', array('site_home_url', '')),
+			array('config.add', array('site_home_text', '')),
+
+			array('permission.add', array('u_chgprofileinfo', true, 'u_sig')),
+
+			array('module.add', array(
+				'acp',
+				'ACP_GROUPS',
+				array(
+					'module_basename'	=> 'acp_groups',
+					'modes'				=> array('position'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_ATTACHMENTS',
+				array(
+					'module_basename'	=> 'acp_attachments',
+					'modes'				=> array('manage'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_STYLE_MANAGEMENT',
+				array(
+					'module_basename'	=> 'acp_styles',
+					'modes'				=> array('install', 'cache'),
+				),
+			)),
+			array('module.add', array(
+				'ucp',
+				'UCP_PROFILE',
+				array(
+					'module_basename'	=> 'ucp_profile',
+					'modes'				=> array('autologin_keys'),
+				),
+			)),
+			// Module will be renamed later
+			array('module.add', array(
+				'acp',
+				'ACP_CAT_STYLES',
+				'ACP_LANGUAGE'
+			)),
+
+			array('module.remove', array(
+				'acp',
+				false,
+				'ACP_TEMPLATES',
+			)),
+			array('module.remove', array(
+				'acp',
+				false,
+				'ACP_THEMES',
+			)),
+			array('module.remove', array(
+				'acp',
+				false,
+				'ACP_IMAGESETS',
+			)),
+
+			array('custom', array(array($this, 'rename_module_basenames'))),
+			array('custom', array(array($this, 'rename_styles_module'))),
+			array('custom', array(array($this, 'add_group_teampage'))),
+			array('custom', array(array($this, 'update_group_legend'))),
+			array('custom', array(array($this, 'localise_global_announcements'))),
+			array('custom', array(array($this, 'update_ucp_pm_basename'))),
+			array('custom', array(array($this, 'update_ucp_profile_auth'))),
+			array('custom', array(array($this, 'move_customise_modules'))),
+
+			array('config.update', array('version', '3.1.0-dev')),
+		);
+	}
+
+	public function move_customise_modules()
+	{
+		// Move language management to new location in the Customise tab
+		// First get language module id
+		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+			WHERE module_basename = 'acp_language'";
+		$result = $this->db->sql_query($sql);
+		$language_module_id = $this->db->sql_fetchfield('module_id');
+		$this->db->sql_freeresult($result);
+		// Next get language management module id of the one just created
+		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+			WHERE module_langname = 'ACP_LANGUAGE'";
+		$result = $this->db->sql_query($sql);
+		$language_management_module_id = $this->db->sql_fetchfield('module_id');
+		$this->db->sql_freeresult($result);
+
+		if (!class_exists('acp_modules'))
+		{
+			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
+		}
+		// acp_modules calls adm_back_link, which is undefined at this point
+		if (!function_exists('adm_back_link'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
+		}
+		$module_manager = new acp_modules();
+		$module_manager->module_class = 'acp';
+		$module_manager->move_module($language_module_id, $language_management_module_id);
+	}
+
+	public function update_ucp_pm_basename()
+	{
+		$sql = 'SELECT module_id, module_basename
+			FROM ' . MODULES_TABLE . "
+			WHERE module_basename <> 'ucp_pm' AND
+				module_langname='UCP_PM'";
+		$result = $this->db->sql_query_limit($sql, 1);
+
+		if ($row = $this->db->sql_fetchrow($result))
+		{
+			// This update is still not applied. Applying it
+
+			$sql = 'UPDATE ' . MODULES_TABLE . "
+				SET module_basename = 'ucp_pm'
+				WHERE  module_id = " . (int) $row['module_id'];
+
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function update_ucp_profile_auth()
+	{
+		// Update the auth setting for the module
+		$sql = 'UPDATE ' . MODULES_TABLE . "
+			SET module_auth = 'acl_u_chgprofileinfo'
+			WHERE module_class = 'ucp'
+				AND module_basename = 'ucp_profile'
+				AND module_mode = 'profile_info'";
+		$this->sql_query($sql);
+	}
+
+	public function rename_styles_module()
+	{
+		// Rename styles module to Customise
+		$sql = 'UPDATE ' . MODULES_TABLE . "
+			SET module_langname = 'ACP_CAT_CUSTOMISE'
+			WHERE module_langname = 'ACP_CAT_STYLES'";
+		$this->sql_query($sql);
+	}
+
+	public function rename_module_basenames()
+	{
+		// rename all module basenames to full classname
+		$sql = 'SELECT module_id, module_basename, module_class
+			FROM ' . MODULES_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$module_id = (int) $row['module_id'];
+			unset($row['module_id']);
+
+			if (!empty($row['module_basename']) && !empty($row['module_class']))
+			{
+				// all the class names start with class name or with phpbb_ for auto loading
+				if (strpos($row['module_basename'], $row['module_class'] . '_') !== 0 &&
+					strpos($row['module_basename'], 'phpbb_') !== 0)
+				{
+					$row['module_basename'] = $row['module_class'] . '_' . $row['module_basename'];
+
+					$sql_update = $this->db->sql_build_array('UPDATE', $row);
+
+					$sql = 'UPDATE ' . MODULES_TABLE . '
+						SET ' . $sql_update . '
+						WHERE module_id = ' . $module_id;
+					$this->sql_query($sql);
+				}
+			}
+		}
+
+		$this->db->sql_freeresult($result);
+	}
+
+	public function add_group_teampage()
+	{
+		$sql = 'UPDATE ' . GROUPS_TABLE . '
+			SET group_teampage = 1
+			WHERE group_type = ' . GROUP_SPECIAL . "
+				AND group_name = 'ADMINISTRATORS'";
+		$this->sql_query($sql);
+
+		$sql = 'UPDATE ' . GROUPS_TABLE . '
+			SET group_teampage = 2
+			WHERE group_type = ' . GROUP_SPECIAL . "
+				AND group_name = 'GLOBAL_MODERATORS'";
+		$this->sql_query($sql);
+	}
+
+	public function update_group_legend()
+	{
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . '
+			WHERE group_legend = 1
+			ORDER BY group_name ASC';
+		$result = $this->db->sql_query($sql);
+
+		$next_legend = 1;
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql = 'UPDATE ' . GROUPS_TABLE . '
+				SET group_legend = ' . $next_legend . '
+				WHERE group_id = ' . (int) $row['group_id'];
+			$this->sql_query($sql);
+
+			$next_legend++;
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function localise_global_announcements()
+	{
+		// Localise Global Announcements
+		$sql = 'SELECT topic_id, topic_approved, (topic_replies + 1) AS topic_posts, topic_last_post_id, topic_last_post_subject, topic_last_post_time, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour
+			FROM ' . TOPICS_TABLE . '
+			WHERE forum_id = 0
+				AND topic_type = ' . POST_GLOBAL;
+		$result = $this->db->sql_query($sql);
+
+		$global_announcements = $update_lastpost_data = array();
+		$update_lastpost_data['forum_last_post_time'] = 0;
+		$update_forum_data = array(
+			'forum_posts'		=> 0,
+			'forum_topics'		=> 0,
+			'forum_topics_real'	=> 0,
+		);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$global_announcements[] = (int) $row['topic_id'];
+
+			$update_forum_data['forum_posts'] += (int) $row['topic_posts'];
+			$update_forum_data['forum_topics_real']++;
+			if ($row['topic_approved'])
+			{
+				$update_forum_data['forum_topics']++;
+			}
+
+			if ($update_lastpost_data['forum_last_post_time'] < $row['topic_last_post_time'])
+			{
+				$update_lastpost_data = array(
+					'forum_last_post_id'		=> (int) $row['topic_last_post_id'],
+					'forum_last_post_subject'	=> $row['topic_last_post_subject'],
+					'forum_last_post_time'		=> (int) $row['topic_last_post_time'],
+					'forum_last_poster_id'		=> (int) $row['topic_last_poster_id'],
+					'forum_last_poster_name'	=> $row['topic_last_poster_name'],
+					'forum_last_poster_colour'	=> $row['topic_last_poster_colour'],
+				);
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($global_announcements))
+		{
+			// Update the post/topic-count for the forum and the last-post if needed
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type = ' . FORUM_POST;
+			$result = $this->db->sql_query_limit($sql, 1);
+			$ga_forum_id = $this->db->sql_fetchfield('forum_id');
+			$this->db->sql_freeresult($result);
+
+			$sql = 'SELECT forum_last_post_time
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_id = ' . $ga_forum_id;
+			$result = $this->db->sql_query($sql);
+			$lastpost = (int) $this->db->sql_fetchfield('forum_last_post_time');
+			$this->db->sql_freeresult($result);
+
+			$sql_update = 'forum_posts = forum_posts + ' . $update_forum_data['forum_posts'] . ', ';
+			$sql_update .= 'forum_topics_real = forum_topics_real + ' . $update_forum_data['forum_topics_real'] . ', ';
+			$sql_update .= 'forum_topics = forum_topics + ' . $update_forum_data['forum_topics'];
+			if ($lastpost < $update_lastpost_data['forum_last_post_time'])
+			{
+				$sql_update .= ', ' . $this->db->sql_build_array('UPDATE', $update_lastpost_data);
+			}
+
+			$sql = 'UPDATE ' . FORUMS_TABLE . '
+				SET ' . $sql_update . '
+				WHERE forum_id = ' . $ga_forum_id;
+			$this->sql_query($sql);
+
+			// Update some forum_ids
+			$table_ary = array(TOPICS_TABLE, POSTS_TABLE, LOG_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE);
+			foreach ($table_ary as $table)
+			{
+				$sql = "UPDATE $table
+					SET forum_id = $ga_forum_id
+					WHERE " . $this->db->sql_in_set('topic_id', $global_announcements);
+				$this->sql_query($sql);
+			}
+			unset($table_ary);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/extensions.php b/phpBB/includes/db/migration/data/310/extensions.php
new file mode 100644
index 0000000000..925fa29384
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/extensions.php
@@ -0,0 +1,69 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_extensions extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'ext');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables'		=> array(
+				$this->table_prefix . 'ext'	=> array(
+					'COLUMNS'			=> array(
+						'ext_name'		=> array('VCHAR', ''),
+						'ext_active'	=> array('BOOL', 0),
+						'ext_state'		=> array('TEXT', ''),
+					),
+					'KEYS'				=> array(
+						'ext_name'		=> array('UNIQUE', 'ext_name'),
+					),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'		=> array(
+				$this->table_prefix . 'ext',
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			// Module will be renamed later
+			array('module.add', array(
+				'acp',
+				'ACP_CAT_STYLES',
+				'ACP_EXTENSION_MANAGEMENT'
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_EXTENSION_MANAGEMENT',
+				array(
+					'module_basename'	=> 'acp_extensions',
+					'modes'				=> array('main'),
+				),
+			)),
+			array('permission.add', array('a_extensions', true, 'a_styles')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/reported_posts_display.php b/phpBB/includes/db/migration/data/310/reported_posts_display.php
new file mode 100644
index 0000000000..64f0f1aaec
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/reported_posts_display.php
@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_reported_posts_display extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_column_exists($this->table_prefix . 'reports', 'reported_post_enable_bbcode');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns'		=> array(
+				$this->table_prefix . 'reports'		=> array(
+					'reported_post_enable_bbcode'		=> array('BOOL', 1),
+					'reported_post_enable_smilies'		=> array('BOOL', 1),
+					'reported_post_enable_magic_url'	=> array('BOOL', 1),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns'		=> array(
+				$this->table_prefix . 'reports'		=> array(
+					'reported_post_enable_bbcode',
+					'reported_post_enable_smilies',
+					'reported_post_enable_magic_url',
+				),
+			),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/style_update_p1.php b/phpBB/includes/db/migration/data/310/style_update_p1.php
new file mode 100644
index 0000000000..d19ccc37cf
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/style_update_p1.php
@@ -0,0 +1,157 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_style_update_p1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_11');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'styles_update'))),
+		);
+	}
+
+	public function styles_update()
+	{
+		// Get list of valid 3.1 styles
+		$available_styles = array('prosilver');
+
+		$iterator = new DirectoryIterator($this->phpbb_root_path . 'styles');
+		$skip_dirs = array('.', '..', 'prosilver');
+		foreach ($iterator as $fileinfo)
+		{
+			if ($fileinfo->isDir() && !in_array($fileinfo->getFilename(), $skip_dirs) && file_exists($fileinfo->getPathname() . '/style.cfg'))
+			{
+				$style_cfg = parse_cfg_file($fileinfo->getPathname() . '/style.cfg');
+				if (isset($style_cfg['phpbb_version']) && version_compare($style_cfg['phpbb_version'], '3.1.0-dev', '>='))
+				{
+					// 3.1 style
+					$available_styles[] = $fileinfo->getFilename();
+				}
+			}
+		}
+
+		// Get all installed styles
+		if ($this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset'))
+		{
+			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id, i.imageset_path
+				FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . 'styles_theme c, ' . $this->table_prefix . "styles_imageset i
+				WHERE t.template_id = s.template_id
+					AND c.theme_id = s.theme_id
+					AND i.imageset_id = s.imageset_id";
+		}
+		else
+		{
+			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id
+				FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . "stles_theme c
+				WHERE t.template_id = s.template_id
+					AND c.theme_id = s.theme_id";
+		}
+		$result = $this->db->sql_query($sql);
+
+		$styles = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$styles[] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		// Decide which styles to keep, all others will be deleted
+		$valid_styles = array();
+		foreach ($styles as $style_row)
+		{
+			if (
+				// Delete styles with parent style (not supported yet)
+				$style_row['template_inherits_id'] == 0 &&
+				// Check if components match
+				$style_row['template_path'] == $style_row['theme_path'] && (!isset($style_row['imageset_path']) || $style_row['template_path'] == $style_row['imageset_path']) &&
+				// Check if components are valid
+				in_array($style_row['template_path'], $available_styles)
+				)
+			{
+				// Valid style. Keep it
+				$sql_ary = array(
+					'style_path'	=> $style_row['template_path'],
+					'bbcode_bitfield'	=> $style_row['bbcode_bitfield'],
+					'style_parent_id'	=> 0,
+					'style_parent_tree'	=> '',
+				);
+				$this->sql_query('UPDATE ' . STYLES_TABLE . '
+					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE style_id = ' . $style_row['style_id']);
+				$valid_styles[] = (int) $style_row['style_id'];
+			}
+		}
+
+		// Remove old entries from styles table
+		if (!sizeof($valid_styles))
+		{
+			// No valid styles: remove everything and add prosilver
+			$this->sql_query('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
+
+			$sql_ary = array(
+				'style_name'		=> 'prosilver',
+				'style_copyright'	=> '&copy; phpBB Group',
+				'style_active'		=> 1,
+				'style_path'		=> 'prosilver',
+				'bbcode_bitfield'	=> 'lNg=',
+				'style_parent_id'	=> 0,
+				'style_parent_tree'	=> '',
+
+				// Will be removed in the next step
+				'imageset_id'		=> 0,
+				'template_id'		=> 0,
+				'theme_id'			=> 0,
+			);
+
+			$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+			$this->sql_query($sql);
+
+			$sql = 'SELECT style_id
+				FROM ' . $table . "
+				WHERE style_name = 'prosilver'";
+			$result = $this->sql_query($sql);
+			$default_style = $this->db->sql_fetchfield($result);
+			$this->db->sql_freeresult($result);
+
+			set_config('default_style', $default_style);
+
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
+			$this->sql_query($sql);
+		}
+		else
+		{
+			// There are valid styles in styles table. Remove styles that are outdated
+			$this->sql_query('DELETE FROM ' . STYLES_TABLE . '
+				WHERE ' . $this->db->sql_in_set('style_id', $valid_styles, true));
+
+			// Change default style
+			if (!in_array($this->config['default_style'], $valid_styles))
+			{
+				$this->sql_query('UPDATE ' . CONFIG_TABLE . "
+					SET config_value = '" . $valid_styles[0] . "'
+					WHERE config_name = 'default_style'");
+			}
+
+			// Reset styles for users
+			$this->sql_query('UPDATE ' . USERS_TABLE . '
+				SET user_style = 0
+				WHERE ' . $this->db->sql_in_set('user_style', $valid_styles, true));
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/style_update_p2.php b/phpBB/includes/db/migration/data/310/style_update_p2.php
new file mode 100644
index 0000000000..7b10518a66
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/style_update_p2.php
@@ -0,0 +1,129 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_style_update_p2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_style_update_p1');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_columns'	=> array(
+				$this->table_prefix . 'styles'		=> array(
+					'imageset_id',
+					'template_id',
+					'theme_id',
+				),
+			),
+
+			'drop_tables'	=> array(
+				$this->table_prefix . 'styles_imageset',
+				$this->table_prefix . 'styles_imageset_data',
+				$this->table_prefix . 'styles_template',
+				$this->table_prefix . 'styles_template_data',
+				$this->table_prefix . 'styles_theme',
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_columns'	=> array(
+				$this->table_prefix . 'styles'		=> array(
+					'imageset_id'	=> array('UINT', 0),
+					'template_id'	=> array('UINT', 0),
+					'theme_id'		=> array('UINT', 0),
+				),
+			),
+
+			'add_tables'	=> array(
+				$this->table_prefix . 'styles_imageset'		=> array(
+					'COLUMNS'		=> array(
+						'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
+						'imageset_name'				=> array('VCHAR_UNI:255', ''),
+						'imageset_copyright'		=> array('VCHAR_UNI', ''),
+						'imageset_path'				=> array('VCHAR:100', ''),
+					),
+					'PRIMARY_KEY'		=> 'imageset_id',
+					'KEYS'				=> array(
+						'imgset_nm'			=> array('UNIQUE', 'imageset_name'),
+					),
+				),
+				$this->table_prefix . 'styles_imageset_data'	=> array(
+					'COLUMNS'		=> array(
+						'image_id'				=> array('UINT', NULL, 'auto_increment'),
+						'image_name'			=> array('VCHAR:200', ''),
+						'image_filename'		=> array('VCHAR:200', ''),
+						'image_lang'			=> array('VCHAR:30', ''),
+						'image_height'			=> array('USINT', 0),
+						'image_width'			=> array('USINT', 0),
+						'imageset_id'			=> array('UINT', 0),
+					),
+					'PRIMARY_KEY'		=> 'image_id',
+					'KEYS'				=> array(
+						'i_d'			=> array('INDEX', 'imageset_id'),
+					),
+				),
+				$this->table_prefix . 'styles_template'		=> array(
+					'COLUMNS'		=> array(
+						'template_id'			=> array('UINT', NULL, 'auto_increment'),
+						'template_name'			=> array('VCHAR_UNI:255', ''),
+						'template_copyright'	=> array('VCHAR_UNI', ''),
+						'template_path'			=> array('VCHAR:100', ''),
+						'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+						'template_storedb'		=> array('BOOL', 0),
+						'template_inherits_id'		=> array('UINT:4', 0),
+						'template_inherit_path'		=> array('VCHAR', ''),
+					),
+					'PRIMARY_KEY'	=> 'template_id',
+					'KEYS'			=> array(
+						'tmplte_nm'				=> array('UNIQUE', 'template_name'),
+					),
+				),
+				$this->table_prefix . 'styles_template_data'	=> array(
+					'COLUMNS'		=> array(
+						'template_id'			=> array('UINT', 0),
+						'template_filename'		=> array('VCHAR:100', ''),
+						'template_included'		=> array('TEXT', ''),
+						'template_mtime'		=> array('TIMESTAMP', 0),
+						'template_data'			=> array('MTEXT_UNI', ''),
+					),
+					'KEYS'			=> array(
+						'tid'					=> array('INDEX', 'template_id'),
+						'tfn'					=> array('INDEX', 'template_filename'),
+					),
+				),
+				$this->table_prefix . 'styles_theme'			=> array(
+					'COLUMNS'		=> array(
+						'theme_id'				=> array('UINT', NULL, 'auto_increment'),
+						'theme_name'			=> array('VCHAR_UNI:255', ''),
+						'theme_copyright'		=> array('VCHAR_UNI', ''),
+						'theme_path'			=> array('VCHAR:100', ''),
+						'theme_storedb'			=> array('BOOL', 0),
+						'theme_mtime'			=> array('TIMESTAMP', 0),
+						'theme_data'			=> array('MTEXT_UNI', ''),
+					),
+					'PRIMARY_KEY'	=> 'theme_id',
+					'KEYS'			=> array(
+						'theme_name'		=> array('UNIQUE', 'theme_name'),
+					),
+				),
+			),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/timezone.php b/phpBB/includes/db/migration/data/310/timezone.php
new file mode 100644
index 0000000000..7a6a9bce05
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/timezone.php
@@ -0,0 +1,163 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_timezone extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_dst');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_timezone'		=> array('VCHAR:100', ''),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_timezones'))),
+		);
+	}
+
+	public function update_timezones()
+	{
+		// Update user timezones
+		$sql = 'SELECT user_dst, user_timezone
+			FROM ' . $this->table_prefix . 'users
+			GROUP BY user_timezone, user_dst';
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . "users
+				SET user_timezone = '" . $this->db->sql_escape($this->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
+				WHERE user_timezone = '" . $this->db->sql_escape($row['user_timezone']) . "'
+					AND user_dst = " . (int) $row['user_dst'];
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+
+		// Update board default timezone
+		$sql = 'UPDATE ' . $this->table_prefix . "config
+			SET config_value = '" . $this->convert_phpbb30_timezone($this->config['board_timezone'], $this->config['board_dst']) . "'
+			WHERE config_name = 'board_timezone'";
+		$this->sql_query($sql);
+	}
+
+	/**
+	* Determine the new timezone for a given phpBB 3.0 timezone and
+	* "Daylight Saving Time" option
+	*
+	*	@param	$timezone	float	Users timezone in 3.0
+	*	@param	$dst		int		Users daylight saving time
+	*	@return		string		Users new php Timezone which is used since 3.1
+	*/
+	public function convert_phpbb30_timezone($timezone, $dst)
+	{
+		$offset = $timezone + $dst;
+
+		switch ($timezone)
+		{
+			case '-12':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 12] Baker Island Time'
+			case '-11':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 11] Niue Time, Samoa Standard Time'
+			case '-10':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
+			case '-9.5':
+				return 'Pacific/Marquesas';			//'[UTC - 9:30] Marquesas Islands Time'
+			case '-9':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
+			case '-8':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 8] Pacific Standard Time'
+			case '-7':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 7] Mountain Standard Time'
+			case '-6':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 6] Central Standard Time'
+			case '-5':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 5] Eastern Standard Time'
+			case '-4.5':
+				return 'America/Caracas';			//'[UTC - 4:30] Venezuelan Standard Time'
+			case '-4':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 4] Atlantic Standard Time'
+			case '-3.5':
+				return 'America/St_Johns';			//'[UTC - 3:30] Newfoundland Standard Time'
+			case '-3':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
+			case '-2':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
+			case '-1':
+				return 'Etc/GMT+' . abs($offset);	//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
+			case '0':
+				return (!$dst) ? 'UTC' : 'Etc/GMT-1';	//'[UTC] Western European Time, Greenwich Mean Time'
+			case '1':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 1] Central European Time, West African Time'
+			case '2':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 2] Eastern European Time, Central African Time'
+			case '3':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 3] Moscow Standard Time, Eastern African Time'
+			case '3.5':
+				return 'Asia/Tehran';				//'[UTC + 3:30] Iran Standard Time'
+			case '4':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
+			case '4.5':
+				return 'Asia/Kabul';				//'[UTC + 4:30] Afghanistan Time'
+			case '5':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
+			case '5.5':
+				return 'Asia/Kolkata';				//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
+			case '5.75':
+				return 'Asia/Kathmandu';			//'[UTC + 5:45] Nepal Time'
+			case '6':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
+			case '6.5':
+				return 'Indian/Cocos';				//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
+			case '7':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
+			case '8':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
+			case '8.75':
+				return 'Australia/Eucla';			//'[UTC + 8:45] Southeastern Western Australia Standard Time'
+			case '9':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
+			case '9.5':
+				return 'Australia/ACT';				//'[UTC + 9:30] Australian Central Standard Time'
+			case '10':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
+			case '10.5':
+				return 'Australia/Lord_Howe';		//'[UTC + 10:30] Lord Howe Standard Time'
+			case '11':
+				return 'Etc/GMT-' . $offset;		//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
+			case '11.5':
+				return 'Pacific/Norfolk';			//'[UTC + 11:30] Norfolk Island Time'
+			case '12':
+				return 'Etc/GMT-12';				//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
+			case '12.75':
+				return 'Pacific/Chatham';			//'[UTC + 12:45] Chatham Islands Time'
+			case '13':
+				return 'Pacific/Tongatapu';			//'[UTC + 13] Tonga Time, Phoenix Islands Time'
+			case '14':
+				return 'Pacific/Kiritimati';		//'[UTC + 14] Line Island Time'
+			default:
+				return 'UTC';
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/timezone_p2.php b/phpBB/includes/db/migration/data/310/timezone_p2.php
new file mode 100644
index 0000000000..113b979e4f
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/timezone_p2.php
@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_timezone_p2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_dst');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_timezone');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_dst',
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_dst'		=> array('BOOL', 0),
+				),
+			),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/3_0_1.php b/phpBB/includes/db/migration/data/3_0_1.php
deleted file mode 100644
index 8b7c6f0f7c..0000000000
--- a/phpBB/includes/db/migration/data/3_0_1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_1_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_10.php b/phpBB/includes/db/migration/data/3_0_10.php
deleted file mode 100644
index b24a876bac..0000000000
--- a/phpBB/includes/db/migration/data/3_0_10.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_10 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.10', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_10_rc3');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.10')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc1.php b/phpBB/includes/db/migration/data/3_0_10_rc1.php
deleted file mode 100644
index 46b7db4e59..0000000000
--- a/phpBB/includes/db/migration/data/3_0_10_rc1.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_10_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.10-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_9');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('email_max_chunk_size', 50)),
-
-			array('config.update', array('version', '3.0.10-rc1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc2.php b/phpBB/includes/db/migration/data/3_0_10_rc2.php
deleted file mode 100644
index 5e85467202..0000000000
--- a/phpBB/includes/db/migration/data/3_0_10_rc2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_10_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.10-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_10_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.10-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_10_rc3.php b/phpBB/includes/db/migration/data/3_0_10_rc3.php
deleted file mode 100644
index 6ff81f7776..0000000000
--- a/phpBB/includes/db/migration/data/3_0_10_rc3.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_10_rc3 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.10-rc3', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_10_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.10-rc3')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_11.php b/phpBB/includes/db/migration/data/3_0_11.php
deleted file mode 100644
index 1a63508593..0000000000
--- a/phpBB/includes/db/migration/data/3_0_11.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_11 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.11', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.11')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc1.php b/phpBB/includes/db/migration/data/3_0_11_rc1.php
deleted file mode 100644
index 19703bcc35..0000000000
--- a/phpBB/includes/db/migration/data/3_0_11_rc1.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_11_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.11-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_10');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
-			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
-
-			array('config.update', array('version', '3.0.11-rc1')),
-		);
-	}
-
-	public function cleanup_deactivated_styles()
-	{
-		// Updates users having current style a deactivated one
-		$sql = 'SELECT style_id
-			FROM ' . STYLES_TABLE . '
-			WHERE style_active = 0';
-		$result = $this->sql_query($sql);
-
-		$deactivated_style_ids = array();
-		while ($style_id = $this->db->sql_fetchfield('style_id', false, $result))
-		{
-			$deactivated_style_ids[] = (int) $style_id;
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($deactivated_style_ids))
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_style = ' . (int) $this->config['default_style'] .'
-				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
-			$this->sql_query($sql);
-		}
-	}
-
-	public function delete_orphan_private_messages()
-	{
-		// Delete orphan private messages
-		$batch_size = 500;
-
-		$sql_array = array(
-			'SELECT'	=> 'p.msg_id',
-			'FROM'		=> array(
-				PRIVMSGS_TABLE	=> 'p',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
-					'ON'	=> 'p.msg_id = t.msg_id',
-				),
-			),
-			'WHERE'		=> 't.user_id IS NULL',
-		);
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-
-		$result = $this->db->sql_query_limit($sql, $batch_size);
-
-		$delete_pms = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$delete_pms[] = (int) $row['msg_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($delete_pms))
-		{
-			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
-			$this->sql_query($sql);
-
-			// Return false to have the Migrator call this function again
-			return false;
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_11_rc2.php b/phpBB/includes/db/migration/data/3_0_11_rc2.php
deleted file mode 100644
index 219d44c4e0..0000000000
--- a/phpBB/includes/db/migration/data/3_0_11_rc2.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_11_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.11-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11_rc1');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_novalue' => array('BOOL', 0),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_novalue',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.11-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_12_rc1.php b/phpBB/includes/db/migration/data/3_0_12_rc1.php
deleted file mode 100644
index c23e8b24b8..0000000000
--- a/phpBB/includes/db/migration/data/3_0_12_rc1.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 **/
-
-class phpbb_db_migration_data_3_0_12_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.12-rc1', '>=');
-	}
-
- 	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_module_auth'))),
-			array('custom', array(array(&$this, 'update_bots'))),
-			array('custom', array(array(&$this, 'disable_bots_from_receiving_pms'))),
-
-			array('config.update', array('version', '3.0.12-rc1')),
-		);
-	}
-
-	public function disable_bots_from_receiving_pms()
-	{
-		// Disable receiving pms for bots
-		$sql = 'SELECT user_id
-			FROM ' . BOTS_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		$bot_user_ids = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$bot_user_ids[] = (int) $row['user_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($bot_user_ids))
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_allow_pm = 0
-				WHERE ' . $this->db->sql_in_set('user_id', $bot_user_ids);
-			$this->sql_query($sql);
-		}
-	}
-
-	public function update_module_auth()
-	{
-		$sql = 'UPDATE ' . MODULES_TABLE . '
-			SET module_auth = \'acl_u_sig\'
-			WHERE module_class = \'ucp\'
-				AND module_basename = \'profile\'
-				AND module_mode = \'signature\'';
-		$this->sql_query($sql);
-	}
-
-	public function update_bots()
-	{
-		// Update bots
-		if (!function_exists('user_delete'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-		}
-
-		$bots_updates = array(
-			// Bot Deletions
-			'NG-Search [Bot]'		=> false,
-			'Nutch/CVS [Bot]'		=> false,
-			'OmniExplorer [Bot]'	=> false,
-			'Seekport [Bot]'		=> false,
-			'Synoo [Bot]'			=> false,
-			'WiseNut [Bot]'			=> false,
-
-			// Bot Updates
-			// Bot name to bot user agent map
-			'Baidu [Spider]'	=> 'Baiduspider',
-			'Exabot [Bot]'		=> 'Exabot',
-			'Voyager [Bot]'		=> 'voyager/',
-			'W3C [Validator]'	=> 'W3C_Validator',
-		);
-
-		foreach ($bots_updates as $bot_name => $bot_agent)
-		{
-			$sql = 'SELECT user_id
-				FROM ' . USERS_TABLE . '
-				WHERE user_type = ' . USER_IGNORE . "
-					AND username_clean = '" . $this->db->sql_escape(utf8_clean_string($bot_name)) . "'";
-			$result = $this->db->sql_query($sql);
-			$bot_user_id = (int) $this->db->sql_fetchfield('user_id');
-			$this->db->sql_freeresult($result);
-
-			if ($bot_user_id)
-			{
-				if ($bot_agent === false)
-				{
-					$sql = 'DELETE FROM ' . BOTS_TABLE . "
-						WHERE user_id = $bot_user_id";
-					$this->sql_query($sql);
-
-					user_delete('remove', $bot_user_id);
-				}
-				else
-				{
-					$sql = 'UPDATE ' . BOTS_TABLE . "
-						SET bot_agent = '" .  $this->db->sql_escape($bot_agent) . "'
-						WHERE user_id = $bot_user_id";
-					$this->sql_query($sql);
-				}
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_1_rc1.php b/phpBB/includes/db/migration/data/3_0_1_rc1.php
deleted file mode 100644
index 2fc2849d04..0000000000
--- a/phpBB/includes/db/migration/data/3_0_1_rc1.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_1_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.1-rc1', '>=');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'display_subforum_list' => array('BOOL', 1),
-				),
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array('UINT', 0),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'groups' => array(
-					'group_legend',
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array('session_forum_id'),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_legend_name' => array('group_legend', 'group_name'),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'display_subforum_list',
-				),
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id',
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'groups' => array(
-					'group_legend' => array('group_legend'),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id',
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_legend_name',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
-			array('custom', array(array(&$this, 'reset_smiley_size'))),
-
-			array('config.update', array('version', '3.0.1-rc1')),
-		);
-	}
-
-	public function fix_unset_last_view_time()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . "topics
-			SET topic_last_view_time = topic_last_post_time
-			WHERE topic_last_view_time = 0";
-		$this->sql_query($sql);
-	}
-
-	public function reset_smiley_size()
-	{
-		// Update smiley sizes
-		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
-
-		foreach ($smileys as $smiley)
-		{
-			if (file_exists($this->phpbb_root_path . 'images/smilies/' . $smiley))
-			{
-				list($width, $height) = getimagesize($this->phpbb_root_path . 'images/smilies/' . $smiley);
-
-				$sql = 'UPDATE ' . SMILIES_TABLE . '
-					SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
-					WHERE smiley_url = '" . $this->db->sql_escape($smiley) . "'";
-
-				$this->sql_query($sql);
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_2.php b/phpBB/includes/db/migration/data/3_0_2.php
deleted file mode 100644
index 8aa975f779..0000000000
--- a/phpBB/includes/db/migration/data/3_0_2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_2_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc1.php b/phpBB/includes/db/migration/data/3_0_2_rc1.php
deleted file mode 100644
index 6081cd682c..0000000000
--- a/phpBB/includes/db/migration/data/3_0_2_rc1.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_2_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.2-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('referer_validation', '1')),
-			array('config.add', array('check_attachment_content', '1')),
-			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
-
-			array('config.update', array('version', '3.0.2-rc1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_2_rc2.php b/phpBB/includes/db/migration/data/3_0_2_rc2.php
deleted file mode 100644
index bb76c270d7..0000000000
--- a/phpBB/includes/db/migration/data/3_0_2_rc2.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_2_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.2-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_2_rc1');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'change_columns' => array(
-				$this->table_prefix . 'drafts' => array(
-					'draft_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_last_post_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_subject' => array('STEXT_UNI', '', 'true_sort'),
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'topics' => array(
-					'topic_title' => array('STEXT_UNI', '', 'true_sort'),
-					'topic_last_post_subject' => array('STEXT_UNI', ''),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id',
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_fid' => array('session_forum_id'),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array(
-						'session_forum_id',
-					),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_fid',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.2-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_3.php b/phpBB/includes/db/migration/data/3_0_3.php
deleted file mode 100644
index 82039a109b..0000000000
--- a/phpBB/includes/db/migration/data/3_0_3.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_3 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.3', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_3_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.3')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_3_rc1.php b/phpBB/includes/db/migration/data/3_0_3_rc1.php
deleted file mode 100644
index 5e300962b7..0000000000
--- a/phpBB/includes/db/migration/data/3_0_3_rc1.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_3_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.3-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_2');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'styles_template' => array(
-					'template_inherits_id' => array('UINT:4', 0),
-					'template_inherit_path' => array('VCHAR', ''),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_max_recipients' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns' => array(
-				$this->table_prefix . 'styles_template' => array(
-					'template_inherits_id',
-					'template_inherit_path',
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_max_recipients',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('enable_queue_trigger', '0')),
-			array('config.add', array('queue_trigger_posts', '3')),
-			array('config.add', array('pm_max_recipients', '0')),
-			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
-			array('config.add', array('dbms_version', $this->db->sql_server_info(true))),
-			array('permission.add', array('u_masspm_group', true, 'u_masspm')),
-			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
-
-			array('config.update', array('version', '3.0.3-rc1')),
-		);
-	}
-
-	public function correct_acp_email_permissions()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . 'modules
-			SET module_auth = \'acl_a_email && cfg_email_enable\'
-			WHERE module_class = \'acp\'
-				AND module_basename = \'email\'';
-		$this->sql_query($sql);
-	}
-
-	public function set_group_default_max_recipients()
-	{
-		// Set maximum number of recipients for the registered users, bots, guests group
-		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
-			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_4.php b/phpBB/includes/db/migration/data/3_0_4.php
deleted file mode 100644
index 34af9fa4ae..0000000000
--- a/phpBB/includes/db/migration/data/3_0_4.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_4 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.4', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_4_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
-
-			array('config.update', array('version', '3.0.4')),
-		);
-	}
-
-	public function rename_log_delete_topic()
-	{
-		if ($this->db->sql_layer == 'oracle')
-		{
-			// log_operation is CLOB - but we can change this later
-			$sql = 'UPDATE ' . $this->table_prefix . "log
-				SET log_operation = 'LOG_DELETE_TOPIC'
-				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
-			$this->sql_query($sql);
-		}
-		else
-		{
-			$sql = 'UPDATE ' . $this->table_prefix . "log
-				SET log_operation = 'LOG_DELETE_TOPIC'
-				WHERE log_operation = 'LOG_TOPIC_DELETED'";
-			$this->sql_query($sql);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_4_rc1.php b/phpBB/includes/db/migration/data/3_0_4_rc1.php
deleted file mode 100644
index f63bebcf75..0000000000
--- a/phpBB/includes/db/migration/data/3_0_4_rc1.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_4_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.4-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_3');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_profile' => array('BOOL', 0),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'styles' => array(
-					'style_id' => array('UINT', NULL, 'auto_increment'),
-					'template_id' => array('UINT', 0),
-					'theme_id' => array('UINT', 0),
-					'imageset_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'styles_imageset' => array(
-					'imageset_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_imageset_data' => array(
-					'image_id' => array('UINT', NULL, 'auto_increment'),
-					'imageset_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'styles_theme' => array(
-					'theme_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_template' => array(
-					'template_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_template_data' => array(
-					'template_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_style' => array('UINT', 0),
-				),
-				$this->table_prefix . 'users' => array(
-					'user_style' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_profile',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
-
-			array('config.update', array('version', '3.0.4-rc1')),
-		);
-	}
-
-	public function update_custom_profile_fields()
-	{
-		// Update the Custom Profile Fields based on previous settings to the new format
-		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
-				FROM ' . PROFILE_FIELDS_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql_ary = array(
-				'field_required'	=> 0,
-				'field_show_on_reg'	=> 0,
-				'field_hide'		=> 0,
-				'field_show_profile'=> 0,
-			);
-
-			if ($row['field_required'])
-			{
-				$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
-			}
-			else if ($row['field_show_on_reg'])
-			{
-				$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
-			}
-			else if ($row['field_hide'])
-			{
-				// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
-				$sql_ary['field_hide'] = 1;
-			}
-			else
-			{
-				// equivelant to "none", which is the "Display in user control panel" option
-				$sql_ary['field_show_profile'] = 1;
-			}
-
-			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
-		}
-
-		$this->db->sql_freeresult($result);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_5.php b/phpBB/includes/db/migration/data/3_0_5.php
deleted file mode 100644
index 077ed251d2..0000000000
--- a/phpBB/includes/db/migration/data/3_0_5.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_5 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.5', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_5_rc1part2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.5')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1.php b/phpBB/includes/db/migration/data/3_0_5_rc1.php
deleted file mode 100644
index df85ee4f7d..0000000000
--- a/phpBB/includes/db/migration/data/3_0_5_rc1.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_5_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_4');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'change_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'forum_style' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		$search_indexing_state = $this->config['search_indexing_state'];
-
-		return array(
-			array('config.add', array('captcha_gd_wave', 0)),
-			array('config.add', array('captcha_gd_3d_noise', 1)),
-			array('config.add', array('captcha_gd_fonts', 1)),
-			array('config.add', array('confirm_refresh', 1)),
-			array('config.add', array('max_num_search_keywords', 10)),
-			array('config.remove', array('search_indexing_state')),
-			array('config.add', array('search_indexing_state', $search_indexing_state, true)),
-			array('custom', array(array(&$this, 'hash_old_passwords'))),
-			array('custom', array(array(&$this, 'update_ichiro_bot'))),
-		);
-	}
-
-	public function hash_old_passwords()
-	{
-		$sql = 'SELECT user_id, user_password
-				FROM ' . $this->table_prefix . 'users
-				WHERE user_pass_convert = 1';
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (strlen($row['user_password']) == 32)
-			{
-				$sql_ary = array(
-					'user_password'	=> phpbb_hash($row['user_password']),
-				);
-
-				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
-			}
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function update_ichiro_bot()
-	{
-		// Adjust bot entry
-		$sql = 'UPDATE ' . $this->table_prefix . "bots
-			SET bot_agent = 'ichiro/'
-			WHERE bot_agent = 'ichiro/2'";
-		$this->sql_query($sql);
-	}
-
-	public function remove_duplicate_auth_options()
-	{
-		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
-		$sql = 'SELECT auth_option
-			FROM ' . $this->table_prefix . 'acl_options
-			GROUP BY auth_option
-			HAVING COUNT(*) >= 2';
-		$result = $this->db->sql_query($sql);
-
-		$auth_options = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$auth_options[] = $row['auth_option'];
-		}
-		$this->db->sql_freeresult($result);
-
-		// Remove specific auth options
-		if (!empty($auth_options))
-		{
-			foreach ($auth_options as $option)
-			{
-				// Select auth_option_ids... the largest id will be preserved
-				$sql = 'SELECT auth_option_id
-					FROM ' . ACL_OPTIONS_TABLE . "
-					WHERE auth_option = '" . $db->sql_escape($option) . "'
-					ORDER BY auth_option_id DESC";
-				// sql_query_limit not possible here, due to bug in postgresql layer
-				$result = $this->db->sql_query($sql);
-
-				// Skip first row, this is our original auth option we want to preserve
-				$row = $this->db->sql_fetchrow($result);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// Ok, remove this auth option...
-					$this->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-				}
-				$this->db->sql_freeresult($result);
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php b/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
deleted file mode 100644
index d2fad7a7f8..0000000000
--- a/phpBB/includes/db/migration/data/3_0_5_rc1part2.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_5_rc1part2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_5_rc1');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_keys'			=> array(
-				$this->table_prefix . 'acl_options'		=> array('auth_option'),
-			),
-			'add_unique_index'	=> array(
-				$this->table_prefix . 'acl_options'		=> array(
-					'auth_option'		=> array('auth_option'),
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.5-rc1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_6.php b/phpBB/includes/db/migration/data/3_0_6.php
deleted file mode 100644
index 1b0cbb1435..0000000000
--- a/phpBB/includes/db/migration/data/3_0_6.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_6 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.6', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_6_rc4');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.6')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc1.php b/phpBB/includes/db/migration/data/3_0_6_rc1.php
deleted file mode 100644
index 0f85084e65..0000000000
--- a/phpBB/includes/db/migration/data/3_0_6_rc1.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_6_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.6-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_5');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'confirm' => array(
-					'attempts' => array('UINT', 0),
-				),
-				$this->table_prefix . 'users' => array(
-					'user_new' => array('BOOL', 1),
-					'user_reminded' => array('TINT:4', 0),
-					'user_reminded_time' => array('TIMESTAMP', 0),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_reported' => array('BOOL', 0),
-				),
-				$this->table_prefix . 'reports' => array(
-					'pm_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'profile_fields'	=> array(
-					'field_show_on_vt' => array('BOOL', 0),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_options' => array('UINT:20', 0),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'users' => array(
-					'user_options' => array('UINT:11', 230271),
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'reports' => array(
-					'post_id' => array('post_id'),
-					'pm_id' => array('pm_id'),
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_username' => array('post_username:255'),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns' => array(
-				$this->table_prefix . 'confirm' => array(
-					'attempts',
-				),
-				$this->table_prefix . 'users' => array(
-					'user_new',
-					'user_reminded',
-					'user_reminded_time',
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_skip_auth',
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_reported',
-				),
-				$this->table_prefix . 'reports' => array(
-					'pm_id',
-				),
-				$this->table_prefix . 'profile_fields'	=> array(
-					'field_show_on_vt',
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_options',
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'reports' => array(
-					'post_id',
-					'pm_id',
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_username',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
-			array('if', array(
-				($this->config['captcha_gd']),
-				array('config.update', array('captcha_plugin', 'phpbb_captcha_gd')),
-			)),
-
-			array('config.add', array('feed_enable', 0)),
-			array('config.add', array('feed_limit', 10)),
-			array('config.add', array('feed_overall_forums', 1)),
-			array('config.add', array('feed_overall_forums_limit', 15)),
-			array('config.add', array('feed_overall_topics', 0)),
-			array('config.add', array('feed_overall_topics_limit', 15)),
-			array('config.add', array('feed_forum', 1)),
-			array('config.add', array('feed_topic', 1)),
-			array('config.add', array('feed_item_statistics', 1)),
-
-			array('config.add', array('smilies_per_page', 50)),
-			array('config.add', array('allow_pm_report', 1)),
-			array('config.add', array('min_post_chars', 1)),
-			array('config.add', array('allow_quick_reply', 1)),
-			array('config.add', array('new_member_post_limit', 0)),
-			array('config.add', array('new_member_group_default', 0)),
-			array('config.add', array('delete_time', $this->config['edit_time'])),
-
-			array('config.add', array('allow_avatar', 0)),
-			array('if', array(
-				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
-				array('config.update', array('allow_avatar', 1)),
-			)),
-			array('config.add', array('allow_avatar_remote_upload', 0)),
-			array('if', array(
-				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
-				array('config.update', array('allow_avatar_remote_upload', 1)),
-			)),
-
-			array('module.add', array(
-				'acp',
-				'ACP_BOARD_CONFIGURATION',
-				array(
-					'module_basename'	=> 'acp_board',
-					'modes'				=> array('feed'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_CAT_USERS',
-				array(
-					'module_basename'	=> 'acp_users',
-					'modes'				=> array('warnings'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_SERVER_CONFIGURATION',
-				array(
-					'module_basename'	=> 'acp_send_statistics',
-					'modes'				=> array('send_statistics'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_FORUM_BASED_PERMISSIONS',
-				array(
-					'module_basename'	=> 'acp_permissions',
-					'modes'				=> array('setting_forum_copy'),
-				),
-			)),
-			array('module.add', array(
-				'mcp',
-				'MCP_REPORTS',
-				array(
-					'module_basename'	=> 'mcp_pm_reports',
-					'modes'				=> array('pm_reports','pm_reports_closed','pm_report_details'),
-				),
-			)),
-			array('custom', array(array(&$this, 'add_newly_registered_group'))),
-			array('custom', array(array(&$this, 'set_user_options_default'))),
-
-			array('config.update', array('version', '3.0.6-rc1')),
-		);
-	}
-
-	public function set_user_options_default()
-	{
-		// 229376 is the added value to enable all three signature options
-		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
-		$this->sql_query($sql);
-	}
-
-	public function add_newly_registered_group()
-	{
-		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = 'NEWLY_REGISTERED'";
-		$result = $this->db->sql_query($sql);
-		$group_id = (int) $this->db->sql_fetchfield('group_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$group_id)
-		{
-			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
-			$this->sql_query($sql);
-
-			$group_id = $this->db->sql_nextid();
-		}
-
-		// Insert new user role... at the end of the chain
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
-				AND role_type = 'u_'";
-		$result = $this->db->sql_query($sql);
-		$u_role = (int) $this->db->sql_fetchfield('role_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$u_role)
-		{
-			$sql = 'SELECT MAX(role_order) as max_order_id
-				FROM ' . ACL_ROLES_TABLE . "
-				WHERE role_type = 'u_'";
-			$result = $this->db->sql_query($sql);
-			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
-			$this->db->sql_freeresult($result);
-
-			$next_order_id++;
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
-			$this->sql_query($sql);
-			$u_role = $this->db->sql_nextid();
-
-			// Now add the correct data to the roles...
-			// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
-			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
-			$this->sql_query($sql);
-
-			// Add user role to group
-			$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
-			$this->sql_query($sql);
-		}
-
-		// Insert new forum role
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
-				AND role_type = 'f_'";
-		$result = $this->db->sql_query($sql);
-		$f_role = (int) $this->db->sql_fetchfield('role_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$f_role)
-		{
-			$sql = 'SELECT MAX(role_order) as max_order_id
-				FROM ' . ACL_ROLES_TABLE . "
-				WHERE role_type = 'f_'";
-			$result = $this->db->sql_query($sql);
-			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
-			$this->db->sql_freeresult($result);
-
-			$next_order_id++;
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
-			$this->sql_query($sql);
-			$f_role = $this->db->sql_nextid();
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
-			$this->sql_query($sql);
-		}
-
-		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
-		$sql = 'SELECT 1
-			FROM ' . USERS_TABLE . '
-			WHERE user_new = 0';
-		$result = $this->db->sql_query_limit($sql, 1);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
-			$this->sql_query($sql);
-		}
-
-		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
-		// Check if the role is already assigned...
-		$sql = 'SELECT forum_id
-			FROM ' . ACL_GROUPS_TABLE . '
-			WHERE group_id = ' . $group_id . '
-				AND auth_role_id = ' . $f_role;
-		$result = $this->db->sql_query($sql);
-		$is_options = (int) $this->db->sql_fetchfield('forum_id');
-		$this->db->sql_freeresult($result);
-
-		// Not assigned at all... :/
-		if (!$is_options)
-		{
-			// Get postable forums
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_type != ' . FORUM_LINK;
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$this->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)');
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		// Clear permissions...
-		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
-		$auth_admin = new auth_admin();
-		$auth_admin->acl_clear_prefetch();
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc2.php b/phpBB/includes/db/migration/data/3_0_6_rc2.php
deleted file mode 100644
index a9c497b3cd..0000000000
--- a/phpBB/includes/db/migration/data/3_0_6_rc2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_6_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.6-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_6_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.6-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc3.php b/phpBB/includes/db/migration/data/3_0_6_rc3.php
deleted file mode 100644
index eca19fc2ff..0000000000
--- a/phpBB/includes/db/migration/data/3_0_6_rc3.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_6_rc3 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.6-rc3', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_6_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_cp_fields'))),
-
-			array('config.update', array('version', '3.0.6-rc3')),
-		);
-	}
-
-	public function update_cp_fields()
-	{
-		// Update the Custom Profile Fields based on previous settings to the new format
-		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
-			SET field_show_on_vt = 1
-			WHERE field_hide = 0
-				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_6_rc4.php b/phpBB/includes/db/migration/data/3_0_6_rc4.php
deleted file mode 100644
index 19611d3c56..0000000000
--- a/phpBB/includes/db/migration/data/3_0_6_rc4.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_6_rc4 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.6-rc4', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_6_rc3');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.6-rc4')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_7.php b/phpBB/includes/db/migration/data/3_0_7.php
deleted file mode 100644
index 97cdf4e3f1..0000000000
--- a/phpBB/includes/db/migration/data/3_0_7.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_7 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.7', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_7_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.7')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_7_pl1.php b/phpBB/includes/db/migration/data/3_0_7_pl1.php
deleted file mode 100644
index 176854a8a6..0000000000
--- a/phpBB/includes/db/migration/data/3_0_7_pl1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_7_pl1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.7-pl1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_7');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.7-pl1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc1.php b/phpBB/includes/db/migration/data/3_0_7_rc1.php
deleted file mode 100644
index daf52213b9..0000000000
--- a/phpBB/includes/db/migration/data/3_0_7_rc1.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_7_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.7-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_6');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_keys' => array(
-				$this->table_prefix . 'log' => array(
-					'log_time',
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'topics_track' => array(
-					'topic_id' => array('topic_id'),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'add_index' => array(
-				$this->table_prefix . 'log' => array(
-					'log_time'	=> array('log_time'),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'topics_track' => array(
-					'topic_id',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('feed_overall', 1)),
-			array('config.add', array('feed_http_auth', 0)),
-			array('config.add', array('feed_limit_post', $this->config['feed_limit'])),
-			array('config.add', array('feed_limit_topic', $this->config['feed_overall_topics_limit'])),
-			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
-			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
-			array('custom', array(array(&$this, 'delete_text_templates'))),
-
-			array('config.update', array('version', '3.0.7-rc1')),
-		);
-	}
-
-	public function delete_text_templates()
-	{
-		// Delete all text-templates from the template_data
-		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
-			WHERE template_filename ' . $this->db->sql_like_expression($this->db->any_char . '.txt');
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_7_rc2.php b/phpBB/includes/db/migration/data/3_0_7_rc2.php
deleted file mode 100644
index 8167d8fa40..0000000000
--- a/phpBB/includes/db/migration/data/3_0_7_rc2.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_7_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.7-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_7_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_email_hash'))),
-
-			array('config.update', array('version', '3.0.7-rc2')),
-		);
-	}
-
-	public function update_email_hash($start = 0)
-	{
-		$limit = 1000;
-
-		$sql = 'SELECT user_id, user_email, user_email_hash
-			FROM ' . USERS_TABLE . '
-			WHERE user_type <> ' . USER_IGNORE . "
-				AND user_email <> ''";
-		$result = $this->db->sql_query_limit($sql, $limit, $start);
-
-		$i = 0;
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$i++;
-
-			// Snapshot of the phpbb_email_hash() function
-			// We cannot call it directly because the auto updater updates the DB first. :/
-			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
-
-			if ($user_email_hash != $row['user_email_hash'])
-			{
-				$sql_ary = array(
-					'user_email_hash'	=> $user_email_hash,
-				);
-
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE user_id = ' . (int) $row['user_id'];
-				$this->sql_query($sql);
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		if ($i < $limit)
-		{
-			// Completed
-			return;
-		}
-
-		// Return the next start, will be sent to $start when this function is called again
-		return $start + $limit;
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_8.php b/phpBB/includes/db/migration/data/3_0_8.php
deleted file mode 100644
index 25baaf0f07..0000000000
--- a/phpBB/includes/db/migration/data/3_0_8.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_8 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.8', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_8_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.8')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_8_rc1.php b/phpBB/includes/db/migration/data/3_0_8_rc1.php
deleted file mode 100644
index 13e68a7953..0000000000
--- a/phpBB/includes/db/migration/data/3_0_8_rc1.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_8_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.8-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_7_pl1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
-			array('custom', array(array(&$this, 'update_module_auth'))),
-			array('custom', array(array(&$this, 'update_bots'))),
-			array('custom', array(array(&$this, 'delete_orphan_shadow_topics'))),
-			array('module.add', array(
-				'acp',
-				'ACP_MESSAGES',
-				array(
-					'module_basename'	=> 'acp_board',
-					'modes'				=> array('post'),
-				),
-			)),
-			array('config.add', array('load_unreads_search', 1)),
-			array('config.update_if_equals', array(600, 'queue_interval', 60)),
-			array('config.update_if_equals', array(50, 'email_package_size', 20)),
-
-			array('config.update', array('version', '3.0.8-rc1')),
-		);
-	}
-
-	public function update_file_extension_group_names()
-	{
-		// Update file extension group names to use language strings.
-		$sql = 'SELECT lang_dir
-			FROM ' . LANG_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		$extension_groups_updated = array();
-		while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
-		{
-			$lang_dir = basename($lang_dir);
-
-			// The language strings we need are either in language/.../acp/attachments.php
-			// in the update package if we're updating to 3.0.8-RC1 or later,
-			// or they are in language/.../install.php when we're updating from 3.0.7-PL1 or earlier.
-			// On an already updated board, they can also already be in language/.../acp/attachments.php
-			// in the board root.
-			$lang_files = array(
-				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.{$this->php_ext}",
-				"{$this->phpbb_root_path}language/$lang_dir/install.{$this->php_ext}",
-				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.{$this->php_ext}",
-			);
-
-			foreach ($lang_files as $lang_file)
-			{
-				if (!file_exists($lang_file))
-				{
-					continue;
-				}
-
-				$lang = array();
-				include($lang_file);
-
-				foreach($lang as $lang_key => $lang_val)
-				{
-					if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
-					{
-						continue;
-					}
-
-					$sql_ary = array(
-						'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
-					);
-
-					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-						SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
-						WHERE group_name = '" . $this->db->sql_escape($lang_val) . "'";
-					$this->sql_query($sql);
-
-					$extension_groups_updated[$lang_key] = true;
-				}
-			}
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function update_module_auth()
-	{
-		$sql = 'UPDATE ' . MODULES_TABLE . '
-			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
-			WHERE module_class = \'ucp\'
-				AND module_basename = \'profile\'
-				AND module_mode = \'avatar\'';
-		$this->sql_query($sql);
-	}
-
-	public function update_bots()
-	{
-		$bot_name = 'Bing [Bot]';
-		$bot_name_clean = utf8_clean_string($bot_name);
-
-		$sql = 'SELECT user_id
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . $this->db->sql_escape($bot_name_clean) . "'";
-		$result = $this->db->sql_query($sql);
-		$bing_already_added = (bool) $this->db->sql_fetchfield('user_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$bing_already_added)
-		{
-			$bot_agent = 'bingbot/';
-			$bot_ip = '';
-			$sql = 'SELECT group_id, group_colour
-				FROM ' . GROUPS_TABLE . "
-				WHERE group_name = 'BOTS'";
-			$result = $this->db->sql_query($sql);
-			$group_row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$group_row)
-			{
-				// default fallback, should never get here
-				$group_row['group_id'] = 6;
-				$group_row['group_colour'] = '9E8DA7';
-			}
-
-			if (!function_exists('user_add'))
-			{
-				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-			}
-
-			$user_row = array(
-				'user_type'				=> USER_IGNORE,
-				'group_id'				=> $group_row['group_id'],
-				'username'				=> $bot_name,
-				'user_regdate'			=> time(),
-				'user_password'			=> '',
-				'user_colour'			=> $group_row['group_colour'],
-				'user_email'			=> '',
-				'user_lang'				=> $this->config['default_lang'],
-				'user_style'			=> $this->config['default_style'],
-				'user_timezone'			=> 0,
-				'user_dateformat'		=> $this->config['default_dateformat'],
-				'user_allow_massemail'	=> 0,
-			);
-
-			$user_id = user_add($user_row);
-
-			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
-				'bot_active'	=> 1,
-				'bot_name'		=> (string) $bot_name,
-				'user_id'		=> (int) $user_id,
-				'bot_agent'		=> (string) $bot_agent,
-				'bot_ip'		=> (string) $bot_ip,
-			));
-
-			$this->sql_query($sql);
-		}
-	}
-
-	public function delete_orphan_shadow_topics()
-	{
-		// Delete shadow topics pointing to not existing topics
-		$batch_size = 500;
-
-		// Set of affected forums we have to resync
-		$sync_forum_ids = array();
-
-		$sql_array = array(
-			'SELECT'	=> 't1.topic_id, t1.forum_id',
-			'FROM'		=> array(
-				TOPICS_TABLE	=> 't1',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(TOPICS_TABLE	=> 't2'),
-					'ON'	=> 't1.topic_moved_id = t2.topic_id',
-				),
-			),
-			'WHERE'		=> 't1.topic_moved_id <> 0
-						AND t2.topic_id IS NULL',
-		);
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-		$result = $this->db->sql_query_limit($sql, $batch_size);
-
-		$topic_ids = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$topic_ids[] = (int) $row['topic_id'];
-
-			$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($topic_ids))
-		{
-			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
-			$this->db->sql_query($sql);
-
-			// Sync the forums we have deleted shadow topics from.
-			sync('forum', 'forum_id', $sync_forum_ids, true, true);
-
-			return false;
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_9.php b/phpBB/includes/db/migration/data/3_0_9.php
deleted file mode 100644
index b35350dbb5..0000000000
--- a/phpBB/includes/db/migration/data/3_0_9.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_9 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.9', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_9_rc4');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc1.php b/phpBB/includes/db/migration/data/3_0_9_rc1.php
deleted file mode 100644
index be6ced2566..0000000000
--- a/phpBB/includes/db/migration/data/3_0_9_rc1.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_9_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.9-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_8');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_tables' => array(
-				$this->table_prefix . 'login_attempts' => array(
-					'COLUMNS' => array(
-						// this column was removed from the database updater
-						// after 3.0.9-RC3 was released. It might still exist
-						// in 3.0.9-RCX installations and has to be dropped in
-						// 3.0.12 after the db_tools class is capable of properly
-						// removing a primary key.
-						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
-						'attempt_ip'			=> array('VCHAR:40', ''),
-						'attempt_browser'		=> array('VCHAR:150', ''),
-						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
-						'attempt_time'			=> array('TIMESTAMP', 0),
-						'user_id'				=> array('UINT', 0),
-						'username'				=> array('VCHAR_UNI:255', 0),
-						'username_clean'		=> array('VCHAR_CI', 0),
-					),
-					//'PRIMARY_KEY' => 'attempt_id',
-					'KEYS' => array(
-						'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
-						'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
-						'att_time' => array('INDEX', array('attempt_time')),
-						'user_id' => array('INDEX', 'user_id'),
-					),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'bbcodes' => array(
-					'bbcode_id' => array('USINT', 0),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_tables' => array(
-				$this->table_prefix . 'login_attempts',
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('ip_login_limit_max', 50)),
-			array('config.add', array('ip_login_limit_time', 21600)),
-			array('config.add', array('ip_login_limit_use_forwarded', 0)),
-			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
-			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
-
-			array('config.update', array('version', '3.0.9-rc1')),
-		);
-	}
-
-	public function update_file_extension_group_names()
-	{
-		// Update file extension group names to use language strings, again.
-		$sql = 'SELECT group_id, group_name
-			FROM ' . EXTENSION_GROUPS_TABLE . '
-			WHERE group_name ' . $this->db->sql_like_expression('EXT_GROUP_' . $this->db->any_char);
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql_ary = array(
-				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
-			);
-
-			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE group_id = ' . $row['group_id'];
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function fix_firebird_qa_captcha()
-	{
-		// Recover from potentially broken Q&A CAPTCHA table on firebird
-		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
-		// without data loss
-		if ($this->db_tools->sql_layer == 'firebird')
-		{
-			$tables = array(
-				$this->table_prefix . 'captcha_questions',
-				$this->table_prefix . 'captcha_answers',
-				$this->table_prefix . 'qa_confirm',
-			);
-			foreach ($tables as $table)
-			{
-				if ($this->db_tools->sql_table_exists($table))
-				{
-					$this->db_tools->sql_table_drop($table);
-				}
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc2.php b/phpBB/includes/db/migration/data/3_0_9_rc2.php
deleted file mode 100644
index 0bec42a8de..0000000000
--- a/phpBB/includes/db/migration/data/3_0_9_rc2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_9_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.9-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_9_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc3.php b/phpBB/includes/db/migration/data/3_0_9_rc3.php
deleted file mode 100644
index a339670932..0000000000
--- a/phpBB/includes/db/migration/data/3_0_9_rc3.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_9_rc3 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.9-rc3', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_9_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9-rc3')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_0_9_rc4.php b/phpBB/includes/db/migration/data/3_0_9_rc4.php
deleted file mode 100644
index ab5c302611..0000000000
--- a/phpBB/includes/db/migration/data/3_0_9_rc4.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_0_9_rc4 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.9-rc4', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_9_rc3');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9-rc4')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/3_1_0_dev.php b/phpBB/includes/db/migration/data/3_1_0_dev.php
deleted file mode 100644
index 8b437104e0..0000000000
--- a/phpBB/includes/db/migration/data/3_1_0_dev.php
+++ /dev/null
@@ -1,406 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_3_1_0_dev extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.1.0-dev', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array(
-			'phpbb_db_migration_data_3_0_11',
-			'phpbb_db_migration_data_extensions',
-			'phpbb_db_migration_data_style_update_p2',
-			'phpbb_db_migration_data_timezone_p2',
-			'phpbb_db_migration_data_reported_posts_display',
-		);
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns'		=> array(
-				$this->table_prefix . 'groups'		=> array(
-					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
-				),
-				$this->table_prefix . 'profile_fields'	=> array(
-					'field_show_on_pm'		=> array('BOOL', 0),
-				),
-				$this->table_prefix . 'styles'		=> array(
-					'style_path'			=> array('VCHAR:100', ''),
-					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
-					'style_parent_id'		=> array('UINT:4', 0),
-					'style_parent_tree'		=> array('TEXT', ''),
-				),
-				$this->table_prefix . 'reports'		=> array(
-					'reported_post_text'		=> array('MTEXT_UNI', ''),
-					'reported_post_uid'			=> array('VCHAR:8', ''),
-					'reported_post_bitfield'	=> array('VCHAR:255', ''),
-				),
-			),
-			'change_columns'	=> array(
-				$this->table_prefix . 'groups'		=> array(
-					'group_legend'		=> array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns'		=> array(
-				$this->table_prefix . 'groups'		=> array(
-					'group_teampage',
-				),
-				$this->table_prefix . 'profile_fields'	=> array(
-					'field_show_on_pm',
-				),
-				$this->table_prefix . 'styles'		=> array(
-					'style_path',
-					'bbcode_bitfield',
-					'style_parent_id',
-					'style_parent_tree',
-				),
-				$this->table_prefix . 'reports'		=> array(
-					'reported_post_text',
-					'reported_post_uid',
-					'reported_post_bitfield',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
-
-			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
-			array('config.add', array('fulltext_postgres_min_word_len', 4)),
-			array('config.add', array('fulltext_postgres_max_word_len', 254)),
-			array('config.add', array('fulltext_sphinx_stopwords', 0)),
-			array('config.add', array('fulltext_sphinx_indexer_mem_limit', 512)),
-
-			array('config.add', array('load_jquery_cdn', 0)),
-			array('config.add', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js')),
-
-			array('config.add', array('use_system_cron', 0)),
-
-			array('config.add', array('legend_sort_groupname', 0)),
-			array('config.add', array('teampage_forums', 1)),
-			array('config.add', array('teampage_memberships', 1)),
-
-			array('config.add', array('load_cpf_pm', 0)),
-
-			array('config.add', array('display_last_subject', 1)),
-
-			array('config.add', array('assets_version', 1)),
-
-			array('config.add', array('site_home_url', '')),
-			array('config.add', array('site_home_text', '')),
-
-			array('permission.add', array('u_chgprofileinfo', true, 'u_sig')),
-
-			array('module.add', array(
-				'acp',
-				'ACP_GROUPS',
-				array(
-					'module_basename'	=> 'acp_groups',
-					'modes'				=> array('position'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_ATTACHMENTS',
-				array(
-					'module_basename'	=> 'acp_attachments',
-					'modes'				=> array('manage'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_STYLE_MANAGEMENT',
-				array(
-					'module_basename'	=> 'acp_styles',
-					'modes'				=> array('install', 'cache'),
-				),
-			)),
-			array('module.add', array(
-				'ucp',
-				'UCP_PROFILE',
-				array(
-					'module_basename'	=> 'ucp_profile',
-					'modes'				=> array('autologin_keys'),
-				),
-			)),
-			// Module will be renamed later
-			array('module.add', array(
-				'acp',
-				'ACP_CAT_STYLES',
-				'ACP_LANGUAGE'
-			)),
-
-			array('module.remove', array(
-				'acp',
-				false,
-				'ACP_TEMPLATES',
-			)),
-			array('module.remove', array(
-				'acp',
-				false,
-				'ACP_THEMES',
-			)),
-			array('module.remove', array(
-				'acp',
-				false,
-				'ACP_IMAGESETS',
-			)),
-
-			array('custom', array(array($this, 'rename_module_basenames'))),
-			array('custom', array(array($this, 'rename_styles_module'))),
-			array('custom', array(array($this, 'add_group_teampage'))),
-			array('custom', array(array($this, 'update_group_legend'))),
-			array('custom', array(array($this, 'localise_global_announcements'))),
-			array('custom', array(array($this, 'update_ucp_pm_basename'))),
-			array('custom', array(array($this, 'update_ucp_profile_auth'))),
-			array('custom', array(array($this, 'move_customise_modules'))),
-
-			array('config.update', array('version', '3.1.0-dev')),
-		);
-	}
-
-	public function move_customise_modules()
-	{
-		// Move language management to new location in the Customise tab
-		// First get language module id
-		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-			WHERE module_basename = 'acp_language'";
-		$result = $this->db->sql_query($sql);
-		$language_module_id = $this->db->sql_fetchfield('module_id');
-		$this->db->sql_freeresult($result);
-		// Next get language management module id of the one just created
-		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-			WHERE module_langname = 'ACP_LANGUAGE'";
-		$result = $this->db->sql_query($sql);
-		$language_management_module_id = $this->db->sql_fetchfield('module_id');
-		$this->db->sql_freeresult($result);
-
-		if (!class_exists('acp_modules'))
-		{
-			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
-		}
-		// acp_modules calls adm_back_link, which is undefined at this point
-		if (!function_exists('adm_back_link'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
-		}
-		$module_manager = new acp_modules();
-		$module_manager->module_class = 'acp';
-		$module_manager->move_module($language_module_id, $language_management_module_id);
-	}
-
-	public function update_ucp_pm_basename()
-	{
-		$sql = 'SELECT module_id, module_basename
-			FROM ' . MODULES_TABLE . "
-			WHERE module_basename <> 'ucp_pm' AND
-				module_langname='UCP_PM'";
-		$result = $this->db->sql_query_limit($sql, 1);
-
-		if ($row = $this->db->sql_fetchrow($result))
-		{
-			// This update is still not applied. Applying it
-
-			$sql = 'UPDATE ' . MODULES_TABLE . "
-				SET module_basename = 'ucp_pm'
-				WHERE  module_id = " . (int) $row['module_id'];
-
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function update_ucp_profile_auth()
-	{
-		// Update the auth setting for the module
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET module_auth = 'acl_u_chgprofileinfo'
-			WHERE module_class = 'ucp'
-				AND module_basename = 'ucp_profile'
-				AND module_mode = 'profile_info'";
-		$this->sql_query($sql);
-	}
-
-	public function rename_styles_module()
-	{
-		// Rename styles module to Customise
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET module_langname = 'ACP_CAT_CUSTOMISE'
-			WHERE module_langname = 'ACP_CAT_STYLES'";
-		$this->sql_query($sql);
-	}
-
-	public function rename_module_basenames()
-	{
-		// rename all module basenames to full classname
-		$sql = 'SELECT module_id, module_basename, module_class
-			FROM ' . MODULES_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$module_id = (int) $row['module_id'];
-			unset($row['module_id']);
-
-			if (!empty($row['module_basename']) && !empty($row['module_class']))
-			{
-				// all the class names start with class name or with phpbb_ for auto loading
-				if (strpos($row['module_basename'], $row['module_class'] . '_') !== 0 &&
-					strpos($row['module_basename'], 'phpbb_') !== 0)
-				{
-					$row['module_basename'] = $row['module_class'] . '_' . $row['module_basename'];
-
-					$sql_update = $this->db->sql_build_array('UPDATE', $row);
-
-					$sql = 'UPDATE ' . MODULES_TABLE . '
-						SET ' . $sql_update . '
-						WHERE module_id = ' . $module_id;
-					$this->sql_query($sql);
-				}
-			}
-		}
-
-		$this->db->sql_freeresult($result);
-	}
-
-	public function add_group_teampage()
-	{
-		$sql = 'UPDATE ' . GROUPS_TABLE . '
-			SET group_teampage = 1
-			WHERE group_type = ' . GROUP_SPECIAL . "
-				AND group_name = 'ADMINISTRATORS'";
-		$this->sql_query($sql);
-
-		$sql = 'UPDATE ' . GROUPS_TABLE . '
-			SET group_teampage = 2
-			WHERE group_type = ' . GROUP_SPECIAL . "
-				AND group_name = 'GLOBAL_MODERATORS'";
-		$this->sql_query($sql);
-	}
-
-	public function update_group_legend()
-	{
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . '
-			WHERE group_legend = 1
-			ORDER BY group_name ASC';
-		$result = $this->db->sql_query($sql);
-
-		$next_legend = 1;
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET group_legend = ' . $next_legend . '
-				WHERE group_id = ' . (int) $row['group_id'];
-			$this->sql_query($sql);
-
-			$next_legend++;
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function localise_global_announcements()
-	{
-		// Localise Global Announcements
-		$sql = 'SELECT topic_id, topic_approved, (topic_replies + 1) AS topic_posts, topic_last_post_id, topic_last_post_subject, topic_last_post_time, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour
-			FROM ' . TOPICS_TABLE . '
-			WHERE forum_id = 0
-				AND topic_type = ' . POST_GLOBAL;
-		$result = $this->db->sql_query($sql);
-
-		$global_announcements = $update_lastpost_data = array();
-		$update_lastpost_data['forum_last_post_time'] = 0;
-		$update_forum_data = array(
-			'forum_posts'		=> 0,
-			'forum_topics'		=> 0,
-			'forum_topics_real'	=> 0,
-		);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$global_announcements[] = (int) $row['topic_id'];
-
-			$update_forum_data['forum_posts'] += (int) $row['topic_posts'];
-			$update_forum_data['forum_topics_real']++;
-			if ($row['topic_approved'])
-			{
-				$update_forum_data['forum_topics']++;
-			}
-
-			if ($update_lastpost_data['forum_last_post_time'] < $row['topic_last_post_time'])
-			{
-				$update_lastpost_data = array(
-					'forum_last_post_id'		=> (int) $row['topic_last_post_id'],
-					'forum_last_post_subject'	=> $row['topic_last_post_subject'],
-					'forum_last_post_time'		=> (int) $row['topic_last_post_time'],
-					'forum_last_poster_id'		=> (int) $row['topic_last_poster_id'],
-					'forum_last_poster_name'	=> $row['topic_last_poster_name'],
-					'forum_last_poster_colour'	=> $row['topic_last_poster_colour'],
-				);
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($global_announcements))
-		{
-			// Update the post/topic-count for the forum and the last-post if needed
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_type = ' . FORUM_POST;
-			$result = $this->db->sql_query_limit($sql, 1);
-			$ga_forum_id = $this->db->sql_fetchfield('forum_id');
-			$this->db->sql_freeresult($result);
-
-			$sql = 'SELECT forum_last_post_time
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_id = ' . $ga_forum_id;
-			$result = $this->db->sql_query($sql);
-			$lastpost = (int) $this->db->sql_fetchfield('forum_last_post_time');
-			$this->db->sql_freeresult($result);
-
-			$sql_update = 'forum_posts = forum_posts + ' . $update_forum_data['forum_posts'] . ', ';
-			$sql_update .= 'forum_topics_real = forum_topics_real + ' . $update_forum_data['forum_topics_real'] . ', ';
-			$sql_update .= 'forum_topics = forum_topics + ' . $update_forum_data['forum_topics'];
-			if ($lastpost < $update_lastpost_data['forum_last_post_time'])
-			{
-				$sql_update .= ', ' . $this->db->sql_build_array('UPDATE', $update_lastpost_data);
-			}
-
-			$sql = 'UPDATE ' . FORUMS_TABLE . '
-				SET ' . $sql_update . '
-				WHERE forum_id = ' . $ga_forum_id;
-			$this->sql_query($sql);
-
-			// Update some forum_ids
-			$table_ary = array(TOPICS_TABLE, POSTS_TABLE, LOG_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE);
-			foreach ($table_ary as $table)
-			{
-				$sql = "UPDATE $table
-					SET forum_id = $ga_forum_id
-					WHERE " . $this->db->sql_in_set('topic_id', $global_announcements);
-				$this->sql_query($sql);
-			}
-			unset($table_ary);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/extensions.php b/phpBB/includes/db/migration/data/extensions.php
deleted file mode 100644
index f077741883..0000000000
--- a/phpBB/includes/db/migration/data/extensions.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_extensions extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return $this->db_tools->sql_table_exists($this->table_prefix . 'ext');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_tables'		=> array(
-				$this->table_prefix . 'ext'	=> array(
-					'COLUMNS'			=> array(
-						'ext_name'		=> array('VCHAR', ''),
-						'ext_active'	=> array('BOOL', 0),
-						'ext_state'		=> array('TEXT', ''),
-					),
-					'KEYS'				=> array(
-						'ext_name'		=> array('UNIQUE', 'ext_name'),
-					),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_tables'		=> array(
-				$this->table_prefix . 'ext',
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			// Module will be renamed later
-			array('module.add', array(
-				'acp',
-				'ACP_CAT_STYLES',
-				'ACP_EXTENSION_MANAGEMENT'
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_EXTENSION_MANAGEMENT',
-				array(
-					'module_basename'	=> 'acp_extensions',
-					'modes'				=> array('main'),
-				),
-			)),
-			array('permission.add', array('a_extensions', true, 'a_styles')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/reported_posts_display.php b/phpBB/includes/db/migration/data/reported_posts_display.php
deleted file mode 100644
index fa605e28e5..0000000000
--- a/phpBB/includes/db/migration/data/reported_posts_display.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_reported_posts_display extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return $this->db_tools->sql_column_exists($this->table_prefix . 'reports', 'reported_post_enable_bbcode');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns'		=> array(
-				$this->table_prefix . 'reports'		=> array(
-					'reported_post_enable_bbcode'		=> array('BOOL', 1),
-					'reported_post_enable_smilies'		=> array('BOOL', 1),
-					'reported_post_enable_magic_url'	=> array('BOOL', 1),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns'		=> array(
-				$this->table_prefix . 'reports'		=> array(
-					'reported_post_enable_bbcode',
-					'reported_post_enable_smilies',
-					'reported_post_enable_magic_url',
-				),
-			),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/style_update_p1.php b/phpBB/includes/db/migration/data/style_update_p1.php
deleted file mode 100644
index 7506b7c49b..0000000000
--- a/phpBB/includes/db/migration/data/style_update_p1.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_style_update_p1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return !$this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'styles_update'))),
-		);
-	}
-
-	public function styles_update()
-	{
-		// Get list of valid 3.1 styles
-		$available_styles = array('prosilver');
-
-		$iterator = new DirectoryIterator($this->phpbb_root_path . 'styles');
-		$skip_dirs = array('.', '..', 'prosilver');
-		foreach ($iterator as $fileinfo)
-		{
-			if ($fileinfo->isDir() && !in_array($fileinfo->getFilename(), $skip_dirs) && file_exists($fileinfo->getPathname() . '/style.cfg'))
-			{
-				$style_cfg = parse_cfg_file($fileinfo->getPathname() . '/style.cfg');
-				if (isset($style_cfg['phpbb_version']) && version_compare($style_cfg['phpbb_version'], '3.1.0-dev', '>='))
-				{
-					// 3.1 style
-					$available_styles[] = $fileinfo->getFilename();
-				}
-			}
-		}
-
-		// Get all installed styles
-		if ($this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset'))
-		{
-			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id, i.imageset_path
-				FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . 'styles_theme c, ' . $this->table_prefix . "styles_imageset i
-				WHERE t.template_id = s.template_id
-					AND c.theme_id = s.theme_id
-					AND i.imageset_id = s.imageset_id";
-		}
-		else
-		{
-			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id
-				FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . "stles_theme c
-				WHERE t.template_id = s.template_id
-					AND c.theme_id = s.theme_id";
-		}
-		$result = $this->db->sql_query($sql);
-
-		$styles = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$styles[] = $row;
-		}
-		$this->db->sql_freeresult($result);
-
-		// Decide which styles to keep, all others will be deleted
-		$valid_styles = array();
-		foreach ($styles as $style_row)
-		{
-			if (
-				// Delete styles with parent style (not supported yet)
-				$style_row['template_inherits_id'] == 0 &&
-				// Check if components match
-				$style_row['template_path'] == $style_row['theme_path'] && (!isset($style_row['imageset_path']) || $style_row['template_path'] == $style_row['imageset_path']) &&
-				// Check if components are valid
-				in_array($style_row['template_path'], $available_styles)
-				)
-			{
-				// Valid style. Keep it
-				$sql_ary = array(
-					'style_path'	=> $style_row['template_path'],
-					'bbcode_bitfield'	=> $style_row['bbcode_bitfield'],
-					'style_parent_id'	=> 0,
-					'style_parent_tree'	=> '',
-				);
-				$this->sql_query('UPDATE ' . STYLES_TABLE . '
-					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE style_id = ' . $style_row['style_id']);
-				$valid_styles[] = (int) $style_row['style_id'];
-			}
-		}
-
-		// Remove old entries from styles table
-		if (!sizeof($valid_styles))
-		{
-			// No valid styles: remove everything and add prosilver
-			$this->sql_query('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
-
-			$sql_ary = array(
-				'style_name'		=> 'prosilver',
-				'style_copyright'	=> '&copy; phpBB Group',
-				'style_active'		=> 1,
-				'style_path'		=> 'prosilver',
-				'bbcode_bitfield'	=> 'lNg=',
-				'style_parent_id'	=> 0,
-				'style_parent_tree'	=> '',
-
-				// Will be removed in the next step
-				'imageset_id'		=> 0,
-				'template_id'		=> 0,
-				'theme_id'			=> 0,
-			);
-
-			$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
-			$this->sql_query($sql);
-
-			$sql = 'SELECT style_id
-				FROM ' . $table . "
-				WHERE style_name = 'prosilver'";
-			$result = $this->sql_query($sql);
-			$default_style = $this->db->sql_fetchfield($result);
-			$this->db->sql_freeresult($result);
-
-			set_config('default_style', $default_style);
-
-			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
-			$this->sql_query($sql);
-		}
-		else
-		{
-			// There are valid styles in styles table. Remove styles that are outdated
-			$this->sql_query('DELETE FROM ' . STYLES_TABLE . '
-				WHERE ' . $this->db->sql_in_set('style_id', $valid_styles, true));
-
-			// Change default style
-			if (!in_array($this->config['default_style'], $valid_styles))
-			{
-				$this->sql_query('UPDATE ' . CONFIG_TABLE . "
-					SET config_value = '" . $valid_styles[0] . "'
-					WHERE config_name = 'default_style'");
-			}
-
-			// Reset styles for users
-			$this->sql_query('UPDATE ' . USERS_TABLE . '
-				SET user_style = 0
-				WHERE ' . $this->db->sql_in_set('user_style', $valid_styles, true));
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/style_update_p2.php b/phpBB/includes/db/migration/data/style_update_p2.php
deleted file mode 100644
index ef13f45d9b..0000000000
--- a/phpBB/includes/db/migration/data/style_update_p2.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_style_update_p2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return !$this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_style_update_p1');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_columns'	=> array(
-				$this->table_prefix . 'styles'		=> array(
-					'imageset_id',
-					'template_id',
-					'theme_id',
-				),
-			),
-
-			'drop_tables'	=> array(
-				$this->table_prefix . 'styles_imageset',
-				$this->table_prefix . 'styles_imageset_data',
-				$this->table_prefix . 'styles_template',
-				$this->table_prefix . 'styles_template_data',
-				$this->table_prefix . 'styles_theme',
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'add_columns'	=> array(
-				$this->table_prefix . 'styles'		=> array(
-					'imageset_id'	=> array('UINT', 0),
-					'template_id'	=> array('UINT', 0),
-					'theme_id'		=> array('UINT', 0),
-				),
-			),
-
-			'add_tables'	=> array(
-				$this->table_prefix . 'styles_imageset'		=> array(
-					'COLUMNS'		=> array(
-						'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
-						'imageset_name'				=> array('VCHAR_UNI:255', ''),
-						'imageset_copyright'		=> array('VCHAR_UNI', ''),
-						'imageset_path'				=> array('VCHAR:100', ''),
-					),
-					'PRIMARY_KEY'		=> 'imageset_id',
-					'KEYS'				=> array(
-						'imgset_nm'			=> array('UNIQUE', 'imageset_name'),
-					),
-				),
-				$this->table_prefix . 'styles_imageset_data'	=> array(
-					'COLUMNS'		=> array(
-						'image_id'				=> array('UINT', NULL, 'auto_increment'),
-						'image_name'			=> array('VCHAR:200', ''),
-						'image_filename'		=> array('VCHAR:200', ''),
-						'image_lang'			=> array('VCHAR:30', ''),
-						'image_height'			=> array('USINT', 0),
-						'image_width'			=> array('USINT', 0),
-						'imageset_id'			=> array('UINT', 0),
-					),
-					'PRIMARY_KEY'		=> 'image_id',
-					'KEYS'				=> array(
-						'i_d'			=> array('INDEX', 'imageset_id'),
-					),
-				),
-				$this->table_prefix . 'styles_template'		=> array(
-					'COLUMNS'		=> array(
-						'template_id'			=> array('UINT', NULL, 'auto_increment'),
-						'template_name'			=> array('VCHAR_UNI:255', ''),
-						'template_copyright'	=> array('VCHAR_UNI', ''),
-						'template_path'			=> array('VCHAR:100', ''),
-						'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
-						'template_storedb'		=> array('BOOL', 0),
-						'template_inherits_id'		=> array('UINT:4', 0),
-						'template_inherit_path'		=> array('VCHAR', ''),
-					),
-					'PRIMARY_KEY'	=> 'template_id',
-					'KEYS'			=> array(
-						'tmplte_nm'				=> array('UNIQUE', 'template_name'),
-					),
-				),
-				$this->table_prefix . 'styles_template_data'	=> array(
-					'COLUMNS'		=> array(
-						'template_id'			=> array('UINT', 0),
-						'template_filename'		=> array('VCHAR:100', ''),
-						'template_included'		=> array('TEXT', ''),
-						'template_mtime'		=> array('TIMESTAMP', 0),
-						'template_data'			=> array('MTEXT_UNI', ''),
-					),
-					'KEYS'			=> array(
-						'tid'					=> array('INDEX', 'template_id'),
-						'tfn'					=> array('INDEX', 'template_filename'),
-					),
-				),
-				$this->table_prefix . 'styles_theme'			=> array(
-					'COLUMNS'		=> array(
-						'theme_id'				=> array('UINT', NULL, 'auto_increment'),
-						'theme_name'			=> array('VCHAR_UNI:255', ''),
-						'theme_copyright'		=> array('VCHAR_UNI', ''),
-						'theme_path'			=> array('VCHAR:100', ''),
-						'theme_storedb'			=> array('BOOL', 0),
-						'theme_mtime'			=> array('TIMESTAMP', 0),
-						'theme_data'			=> array('MTEXT_UNI', ''),
-					),
-					'PRIMARY_KEY'	=> 'theme_id',
-					'KEYS'			=> array(
-						'theme_name'		=> array('UNIQUE', 'theme_name'),
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/timezone.php b/phpBB/includes/db/migration/data/timezone.php
deleted file mode 100644
index 66085b8872..0000000000
--- a/phpBB/includes/db/migration/data/timezone.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_timezone extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_dst');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'change_columns'	=> array(
-				$this->table_prefix . 'users'			=> array(
-					'user_timezone'		=> array('VCHAR:100', ''),
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'update_timezones'))),
-		);
-	}
-
-	public function update_timezones()
-	{
-		// Update user timezones
-		$sql = 'SELECT user_dst, user_timezone
-			FROM ' . $this->table_prefix . 'users
-			GROUP BY user_timezone, user_dst';
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql = 'UPDATE ' . $this->table_prefix . "users
-				SET user_timezone = '" . $this->db->sql_escape($this->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
-				WHERE user_timezone = '" . $this->db->sql_escape($row['user_timezone']) . "'
-					AND user_dst = " . (int) $row['user_dst'];
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-
-		// Update board default timezone
-		$sql = 'UPDATE ' . $this->table_prefix . "config
-			SET config_value = '" . $this->convert_phpbb30_timezone($this->config['board_timezone'], $this->config['board_dst']) . "'
-			WHERE config_name = 'board_timezone'";
-		$this->sql_query($sql);
-	}
-
-	/**
-	* Determine the new timezone for a given phpBB 3.0 timezone and
-	* "Daylight Saving Time" option
-	*
-	*	@param	$timezone	float	Users timezone in 3.0
-	*	@param	$dst		int		Users daylight saving time
-	*	@return		string		Users new php Timezone which is used since 3.1
-	*/
-	public function convert_phpbb30_timezone($timezone, $dst)
-	{
-		$offset = $timezone + $dst;
-
-		switch ($timezone)
-		{
-			case '-12':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 12] Baker Island Time'
-			case '-11':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 11] Niue Time, Samoa Standard Time'
-			case '-10':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
-			case '-9.5':
-				return 'Pacific/Marquesas';			//'[UTC - 9:30] Marquesas Islands Time'
-			case '-9':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
-			case '-8':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 8] Pacific Standard Time'
-			case '-7':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 7] Mountain Standard Time'
-			case '-6':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 6] Central Standard Time'
-			case '-5':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 5] Eastern Standard Time'
-			case '-4.5':
-				return 'America/Caracas';			//'[UTC - 4:30] Venezuelan Standard Time'
-			case '-4':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 4] Atlantic Standard Time'
-			case '-3.5':
-				return 'America/St_Johns';			//'[UTC - 3:30] Newfoundland Standard Time'
-			case '-3':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
-			case '-2':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
-			case '-1':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
-			case '0':
-				return (!$dst) ? 'UTC' : 'Etc/GMT-1';	//'[UTC] Western European Time, Greenwich Mean Time'
-			case '1':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 1] Central European Time, West African Time'
-			case '2':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 2] Eastern European Time, Central African Time'
-			case '3':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 3] Moscow Standard Time, Eastern African Time'
-			case '3.5':
-				return 'Asia/Tehran';				//'[UTC + 3:30] Iran Standard Time'
-			case '4':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
-			case '4.5':
-				return 'Asia/Kabul';				//'[UTC + 4:30] Afghanistan Time'
-			case '5':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
-			case '5.5':
-				return 'Asia/Kolkata';				//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
-			case '5.75':
-				return 'Asia/Kathmandu';			//'[UTC + 5:45] Nepal Time'
-			case '6':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
-			case '6.5':
-				return 'Indian/Cocos';				//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
-			case '7':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
-			case '8':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
-			case '8.75':
-				return 'Australia/Eucla';			//'[UTC + 8:45] Southeastern Western Australia Standard Time'
-			case '9':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
-			case '9.5':
-				return 'Australia/ACT';				//'[UTC + 9:30] Australian Central Standard Time'
-			case '10':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
-			case '10.5':
-				return 'Australia/Lord_Howe';		//'[UTC + 10:30] Lord Howe Standard Time'
-			case '11':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
-			case '11.5':
-				return 'Pacific/Norfolk';			//'[UTC + 11:30] Norfolk Island Time'
-			case '12':
-				return 'Etc/GMT-12';				//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
-			case '12.75':
-				return 'Pacific/Chatham';			//'[UTC + 12:45] Chatham Islands Time'
-			case '13':
-				return 'Pacific/Tongatapu';			//'[UTC + 13] Tonga Time, Phoenix Islands Time'
-			case '14':
-				return 'Pacific/Kiritimati';		//'[UTC + 14] Line Island Time'
-			default:
-				return 'UTC';
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/timezone_p2.php b/phpBB/includes/db/migration/data/timezone_p2.php
deleted file mode 100644
index 38347a0c63..0000000000
--- a/phpBB/includes/db/migration/data/timezone_p2.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_timezone_p2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_dst');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_timezone');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_columns'	=> array(
-				$this->table_prefix . 'users'			=> array(
-					'user_dst',
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'add_columns'	=> array(
-				$this->table_prefix . 'users'			=> array(
-					'user_dst'		=> array('BOOL', 0),
-				),
-			),
-		);
-	}
-}
-- 
cgit v1.2.1


From e4afb68dc35131918a6b91ae9874ade97f448475 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 14 Jan 2013 12:50:13 -0600
Subject: [feature/migrations] Correct depends_on

PHPBB3-9737
---
 phpBB/includes/db/migration/data/310/dev.php                    | 1 -
 phpBB/includes/db/migration/data/310/extensions.php             | 2 +-
 phpBB/includes/db/migration/data/310/reported_posts_display.php | 5 +++++
 phpBB/includes/db/migration/data/310/style_update_p1.php        | 2 +-
 phpBB/includes/db/migration/data/310/timezone.php               | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index f41750e327..13b36bbf30 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -17,7 +17,6 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 	static public function depends_on()
 	{
 		return array(
-			'phpbb_db_migration_data_30x_11',
 			'phpbb_db_migration_data_310_extensions',
 			'phpbb_db_migration_data_310_style_update_p2',
 			'phpbb_db_migration_data_310_timezone_p2',
diff --git a/phpBB/includes/db/migration/data/310/extensions.php b/phpBB/includes/db/migration/data/310/extensions.php
index 925fa29384..6a9caa1cfc 100644
--- a/phpBB/includes/db/migration/data/310/extensions.php
+++ b/phpBB/includes/db/migration/data/310/extensions.php
@@ -16,7 +16,7 @@ class phpbb_db_migration_data_310_extensions extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_11');
+		return array('phpbb_db_migration_data_30x_3_0_11');
 	}
 
 	public function update_schema()
diff --git a/phpBB/includes/db/migration/data/310/reported_posts_display.php b/phpBB/includes/db/migration/data/310/reported_posts_display.php
index 64f0f1aaec..80a0a0e43f 100644
--- a/phpBB/includes/db/migration/data/310/reported_posts_display.php
+++ b/phpBB/includes/db/migration/data/310/reported_posts_display.php
@@ -14,6 +14,11 @@ class phpbb_db_migration_data_310_reported_posts_display extends phpbb_db_migrat
 		return $this->db_tools->sql_column_exists($this->table_prefix . 'reports', 'reported_post_enable_bbcode');
 	}
 
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
 	public function update_schema()
 	{
 		return array(
diff --git a/phpBB/includes/db/migration/data/310/style_update_p1.php b/phpBB/includes/db/migration/data/310/style_update_p1.php
index d19ccc37cf..e324ce7f24 100644
--- a/phpBB/includes/db/migration/data/310/style_update_p1.php
+++ b/phpBB/includes/db/migration/data/310/style_update_p1.php
@@ -16,7 +16,7 @@ class phpbb_db_migration_data_310_style_update_p1 extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_11');
+		return array('phpbb_db_migration_data_30x_3_0_11');
 	}
 
 	public function update_data()
diff --git a/phpBB/includes/db/migration/data/310/timezone.php b/phpBB/includes/db/migration/data/310/timezone.php
index 7a6a9bce05..6e50cbe45f 100644
--- a/phpBB/includes/db/migration/data/310/timezone.php
+++ b/phpBB/includes/db/migration/data/310/timezone.php
@@ -16,7 +16,7 @@ class phpbb_db_migration_data_310_timezone extends phpbb_db_migration
 
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_11');
+		return array('phpbb_db_migration_data_30x_3_0_11');
 	}
 
 	public function update_schema()
-- 
cgit v1.2.1


From a665ad5c2e44922fbd9790597913091c68311533 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 15 Jan 2013 18:58:19 -0600
Subject: [feature/migrations] Remove user_msnm migration

PHPBB3-9737
---
 phpBB/includes/db/migration/data/310/dev.php       |  1 +
 .../includes/db/migration/data/310/remove_msnm.php | 43 ++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 phpBB/includes/db/migration/data/310/remove_msnm.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 13b36bbf30..34f081bf62 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -21,6 +21,7 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 			'phpbb_db_migration_data_310_style_update_p2',
 			'phpbb_db_migration_data_310_timezone_p2',
 			'phpbb_db_migration_data_310_reported_posts_display',
+			'phpbb_db_migration_data_310_remove_msnm',
 		);
 	}
 
diff --git a/phpBB/includes/db/migration/data/310/remove_msnm.php b/phpBB/includes/db/migration/data/310/remove_msnm.php
new file mode 100644
index 0000000000..521161df6b
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/remove_msnm.php
@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_remove_msnm extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_msnm');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_msnm',
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_msnm'		=> array('VCHAR_UNI', ''),
+				),
+			),
+		);
+	}
+}
-- 
cgit v1.2.1


From daf243026a1c6bcd369381433b556732674c41f6 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 6 Feb 2013 13:08:35 -0600
Subject: [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver

PHPBB3-11350
---
 phpBB/includes/db/db_tools.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index a4bf40fcd7..9235317958 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -303,7 +303,7 @@ class phpbb_db_tools
 	* @param phpbb_db_driver	$db					Database connection
 	* @param bool		$return_statements	True if only statements should be returned and no SQL being executed
 	*/
-	function phpbb_db_tools(&$db, $return_statements = false)
+	function phpbb_db_tools(phpbb_db_driver $db, $return_statements = false)
 	{
 		$this->db = $db;
 		$this->return_statements = $return_statements;
-- 
cgit v1.2.1


From 5705c3d377d097ef8bf7b99863eabc08fe3276e7 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 6 Feb 2013 13:14:40 -0600
Subject: [feature/migrations] Fix path to extension migrations

PHPBB3-11318
---
 phpBB/includes/extension/manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 018324d5d6..008bd35376 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -520,7 +520,7 @@ class phpbb_extension_manager
 	protected function handle_migrations($extension_name, $mode)
 	{
 		$migrator = $this->container->get('migrator');
-		$migrations_path = $this->get_extension_path($extension_name) . 'migrations';
+		$migrations_path = $this->phpbb_root_path . $this->get_extension_path($extension_name) . 'migrations/';
 		if (file_exists($migrations_path) && is_dir($migrations_path))
 		{
 			$migrator->load_migrations($migrations_path);
-- 
cgit v1.2.1


From 5a4da46f9bdadbd1744f78b39c68184b317df60b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 6 Feb 2013 23:47:14 +0100
Subject: [feature/avatars] Use array for allowed extensions and implode if
 needed

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php | 7 ++++++-
 phpBB/includes/avatar/driver/local.php  | 2 +-
 phpBB/includes/avatar/driver/remote.php | 2 +-
 phpBB/includes/avatar/driver/upload.php | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index 5a54c3ee37..a116155fd3 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -54,7 +54,12 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	/**
 	* Regex for allowed avatar image extensions
 	*/
-	const REGEX_ALLOWED_EXT = 'gif|jpg|jpeg|png';
+	protected $allowed_extensions = array(
+		'gif',
+		'jpg',
+		'jpeg',
+		'png',
+	);
 
 	/**
 	* Construct a driver object
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index a789cd391d..9049cadea8 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -162,7 +162,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 				$image = $file_info->getFilename();
 
 				// Match all images in the gallery folder
-				if (preg_match('#^[^&\'"<>]+\.(?:'. self::REGEX_ALLOWED_EXT . ')$#i', $image) && is_file($file_path . '/' . $image))
+				if (preg_match('#^[^&\'"<>]+\.(?:' . implode('|', $this->allowed_extensions) . ')$#i', $image) && is_file($file_path . '/' . $image))
 				{
 					if (function_exists('getimagesize'))
 					{
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 9845db4b7f..02098f512c 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -84,7 +84,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 
 		// Check if this url looks alright
 		// This isn't perfect, but it's what phpBB 3.0 did, and might as well make sure everything is compatible
-		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.('. self::REGEX_ALLOWED_EXT . ')$#i', $url))
+		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.('. implode('|', $this->allowed_extensions) . ')$#i', $url))
 		{
 			$error[] = 'AVATAR_URL_INVALID';
 			return false;
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 282e0a21ff..56569ec63c 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -66,7 +66,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 			include($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
 		}
 
-		$upload = new fileupload('AVATAR_', explode('|', self::REGEX_ALLOWED_EXT), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
+		$upload = new fileupload('AVATAR_', $this->allowed_extensions, $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
 
 		$url = $request->variable('avatar_upload_url', '');
 		$upload_file = $request->file('avatar_upload_file');
-- 
cgit v1.2.1


From 8e3aa08845d170633db5fddbecd18e9493d050bc Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Fri, 8 Feb 2013 16:22:36 +0530
Subject: [ticket/11303] add S_TZ_PRESELECT template var

add a new template variable to check if timezone has already been selected
by the user while registeration.

PHPBB3-11303
---
 phpBB/includes/ucp/ucp_register.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index c57aec00a0..9434667111 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -457,6 +457,7 @@ class ucp_register
 			'S_LANG_OPTIONS'	=> language_select($data['lang']),
 			'S_TZ_OPTIONS'			=> $timezone_selects['tz_select'],
 			'S_TZ_DATE_OPTIONS'		=> $timezone_selects['tz_dates'],
+			'S_TZ_PRESELECT'	=> (!$submit),
 			'S_CONFIRM_REFRESH'	=> ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false,
 			'S_REGISTRATION'	=> true,
 			'S_COPPA'			=> $coppa,
-- 
cgit v1.2.1


From a8da6b89e9da1d3b4e16317c21fc88fa1173d0f1 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 20:01:40 -0600
Subject: [feature/migrations] Inject Migrator instead of using the container
 to fetch

PHPBB3-11318
---
 phpBB/includes/extension/manager.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 008bd35376..926cc015de 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -29,6 +29,7 @@ class phpbb_extension_manager
 
 	protected $db;
 	protected $config;
+	protected $migrator;
 	protected $cache;
 	protected $php_ext;
 	protected $extensions;
@@ -48,12 +49,13 @@ class phpbb_extension_manager
 	* @param phpbb_cache_driver_interface $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
+	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_db_migrator $migrator, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
 	{
 		$this->container = $container;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->db = $db;
 		$this->config = $config;
+		$this->migrator = $migrator;
 		$this->cache = $cache;
 		$this->php_ext = $php_ext;
 		$this->extension_table = $extension_table;
@@ -519,11 +521,10 @@ class phpbb_extension_manager
 	*/
 	protected function handle_migrations($extension_name, $mode)
 	{
-		$migrator = $this->container->get('migrator');
 		$migrations_path = $this->phpbb_root_path . $this->get_extension_path($extension_name) . 'migrations/';
 		if (file_exists($migrations_path) && is_dir($migrations_path))
 		{
-			$migrator->load_migrations($migrations_path);
+			$this->migrator->load_migrations($migrations_path);
 		}
 
 		// What is a safe limit of execution time? Half the max execution time should be safe.
@@ -532,9 +533,9 @@ class phpbb_extension_manager
 
 		if ($mode == 'enable')
 		{
-			while (!$migrator->finished())
+			while (!$this->migrator->finished())
 			{
-				$migrator->update();
+				$this->migrator->update();
 
 				// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
 				if ((time() - $start_time) >= $safe_time_limit)
@@ -545,9 +546,9 @@ class phpbb_extension_manager
 		}
 		else if ($mode == 'purge')
 		{
-			while ($migrator->migration_state() !== false)
+			while ($this->migrator->migration_state() !== false)
 			{
-				$migrator->revert();
+				$this->migrator->revert();
 
 				// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
 				if ((time() - $start_time) >= $safe_time_limit)
-- 
cgit v1.2.1


From fc4d5f74c0b82989370e899939d6f31e9a85723d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 20:05:39 -0600
Subject: [feature/migrations] Call revert correctly when purging an extension

PHPBB3-11318
---
 phpBB/includes/extension/manager.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 926cc015de..21a9ec1370 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -522,11 +522,13 @@ class phpbb_extension_manager
 	protected function handle_migrations($extension_name, $mode)
 	{
 		$migrations_path = $this->phpbb_root_path . $this->get_extension_path($extension_name) . 'migrations/';
-		if (file_exists($migrations_path) && is_dir($migrations_path))
+		if (!file_exists($migrations_path) || !is_dir($migrations_path))
 		{
-			$this->migrator->load_migrations($migrations_path);
+			return true;
 		}
 
+		$migrations = $this->migrator->load_migrations($migrations_path);
+
 		// What is a safe limit of execution time? Half the max execution time should be safe.
 		$safe_time_limit = (ini_get('max_execution_time') / 2);
 		$start_time = time();
@@ -546,14 +548,17 @@ class phpbb_extension_manager
 		}
 		else if ($mode == 'purge')
 		{
-			while ($this->migrator->migration_state() !== false)
+			foreach ($migrations as $migration)
 			{
-				$this->migrator->revert();
-
-				// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
-				if ((time() - $start_time) >= $safe_time_limit)
+				while ($this->migrator->migration_state($migration) !== false)
 				{
-					return false;
+					$this->migrator->revert($migration);
+
+					// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+					if ((time() - $start_time) >= $safe_time_limit)
+					{
+						return false;
+					}
 				}
 			}
 		}
-- 
cgit v1.2.1


From cacaffee6e013e43b75212d49960922f88f9f69a Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 20:56:42 -0600
Subject: [feature/migrations] Add language strings for migrations errors

Unfulfillable returns string of the missing dependency name now if
the migration is unfulfillable (this is significantly more helpful).

PHPBB3-11351
---
 phpBB/includes/db/migration/tool/config.php     |  2 +-
 phpBB/includes/db/migration/tool/module.php     |  6 +++---
 phpBB/includes/db/migration/tool/permission.php |  6 +++---
 phpBB/includes/db/migrator.php                  | 16 +++++++++-------
 4 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/tool/config.php b/phpBB/includes/db/migration/tool/config.php
index d9cc20053e..458a25fb66 100644
--- a/phpBB/includes/db/migration/tool/config.php
+++ b/phpBB/includes/db/migration/tool/config.php
@@ -49,7 +49,7 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 	{
 		if (isset($this->config[$config_name]))
 		{
-			throw new phpbb_db_migration_exception('CONFIG_ALREADY_EXISTS', $config_name);
+			throw new phpbb_db_migration_exception('CONFIG_ALREADY_EXIST', $config_name);
 		}
 
 		$this->config->set($config_name, $config_value, !$is_dynamic);
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index afe1f21ec5..4d7fae2bb0 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -242,14 +242,14 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 
 			if (!$module_id)
 			{
-				throw new phpbb_db_migration_exception('MODULE_PARENT_NOT_EXIST', $parent);
+				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $parent);
 			}
 
 			$parent = $data['parent_id'] = $module_id;
 		}
 		else if (!$this->exists($class, false, $parent))
 		{
-			throw new phpbb_db_migration_exception('MODULE_PARENT_NOT_EXIST', $parent);
+			throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $parent);
 		}
 
 		if ($this->exists($class, $parent, $data['module_langname']))
@@ -477,7 +477,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 				$result = $acp_modules->delete_module($module_id);
 				if (!empty($result))
 				{
-					throw new phpbb_db_migration_exception('CANNOT_REMOVE_MODULE', $module_id);
+					throw new phpbb_db_migration_exception('MODULE_NOT_REMOVABLE', $module_id, $result);
 				}
 			}
 
diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php
index 001d090f5a..4231fbe1dd 100644
--- a/phpBB/includes/db/migration/tool/permission.php
+++ b/phpBB/includes/db/migration/tool/permission.php
@@ -107,7 +107,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	{
 		if ($this->exists($auth_option, $global))
 		{
-			throw new phpbb_db_migration_exception('PERMISSION_ALREADY_EXISTS', $auth_option);
+			throw new phpbb_db_migration_exception('PERMISSION_ALREADY_EXIST', $auth_option);
 		}
 
 		// We've added permissions, so set to true to notify the user.
@@ -252,7 +252,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 
 		if ($role_id)
 		{
-			throw new phpbb_db_migration_exception('ROLE_ALREADY_EXISTS', $old_role_name);
+			return;
 		}
 
 		$sql = 'SELECT MAX(role_order) AS max_role_order
@@ -290,7 +290,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 
 		if (!$role_id)
 		{
-			throw new phpbb_db_migration_exception('ROLE_NOT_EXISTS', $old_role_name);
+			throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $old_role_name);
 		}
 
 		$sql = 'UPDATE ' . ACL_ROLES_TABLE . "
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 4456600b0a..3c311e96d7 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -228,9 +228,10 @@ class phpbb_db_migrator
 		{
 			foreach ($this->migrations as $name)
 			{
-				if ($this->unfulfillable($name))
+				$unfulfillable = $this->unfulfillable($name);
+				if ($unfulfillable !== false)
 				{
-					throw new phpbb_db_migration_exception('MIGRATION NOT FULFILLABLE', $name);
+					throw new phpbb_db_migration_exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable);
 				}
 			}
 		}
@@ -674,13 +675,13 @@ class phpbb_db_migrator
 	* Checks if a migration's dependencies can even theoretically be satisfied.
 	*
 	* @param string	$name The class name of the migration
-	* @return bool Whether the migration cannot be fulfilled
+	* @return bool|string False if fulfillable, string of missing migration name if unfulfillable
 	*/
 	public function unfulfillable($name)
 	{
 		if (isset($this->migration_state[$name]))
 		{
-			return false;
+			return $name;
 		}
 
 		if (!class_exists($name))
@@ -693,9 +694,10 @@ class phpbb_db_migrator
 
 		foreach ($depends as $depend)
 		{
-			if ($this->unfulfillable($depend))
+			$unfulfillable = $this->unfulfillable($depend);
+			if ($unfulfillable !== false)
 			{
-				return true;
+				return $unfulfillable;
 			}
 		}
 
@@ -715,7 +717,7 @@ class phpbb_db_migrator
 			{
 				// skip unfulfillable migrations, but fulfillables mean we
 				// are not finished yet
-				if ($this->unfulfillable($name))
+				if ($this->unfulfillable($name) !== false)
 				{
 					continue;
 				}
-- 
cgit v1.2.1


From b398fa2050ab720d9a3ae2b809bb3cdf4f153dc6 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 21:09:29 -0600
Subject: [feature/migrations] Catch and display errors from the migrator

PHPBB3-11318
---
 phpBB/includes/acp/acp_extensions.php | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index a0bcf62ecc..17ab4f3169 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -37,7 +37,7 @@ class acp_extensions
 		$this->template = $template;
 		$this->user = $user;
 
-		$user->add_lang(array('install', 'acp/extensions'));
+		$user->add_lang(array('install', 'acp/extensions', 'migrator'));
 
 		$this->page_title = 'ACP_EXTENSIONS';
 
@@ -103,11 +103,18 @@ class acp_extensions
 					trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action));
 				}
 
-				if ($phpbb_extension_manager->enable_step($ext_name))
+				try
 				{
-					$template->assign_var('S_NEXT_STEP', true);
+					if ($phpbb_extension_manager->enable_step($ext_name))
+					{
+						$template->assign_var('S_NEXT_STEP', true);
 
-					meta_refresh(0, $this->u_action . '&amp;action=enable&amp;ext_name=' . urlencode($ext_name));
+						meta_refresh(0, $this->u_action . '&amp;action=enable&amp;ext_name=' . urlencode($ext_name));
+					}
+				}
+				catch (phpbb_db_migration_exception $e)
+				{
+					$template->assign_var('MIGRATOR_ERROR', $user->lang($e->getMessage(), $e->getParameters()));
 				}
 
 				$this->tpl_name = 'acp_ext_enable';
@@ -156,11 +163,18 @@ class acp_extensions
 			break;
 
 			case 'purge':
-				if ($phpbb_extension_manager->purge_step($ext_name))
+				try
 				{
-					$template->assign_var('S_NEXT_STEP', true);
+					if ($phpbb_extension_manager->purge_step($ext_name))
+					{
+						$template->assign_var('S_NEXT_STEP', true);
 
-					meta_refresh(0, $this->u_action . '&amp;action=purge&amp;ext_name=' . urlencode($ext_name));
+						meta_refresh(0, $this->u_action . '&amp;action=purge&amp;ext_name=' . urlencode($ext_name));
+					}
+				}
+				catch (phpbb_db_migration_exception $e)
+				{
+					$template->assign_var('MIGRATOR_ERROR', $user->lang($e->getMessage(), $e->getParameters()));
 				}
 
 				$this->tpl_name = 'acp_ext_purge';
-- 
cgit v1.2.1


From f18b096df945648aa3ecc2b8b914869871b1823f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 21:10:56 -0600
Subject: [feature/migrations] getParameters function for migration exception

PHPBB3-11351
---
 phpBB/includes/db/migration/exception.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/exception.php b/phpBB/includes/db/migration/exception.php
index ffdcd97780..b3abcdb5e5 100644
--- a/phpBB/includes/db/migration/exception.php
+++ b/phpBB/includes/db/migration/exception.php
@@ -52,4 +52,14 @@ class phpbb_db_migration_exception extends \Exception
 	{
 		return $this->message . ': ' . var_export($this->parameters, true);
 	}
+
+	/**
+	* Get the parameters
+	*
+	* @return array
+	*/
+	public function getParameters()
+	{
+		return $this->parameters;
+	}
 }
-- 
cgit v1.2.1


From f9a1b27a99e30a41db4facd415b39a690614d6c6 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Feb 2013 21:16:39 -0600
Subject: [feature/migrations] Fix unfulfillable function

Returned unfulfillable name in the wrong place previously

PHPBB3-11351
---
 phpBB/includes/db/migrator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 3c311e96d7..41d996b1e3 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -681,12 +681,12 @@ class phpbb_db_migrator
 	{
 		if (isset($this->migration_state[$name]))
 		{
-			return $name;
+			return false;
 		}
 
 		if (!class_exists($name))
 		{
-			return true;
+			return $name;
 		}
 
 		$migration = $this->get_migration($name);
-- 
cgit v1.2.1


From 6b00a6bb7dab0b5645e0598165e1ef04532ba070 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Tue, 12 Feb 2013 21:09:26 +0530
Subject: [ticket/11303] remove additional brackets

PHPBB3-11303
---
 phpBB/includes/ucp/ucp_register.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 9434667111..1de38fddb7 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -457,7 +457,7 @@ class ucp_register
 			'S_LANG_OPTIONS'	=> language_select($data['lang']),
 			'S_TZ_OPTIONS'			=> $timezone_selects['tz_select'],
 			'S_TZ_DATE_OPTIONS'		=> $timezone_selects['tz_dates'],
-			'S_TZ_PRESELECT'	=> (!$submit),
+			'S_TZ_PRESELECT'	=> !$submit,
 			'S_CONFIRM_REFRESH'	=> ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false,
 			'S_REGISTRATION'	=> true,
 			'S_COPPA'			=> $coppa,
-- 
cgit v1.2.1


From 8ec55b062dbaf40f5ad3aec49bf987a14b34dfe8 Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Mon, 11 Feb 2013 15:29:12 +0530
Subject: [ticket/11196] Changed 401 response message in session.php.

In session.php 401 response message was "Not Authorized".
I changed it to "Unauthorized".

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 496c12a0d1..d980f50e05 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -325,7 +325,7 @@ class session
 		// if no session id is set, redirect to index.php
 		if (defined('NEED_SID') && (!isset($_GET['sid']) || $this->session_id !== $_GET['sid']))
 		{
-			send_status_line(401, 'Not authorized');
+			send_status_line(401, 'Unauthorized');
 			redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
 		}
 
-- 
cgit v1.2.1


From f09e6865f70b7b3dfedd2d436396a555a29ebe10 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 13 Feb 2013 01:07:02 +0100
Subject: [feature/avatars] Document the use of the allowed extensions array

PHPBB3-10018
---
 phpBB/includes/avatar/driver/driver.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index a116155fd3..29c58d4e62 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -52,7 +52,12 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	protected $cache;
 
 	/**
-	* Regex for allowed avatar image extensions
+	* Array of allowed avatar image extensions
+	* Array is used for setting the allowed extensions in the fileupload class
+	* and as a base for a regex of allowed extensions, which will be formed by
+	* imploding the array with a "|".
+	*
+	* @var array
 	*/
 	protected $allowed_extensions = array(
 		'gif',
-- 
cgit v1.2.1


From 7ad577a86afa379d67812ed184b7a59a32c64e9e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 15 Feb 2013 16:02:33 -0600
Subject: [ticket/11103] Add Notification Settings link in flyout menu

PHPBB3-11103
---
 phpBB/includes/functions.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 0c514e7205..8ba7b2c24b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5277,6 +5277,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'UNREAD_NOTIFICATIONS_COUNT'	=> ($notifications !== false) ? $notifications['unread_count'] : '',
 		'NOTIFICATIONS_COUNT'			=> ($notifications !== false) ? $user->lang('NOTIFICATIONS_COUNT', $notifications['unread_count']) : '',
 		'U_VIEW_ALL_NOTIFICATIONS'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications'),
+		'U_NOTIFICATION_SETTINGS'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications&amp;mode=notification_options'),
 		'S_NOTIFICATIONS_DISPLAY'		=> $config['load_notifications'],
 
 		'S_USER_NEW_PRIVMSG'			=> $user->data['user_new_privmsg'],
-- 
cgit v1.2.1


From f6bb14569b0a777d3511b732201af9d1a415f2ed Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 15 Feb 2013 22:19:24 -0600
Subject: [feature/migrations] getLocalisedMessage function for migration
 exception

PHPBB3-11351
---
 phpBB/includes/db/migration/exception.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/exception.php b/phpBB/includes/db/migration/exception.php
index b3abcdb5e5..e84330dd71 100644
--- a/phpBB/includes/db/migration/exception.php
+++ b/phpBB/includes/db/migration/exception.php
@@ -62,4 +62,18 @@ class phpbb_db_migration_exception extends \Exception
 	{
 		return $this->parameters;
 	}
+
+	/**
+	* Get localised message (with $user->lang()) 
+	* 
+	* @param phpbb_user $user
+	* @return string
+	*/
+	public function getLocalisedMessage(phpbb_user $user)
+	{
+		$parameters = $this->getParameters();
+		array_unshift($parameters, $this->getMessage());
+
+		return call_user_func_array(array($user, 'lang'), $parameters);
+	}
 }
-- 
cgit v1.2.1


From 872773a21897ccad754a53d7c8ad7899bcc05796 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 15 Feb 2013 22:22:13 -0600
Subject: [feature/migrations] Use getLocalisedMessage() function to get error
 message

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 17ab4f3169..24211196bd 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -114,7 +114,7 @@ class acp_extensions
 				}
 				catch (phpbb_db_migration_exception $e)
 				{
-					$template->assign_var('MIGRATOR_ERROR', $user->lang($e->getMessage(), $e->getParameters()));
+					$template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($user));
 				}
 
 				$this->tpl_name = 'acp_ext_enable';
@@ -174,7 +174,7 @@ class acp_extensions
 				}
 				catch (phpbb_db_migration_exception $e)
 				{
-					$template->assign_var('MIGRATOR_ERROR', $user->lang($e->getMessage(), $e->getParameters()));
+					$template->assign_var('MIGRATOR_ERROR', $e->getLocalisedMessage($user));
 				}
 
 				$this->tpl_name = 'acp_ext_purge';
-- 
cgit v1.2.1


From 5b99f0c113390959f693222055715413addef34e Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Mon, 18 Feb 2013 14:01:46 +0530
Subject: [ticket/11359] close span

PHPBB3-11359
---
 phpBB/includes/search/fulltext_sphinx.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 4bacf74f93..07bcbdadc1 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -878,7 +878,7 @@ class phpbb_search_fulltext_sphinx
 			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" /> ' . $this->user->lang['MIB'] . '</dd>
 		</dl>
 		<dl>
-			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</dt>
+			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</span></dt>
 			<dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6">' . $this->config_file_data . '</textarea>' : $this->config_file_data) . '</dd>
 		<dl>
 		';
-- 
cgit v1.2.1


From 3c6256b3e7489b9aca1e153b3e3bb754f3dd6a7d Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Mon, 18 Feb 2013 14:05:25 +0530
Subject: [ticket/11359] add id attribute to textarea

PHPBB3-11359
---
 phpBB/includes/search/fulltext_sphinx.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 07bcbdadc1..6c66499d21 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -879,7 +879,7 @@ class phpbb_search_fulltext_sphinx
 		</dl>
 		<dl>
 			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</span></dt>
-			<dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6">' . $this->config_file_data . '</textarea>' : $this->config_file_data) . '</dd>
+			<dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6" id="sphinx_config_data">' . $this->config_file_data . '</textarea>' : $this->config_file_data) . '</dd>
 		<dl>
 		';
 
-- 
cgit v1.2.1


From 38360c71f298efee54396118b8afb5c642c79db3 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Mon, 18 Feb 2013 14:13:31 +0530
Subject: [ticket/11359] html escape sphinx config data

PHPBB3-11359
---
 phpBB/includes/search/fulltext_sphinx.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 6c66499d21..7304e70ff8 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -879,7 +879,7 @@ class phpbb_search_fulltext_sphinx
 		</dl>
 		<dl>
 			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</span></dt>
-			<dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6" id="sphinx_config_data">' . $this->config_file_data . '</textarea>' : $this->config_file_data) . '</dd>
+			<dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6" id="sphinx_config_data">' . htmlspecialchars($this->config_file_data) . '</textarea>' : $this->config_file_data) . '</dd>
 		<dl>
 		';
 
-- 
cgit v1.2.1


From 737b99966de8e12ffa13d762b7065043a39399d7 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 10 Nov 2012 03:39:51 +0530
Subject: [ticket/11179] add search query in case initial one fails

changes the start parameter according to the total search results and
executes the search query again to get the results.

PHPBB3-11179
---
 phpBB/includes/search/fulltext_mysql.php | 34 ++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 324c214e91..acb1a7bde8 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -381,7 +381,6 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 		{
 			return $result_count;
 		}
-
 		$id_ary = array();
 
 		$join_topic = ($type == 'posts') ? false : true;
@@ -490,7 +489,38 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 
 		if (!sizeof($id_ary))
 		{
-			return false;
+			$sql_count = "SELECT COUNT(*) as result_count
+				FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
+				WHERE MATCH ($sql_match) AGAINST ('" . $this->db->sql_escape(htmlspecialchars_decode($this->search_query)) . "' IN BOOLEAN MODE)
+					$sql_where_options
+				ORDER BY $sql_sort";
+			$result = $this->db->sql_query($sql_count);
+			$total_match_count = (int) $this->db->sql_fetchfield('result_count');
+
+			if ($total_match_count)
+			{
+				if ($start < 0)
+				{
+					$start = 0;
+				}
+				else if ($start >= $total_match_count)
+				{
+					$start = floor(($total_match_count - 1) / $per_page) * $per_page;
+				}
+				$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$id_ary[] = (int) $row[$field];
+				}
+				$this->db->sql_freeresult($result);
+
+				$id_ary = array_unique($id_ary);
+			}
+
+			if (!sizeof($id_ary))
+			{
+				return false;
+			}
 		}
 
 		// if the total result count is not cached yet, retrieve it from the db
-- 
cgit v1.2.1


From 00d34617ccb6a53185f0e872a735b4dd2f65009b Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 10 Nov 2012 13:36:14 +0100
Subject: [ticket/11179] correct the start parameter while retrieving from
 cache

Start parameter if not between 0 and the total result count of the cached
search results is changed accordingly

PHPBB3-11179
---
 phpBB/includes/search/base.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/base.php b/phpBB/includes/search/base.php
index b364dead9a..11e5535979 100644
--- a/phpBB/includes/search/base.php
+++ b/phpBB/includes/search/base.php
@@ -97,7 +97,6 @@ class phpbb_search_base
 	function obtain_ids($search_key, &$result_count, &$id_ary, $start, $per_page, $sort_dir)
 	{
 		global $cache;
-
 		if (!($stored_ids = $cache->get('_search_results_' . $search_key)))
 		{
 			// no search results cached for this search_key
@@ -109,6 +108,19 @@ class phpbb_search_base
 			$reverse_ids = ($stored_ids[-2] != $sort_dir) ? true : false;
 			$complete = true;
 
+			// change start parameter in case out of bounds
+			if ($result_count)
+			{
+				if ($start < 0)
+				{
+					$start = 0;
+				}
+				else if ($start >= $result_count)
+				{
+					$start = floor(($result_count - 1) / $per_page) * $per_page;
+				}
+			}
+
 			// change the start to the actual end of the current request if the sort direction differs
 			// from the dirction in the cache and reverse the ids later
 			if ($reverse_ids)
-- 
cgit v1.2.1


From 3e5ef8ab2cc1d8c6e0850e36ddb546489cc5ab12 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 10 Nov 2012 13:39:40 +0100
Subject: [ticket/11179] pass start parameter by reference

start parameter is passed by reference so that in case it is not in bounds
the changes made to it are reflected back to the phpBB/search.php file

PHPBB3-11179
---
 phpBB/includes/search/base.php           | 2 +-
 phpBB/includes/search/fulltext_mysql.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/base.php b/phpBB/includes/search/base.php
index 11e5535979..2047742367 100644
--- a/phpBB/includes/search/base.php
+++ b/phpBB/includes/search/base.php
@@ -94,7 +94,7 @@ class phpbb_search_base
 	*
 	* @return int SEARCH_RESULT_NOT_IN_CACHE or SEARCH_RESULT_IN_CACHE or SEARCH_RESULT_INCOMPLETE
 	*/
-	function obtain_ids($search_key, &$result_count, &$id_ary, $start, $per_page, $sort_dir)
+	function obtain_ids($search_key, &$result_count, &$id_ary, &$start, $per_page, $sort_dir)
 	{
 		global $cache;
 		if (!($stored_ids = $cache->get('_search_results_' . $search_key)))
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index acb1a7bde8..749353b2ee 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -353,7 +353,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No keywords? No posts
 		if (!$this->search_query)
-- 
cgit v1.2.1


From 1c9c666ef193942a2d88ec59741ddc49900e92e9 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 10 Nov 2012 14:17:38 +0100
Subject: [ticket/11179] use FOUND_ROWS query to re-search with changed start
 param

PHPBB3-11179
---
 phpBB/includes/search/fulltext_mysql.php | 60 ++++++++++++--------------------
 1 file changed, 22 insertions(+), 38 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 749353b2ee..3ecc2cd39d 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -375,6 +375,11 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			implode(',', $author_ary)
 		)));
 
+		if ($start < 0)
+		{
+			$start = 0;
+		}
+
 		// try reading the results from cache
 		$result_count = 0;
 		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
@@ -487,47 +492,11 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 
 		$id_ary = array_unique($id_ary);
 
-		if (!sizeof($id_ary))
-		{
-			$sql_count = "SELECT COUNT(*) as result_count
-				FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
-				WHERE MATCH ($sql_match) AGAINST ('" . $this->db->sql_escape(htmlspecialchars_decode($this->search_query)) . "' IN BOOLEAN MODE)
-					$sql_where_options
-				ORDER BY $sql_sort";
-			$result = $this->db->sql_query($sql_count);
-			$total_match_count = (int) $this->db->sql_fetchfield('result_count');
-
-			if ($total_match_count)
-			{
-				if ($start < 0)
-				{
-					$start = 0;
-				}
-				else if ($start >= $total_match_count)
-				{
-					$start = floor(($total_match_count - 1) / $per_page) * $per_page;
-				}
-				$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$id_ary[] = (int) $row[$field];
-				}
-				$this->db->sql_freeresult($result);
-
-				$id_ary = array_unique($id_ary);
-			}
-
-			if (!sizeof($id_ary))
-			{
-				return false;
-			}
-		}
-
 		// if the total result count is not cached yet, retrieve it from the db
 		if (!$result_count)
 		{
-			$sql = 'SELECT FOUND_ROWS() as result_count';
-			$result = $this->db->sql_query($sql);
+			$sql_found_rows = 'SELECT FOUND_ROWS() as result_count';
+			$result = $this->db->sql_query($sql_found_rows);
 			$result_count = (int) $this->db->sql_fetchfield('result_count');
 			$this->db->sql_freeresult($result);
 
@@ -537,6 +506,21 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			}
 		}
 
+		if ($start >= $result_count)
+		{
+			$start = floor(($result_count - 1) / $per_page) * $per_page;
+		}
+
+		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$id_ary[] = (int) $row[$field];
+		}
+		$this->db->sql_freeresult($result);
+
+		$id_ary = array_unique($id_ary);
+
 		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
 		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
 		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-- 
cgit v1.2.1


From 2601411a9cfb79de1c45523005e91f00a8583ad1 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 10 Nov 2012 14:28:29 +0100
Subject: [ticket/11179] correct start parameter for author search

PHPBB3-11179
---
 phpBB/includes/search/fulltext_mysql.php | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 3ecc2cd39d..54e2007da3 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -571,6 +571,11 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			$author_name,
 		)));
 
+		if ($start < 0)
+		{
+			$start = 0;
+		}
+
 		// try reading the results from cache
 		$result_count = 0;
 		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
@@ -676,8 +681,8 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 		// retrieve the total result count if needed
 		if (!$result_count)
 		{
-			$sql = 'SELECT FOUND_ROWS() as result_count';
-			$result = $this->db->sql_query($sql);
+			$sql_found_rows = 'SELECT FOUND_ROWS() as result_count';
+			$result = $this->db->sql_query($sql_found_rows);
 			$result_count = (int) $this->db->sql_fetchfield('result_count');
 			$this->db->sql_freeresult($result);
 
@@ -687,6 +692,20 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			}
 		}
 
+		if ($start >= $result_count)
+		{
+			$start = floor(($result_count - 1) / $per_page) * $per_page;
+		}
+
+		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$id_ary[] = (int) $row[$field];
+		}
+		$this->db->sql_freeresult($result);
+
+		$id_ary = array_unique($id_ary);
+
 		if (sizeof($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
-- 
cgit v1.2.1


From 80f8e3abceabab658a5a935e5a6079e73f663698 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 10 Nov 2012 14:29:39 +0100
Subject: [ticket/11179] pass start param by reference in author search

PHPBB3-11179
---
 phpBB/includes/search/fulltext_mysql.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 54e2007da3..69f76ba99e 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -547,7 +547,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No author? No posts
 		if (!sizeof($author_ary))
@@ -578,7 +578,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 
 		// try reading the results from cache
 		$result_count = 0;
-		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
+		if ($this->obtain_ids($search_key, $result_count, $id_ary, &$start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
 		{
 			return $result_count;
 		}
-- 
cgit v1.2.1


From 2cb48f034153038d71d89ab58904cd048b8524d9 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 10 Nov 2012 15:35:05 +0100
Subject: [ticket/11179] correct start parameter in psql keyword search

PHPBB3-11179
---
 phpBB/includes/search/fulltext_postgres.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index 1475cc31d0..d968a934f4 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -371,6 +371,11 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			implode(',', $author_ary)
 		)));
 
+		if ($start < 0)
+		{
+			$start = 0;
+		}
+
 		// try reading the results from cache
 		$result_count = 0;
 		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
@@ -495,11 +500,6 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 
 		$id_ary = array_unique($id_ary);
 
-		if (!sizeof($id_ary))
-		{
-			return false;
-		}
-
 		// if the total result count is not cached yet, retrieve it from the db
 		if (!$result_count)
 		{
@@ -518,6 +518,21 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 
 		$this->db->sql_transaction('commit');
 
+		if ($start >= $result_count)
+		{
+			$start = floor(($result_count - 1) / $per_page) * $per_page;
+		}
+
+		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$id_ary[] = $row[$field];
+		}
+		$this->db->sql_freeresult($result);
+
+		$id_ary = array_unique($id_ary);
+
 		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
 		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
 		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-- 
cgit v1.2.1


From ef88edbcf69541bd79e220c87c444b33a6751c67 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 10 Nov 2012 15:44:16 +0100
Subject: [ticket/11179] correct start param in author search of postgres

PHPBB3-11179
---
 phpBB/includes/search/fulltext_postgres.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index d968a934f4..e8a5353b05 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -583,6 +583,11 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			$author_name,
 		)));
 
+		if ($start < 0)
+		{
+			$start = 0;
+		}
+
 		// try reading the results from cache
 		$result_count = 0;
 		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
@@ -725,6 +730,20 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 
 		$this->db->sql_transaction('commit');
 
+		if ($start >= $result_count)
+		{
+			$start = floor(($result_count - 1) / $per_page) * $per_page;
+		}
+
+		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$id_ary[] = (int) $row[$field];
+		}
+		$this->db->sql_freeresult($result);
+
+		$id_ary = array_unique($id_ary);
+
 		if (sizeof($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
-- 
cgit v1.2.1


From bc77ca4d4eb6a5bcf3e47706c6b6fd2b0fe33f82 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 10 Nov 2012 15:45:15 +0100
Subject: [ticket/11179] pass start param by reference in postgres

PHPBB3-11179
---
 phpBB/includes/search/fulltext_postgres.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index e8a5353b05..bdc2fa4f19 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -343,7 +343,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No keywords? No posts
 		if (!$this->search_query)
@@ -559,7 +559,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No author? No posts
 		if (!sizeof($author_ary))
-- 
cgit v1.2.1


From 16bbdf4a52b2cb2fa4aa2cd607ae726ea1c7af67 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 11 Nov 2012 10:11:58 +0100
Subject: [ticket/11179] minor fixes

Amends comments to start with capitals. Reinsert blank lines which were
not supposed to be removed

PHPBB3-11179
---
 phpBB/includes/search/base.php           | 3 ++-
 phpBB/includes/search/fulltext_mysql.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/base.php b/phpBB/includes/search/base.php
index 2047742367..914cef9167 100644
--- a/phpBB/includes/search/base.php
+++ b/phpBB/includes/search/base.php
@@ -97,6 +97,7 @@ class phpbb_search_base
 	function obtain_ids($search_key, &$result_count, &$id_ary, &$start, $per_page, $sort_dir)
 	{
 		global $cache;
+
 		if (!($stored_ids = $cache->get('_search_results_' . $search_key)))
 		{
 			// no search results cached for this search_key
@@ -108,7 +109,7 @@ class phpbb_search_base
 			$reverse_ids = ($stored_ids[-2] != $sort_dir) ? true : false;
 			$complete = true;
 
-			// change start parameter in case out of bounds
+			// Change start parameter in case out of bounds
 			if ($result_count)
 			{
 				if ($start < 0)
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 69f76ba99e..ad5119f67c 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -386,6 +386,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 		{
 			return $result_count;
 		}
+
 		$id_ary = array();
 
 		$join_topic = ($type == 'posts') ? false : true;
-- 
cgit v1.2.1


From f0d63594e68fa7a165b8ba90d0fcf35f38e42de9 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 2 Dec 2012 14:15:04 +0530
Subject: [ticket/11179] fix success query path for mysql

Additional query to check start parameter executed only incase of no
results.

PHPBB3-11179
---
 phpBB/includes/search/fulltext_mysql.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index ad5119f67c..4dc62753aa 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -510,17 +510,17 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 		if ($start >= $result_count)
 		{
 			$start = floor(($result_count - 1) / $per_page) * $per_page;
-		}
 
-		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
 
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$id_ary[] = (int) $row[$field];
-		}
-		$this->db->sql_freeresult($result);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = (int) $row[$field];
+			}
+			$this->db->sql_freeresult($result);
 
-		$id_ary = array_unique($id_ary);
+			$id_ary = array_unique($id_ary);
+		}
 
 		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
 		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
@@ -696,16 +696,16 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 		if ($start >= $result_count)
 		{
 			$start = floor(($result_count - 1) / $per_page) * $per_page;
-		}
 
-		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$id_ary[] = (int) $row[$field];
-		}
-		$this->db->sql_freeresult($result);
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = (int) $row[$field];
+			}
+			$this->db->sql_freeresult($result);
 
-		$id_ary = array_unique($id_ary);
+			$id_ary = array_unique($id_ary);
+		}
 
 		if (sizeof($id_ary))
 		{
-- 
cgit v1.2.1


From 8b7f306897cddcb16cbed50488848ee357c26f39 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 2 Dec 2012 14:31:12 +0530
Subject: [ticket/11179] fix success query path for postgres

Additional query to check start parameter executed only incase of no
results.

PHPBB3-11179
---
 phpBB/includes/search/fulltext_postgres.php | 32 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index bdc2fa4f19..eeb628b18f 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -521,17 +521,17 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 		if ($start >= $result_count)
 		{
 			$start = floor(($result_count - 1) / $per_page) * $per_page;
-		}
 
-		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
 
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$id_ary[] = $row[$field];
-		}
-		$this->db->sql_freeresult($result);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = $row[$field];
+			}
+			$this->db->sql_freeresult($result);
 
-		$id_ary = array_unique($id_ary);
+			$id_ary = array_unique($id_ary);
+		}
 
 		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
 		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
@@ -733,16 +733,16 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 		if ($start >= $result_count)
 		{
 			$start = floor(($result_count - 1) / $per_page) * $per_page;
-		}
 
-		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$id_ary[] = (int) $row[$field];
-		}
-		$this->db->sql_freeresult($result);
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = (int) $row[$field];
+			}
+			$this->db->sql_freeresult($result);
 
-		$id_ary = array_unique($id_ary);
+			$id_ary = array_unique($id_ary);
+		}
 
 		if (sizeof($id_ary))
 		{
-- 
cgit v1.2.1


From a0ae223ef46e30c9413350ed7c4e52eaab5bb159 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Fri, 21 Dec 2012 19:10:48 +0530
Subject: [ticket/11179] correct start parameter in native keyword search

PHPBB3-11179
---
 phpBB/includes/search/fulltext_native.php | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 53df8348ae..fccdcd855e 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -516,7 +516,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No keywords? No posts.
 		if (empty($this->search_query))
@@ -855,10 +855,6 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 		}
 		$this->db->sql_freeresult($result);
 
-		if (!sizeof($id_ary))
-		{
-			return false;
-		}
 
 		// if we use mysql and the total result count is not cached yet, retrieve it from the db
 		if (!$total_results && $is_mysql)
@@ -867,14 +863,14 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			$sql_array_copy = $sql_array;
 			$sql_array_copy['SELECT'] = 'SQL_CALC_FOUND_ROWS p.post_id ';
 
-			$sql = $this->db->sql_build_query('SELECT', $sql_array_copy);
+			$sql_calc = $this->db->sql_build_query('SELECT', $sql_array_copy);
 			unset($sql_array_copy);
 
-			$this->db->sql_query($sql);
+			$this->db->sql_query($sql_calc);
 			$this->db->sql_freeresult($result);
 
-			$sql = 'SELECT FOUND_ROWS() as total_results';
-			$result = $this->db->sql_query($sql);
+			$sql_count = 'SELECT FOUND_ROWS() as total_results';
+			$result = $this->db->sql_query($sql_count);
 			$total_results = (int) $this->db->sql_fetchfield('total_results');
 			$this->db->sql_freeresult($result);
 
@@ -884,6 +880,20 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			}
 		}
 
+		if ($start >= $total_results)
+		{
+			$start = floor(($total_results - 1) / $per_page) * $per_page;
+
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = (int) $row[(($type == 'posts') ? 'post_id' : 'topic_id')];
+			}
+			$this->db->sql_freeresult($result);
+
+		}
+
 		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
 		$this->save_ids($search_key, $this->search_query, $author_ary, $total_results, $id_ary, $start, $sort_dir);
 		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-- 
cgit v1.2.1


From 2ff874fe930d458382212cfe5495080231ec76e6 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Fri, 21 Dec 2012 19:11:20 +0530
Subject: [ticket/11179] correct start parameter in native author search

PHPBB3-11179
---
 phpBB/includes/search/fulltext_native.php | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index fccdcd855e..c9f33054fc 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -920,7 +920,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No author? No posts
 		if (!sizeof($author_ary))
@@ -1106,13 +1106,13 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 		if (!$total_results && $is_mysql)
 		{
 			// Count rows for the executed queries. Replace $select within $sql with SQL_CALC_FOUND_ROWS, and run it.
-			$sql = str_replace('SELECT ' . $select, 'SELECT DISTINCT SQL_CALC_FOUND_ROWS p.post_id', $sql);
+			$sql_calc = str_replace('SELECT ' . $select, 'SELECT DISTINCT SQL_CALC_FOUND_ROWS p.post_id', $sql);
 
-			$this->db->sql_query($sql);
+			$this->db->sql_query($sql_calc);
 			$this->db->sql_freeresult($result);
 
-			$sql = 'SELECT FOUND_ROWS() as total_results';
-			$result = $this->db->sql_query($sql);
+			$sql_count = 'SELECT FOUND_ROWS() as total_results';
+			$result = $this->db->sql_query($sql_count);
 			$total_results = (int) $this->db->sql_fetchfield('total_results');
 			$this->db->sql_freeresult($result);
 
@@ -1122,6 +1122,19 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			}
 		}
 
+		if ($start >= $total_results)
+		{
+			$start = floor(($total_results - 1) / $per_page) * $per_page;
+
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = (int) $row[$field];
+			}
+			$this->db->sql_freeresult($result);
+		}
+
 		if (sizeof($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $total_results, $id_ary, $start, $sort_dir);
-- 
cgit v1.2.1


From 38bb7dca31740f9d4f188b75167f736ee6666c2f Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Fri, 21 Dec 2012 21:54:41 +0530
Subject: [ticket/11179] correct start parameter in sphinx search

PHPBB3-11179
---
 phpBB/includes/search/fulltext_sphinx.php | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 7304e70ff8..48445d0794 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -454,7 +454,7 @@ class phpbb_search_fulltext_sphinx
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No keywords? No posts.
 		if (!strlen($this->search_query) && !sizeof($author_ary))
@@ -609,6 +609,25 @@ class phpbb_search_fulltext_sphinx
 			}
 		}
 
+		$result_count = $result['total_found'];
+
+		if ($start >= $result_count)
+		{
+			$start = floor(($result_count - 1) / $per_page) * $per_page;
+
+			$this->sphinx->SetLimits((int) $start, (int) $per_page, SPHINX_MAX_MATCHES);
+			$result = $this->sphinx->Query($search_query_prefix . str_replace('&quot;', '"', $this->search_query), $this->indexes);
+
+			// Could be connection to localhost:9312 failed (errno=111,
+			// msg=Connection refused) during rotate, retry if so
+			$retries = SPHINX_CONNECT_RETRIES;
+			while (!$result && (strpos($this->sphinx->GetLastError(), "errno=111,") !== false) && $retries--)
+			{
+				usleep(SPHINX_CONNECT_WAIT_TIME);
+				$result = $this->sphinx->Query($search_query_prefix . str_replace('&quot;', '"', $this->search_query), $this->indexes);
+			}
+		}
+
 		$id_ary = array();
 		if (isset($result['matches']))
 		{
@@ -629,8 +648,6 @@ class phpbb_search_fulltext_sphinx
 			return false;
 		}
 
-		$result_count = $result['total_found'];
-
 		$id_ary = array_slice($id_ary, 0, (int) $per_page);
 
 		return $result_count;
-- 
cgit v1.2.1


From 1ee4702ec51ecfc7d40c8768ba7927439c73002c Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Fri, 25 Jan 2013 18:15:55 +0530
Subject: [ticket/11179] remove extra & in function call

PHPBB3-11179
---
 phpBB/includes/search/fulltext_mysql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 4dc62753aa..adaf025730 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -579,7 +579,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 
 		// try reading the results from cache
 		$result_count = 0;
-		if ($this->obtain_ids($search_key, $result_count, $id_ary, &$start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
+		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
 		{
 			return $result_count;
 		}
-- 
cgit v1.2.1


From 2302cd7a42004b288c5f6be6d0e4b63fe363a983 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 19 Feb 2013 12:24:21 +0100
Subject: [feature/avatars] Pass phpbb_user to prepare and process form
 functions

The phpbb_user object might be used for language variables and other
things.

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php          | 4 ++--
 phpBB/includes/acp/acp_users.php           | 4 ++--
 phpBB/includes/avatar/driver/gravatar.php  | 4 ++--
 phpBB/includes/avatar/driver/interface.php | 6 ++++--
 phpBB/includes/avatar/driver/local.php     | 4 ++--
 phpBB/includes/avatar/driver/remote.php    | 4 ++--
 phpBB/includes/avatar/driver/upload.php    | 4 ++--
 phpBB/includes/ucp/ucp_groups.php          | 4 ++--
 phpBB/includes/ucp/ucp_profile.php         | 4 ++--
 9 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 92fd466214..483bf47db2 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -338,7 +338,7 @@ class acp_groups
 						if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 						{
 							$driver = $phpbb_avatar_manager->get_driver($driver_name);
-							$result = $driver->process_form($request, $template, $avatar_data, $avatar_error);
+							$result = $driver->process_form($request, $template, $user, $avatar_data, $avatar_error);
 
 							if ($result && empty($avatar_error))
 							{
@@ -532,7 +532,7 @@ class acp_groups
 							'avatar' => "acp_avatar_options_{$config_name}.html",
 						));
 
-						if ($driver->prepare_form($request, $template, $avatar_data, $avatar_error))
+						if ($driver->prepare_form($request, $template, $user, $avatar_data, $avatar_error))
 						{
 							$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 							$driver_upper = strtoupper($driver_name);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 61b644e9f5..88becdb3a5 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1751,7 +1751,7 @@ class acp_users
 							if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 							{
 								$driver = $phpbb_avatar_manager->get_driver($driver_name);
-								$result = $driver->process_form($request, $template, $avatar_data, $error);
+								$result = $driver->process_form($request, $template, $user, $avatar_data, $error);
 
 								if ($result && empty($error))
 								{
@@ -1813,7 +1813,7 @@ class acp_users
 							'avatar' => "acp_avatar_options_{$config_name}.html",
 						));
 
-						if ($driver->prepare_form($request, $template, $avatar_data, $error))
+						if ($driver->prepare_form($request, $template, $user, $avatar_data, $error))
 						{
 							$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 							$driver_upper = strtoupper($driver_name);
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index b54aae94b7..5f4cfcebc6 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -52,7 +52,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form($request, $template, $row, &$error)
+	public function prepare_form($request, $template, $user, $row, &$error)
 	{
 		$template->assign_vars(array(
 			'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_gravatar_width', 0),
@@ -66,7 +66,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function process_form($request, $template, $row, &$error)
+	public function process_form($request, $template, $user, $row, &$error)
 	{
 		$row['avatar'] = $request->variable('avatar_gravatar_email', '');
 		$row['avatar_width'] = $request->variable('avatar_gravatar_width', 0);
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 9364699b5f..6ceb48ad10 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -55,6 +55,7 @@ interface phpbb_avatar_driver_interface
 	*
 	* @param phpbb_request $request Request object
 	* @param phpbb_template	$template Template object
+	* @param phpbb_user $user User object
 	* @param array	$row User data or group data that has been cleaned with 
 	*        phpbb_avatar_manager::clean_row
 	* @param array	&$error Reference to an error array that is filled by this
@@ -64,7 +65,7 @@ interface phpbb_avatar_driver_interface
 	*
 	* @return bool True if form has been successfully prepared
 	*/
-	public function prepare_form($request, $template, $row, &$error);
+	public function prepare_form($request, $template, $user, $row, &$error);
 
 	/**
 	* Prepare form for changing the acp settings of this avatar
@@ -82,6 +83,7 @@ interface phpbb_avatar_driver_interface
 	*
 	* @param phpbb_request $request Request object
 	* @param phpbb_template	$template Template object
+	* @param phpbb_user $user User object
 	* @param array	$row User data or group data that has been cleaned with 
 	*        phpbb_avatar_manager::clean_row
 	* @param array	&$error Reference to an error array that is filled by this
@@ -92,7 +94,7 @@ interface phpbb_avatar_driver_interface
 	* @return array Array containing the avatar data as follows:
 	*        ['avatar'], ['avatar_width'], ['avatar_height']
 	*/
-	public function process_form($request, $template, $row, &$error);
+	public function process_form($request, $template, $user, $row, &$error);
 
 	/**
 	* Delete avatar
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 9049cadea8..693a0ede47 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -36,7 +36,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form($request, $template, $row, &$error)
+	public function prepare_form($request, $template, $user, $row, &$error)
 	{
 		$avatar_list = $this->get_avatar_list();
 		$category = $request->variable('avatar_local_cat', '');
@@ -114,7 +114,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function process_form($request, $template, $row, &$error)
+	public function process_form($request, $template, $user, $row, &$error)
 	{
 		$avatar_list = $this->get_avatar_list();
 		$category = $request->variable('avatar_local_cat', '');
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 02098f512c..3661e16160 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -36,7 +36,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form($request, $template, $row, &$error)
+	public function prepare_form($request, $template, $user, $row, &$error)
 	{
 		$template->assign_vars(array(
 			'AVATAR_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_remote_width', 0),
@@ -50,7 +50,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function process_form($request, $template, $row, &$error)
+	public function process_form($request, $template, $user, $row, &$error)
 	{
 		$url = $request->variable('avatar_remote_url', '');
 		$width = $request->variable('avatar_remote_width', 0);
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 56569ec63c..f91d170d7c 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -36,7 +36,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function prepare_form($request, $template, $row, &$error)
+	public function prepare_form($request, $template, $user, $row, &$error)
 	{
 		if (!$this->can_upload())
 		{
@@ -54,7 +54,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	/**
 	* @inheritdoc
 	*/
-	public function process_form($request, $template, $row, &$error)
+	public function process_form($request, $template, $user, $row, &$error)
 	{
 		if (!$this->can_upload())
 		{
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 9635fcf079..8516682633 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -526,7 +526,7 @@ class ucp_groups
 								if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 								{
 									$driver = $phpbb_avatar_manager->get_driver($driver_name);
-									$result = $driver->process_form($request, $template, $avatar_data, $avatar_error);
+									$result = $driver->process_form($request, $template, $user, $avatar_data, $avatar_error);
 
 									if ($result && empty($avatar_error))
 									{
@@ -657,7 +657,7 @@ class ucp_groups
 									'avatar' => $driver->get_template_name(),
 								));
 
-								if ($driver->prepare_form($request, $template, $avatar_data, $avatar_error))
+								if ($driver->prepare_form($request, $template, $user, $avatar_data, $avatar_error))
 								{
 									$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 									$driver_upper = strtoupper($driver_name);
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 518ad9d917..326514aaef 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -576,7 +576,7 @@ class ucp_profile
 							if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 							{
 								$driver = $phpbb_avatar_manager->get_driver($driver_name);
-								$result = $driver->process_form($request, $template, $avatar_data, $error);
+								$result = $driver->process_form($request, $template, $user, $avatar_data, $error);
 
 								if ($result && empty($error))
 								{
@@ -641,7 +641,7 @@ class ucp_profile
 							'avatar' => $driver->get_template_name(),
 						));
 
-						if ($driver->prepare_form($request, $template, $avatar_data, $error))
+						if ($driver->prepare_form($request, $template, $user, $avatar_data, $error))
 						{
 							$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 							$driver_upper = strtoupper($driver_name);
-- 
cgit v1.2.1


From a9e0aea4b1587ac5ff6c94d2dc7e4d05c304423d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 19 Feb 2013 12:30:14 +0100
Subject: [feature/avatars] Remove trailing whitespace from avatar code

PHPBB3-10018
---
 phpBB/includes/acp/acp_groups.php          |  7 +++----
 phpBB/includes/acp/acp_users.php           |  4 ++--
 phpBB/includes/avatar/driver/gravatar.php  |  4 ++--
 phpBB/includes/avatar/driver/interface.php | 10 +++++-----
 phpBB/includes/avatar/driver/local.php     |  2 +-
 phpBB/includes/ucp/ucp_profile.php         |  6 +++---
 6 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 483bf47db2..56063759c9 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -329,7 +329,7 @@ class acp_groups
 					{
 						$submit_ary['founder_manage'] = isset($_REQUEST['group_founder_manage']) ? 1 : 0;
 					}
-					
+
 					if ($config['allow_avatar'])
 					{
 						// Handle avatar
@@ -343,7 +343,6 @@ class acp_groups
 							if ($result && empty($avatar_error))
 							{
 								$result['avatar_type'] = $driver_name;
-								
 								$submit_ary = array_merge($submit_ary, $result);
 							}
 						}
@@ -547,9 +546,9 @@ class acp_groups
 						}
 					}
 				}
-				
+
 				$avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
-				
+
 				// Merge any avatar errors into the primary error array
 				$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
 
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 88becdb3a5..8f4a22b61f 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1786,7 +1786,7 @@ class acp_users
 									'user_avatar_width' => 0,
 									'user_avatar_height' => 0,
 								);
-								
+
 								$sql = 'UPDATE ' . USERS_TABLE . '
 									SET ' . $db->sql_build_array('UPDATE', $result) . '
 									WHERE user_id = ' . (int) $user_id;
@@ -1843,7 +1843,7 @@ class acp_users
 					'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
 
 					'L_AVATAR_EXPLAIN'	=> sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024),
-					
+
 					'S_AVATARS_ENABLED'		=> ($config['allow_avatar'] && $avatars_enabled),
 				));
 
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 5f4cfcebc6..2e2ae2071f 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -37,7 +37,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 			'height' => $row['avatar_height'],
 		);
 	}
-	
+
 	/**
 	* @inheritdoc
 	*/
@@ -126,7 +126,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 			$error[] = 'AVATAR_NO_SIZE';
 			return false;
 		}
-		
+
 		if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
 		{
 			if ($row['avatar_width'] > $this->config['avatar_max_width'] || $row['avatar_height'] > $this->config['avatar_max_height'])
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
index 6ceb48ad10..3d62969aef 100644
--- a/phpBB/includes/avatar/driver/interface.php
+++ b/phpBB/includes/avatar/driver/interface.php
@@ -31,7 +31,7 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Get the avatar url and dimensions
 	*
-	* @param array	$row User data or group data that has been cleaned with 
+	* @param array	$row User data or group data that has been cleaned with
 	*        phpbb_avatar_manager::clean_row
 	* @return array Avatar data, must have keys src, width and height, e.g.
 	*        ['src' => '', 'width' => 0, 'height' => 0]
@@ -42,7 +42,7 @@ interface phpbb_avatar_driver_interface
 	* Returns custom html if it is needed for displaying this avatar
 	*
 	* @param phpbb_user $user phpBB user object
-	* @param array	$row User data or group data that has been cleaned with 
+	* @param array	$row User data or group data that has been cleaned with
 	*        phpbb_avatar_manager::clean_row
 	* @param string $alt Alternate text for avatar image
 	*
@@ -56,7 +56,7 @@ interface phpbb_avatar_driver_interface
 	* @param phpbb_request $request Request object
 	* @param phpbb_template	$template Template object
 	* @param phpbb_user $user User object
-	* @param array	$row User data or group data that has been cleaned with 
+	* @param array	$row User data or group data that has been cleaned with
 	*        phpbb_avatar_manager::clean_row
 	* @param array	&$error Reference to an error array that is filled by this
 	*        function. Key values can either be a string with a language key or
@@ -84,7 +84,7 @@ interface phpbb_avatar_driver_interface
 	* @param phpbb_request $request Request object
 	* @param phpbb_template	$template Template object
 	* @param phpbb_user $user User object
-	* @param array	$row User data or group data that has been cleaned with 
+	* @param array	$row User data or group data that has been cleaned with
 	*        phpbb_avatar_manager::clean_row
 	* @param array	&$error Reference to an error array that is filled by this
 	*        function. Key values can either be a string with a language key or
@@ -99,7 +99,7 @@ interface phpbb_avatar_driver_interface
 	/**
 	* Delete avatar
 	*
-	* @param array $row User data or group data that has been cleaned with 
+	* @param array $row User data or group data that has been cleaned with
 	*        phpbb_avatar_manager::clean_row
 	*
 	* @return bool True if avatar has been deleted or there is no need to delete,
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 693a0ede47..7237c745d6 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -50,7 +50,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 					'SELECTED' => ($cat == $category),
 				));
 			}
-			
+
 			if ($cat != $category)
 			{
 				unset($avatar_list[$cat]);
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 326514aaef..d2507e5dbd 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -593,7 +593,7 @@ class ucp_profile
 										WHERE user_id = ' . (int) $user->data['user_id'];
 
 									$db->sql_query($sql);
-									
+
 									meta_refresh(3, $this->u_action);
 									$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 									trigger_error($message);
@@ -618,7 +618,7 @@ class ucp_profile
 									WHERE user_id = ' . (int) $user->data['user_id'];
 
 								$db->sql_query($sql);
-								
+
 								meta_refresh(3, $this->u_action);
 								$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 								trigger_error($message);
@@ -670,7 +670,7 @@ class ucp_profile
 					'S_FORM_ENCTYPE'	=> ' enctype="multipart/form-data"',
 
 					'L_AVATAR_EXPLAIN'	=> phpbb_avatar_explanation_string(),
-					
+
 					'S_AVATARS_ENABLED'		=> ($config['allow_avatar'] && $avatars_enabled),
 				));
 
-- 
cgit v1.2.1


From 3cc4746ad3220910b6cbb17772ba594ae26e7c32 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 19 Feb 2013 12:45:08 +0100
Subject: [feature/avatars] Use "Main" as category for avatars in root of
 gallery

Before this change the whole avatar gallery path would show as category.
Additionally, the avatars that were selected like that had an incorrect
path and didn't show up correctly.
With this patch it'll display "Main" as category and properly work.

PHPBBB3-10018
---
 phpBB/includes/avatar/driver/local.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
index 7237c745d6..f4bcd4ce74 100644
--- a/phpBB/includes/avatar/driver/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -38,7 +38,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	*/
 	public function prepare_form($request, $template, $user, $row, &$error)
 	{
-		$avatar_list = $this->get_avatar_list();
+		$avatar_list = $this->get_avatar_list($user);
 		$category = $request->variable('avatar_local_cat', '');
 
 		foreach ($avatar_list as $cat => $null)
@@ -116,7 +116,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	*/
 	public function process_form($request, $template, $user, $row, &$error)
 	{
-		$avatar_list = $this->get_avatar_list();
+		$avatar_list = $this->get_avatar_list($user);
 		$category = $request->variable('avatar_local_cat', '');
 
 		$file = $request->variable('avatar_local_file', '');
@@ -134,7 +134,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 		}
 
 		return array(
-			'avatar' => $category . '/' . $file,
+			'avatar' => ($category != $user->lang['MAIN']) ? $category . '/' . $file : $file,
 			'avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
 			'avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
 		);
@@ -144,9 +144,11 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 	* Get a list of avatars that are locally available
 	* Results get cached for 24 hours (86400 seconds)
 	*
+	* @param phpbb_user $user User object
+	*
 	* @return array Array containing the locally available avatars
 	*/
-	protected function get_avatar_list()
+	protected function get_avatar_list($user)
 	{
 		$avatar_list = ($this->cache == null) ? false : $this->cache->get('avatar_local_list');
 
@@ -172,9 +174,9 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
 					{
 						$dims = array(0, 0);
 					}
-					$cat = str_replace("$path/", '', $file_path);
+					$cat = ($path == $file_path) ? $user->lang['MAIN'] : str_replace("$path/", '', $file_path);
 					$avatar_list[$cat][$image] = array(
-						'file'      => rawurlencode($cat) . '/' . rawurlencode($image),
+						'file'      => ($cat != $user->lang['MAIN']) ? rawurlencode($cat) . '/' . rawurlencode($image) : rawurlencode($image),
 						'filename'  => rawurlencode($image),
 						'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
 						'width'     => $dims[0],
-- 
cgit v1.2.1


From 01a2622dc6b9910b2f4a3d7c77e7b06b51584bc0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 19 Feb 2013 15:49:49 +0100
Subject: [ticket/11323] Correctly treat variables in template defines

Previously, any template variables that were used when defining a variable
were treated as strings. This is a regression to phpBB 3.0. With this
patch the template variables will be properly parsed.

PHPBB3-11323
---
 phpBB/includes/template/filter.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index f73ad28ba1..93bacd9c1e 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -830,10 +830,11 @@ class phpbb_template_filter extends php_user_filter
 	*/
 	private function compile_tag_define($tag_args, $op)
 	{
+		$add_quote = true;
 		$match = array();
-		preg_match('#^((?:' . self::REGEX_NS . '\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (.*?))?$#', $tag_args, $match);
+		preg_match('#^((?:' . self::REGEX_NS . '\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
 
-		if (empty($match[2]) || (!isset($match[3]) && $op))
+		if (empty($match[2]) || (!isset($match[4]) && $op))
 		{
 			return '';
 		}
@@ -843,7 +844,12 @@ class phpbb_template_filter extends php_user_filter
 			return 'unset(' . (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ');';
 		}
 
-		$parsed_statement = implode(' ', $this->compile_expression($match[3]));
+		if ($match[3] && $match[5] && substr($match[4], 0, 1) == '{' && substr($match[4], -1, 1) == '}')
+		{
+			$match[4] = substr($match[4], 1, -1);
+			$add_quote = false;
+		}
+		$parsed_statement = ($add_quote) ? "'" . implode(' ', $this->compile_expression($match[4])) . "'" : implode(' ', $this->compile_expression($match[4]));
 
 		return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $parsed_statement . ';';
 	}
-- 
cgit v1.2.1


From ae3a22bd0c06bd6098c229963402d660572a0598 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 23 Feb 2013 11:06:48 +0100
Subject: [ticket/11361] Make sure that array passed to strtr() has the proper
 format.

The array $date_cache[$format]['lang'] passed to strtr() contains a sub-array
which results in an E_NOTICE being thrown for 'Array to string conversion' on
PHP 5.4.
Ensure that the array passed to strtr() is one-dimensional by filtering out
non-string values.

PHPBB3-11361
---
 phpBB/includes/session.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index d980f50e05..b93f2ff65e 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -2156,7 +2156,8 @@ class user extends session
 				'is_short'		=> strpos($format, '|'),
 				'format_short'	=> substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1),
 				'format_long'	=> str_replace('|', '', $format),
-				'lang'			=> $this->lang['datetime'],
+				// Filter out values that are not strings (e.g. arrays) for strtr().
+				'lang'			=> array_filter($this->lang['datetime'], 'is_string'),
 			);
 
 			// Short representation of month in format? Some languages use different terms for the long and short format of May
-- 
cgit v1.2.1


From b7a222cdd593edb3e61183d9e28707ac9005aa82 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 23 Feb 2013 14:20:56 -0500
Subject: [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/info/acp_extensions.php b/phpBB/includes/acp/info/acp_extensions.php
index 03d7059165..174b365af0 100644
--- a/phpBB/includes/acp/info/acp_extensions.php
+++ b/phpBB/includes/acp/info/acp_extensions.php
@@ -16,10 +16,10 @@ class acp_extensions_info
 	{
 		return array(
 			'filename'	=> 'acp_extensions',
-			'title'		=> 'ACP_EXTENSIONS_MANAGEMENT',
+			'title'		=> 'ACP_EXTENSION_MANAGEMENT',
 			'version'	=> '1.0.0',
 			'modes'		=> array(
-				'main'		=> array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSIONS_MANAGEMENT')),
+				'main'		=> array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSION_MANAGEMENT')),
 			),
 		);
 	}
-- 
cgit v1.2.1


From 4bf64b5e38efd194b6ab41fcc5d62ee0cc6fad5a Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 23 Feb 2013 15:10:21 -0600
Subject: [feature/migrations] Fully revert the removal of the user_msnm field

PHBB3-9737
---
 phpBB/includes/db/migration/data/310/dev.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 34f081bf62..13b36bbf30 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -21,7 +21,6 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 			'phpbb_db_migration_data_310_style_update_p2',
 			'phpbb_db_migration_data_310_timezone_p2',
 			'phpbb_db_migration_data_310_reported_posts_display',
-			'phpbb_db_migration_data_310_remove_msnm',
 		);
 	}
 
-- 
cgit v1.2.1


From e8b3e8498d9842296a905fdaad8c0c32e31bceb4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 24 Feb 2013 12:54:05 +0100
Subject: [ticket/7262] Backport set_config() and set_config_count() docs from
 develop.

PHPBB3-7262
---
 phpBB/includes/functions.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 571c863839..04b69f8c69 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -137,7 +137,14 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false)
 }
 
 /**
-* Set config value. Creates missing config entry.
+* Sets a configuration option's value.
+*
+* @param string $config_name   The configuration option's name
+* @param string $config_value  New configuration value
+* @param bool   $is_dynamic    Whether this variable should be cached or if it
+*                              changes too frequently to be efficiently cached.
+*
+* @return null
 */
 function set_config($config_name, $config_value, $is_dynamic = false)
 {
@@ -166,7 +173,14 @@ function set_config($config_name, $config_value, $is_dynamic = false)
 }
 
 /**
-* Set dynamic config value with arithmetic operation.
+* Increments an integer config value directly in the database.
+*
+* @param string $config_name   The configuration option's name
+* @param int    $increment     Amount to increment by
+* @param bool   $is_dynamic    Whether this variable should be cached or if it
+*                              changes too frequently to be efficiently cached.
+*
+* @return null
 */
 function set_config_count($config_name, $increment, $is_dynamic = false)
 {
-- 
cgit v1.2.1


From a9037a68c177d396b2ed4b9bfcaad64536a01aaa Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 24 Feb 2013 13:03:48 +0100
Subject: [ticket/7262] Add $is_dynamic example to set_config() and
 set_config_count().

The logic is the other way around here in comparison to develop's
phpbb_config_db class, so add examples to make things more clear.

PHPBB3-7262
---
 phpBB/includes/functions.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 04b69f8c69..2ca7d7f898 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -141,8 +141,9 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false)
 *
 * @param string $config_name   The configuration option's name
 * @param string $config_value  New configuration value
-* @param bool   $is_dynamic    Whether this variable should be cached or if it
-*                              changes too frequently to be efficiently cached.
+* @param bool   $is_dynamic    Whether this variable should be cached (false) or
+*                              if it changes too frequently (true) to be
+*                              efficiently cached.
 *
 * @return null
 */
@@ -177,8 +178,9 @@ function set_config($config_name, $config_value, $is_dynamic = false)
 *
 * @param string $config_name   The configuration option's name
 * @param int    $increment     Amount to increment by
-* @param bool   $is_dynamic    Whether this variable should be cached or if it
-*                              changes too frequently to be efficiently cached.
+* @param bool   $is_dynamic    Whether this variable should be cached (false) or
+*                              if it changes too frequently (true) to be
+*                              efficiently cached.
 *
 * @return null
 */
-- 
cgit v1.2.1


From 6bf64d5620b1b9f165a65b50042c391a29ef151c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 24 Feb 2013 13:37:52 +0100
Subject: [ticket/7262] Add note about set_config() not updating is_dynamic.

PHPBB3-7262
---
 phpBB/includes/functions.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 2ca7d7f898..ccd2d3147c 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -139,6 +139,9 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false)
 /**
 * Sets a configuration option's value.
 *
+* Please note that this function does not update the is_dynamic value for
+* an already existing config option.
+*
 * @param string $config_name   The configuration option's name
 * @param string $config_value  New configuration value
 * @param bool   $is_dynamic    Whether this variable should be cached (false) or
-- 
cgit v1.2.1


From d2a15d9afe06509ff3e9fe5b6463800f66813783 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 24 Feb 2013 17:42:53 +0100
Subject: [ticket/10896] Add missing email validation lost in develop merge

Fix incomplete merge, by adding a piece of code moved to another file in
olympus back.

PHPBB3-10896
---
 phpBB/includes/functions_acp.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 32fd76e74d..d6bd9e35dd 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -443,6 +443,13 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 				}
 			break;
 
+			case 'email':
+				if (!preg_match('/^' . get_preg_expression('email') . '$/i', $cfg_array[$config_name]))
+				{
+					$error[] = $user->lang['EMAIL_INVALID_EMAIL'];
+				}
+			break;
+
 			// Absolute path
 			case 'script_path':
 				if (!$cfg_array[$config_name])
-- 
cgit v1.2.1


From f8e184c54e85dc55a803b76a6ccefb769ef38e17 Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Mon, 18 Feb 2013 11:04:14 +0530
Subject: [ticket/11355] Wrong error message when no user is selected.

In ACP group membership management, if you select 'remove member
from group' without selecting any users and submit,it will display
a wrong error after confirmbox. Since no users are selected, this
should not go even until confirmbox. Added a new condition to check
weather any users are selected when the action is 'deleteusers'
in acp_groups.php and disply a correct error.

PHPBB3-11355
---
 phpBB/includes/acp/acp_groups.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 486616c33d..ec44f4fc0c 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -179,6 +179,10 @@ class acp_groups
 			break;
 
 			case 'deleteusers':
+				if (!$name_ary)
+				{
+					trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id), E_USER_WARNING);
+				}
 			case 'delete':
 				if (!$group_id)
 				{
@@ -795,4 +799,4 @@ class acp_groups
 	}
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.1


From ab530a999ed64a2e1fcc10252bdae6d9139d7538 Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Thu, 21 Feb 2013 22:47:42 +0530
Subject: [ticket/11355] Referred proper variable when validating selection.

Earlier PR was referring wrong variable $name_ary. Changed it to
$mark_ary which actually contains selected user ids.

PHPBB3-11355
---
 phpBB/includes/acp/acp_groups.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index ec44f4fc0c..bbe85f8038 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -179,7 +179,7 @@ class acp_groups
 			break;
 
 			case 'deleteusers':
-				if (!$name_ary)
+				if (empty($mark_ary))
 				{
 					trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id), E_USER_WARNING);
 				}
-- 
cgit v1.2.1


From 373c9a3f4ea92f1bcbe63404a2b3bf356fe5abcb Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Mon, 18 Feb 2013 11:17:27 +0530
Subject: [ticket/11358] Success message even without selecting a user.

In group membership management, if you perform the action
'Make group default for member' without selecting any user,
a confirm box will be displayed and will show a success
message after confirming. Added a new condition to fix this
issue in acp_groups.php. It will check weather any users are
selected before performing above action.

PHPBB3-11358
---
 phpBB/includes/acp/acp_groups.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index bbe85f8038..dbe692aee0 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -120,6 +120,10 @@ class acp_groups
 				{
 					trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
 				}
+				else if (!$name_ary)
+				{
+					trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id), E_USER_WARNING);
+				}
 
 				if (confirm_box(true))
 				{
-- 
cgit v1.2.1


From 880786d68610aff0c30573dc599af9e5b3ad56cf Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Thu, 21 Feb 2013 22:25:12 +0530
Subject: [ticket/11358] Removed redundant code and referred proper variable.

Error was thrown when no users are selected before executing the code
chunk which manually adds all the user to make the group default.
Removed this code and referred $mark_ary instead of $name_ary which
will not have selected user ids.

PHPBB3-11358
---
 phpBB/includes/acp/acp_groups.php | 42 ++-------------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index dbe692aee0..af25d9d014 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -120,7 +120,7 @@ class acp_groups
 				{
 					trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
 				}
-				else if (!$name_ary)
+				else if (empty($mark_ary))
 				{
 					trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id), E_USER_WARNING);
 				}
@@ -128,45 +128,7 @@ class acp_groups
 				if (confirm_box(true))
 				{
 					$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-
-					if (!sizeof($mark_ary))
-					{
-						$start = 0;
-
-						do
-						{
-							$sql = 'SELECT user_id
-								FROM ' . USER_GROUP_TABLE . "
-								WHERE group_id = $group_id
-								ORDER BY user_id";
-							$result = $db->sql_query_limit($sql, 200, $start);
-
-							$mark_ary = array();
-							if ($row = $db->sql_fetchrow($result))
-							{
-								do
-								{
-									$mark_ary[] = $row['user_id'];
-								}
-								while ($row = $db->sql_fetchrow($result));
-
-								group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
-
-								$start = (sizeof($mark_ary) < 200) ? 0 : $start + 200;
-							}
-							else
-							{
-								$start = 0;
-							}
-							$db->sql_freeresult($result);
-						}
-						while ($start);
-					}
-					else
-					{
-						group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
-					}
-
+					group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
 					trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
 				}
 				else
-- 
cgit v1.2.1


From 538b09ba6115a1f90821a18d045f2056e66b5178 Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Fri, 22 Feb 2013 00:31:55 +0530
Subject: [ticket/11358] Enabled link making all users default for a group.

Detect whether link is clicked or form is posted for making users
default for a group. If form is posted and no users are selected,
validation happens and displays an error message. When the link is
clicked, all the users will be default users for that group.

PHPBB3-11358
---
 phpBB/includes/acp/acp_groups.php | 42 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index af25d9d014..c70327c6f1 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -120,7 +120,7 @@ class acp_groups
 				{
 					trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
 				}
-				else if (empty($mark_ary))
+				else if (empty($mark_ary) && $request->is_set_post('default'))
 				{
 					trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id), E_USER_WARNING);
 				}
@@ -128,7 +128,45 @@ class acp_groups
 				if (confirm_box(true))
 				{
 					$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-					group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
+					
+				if (!sizeof($mark_ary))
+					{
+						$start = 0;
+
+						do
+						{
+							$sql = 'SELECT user_id
+								FROM ' . USER_GROUP_TABLE . "
+								WHERE group_id = $group_id
+								ORDER BY user_id";
+							$result = $db->sql_query_limit($sql, 200, $start);
+
+							$mark_ary = array();
+							if ($row = $db->sql_fetchrow($result))
+							{
+								do
+								{
+									$mark_ary[] = $row['user_id'];
+								}
+								while ($row = $db->sql_fetchrow($result));
+
+								group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
+
+								$start = (sizeof($mark_ary) < 200) ? 0 : $start + 200;
+							}
+							else
+							{
+								$start = 0;
+							}
+							$db->sql_freeresult($result);
+						}
+						while ($start);
+					}
+					else
+					{
+						group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
+					}
+					
 					trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
 				}
 				else
-- 
cgit v1.2.1


From c0a39537e38c350365c0baa74be31c000b1e9381 Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Fri, 22 Feb 2013 09:53:49 +0530
Subject: [ticket/11358] Changed the action parameter value to represent the
 link.

Changed the action parameter value to recognize whether 'Make default
group for every member' is clicked. If so execute a seperate code block
under switch statement for $action and add all the users as default
for the group.

PHPBB3-11358
---
 phpBB/includes/acp/acp_groups.php | 50 +++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 20 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index c70327c6f1..33d5c16ed0 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -120,7 +120,7 @@ class acp_groups
 				{
 					trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
 				}
-				else if (empty($mark_ary) && $request->is_set_post('default'))
+				else if (empty($mark_ary))
 				{
 					trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id), E_USER_WARNING);
 				}
@@ -128,9 +128,26 @@ class acp_groups
 				if (confirm_box(true))
 				{
 					$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-					
-				if (!sizeof($mark_ary))
+					group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);	
+					trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
+				}
+				else
+				{
+					confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+						'mark'		=> $mark_ary,
+						'g'			=> $group_id,
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'action'	=> $action))
+					);
+				}
+
+				break;
+			case 'defaultbylink':
+					if (confirm_box(true))
 					{
+						$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
+							
 						$start = 0;
 
 						do
@@ -161,27 +178,20 @@ class acp_groups
 							$db->sql_freeresult($result);
 						}
 						while ($start);
+							
+						trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
 					}
 					else
 					{
-						group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
+						confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+							'mark'		=> $mark_ary,
+							'g'			=> $group_id,
+							'i'			=> $id,
+							'mode'		=> $mode,
+							'action'	=> $action))
+						);
 					}
-					
-					trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
-				}
-				else
-				{
-					confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-						'mark'		=> $mark_ary,
-						'g'			=> $group_id,
-						'i'			=> $id,
-						'mode'		=> $mode,
-						'action'	=> $action))
-					);
-				}
-
 			break;
-
 			case 'deleteusers':
 				if (empty($mark_ary))
 				{
@@ -691,7 +701,7 @@ class acp_groups
 					'U_ACTION'			=> $this->u_action . "&amp;g=$group_id",
 					'U_BACK'			=> $this->u_action,
 					'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=list&amp;field=usernames'),
-					'U_DEFAULT_ALL'		=> "{$this->u_action}&amp;action=default&amp;g=$group_id",
+					'U_DEFAULT_ALL'		=> "{$this->u_action}&amp;action=defaultbylink&amp;g=$group_id",
 				));
 
 				// Grab the members
-- 
cgit v1.2.1


From 1b39d6d65e2af632e6ad2ccba7fa2e61ab36c30c Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Sun, 24 Feb 2013 21:34:29 +0530
Subject: [ticket/11358] Changed the name of post parameter.

Replaced the parameter name 'defaultbylink' to a meaningful name
'set_default_on_all'. Parameter is used for making all users
default for selected group in acp_groups.php.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 33d5c16ed0..00ca26dfa6 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -143,7 +143,7 @@ class acp_groups
 				}
 
 				break;
-			case 'defaultbylink':
+			case 'set_default_on_all':
 					if (confirm_box(true))
 					{
 						$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
@@ -701,7 +701,7 @@ class acp_groups
 					'U_ACTION'			=> $this->u_action . "&amp;g=$group_id",
 					'U_BACK'			=> $this->u_action,
 					'U_FIND_USERNAME'	=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=list&amp;field=usernames'),
-					'U_DEFAULT_ALL'		=> "{$this->u_action}&amp;action=defaultbylink&amp;g=$group_id",
+					'U_DEFAULT_ALL'		=> "{$this->u_action}&amp;action=set_default_on_all&amp;g=$group_id",
 				));
 
 				// Grab the members
-- 
cgit v1.2.1


From 4615698807e17c55d5ab93e872f7efefb1e6acd7 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 24 Feb 2013 19:07:24 +0100
Subject: [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated

Rather than send invalid message ids with a missing domain part we try
to read one from $_SERVER and otherwise use phpbb.generated

PHPBB3-10986
---
 phpBB/includes/functions_messenger.php | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index e837811c86..db2dea33e8 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -389,6 +389,28 @@ class messenger
 		}
 	}
 
+	/**
+	* Generates a valid message id to be used in emails
+	*
+	* @return string message id
+	*/
+	function generate_message_id()
+	{
+		global $config;
+
+		$domain = 'phpbb.generated';
+		if ($config['server_name'])
+		{
+			$domain = $config['server_name'];
+		}
+		else if (!empty($_SERVER['SERVER_NAME']))
+		{
+			$domain = $_SERVER['SERVER_NAME'];
+		}
+
+		return md5(unique_id(time())) . '@' . $domain;
+	}
+
 	/**
 	* Return email header
 	*/
@@ -415,7 +437,7 @@ class messenger
 		$headers[] = 'Return-Path: <' . $config['board_email'] . '>';
 		$headers[] = 'Sender: <' . $config['board_email'] . '>';
 		$headers[] = 'MIME-Version: 1.0';
-		$headers[] = 'Message-ID: <' . md5(unique_id(time())) . '@' . $config['server_name'] . '>';
+		$headers[] = 'Message-ID: <' . $this->generate_message_id() . '>';
 		$headers[] = 'Date: ' . date('r', time());
 		$headers[] = 'Content-Type: text/plain; charset=UTF-8'; // format=flowed
 		$headers[] = 'Content-Transfer-Encoding: 8bit'; // 7bit
-- 
cgit v1.2.1


From c1b4cdb1883bb6771a303624ece131eb5c7f071d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 25 Feb 2013 15:57:21 +0100
Subject: [ticket/10714] Update add_log docs block with @param and @deprecated

PHPBB3-10714
---
 phpBB/includes/functions.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 6f9d8ad8d6..d9116084fd 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3508,7 +3508,18 @@ function parse_cfg_file($filename, $lines = false)
 }
 
 /**
-* Add log event
+* Add log entry
+*
+* @param	string	$mode				The mode defines which log_type is used and from which log the entry is retrieved
+* @param	int		$forum_id			Mode 'mod' ONLY: forum id of the related item, NOT INCLUDED otherwise
+* @param	int		$topic_id			Mode 'mod' ONLY: topic id of the related item, NOT INCLUDED otherwise
+* @param	int		$reportee_id		Mode 'user' ONLY: user id of the reportee, NOT INCLUDED otherwise
+* @param	string	$log_operation		Name of the operation
+* @param	array	$additional_data	More arguments can be added, depending on the log_type
+*
+* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
+*
+* @deprecated	Use $phpbb_log->add() instead
 */
 function add_log()
 {
-- 
cgit v1.2.1


From 12cc64e715cd87af0195e0abc0974eaab459107d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 25 Feb 2013 19:01:35 +0100
Subject: [ticket/10411] Ensure we only get services that do exist

PHPBB3-10411
---
 phpBB/includes/acp/acp_groups.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 81ae567a8c..fc31105685 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -829,7 +829,7 @@ class acp_groups
 			// Invalid mode
 			trigger_error($user->lang['NO_MODE'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
-		else if ($field)
+		else if ($field && in_array($field, array('legend', 'teampage')))
 		{
 
 			$group_position = $phpbb_container->get('groupposition.' . $field);
-- 
cgit v1.2.1


From 9ea48dbd45aaa7d239998910feddcc827aaaafe9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 25 Feb 2013 20:24:11 +0100
Subject: [ticket/10411] Use template loops instead of defining the html in php
 files

PHPBB3-10411
---
 phpBB/includes/acp/acp_groups.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index fc31105685..46b5a0fa4a 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -916,7 +916,7 @@ class acp_groups
 			{
 				$template->assign_block_vars('legend', array(
 					'GROUP_NAME'	=> $group_name,
-					'GROUP_COLOUR'	=> ($row['group_colour']) ? ' style="color: #' . $row['group_colour'] . '"' : '',
+					'GROUP_COLOUR'	=> ($row['group_colour']) ? '#' . $row['group_colour'] : '',
 					'GROUP_TYPE'	=> $user->lang[phpbb_groupposition_legend::group_type_language($row['group_type'])],
 
 					'U_MOVE_DOWN'	=> "{$this->u_action}&amp;field=legend&amp;action=move_down&amp;g=" . $row['group_id'],
@@ -926,7 +926,11 @@ class acp_groups
 			}
 			else
 			{
-				$s_group_select_legend .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . (int) $row['group_id'] . '">' . $group_name . '</option>';
+				$template->assign_block_vars('add_legend', array(
+					'GROUP_ID'		=> (int) $row['group_id'],
+					'GROUP_NAME'	=> $group_name,
+					'GROUP_SPECIAL'	=> ($row['group_type'] == GROUP_SPECIAL),
+				));
 			}
 		}
 		$db->sql_freeresult($result);
@@ -966,7 +970,7 @@ class acp_groups
 
 			$template->assign_block_vars('teampage', array(
 				'GROUP_NAME'	=> $group_name,
-				'GROUP_COLOUR'	=> ($row['group_colour']) ? ' style="color: #' . $row['group_colour'] . '"' : '',
+				'GROUP_COLOUR'	=> ($row['group_colour']) ? '#' . $row['group_colour'] : '',
 				'GROUP_TYPE'	=> $group_type,
 
 				'U_CATEGORY'	=> (!$row['group_id']) ? "{$this->u_action}&amp;c=" . $row['teampage_id'] : '',
@@ -989,7 +993,11 @@ class acp_groups
 		while ($row = $db->sql_fetchrow($result))
 		{
 			$group_name = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
-			$s_group_select_teampage .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . (int) $row['group_id'] . '">' . $group_name . '</option>';
+			$template->assign_block_vars('add_teampage', array(
+				'GROUP_ID'		=> (int) $row['group_id'],
+				'GROUP_NAME'	=> $group_name,
+				'GROUP_SPECIAL'	=> ($row['group_type'] == GROUP_SPECIAL),
+			));
 		}
 		$db->sql_freeresult($result);
 
@@ -999,8 +1007,6 @@ class acp_groups
 			'U_ACTION_TEAMPAGE'			=> $this->u_action . '&amp;field=teampage' . $category_url_param,
 			'U_ACTION_TEAMPAGE_CAT'		=> $this->u_action . '&amp;field=teampage_cat',
 
-			'S_GROUP_SELECT_LEGEND'		=> $s_group_select_legend,
-			'S_GROUP_SELECT_TEAMPAGE'	=> $s_group_select_teampage,
 			'S_TEAMPAGE_CATEGORY'		=> $category_id,
 			'DISPLAY_FORUMS'			=> ($config['teampage_forums']) ? true : false,
 			'DISPLAY_MEMBERSHIPS'		=> $config['teampage_memberships'],
-- 
cgit v1.2.1


From b0dc5925b91cb0447046e8a7f089c6675e4be95c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 25 Feb 2013 20:29:04 +0100
Subject: [ticket/10411] Fix typehinting and change private to protected

PHPBB3-10411
---
 phpBB/includes/groupposition/legend.php   | 14 +++++++-------
 phpBB/includes/groupposition/teampage.php | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/groupposition/legend.php b/phpBB/includes/groupposition/legend.php
index 4dcf31ff06..51f2510e85 100644
--- a/phpBB/includes/groupposition/legend.php
+++ b/phpBB/includes/groupposition/legend.php
@@ -32,28 +32,28 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 
 	/**
 	* Database object
-	* @var dbal
+	* @var phpbb_db_driver
 	*/
-	private $db = null;
+	protected $db;
 
 	/**
 	* User object
 	* @var phpbb_user
 	*/
-	private $user = null;
+	protected $user;
 
 	/**
 	* URI for the adm_back_link when there was an error.
 	*/
-	private $adm_back_link = '';
+	protected $adm_back_link = '';
 
 	/**
 	* Constructor
 	*
-	* @param dbal		$db		Database object
-	* @param phpbb_user	$user	User object
+	* @param phpbb_db_driver	$db		Database object
+	* @param phpbb_user			$user	User object
 	*/
-	public function __construct(dbal $db, phpbb_user $user)
+	public function __construct(phpbb_db_driver $db, phpbb_user $user)
 	{
 		$this->db = $db;
 		$this->user = $user;
diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/includes/groupposition/teampage.php
index 2c488dd8a9..f13e171134 100644
--- a/phpBB/includes/groupposition/teampage.php
+++ b/phpBB/includes/groupposition/teampage.php
@@ -36,35 +36,35 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 
 	/**
 	* Database object
-	* @var dbal
+	* @var phpbb_db_driver
 	*/
-	private $db = null;
+	protected $db;
 
 	/**
 	* User object
 	* @var phpbb_user
 	*/
-	private $user = null;
+	protected $user;
 
 	/**
 	* Cache object
 	* @var phpbb_cache_driver_interface
 	*/
-	private $cache = null;
+	protected $cache;
 
 	/**
 	* URI for the adm_back_link when there was an error.
 	*/
-	private $adm_back_link = '';
+	protected $adm_back_link = '';
 
 	/**
 	* Constructor
 	*
-	* @param dbal							$db		Database object
+	* @param phpbb_db_driver				$db		Database object
 	* @param phpbb_user						$user	User object
 	* @param phpbb_cache_driver_interface	$cache	Cache object
 	*/
-	public function __construct(dbal $db, phpbb_user $user, phpbb_cache_driver_interface $cache)
+	public function __construct(phpbb_db_driver $db, phpbb_user $user, phpbb_cache_driver_interface $cache)
 	{
 		$this->db = $db;
 		$this->user = $user;
-- 
cgit v1.2.1


From 1d7b082a6fa05d5760ef15ef8bf78cd3a1d204cf Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 25 Feb 2013 20:58:12 +0100
Subject: [ticket/10411] Add return value to move functions

PHPBB3-10411
---
 phpBB/includes/groupposition/interface.php |  6 ++---
 phpBB/includes/groupposition/legend.php    | 15 +++++++++----
 phpBB/includes/groupposition/teampage.php  | 36 +++++++++++++++++++++---------
 3 files changed, 39 insertions(+), 18 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/groupposition/interface.php b/phpBB/includes/groupposition/interface.php
index 749ad61071..6fb16134e0 100644
--- a/phpBB/includes/groupposition/interface.php
+++ b/phpBB/includes/groupposition/interface.php
@@ -59,7 +59,7 @@ interface phpbb_groupposition_interface
 	* Moves a group up by group_id
 	*
 	* @param	int		$group_id	group_id of the group to be moved
-	* @return	null
+	* @return	bool		True if the group was moved successfully
 	*/
 	public function move_up($group_id);
 
@@ -67,7 +67,7 @@ interface phpbb_groupposition_interface
 	* Moves a group down by group_id
 	*
 	* @param	int		$group_id	group_id of the group to be moved
-	* @return	null
+	* @return	bool		True if the group was moved successfully
 	*/
 	public function move_down($group_id);
 
@@ -78,7 +78,7 @@ interface phpbb_groupposition_interface
 	* @param	int		$delta		number of steps:
 	*								- positive = move up
 	*								- negative = move down
-	* @return	null
+	* @return	bool		True if the group was moved successfully
 	*/
 	public function move($group_id, $delta);
 }
diff --git a/phpBB/includes/groupposition/legend.php b/phpBB/includes/groupposition/legend.php
index 51f2510e85..9b69f9d2b3 100644
--- a/phpBB/includes/groupposition/legend.php
+++ b/phpBB/includes/groupposition/legend.php
@@ -168,7 +168,7 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 	*/
 	public function move_up($group_id)
 	{
-		$this->move($group_id, 1);
+		return $this->move($group_id, 1);
 	}
 
 	/**
@@ -178,7 +178,7 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 	*/
 	public function move_down($group_id)
 	{
-		$this->move($group_id, -1);
+		return $this->move($group_id, -1);
 	}
 
 	/**
@@ -188,9 +188,10 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 	*/
 	public function move($group_id, $delta)
 	{
-		if (!is_int($delta) || !$delta)
+		$delta = (int) $delta;
+		if (!$delta)
 		{
-			return;
+			return false;
 		}
 
 		$move_up = ($delta > 0) ? true : false;
@@ -221,10 +222,16 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 					SET group_legend = group_legend ' . (($move_up) ? ' - ' : ' + ') . $delta . '
 					WHERE group_id = ' . (int) $group_id;
 				$this->db->sql_query($sql);
+
+				$this->db->sql_transaction('commit');
+
+				return true;
 			}
 
 			$this->db->sql_transaction('commit');
 		}
+
+		return false;
 	}
 
 	/**
diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/includes/groupposition/teampage.php
index f13e171134..cbdf06ebaf 100644
--- a/phpBB/includes/groupposition/teampage.php
+++ b/phpBB/includes/groupposition/teampage.php
@@ -359,18 +359,18 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	*/
 	public function move_up($group_id)
 	{
-		$this->move($group_id, 1);
+		return $this->move($group_id, 1);
 	}
 
 	/**
 	* Moves an item up by teampage_id
 	*
 	* @param	int		$group_id	group_id of the group to be moved
-	* @return	null
+	* @return	bool		True if the group was moved successfully
 	*/
 	public function move_up_teampage($teampage_id)
 	{
-		$this->move_teampage($teampage_id, 1);
+		return $this->move_teampage($teampage_id, 1);
 	}
 
 	/**
@@ -380,18 +380,18 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	*/
 	public function move_down($group_id)
 	{
-		$this->move($group_id, -1);
+		return $this->move($group_id, -1);
 	}
 
 	/**
 	* Movesan item down by teampage_id
 	*
 	* @param	int		$group_id	group_id of the group to be moved
-	* @return	null
+	* @return	bool		True if the group was moved successfully
 	*/
 	public function move_down_teampage($teampage_id)
 	{
-		$this->move_teampage($teampage_id, -1);
+		return $this->move_teampage($teampage_id, -1);
 	}
 
 	/**
@@ -401,9 +401,10 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	*/
 	public function move($group_id, $delta)
 	{
-		if (!is_int($delta) || !$delta)
+		$delta = (int) $delta;
+		if (!$delta)
 		{
-			return;
+			return false;
 		}
 
 		$move_up = ($delta > 0) ? true : false;
@@ -463,12 +464,18 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 					SET teampage_position = teampage_position ' . (($move_up) ? ' - ' : ' + ') . abs($delta) . '
 					WHERE group_id = ' . (int) $group_id;
 				$this->db->sql_query($sql);
+
+				$this->db->sql_transaction('commit');
+				$this->cache->destroy('sql', TEAMPAGE_TABLE);
+
+				return true;
 			}
 
 			$this->db->sql_transaction('commit');
 		}
 
 		$this->cache->destroy('sql', TEAMPAGE_TABLE);
+		return false;
 	}
 
 	/**
@@ -478,13 +485,14 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	* @param	int		$delta		number of steps:
 	*								- positive = move up
 	*								- negative = move down
-	* @return	null
+	* @return	bool		True if the group was moved successfully
 	*/
 	public function move_teampage($teampage_id, $delta)
 	{
-		if (!is_int($delta) || !$delta)
+		$delta = (int) $delta;
+		if (!$delta)
 		{
-			return;
+			return false;
 		}
 
 		$move_up = ($delta > 0) ? true : false;
@@ -559,12 +567,18 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 					WHERE teampage_id = ' . (int) $teampage_id . '
 						OR teampage_parent = ' . (int) $teampage_id;
 				$this->db->sql_query($sql);
+
+				$this->db->sql_transaction('commit');
+				$this->cache->destroy('sql', TEAMPAGE_TABLE);
+
+				return true;
 			}
 
 			$this->db->sql_transaction('commit');
 		}
 
 		$this->cache->destroy('sql', TEAMPAGE_TABLE);
+		return false;
 	}
 
 	/**
-- 
cgit v1.2.1


From 41eea66da975a3b4140d8f4dc3f6931ea84916db Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 25 Feb 2013 21:24:52 +0100
Subject: [ticket/10411] Add return values to add/delete function

PHPBB3-10411
---
 phpBB/includes/groupposition/interface.php |  4 ++--
 phpBB/includes/groupposition/legend.php    |  7 +++++++
 phpBB/includes/groupposition/teampage.php  | 23 ++++++++++++++++++-----
 3 files changed, 27 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/groupposition/interface.php b/phpBB/includes/groupposition/interface.php
index 6fb16134e0..eacc04e1a4 100644
--- a/phpBB/includes/groupposition/interface.php
+++ b/phpBB/includes/groupposition/interface.php
@@ -42,7 +42,7 @@ interface phpbb_groupposition_interface
 	* Addes a group by group_id
 	*
 	* @param	int		$group_id	group_id of the group to be added
-	* @return	null
+	* @return	bool		True if the group was added successfully
 	*/
 	public function add_group($group_id);
 
@@ -51,7 +51,7 @@ interface phpbb_groupposition_interface
 	*
 	* @param	int		$group_id		group_id of the group to be deleted
 	* @param	bool	$skip_group		Skip setting the value for this group, to save the query, when you need to update it anyway.
-	* @return	null
+	* @return	bool		True if the group was deleted successfully
 	*/
 	public function delete_group($group_id, $skip_group = false);
 
diff --git a/phpBB/includes/groupposition/legend.php b/phpBB/includes/groupposition/legend.php
index 9b69f9d2b3..8f115a8b1e 100644
--- a/phpBB/includes/groupposition/legend.php
+++ b/phpBB/includes/groupposition/legend.php
@@ -128,7 +128,10 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 				WHERE group_legend = ' . self::GROUP_DISABLED . '
 					AND group_id = ' . (int) $group_id;
 			$this->db->sql_query($sql);
+			return true;
 		}
+
+		return false;
 	}
 
 	/**
@@ -158,7 +161,11 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 			}
 
 			$this->db->sql_transaction('commit');
+
+			return true;
 		}
+
+		return false;
 	}
 
 	/**
diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/includes/groupposition/teampage.php
index cbdf06ebaf..3be8ef2774 100644
--- a/phpBB/includes/groupposition/teampage.php
+++ b/phpBB/includes/groupposition/teampage.php
@@ -207,7 +207,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	*/
 	public function add_group($group_id)
 	{
-		$this->add_group_teampage($group_id, self::NO_PARENT);
+		return $this->add_group_teampage($group_id, self::NO_PARENT);
 	}
 
 	/**
@@ -215,7 +215,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	*
 	* @param	int		$group_id	group_id of the group to be added
 	* @param	int		$parent_id	Teampage ID of the parent item
-	* @return	null
+	* @return	bool		True if the group was added successfully
 	*/
 	public function add_group_teampage($group_id, $parent_id)
 	{
@@ -266,22 +266,26 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 
 			$sql = 'INSERT INTO ' . TEAMPAGE_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
 			$this->db->sql_query($sql);
+
+			$this->cache->destroy('sql', TEAMPAGE_TABLE);
+			return true;
 		}
 
 		$this->cache->destroy('sql', TEAMPAGE_TABLE);
+		return false;
 	}
 
 	/**
 	* Adds a new category
 	*
 	* @param	string	$category_name	Name of the category to be added
-	* @return	null
+	* @return	bool		True if the category was added successfully
 	*/
 	public function add_category_teampage($category_name)
 	{
 		if ($category_name === '')
 		{
-			return;
+			return false;
 		}
 
 		$num_entries = $this->get_group_count();
@@ -297,6 +301,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		$this->db->sql_query($sql);
 
 		$this->cache->destroy('sql', TEAMPAGE_TABLE);
+		return true;
 	}
 
 	/**
@@ -318,9 +323,13 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 			$sql = 'DELETE FROM ' . TEAMPAGE_TABLE . '
 				WHERE group_id = ' . $group_id;
 			$this->db->sql_query($sql);
+
+			$this->cache->destroy('sql', TEAMPAGE_TABLE);
+			return true;
 		}
 
 		$this->cache->destroy('sql', TEAMPAGE_TABLE);
+		return false;
 	}
 
 	/**
@@ -328,7 +337,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	*
 	* @param	int		$teampage_id	teampage_id of the item to be deleted
 	* @param	bool	$skip_group		Skip setting the group to GROUP_DISABLED, to save the query, when you need to update it anyway.
-	* @return	null
+	* @return	bool		True if the item was deleted successfully
 	*/
 	public function delete_teampage($teampage_id, $skip_group = false)
 	{
@@ -347,9 +356,13 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 				SET teampage_position = teampage_position - ' . $delta . '
 				WHERE teampage_position > ' . $current_value;
 			$this->db->sql_query($sql);
+
+			$this->cache->destroy('sql', TEAMPAGE_TABLE);
+			return true;
 		}
 
 		$this->cache->destroy('sql', TEAMPAGE_TABLE);
+		return false;
 	}
 
 	/**
-- 
cgit v1.2.1


From 6045aa7aa2fb63358e3f736504b17533b1085712 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 25 Feb 2013 19:16:29 -0600
Subject: [ticket/11367] Migrator throws error if migrations table does not
 exist

Force load_migration_state to not throw errors if the table does not exist.

PHPBB3-11367
---
 phpBB/includes/db/migrator.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 41d996b1e3..ea5de3372f 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -99,18 +99,26 @@ class phpbb_db_migrator
 	{
 		$this->migration_state = array();
 
+		// prevent errors in case the table does not exist yet
+		$this->db->sql_return_on_error(true);
+
 		$sql = "SELECT *
 			FROM " . $this->migrations_table;
 		$result = $this->db->sql_query($sql);
 
-		while ($migration = $this->db->sql_fetchrow($result))
+		if (!$this->db->sql_error_triggered)
 		{
-			$this->migration_state[$migration['migration_name']] = $migration;
+			while ($migration = $this->db->sql_fetchrow($result))
+			{
+				$this->migration_state[$migration['migration_name']] = $migration;
+
+				$this->migration_state[$migration['migration_name']]['migration_depends_on'] = unserialize($migration['migration_depends_on']);
+			}
 
-			$this->migration_state[$migration['migration_name']]['migration_depends_on'] = unserialize($migration['migration_depends_on']);
+			$this->db->sql_freeresult($result);
 		}
 
-		$this->db->sql_freeresult($result);
+		$this->db->sql_return_on_error(false);
 	}
 
 	/**
-- 
cgit v1.2.1


From e0df5934485df0eee22141d1c5ded3e432119b20 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 26 Feb 2013 16:52:53 +0100
Subject: [ticket/10411] Throw exceptions instead of using trigger_error()

PHPBB3-10411
---
 phpBB/includes/groupposition/exception.php | 23 +++++++++++++++++++++
 phpBB/includes/groupposition/legend.php    | 27 +-----------------------
 phpBB/includes/groupposition/teampage.php  | 33 ++++--------------------------
 3 files changed, 28 insertions(+), 55 deletions(-)
 create mode 100644 phpBB/includes/groupposition/exception.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/groupposition/exception.php b/phpBB/includes/groupposition/exception.php
new file mode 100644
index 0000000000..e4ff09c703
--- /dev/null
+++ b/phpBB/includes/groupposition/exception.php
@@ -0,0 +1,23 @@
+<?php
+/**
+*
+* @package groupposition
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* @package groupposition
+*/
+class phpbb_groupposition_exception extends \Exception
+{
+}
diff --git a/phpBB/includes/groupposition/legend.php b/phpBB/includes/groupposition/legend.php
index 8f115a8b1e..7fddadde99 100644
--- a/phpBB/includes/groupposition/legend.php
+++ b/phpBB/includes/groupposition/legend.php
@@ -42,11 +42,6 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 	*/
 	protected $user;
 
-	/**
-	* URI for the adm_back_link when there was an error.
-	*/
-	protected $adm_back_link = '';
-
 	/**
 	* Constructor
 	*
@@ -59,16 +54,6 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 		$this->user = $user;
 	}
 
-	/**
-	* Set the back link for error messages
-	*
-	* @param string		$adm_back_link	Return URL to use after an error occured
-	*/
-	public function set_admin_back_link($adm_back_link)
-	{
-		$this->adm_back_link = $adm_back_link;
-	}
-
 	/**
 	* Returns the group_legend for a given group, if the group exists.
 	*
@@ -86,7 +71,7 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 		if ($current_value === false)
 		{
 			// Group not found.
-			$this->error('NO_GROUP');
+			throw new phpbb_groupposition_exception('NO_GROUP');
 		}
 
 		return (int) $current_value;
@@ -241,16 +226,6 @@ class phpbb_groupposition_legend implements phpbb_groupposition_interface
 		return false;
 	}
 
-	/**
-	* Error
-	*
-	* {@inheritDoc}
-	*/
-	private function error($message)
-	{
-		trigger_error($this->user->lang[$message] . (($this->adm_back_link) ? adm_back_link($this->adm_back_link) : ''), E_USER_WARNING);
-	}
-
 	/**
 	* Get group type language var
 	*
diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/includes/groupposition/teampage.php
index 3be8ef2774..7c758199e7 100644
--- a/phpBB/includes/groupposition/teampage.php
+++ b/phpBB/includes/groupposition/teampage.php
@@ -52,11 +52,6 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 	*/
 	protected $cache;
 
-	/**
-	* URI for the adm_back_link when there was an error.
-	*/
-	protected $adm_back_link = '';
-
 	/**
 	* Constructor
 	*
@@ -71,16 +66,6 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		$this->cache = $cache;
 	}
 
-	/**
-	* Set the back link for error messages
-	*
-	* @param string		$adm_back_link	Return URL to use after an error occured
-	*/
-	public function set_admin_back_link($adm_back_link)
-	{
-		$this->adm_back_link = $adm_back_link;
-	}
-
 	/**
 	* Returns the teampage position for a given group, if the group exists.
 	*
@@ -101,7 +86,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		if ($row === false)
 		{
 			// Group not found.
-			$this->error('NO_GROUP');
+			throw new phpbb_groupposition_exception('NO_GROUP');
 		}
 
 		return (int) $row['teampage_position'];
@@ -128,7 +113,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		if ($row === false)
 		{
 			// Group not found.
-			$this->error('NO_GROUP');
+			throw new phpbb_groupposition_exception('NO_GROUP');
 		}
 
 		return $row;
@@ -152,7 +137,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		if ($current_value === false)
 		{
 			// Group not found.
-			$this->error('NO_GROUP');
+			throw new phpbb_groupposition_exception('NO_GROUP');
 		}
 
 		return (int) $current_value;
@@ -176,7 +161,7 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		if ($row === false)
 		{
 			// Group not found.
-			$this->error('NO_GROUP');
+			throw new phpbb_groupposition_exception('NO_GROUP');
 		}
 
 		return $row;
@@ -594,16 +579,6 @@ class phpbb_groupposition_teampage implements phpbb_groupposition_interface
 		return false;
 	}
 
-	/**
-	* Error
-	*
-	* {@inheritDoc}
-	*/
-	private function error($message)
-	{
-		trigger_error($this->user->lang[$message] . (($this->adm_back_link) ? adm_back_link($this->adm_back_link) : ''), E_USER_WARNING);
-	}
-
 	/**
 	* Get group type language var
 	*
-- 
cgit v1.2.1


From 9e70f7a4e0e419984ad5dd0392857ecd810ad252 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 26 Feb 2013 16:53:51 +0100
Subject: [ticket/10411] Catch exceptions from grouppositions

PHPBB3-10411
---
 phpBB/includes/acp/acp_groups.php | 73 ++++++++++++++++++++--------------
 phpBB/includes/functions_user.php | 84 ++++++++++++++++++++++++++++++---------
 2 files changed, 108 insertions(+), 49 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 805fc28520..17145508aa 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -851,53 +851,66 @@ class acp_groups
 		{
 
 			$group_position = $phpbb_container->get('groupposition.' . $field);
-			$group_position->set_admin_back_link($this->u_action);
 		}
 
 		if ($field == 'teampage')
 		{
-			switch ($action)
+			try
 			{
-				case 'add':
-					$group_position->add_group_teampage($group_id, $category_id);
-				break;
+				switch ($action)
+				{
+					case 'add':
+						$group_position->add_group_teampage($group_id, $category_id);
+					break;
 
-				case 'add_category':
-					$group_position->add_category_teampage($request->variable('category_name', '', true));
-				break;
+					case 'add_category':
+						$group_position->add_category_teampage($request->variable('category_name', '', true));
+					break;
 
-				case 'delete':
-					$group_position->delete_teampage($teampage_id);
-				break;
+					case 'delete':
+						$group_position->delete_teampage($teampage_id);
+					break;
 
-				case 'move_up':
-					$group_position->move_up_teampage($teampage_id);
-				break;
+					case 'move_up':
+						$group_position->move_up_teampage($teampage_id);
+					break;
 
-				case 'move_down':
-					$group_position->move_down_teampage($teampage_id);
-				break;
+					case 'move_down':
+						$group_position->move_down_teampage($teampage_id);
+					break;
+				}
+			}
+			catch (phpbb_groupposition_exception $exception)
+			{
+				trigger_error($user->lang($exception->getMessage()) . adm_back_link($this->u_action), E_USER_WARNING);
 			}
 		}
 		else if ($field == 'legend')
 		{
-			switch ($action)
+			try
 			{
-				case 'add':
-					$group_position->add_group($group_id);
-				break;
+				switch ($action)
+				{
+					case 'add':
+						$group_position->add_group($group_id);
+					break;
 
-				case 'delete':
-					$group_position->delete_group($group_id);
-				break;
+					case 'delete':
+						$group_position->delete_group($group_id);
+					break;
 
-				case 'move_up':
-					$group_position->move_up($group_id);
-				break;
+					case 'move_up':
+						$group_position->move_up($group_id);
+					break;
 
-				case 'move_down':
-					$group_position->move_down($group_id);
-				break;
+					case 'move_down':
+						$group_position->move_down($group_id);
+					break;
+				}
+			}
+			catch (phpbb_groupposition_exception $exception)
+			{
+				trigger_error($user->lang($exception->getMessage()) . adm_back_link($this->u_action), E_USER_WARNING);
 			}
 		}
 		else
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 379abe4d42..cae83bf203 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2606,8 +2606,15 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 		$teampage = $phpbb_container->get('groupposition.teampage');
 		if ($group_id)
 		{
-			$current_legend = $legend->get_group_value($group_id);
-			$current_teampage = $teampage->get_group_value($group_id);
+			try
+			{
+				$current_legend = $legend->get_group_value($group_id);
+				$current_teampage = $teampage->get_group_value($group_id);
+			}
+			catch (phpbb_groupposition_exception $exception)
+			{
+				trigger_error($user->lang($exception->getMessage()));
+			}
 		}
 
 		if (!empty($group_attributes['group_legend']))
@@ -2626,7 +2633,14 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 		else if ($group_id && ($current_legend != phpbb_groupposition_legend::GROUP_DISABLED))
 		{
 			// Group is removed from the legend
-			$legend->delete_group($group_id, true);
+			try
+			{
+				$legend->delete_group($group_id, true);
+			}
+			catch (phpbb_groupposition_exception $exception)
+			{
+				trigger_error($user->lang($exception->getMessage()));
+			}
 			$group_attributes['group_legend'] = phpbb_groupposition_legend::GROUP_DISABLED;
 		}
 		else
@@ -2733,7 +2747,14 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 		// which is currently displayed.
 		if (!$group_teampage && $group_id && $current_teampage != phpbb_groupposition_teampage::GROUP_DISABLED)
 		{
-			$teampage->delete_group($group_id);
+			try
+			{
+				$teampage->delete_group($group_id);
+			}
+			catch (phpbb_groupposition_exception $exception)
+			{
+				trigger_error($user->lang($exception->getMessage()));
+			}
 		}
 
 		if (!$group_id)
@@ -2746,21 +2767,28 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 			}
 		}
 
-		if ($group_teampage && $current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED)
-		{
-			$teampage->add_group($group_id);
-		}
-
-		if ($group_teampage)
+		try
 		{
-			if ($current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED)
+			if ($group_teampage && $current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED)
 			{
 				$teampage->add_group($group_id);
 			}
+
+			if ($group_teampage)
+			{
+				if ($current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED)
+				{
+					$teampage->add_group($group_id);
+				}
+			}
+			else if ($group_id && ($current_teampage != phpbb_groupposition_teampage::GROUP_DISABLED))
+			{
+				$teampage->delete_group($group_id);
+			}
 		}
-		else if ($group_id && ($current_teampage != phpbb_groupposition_teampage::GROUP_DISABLED))
+		catch (phpbb_groupposition_exception $exception)
 		{
-			$teampage->delete_group($group_id);
+			trigger_error($user->lang($exception->getMessage()));
 		}
 		unset($teampage);
 
@@ -2887,13 +2915,31 @@ function group_delete($group_id, $group_name = false)
 	while ($start);
 
 	// Delete group from legend and teampage
-	$legend = $phpbb_container->get('groupposition.legend');
-	$legend->delete_group($group_id);
-	unset($legend);
+	try
+	{
+		$legend = $phpbb_container->get('groupposition.legend');
+		$legend->delete_group($group_id);
+		unset($legend);
+	}
+	catch (phpbb_groupposition_exception $exception)
+	{
+		// The group we want to delete does not exist.
+		// No reason to worry, we just continue the deleting process.
+		//trigger_error($user->lang($exception->getMessage()));
+	}
 
-	$teampage = $phpbb_container->get('groupposition.teampage');
-	$teampage->delete_group($group_id);
-	unset($teampage);
+	try
+	{
+		$teampage = $phpbb_container->get('groupposition.teampage');
+		$teampage->delete_group($group_id);
+		unset($teampage);
+	}
+	catch (phpbb_groupposition_exception $exception)
+	{
+		// The group we want to delete does not exist.
+		// No reason to worry, we just continue the deleting process.
+		//trigger_error($user->lang($exception->getMessage()));
+	}
 
 	// Delete group
 	$sql = 'DELETE FROM ' . GROUPS_TABLE . "
-- 
cgit v1.2.1


From 9a319fefb2ffed58da1d3339d59e53de09521e03 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 26 Feb 2013 10:22:13 -0600
Subject: [ticket/11367] Always freeresult

PHPBB3-11367
---
 phpBB/includes/db/migrator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index ea5de3372f..74f71775f3 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -114,10 +114,10 @@ class phpbb_db_migrator
 
 				$this->migration_state[$migration['migration_name']]['migration_depends_on'] = unserialize($migration['migration_depends_on']);
 			}
-
-			$this->db->sql_freeresult($result);
 		}
 
+		$this->db->sql_freeresult($result);
+
 		$this->db->sql_return_on_error(false);
 	}
 
-- 
cgit v1.2.1


From 1ebb17c698ce17147abec0af5048ac522014cf45 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 26 Feb 2013 21:43:39 +0100
Subject: [ticket/11323] Reduce additional code and revert regex to previous
 one

PHPBB3-11323
---
 phpBB/includes/template/filter.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 93bacd9c1e..9e8ad2fef0 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -830,11 +830,10 @@ class phpbb_template_filter extends php_user_filter
 	*/
 	private function compile_tag_define($tag_args, $op)
 	{
-		$add_quote = true;
 		$match = array();
-		preg_match('#^((?:' . self::REGEX_NS . '\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
+		preg_match('#^((?:' . self::REGEX_NS . '\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (.*?))?$#', $tag_args, $match);
 
-		if (empty($match[2]) || (!isset($match[4]) && $op))
+		if (empty($match[2]) || (!isset($match[3]) && $op))
 		{
 			return '';
 		}
@@ -844,12 +843,18 @@ class phpbb_template_filter extends php_user_filter
 			return 'unset(' . (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ');';
 		}
 
-		if ($match[3] && $match[5] && substr($match[4], 0, 1) == '{' && substr($match[4], -1, 1) == '}')
+		/*
+		* Define tags that contain template variables (enclosed in curly brackets)
+		* need to be treated differently.
+		*/
+		if (substr($match[3], 1, 1) == '{' && substr($match[3], -2, 1) == '}')
+		{
+			$parsed_statement = implode(' ', $this->compile_expression(substr($match[3], 2, -2)));
+		}
+		else
 		{
-			$match[4] = substr($match[4], 1, -1);
-			$add_quote = false;
+			$parsed_statement = implode(' ', $this->compile_expression($match[3]));
 		}
-		$parsed_statement = ($add_quote) ? "'" . implode(' ', $this->compile_expression($match[4])) . "'" : implode(' ', $this->compile_expression($match[4]));
 
 		return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $parsed_statement . ';';
 	}
-- 
cgit v1.2.1


From f9cbf5b4c7ea4f4eb1438d98ccc1cb71b0fea2af Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 26 Feb 2013 19:25:51 -0600
Subject: [ticket/11369] Reverting migration throws error

String is attempted to be unserialized

PHPBB3-11369
---
 phpBB/includes/db/migrator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 74f71775f3..d6bcae6ca6 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -434,7 +434,7 @@ class phpbb_db_migrator
 			}
 			else
 			{
-				$result = $this->process_data_step($migration->revert_data(), $state['migration_data_state'], false);
+				$result = $this->process_data_step($migration->revert_data(), '', false);
 
 				$state['migration_data_state'] = ($result === true) ? '' : $result;
 				$state['migration_data_done'] = ($result === true) ? false : true;
-- 
cgit v1.2.1


From 51651b3d9f8622a195d877bbcf106acd413aee03 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 26 Feb 2013 19:44:03 -0600
Subject: [ticket/11370] Effectively installed migrations not inserted into
 table

insert_migration() function now handles inserting/updating

Move all insert/update code to insert_migration() function to prevent this from occurring again.

PHPBB3-11370
---
 phpBB/includes/db/migrator.php | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 74f71775f3..691285d477 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -332,7 +332,6 @@ class phpbb_db_migrator
 			if (!isset($this->migration_state[$name]))
 			{
 				$state['migration_start_time'] = time();
-				$this->insert_migration($name, $state);
 			}
 		}
 
@@ -361,14 +360,7 @@ class phpbb_db_migrator
 			}
 		}
 
-		$insert = $state;
-		$insert['migration_depends_on'] = serialize($state['migration_depends_on']);
-		$sql = 'UPDATE ' . $this->migrations_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $insert) . "
-			WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
-		$this->db->sql_query($sql);
-
-		$this->migration_state[$name] = $state;
+		$this->insert_migration($name, $state);
 
 		return true;
 	}
@@ -440,14 +432,7 @@ class phpbb_db_migrator
 				$state['migration_data_done'] = ($result === true) ? false : true;
 			}
 
-			$insert = $state;
-			$insert['migration_depends_on'] = serialize($state['migration_depends_on']);
-			$sql = 'UPDATE ' . $this->migrations_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $insert) . "
-				WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
-			$this->db->sql_query($sql);
-
-			$this->migration_state[$name] = $state;
+			$this->insert_migration($name, $state);
 		}
 		else
 		{
@@ -660,7 +645,7 @@ class phpbb_db_migrator
 	}
 
 	/**
-	* Insert migration row into the database
+	* Insert/Update migration row into the database
 	*
 	* @param string $name Name of the migration
 	* @param array $state
@@ -669,12 +654,22 @@ class phpbb_db_migrator
 	protected function insert_migration($name, $state)
 	{
 		$migration_row = $state;
-		$migration_row['migration_name'] = $name;
 		$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);
 
-		$sql = 'INSERT INTO ' . $this->migrations_table . '
-			' . $this->db->sql_build_array('INSERT', $migration_row);
-		$this->db->sql_query($sql);
+		if (isset($this->migration_state[$name]))
+		{
+			$sql = 'UPDATE ' . $this->migrations_table . '
+				SET ' . $this->db->sql_build_array('UPDATE', $migration_row) . "
+				WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
+			$this->db->sql_query($sql);
+		}
+		else
+		{
+			$migration_row['migration_name'] = $name;
+			$sql = 'INSERT INTO ' . $this->migrations_table . '
+				' . $this->db->sql_build_array('INSERT', $migration_row);
+			$this->db->sql_query($sql);
+		}
 
 		$this->migration_state[$name] = $state;
 	}
-- 
cgit v1.2.1


From c6aabab03961cbfc3d96ef12e91fb65dbc367c16 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 26 Feb 2013 19:54:47 -0600
Subject: [ticket/11103] Notifications Migration file

PHPBB3-11103
---
 .../db/migration/data/310/notifications.php        | 160 +++++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 phpBB/includes/db/migration/data/310/notifications.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notifications.php b/phpBB/includes/db/migration/data/310/notifications.php
new file mode 100644
index 0000000000..6299ede7f7
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/notifications.php
@@ -0,0 +1,160 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_notifications extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return false;//!$this->db_tools->sql_table_exists($this->table_prefix . 'notifications');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_dev');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables'		=> array(
+				$this->table_prefix . 'notification_types'	=> array(
+					'COLUMNS'			=> array(
+						'notification_type'			=> array('VCHAR:255', ''),
+						'notification_type_enabled'	=> array('BOOL', 1),
+					),
+					'PRIMARY_KEY'		=> array('notification_type', 'notification_type_enabled'),
+				),
+				$this->table_prefix . 'notifications'		=> array(
+					'COLUMNS'			=> array(
+						'notification_id'  				=> array('UINT', NULL, 'auto_increment'),
+						'item_type'			   			=> array('VCHAR:255', ''),
+						'item_id'		  				=> array('UINT', 0),
+						'item_parent_id'   				=> array('UINT', 0),
+						'user_id'						=> array('UINT', 0),
+						'notification_read'				=> array('BOOL', 0),
+						'notification_time'				=> array('TIMESTAMP', 1),
+						'notification_data'			   	=> array('TEXT_UNI', ''),
+					),
+					'PRIMARY_KEY'		=> 'notification_id',
+					'KEYS'				=> array(
+						'item_ident'		=> array('INDEX', array('item_type', 'item_id')),
+						'user'				=> array('INDEX', array('user_id', 'notification_read')),
+					),
+				),
+				$this->table_prefix . 'user_notifications'	=> array(
+					'COLUMNS'			=> array(
+						'item_type'			=> array('VCHAR:255', ''),
+						'item_id'			=> array('UINT', 0),
+						'user_id'			=> array('UINT', 0),
+						'method'			=> array('VCHAR:255', ''),
+						'notify'			=> array('BOOL', 1),
+					),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'	=> array(
+				$this->table_prefix . 'notification_types',
+				$this->table_prefix . 'notifications',
+				$this->table_prefix . 'user_notifications',
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('module.add', array(
+				'ucp',
+				'UCP_MAIN',
+				array(
+					'module_basename'	=> 'ucp_notifications',
+					'modes'				=> array('notification_list'),
+				),
+			)),
+			array('module.add', array(
+				'ucp',
+				'UCP_PREFS',
+				array(
+					'module_basename'	=> 'ucp_notifications',
+					'modes'				=> array('notification_options'),
+				),
+			)),
+			array('config.add', array('load_notifications', 1)),
+			array('custom', array(array($this, 'convert_notifications'))),
+		);
+	}
+
+	public function convert_notifications()
+	{
+		$convert_notifications = array(
+			array(
+				'check'			=> ($this->config['allow_topic_notify']),
+				'item_type'		=> 'post',
+			),
+			array(
+				'check'			=> ($this->config['allow_forum_notify']),
+				'item_type'		=> 'topic',
+			),
+			array(
+				'check'			=> ($this->config['allow_bookmarks']),
+				'item_type'		=> 'bookmark',
+			),
+			array(
+				'check'			=> ($this->config['allow_privmsg']),
+				'item_type'		=> 'pm',
+			),
+		);
+
+		foreach ($convert_notifications as $convert_data)
+		{
+			if ($convert_data['check'])
+			{
+				$sql = 'SELECT user_id, user_notify_type
+					FROM ' . USERS_TABLE . '
+						WHERE user_notify = 1';
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
+						'item_type'		=> $convert_data['item_type'],
+						'item_id'		=> 0,
+						'user_id'		=> $row['user_id'],
+						'method'		=> '',
+					)));
+
+					if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
+					{
+						$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
+							'item_type'		=> $convert_data['item_type'],
+							'item_id'		=> 0,
+							'user_id'		=> $row['user_id'],
+							'method'		=> 'email',
+						)));
+					}
+
+					if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
+					{
+						$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
+							'item_type'		=> $convert_data['item_type'],
+							'item_id'		=> 0,
+							'user_id'		=> $row['user_id'],
+							'method'		=> 'jabber',
+						)));
+					}
+				}
+				$this->db->sql_freeresult($result);
+			}
+		}
+	}
+}
-- 
cgit v1.2.1


From d296e809d5e44eec0005ed8229d5a173cd4f6edb Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 27 Feb 2013 11:12:18 -0600
Subject: [ticket/11363] Load module info files for extensions too

Use the acp_modules::get_module_infos function instead of our own include code

PHPBB3-11363
---
 phpBB/includes/db/migration/tool/module.php | 45 +++++++----------------------
 1 file changed, 11 insertions(+), 34 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index 4d7fae2bb0..994768598c 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -183,25 +183,13 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			$basename = str_replace(array('/', '\\'), '', $basename);
 			$class = str_replace(array('/', '\\'), '', $class);
 
-			$include_path = ($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path;
-			$info_file = "$class/info/$basename.{$this->php_ext}";
-
-			// The manual and automatic ways both failed...
-			if (!file_exists($include_path . $info_file))
-			{
-				throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $info_file);
-			}
-
-			$classname = "{$basename}_info";
-
-			if (!class_exists($classname))
+			if (!class_exists('acp_modules'))
 			{
-				include($include_path . $info_file);
+				include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
 			}
-
-			$info = new $classname;
-			$module = $info->module();
-			unset($info);
+			$acp_modules = new acp_modules();
+			$module = $acp_modules->get_module_infos($basename, $class);
+			unset($acp_modules);
 
 			$result = '';
 			foreach ($module['modes'] as $mode => $module_info)
@@ -373,30 +361,19 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
 			$class = str_replace(array('/', '\\'), '', $class);
 
-			$include_path = ($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path;
-			$info_file = "$class/info/$basename.{$this->php_ext}";
-
-			if (!file_exists($include_path . $info_file))
-			{
-				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $info_file);
-			}
-
-			$classname = "{$basename}_info";
-
-			if (!class_exists($classname))
+			if (!class_exists('acp_modules'))
 			{
-				include($include_path . $info_file);
+				include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
 			}
-
-			$info = new $classname;
-			$module_info = $info->module();
-			unset($info);
+			$acp_modules = new acp_modules();
+			$module_info = $acp_modules->get_module_infos($basename, $class);
+			unset($acp_modules);
 
 			foreach ($module_info['modes'] as $mode => $info)
 			{
 				if (!isset($module['modes']) || in_array($mode, $module['modes']))
 				{
-					$this->remove($class, $parent, $info['title']) . '<br />';
+					$this->remove($class, $parent, $info['title']);
 				}
 			}
 		}
-- 
cgit v1.2.1


From 3362baca51bd82e6cc0d15625863e46506bece72 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 27 Feb 2013 19:27:30 +0100
Subject: [ticket/10411] Add migrations file for teampage table

PHPBB3-10411
---
 phpBB/includes/db/migration/data/310/teampage.php | 104 ++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 phpBB/includes/db/migration/data/310/teampage.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/teampage.php b/phpBB/includes/db/migration/data/310/teampage.php
new file mode 100644
index 0000000000..510ecf9481
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/teampage.php
@@ -0,0 +1,104 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_teampage extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'teampage');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_dev');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables'		=> array(
+				$this->table_prefix . 'teampage'	=> array(
+					'COLUMNS'		=> array(
+						'teampage_id'		=> array('UINT', NULL, 'auto_increment'),
+						'group_id'			=> array('UINT', 0),
+						'teampage_name'		=> array('VCHAR_UNI:255', ''),
+						'teampage_position'	=> array('UINT', 0),
+						'teampage_parent'	=> array('UINT', 0),
+					),
+					'PRIMARY_KEY'		=> 'teampage_id',
+				),
+			),
+			'drop_columns'		=> array(
+				$this->table_prefix . 'groups'		=> array(
+					'group_teampage',
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'		=> array(
+				$this->table_prefix . 'teampage',
+			),
+			'add_columns'		=> array(
+				$this->table_prefix . 'groups'		=> array(
+					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'add_groups_teampage'))),
+		);
+	}
+
+	public function add_groups_teampage()
+	{
+		$sql = 'SELECT teampage_id
+			FROM ' . TEAMPAGE_TABLE;
+		$result = $this->db->sql_query_limit($sql, 1);
+		$added_groups_teampage = (bool) $this->db->sql_fetchfield('teampage_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$added_groups_teampage)
+		{
+			$sql = 'SELECT *
+				FROM ' . GROUPS_TABLE . '
+				WHERE group_type = ' . GROUP_SPECIAL . "
+					AND (group_name = 'ADMINISTRATORS'
+						OR group_name = 'GLOBAL_MODERATORS')
+				ORDER BY group_name ASC";
+			$result = $this->db->sql_query($sql);
+
+			$teampage_entries = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$teampage_entries[] = array(
+					'group_id'			=> (int) $row['group_id'],
+					'teampage_name'		=> '',
+					'teampage_position'	=> sizeof($teampage_entries) + 1,
+					'teampage_parent'	=> 0,
+				);
+			}
+			$db->sql_freeresult($result);
+
+			if (sizeof($teampage_entries))
+			{
+				$this->db->sql_multi_insert(TEAMPAGE_TABLE, $teampage_entries);
+			}
+			unset($teampage_entries);
+		}
+
+	}
+}
-- 
cgit v1.2.1


From 9b554fbf3c9d1cb720fbd340bba552328790967f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 27 Feb 2013 13:52:45 -0600
Subject: [ticket/11372] Migrator should only check if effectively installed if
 not

installed at all

PHPBB3-11372
---
 phpBB/includes/db/migrator.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 74f71775f3..1ba65d71a6 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -316,20 +316,20 @@ class phpbb_db_migrator
 			'class'	=> $migration,
 		);
 
-		if ($migration->effectively_installed())
+		if (!isset($this->migration_state[$name]))
 		{
-			$state = array(
-				'migration_depends_on'	=> $migration->depends_on(),
-				'migration_schema_done' => true,
-				'migration_data_done'	=> true,
-				'migration_data_state'	=> '',
-				'migration_start_time'	=> 0,
-				'migration_end_time'	=> 0,
-			);
-		}
-		else
-		{
-			if (!isset($this->migration_state[$name]))
+			if ($migration->effectively_installed())
+			{
+				$state = array(
+					'migration_depends_on'	=> $migration->depends_on(),
+					'migration_schema_done' => true,
+					'migration_data_done'	=> true,
+					'migration_data_state'	=> '',
+					'migration_start_time'	=> 0,
+					'migration_end_time'	=> 0,
+				);
+			}
+			else
 			{
 				$state['migration_start_time'] = time();
 				$this->insert_migration($name, $state);
-- 
cgit v1.2.1


From c3434dec4020e1053f40382cdec729316f901728 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 27 Feb 2013 14:09:27 -0600
Subject: [ticket/11363] Fix a couple bugs and throw errors if the file not
 found

PHPBB3-11363
---
 phpBB/includes/db/migration/tool/module.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index 994768598c..8744866a16 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -189,8 +189,14 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			}
 			$acp_modules = new acp_modules();
 			$module = $acp_modules->get_module_infos($basename, $class);
+			$module = $module[$basename];
 			unset($acp_modules);
 
+			if (empty($module))
+			{
+				throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename);
+			}
+
 			$result = '';
 			foreach ($module['modes'] as $mode => $module_info)
 			{
@@ -367,8 +373,14 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			}
 			$acp_modules = new acp_modules();
 			$module_info = $acp_modules->get_module_infos($basename, $class);
+			$module_info = $module_info[$basename];
 			unset($acp_modules);
 
+			if (empty($module_info))
+			{
+				throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename);
+			}
+
 			foreach ($module_info['modes'] as $mode => $info)
 			{
 				if (!isset($module['modes']) || in_array($mode, $module['modes']))
-- 
cgit v1.2.1


From 247ecdf11bd404f4842a93afbf9c5dae9d541f55 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 28 Feb 2013 15:06:52 -0600
Subject: [ticket/11103] Fix effectively installed check

PHPBB3-11103
---
 phpBB/includes/db/migration/data/310/notifications.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notifications.php b/phpBB/includes/db/migration/data/310/notifications.php
index 6299ede7f7..82bfd4cb2d 100644
--- a/phpBB/includes/db/migration/data/310/notifications.php
+++ b/phpBB/includes/db/migration/data/310/notifications.php
@@ -11,7 +11,7 @@ class phpbb_db_migration_data_310_notifications extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return false;//!$this->db_tools->sql_table_exists($this->table_prefix . 'notifications');
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'notifications');
 	}
 
 	static public function depends_on()
-- 
cgit v1.2.1


From b41b1a36d1ee85abc05c22b443db7b10af077f7e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 28 Feb 2013 15:25:18 -0600
Subject: [ticket/11103] Case time in queries as an int

PHPBB3-11103
---
 phpBB/includes/notification/manager.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 5c1016335a..ff83d4bb37 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -254,7 +254,7 @@ class phpbb_notification_manager
 
 		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET notification_read = 1
-			WHERE notification_time <= " . $time .
+			WHERE notification_time <= " . (int) $time .
 				(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
 				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '');
 		$this->db->sql_query($sql);
@@ -285,7 +285,7 @@ class phpbb_notification_manager
 		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET notification_read = 1
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND notification_time <= " . $time .
+				AND notification_time <= " . (int) $time .
 				(($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') .
 				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
 		$this->db->sql_query($sql);
@@ -303,7 +303,7 @@ class phpbb_notification_manager
 
 		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET notification_read = 1
-			WHERE notification_time <= " . $time . '
+			WHERE notification_time <= " . (int) $time . '
 				AND ' . ((is_array($notification_id)) ? $this->db->sql_in_set('notification_id', $notification_id) : 'notification_id = ' . (int) $notification_id);
 		$this->db->sql_query($sql);
 	}
-- 
cgit v1.2.1


From ee264e723566eb96ab9d068d3da671778f49a4f2 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 28 Feb 2013 17:25:39 -0600
Subject: [ticket/11103] Don't call generate_board_url many times

Fix a URL and some comments

PHPBB3-11103
---
 phpBB/includes/notification/type/base.php        |  3 ++-
 phpBB/includes/notification/type/report_post.php |  2 +-
 phpBB/includes/notification/type/topic.php       | 10 ++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index f52f14c09e..600ef7c965 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -154,7 +154,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* Magic method to set data on this notification
 	* 
 	* @param mixed $name
-	* @return mixed
+	* @return null
 	*/
 	public function __set($name, $value)
 	{
@@ -191,6 +191,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*
 	* @param string $name Name of the variable to set
 	* @param mixed $value Value to set to the variable
+	* @return mixed
 	*/
 	protected function set_data($name, $value)
 	{
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
index 1ea532c929..de5c54a291 100644
--- a/phpBB/includes/notification/type/report_post.php
+++ b/phpBB/includes/notification/type/report_post.php
@@ -99,7 +99,7 @@ class phpbb_notification_type_report_post extends phpbb_notification_type_post_i
 			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
 			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
 
-			'U_VIEW_REPORT'				=> "{$board_url}mcp.{$this->php_ext}?f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports",
+			'U_VIEW_REPORT'				=> "{$board_url}/mcp.{$this->php_ext}?f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports",
 			'U_VIEW_POST'				=> "{$board_url}/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
 			'U_NEWEST_POST'				=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
 			'U_TOPIC'					=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 71e074fb50..2549b29409 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -170,6 +170,8 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 	*/
 	public function get_email_template_variables()
 	{
+		$board_url = generate_board_url();
+
 		if ($this->get_data('post_username'))
 		{
 			$username = $this->get_data('post_username');
@@ -184,10 +186,10 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 			'FORUM_NAME'				=> htmlspecialchars_decode($this->get_data('forum_name')),
 			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
 
-			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
-			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
-			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->item_parent_id}",
-			'U_STOP_WATCHING_FORUM'		=> generate_board_url() . "/viewforum.{$this->php_ext}?uid={$this->user_id}&f={$this->item_parent_id}&unwatch=forum",
+			'U_TOPIC'					=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
+			'U_VIEW_TOPIC'				=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
+			'U_FORUM'					=> "{$board_url}/viewforum.{$this->php_ext}?f={$this->item_parent_id}",
+			'U_STOP_WATCHING_FORUM'		=> "{$board_url}/viewforum.{$this->php_ext}?uid={$this->user_id}&f={$this->item_parent_id}&unwatch=forum",
 		);
 	}
 
-- 
cgit v1.2.1


From 19c3917de985d04f994bc22bcec1e814aa2e207c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 1 Mar 2013 12:46:55 +0100
Subject: [ticket/10411] Fix call to function on non-object $db->...()

PHPBB3-10411
---
 phpBB/includes/db/migration/data/310/teampage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/teampage.php b/phpBB/includes/db/migration/data/310/teampage.php
index 510ecf9481..4e77da17b7 100644
--- a/phpBB/includes/db/migration/data/310/teampage.php
+++ b/phpBB/includes/db/migration/data/310/teampage.php
@@ -82,7 +82,7 @@ class phpbb_db_migration_data_310_teampage extends phpbb_db_migration
 			$result = $this->db->sql_query($sql);
 
 			$teampage_entries = array();
-			while ($row = $db->sql_fetchrow($result))
+			while ($row = $this->db->sql_fetchrow($result))
 			{
 				$teampage_entries[] = array(
 					'group_id'			=> (int) $row['group_id'],
@@ -91,7 +91,7 @@ class phpbb_db_migration_data_310_teampage extends phpbb_db_migration
 					'teampage_parent'	=> 0,
 				);
 			}
-			$db->sql_freeresult($result);
+			$this->db->sql_freeresult($result);
 
 			if (sizeof($teampage_entries))
 			{
-- 
cgit v1.2.1


From e34f6a5269d7bd15b6b1357dc192893af8ec02e5 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 1 Mar 2013 11:37:24 -0600
Subject: [ticket/11381] Make finder able to search in all available extensions

PHPBB3-11381
---
 phpBB/includes/extension/finder.php              | 37 +++++++++++++++++-------
 phpBB/includes/style/extension_path_provider.php |  2 +-
 2 files changed, 28 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index fb19b98429..af31478337 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -247,14 +247,16 @@ class phpbb_extension_finder
 	* phpBB naming rules an incorrect class name will be returned.
 	*
 	* @param bool $cache Whether the result should be cached
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
 	* @return array An array of found class names
 	*/
-	public function get_classes($cache = true)
+	public function get_classes($cache = true, $use_all_available = false)
 	{
 		$this->query['extension_suffix'] .= $this->php_ext;
 		$this->query['core_suffix'] .= $this->php_ext;
 
-		$files = $this->find($cache, false);
+		$files = $this->find($cache, false, $use_all_available);
 
 		$classes = array();
 		foreach ($files as $file => $ext_name)
@@ -270,23 +272,27 @@ class phpbb_extension_finder
 	* Finds all directories matching the configured options
 	*
 	* @param bool $cache Whether the result should be cached
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
 	* @param bool $extension_keys Whether the result should have extension name as array key
 	* @return array An array of paths to found directories
 	*/
-	public function get_directories($cache = true, $extension_keys = false)
+	public function get_directories($cache = true, $use_all_available = false, $extension_keys = false)
 	{
-		return $this->find_with_root_path($cache, true, $extension_keys);
+		return $this->find_with_root_path($cache, true, $use_all_available, $extension_keys);
 	}
 
 	/**
 	* Finds all files matching the configured options.
 	*
 	* @param bool $cache Whether the result should be cached
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
 	* @return array An array of paths to found files
 	*/
-	public function get_files($cache = true)
+	public function get_files($cache = true, $use_all_available = false)
 	{
-		return $this->find_with_root_path($cache, false);
+		return $this->find_with_root_path($cache, false, $use_all_available);
 	}
 
 	/**
@@ -295,13 +301,15 @@ class phpbb_extension_finder
 	* @param bool $cache Whether the result should be cached
 	* @param bool $is_dir Directories will be returned when true, only files
 	*                     otherwise
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
 	* @param bool $extension_keys If true, result will be associative array
 	*					with extension name as key
 	* @return array An array of paths to found items
 	*/
-	protected function find_with_root_path($cache = true, $is_dir = false, $extension_keys = false)
+	protected function find_with_root_path($cache = true, $is_dir = false, $use_all_available = false, $extension_keys = false)
 	{
-		$items = $this->find($cache, $is_dir);
+		$items = $this->find($cache, $is_dir, $use_all_available);
 
 		$result = array();
 		foreach ($items as $item => $ext_name)
@@ -325,9 +333,11 @@ class phpbb_extension_finder
 	* @param bool $cache Whether the result should be cached
 	* @param bool $is_dir Directories will be returned when true, only files
 	*                     otherwise
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
 	* @return array An array of paths to found items
 	*/
-	public function find($cache = true, $is_dir = false)
+	public function find($cache = true, $is_dir = false, $use_all_available = false)
 	{
 		$this->query['is_dir'] = $is_dir;
 		$query = md5(serialize($this->query));
@@ -339,7 +349,14 @@ class phpbb_extension_finder
 
 		$files = array();
 
-		$extensions = $this->extension_manager->all_enabled();
+		if ($use_all_available)
+		{
+			$extensions = $this->extension_manager->all_available();
+		}
+		else
+		{
+			$extensions = $this->extension_manager->all_enabled();
+		}
 
 		if ($this->query['core_path'])
 		{
diff --git a/phpBB/includes/style/extension_path_provider.php b/phpBB/includes/style/extension_path_provider.php
index 4eac300424..6976a45ed0 100644
--- a/phpBB/includes/style/extension_path_provider.php
+++ b/phpBB/includes/style/extension_path_provider.php
@@ -92,7 +92,7 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple
 					if ($path && !phpbb_is_absolute($path))
 					{
 						$result = $finder->directory('/' . $this->ext_dir_prefix . $path)
-							->get_directories(true, true);
+							->get_directories(true, false, true);
 						foreach ($result as $ext => $ext_path)
 						{
 							$directories[$ext][] = $ext_path;
-- 
cgit v1.2.1


From e483e3f4591b584aeea32aa5bb2a7be322086287 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 1 Mar 2013 12:05:08 -0600
Subject: [ticket/11363] Fix to make get_module_infos get from all extensions

Depends on 11381

PHPBB3-11363
---
 phpBB/includes/acp/acp_modules.php          | 10 ++++--
 phpBB/includes/db/migration/tool/module.php | 52 ++++++++++++++---------------
 2 files changed, 34 insertions(+), 28 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 52a82004e8..fce26bf45f 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -535,8 +535,14 @@ class acp_modules
 
 	/**
 	* Get available module information from module files
+	*
+	* @param string $module
+	* @param bool|string $module_class
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
+	* @return array
 	*/
-	function get_module_infos($module = '', $module_class = false)
+	function get_module_infos($module = '', $module_class = false, $use_all_available = false)
 	{
 		global $phpbb_root_path, $phpEx;
 
@@ -556,7 +562,7 @@ class acp_modules
 				->extension_directory("/$module_class")
 				->core_path("includes/$module_class/info/")
 				->core_prefix($module_class . '_')
-				->get_classes();
+				->get_classes(true, $use_all_available);
 
 			foreach ($modules as $module)
 			{
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index 8744866a16..6ffb073543 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -183,19 +183,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			$basename = str_replace(array('/', '\\'), '', $basename);
 			$class = str_replace(array('/', '\\'), '', $class);
 
-			if (!class_exists('acp_modules'))
-			{
-				include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
-			}
-			$acp_modules = new acp_modules();
-			$module = $acp_modules->get_module_infos($basename, $class);
-			$module = $module[$basename];
-			unset($acp_modules);
-
-			if (empty($module))
-			{
-				throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename);
-			}
+			$module = $this->get_module_info($class, $basename);
 
 			$result = '';
 			foreach ($module['modes'] as $mode => $module_info)
@@ -367,19 +355,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
 			$class = str_replace(array('/', '\\'), '', $class);
 
-			if (!class_exists('acp_modules'))
-			{
-				include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
-			}
-			$acp_modules = new acp_modules();
-			$module_info = $acp_modules->get_module_infos($basename, $class);
-			$module_info = $module_info[$basename];
-			unset($acp_modules);
-
-			if (empty($module_info))
-			{
-				throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename);
-			}
+			$module_info = $this->get_module_info($class, $basename);
 
 			foreach ($module_info['modes'] as $mode => $info)
 			{
@@ -499,4 +475,28 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			return call_user_func_array(array(&$this, $call), $arguments);
 		}
 	}
+
+	/**
+	* Wrapper for acp_modules::get_module_infos()
+	*
+	* @param string $class Module Class
+	* @param string $basename Module Basename
+	* @return array Module Information
+	*/
+	protected function get_module_info($class, $basename)
+	{
+		if (!class_exists('acp_modules'))
+		{
+			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
+		}
+		$acp_modules = new acp_modules();
+		$module = $acp_modules->get_module_infos($basename, $class, true);
+
+		if (empty($module));
+		{
+			throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename);
+		}
+
+		return array_pop($module);
+	}
 }
-- 
cgit v1.2.1


From 39ca212e17e80d14dbbd20cf5542ab37f27bd217 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 2 Mar 2013 11:02:53 -0600
Subject: [ticket/11386] Use finder to find migration files

PHPBB3-11386
---
 phpBB/includes/db/migrator.php       | 53 ++++++---------------
 phpBB/includes/extension/finder.php  | 91 +++++++++++++++++++++++++++++-------
 phpBB/includes/extension/manager.php | 11 ++++-
 3 files changed, 97 insertions(+), 58 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index ec0b6a87da..824bca5e70 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -31,6 +31,9 @@ class phpbb_db_migrator
 	/** @var phpbb_db_tools */
 	protected $db_tools;
 
+	/** @var phpbb_extension_manager */
+	protected $extension_manager;
+
 	/** @var string */
 	protected $table_prefix;
 
@@ -69,11 +72,12 @@ class phpbb_db_migrator
 	/**
 	* Constructor of the database migrator
 	*/
-	public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools)
+	public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, phpbb_extension_manager $extension_manager, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools)
 	{
 		$this->config = $config;
 		$this->db = $db;
 		$this->db_tools = $db_tools;
+		$this->extension_manager = $extension_manager;
 
 		$this->migrations_table = $migrations_table;
 
@@ -180,55 +184,26 @@ class phpbb_db_migrator
 	* 	If FALSE, we will not check. You SHOULD check at least once
 	* 	to prevent errors (if including multiple directories, check
 	* 	with the last call to prevent throwing errors unnecessarily).
-	* @param bool $recursive Set to true to also load data files from subdirectories
 	* @return array Array of migration names
 	*/
-	public function load_migrations($path, $check_fulfillable = true, $recursive = true)
+	public function load_migrations($path, $check_fulfillable = true)
 	{
 		if (!is_dir($path))
 		{
 			throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path);
 		}
 
-		$handle = opendir($path);
-		while (($file = readdir($handle)) !== false)
+		$finder = $this->extension_manager->get_finder();
+		$migration_files = $finder
+			->extension_directory("/")
+			->find_from_paths(array('/' => $path));
+		foreach ($migration_files as $migration)
 		{
-			if ($file == '.' || $file == '..')
-			{
-				continue;
-			}
+			$migration_name = $migration['path'] . $migration['filename'];
 
-			// Recursion through subdirectories
-			if (is_dir($path . $file) && $recursive)
+			if (!in_array($migration_name, $this->migrations))
 			{
-				$this->load_migrations($path . $file . '/', $check_fulfillable, $recursive);
-			}
-
-			if (strpos($file, '_') !== 0 && strrpos($file, '.' . $this->php_ext) === (strlen($file) - strlen($this->php_ext) - 1))
-			{
-				// We try to find what class existed by comparing the classes declared before and after including the file.
-				$declared_classes = get_declared_classes();
-
-				include ($path . $file);
-
-				$added_classes = array_diff(get_declared_classes(), $declared_classes);
-
-				if (
-					// If two classes have been added and phpbb_db_migration is one of them, we've only added one real migration
-					!(sizeof($added_classes) == 2 && in_array('phpbb_db_migration', $added_classes)) &&
-					// Otherwise there should only be one class added
-					sizeof($added_classes) != 1
-				)
-				{
-					throw new phpbb_db_migration_exception('MIGRATION DATA FILE INVALID', $path . $file);
-				}
-
-				$name = array_pop($added_classes);
-
-				if (!in_array($name, $this->migrations))
-				{
-					$this->migrations[] = $name;
-				}
+				$this->migrations[] = $migration_name;
 			}
 		}
 
diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index fb19b98429..15e6db1bbe 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -247,15 +247,28 @@ class phpbb_extension_finder
 	* phpBB naming rules an incorrect class name will be returned.
 	*
 	* @param bool $cache Whether the result should be cached
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
 	* @return array An array of found class names
 	*/
-	public function get_classes($cache = true)
+	public function get_classes($cache = true, $use_all_available = false)
 	{
 		$this->query['extension_suffix'] .= $this->php_ext;
 		$this->query['core_suffix'] .= $this->php_ext;
 
-		$files = $this->find($cache, false);
+		$files = $this->find($cache, false, $use_all_available);
 
+		return $this->get_classes_from_files($files);
+	}
+
+	/**
+	* Get class names from a list of files
+	*
+	* @param array $files Array of files (from find())
+	* @return array Array of class names
+	*/
+	public function get_classes_from_files($files)
+	{
 		$classes = array();
 		foreach ($files as $file => $ext_name)
 		{
@@ -270,23 +283,27 @@ class phpbb_extension_finder
 	* Finds all directories matching the configured options
 	*
 	* @param bool $cache Whether the result should be cached
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
 	* @param bool $extension_keys Whether the result should have extension name as array key
 	* @return array An array of paths to found directories
 	*/
-	public function get_directories($cache = true, $extension_keys = false)
+	public function get_directories($cache = true, $use_all_available = false, $extension_keys = false)
 	{
-		return $this->find_with_root_path($cache, true, $extension_keys);
+		return $this->find_with_root_path($cache, true, $use_all_available, $extension_keys);
 	}
 
 	/**
 	* Finds all files matching the configured options.
 	*
 	* @param bool $cache Whether the result should be cached
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
 	* @return array An array of paths to found files
 	*/
-	public function get_files($cache = true)
+	public function get_files($cache = true, $use_all_available = false)
 	{
-		return $this->find_with_root_path($cache, false);
+		return $this->find_with_root_path($cache, false, $use_all_available);
 	}
 
 	/**
@@ -295,13 +312,15 @@ class phpbb_extension_finder
 	* @param bool $cache Whether the result should be cached
 	* @param bool $is_dir Directories will be returned when true, only files
 	*                     otherwise
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
 	* @param bool $extension_keys If true, result will be associative array
 	*					with extension name as key
 	* @return array An array of paths to found items
 	*/
-	protected function find_with_root_path($cache = true, $is_dir = false, $extension_keys = false)
+	protected function find_with_root_path($cache = true, $is_dir = false, $use_all_available = false, $extension_keys = false)
 	{
-		$items = $this->find($cache, $is_dir);
+		$items = $this->find($cache, $is_dir, $use_all_available);
 
 		$result = array();
 		foreach ($items as $item => $ext_name)
@@ -325,27 +344,59 @@ class phpbb_extension_finder
 	* @param bool $cache Whether the result should be cached
 	* @param bool $is_dir Directories will be returned when true, only files
 	*                     otherwise
+	* @param bool $use_all_available Use all available instead of just all
+	* 						enabled extensions
 	* @return array An array of paths to found items
 	*/
-	public function find($cache = true, $is_dir = false)
+	public function find($cache = true, $is_dir = false, $use_all_available = false)
 	{
-		$this->query['is_dir'] = $is_dir;
-		$query = md5(serialize($this->query));
+		if ($use_all_available)
+		{
+			$extensions = $this->extension_manager->all_available();
+		}
+		else
+		{
+			$extensions = $this->extension_manager->all_enabled();
+		}
 
-		if (!defined('DEBUG') && $cache && isset($this->cached_queries[$query]))
+		if ($this->query['core_path'])
 		{
-			return $this->cached_queries[$query];
+			$extensions['/'] = $this->phpbb_root_path . $this->query['core_path'];
 		}
 
 		$files = array();
+		$file_list = $this->find_from_paths($extensions, $cache, $is_dir);
 
-		$extensions = $this->extension_manager->all_enabled();
+		foreach ($file_list as $file)
+		{
+			$files[$file['named_path']] = $file['ext_name'];
+		}
 
-		if ($this->query['core_path'])
+		return $files;
+	}
+
+	/**
+	* Finds all file system entries matching the configured options from
+	* an array of paths
+	*
+	* @param array $extensions Array of extensions (name => full relative path)
+	* @param bool $cache Whether the result should be cached
+	* @param bool $is_dir Directories will be returned when true, only files
+	*                     otherwise
+	* @return array An array of paths to found items
+	*/
+	public function find_from_paths($extensions, $cache = true, $is_dir = false)
+	{
+		$this->query['is_dir'] = $is_dir;
+		$query = md5(serialize($this->query) . serialize($extensions));
+
+		if (!defined('DEBUG') && $cache && isset($this->cached_queries[$query]))
 		{
-			$extensions['/'] = $this->phpbb_root_path . $this->query['core_path'];
+			return $this->cached_queries[$query];
 		}
 
+		$files = array();
+
 		foreach ($extensions as $name => $path)
 		{
 			$ext_name = $name;
@@ -419,7 +470,13 @@ class phpbb_extension_finder
 						(!$prefix || substr($filename, 0, strlen($prefix)) === $prefix) &&
 						(!$directory || preg_match($directory_pattern, $relative_path)))
 					{
-						$files[str_replace(DIRECTORY_SEPARATOR, '/', $location . $name . substr($relative_path, 1))] = $ext_name;
+						$files[] = array(
+							'named_path'	=> str_replace(DIRECTORY_SEPARATOR, '/', $location . $name . substr($relative_path, 1)),
+							'ext_name'		=> $ext_name,
+							'path'			=> str_replace(array(DIRECTORY_SEPARATOR, $this->phpbb_root_path), array('/', ''), $file_info->getPath()) . '/',
+							'filename'		=> $filename,
+							'file_info'		=> $file_info,
+						);
 					}
 				}
 			}
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 21a9ec1370..0d760681b9 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -49,13 +49,12 @@ class phpbb_extension_manager
 	* @param phpbb_cache_driver_interface $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_db_migrator $migrator, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
+	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
 	{
 		$this->container = $container;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->db = $db;
 		$this->config = $config;
-		$this->migrator = $migrator;
 		$this->cache = $cache;
 		$this->php_ext = $php_ext;
 		$this->extension_table = $extension_table;
@@ -69,6 +68,14 @@ class phpbb_extension_manager
 		}
 	}
 
+	/**
+	* Set migrator (get around circular reference)
+	*/
+	public function set_migrator(phpbb_db_migrator $migrator)
+	{
+		$this->migrator = $migrator;
+	}
+
 	/**
 	* Loads all extension information from the database
 	*
-- 
cgit v1.2.1


From 1368470f7488b278cdc214745a7d4c9557d407e2 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 2 Mar 2013 11:42:30 -0600
Subject: [ticket/11386] Forgot to get the migration classes

PHPBB3-11386
---
 phpBB/includes/db/migrator.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 824bca5e70..855e640554 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -193,17 +193,23 @@ class phpbb_db_migrator
 			throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path);
 		}
 
+		$migrations = array();
+
 		$finder = $this->extension_manager->get_finder();
-		$migration_files = $finder
+		$files = $finder
 			->extension_directory("/")
 			->find_from_paths(array('/' => $path));
-		foreach ($migration_files as $migration)
+		foreach ($files as $file)
 		{
-			$migration_name = $migration['path'] . $migration['filename'];
+			$migrations[$file['path'] . $file['filename']] = '';
+		}
+		$migrations = $finder->get_classes_from_files($migrations);
 
-			if (!in_array($migration_name, $this->migrations))
+		foreach ($migrations as $migration)
+		{
+			if (!in_array($migration, $this->migrations))
 			{
-				$this->migrations[] = $migration_name;
+				$this->migrations[] = $migration;
 			}
 		}
 
-- 
cgit v1.2.1


From a6f877c0d84ff102d3812246eae7469e191983e2 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 2 Mar 2013 14:15:59 -0600
Subject: [ticket/11386] Fix circular reference error & serialize error

PHPBB3-11386
---
 phpBB/includes/db/migrator.php      | 13 +++++++++++--
 phpBB/includes/extension/finder.php |  1 -
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 855e640554..de9c06948c 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -72,12 +72,11 @@ class phpbb_db_migrator
 	/**
 	* Constructor of the database migrator
 	*/
-	public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, phpbb_extension_manager $extension_manager, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools)
+	public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools)
 	{
 		$this->config = $config;
 		$this->db = $db;
 		$this->db_tools = $db_tools;
-		$this->extension_manager = $extension_manager;
 
 		$this->migrations_table = $migrations_table;
 
@@ -94,6 +93,16 @@ class phpbb_db_migrator
 		$this->load_migration_state();
 	}
 
+	/**
+	* Set Extension Manager (required)
+	*
+	* Not in constructor to prevent circular reference error
+	*/
+	public function set_extension_manager(phpbb_extension_manager $extension_manager)
+	{
+		$this->extension_manager = $extension_manager;
+	}
+
 	/**
 	* Loads all migrations and their application state from the database.
 	*
diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index 15e6db1bbe..f71e32bc8d 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -475,7 +475,6 @@ class phpbb_extension_finder
 							'ext_name'		=> $ext_name,
 							'path'			=> str_replace(array(DIRECTORY_SEPARATOR, $this->phpbb_root_path), array('/', ''), $file_info->getPath()) . '/',
 							'filename'		=> $filename,
-							'file_info'		=> $file_info,
 						);
 					}
 				}
-- 
cgit v1.2.1


From 49de9e3d444ab71a2ad1e5ac1db6d92e3cb80466 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 2 Mar 2013 15:03:13 -0600
Subject: [ticket/11387] Log module added only after it has been added

PHPBB3-11387
---
 phpBB/includes/db/migration/tool/module.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index 6ffb073543..3ba82d8a0f 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -209,9 +209,6 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 		}
 
 		// The "manual" way
-		$module_log_name = ((isset($this->user->lang[$data['module_langname']])) ? $this->user->lang[$data['module_langname']] : $data['module_langname']);
-		add_log('admin', 'LOG_MODULE_ADD', $module_log_name);
-
 		if (!is_numeric($parent))
 		{
 			$sql = 'SELECT module_id
@@ -267,6 +264,8 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 		else
 		{
 			// Success
+			$module_log_name = ((isset($this->user->lang[$data['module_langname']])) ? $this->user->lang[$data['module_langname']] : $data['module_langname']);
+			add_log('admin', 'LOG_MODULE_ADD', $module_log_name);
 
 			// Move the module if requested above/below an existing one
 			if (isset($data['before']) && $data['before'])
-- 
cgit v1.2.1


From c73f0a7c7870109a8e3d517f4967a7018dbb8669 Mon Sep 17 00:00:00 2001
From: OpenShift guest <dachebodt@gmail.com>
Date: Fri, 1 Mar 2013 20:36:32 -0500
Subject: [ticket/11385] Fix issue with migration module tool not getting
 extension module info

PHPBB3-11385
---
 phpBB/includes/db/migration/tool/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index 6ffb073543..ad94c5aadb 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -492,7 +492,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 		$acp_modules = new acp_modules();
 		$module = $acp_modules->get_module_infos($basename, $class, true);
 
-		if (empty($module));
+		if (empty($module))
 		{
 			throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename);
 		}
-- 
cgit v1.2.1


From eb61edf4d1b5fd82e225ed1ac50f6310f72953f8 Mon Sep 17 00:00:00 2001
From: OpenShift guest <dachebodt@gmail.com>
Date: Sun, 3 Mar 2013 01:44:21 -0500
Subject: [ticket/11383] Correctly revert modules added/removed by migrator

PHPBB3-11383
---
 phpBB/includes/db/migrator.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index de9c06948c..5e1266cc4a 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -462,6 +462,12 @@ class phpbb_db_migrator
 	{
 		$state = ($state) ? unserialize($state) : false;
 
+		// reverse order of steps if reverting
+		if ($revert === true)
+		{
+			$steps = array_reverse($steps);
+		}
+
 		foreach ($steps as $step_identifier => $step)
 		{
 			$last_result = false;
-- 
cgit v1.2.1


From 46c4ff46e00e4f050a5c987027a4b05e72456162 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 3 Mar 2013 20:30:17 +0100
Subject: [ticket/10714] Logs are disabled for this page call only

PHPBB3-10714
---
 phpBB/includes/log/interface.php | 9 +++++++--
 phpBB/includes/log/log.php       | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/log/interface.php b/phpBB/includes/log/interface.php
index 24bf412ce0..3b459c9bdf 100644
--- a/phpBB/includes/log/interface.php
+++ b/phpBB/includes/log/interface.php
@@ -33,8 +33,11 @@ interface phpbb_log_interface
 	public function is_enabled($type = '');
 
 	/**
-	* This function allows disabling the log system. When add_log is called
-	* and the type is disabled, the log will not be added to the database.
+	* Disable log
+	*
+	* This function allows disabling the log system or parts of it, for this
+	* page call. When add_log is called and the type is disabled,
+	* the log will not be added to the database.
 	*
 	* @param	mixed	$type	The log type we want to disable. Empty to
 	*						disable all logs. Can also be an array of types.
@@ -44,6 +47,8 @@ interface phpbb_log_interface
 	public function disable($type = '');
 
 	/**
+	* Enable log
+	*
 	* This function allows re-enabling the log system.
 	*
 	* @param	mixed	$type	The log type we want to enable. Empty to
diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
index 8da8b63391..7a26858348 100644
--- a/phpBB/includes/log/log.php
+++ b/phpBB/includes/log/log.php
@@ -177,8 +177,11 @@ class phpbb_log implements phpbb_log_interface
 	}
 
 	/**
-	* This function allows disabling the log system. When add_log is called
-	* and the type is disabled, the log will not be added to the database.
+	* Disable log
+	*
+	* This function allows disabling the log system or parts of it, for this
+	* page call. When add_log is called and the type is disabled,
+	* the log will not be added to the database.
 	*
 	* {@inheritDoc}
 	*/
@@ -202,6 +205,8 @@ class phpbb_log implements phpbb_log_interface
 	}
 
 	/**
+	* Enable log
+	*
 	* This function allows re-enabling the log system.
 	*
 	* {@inheritDoc}
-- 
cgit v1.2.1


From e0328814f30d51bfac45e9c66d17b29478addd79 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 3 Mar 2013 20:30:54 +0100
Subject: [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 36c5ad507e..106b7d75cc 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -57,7 +57,7 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext)
 	$container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext);
 
 	$container->setParameter('core.root_path', $phpbb_root_path);
-	$container->setParameter('core.adm_relative_path', 'adm/');
+	$container->setParameter('core.adm_relative_path', $phpbb_adm_relative_path);
 	$container->setParameter('core.php_ext', $php_ext);
 	$container->setParameter('core.table_prefix', '');
 
-- 
cgit v1.2.1


From e1bb76eb096673af9e106f4cbd6e328c2b4bfdb6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 4 Mar 2013 00:25:38 +0100
Subject: [feature/avatars] Reduce module auth of ucp avatar settings

Previously the avatar types that need to be enabled were hardcoded into
the module auth. This is no longer needed in the new avatar system.

PHPBB3-10018
---
 phpBB/includes/ucp/info/ucp_profile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/info/ucp_profile.php b/phpBB/includes/ucp/info/ucp_profile.php
index 98ab0597ff..e974cea713 100644
--- a/phpBB/includes/ucp/info/ucp_profile.php
+++ b/phpBB/includes/ucp/info/ucp_profile.php
@@ -21,7 +21,7 @@ class ucp_profile_info
 			'modes'		=> array(
 				'profile_info'	=> array('title' => 'UCP_PROFILE_PROFILE_INFO', 'auth' => 'acl_u_chgprofileinfo', 'cat' => array('UCP_PROFILE')),
 				'signature'		=> array('title' => 'UCP_PROFILE_SIGNATURE', 'auth' => 'acl_u_sig', 'cat' => array('UCP_PROFILE')),
-				'avatar'		=> array('title' => 'UCP_PROFILE_AVATAR', 'auth' => 'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload || cfg_allow_avatar_gravatar)', 'cat' => array('UCP_PROFILE')),
+				'avatar'		=> array('title' => 'UCP_PROFILE_AVATAR', 'auth' => 'cfg_allow_avatar', 'cat' => array('UCP_PROFILE')),
 				'reg_details'	=> array('title' => 'UCP_PROFILE_REG_DETAILS', 'auth' => '', 'cat' => array('UCP_PROFILE')),
 				'autologin_keys'=> array('title' => 'UCP_PROFILE_AUTOLOGIN_KEYS', 'auth' => '', 'cat' => array('UCP_PROFILE')),
 			),
-- 
cgit v1.2.1


From c7ca4e445c7dc6c775e27597cd7b0968fa5fd904 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 4 Mar 2013 01:04:36 +0100
Subject: [feature/avatars] Add migrations data file for avatars

The module_auth of the ucp avatar settings are used for checking if the
migration has already been installed.

PHPBB3-10018
---
 phpBB/includes/db/migration/data/310/avatars.php | 64 ++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 phpBB/includes/db/migration/data/310/avatars.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/avatars.php b/phpBB/includes/db/migration/data/310/avatars.php
new file mode 100644
index 0000000000..de11a64556
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/avatars.php
@@ -0,0 +1,64 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_avatars extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		$sql = 'SELECT module_auth
+				FROM ' . MODULES_TABLE . "
+				WHERE module_class = 'ucp'
+					AND module_basename = 'ucp_profile'
+					AND module_mode = 'avatar'";
+		$result = $this->db->sql_query($sql);
+		$module_auth = $this->db->sql_fetchfield('module_auth');
+		$this->db->sql_freeresult($result);
+		return ($module_auth == 'cfg_allow_avatar');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_avatar_type'		=> array('VCHAR:255', ''),
+				),
+				$this->table_prefix . 'groups'			=> array(
+					'group_avatar_type'		=> array('VCHAR:255', ''),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_avatar_type'		=> array('TINT:2', ''),
+				),
+				$this->table_prefix . 'groups'			=> array(
+					'group_avatar_type'		=> array('TINT:2', ''),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('allow_avatar_gravatar', 0)),
+		);
+	}
+}
-- 
cgit v1.2.1


From e4f782819968ec44f1dd207dc9de7ec703826d29 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 3 Mar 2013 19:54:22 -0600
Subject: [ticket/11386] Send list of migrations instead of using
 load_migrations

Remove dependency of extension manager for migrator.

Keeping load_migrations function for others to use if they desire
but requiring the finder be sent to it in order to use it.

PHPBB3-11386
---
 phpBB/includes/db/migrator.php       | 188 +++++++++++++++--------------------
 phpBB/includes/extension/manager.php |  32 +++---
 2 files changed, 102 insertions(+), 118 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index de9c06948c..b925ca5297 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -29,10 +29,7 @@ class phpbb_db_migrator
 	protected $db;
 
 	/** @var phpbb_db_tools */
-	protected $db_tools;
-
-	/** @var phpbb_extension_manager */
-	protected $extension_manager;
+	protected $db_tools
 
 	/** @var string */
 	protected $table_prefix;
@@ -93,16 +90,6 @@ class phpbb_db_migrator
 		$this->load_migration_state();
 	}
 
-	/**
-	* Set Extension Manager (required)
-	*
-	* Not in constructor to prevent circular reference error
-	*/
-	public function set_extension_manager(phpbb_extension_manager $extension_manager)
-	{
-		$this->extension_manager = $extension_manager;
-	}
-
 	/**
 	* Loads all migrations and their application state from the database.
 	*
@@ -145,98 +132,6 @@ class phpbb_db_migrator
 		$this->migrations = $class_names;
 	}
 
-	/**
-	* This function adds all migrations in a specified directory to the migrations table
-	*
-	* THIS SHOULD NOT GENERALLY BE USED! THIS IS FOR THE PHPBB INSTALLER.
-	* THIS WILL THROW ERRORS IF MIGRATIONS ALREADY EXIST IN THE TABLE, DO NOT CALL MORE THAN ONCE!
-	*
-	* @param string $path Path to migration data files
-	* @param bool $recursive Set to true to also load data files from subdirectories
-	* @return null
-	*/
-	public function populate_migrations_from_directory($path, $recursive = true)
-	{
-		$existing_migrations = $this->migrations;
-
-		$this->migrations = array();
-		$this->load_migrations($path, true, $recursive);
-
-		foreach ($this->migrations as $name)
-		{
-			if ($this->migration_state($name) === false)
-			{
-				$state = array(
-					'migration_depends_on'	=> $name::depends_on(),
-					'migration_schema_done' => true,
-					'migration_data_done'	=> true,
-					'migration_data_state'	=> '',
-					'migration_start_time'	=> time(),
-					'migration_end_time'	=> time(),
-				);
-				$this->insert_migration($name, $state);
-			}
-		}
-
-		$this->migrations = $existing_migrations;
-	}
-
-	/**
-	* Load migration data files from a directory
-	*
-	* Migration data files loaded with this function MUST contain
-	* 	ONLY ONE class in them (or an exception will be thrown).
-	*
-	* @param string $path Path to migration data files
-	* @param bool $check_fulfillable If TRUE (default), we will check
-	* 	if all of the migrations are fulfillable after loading them.
-	* 	If FALSE, we will not check. You SHOULD check at least once
-	* 	to prevent errors (if including multiple directories, check
-	* 	with the last call to prevent throwing errors unnecessarily).
-	* @return array Array of migration names
-	*/
-	public function load_migrations($path, $check_fulfillable = true)
-	{
-		if (!is_dir($path))
-		{
-			throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path);
-		}
-
-		$migrations = array();
-
-		$finder = $this->extension_manager->get_finder();
-		$files = $finder
-			->extension_directory("/")
-			->find_from_paths(array('/' => $path));
-		foreach ($files as $file)
-		{
-			$migrations[$file['path'] . $file['filename']] = '';
-		}
-		$migrations = $finder->get_classes_from_files($migrations);
-
-		foreach ($migrations as $migration)
-		{
-			if (!in_array($migration, $this->migrations))
-			{
-				$this->migrations[] = $migration;
-			}
-		}
-
-		if ($check_fulfillable)
-		{
-			foreach ($this->migrations as $name)
-			{
-				$unfulfillable = $this->unfulfillable($name);
-				if ($unfulfillable !== false)
-				{
-					throw new phpbb_db_migration_exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable);
-				}
-			}
-		}
-
-		return $this->migrations;
-	}
-
 	/**
 	* Runs a single update step from the next migration to be applied.
 	*
@@ -754,4 +649,85 @@ class phpbb_db_migrator
 	{
 		return new $name($this->config, $this->db, $this->db_tools, $this->phpbb_root_path, $this->php_ext, $this->table_prefix);
 	}
+
+	/**
+	* This function adds all migrations sent to it to the migrations table
+	*
+	* THIS SHOULD NOT GENERALLY BE USED! THIS IS FOR THE PHPBB INSTALLER.
+	* THIS WILL THROW ERRORS IF MIGRATIONS ALREADY EXIST IN THE TABLE, DO NOT CALL MORE THAN ONCE!
+	*
+	* @param array $migrations Array of migrations (names) to add to the migrations table
+	* @return null
+	*/
+	public function populate_migrations($migrations)
+	{
+		foreach ($migrations as $name)
+		{
+			if ($this->migration_state($name) === false)
+			{
+				$state = array(
+					'migration_depends_on'	=> $name::depends_on(),
+					'migration_schema_done' => true,
+					'migration_data_done'	=> true,
+					'migration_data_state'	=> '',
+					'migration_start_time'	=> time(),
+					'migration_end_time'	=> time(),
+				);
+				$this->insert_migration($name, $state);
+			}
+		}
+	}
+
+	/**
+	* Load migration data files from a directory
+	*
+	* @param phpbb_extension_finder $finder
+	* @param string $path Path to migration data files
+	* @param bool $check_fulfillable If TRUE (default), we will check
+	* 	if all of the migrations are fulfillable after loading them.
+	* 	If FALSE, we will not check. You SHOULD check at least once
+	* 	to prevent errors (if including multiple directories, check
+	* 	with the last call to prevent throwing errors unnecessarily).
+	* @return array Array of migration names
+	*/
+	public function load_migrations(phpbb_extension_finder $finder, $path, $check_fulfillable = true)
+	{
+		if (!is_dir($path))
+		{
+			throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path);
+		}
+
+		$migrations = array();
+
+		$files = $finder
+			->extension_directory("/")
+			->find_from_paths(array('/' => $path));
+		foreach ($files as $file)
+		{
+			$migrations[$file['path'] . $file['filename']] = '';
+		}
+		$migrations = $finder->get_classes_from_files($migrations);
+
+		foreach ($migrations as $migration)
+		{
+			if (!in_array($migration, $this->migrations))
+			{
+				$this->migrations[] = $migration;
+			}
+		}
+
+		if ($check_fulfillable)
+		{
+			foreach ($this->migrations as $name)
+			{
+				$unfulfillable = $this->unfulfillable($name);
+				if ($unfulfillable !== false)
+				{
+					throw new phpbb_db_migration_exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable);
+				}
+			}
+		}
+
+		return $this->migrations;
+	}
 }
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 0d760681b9..44a30c6280 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -43,18 +43,20 @@ class phpbb_extension_manager
 	* @param ContainerInterface $container A container
 	* @param phpbb_db_driver $db A database connection
 	* @param phpbb_config $config phpbb_config
+	* @param phpbb_db_migrator $migrator
 	* @param string $extension_table The name of the table holding extensions
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
 	* @param string $php_ext php file extension
 	* @param phpbb_cache_driver_interface $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
+	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_db_migrator $migrator, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
 	{
 		$this->container = $container;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->db = $db;
 		$this->config = $config;
+		$this->migrator = $migrator;
 		$this->cache = $cache;
 		$this->php_ext = $php_ext;
 		$this->extension_table = $extension_table;
@@ -68,14 +70,6 @@ class phpbb_extension_manager
 		}
 	}
 
-	/**
-	* Set migrator (get around circular reference)
-	*/
-	public function set_migrator(phpbb_db_migrator $migrator)
-	{
-		$this->migrator = $migrator;
-	}
-
 	/**
 	* Loads all extension information from the database
 	*
@@ -528,13 +522,27 @@ class phpbb_extension_manager
 	*/
 	protected function handle_migrations($extension_name, $mode)
 	{
-		$migrations_path = $this->phpbb_root_path . $this->get_extension_path($extension_name) . 'migrations/';
-		if (!file_exists($migrations_path) || !is_dir($migrations_path))
+		$extensions = array(
+			$extension_name => $this->phpbb_root_path . $this->get_extension_path($extension_name),
+		);
+
+		$finder = $this->get_finder();
+		$migrations = array();
+		$file_list = $finder
+			->extension_directory('/migrations')
+			->find_from_paths($extensions);
+
+		if (empty($file_list))
 		{
 			return true;
 		}
 
-		$migrations = $this->migrator->load_migrations($migrations_path);
+		foreach ($file_list as $file)
+		{
+			$migrations[$file['named_path']] = $file['ext_name'];
+		}
+		$migrations = $finder->get_classes_from_files($migrations);
+		$this->migrator->set_migrations($migrations);
 
 		// What is a safe limit of execution time? Half the max execution time should be safe.
 		$safe_time_limit = (ini_get('max_execution_time') / 2);
-- 
cgit v1.2.1


From 6cad032fbb2ceba892c861f8a2abab82574b12ae Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 3 Mar 2013 20:18:05 -0600
Subject: [ticket/11393] Give more information on database updater

PHPBB3-11393
---
 phpBB/includes/db/migrator.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index de9c06948c..81beb14b76 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -63,7 +63,9 @@ class phpbb_db_migrator
 	protected $migrations = array();
 
 	/**
-	* 'name' and 'class' of the last migration run
+	* 'name,' 'class,' and 'state' of the last migration run
+	*
+	* 'effectively_installed' set and set to true if the migration was effectively_installed
 	*
 	* @var array
 	*/
@@ -304,6 +306,7 @@ class phpbb_db_migrator
 		$this->last_run_migration = array(
 			'name'	=> $name,
 			'class'	=> $migration,
+			'state'	=> $state,
 		);
 
 		if (!isset($this->migration_state[$name]))
@@ -318,6 +321,8 @@ class phpbb_db_migrator
 					'migration_start_time'	=> 0,
 					'migration_end_time'	=> 0,
 				);
+
+				$this->last_run_migration['effectively_installed'] = true;
 			}
 			else
 			{
@@ -662,6 +667,8 @@ class phpbb_db_migrator
 		}
 
 		$this->migration_state[$name] = $state;
+
+		$this->last_run_migration['state'] = $state;
 	}
 
 	/**
-- 
cgit v1.2.1


From 9dfc5fbf9a8b866bea38efa5217417e6ef341bf1 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 3 Mar 2013 20:47:14 -0600
Subject: [ticket/11395] Prevent acp_modules::get_modules_info from reincluding
 files

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index fce26bf45f..7c2ea86122 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -600,11 +600,11 @@ class acp_modules
 
 			if (!class_exists($info_class))
 			{
-				if (file_exists($directory . $module . '.' . $phpEx))
+				$info_class = $module . '_info';
+				if (!class_exists($info_class) && file_exists($directory . $module . '.' . $phpEx))
 				{
 					include($directory . $module . '.' . $phpEx);
 				}
-				$info_class = $module . '_info';
 			}
 
 			// Get module title tag
-- 
cgit v1.2.1


From ae15fabb323c8f76ad2c8c994c2d205aabeafcbe Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 3 Mar 2013 20:59:21 -0600
Subject: [ticket/11396] Rename insert_migration to set_migration_state

PHPBB3-11396
---
 phpBB/includes/db/migrator.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index de9c06948c..7b5e8cb2de 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -174,7 +174,7 @@ class phpbb_db_migrator
 					'migration_start_time'	=> time(),
 					'migration_end_time'	=> time(),
 				);
-				$this->insert_migration($name, $state);
+				$this->set_migration_state($name, $state);
 			}
 		}
 
@@ -350,7 +350,7 @@ class phpbb_db_migrator
 			}
 		}
 
-		$this->insert_migration($name, $state);
+		$this->set_migration_state($name, $state);
 
 		return true;
 	}
@@ -422,7 +422,7 @@ class phpbb_db_migrator
 				$state['migration_data_done'] = ($result === true) ? false : true;
 			}
 
-			$this->insert_migration($name, $state);
+			$this->set_migration_state($name, $state);
 		}
 		else
 		{
@@ -641,7 +641,7 @@ class phpbb_db_migrator
 	* @param array $state
 	* @return null
 	*/
-	protected function insert_migration($name, $state)
+	protected function set_migration_state($name, $state)
 	{
 		$migration_row = $state;
 		$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);
-- 
cgit v1.2.1


From 2e2ddd7e85034f747d5dd312803aadfc47ac80e2 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 4 Mar 2013 10:30:49 +0100
Subject: [feature/avatars] Update module_auth of ucp module and fix small
 issues

Reduced the check effectively_installed() to just checking for the config
entry "allow_avatar_gravatar". Also added the missing update of the
module_auth of the ucp_profile avatar mode.

PHPBB3-10018
---
 phpBB/includes/db/migration/data/310/avatars.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/avatars.php b/phpBB/includes/db/migration/data/310/avatars.php
index de11a64556..79547337f7 100644
--- a/phpBB/includes/db/migration/data/310/avatars.php
+++ b/phpBB/includes/db/migration/data/310/avatars.php
@@ -11,15 +11,7 @@ class phpbb_db_migration_data_310_avatars extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		$sql = 'SELECT module_auth
-				FROM ' . MODULES_TABLE . "
-				WHERE module_class = 'ucp'
-					AND module_basename = 'ucp_profile'
-					AND module_mode = 'avatar'";
-		$result = $this->db->sql_query($sql);
-		$module_auth = $this->db->sql_fetchfield('module_auth');
-		$this->db->sql_freeresult($result);
-		return ($module_auth == 'cfg_allow_avatar');
+		return isset($this->config['allow_avatar_gravatar']);
 	}
 
 	static public function depends_on()
@@ -59,6 +51,17 @@ class phpbb_db_migration_data_310_avatars extends phpbb_db_migration
 	{
 		return array(
 			array('config.add', array('allow_avatar_gravatar', 0)),
+			array('custom', array(array($this, 'update_module_auth'))),
 		);
 	}
+
+	public function update_module_auth()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . "modules
+			SET module_auth = 'cfg_allow_avatar'
+			WHERE module_class = 'ucp'
+				AND module_basename = 'ucp_profile'
+				AND module_mode = 'avatar'";
+		$this->db->sql_query($sql);
+	}
 }
-- 
cgit v1.2.1


From 071defded6f0e4d2a805b336f56f0a2524d5b1b6 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 4 Mar 2013 09:55:23 -0600
Subject: [ticket/11386] Fix missing ;

PHPBB3-11386
---
 phpBB/includes/db/migrator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index b925ca5297..9fe4f40df2 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -29,7 +29,7 @@ class phpbb_db_migrator
 	protected $db;
 
 	/** @var phpbb_db_tools */
-	protected $db_tools
+	protected $db_tools;
 
 	/** @var string */
 	protected $table_prefix;
-- 
cgit v1.2.1


From 2aadc5a22c4ad58cab73bb8b56ca0109a95fab0f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 3 Mar 2013 20:25:31 -0600
Subject: [ticket/11394] Relax Migration Tools

Do not throw as many exceptions in the migration tools (when something
unexpected occurs but can be safely ignored).

PHPBB3-11394
---
 phpBB/includes/db/migration/tool/config.php     | 4 ++--
 phpBB/includes/db/migration/tool/module.php     | 6 +++---
 phpBB/includes/db/migration/tool/permission.php | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/tool/config.php b/phpBB/includes/db/migration/tool/config.php
index 458a25fb66..0b626bf455 100644
--- a/phpBB/includes/db/migration/tool/config.php
+++ b/phpBB/includes/db/migration/tool/config.php
@@ -49,7 +49,7 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 	{
 		if (isset($this->config[$config_name]))
 		{
-			throw new phpbb_db_migration_exception('CONFIG_ALREADY_EXIST', $config_name);
+			return;
 		}
 
 		$this->config->set($config_name, $config_value, !$is_dynamic);
@@ -105,7 +105,7 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 	{
 		if (!isset($this->config[$config_name]))
 		{
-			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
+			return;
 		}
 
 		$this->config->delete($config_name);
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index ad94c5aadb..ec683d36af 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -236,7 +236,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 
 		if ($this->exists($class, $parent, $data['module_langname']))
 		{
-			throw new phpbb_db_migration_exception('MODULE_ALREADY_EXIST', $data['module_langname']);
+			return;
 		}
 
 		if (!class_exists('acp_modules'))
@@ -369,7 +369,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 		{
 			if (!$this->exists($class, $parent, $module))
 			{
-				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', ((isset($this->user->lang[$module])) ? $this->user->lang[$module] : $module));
+				return;
 			}
 
 			$parent_sql = '';
@@ -442,7 +442,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 				$result = $acp_modules->delete_module($module_id);
 				if (!empty($result))
 				{
-					throw new phpbb_db_migration_exception('MODULE_NOT_REMOVABLE', $module_id, $result);
+					return;
 				}
 			}
 
diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php
index 4231fbe1dd..3b196fdbc2 100644
--- a/phpBB/includes/db/migration/tool/permission.php
+++ b/phpBB/includes/db/migration/tool/permission.php
@@ -107,7 +107,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	{
 		if ($this->exists($auth_option, $global))
 		{
-			throw new phpbb_db_migration_exception('PERMISSION_ALREADY_EXIST', $auth_option);
+			return;
 		}
 
 		// We've added permissions, so set to true to notify the user.
@@ -190,7 +190,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	{
 		if (!$this->exists($auth_option, $global))
 		{
-			throw new phpbb_db_migration_exception('PERMISSION_NOT_EXIST', $auth_option);
+			return;
 		}
 
 		if ($global)
@@ -315,7 +315,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 
 		if (!$role_id)
 		{
-			throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $role_name);
+			return;
 		}
 
 		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-- 
cgit v1.2.1


From e7d9cfa009ba8e22b0e75f1401ea2caa70c89c5b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 5 Mar 2013 01:06:22 +0100
Subject: [ticket/11398] Correctly call permission_set method in permission
 tool

The permission_set method calls itself inside the permission tool.
Probably due to an oversight, it is called as $this->set(), which causes a
fatal error. This patch will get rid of this issue.

PHPBB3-11398
---
 phpBB/includes/db/migration/tool/permission.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php
index 3b196fdbc2..2f09c0ac72 100644
--- a/phpBB/includes/db/migration/tool/permission.php
+++ b/phpBB/includes/db/migration/tool/permission.php
@@ -422,7 +422,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 					$this->db->sql_query($sql);
 					$role_name = $this->db->sql_fetchfield('role_name');
 
-					return $this->set($role_name, $auth_option, 'role', $has_permission);
+					return $this->permission_set($role_name, $auth_option, 'role', $has_permission);
 				}
 
 				$sql = 'SELECT auth_option_id, auth_setting
-- 
cgit v1.2.1


From a21de6e3f845f56026757e370b0bae8a02997bad Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 5 Mar 2013 17:09:33 +0100
Subject: [ticket/9657] Rebuild notifications in mcp_queue.php

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 157 ++++++++++++++++++---------------------
 1 file changed, 72 insertions(+), 85 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 6f9f16bde4..01abdc82d8 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -650,46 +650,39 @@ class mcp_queue
 			// Only send out the mails, when the posts are being approved
 			if ($action == 'approve')
 			{
-				$messenger = new messenger();
+				$phpbb_notifications = $phpbb_container->get('notification_manager');
 
-				// Notify Poster?
-				if ($notify_poster)
+				// Send out normal user notifications
+				$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
+
+				// Handle notifications
+				foreach ($post_info as $post_id => $post_data)
 				{
-					foreach ($post_info as $post_id => $post_data)
+					$phpbb_notifications->delete_notifications('post_in_queue', $post_id);
+
+					$phpbb_notifications->add_notifications(array(
+						'quote',
+						'bookmark',
+						'post',
+					), $post_data);
+
+					$phpbb_notifications->mark_notifications_read(array(
+						'quote',
+						'bookmark',
+						'post',
+					), $post_data['post_id'], $user->data['user_id']);
+
+					// Notify Poster?
+					if ($notify_poster)
 					{
 						if ($post_data['poster_id'] == ANONYMOUS)
 						{
 							continue;
 						}
 
-						$messenger->template('post_approved', $post_data['user_lang']);
-
-						$messenger->to($post_data['user_email'], $post_data['username']);
-						$messenger->im($post_data['user_jabber'], $post_data['username']);
-
-						$messenger->assign_vars(array(
-							'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
-							'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
-							'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])),
-
-							'U_VIEW_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&e=0",
-							'U_VIEW_POST'	=> generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&p=$post_id&e=$post_id")
-						);
-
-						$messenger->send($post_data['user_notify_type']);
+						$phpbb_notifications->add_notifications('approve_post', $post_data);
 					}
 				}
-
-				$messenger->save_queue();
-
-				// Send out normal user notifications
-				$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
-
-				foreach ($post_info as $post_id => $post_data)
-				{
-					// Topic Notifications
-					user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
-				}
 			}
 		}
 		else
@@ -818,41 +811,27 @@ class mcp_queue
 			// Only send out the mails, when the posts are being approved
 			if ($action == 'approve')
 			{
-				$messenger = new messenger();
-
-				// Notify Poster?
-				if ($notify_poster)
-				{
-					foreach ($topic_info as $topic_id => $topic_data)
-					{
-						if ($topic_data['topic_poster'] == ANONYMOUS)
-						{
-							continue;
-						}
-
-						$messenger->template('topic_approved', $topic_data['user_lang']);
-						$messenger->to($topic_data['user_email'], $topic_data['username']);
-						$messenger->im($topic_data['user_jabber'], $topic_data['username']);
-
-						$messenger->assign_vars(array(
-							'USERNAME'		=> htmlspecialchars_decode($topic_data['username']),
-							'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($topic_data['topic_title'])),
-							'U_VIEW_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?f={$topic_data['forum_id']}&t={$topic_data['topic_id']}&e=0",
-						));
-
-						$messenger->send($topic_data['user_notify_type']);
-					}
-				}
-
-				$messenger->save_queue();
-
 				// Send out normal user notifications
 				$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
+				// Handle notifications
+				$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 				foreach ($topic_info as $topic_id => $topic_data)
 				{
-					// Forum Notifications
-					user_notification('post', $topic_data['topic_title'], $topic_data['topic_title'], $topic_data['forum_name'], $topic_data['forum_id'], $topic_data['topic_id'], 0);
+					$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
+					$phpbb_notifications->add_notifications(array(
+						'quote',
+						'topic',
+					), $post_data);
+
+					$phpbb_notifications->mark_notifications_read('quote', $post_data['post_id'], $user->data['user_id']);
+					$phpbb_notifications->mark_notifications_read('topic', $post_data['topic_id'], $user->data['user_id']);
+
+					if ($notify_poster)
+					{
+						$phpbb_notifications->add_notifications('approve_topic', $post_data);
+					}
 				}
 			}
 		}
@@ -1068,20 +1047,33 @@ class mcp_queue
 				}
 			}
 
-			$messenger = new messenger();
+			$phpbb_notifications = $phpbb_container->get('notification_manager');
 
-			// Notify Poster?
-			if ($notify_poster)
+			$lang_reasons = array();
+
+			foreach ($post_info as $post_id => $post_data)
 			{
-				$lang_reasons = array();
+				$disapprove_all_posts_in_topic = $topic_information[$topic_id]['topic_posts_approved'] == 0 &&
+					$topic_information[$topic_id]['topic_posts_softdeleted'] == 0 &&
+					$topic_information[$topic_id]['topic_posts_unapproved'] == $topic_posts_unapproved[$topic_id];
 
-				foreach ($post_info as $post_id => $post_data)
+				$phpbb_notifications->delete_notifications('post_in_queue', $post_id);
+
+				// Do we disapprove the whole topic? Remove potential notifications
+				if ($disapprove_all_posts_in_topic)
+				{
+					$phpbb_notifications->delete_notifications('topic_in_queue', $post_data['topic_id']);
+				}
+
+				// Notify Poster?
+				if ($notify_poster)
 				{
 					if ($post_data['poster_id'] == ANONYMOUS)
 					{
 						continue;
 					}
 
+					$post_data['disapprove_reason'] = '';
 					if (isset($disapprove_reason_lang))
 					{
 						// Okay we need to get the reason from the posters language
@@ -1107,32 +1099,27 @@ class mcp_queue
 							}
 						}
 
-						$email_disapprove_reason = $lang_reasons[$post_data['user_lang']];
-						$email_disapprove_reason .= ($reason) ? "\n\n" . $reason : '';
+						$post_data['disapprove_reason'] = $lang_reasons[$post_data['user_lang']];
+						$post_data['disapprove_reason'] .= ($reason) ? "\n\n" . $reason : '';
 					}
 
-					$email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_disapproved' : 'post_disapproved';
-
-					$messenger->template($email_template, $post_data['user_lang']);
 
-					$messenger->to($post_data['user_email'], $post_data['username']);
-					$messenger->im($post_data['user_jabber'], $post_data['username']);
-
-					$messenger->assign_vars(array(
-						'USERNAME'		=> htmlspecialchars_decode($post_data['username']),
-						'REASON'		=> htmlspecialchars_decode($email_disapprove_reason),
-						'POST_SUBJECT'	=> htmlspecialchars_decode(censor_text($post_data['post_subject'])),
-						'TOPIC_TITLE'	=> htmlspecialchars_decode(censor_text($post_data['topic_title'])))
-					);
-
-					$messenger->send($post_data['user_notify_type']);
+					if ($disapprove_all_posts_in_topic && $topic_information[$topic_id]['topic_posts_unapproved'] == 1)
+					{
+						// If there is only 1 post when disapproving the topic,
+						// we send the user a "disapprove topic" notification...
+						$phpbb_notifications->add_notifications('disapprove_topic', $post_data);
+					}
+					else
+					{
+						// ... otherwise there are multiple unapproved posts and
+						// all of them are disapproved as posts.
+						$phpbb_notifications->add_notifications('disapprove_post', $post_data);
+					}
 				}
-
-				unset($lang_reasons);
 			}
-			unset($post_info, $disapprove_reason, $email_disapprove_reason, $disapprove_reason_lang);
 
-			$messenger->save_queue();
+			unset($lang_reasons,$post_info, $disapprove_reason, $email_disapprove_reason, $disapprove_reason_lang);
 
 			if ($num_disapproved_topics)
 			{
-- 
cgit v1.2.1


From ab4c1b5d0c07dcf60e4dc41a4b6b4abfec64cd1e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 5 Mar 2013 10:28:52 -0600
Subject: [ticket/11400] If email is disabled, disable it for notifications

PHPBB3-11400
---
 phpBB/includes/notification/method/email.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index 429dfda2ba..4a7fea6df3 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -53,8 +53,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 	*/
 	public function is_available()
 	{
-		// Email is always available
-		return true;
+		return (bool) $this->config['email_enable'];
 	}
 
 	/**
-- 
cgit v1.2.1


From 6c6912f9e65f0683a806548bdc1a3526ed9ae107 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 5 Mar 2013 18:23:13 +0100
Subject: [ticket/9657] FIx merge conflict from merging develop

PHPBB3-9657
---
 phpBB/includes/search/fulltext_native.php   | 6 +-----
 phpBB/includes/search/fulltext_postgres.php | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 90ea553ddc..2a9b552928 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -913,11 +913,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-<<<<<<< HEAD
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
-=======
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
->>>>>>> bee4f8d8185d4ff5278be758db4ea4a814f09b4f
+	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No author? No posts
 		if (!sizeof($author_ary))
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index d5deb47222..8ccd27f43a 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -546,11 +546,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-<<<<<<< HEAD
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
-=======
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
->>>>>>> bee4f8d8185d4ff5278be758db4ea4a814f09b4f
+	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No author? No posts
 		if (!sizeof($author_ary))
-- 
cgit v1.2.1


From 0eb6f56a9ae6af541e4c12dec0235da0b508d65d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 5 Mar 2013 11:46:58 -0600
Subject: [ticket/11402] Fix undefined index in post/topic_in_queue

PHPBB3-11402
---
 phpBB/includes/notification/type/post_in_queue.php | 18 ++++++++++++----
 .../includes/notification/type/topic_in_queue.php  | 25 ++++++++++++++++++----
 2 files changed, 35 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 1c29bee3cd..9c719205e6 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -64,9 +64,9 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 	*/
 	public function is_available()
 	{
-		$m_approve = $this->auth->acl_getf($this->permission, true);
+		$has_permission = $this->auth->acl_getf($this->permission, true);
 
-		return (!empty($m_approve));
+		return (!empty($has_permission));
 	}
 
 	/**
@@ -90,9 +90,19 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 			return array();
 		}
 
-		$auth_approve[$post['forum_id']] = array_unique(array_merge($auth_approve[$post['forum_id']], $auth_approve[0]));
+		$has_permission = array();
 
-		return $this->check_user_notification_options($auth_approve[$post['forum_id']][$this->permission], array_merge($options, array(
+		if (isset($auth_approve[$post['forum_id']][$this->permission]))
+		{
+			$has_permission = $auth_approve[$post['forum_id']][$this->permission];
+		}
+
+		if (isset($auth_approve[0][$this->permission]))
+		{
+			$has_permission = array_unique(array_merge($has_permission, $auth_approve[0][$this->permission]));
+		}
+
+		return $this->check_user_notification_options($has_permission, array_merge($options, array(
 			'item_type'		=> self::$notification_option['id'],
 		)));
 	}
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index dc0b9f9869..c501434c43 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -52,14 +52,21 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
 	);
 
+	/**
+	* Permission to check for (in find_users_for_notification)
+	*
+	* @var string Permission name
+	*/
+	protected $permission = 'm_approve';
+
 	/**
 	* Is available
 	*/
 	public function is_available()
 	{
-		$m_approve = $this->auth->acl_getf('m_approve', true);
+		$has_permission = $this->auth->acl_getf($this->permission, true);
 
-		return (!empty($m_approve));
+		return (!empty($has_permission));
 	}
 
 	/**
@@ -83,9 +90,19 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 			return array();
 		}
 
-		$auth_approve[$topic['forum_id']] = array_unique(array_merge($auth_approve[$topic['forum_id']], $auth_approve[0]));
+		$has_permission = array();
+
+		if (isset($auth_approve[$topic['forum_id']][$this->permission]))
+		{
+			$has_permission = $auth_approve[$topic['forum_id']][$this->permission];
+		}
+
+		if (isset($auth_approve[0][$this->permission]))
+		{
+			$has_permission = array_unique(array_merge($has_permission, $auth_approve[0][$this->permission]));
+		}
 
-		return $this->check_user_notification_options($auth_approve[$topic['forum_id']]['m_approve'], array_merge($options, array(
+		return $this->check_user_notification_options($has_permission, array_merge($options, array(
 			'item_type'		=> self::$notification_option['id'],
 		)));
 	}
-- 
cgit v1.2.1


From 50b557ca4e0a80b3f153bc43f261e6b59e197371 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Mar 2013 22:00:37 +0100
Subject: [ticket/10202] Implementation of config options with arbitrary length
 values.

PHPBB3-10202
---
 phpBB/includes/config/db_text.php | 157 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 phpBB/includes/config/db_text.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/config/db_text.php b/phpBB/includes/config/db_text.php
new file mode 100644
index 0000000000..79f83391f8
--- /dev/null
+++ b/phpBB/includes/config/db_text.php
@@ -0,0 +1,157 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Manages configuration options with an arbitrary length value stored in a TEXT
+* column. In constrast to class phpbb_config_db, values are never cached and
+* prefetched, but every get operation sends a query to the database.
+*
+* @package phpBB3
+*/
+class phpbb_config_db_text
+{
+	/**
+	* Database connection
+	* @var phpbb_db_driver
+	*/
+	protected $db;
+
+	/**
+	* Name of the database table used.
+	* @var string
+	*/
+	protected $table;
+
+	/**
+	* @param phpbb_db_driver $db        Database connection
+	* @param string          $table     Table name
+	*/
+	public function __construct(phpbb_db_driver $db, $table)
+	{
+		$this->db = $db;
+		$this->table = $table;
+	}
+
+	/**
+	* Sets the configuration option with the name $key to $value.
+	*
+	* @param string $key       The configuration option's name
+	* @param string $value     New configuration value
+	*
+	* @return null
+	*/
+	public function set($key, $value)
+	{
+		$this->setAll(array($key => $value));
+	}
+
+	/**
+	* Gets the configuration value for the name $key.
+	*
+	* @param string $key       The configuration option's name
+	*
+	* @return string|null      String result on success
+	*                          null if there is no such option
+	*/
+	public function get($key)
+	{
+		$map = $this->getAll(array($key));
+
+		return isset($map[$key]) ? $map[$key] : null;
+	}
+
+	/**
+	* Removes a configuration option
+	*
+	* @param string $key       The configuration option's name
+	*
+	* @return null
+	*/
+	public function delete($key)
+	{
+		$this->deleteAll(array($key));
+	}
+
+	/**
+	* Sets a configuration option's value
+	*
+	* @param array $map        Map from configuration names to values
+	*
+	* @return null
+	*/
+	public function setAll(array $map)
+	{
+		$this->db->sql_transaction('begin');
+
+		foreach ($map as $key => $value)
+		{
+			$sql = 'UPDATE ' . $this->table . "
+				SET config_value = '" . $this->db->sql_escape($value) . "'
+				WHERE config_name = '" . $this->db->sql_escape($key) . "'";
+			$result = $this->db->sql_query($sql);
+
+			if (!$this->db->sql_affectedrows($result))
+			{
+				$sql = 'INSERT INTO ' . $this->table . ' ' . $this->db->sql_build_array('INSERT', array(
+					'config_name'	=> $key,
+					'config_value'	=> $value,
+				));
+				$this->db->sql_query($sql);
+			}
+		}
+
+		$this->db->sql_transaction('commit');
+	}
+
+	/**
+	* Gets a set of configuration options as a key => value map.
+	*
+	* @param array $keys       Set of configuration option names
+	*
+	* @return array            Map from configuration names to values
+	*/
+	public function getAll(array $keys)
+	{
+		$sql = 'SELECT *
+			FROM ' . $this->table . '
+			WHERE ' . $this->db->sql_in_set('config_name', $keys, false, true);
+		$result = $this->db->sql_query($sql);
+
+		$map = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$map[$row['config_name']] = $row['config_value'];
+		}
+
+		return $map;
+	}
+
+	/**
+	* Removes multiple configuration options
+	*
+	* @param array $keys       Set of configuration option names
+	*
+	* @return null
+	*/
+	public function deleteAll(array $keys)
+	{
+		$sql = 'DELETE
+			FROM ' . $this->table . '
+			WHERE ' . $this->db->sql_in_set('config_name', $keys, false, true);
+		$result = $this->db->sql_query($sql);
+	}
+}
-- 
cgit v1.2.1


From a73b76cb24bcbde96735d343d2a22e6723de8390 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 5 Mar 2013 02:26:46 +0100
Subject: [ticket/10202] Adjust method names to guidelines.

PHPBB3-10202
---
 phpBB/includes/config/db_text.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/config/db_text.php b/phpBB/includes/config/db_text.php
index 79f83391f8..05ba4ddabf 100644
--- a/phpBB/includes/config/db_text.php
+++ b/phpBB/includes/config/db_text.php
@@ -56,7 +56,7 @@ class phpbb_config_db_text
 	*/
 	public function set($key, $value)
 	{
-		$this->setAll(array($key => $value));
+		$this->set_all(array($key => $value));
 	}
 
 	/**
@@ -69,7 +69,7 @@ class phpbb_config_db_text
 	*/
 	public function get($key)
 	{
-		$map = $this->getAll(array($key));
+		$map = $this->get_all(array($key));
 
 		return isset($map[$key]) ? $map[$key] : null;
 	}
@@ -83,7 +83,7 @@ class phpbb_config_db_text
 	*/
 	public function delete($key)
 	{
-		$this->deleteAll(array($key));
+		$this->delete_all(array($key));
 	}
 
 	/**
@@ -93,7 +93,7 @@ class phpbb_config_db_text
 	*
 	* @return null
 	*/
-	public function setAll(array $map)
+	public function set_all(array $map)
 	{
 		$this->db->sql_transaction('begin');
 
@@ -124,7 +124,7 @@ class phpbb_config_db_text
 	*
 	* @return array            Map from configuration names to values
 	*/
-	public function getAll(array $keys)
+	public function get_all(array $keys)
 	{
 		$sql = 'SELECT *
 			FROM ' . $this->table . '
@@ -147,7 +147,7 @@ class phpbb_config_db_text
 	*
 	* @return null
 	*/
-	public function deleteAll(array $keys)
+	public function delete_all(array $keys)
 	{
 		$sql = 'DELETE
 			FROM ' . $this->table . '
-- 
cgit v1.2.1


From 95764c4f0e6b1ceef7b14e2394637891482ade43 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 5 Mar 2013 03:41:26 +0100
Subject: [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT
 queries.

PHPBB3-10202
---
 phpBB/includes/config/db_text.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/config/db_text.php b/phpBB/includes/config/db_text.php
index 05ba4ddabf..0c18675ffc 100644
--- a/phpBB/includes/config/db_text.php
+++ b/phpBB/includes/config/db_text.php
@@ -136,6 +136,7 @@ class phpbb_config_db_text
 		{
 			$map[$row['config_name']] = $row['config_value'];
 		}
+		$this->db->sql_freeresult($result);
 
 		return $map;
 	}
-- 
cgit v1.2.1


From af02681960257a1df344275b2a1eb2893bc470df Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 5 Mar 2013 03:43:51 +0100
Subject: [ticket/10202] SQL escape the table name.

PHPBB3-10202
---
 phpBB/includes/config/db_text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/config/db_text.php b/phpBB/includes/config/db_text.php
index 0c18675ffc..7563a228f5 100644
--- a/phpBB/includes/config/db_text.php
+++ b/phpBB/includes/config/db_text.php
@@ -43,7 +43,7 @@ class phpbb_config_db_text
 	public function __construct(phpbb_db_driver $db, $table)
 	{
 		$this->db = $db;
-		$this->table = $table;
+		$this->table = $this->db->sql_escape($table);
 	}
 
 	/**
-- 
cgit v1.2.1


From 0071ad3bfd88780af24ebf9cb4d02eac76369994 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 5 Mar 2013 04:02:05 +0100
Subject: [ticket/10202] Improve method documentation.

PHPBB3-10202
---
 phpBB/includes/config/db_text.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/config/db_text.php b/phpBB/includes/config/db_text.php
index 7563a228f5..6449a2e02b 100644
--- a/phpBB/includes/config/db_text.php
+++ b/phpBB/includes/config/db_text.php
@@ -75,7 +75,7 @@ class phpbb_config_db_text
 	}
 
 	/**
-	* Removes a configuration option
+	* Removes the configuration option with the name $key.
 	*
 	* @param string $key       The configuration option's name
 	*
@@ -87,7 +87,9 @@ class phpbb_config_db_text
 	}
 
 	/**
-	* Sets a configuration option's value
+	* Mass set configuration options: Receives an associative array,
+	* treats array keys as configuration option names and associated
+	* array values as their configuration option values.
 	*
 	* @param array $map        Map from configuration names to values
 	*
@@ -118,7 +120,10 @@ class phpbb_config_db_text
 	}
 
 	/**
-	* Gets a set of configuration options as a key => value map.
+	* Mass get configuration options: Receives a set of configuration
+	* option names and returns the result as a key => value map where
+	* array keys are configuration option names and array values are
+	* associated config option values.
 	*
 	* @param array $keys       Set of configuration option names
 	*
@@ -142,7 +147,7 @@ class phpbb_config_db_text
 	}
 
 	/**
-	* Removes multiple configuration options
+	* Mass delete configuration options.
 	*
 	* @param array $keys       Set of configuration option names
 	*
-- 
cgit v1.2.1


From 3a4b34ca3240c5f66faae8faa1c50baea1d6e108 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 5 Mar 2013 22:58:19 +0100
Subject: [ticket/10202] Add migration file for config_db_text.

PHPBB3-10202
---
 .../db/migration/data/310/config_db_text.php       | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 phpBB/includes/db/migration/data/310/config_db_text.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/config_db_text.php b/phpBB/includes/db/migration/data/310/config_db_text.php
new file mode 100644
index 0000000000..89f211adda
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/config_db_text.php
@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_config_db_text extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'config_text');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables' => array(
+				$this->table_prefix . 'config_text' => array(
+					'COLUMNS' => array(
+						'config_name'	=> array('VCHAR', ''),
+						'config_value'	=> array('MTEXT', ''),
+					),
+					'PRIMARY_KEY' => 'config_name',
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables' => array(
+				$this->table_prefix . 'config_text',
+			),
+		);
+	}
+}
-- 
cgit v1.2.1


From 32ff2348f10aed1aad3b78e7677dca34335b7adb Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 5 Mar 2013 23:15:46 +0100
Subject: [ticket/10202] Rename method names _all() to _array().

PHPBB3-10202
---
 phpBB/includes/config/db_text.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/config/db_text.php b/phpBB/includes/config/db_text.php
index 6449a2e02b..b365cb5c77 100644
--- a/phpBB/includes/config/db_text.php
+++ b/phpBB/includes/config/db_text.php
@@ -56,7 +56,7 @@ class phpbb_config_db_text
 	*/
 	public function set($key, $value)
 	{
-		$this->set_all(array($key => $value));
+		$this->set_array(array($key => $value));
 	}
 
 	/**
@@ -69,7 +69,7 @@ class phpbb_config_db_text
 	*/
 	public function get($key)
 	{
-		$map = $this->get_all(array($key));
+		$map = $this->get_array(array($key));
 
 		return isset($map[$key]) ? $map[$key] : null;
 	}
@@ -83,7 +83,7 @@ class phpbb_config_db_text
 	*/
 	public function delete($key)
 	{
-		$this->delete_all(array($key));
+		$this->delete_array(array($key));
 	}
 
 	/**
@@ -95,7 +95,7 @@ class phpbb_config_db_text
 	*
 	* @return null
 	*/
-	public function set_all(array $map)
+	public function set_array(array $map)
 	{
 		$this->db->sql_transaction('begin');
 
@@ -129,7 +129,7 @@ class phpbb_config_db_text
 	*
 	* @return array            Map from configuration names to values
 	*/
-	public function get_all(array $keys)
+	public function get_array(array $keys)
 	{
 		$sql = 'SELECT *
 			FROM ' . $this->table . '
@@ -153,7 +153,7 @@ class phpbb_config_db_text
 	*
 	* @return null
 	*/
-	public function delete_all(array $keys)
+	public function delete_array(array $keys)
 	{
 		$sql = 'DELETE
 			FROM ' . $this->table . '
-- 
cgit v1.2.1


From 5963905825ed65a522fe94e380c6c179a461e437 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 6 Mar 2013 11:32:23 +0100
Subject: [ticket/11404] Return empty array of avatar data if $row is empty

While creating a group in the acp, the group data ($group_row) is empty.
Due to that array_combine in phpbb_avatar_manager::clean_row() will cause
PHP Warnings. In addition to that the required indexes 'avatar',
'avatar_width', 'avatar_height', and 'avatar_type' won't be defined. This
patch will solve that issue.

PHPBB3-11404
---
 phpBB/includes/avatar/manager.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 9c60436de8..f126d69300 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -177,6 +177,17 @@ class phpbb_avatar_manager
 		$keys = array_keys($row);
 		$values = array_values($row);
 
+		// Upon creation of a user/group $row might be empty
+		if (empty($keys))
+		{
+			return array(
+				'avatar'		=> '',
+				'avatar_type'	=> '',
+				'avatar_width'	=> '',
+				'avatar_height'	=> '',
+			);
+		}
+
 		$keys = array_map(array('phpbb_avatar_manager', 'strip_prefix'), $keys);
 
 		return array_combine($keys, $values);
-- 
cgit v1.2.1


From e1f5e98fbca5c3f989a829fa763a471e04082e64 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 6 Mar 2013 12:26:43 +0100
Subject: [ticket/9657] Correctly state when to refresh last/first post info on
 approving

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 01abdc82d8..0e835b0aa9 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -613,12 +613,14 @@ class mcp_queue
 				$topic_info[$topic_id]['posts'][] = (int) $post_id;
 				$topic_info[$topic_id]['forum_id'] = (int) $post_data['forum_id'];
 
-				if ($post_id == $post_data['topic_first_post_id'])
+				// Refresh the first post, if the time or id is older then the current one
+				if ($post_id <= $post_data['topic_first_post_id'] || $post_data['post_time'] <= $post_data['topic_time'])
 				{
 					$topic_info[$topic_id]['first_post'] = true;
 				}
 
-				if ($post_id == $post_data['topic_last_post_id'])
+				// Refresh the last post, if the time or id is newer then the current one
+				if ($post_id >= $post_data['topic_last_post_id'] || $post_data['post_time'] >= $post_data['topic_last_post_time'])
 				{
 					$topic_info[$topic_id]['last_post'] = true;
 				}
-- 
cgit v1.2.1


From 9bddf73d315de89fc65b74bcc81aca8dfe57a796 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 6 Mar 2013 13:52:11 +0100
Subject: [ticket/9657] Add migration files for updating the database

PHPBB3-9657
---
 .../db/migration/data/310/softdelete_p1.php        | 171 +++++++++++++++++++++
 .../db/migration/data/310/softdelete_p2.php        |  74 +++++++++
 2 files changed, 245 insertions(+)
 create mode 100644 phpBB/includes/db/migration/data/310/softdelete_p1.php
 create mode 100644 phpBB/includes/db/migration/data/310/softdelete_p2.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/softdelete_p1.php b/phpBB/includes/db/migration/data/310/softdelete_p1.php
new file mode 100644
index 0000000000..35f6138ef6
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/softdelete_p1.php
@@ -0,0 +1,171 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_softdelete_p1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_column_exists($this->table_prefix . 'posts', 'post_visibility');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_dev');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns'		=> array(
+				$this->table_prefix . 'forums'		=> array(
+					'forum_posts_approved'		=> array('UINT', 0),
+					'forum_posts_unapproved'	=> array('UINT', 0),
+					'forum_posts_softdeleted'	=> array('UINT', 0),
+					'forum_topics_approved'		=> array('UINT', 0),
+					'forum_topics_unapproved'	=> array('UINT', 0),
+					'forum_topics_softdeleted'	=> array('UINT', 0),
+				),
+				$this->table_prefix . 'posts'		=> array(
+					'post_visibility'		=> array('TINT:3', 0),
+					'post_delete_time'		=> array('TIMESTAMP', 0),
+					'post_delete_reason'	=> array('STEXT_UNI', ''),
+					'post_delete_user'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'topics'		=> array(
+					'topic_visibility'		=> array('TINT:3', 0),
+					'topic_delete_time'		=> array('TIMESTAMP', 0),
+					'topic_delete_reason'	=> array('STEXT_UNI', ''),
+					'topic_delete_user'		=> array('UINT', 0),
+					'topic_posts_approved'		=> array('UINT', 0),
+					'topic_posts_unapproved'	=> array('UINT', 0),
+					'topic_posts_softdeleted'	=> array('UINT', 0),
+				),
+			),
+			'add_index'		=> array(
+				$this->table_prefix . 'posts'		=> array(
+					'post_visibility'		=> array('post_visibility'),
+				),
+				$this->table_prefix . 'topics'		=> array(
+					'topic_visibility'		=> array('topic_visibility'),
+					'forum_vis_last'		=> array('forum_id', 'topic_visibility', 'topic_last_post_id'),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns'		=> array(
+				$this->table_prefix . 'forums'		=> array(
+					'forum_posts_approved',
+					'forum_posts_unapproved',
+					'forum_posts_softdeleted',
+					'forum_topics_approved',
+					'forum_topics_unapproved',
+					'forum_topics_softdeleted',
+				),
+				$this->table_prefix . 'posts'		=> array(
+					'post_visibility',
+					'post_delete_time',
+					'post_delete_reason',
+					'post_delete_user',
+				),
+				$this->table_prefix . 'topics'		=> array(
+					'topic_visibility',
+					'topic_delete_time',
+					'topic_delete_reason',
+					'topic_delete_user',
+					'topic_posts_approved',
+					'topic_posts_unapproved',
+					'topic_posts_softdeleted',
+				),
+			),
+			'drop_keys'		=> array(
+				$this->table_prefix . 'posts'		=> array('post_visibility'),
+				$this->table_prefix . 'topics'	=> array('topic_visibility', 'forum_vis_last'),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_post_visibility'))),
+			array('custom', array(array($this, 'update_topic_visibility'))),
+			array('custom', array(array($this, 'update_topic_forum_counts'))),
+
+			array('permission.add', array('f_softdelete', false)),
+			array('permission.add', array('m_softdelete', false)),
+		);
+	}
+
+	public function update_post_visibility()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . 'posts
+			SET post_visibility = post_approved';
+		$this->sql_query($sql);
+	}
+
+	public function update_topic_visibility()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . 'topics
+			SET topic_visibility = topic_approved';
+		$this->sql_query($sql);
+	}
+
+	public function update_topic_forum_counts()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . 'topics
+			SET topic_posts_approved = topic_replies + 1,
+				topic_posts_unapproved = topic_replies_real - topic_replies
+			WHERE topic_visibility = ' . ITEM_APPROVED;
+		$this->sql_query($sql);
+
+		$sql = 'UPDATE ' . $this->table_prefix . 'topics
+			SET topic_posts_approved = 0,
+				topic_posts_unapproved = (topic_replies_real - topic_replies) + 1
+			WHERE topic_visibility = ' . ITEM_UNAPPROVED;
+		$this->sql_query($sql);
+
+		$sql = 'SELECT forum_id, topic_visibility, COUNT(topic_id) AS sum_topics, SUM(topic_posts) AS sum_posts, SUM(topic_posts_unapproved) AS sum_posts_unapproved
+			FROM ' . $this->table_prefix . 'topics
+			GROUP BY forum_id, topic_visibility';
+		$result = $this->db->sql_query($sql);
+
+		$update_forums = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$forum_id = (int) $row['forum_id'];
+			if (!isset($update_forums[$forum_id]))
+			{
+				$update_forums[$forum_id] = array(
+					'forum_posts_approved'		=> 0,
+					'forum_posts_unapproved'	=> 0,
+					'forum_topics_approved'		=> 0,
+					'forum_topics_unapproved'	=> 0,
+				);
+			}
+
+			$update_forums[$forum_id]['forum_posts_approved'] += (int) $row['sum_posts'];
+			$update_forums[$forum_id]['forum_posts_unapproved'] += (int) $row['sum_posts_unapproved'];
+
+			$update_forums[$forum_id][(($row['topic_visibility'] == ITEM_APPROVED) ? 'forum_topics_approved' : 'forum_topics_unapproved')] += (int) $row['sum_topics'];
+		}
+		$this->db->sql_freeresult($result);
+
+		foreach ($update_forums as $forum_id => $forum_data)
+		{
+			$sql = 'UPDATE ' . FORUMS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $forum_data) . '
+				WHERE forum_id = ' . $forum_id;
+			$this->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/softdelete_p2.php b/phpBB/includes/db/migration/data/310/softdelete_p2.php
new file mode 100644
index 0000000000..15de8e7185
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/softdelete_p2.php
@@ -0,0 +1,74 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_softdelete_p2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_column_exists($this->table_prefix . 'posts', 'post_approved');
+	}
+
+	static public function depends_on()
+	{
+		return array(
+			'phpbb_db_migration_data_310_dev',
+			'phpbb_db_migration_data_310_softdelete_p1',
+		);
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_columns'		=> array(
+				$this->table_prefix . 'forums'			=> array('forum_posts', 'forum_topics', 'forum_topics_real'),
+				$this->table_prefix . 'posts'			=> array('post_approved'),
+				$this->table_prefix . 'topics'			=> array('topic_approved', 'topic_replies', 'topic_replies_real'),
+			),
+			'drop_keys'		=> array(
+				$this->table_prefix . 'posts'			=> array('post_approved'),
+				$this->table_prefix . 'topics'			=> array('forum_appr_last'),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_columns'		=> array(
+				$this->table_prefix . 'forums'			=> array(
+					'forum_posts'			=> array('UINT', 0),
+					'forum_topics'			=> array('UINT', 0),
+					'forum_topics_real'		=> array('UINT', 0),
+				),
+				$this->table_prefix . 'posts'			=> array(
+					'post_approved'			=> array('BOOL', 1),
+				),
+				$this->table_prefix . 'topics'		=> array(
+					'topic_approved'			=> array('BOOL', 1),
+					'topic_replies'				=> array('UINT', 0),
+					'topic_replies_real'		=> array('UINT', 0),
+				),
+			),
+			'add_index'		=> array(
+				$this->table_prefix . 'posts'			=> array(
+					'post_approved'		=> array('post_approved'),
+				),
+				$this->table_prefix . 'topics'		=> array(
+					'forum_appr_last'	=> array('forum_id', 'topic_approved', 'topic_last_post_id'),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+		);
+	}
+}
-- 
cgit v1.2.1


From 74a9ecfd24e745a0c0ad394bac915d121ea72278 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 6 Mar 2013 16:29:50 +0100
Subject: [ticket/9657] Fix wrongly added notifications when post is posted
 softdeleted

The post/topic should not trigger "*_in_queue" notifications if it is
softdeleted, as it is not in the queue then.

PHPBB3-9657
---
 phpBB/includes/functions_posting.php | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index f9dacae655..d2ff095e25 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2214,7 +2214,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			break;
 		}
 	}
-	else
+	else if ($post_visibility == ITEM_UNAPPROVED)
 	{
 		switch ($mode)
 		{
@@ -2231,6 +2231,32 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			case 'edit_first_post':
 			case 'edit':
 			case 'edit_last_post':
+				// @todo: Check whether these notification deletions are correct
+				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
+
+				$phpbb_notifications->delete_notifications(array(
+					'quote',
+					'bookmark',
+					'post',
+				), $data['post_id']);
+			break;
+		}
+	}
+	else if ($post_visibility == ITEM_DELETED)
+	{
+		switch ($mode)
+		{
+			case 'post':
+			case 'reply':
+			case 'quote':
+				// Nothing to do here
+			break;
+
+			case 'edit_topic':
+			case 'edit_first_post':
+			case 'edit':
+			case 'edit_last_post':
+				// @todo: Check whether these notification deletions are correct
 				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
 
 				$phpbb_notifications->delete_notifications(array(
-- 
cgit v1.2.1


From 3aab72d79bdad45933e87ebce39483a7664ffd68 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 6 Mar 2013 09:53:41 -0600
Subject: [ticket/11408] user_jabber instead of jabber

PHPBB3-11408
---
 phpBB/includes/notification/method/jabber.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
index e3eb571fbc..863846b8a5 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/includes/notification/method/jabber.php
@@ -53,7 +53,7 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
 	*/
 	public function is_available()
 	{
-		return ($this->global_available() && $this->user->data['jabber']);
+		return ($this->global_available() && $this->user->data['user_jabber']);
 	}
 
 	/**
-- 
cgit v1.2.1


From bb584627248cc95443ebda511fca51effea6d0af Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 7 Mar 2013 13:03:27 +0100
Subject: [ticket/11404] Use a default data row if $row is empty in clean_row()

A statically defined $default_row will be used inside the
phpbb_avatar_manager::clean_row() method if the $row passed to it is
empty.

PHPBB3-11404
---
 phpBB/includes/avatar/manager.php | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index f126d69300..58d994c3c0 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -45,6 +45,17 @@ class phpbb_avatar_manager
 	*/
 	protected $container;
 
+	/**
+	* Default avatar data row
+	* @var array
+	*/
+	static protected $default_row = array(
+		'avatar'		=> '',
+		'avatar_type'	=> '',
+		'avatar_width'	=> '',
+		'avatar_height'	=> '',
+	);
+
 	/**
 	* Construct an avatar manager object
 	*
@@ -174,20 +185,15 @@ class phpbb_avatar_manager
 	*/
 	static public function clean_row($row)
 	{
-		$keys = array_keys($row);
-		$values = array_values($row);
-
 		// Upon creation of a user/group $row might be empty
-		if (empty($keys))
+		if (empty($row))
 		{
-			return array(
-				'avatar'		=> '',
-				'avatar_type'	=> '',
-				'avatar_width'	=> '',
-				'avatar_height'	=> '',
-			);
+			return self::$default_row;
 		}
 
+		$keys = array_keys($row);
+		$values = array_values($row);
+
 		$keys = array_map(array('phpbb_avatar_manager', 'strip_prefix'), $keys);
 
 		return array_combine($keys, $values);
-- 
cgit v1.2.1


From 60c0da8b54e5347e472d2ce97e756623717fd011 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 7 Mar 2013 13:15:55 +0100
Subject: [ticket/9657] Remove empty update_data() method from p2 migration

PHPBB3-9657
---
 phpBB/includes/db/migration/data/310/softdelete_p2.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/softdelete_p2.php b/phpBB/includes/db/migration/data/310/softdelete_p2.php
index 15de8e7185..7320a2c2bf 100644
--- a/phpBB/includes/db/migration/data/310/softdelete_p2.php
+++ b/phpBB/includes/db/migration/data/310/softdelete_p2.php
@@ -65,10 +65,4 @@ class phpbb_db_migration_data_310_softdelete_p2 extends phpbb_db_migration
 			),
 		);
 	}
-
-	public function update_data()
-	{
-		return array(
-		);
-	}
 }
-- 
cgit v1.2.1


From bff6cf40ba03320247c777d651d47673b3d36d2b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 7 Mar 2013 14:02:11 +0100
Subject: [ticket/9657] Fix colum name in migration file

PHPBB3-9657
---
 phpBB/includes/db/migration/data/310/softdelete_p1.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/softdelete_p1.php b/phpBB/includes/db/migration/data/310/softdelete_p1.php
index 35f6138ef6..84f8eebd4a 100644
--- a/phpBB/includes/db/migration/data/310/softdelete_p1.php
+++ b/phpBB/includes/db/migration/data/310/softdelete_p1.php
@@ -134,7 +134,7 @@ class phpbb_db_migration_data_310_softdelete_p1 extends phpbb_db_migration
 			WHERE topic_visibility = ' . ITEM_UNAPPROVED;
 		$this->sql_query($sql);
 
-		$sql = 'SELECT forum_id, topic_visibility, COUNT(topic_id) AS sum_topics, SUM(topic_posts) AS sum_posts, SUM(topic_posts_unapproved) AS sum_posts_unapproved
+		$sql = 'SELECT forum_id, topic_visibility, COUNT(topic_id) AS sum_topics, SUM(topic_posts_approved) AS sum_posts_approved, SUM(topic_posts_unapproved) AS sum_posts_unapproved
 			FROM ' . $this->table_prefix . 'topics
 			GROUP BY forum_id, topic_visibility';
 		$result = $this->db->sql_query($sql);
@@ -153,7 +153,7 @@ class phpbb_db_migration_data_310_softdelete_p1 extends phpbb_db_migration
 				);
 			}
 
-			$update_forums[$forum_id]['forum_posts_approved'] += (int) $row['sum_posts'];
+			$update_forums[$forum_id]['forum_posts_approved'] += (int) $row['sum_posts_approved'];
 			$update_forums[$forum_id]['forum_posts_unapproved'] += (int) $row['sum_posts_unapproved'];
 
 			$update_forums[$forum_id][(($row['topic_visibility'] == ITEM_APPROVED) ? 'forum_topics_approved' : 'forum_topics_unapproved')] += (int) $row['sum_topics'];
-- 
cgit v1.2.1


From 1a498524138a7a3192ad14ad10f714b34488321f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 7 Mar 2013 14:15:14 +0100
Subject: [ticket/9657] Remove unused email variables

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 0e835b0aa9..4383c5d571 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -654,9 +654,6 @@ class mcp_queue
 			{
 				$phpbb_notifications = $phpbb_container->get('notification_manager');
 
-				// Send out normal user notifications
-				$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
-
 				// Handle notifications
 				foreach ($post_info as $post_id => $post_data)
 				{
@@ -813,9 +810,6 @@ class mcp_queue
 			// Only send out the mails, when the posts are being approved
 			if ($action == 'approve')
 			{
-				// Send out normal user notifications
-				$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
-
 				// Handle notifications
 				$phpbb_notifications = $phpbb_container->get('notification_manager');
 
@@ -961,8 +955,6 @@ class mcp_queue
 				{
 					$disapprove_reason_lang = strtoupper($row['reason_title']);
 				}
-
-				$email_disapprove_reason = $disapprove_reason;
 			}
 		}
 
@@ -1121,7 +1113,7 @@ class mcp_queue
 				}
 			}
 
-			unset($lang_reasons,$post_info, $disapprove_reason, $email_disapprove_reason, $disapprove_reason_lang);
+			unset($lang_reasons, $post_info, $disapprove_reason, $disapprove_reason_lang);
 
 			if ($num_disapproved_topics)
 			{
-- 
cgit v1.2.1


From 36de18e174c1137904d2f318d4f5eb7db9e96ebc Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 9 Mar 2013 09:12:46 -0600
Subject: [ticket/11423] Send unformatted usernames to the email template

PHPBB3-11423
---
 phpBB/includes/notification/type/post.php  | 2 +-
 phpBB/includes/notification/type/topic.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index ddfa720e5e..d8ffdea81d 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -216,7 +216,7 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		}
 		else
 		{
-			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile');
+			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'username');
 		}
 
 		return array(
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
index 2549b29409..22436d3fb1 100644
--- a/phpBB/includes/notification/type/topic.php
+++ b/phpBB/includes/notification/type/topic.php
@@ -178,7 +178,7 @@ class phpbb_notification_type_topic extends phpbb_notification_type_base
 		}
 		else
 		{
-			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile');
+			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'username');
 		}
 
 		return array(
-- 
cgit v1.2.1


From 7db5eec5d28449af2d313f52b4d4c1c4534ba870 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 10 Mar 2013 22:15:29 +0100
Subject: [ticket/9657] Correctly increase users post count when approving
 posts

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 3118be6574..6ca1f8b25c 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -309,8 +309,7 @@ class phpbb_content_visibility
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
 					SET user_posts = user_posts + ' . $num_posts . '
-					WHERE ' . $db->sql_in_set('user_id', $poster_ids) . '
-						AND user_posts >= ' . $num_posts;
+					WHERE ' . $db->sql_in_set('user_id', $poster_ids);
 				$db->sql_query($sql);
 			}
 		}
-- 
cgit v1.2.1


From cc5ba36a061215e0d96f32b67e9f1391e699ac63 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 10 Mar 2013 22:18:37 +0100
Subject: [ticket/9657] Cast IDs to integer

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 6ca1f8b25c..ac827bd822 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -244,13 +244,13 @@ class phpbb_content_visibility
 
 			if ($row['post_visibility'] != $visibility)
 			{
-				if ($row['post_postcount'] && !isset($poster_postcounts[$row['poster_id']]))
+				if ($row['post_postcount'] && !isset($poster_postcounts[(int) $row['poster_id']]))
 				{
-					$poster_postcounts[$row['poster_id']] = 1;
+					$poster_postcounts[(int) $row['poster_id']] = 1;
 				}
 				else if ($row['post_postcount'])
 				{
-					$poster_postcounts[$row['poster_id']]++;
+					$poster_postcounts[(int) $row['poster_id']]++;
 				}
 
 				if (!isset($postcount_visibility[$row['post_visibility']]))
@@ -411,12 +411,12 @@ class phpbb_content_visibility
 				// Update the number for replies and posts
 				$sql = 'UPDATE ' . TOPICS_TABLE . '
 					SET ' . implode(', ', $topic_sql) . '
-					WHERE topic_id = ' . $topic_id;
+					WHERE topic_id = ' . (int) $topic_id;
 				$db->sql_query($sql);
 
 				$sql = 'UPDATE ' . FORUMS_TABLE . '
 					SET ' . implode(', ', $forum_sql) . '
-					WHERE forum_id = ' . $forum_id;
+					WHERE forum_id = ' . (int) $forum_id;
 				$db->sql_query($sql);
 			}
 		}
-- 
cgit v1.2.1


From 147c98fa32ba5c1aeedb73486665a461f3b375aa Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 10 Mar 2013 22:21:38 +0100
Subject: [ticket/9657] Fix newly added empty line

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_forum.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index ddd27a1be2..a7302ce912 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -260,7 +260,6 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 			'S_POSTS_UNAPPROVED'	=> $posts_unapproved,
 			'S_TOPIC_DELETED'		=> $topic_deleted,
 			'S_UNREAD_TOPIC'		=> $unread_topic,
-
 		);
 
 		if ($row['topic_status'] == ITEM_MOVED)
-- 
cgit v1.2.1


From f6dd688e7266ccbd4fda5bb5091cbb9056ebcf20 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 11 Mar 2013 12:40:33 +0100
Subject: [ticket/9657] Fix missing global $phpbb_container

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 4383c5d571..835f19555f 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -904,7 +904,7 @@ class mcp_queue
 	*/
 	static public function disapprove_posts($post_id_list, $id, $mode)
 	{
-		global $db, $template, $user, $config;
+		global $db, $template, $user, $config, $phpbb_container;
 		global $phpEx, $phpbb_root_path, $request;
 
 		if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
-- 
cgit v1.2.1


From b727e1eedaab27c99a733b94bcdddbc55cc929d9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 11 Mar 2013 16:37:43 +0100
Subject: [ticket/9657] Correctly split disapproving from perma deleting posts

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 63 ++++++++++++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 835f19555f..29c0375e6c 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -960,6 +960,17 @@ class mcp_queue
 
 		$post_info = get_post_data($post_id_list, 'm_approve');
 
+		$is_disapproving = false;
+		foreach ($post_info as $post_id => $post_data)
+		{
+			if ($post_data['post_visibility'] == ITEM_DELETED)
+			{
+				continue;
+			}
+
+			$is_disapproving = true;
+		}
+
 		if (confirm_box(true))
 		{
 			$disapprove_log = $disapprove_log_topics = $disapprove_log_posts = array();
@@ -996,6 +1007,7 @@ class mcp_queue
 							'post_subject'	=> $post_info[$post_id]['topic_title'],
 							'forum_id'		=> $post_info[$post_id]['forum_id'],
 							'topic_id'		=> 0, // useless to log a topic id, as it will be deleted
+							'post_username'	=> ($post_info[$post_id]['poster_id'] == ANONYMOUS && !empty($post_info[$post_id]['post_username'])) ? $post_info[$post_id]['post_username'] : $post_info[$post_id]['username'],
 						);
 					}
 				}
@@ -1007,6 +1019,7 @@ class mcp_queue
 						'post_subject'	=> $post_info[$post_id]['post_subject'],
 						'forum_id'		=> $post_info[$post_id]['forum_id'],
 						'topic_id'		=> $post_info[$post_id]['topic_id'],
+						'post_username'	=> ($post_info[$post_id]['poster_id'] == ANONYMOUS && !empty($post_info[$post_id]['post_username'])) ? $post_info[$post_id]['post_username'] : $post_info[$post_id]['username'],
 					);
 
 				}
@@ -1037,7 +1050,16 @@ class mcp_queue
 
 				foreach ($disapprove_log as $log_data)
 				{
-					add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_DISAPPROVED' : 'LOG_POST_DISAPPROVED', $log_data['post_subject'], $disapprove_reason);
+					if ($is_disapproving)
+					{
+						$l_log_message = ($log_data['type'] == 'topic') ? 'LOG_TOPIC_DISAPPROVED' : 'LOG_POST_DISAPPROVED';
+						add_log('mod', $log_data['forum_id'], $log_data['topic_id'], $l_log_message, $log_data['post_subject'], $disapprove_reason);
+					}
+					else
+					{
+						$l_log_message = ($log_data['type'] == 'topic') ? 'LOG_DELETE_TOPIC' : 'LOG_DELETE_POST';
+						add_log('mod', $log_data['forum_id'], $log_data['topic_id'], $l_log_message, $log_data['post_subject'], $log_data['post_username']);
+					}
 				}
 			}
 
@@ -1115,21 +1137,29 @@ class mcp_queue
 
 			unset($lang_reasons, $post_info, $disapprove_reason, $disapprove_reason_lang);
 
+
 			if ($num_disapproved_topics)
 			{
-				$success_msg = ($num_disapproved_topics == 1) ? 'TOPIC_DISAPPROVED_SUCCESS' : 'TOPICS_DISAPPROVED_SUCCESS';
+				$success_msg = ($num_disapproved_topics == 1) ? 'TOPIC' : 'TOPICS';
 			}
 			else
 			{
-				$success_msg = ($num_disapproved_posts == 1) ? 'POST_DISAPPROVED_SUCCESS' : 'POSTS_DISAPPROVED_SUCCESS';
+				$success_msg = ($num_disapproved_posts == 1) ? 'POST' : 'POSTS';
+			}
+
+			if ($is_disapproving)
+			{
+				$success_msg .= '_DISAPPROVED_SUCCESS';
+			}
+			else
+			{
+				$success_msg .= '_DELETED_SUCCESS';
 			}
 		}
 		else
 		{
 			include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 
-			display_reasons($reason_id);
-
 			$show_notify = false;
 
 			foreach ($post_info as $post_data)
@@ -1145,14 +1175,29 @@ class mcp_queue
 				}
 			}
 
+			$l_confirm_msg = 'DISAPPROVE_POST';
+			$confirm_template = 'mcp_approve.html';
+			if ($is_disapproving)
+			{
+				display_reasons($reason_id);
+			}
+			else
+			{
+				$user->add_lang('posting');
+
+				$l_confirm_msg = 'DELETE_POST_PERMANENTLY';
+				$confirm_template = 'confirm_delete_body.html';
+			}
+			$l_confirm_msg .= ((sizeof($post_id_list) == 1) ? '' : 'S');
+
 			$template->assign_vars(array(
 				'S_NOTIFY_POSTER'	=> $show_notify,
 				'S_APPROVE'			=> false,
-				'REASON'			=> $reason,
-				'ADDITIONAL_MSG'	=> $additional_msg)
-			);
+				'REASON'			=> ($is_disapproving) ? $reason : '',
+				'ADDITIONAL_MSG'	=> $additional_msg,
+			));
 
-			confirm_box(false, 'DISAPPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
+			confirm_box(false, $l_confirm_msg, $s_hidden_fields, $confirm_template);
 		}
 
 		$redirect = $request->variable('redirect', "index.$phpEx");
-- 
cgit v1.2.1


From df98de971ca9e8362f1bbf5ce59967db16268531 Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Tue, 12 Mar 2013 10:19:29 +0530
Subject: [ticket/11106] Undefined index EDITED_TIME_TOTAL notice.

When viewing a private message, when message edit count is 1
Undefined index EDITED_TIME_TOTAL php notice appears. Changed
the message formatting method to what is used in viewtopic.php.

PHPBB3-11106
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index c85b05f144..e2b61f1b02 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -94,8 +94,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	// Editing information
 	if ($message_row['message_edit_count'] && $config['display_last_edited'])
 	{
-		$l_edit_time_total = ($message_row['message_edit_count'] == 1) ? $user->lang['EDITED_TIME_TOTAL'] : $user->lang['EDITED_TIMES_TOTAL'];
-		$l_edited_by = '<br /><br />' . sprintf($l_edit_time_total, (!$message_row['message_edit_user']) ? $message_row['username'] : $message_row['message_edit_user'], $user->format_date($message_row['message_edit_time'], false, true), $message_row['message_edit_count']);
+		$l_edited_by = $user->lang('EDITED_TIMES_TOTAL', (int) $message_row['message_edit_count'], (!$message_row['message_edit_user']) ? $message_row['username'] : $message_row['message_edit_user'], $user->format_date($message_row['message_edit_time'], false, true));
 	}
 	else
 	{
-- 
cgit v1.2.1


From b712cff49662c4356ec69048cd5a834c1415c0cf Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 12 Mar 2013 11:36:40 +0100
Subject: [ticket/9657] Populate data about post's delete status in mcp_post

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_post.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 90ce18de4e..734fa96a78 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -174,6 +174,33 @@ function mcp_post_details($id, $mode, $action)
 		}
 	}
 
+	// Deleting information
+	if ($post_info['post_visibility'] == ITEM_DELETED && $post_info['post_delete_user'])
+	{
+		// User having deleted the post also being the post author?
+		if (!$post_info['post_delete_user'] || $post_info['post_delete_user'] == $post_info['poster_id'])
+		{
+			$display_username = get_username_string('full', $post_info['poster_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']);
+		}
+		else
+		{
+			$sql = 'SELECT user_id, username, user_colour
+				FROM ' . USERS_TABLE . '
+				WHERE user_id = ' . (int) $post_info['post_delete_user'];
+			$result = $db->sql_query($sql);
+			$user_delete_row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+			$display_username = get_username_string('full', $post_info['post_delete_user'], $user_delete_row['username'], $user_delete_row['user_colour']);
+		}
+
+		$user->add_lang('viewtopic');
+		$l_deleted_by = $user->lang('DELETED_INFORMATION', $display_username, $user->format_date($post_info['post_delete_time'], false, true));
+	}
+	else
+	{
+		$l_deleted_by = '';
+	}
+
 	$template->assign_vars(array(
 		'U_MCP_ACTION'			=> "$url&amp;i=main&amp;quickmod=1&amp;mode=post_details", // Use this for mode paramaters
 		'U_POST_ACTION'			=> "$url&amp;i=$id&amp;mode=post_details", // Use this for action parameters
@@ -186,9 +213,12 @@ function mcp_post_details($id, $mode, $action)
 
 		'S_POST_REPORTED'		=> ($post_info['post_reported']) ? true : false,
 		'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED) ? true : false,
+		'S_POST_DELETED'		=> ($post_info['post_visibility'] == ITEM_DELETED) ? true : false,
 		'S_POST_LOCKED'			=> ($post_info['post_edit_locked']) ? true : false,
 		'S_USER_NOTES'			=> true,
 		'S_CLEAR_ALLOWED'		=> ($auth->acl_get('a_clearlogs')) ? true : false,
+		'DELETED_MESSAGE'		=> $l_deleted_by,
+		'DELETE_REASON'			=> $post_info['post_delete_reason'],
 
 		'U_EDIT'				=> ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&amp;f={$post_info['forum_id']}&amp;p={$post_info['post_id']}") : '',
 		'U_FIND_USERNAME'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=mcp_chgposter&amp;field=username&amp;select_single=true'),
@@ -205,6 +235,7 @@ function mcp_post_details($id, $mode, $action)
 		'RETURN_FORUM'			=> sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", "f={$post_info['forum_id']}&amp;start={$start}") . '">', '</a>'),
 		'REPORTED_IMG'			=> $user->img('icon_topic_reported', $user->lang['POST_REPORTED']),
 		'UNAPPROVED_IMG'		=> $user->img('icon_topic_unapproved', $user->lang['POST_UNAPPROVED']),
+		'DELETED_IMG'			=> $user->img('icon_topic_deleted', $user->lang['POST_DELETED']),
 		'EDIT_IMG'				=> $user->img('icon_post_edit', $user->lang['EDIT_POST']),
 		'SEARCH_IMG'			=> $user->img('icon_user_search', $user->lang['SEARCH']),
 
-- 
cgit v1.2.1


From 5eef287646725292c6fa263bf04c85bd987f644a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 12 Mar 2013 17:10:32 +0100
Subject: [ticket/11310] Add hashes to action links to prevent CSRF attacks

PHPBB3-11310
---
 phpBB/includes/acp/acp_styles.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 266495972b..094d84de40 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -68,13 +68,20 @@ class acp_styles
 
 		$action = $this->request->variable('action', '');
 		$post_actions = array('install', 'activate', 'deactivate', 'uninstall');
+
+		if ($action && in_array($action, $post_actions) && !check_link_hash($request->variable('hash', ''), $action))
+		{
+			trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
 		foreach ($post_actions as $key)
 		{
-			if (isset($_POST[$key]))
+			if ($this->request->is_set_post($key))
 			{
 				$action = $key;
 			}
 		}
+
 		if ($action != '')
 		{
 			$this->s_hidden_fields['action'] = $action;
@@ -921,21 +928,23 @@ class acp_styles
 				'L_ACTION'	=> $this->user->lang['DETAILS']
 			);
 
-			// Activate
+			// Activate/Deactive
+			$action_name = ($style['style_active'] ? 'de' : '') . 'activate';
+
 			$actions[] = array(
-				'U_ACTION'	=> $this->u_action . '&amp;action=' . ($style['style_active'] ? 'de' : '') . 'activate&amp;id=' . $style['style_id'],
+				'U_ACTION'	=> $this->u_action . '&amp;action=' . $action_name . '&amp;hash=' . generate_link_hash($action_name) . '&amp;id=' . $style['style_id'],
 				'L_ACTION'	=> $this->user->lang['STYLE_' . ($style['style_active'] ? 'DE' : '') . 'ACTIVATE']
 			);
 
 /*			// Export
 			$actions[] = array(
-				'U_ACTION'	=> $this->u_action . '&amp;action=export&amp;id=' . $style['style_id'],
+				'U_ACTION'	=> $this->u_action . '&amp;action=export&amp;hash=' . generate_link_hash('export') . '&amp;id=' . $style['style_id'],
 				'L_ACTION'	=> $this->user->lang['EXPORT']
 			); */
 
 			// Uninstall
 			$actions[] = array(
-				'U_ACTION'	=> $this->u_action . '&amp;action=uninstall&amp;id=' . $style['style_id'],
+				'U_ACTION'	=> $this->u_action . '&amp;action=uninstall&amp;hash=' . generate_link_hash('uninstall') . '&amp;id=' . $style['style_id'],
 				'L_ACTION'	=> $this->user->lang['STYLE_UNINSTALL']
 			);
 
@@ -957,7 +966,7 @@ class acp_styles
 			else
 			{
 				$actions[] = array(
-					'U_ACTION'	=> $this->u_action . '&amp;action=install&amp;dir=' . urlencode($style['style_path']),
+					'U_ACTION'	=> $this->u_action . '&amp;action=install&amp;hash=' . generate_link_hash('install') . '&amp;dir=' . urlencode($style['style_path']),
 					'L_ACTION'	=> $this->user->lang['INSTALL_STYLE']
 				);
 			}
-- 
cgit v1.2.1


From 567eefb2bd2bf280391786ea171dad0bdb0b442d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 12 Mar 2013 22:35:31 +0100
Subject: [ticket/11362] Correctly sanitise the directory path

We need to correctly remove ../ form the path if possible by removing the
previous folder aswell. Otherwise the finder is unable to locate /adm/style
directories in extensions as he is looking for /adm/../adm/style instead.

PHPBB3-11362
---
 phpBB/includes/extension/finder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index f71e32bc8d..d9aacc38ff 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -227,7 +227,7 @@ class phpbb_extension_finder
 	*/
 	protected function sanitise_directory($directory)
 	{
-		$directory = preg_replace('#(?:^|/)\./#', '/', $directory);
+		$directory = phpbb_clean_path($directory);
 		$dir_len = strlen($directory);
 
 		if ($dir_len > 1 && $directory[$dir_len - 1] === '/')
-- 
cgit v1.2.1


From d41cf293e1609be9d0cc08e5ccd37947481e61ca Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 14 Mar 2013 12:10:07 +0100
Subject: [ticket/9657] Check for post visibility when searching with Sphinx

This update will require admins to manually update their Sphinx config
file aswell as to delete the index and rebuild it from scratch. Before
this is done the search will not be usable anymore.

PHPBB3-9657
---
 phpBB/includes/search/fulltext_sphinx.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 441fb2583b..5d5e0ab8f9 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -274,6 +274,7 @@ class phpbb_search_fulltext_sphinx
 						p.forum_id,
 						p.topic_id,
 						p.poster_id,
+						p.post_visibility,
 						CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,
 						p.post_time,
 						p.post_subject,
@@ -291,6 +292,7 @@ class phpbb_search_fulltext_sphinx
 				array('sql_attr_uint',				'forum_id'),
 				array('sql_attr_uint',				'topic_id'),
 				array('sql_attr_uint',				'poster_id'),
+				array('sql_attr_uint',				'post_visibility'),
 				array('sql_attr_bool',				'topic_first_post'),
 				array('sql_attr_bool',				'deleted'),
 				array('sql_attr_timestamp'	,		'post_time'),
@@ -306,6 +308,7 @@ class phpbb_search_fulltext_sphinx
 						p.forum_id,
 						p.topic_id,
 						p.poster_id,
+						p.post_visibility,
 						CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,
 						p.post_time,
 						p.post_subject,
@@ -569,10 +572,13 @@ class phpbb_search_fulltext_sphinx
 			$this->sphinx->SetFilter('poster_id', $author_ary);
 		}
 
+		// As this is not simply possible at the moment, we limit the result to approved posts.
+		// This will make it impossible for moderators to search unapproved and softdeleted posts,
+		// but at least it will also cause the same for normal users.
+		$this->sphinx->SetFilter('post_visibility', array(ITEM_APPROVED));
+
 		if (sizeof($ex_fid_ary))
 		{
-			//@todo: Limit using $post_visibility
-
 			// All forums that a user is allowed to access
 			$fid_ary = array_unique(array_intersect(array_keys($this->auth->acl_getf('f_read', true)), array_keys($this->auth->acl_getf('f_search', true))));
 			// All forums that the user wants to and can search in
-- 
cgit v1.2.1


From a38a92424ddf00383c17a6dffffe522065e25c9f Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 14 Mar 2013 10:45:17 -0700
Subject: [ticket/10155] Update jQuery to 1.8.3

Currently included jQuery is old by now, v1.6.2. We should update to
1.8.3. This allows us to take advantage of the latest form of jQuery
event delegation ($.on). I don't think it wise to update to jQuery
1.9.x yet, as many 3rd party scripts still need to be updated to cope
with its deprecated features ($.browser). Therefor, 1.8.3 is the latest
and most widely compatible stable version right now.

PHPBB3-10155
---
 phpBB/includes/db/migration/data/310/dev.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 13b36bbf30..982dc9662e 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -91,7 +91,7 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 			array('config.add', array('fulltext_sphinx_indexer_mem_limit', 512)),
 
 			array('config.add', array('load_jquery_cdn', 0)),
-			array('config.add', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js')),
+			array('config.add', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js')),
 
 			array('config.add', array('use_system_cron', 0)),
 
-- 
cgit v1.2.1


From b17c0aa098485994355a173299ab54fd91629f8e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 15 Mar 2013 01:21:12 +0100
Subject: [ticket/11440] Remove useless/incorrect comment.

PHPBB3-11440
---
 phpBB/includes/user_loader.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/user_loader.php b/phpBB/includes/user_loader.php
index 77128d6570..a834051ab3 100644
--- a/phpBB/includes/user_loader.php
+++ b/phpBB/includes/user_loader.php
@@ -70,7 +70,6 @@ class phpbb_user_loader
 	{
 		$user_ids[] = ANONYMOUS;
 
-		// Load the users
 		$user_ids = array_unique($user_ids);
 
 		// Do not load users we already have in $this->users
-- 
cgit v1.2.1


From 1694dc6e2853c294c502e387d2d2463501d2d844 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 15 Mar 2013 01:22:00 +0100
Subject: [ticket/11440] Cast values of the $user_ids array to integer before
 sql_in_set.

PHPBB3-11440
---
 phpBB/includes/user_loader.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/user_loader.php b/phpBB/includes/user_loader.php
index a834051ab3..37bf9648c1 100644
--- a/phpBB/includes/user_loader.php
+++ b/phpBB/includes/user_loader.php
@@ -70,7 +70,8 @@ class phpbb_user_loader
 	{
 		$user_ids[] = ANONYMOUS;
 
-		$user_ids = array_unique($user_ids);
+		// Make user_ids unique and convert to integer.
+		$user_ids = array_map('intval', array_unique($user_ids));
 
 		// Do not load users we already have in $this->users
 		$user_ids = array_diff($user_ids, array_keys($this->users));
-- 
cgit v1.2.1


From 2b2bbf787c55e8922ae1c06242be1120a7e91eb7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 15 Mar 2013 08:23:39 +0100
Subject: [ticket/11438] Add helpful comments from sample config to ACP output

PHPBB3-11438
---
 phpBB/includes/search/fulltext_sphinx.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 48445d0794..48e6b5aaec 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -258,13 +258,13 @@ class phpbb_search_fulltext_sphinx
 		$config_object = new phpbb_search_sphinx_config($this->config_file_data);
 		$config_data = array(
 			'source source_phpbb_' . $this->id . '_main' => array(
-				array('type',						$this->dbtype),
+				array('type',						$this->dbtype . ' #mysql or pgsql'),
 				// This config value sql_host needs to be changed incase sphinx and sql are on different servers
-				array('sql_host',					$dbhost),
+				array('sql_host',					$dbhost . ' #SQL server host sphinx connects to'),
 				array('sql_user',					$dbuser),
 				array('sql_pass',					$dbpasswd),
 				array('sql_db',						$dbname),
-				array('sql_port',					$dbport),
+				array('sql_port',					$dbport . ' #optional, default is 3306 for mysql and 5432 for pgsql'),
 				array('sql_query_pre',				'SET NAMES \'utf8\''),
 				array('sql_query_pre',				'UPDATE ' . SPHINX_TABLE . ' SET max_doc_id = (SELECT MAX(post_id) FROM ' . POSTS_TABLE . ') WHERE counter_id = 1'),
 				array('sql_query_range',			'SELECT MIN(post_id), MAX(post_id) FROM ' . POSTS_TABLE . ''),
-- 
cgit v1.2.1


From 8c512b0d2d73a0930a420030dd6fecb8cb2d506f Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 18 Jan 2013 14:00:40 -0500
Subject: [ticket/11334] Properly generate controller URL until paths issue
 gets fixed

PHPBB3-11334
---
 phpBB/includes/controller/helper.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index 6cacc8fefa..2098f51edf 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -85,17 +85,14 @@ class phpbb_controller_helper
 	}
 
 	/**
-	* Easily generate a URL
+	* Generate a URL
 	*
-	* @param array $url_parts Each array element is a 'folder'
-	* 		i.e. array('my', 'ext') maps to ./app.php/my/ext
-	* @param mixed $query The Query string, passed directly into the second
-	*		argument of append_sid()
-	* @return string A URL that has already been run through append_sid()
+	* @param string $route The route to travel
+	* @return string The URL already passed through append_sid()
 	*/
-	public function url(array $url_parts, $query = '')
+	protected function url($route)
 	{
-		return append_sid($this->phpbb_root_path . implode('/', $url_parts), $query);
+		return append_sid($this->phpbb_root_path . 'app.' . $this->php_ext, array('controller' => $route));
 	}
 
 	/**
-- 
cgit v1.2.1


From d3e2fae66d74f79ef7dcfe2e24f47efaa5c106e2 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 15 Feb 2013 16:48:43 -0500
Subject: [ticket/11334] Add a test for the controller helper URL method

PHPBB3-11334
---
 phpBB/includes/controller/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index 2098f51edf..0e64829874 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -55,7 +55,7 @@ class phpbb_controller_helper
 	* @param string $phpbb_root_path phpBB root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_template $template = null, phpbb_user $user = null, $phpbb_root_path = './', $php_ext = '.php')
 	{
 		$this->template = $template;
 		$this->user = $user;
-- 
cgit v1.2.1


From 5e89ce1898857f29e5345adf31d62bbed1fb985b Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 15 Feb 2013 16:52:54 -0500
Subject: [ticket/11334] Make url helper method public

PHPBB3-11334
---
 phpBB/includes/controller/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index 0e64829874..f2beca2056 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -90,7 +90,7 @@ class phpbb_controller_helper
 	* @param string $route The route to travel
 	* @return string The URL already passed through append_sid()
 	*/
-	protected function url($route)
+	public function url($route)
 	{
 		return append_sid($this->phpbb_root_path . 'app.' . $this->php_ext, array('controller' => $route));
 	}
-- 
cgit v1.2.1


From 5850a2cbf6e8313feeb55154e1083d73b45f4dc3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 16 Feb 2013 19:21:34 -0500
Subject: [ticket/11334] Remove extraneous period

PHPBB3-11334
---
 phpBB/includes/controller/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index f2beca2056..451c448a18 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -92,7 +92,7 @@ class phpbb_controller_helper
 	*/
 	public function url($route)
 	{
-		return append_sid($this->phpbb_root_path . 'app.' . $this->php_ext, array('controller' => $route));
+		return append_sid($this->phpbb_root_path . 'app' . $this->php_ext, array('controller' => $route));
 	}
 
 	/**
-- 
cgit v1.2.1


From ff9a0e4ef4756c5a9cce3f023b07d9f9a0e5653a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 15 Mar 2013 13:35:43 +0100
Subject: [ticket/11334] Expand functionality of helper->url()

Expanded the functionality of helper->url() to support all parameters of
append_sid() itself.

PHPBB3-11334
---
 phpBB/includes/controller/helper.php | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index 451c448a18..4c021849f4 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -87,12 +87,30 @@ class phpbb_controller_helper
 	/**
 	* Generate a URL
 	*
-	* @param string $route The route to travel
+	* @param string	$route		The route to travel
+	* @param mixed	$params		String or array of additional url parameters
+	* @param bool	$is_amp		Is url using &amp; (true) or & (false)
+	* @param string	$session_id	Possibility to use a custom session id instead of the global one
 	* @return string The URL already passed through append_sid()
 	*/
-	public function url($route)
+	public function url($route, $params = false, $is_amp = true, $session_id = false)
 	{
-		return append_sid($this->phpbb_root_path . 'app' . $this->php_ext, array('controller' => $route));
+		if (is_array($params) && !empty($params))
+		{
+			$params = array_merge(array(
+				'controller' => $route,
+			), $params);
+		}
+		else if (is_string($params) && $params)
+		{
+			$params = 'controller=' . $route . (($is_amp) ? '&amp;' : '&') . $params;
+		}
+		else
+		{
+			$params = array('controller' => $route);
+		}
+
+		return append_sid($this->phpbb_root_path . 'app' . $this->php_ext, $params, $is_amp, $session_id);
 	}
 
 	/**
-- 
cgit v1.2.1


From 076711d9a95e05083143b7ac4a589914a2e2b2ad Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 15 Mar 2013 14:02:46 +0100
Subject: [ticket/11334] Use mocks instead of making parameters optional

PHPBB3-11334
---
 phpBB/includes/controller/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index 4c021849f4..1464267711 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -55,7 +55,7 @@ class phpbb_controller_helper
 	* @param string $phpbb_root_path phpBB root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(phpbb_template $template = null, phpbb_user $user = null, $phpbb_root_path = './', $php_ext = '.php')
+	public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext)
 	{
 		$this->template = $template;
 		$this->user = $user;
-- 
cgit v1.2.1


From 3b0cdc53629c3a852762ae9b96b809cf4b1af2c4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 15 Mar 2013 15:21:15 +0100
Subject: [ticket/11334] Allow parameters to be specified in the route

PHPBB3-11334
---
 phpBB/includes/controller/helper.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index 1464267711..46c6307cb4 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -95,6 +95,13 @@ class phpbb_controller_helper
 	*/
 	public function url($route, $params = false, $is_amp = true, $session_id = false)
 	{
+		$route_params = '';
+		if (($route_delim = strpos($route, '?')) !== false)
+		{
+			$route_params = substr($route, $route_delim);
+			$route = substr($route, 0, $route_delim);
+		}
+
 		if (is_array($params) && !empty($params))
 		{
 			$params = array_merge(array(
@@ -110,7 +117,7 @@ class phpbb_controller_helper
 			$params = array('controller' => $route);
 		}
 
-		return append_sid($this->phpbb_root_path . 'app' . $this->php_ext, $params, $is_amp, $session_id);
+		return append_sid($this->phpbb_root_path . 'app' . $this->php_ext . $route_params, $params, $is_amp, $session_id);
 	}
 
 	/**
-- 
cgit v1.2.1


From 56914e72b7ec2e4063e0d510f2d61a56c37f80d0 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 15 Mar 2013 09:51:34 -0700
Subject: [ticket/10155] Use new migration file for jQuery config update

---
 phpBB/includes/db/migration/data/310/dev.php    |  2 +-
 phpBB/includes/db/migration/data/310/dev_p2.php | 31 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/includes/db/migration/data/310/dev_p2.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 982dc9662e..13b36bbf30 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -91,7 +91,7 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 			array('config.add', array('fulltext_sphinx_indexer_mem_limit', 512)),
 
 			array('config.add', array('load_jquery_cdn', 0)),
-			array('config.add', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js')),
+			array('config.add', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js')),
 
 			array('config.add', array('use_system_cron', 0)),
 
diff --git a/phpBB/includes/db/migration/data/310/dev_p2.php b/phpBB/includes/db/migration/data/310/dev_p2.php
new file mode 100644
index 0000000000..f5ec6eeb01
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/dev_p2.php
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_dev_p2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return !isset($this->config['load_jquery_url']);
+	}
+
+	static public function depends_on()
+	{
+		return array(
+			'phpbb_db_migration_data_310_dev',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js')),
+		);
+	}
+
+}
-- 
cgit v1.2.1


From 21a946255336bbd3b3572db5cc2ade2c48076a93 Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Sat, 16 Mar 2013 00:05:12 +0530
Subject: [ticket/11106] Added missing line breaks.

Added two missing line breaks into 'edited by' message.

PHPBB3-11106
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index e2b61f1b02..e2dd1d5306 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -94,7 +94,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	// Editing information
 	if ($message_row['message_edit_count'] && $config['display_last_edited'])
 	{
-		$l_edited_by = $user->lang('EDITED_TIMES_TOTAL', (int) $message_row['message_edit_count'], (!$message_row['message_edit_user']) ? $message_row['username'] : $message_row['message_edit_user'], $user->format_date($message_row['message_edit_time'], false, true));
+		$l_edited_by = '<br /><br />' . $user->lang('EDITED_TIMES_TOTAL', (int) $message_row['message_edit_count'], (!$message_row['message_edit_user']) ? $message_row['username'] : $message_row['message_edit_user'], $user->format_date($message_row['message_edit_time'], false, true));
 	}
 	else
 	{
-- 
cgit v1.2.1


From c50af280770a9db13043a41e34238a2434176936 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 16 Mar 2013 01:18:15 +0100
Subject: [ticket/11438] Add spaces after # comment start and before \ line
 breaks

PHPBB3-11438
---
 phpBB/includes/search/fulltext_sphinx.php        | 6 +++---
 phpBB/includes/search/sphinx/config_variable.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 48e6b5aaec..28761792ec 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -258,13 +258,13 @@ class phpbb_search_fulltext_sphinx
 		$config_object = new phpbb_search_sphinx_config($this->config_file_data);
 		$config_data = array(
 			'source source_phpbb_' . $this->id . '_main' => array(
-				array('type',						$this->dbtype . ' #mysql or pgsql'),
+				array('type',						$this->dbtype . ' # mysql or pgsql'),
 				// This config value sql_host needs to be changed incase sphinx and sql are on different servers
-				array('sql_host',					$dbhost . ' #SQL server host sphinx connects to'),
+				array('sql_host',					$dbhost . ' # SQL server host sphinx connects to'),
 				array('sql_user',					$dbuser),
 				array('sql_pass',					$dbpasswd),
 				array('sql_db',						$dbname),
-				array('sql_port',					$dbport . ' #optional, default is 3306 for mysql and 5432 for pgsql'),
+				array('sql_port',					$dbport . ' # optional, default is 3306 for mysql and 5432 for pgsql'),
 				array('sql_query_pre',				'SET NAMES \'utf8\''),
 				array('sql_query_pre',				'UPDATE ' . SPHINX_TABLE . ' SET max_doc_id = (SELECT MAX(post_id) FROM ' . POSTS_TABLE . ') WHERE counter_id = 1'),
 				array('sql_query_range',			'SELECT MIN(post_id), MAX(post_id) FROM ' . POSTS_TABLE . ''),
diff --git a/phpBB/includes/search/sphinx/config_variable.php b/phpBB/includes/search/sphinx/config_variable.php
index 35abe281cb..2c1d35a49c 100644
--- a/phpBB/includes/search/sphinx/config_variable.php
+++ b/phpBB/includes/search/sphinx/config_variable.php
@@ -75,6 +75,6 @@ class phpbb_search_sphinx_config_variable
 	*/
 	function to_string()
 	{
-		return "\t" . $this->name . ' = ' . str_replace("\n", "\\\n", $this->value) . ' ' . $this->comment . "\n";
+		return "\t" . $this->name . ' = ' . str_replace("\n", " \\\n", $this->value) . ' ' . $this->comment . "\n";
 	}
 }
-- 
cgit v1.2.1


From c9e7247ab4234ad13d239e2b34c4ec4b305ef8ae Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 16 Mar 2013 21:49:00 +0100
Subject: [ticket/11445] Add abstract class
 phpbb_notification_method_messenger_base.

PHPBB3-11445
---
 phpBB/includes/notification/method/email.php       |  78 +---------------
 phpBB/includes/notification/method/jabber.php      |  18 +---
 .../notification/method/messenger_base.php         | 100 +++++++++++++++++++++
 3 files changed, 103 insertions(+), 93 deletions(-)
 create mode 100644 phpBB/includes/notification/method/messenger_base.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index 4a7fea6df3..dc505c0d41 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -33,20 +33,6 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 		return 'email';
 	}
 
-	/**
-	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
-	*
-	* @var mixed
-	*/
-	protected $notify_method = NOTIFY_EMAIL;
-
-	/**
-	* Base directory to prepend to the email template name
-	*
-	* @var string
-	*/
-	protected $email_template_base_dir = '';
-
 	/**
 	* Is this method available for the user?
 	* This is checked on the notifications options
@@ -61,68 +47,6 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 	*/
 	public function notify()
 	{
-		if (!sizeof($this->queue))
-		{
-			return;
-		}
-
-		// Load all users we want to notify (we need their email address)
-		$user_ids = $users = array();
-		foreach ($this->queue as $notification)
-		{
-			$user_ids[] = $notification->user_id;
-		}
-
-		// We do not send emails to banned users
-		if (!function_exists('phpbb_get_banned_user_ids'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-		}
-		$banned_users = phpbb_get_banned_user_ids($user_ids);
-
-		// Load all the users we need
-		$this->user_loader->load_users($user_ids);
-
-		// Load the messenger
-		if (!class_exists('messenger'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
-		}
-		$messenger = new messenger();
-		$board_url = generate_board_url();
-
-		// Time to go through the queue and send emails
-		foreach ($this->queue as $notification)
-		{
-			if ($notification->get_email_template() === false)
-			{
-				continue;
-			}
-
-			$user = $this->user_loader->get_user($notification->user_id);
-
-			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
-			{
-				continue;
-			}
-
-			$messenger->template($this->email_template_base_dir . $notification->get_email_template(), $user['user_lang']);
-
-			$messenger->to($user['user_email'], $user['username']);
-
-			$messenger->assign_vars(array_merge(array(
-				'USERNAME'						=> $user['username'],
-
-				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',
-			), $notification->get_email_template_variables()));
-
-			$messenger->send($this->notify_method);
-		}
-
-		// Save the queue in the messenger class (has to be called or these emails could be lost?)
-		$messenger->save_queue();
-
-		// We're done, empty the queue
-		$this->empty_queue();
+		return $this->notify_using_messenger(NOTIFY_EMAIL);
 	}
 }
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
index 863846b8a5..debffa8ce5 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/includes/notification/method/jabber.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notification_method_jabber extends phpbb_notification_method_email
+class phpbb_notification_method_jabber extends phpbb_notification_method_messenger_base
 {
 	/**
 	* Get notification method name
@@ -33,20 +33,6 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
 		return 'jabber';
 	}
 
-	/**
-	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
-	*
-	* @var mixed
-	*/
-	protected $notify_method = NOTIFY_IM;
-
-	/**
-	* Base directory to prepend to the email template name
-	*
-	* @var string
-	*/
-	protected $email_template_base_dir = 'short/';
-
 	/**
 	* Is this method available for the user?
 	* This is checked on the notifications options
@@ -72,6 +58,6 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
 			return;
 		}
 
-		return parent::notify();
+		return $this->notify_using_messenger(NOTIFY_IM, 'short/');
 	}
 }
diff --git a/phpBB/includes/notification/method/messenger_base.php b/phpBB/includes/notification/method/messenger_base.php
new file mode 100644
index 0000000000..ce1ecc09ce
--- /dev/null
+++ b/phpBB/includes/notification/method/messenger_base.php
@@ -0,0 +1,100 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Abstract notification method handling email and jabber notifications
+* using the phpBB messenger.
+*
+* @package notifications
+*/
+abstract class phpbb_notification_method_messenger_base extends phpbb_notification_method_base
+{
+	/**
+	* Notify using phpBB messenger
+	*
+	* @param int $notify_method				Notify method for messenger (e.g. NOTIFY_IM)
+	* @param string $template_dir_prefix	Base directory to prepend to the email template name
+	*
+	* @return null
+	*/
+	protected function notify_using_messenger($notify_method, $template_dir_prefix = '')
+	{
+		if (empty($this->queue))
+		{
+			return;
+		}
+
+		// Load all users we want to notify (we need their email address)
+		$user_ids = $users = array();
+		foreach ($this->queue as $notification)
+		{
+			$user_ids[] = $notification->user_id;
+		}
+
+		// We do not send emails to banned users
+		if (!function_exists('phpbb_get_banned_user_ids'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		}
+		$banned_users = phpbb_get_banned_user_ids($user_ids);
+
+		// Load all the users we need
+		$this->user_loader->load_users($user_ids);
+
+		// Load the messenger
+		if (!class_exists('messenger'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
+		}
+		$messenger = new messenger();
+		$board_url = generate_board_url();
+
+		// Time to go through the queue and send emails
+		foreach ($this->queue as $notification)
+		{
+			if ($notification->get_email_template() === false)
+			{
+				continue;
+			}
+
+			$user = $this->user_loader->get_user($notification->user_id);
+
+			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
+			{
+				continue;
+			}
+
+			$messenger->template($email_template_base_dir . $notification->get_email_template(), $user['user_lang']);
+
+			$messenger->to($user['user_email'], $user['username']);
+
+			$messenger->assign_vars(array_merge(array(
+				'USERNAME'						=> $user['username'],
+
+				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',
+			), $notification->get_email_template_variables()));
+
+			$messenger->send($notify_method);
+		}
+
+		// Save the queue in the messenger class (has to be called or these emails could be lost?)
+		$messenger->save_queue();
+
+		// We're done, empty the queue
+		$this->empty_queue();
+	}
+}
-- 
cgit v1.2.1


From 58d7acbf5a4483f7e2ebac6d9ed38189c48facfb Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 17 Mar 2013 19:54:32 +0100
Subject: [ticket/11452] Now notification_method_email checks whether user has
 address.

Make sure the user has an email address set before offering email
notifications. The address could be missing for whatever reason, e.g. external
authentication. This is also consistent with XMPP/Jabber now.

PHPBB3-11452
---
 phpBB/includes/notification/method/email.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index 4a7fea6df3..2cd1ba3ef6 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -53,7 +53,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 	*/
 	public function is_available()
 	{
-		return (bool) $this->config['email_enable'];
+		return $this->config['email_enable'] && $this->user->data['user_email'];
 	}
 
 	/**
-- 
cgit v1.2.1


From ac26be98c69094173c90acc49d208f751b93b7df Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 17 Mar 2013 17:01:38 -0700
Subject: [ticket/10155] Use more descriptive title for migration file

PHPBB3-10155
---
 phpBB/includes/db/migration/data/310/dev_p2.php    | 31 ----------------------
 .../db/migration/data/310/jquery_update.php        | 31 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 phpBB/includes/db/migration/data/310/dev_p2.php
 create mode 100644 phpBB/includes/db/migration/data/310/jquery_update.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/dev_p2.php b/phpBB/includes/db/migration/data/310/dev_p2.php
deleted file mode 100644
index f5ec6eeb01..0000000000
--- a/phpBB/includes/db/migration/data/310/dev_p2.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_dev_p2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return !isset($this->config['load_jquery_url']);
-	}
-
-	static public function depends_on()
-	{
-		return array(
-			'phpbb_db_migration_data_310_dev',
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js')),
-		);
-	}
-
-}
diff --git a/phpBB/includes/db/migration/data/310/jquery_update.php b/phpBB/includes/db/migration/data/310/jquery_update.php
new file mode 100644
index 0000000000..ac6cf2666a
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/jquery_update.php
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_jquery_update extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return !isset($this->config['load_jquery_url']);
+	}
+
+	static public function depends_on()
+	{
+		return array(
+			'phpbb_db_migration_data_310_dev',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js')),
+		);
+	}
+
+}
-- 
cgit v1.2.1


From aefca4b40f67bc4d0cc52c8f89705148237a5f05 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 21 Mar 2013 14:59:53 +0100
Subject: [ticket/11465] Use extension finder when adding extensions' acp
 modules

The method acp_modules::get_module_infos() needs to use the extension
finder whenever it is looking for a module's info file. While
transitioning to the new extension system, only the initial search for all
module info files was changed to the new system. Due to this it is not
possible to add an extension's acp/mcp/ucp module manually in the ACP.
This patch will always use the extension finder for the acp module's info
files and therefore properly find the needed file. Additionally, the code
has been cleaned up a little bit.

PHPBB3-11465
---
 phpBB/includes/acp/acp_modules.php | 72 +++++++++++++-------------------------
 1 file changed, 25 insertions(+), 47 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 7c2ea86122..9cf6bf0214 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -544,81 +544,59 @@ class acp_modules
 	*/
 	function get_module_infos($module = '', $module_class = false, $use_all_available = false)
 	{
-		global $phpbb_root_path, $phpEx;
+		global $phpbb_extension_manager, $phpbb_root_path, $phpEx;
 
 		$module_class = ($module_class === false) ? $this->module_class : $module_class;
 
 		$directory = $phpbb_root_path . 'includes/' . $module_class . '/info/';
 		$fileinfo = array();
 
-		if (!$module)
-		{
-			global $phpbb_extension_manager;
-
-			$finder = $phpbb_extension_manager->get_finder();
+		$finder = $phpbb_extension_manager->get_finder();
 
-			$modules = $finder
-				->extension_suffix('_module')
-				->extension_directory("/$module_class")
-				->core_path("includes/$module_class/info/")
-				->core_prefix($module_class . '_')
-				->get_classes(true, $use_all_available);
+		$modules = $finder
+			->extension_suffix('_module')
+			->extension_directory("/$module_class")
+			->core_path("includes/$module_class/info/")
+			->core_prefix($module_class . '_')
+			->get_classes(true, $use_all_available);
 
-			foreach ($modules as $module)
+		foreach ($modules as $cur_module)
+		{
+			// Skip entries we do not need if we know the module we are
+			// looking for
+			if ($module && strpos($cur_module, $module) === false)
 			{
-				$info_class = preg_replace('/_module$/', '_info', $module);
-
-				// If the class does not exist it might be following the old
-				// format. phpbb_acp_info_acp_foo needs to be turned into
-				// acp_foo_info and the respective file has to be included
-				// manually because it does not support auto loading
-				if (!class_exists($info_class))
-				{
-					$info_class = str_replace("phpbb_{$module_class}_info_", '', $module) . '_info';
-					if (file_exists($directory . $info_class . '.' . $phpEx))
-					{
-						include($directory . $info_class . '.' . $phpEx);
-					}
-				}
-
-				if (class_exists($info_class))
-				{
-					$info = new $info_class();
-					$module_info = $info->module();
-
-					$main_class = (isset($module_info['filename'])) ? $module_info['filename'] : $module;
-
-					$fileinfo[$main_class] = $module_info;
-				}
+				continue;
 			}
 
-			ksort($fileinfo);
-		}
-		else
-		{
-			$info_class = preg_replace('/_module$/', '_info', $module);
+			$info_class = preg_replace('/_module$/', '_info', $cur_module);
 
+			// If the class does not exist it might be following the old
+			// format. phpbb_acp_info_acp_foo needs to be turned into
+			// acp_foo_info and the respective file has to be included
+			// manually because it does not support auto loading
 			if (!class_exists($info_class))
 			{
-				$info_class = $module . '_info';
-				if (!class_exists($info_class) && file_exists($directory . $module . '.' . $phpEx))
+				$info_class = str_replace("phpbb_{$module_class}_info_", '', $cur_module) . '_info';
+				if (file_exists($directory . $info_class . '.' . $phpEx))
 				{
-					include($directory . $module . '.' . $phpEx);
+					include($directory . $info_class . '.' . $phpEx);
 				}
 			}
 
-			// Get module title tag
 			if (class_exists($info_class))
 			{
 				$info = new $info_class();
 				$module_info = $info->module();
 
-				$main_class = (isset($module_info['filename'])) ? $module_info['filename'] : $module;
+				$main_class = (isset($module_info['filename'])) ? $module_info['filename'] : $cur_module;
 
 				$fileinfo[$main_class] = $module_info;
 			}
 		}
 
+		ksort($fileinfo);
+
 		return $fileinfo;
 	}
 
-- 
cgit v1.2.1


From 16a60253721330323ae201032f0b852697ce2a00 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 21 Mar 2013 23:04:17 +0100
Subject: [ticket/11469] Add SQL insert buffer allowing easier handling of
 multi inserts.

1. Tries to prevent going over max packet size by flushing to the database
   after a certain number of rows have been added.
2. Because of 1., it is less likely to reach a connection timeout when
   inserting a huge number of rows.
3. By flushing the buffer when a certain size is reached, memory usage should
   be lower compared to building the whole insert row set first.

PHPBB3-11469
---
 phpBB/includes/db/sql_insert_buffer.php | 111 ++++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)
 create mode 100644 phpBB/includes/db/sql_insert_buffer.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
new file mode 100644
index 0000000000..8d4b03ef53
--- /dev/null
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -0,0 +1,111 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Collects rows for insert into a database until the buffer size is reached.
+* Then flushes the buffer to the database and starts over again.
+*
+* @package dbal
+*/
+class phpbb_db_sql_insert_buffer
+{
+	/** @var phpbb_db_driver */
+	protected $db;
+
+	/** @var bool */
+	protected $db_supports_multi_insert;
+
+	/** @var string */
+	protected $table_name;
+
+	/** @var int */
+	protected $max_buffered_rows;
+
+	/** @var array */
+	protected $buffer = array();
+
+	/**
+	* @param phpbb_db_driver $db
+	* @param string          $table_name
+	* @param int             $max_buffered_rows
+	*/
+	public function __construct(phpbb_db_driver $db, $table_name, $max_buffered_rows = 500)
+	{
+		$this->db = $db;
+		$this->db_supports_multi_insert = $db->multi_insert;
+		$this->table_name = $table_name;
+		$this->max_buffered_rows = $max_buffered_rows;
+	}
+
+	/**
+	* Inserts a single row into the buffer if multi insert is supported by the
+	* database (otherwise an insert query is sent immediately). Then flushes
+	* the buffer if the number of rows in the buffer is now greater than or
+	* equal to $max_buffered_rows.
+	*
+	* @param array $row
+	*
+	* @return null
+	*/
+	public function insert(array $row)
+	{
+		if (!$this->db_supports_multi_insert)
+		{
+			$this->db->sql_multi_insert($this->table_name, array($row));
+		}
+
+		$this->buffer[] = $row;
+
+		if (sizeof($this->buffer) >= $this->max_buffered_rows)
+		{
+			$this->flush();
+		}
+	}
+
+	/**
+	* Inserts a row set, i.e. an array of rows, by calling insert().
+	*
+	* Please note that it is in most cases better to use insert() instead of
+	* first building a huge rowset. Or at least sizeof($rows) should be kept
+	* small.
+	*
+	* @param array $rows 
+	*
+	* @return null
+	*/
+	public function insert_all(array $rows)
+	{
+		foreach ($rows as $row)
+		{
+			$this->insert($row);
+		}
+	}
+
+	/**
+	* Flushes the buffer content to the DB and clears the buffer.
+	*
+	* @return null
+	*/
+	public function flush()
+	{
+		if (!empty($this->buffer))
+		{
+			$this->db->sql_multi_insert($this->table_name, $this->buffer);
+			$this->buffer = array();
+		}
+	}
+}
-- 
cgit v1.2.1


From 73d6855edf2f7a72a2f4836e7cce8f94e34f5502 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 22 Mar 2013 11:22:25 -0700
Subject: [ticket/10155] Make effectively installed test more specific

PHPBB3-10155
---
 phpBB/includes/db/migration/data/310/jquery_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/jquery_update.php b/phpBB/includes/db/migration/data/310/jquery_update.php
index ac6cf2666a..bb0c48550a 100644
--- a/phpBB/includes/db/migration/data/310/jquery_update.php
+++ b/phpBB/includes/db/migration/data/310/jquery_update.php
@@ -11,7 +11,7 @@ class phpbb_db_migration_data_310_jquery_update extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return !isset($this->config['load_jquery_url']);
+		return $this->config['load_jquery_url'] !== '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js';
 	}
 
 	static public function depends_on()
-- 
cgit v1.2.1


From a91ffe06c79dd067162fe3d659be44382a20df0e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 23 Mar 2013 13:25:01 +0100
Subject: [ticket/11405] Send post notifications to forum subscribers

Like in 3.0 we should also send notifications about new posts to users
that subscribed to the forum. (Subscriptions are verbose)

PHPBB3-11405
---
 phpBB/includes/notification/type/post.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index d8ffdea81d..626c13b7fd 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -106,11 +106,26 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		}
 		$this->db->sql_freeresult($result);
 
+		$sql = 'SELECT user_id
+			FROM ' . FORUMS_WATCH_TABLE . '
+			WHERE forum_id = ' . (int) $post['forum_id'] . '
+				AND notify_status = ' . NOTIFY_YES . '
+				AND user_id <> ' . (int) $post['poster_id'];
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$users[] = $row['user_id'];
+		}
+		$this->db->sql_freeresult($result);
+
 		if (empty($users))
 		{
 			return array();
 		}
 
+		$users = array_unique($users);
+		sort($users);
+
 		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
 
 		if (empty($auth_read))
-- 
cgit v1.2.1


From 1259117d213d9364ec7eaeb637f9a3fd8838e816 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 25 Mar 2013 14:41:31 +0100
Subject: [ticket/11405] Sort $users array in order to prevent issues on
 postgres

PHPBB3-11405
---
 phpBB/includes/notification/type/quote.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 5453b267c8..e9eb7bea21 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -108,6 +108,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		{
 			return array();
 		}
+		sort($users);
 
 		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
 
-- 
cgit v1.2.1


From fc8bf3f3c767067a03d240403598d62fb22ce889 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 25 Mar 2013 01:41:09 +0100
Subject: [ticket/11469] Add comment about using sql_multi_insert when not
 buffering.

PHPBB3-11469
---
 phpBB/includes/db/sql_insert_buffer.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
index 8d4b03ef53..fe45206893 100644
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -65,6 +65,9 @@ class phpbb_db_sql_insert_buffer
 	{
 		if (!$this->db_supports_multi_insert)
 		{
+			// The database does not support multi inserts.
+			// Pass data on to sql_multi_insert right away which will
+			// immediately send an INSERT INTO query to the database.
 			$this->db->sql_multi_insert($this->table_name, array($row));
 		}
 
-- 
cgit v1.2.1


From 323a494cd16bd202d89260f756519c2d76f2f9fe Mon Sep 17 00:00:00 2001
From: OpenShift guest <dachebodt@gmail.com>
Date: Mon, 25 Mar 2013 18:21:48 -0400
Subject: [ticket/11458] Search for permission language files in extensions

Extensions that add new permission masks only need to add a permission file in
the language folder of the extension. The file must start with 'permissions_'
eg 'permissions_blog.php'. The permission language file will be automatically
included when viewing/setting permissions.

PHPBB3-11458
---
 phpBB/includes/functions_admin.php | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index d273b9fb3a..5d71f55d1a 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -3040,38 +3040,25 @@ function tidy_database()
 */
 function add_permission_language()
 {
-	global $user, $phpEx;
+	global $user, $phpEx, $phpbb_extension_manager;
 
 	// First of all, our own file. We need to include it as the first file because it presets all relevant variables.
 	$user->add_lang('acp/permissions_phpbb');
 
-	$files_to_add = array();
+	// add permission language files from extensions
+	$finder = $phpbb_extension_manager->get_finder();
 
-	// Now search in acp and mods folder for permissions_ files.
-	foreach (array('acp/', 'mods/') as $path)
-	{
-		$dh = @opendir($user->lang_path . $user->lang_name . '/' . $path);
-
-		if ($dh)
-		{
-			while (($file = readdir($dh)) !== false)
-			{
-				if ($file !== 'permissions_phpbb.' . $phpEx && strpos($file, 'permissions_') === 0 && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx)
-				{
-					$files_to_add[] = $path . substr($file, 0, -(strlen($phpEx) + 1));
-				}
-			}
-			closedir($dh);
-		}
-	}
+	$lang_files = $finder
+		->prefix('permissions_')
+		->suffix(".$phpEx")
+		->extension_directory('/language/' . $user->lang_name)
+		->core_path('language/' . $user->lang_name . '/mods')
+		->find();
 
-	if (!sizeof($files_to_add))
+	foreach ($lang_files as $lang_file => $ext_name)
 	{
-		return false;
+		$user->add_lang_ext($ext_name, $lang_file);
 	}
-
-	$user->add_lang($files_to_add);
-	return true;
 }
 
 /**
-- 
cgit v1.2.1


From 81cf02e057080dda384716022b6cc4c9cc1ff461 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 26 Mar 2013 13:34:20 +0100
Subject: [ticket/11405] Order users in bookmark, in order to pass postgres
 tests

PHPBB3-11405
---
 phpBB/includes/notification/type/bookmark.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index 4e48a967d0..946cb9b4ed 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -89,6 +89,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 		{
 			return array();
 		}
+		sort($users);
 
 		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
 
-- 
cgit v1.2.1


From 1af89968dda7270de73d21bfb5285f25ddee9963 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 26 Mar 2013 20:14:40 +0100
Subject: [ticket/11474] Check read permission before sending *_in_queue
 notifications

PHPBB3-11405
PHPBB3-11474
---
 phpBB/includes/notification/type/post_in_queue.php  | 9 ++++++++-
 phpBB/includes/notification/type/topic_in_queue.php | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 9c719205e6..a167dc2faf 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -101,8 +101,15 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 		{
 			$has_permission = array_unique(array_merge($has_permission, $auth_approve[0][$this->permission]));
 		}
+		sort($has_permission);
 
-		return $this->check_user_notification_options($has_permission, array_merge($options, array(
+		$auth_read = $this->auth->acl_get_list($has_permission, 'f_read', $post['forum_id']);
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		return $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], array_merge($options, array(
 			'item_type'		=> self::$notification_option['id'],
 		)));
 	}
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index c501434c43..4fe4325118 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -101,8 +101,15 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 		{
 			$has_permission = array_unique(array_merge($has_permission, $auth_approve[0][$this->permission]));
 		}
+		sort($has_permission);
 
-		return $this->check_user_notification_options($has_permission, array_merge($options, array(
+		$auth_read = $this->auth->acl_get_list($has_permission, 'f_read', $topic['forum_id']);
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		return $this->check_user_notification_options($auth_read[$topic['forum_id']]['f_read'], array_merge($options, array(
 			'item_type'		=> self::$notification_option['id'],
 		)));
 	}
-- 
cgit v1.2.1


From d8a63047aaef2d8839baf32bbb8df724e1e46b02 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 26 Mar 2013 20:16:07 +0100
Subject: [ticket/11474] Clarify comment with "global" and forum_id = 0

Forum ID 0 in permission checks, checks the global moderator permission.

PHPBB3-11405
PHPBB3-11474
---
 phpBB/includes/notification/type/post_in_queue.php  | 2 +-
 phpBB/includes/notification/type/topic_in_queue.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index a167dc2faf..bc4b15cdc3 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -82,7 +82,7 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 			'ignore_users'		=> array(),
 		), $options);
 
-		// 0 is for global
+		// 0 is for global moderator permissions
 		$auth_approve = $this->auth->acl_get_list(false, $this->permission, array($post['forum_id'], 0));
 
 		if (empty($auth_approve))
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index 4fe4325118..f735e10c00 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -82,7 +82,7 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 			'ignore_users'		=> array(),
 		), $options);
 
-		// 0 is for global
+		// 0 is for global moderator permissions
 		$auth_approve = $this->auth->acl_get_list(false, 'm_approve', array($topic['forum_id'], 0));
 
 		if (empty($auth_approve))
-- 
cgit v1.2.1


From 6dddc22ec7241cdf32cd28788ff04fb296648203 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 26 Mar 2013 17:07:20 -0400
Subject: [ticket/11448] Use of $user_id parameter to mark a user's
 notifications read

Currently, the $user_id is a parameter but is not used. This patch fixes that.

PHPBB3-11448
---
 phpBB/includes/notification/manager.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index ff83d4bb37..4e26234390 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -256,6 +256,7 @@ class phpbb_notification_manager
 			SET notification_read = 1
 			WHERE notification_time <= " . (int) $time .
 				(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
+				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '') .
 				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '');
 		$this->db->sql_query($sql);
 	}
-- 
cgit v1.2.1


From bf6f2c5875f2476366c1bd660506e70c0f006c9d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 27 Mar 2013 11:47:40 +0100
Subject: [ticket/11469] Return after sql_multi_insert when multi_insert is
 false

PHPBB3-11469
---
 phpBB/includes/db/sql_insert_buffer.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
index fe45206893..49cf5b8ef6 100644
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -69,6 +69,7 @@ class phpbb_db_sql_insert_buffer
 			// Pass data on to sql_multi_insert right away which will
 			// immediately send an INSERT INTO query to the database.
 			$this->db->sql_multi_insert($this->table_name, array($row));
+			return;
 		}
 
 		$this->buffer[] = $row;
-- 
cgit v1.2.1


From c629b2c7b3bd8bcb836ed8d0b4e583170ede2558 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 27 Mar 2013 15:01:36 +0100
Subject: [ticket/11476] Remove pass-by-reference from sql_mutli_insert

The method never writes to the array passed by reference. So it can be
passed by value instead to avoid certain problems.

PHPBB3-11476
---
 phpBB/includes/db/driver/driver.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php
index 8dda94bc2c..b915ee081b 100644
--- a/phpBB/includes/db/driver/driver.php
+++ b/phpBB/includes/db/driver/driver.php
@@ -568,12 +568,12 @@ class phpbb_db_driver
 	* Run more than one insert statement.
 	*
 	* @param string $table table name to run the statements on
-	* @param array &$sql_ary multi-dimensional array holding the statement data.
+	* @param array $sql_ary multi-dimensional array holding the statement data.
 	*
 	* @return bool false if no statements were executed.
 	* @access public
 	*/
-	function sql_multi_insert($table, &$sql_ary)
+	function sql_multi_insert($table, $sql_ary)
 	{
 		if (!sizeof($sql_ary))
 		{
-- 
cgit v1.2.1


From 94a15f85a64db283a9c9402c40b2d35cb484fb37 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 27 Mar 2013 18:06:48 +0100
Subject: [ticket/11469] Add example code to class documentation.

PHPBB3-11469
---
 phpBB/includes/db/sql_insert_buffer.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
index fe45206893..772f368987 100644
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -19,6 +19,21 @@ if (!defined('IN_PHPBB'))
 * Collects rows for insert into a database until the buffer size is reached.
 * Then flushes the buffer to the database and starts over again.
 *
+* Usage:
+* <code>
+*	$buffer = new phpbb_db_sql_insert_buffer($db, 'test_table', 1234);
+*
+*	while (do_stuff())
+*	{
+*		$buffer->insert(array(
+*			'column1' => 'value1',
+*			'column2' => 'value2',
+*		));
+*	}
+*
+*	$buffer->flush();
+* </code>
+*
 * @package dbal
 */
 class phpbb_db_sql_insert_buffer
-- 
cgit v1.2.1


From 8c5fcac2325356bacb72517f6fbd95f9bfdaf16d Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 27 Mar 2013 18:22:59 +0100
Subject: [ticket/11469] Add benefits over collecting huge insert arrays to
 class doc.

PHPBB3-11469
---
 phpBB/includes/db/sql_insert_buffer.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
index 6b884dd412..4bf0608227 100644
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -19,6 +19,18 @@ if (!defined('IN_PHPBB'))
 * Collects rows for insert into a database until the buffer size is reached.
 * Then flushes the buffer to the database and starts over again.
 *
+* Benefits over collecting a (possibly huge) insert array and then using
+* $db->sql_multi_insert() include:
+*
+*  - Going over max packet size of the database connection is usually prevented
+*    because the data is submitted in batches.
+*
+*  - Reaching database connection timeout is usually prevented because
+*    submission of batches talks to the database every now and then.
+*
+*  - Usage of less PHP memory because data no longer needed is discarded on
+*    buffer flush.
+*
 * Usage:
 * <code>
 *	$buffer = new phpbb_db_sql_insert_buffer($db, 'test_table', 1234);
-- 
cgit v1.2.1


From dc766f29b4381e3cecfacbfeb848b4e13c3e48f9 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 27 Mar 2013 19:19:26 +0100
Subject: [ticket/11469] Have all methods of phpbb_db_sql_insert_buffer provide
 feedback.

PHPBB3-11469
---
 phpBB/includes/db/sql_insert_buffer.php | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
index 4bf0608227..dd4a62a948 100644
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -86,7 +86,8 @@ class phpbb_db_sql_insert_buffer
 	*
 	* @param array $row
 	*
-	* @return null
+	* @return bool		True when some data was flushed to the database.
+	*					False otherwise.
 	*/
 	public function insert(array $row)
 	{
@@ -96,15 +97,18 @@ class phpbb_db_sql_insert_buffer
 			// Pass data on to sql_multi_insert right away which will
 			// immediately send an INSERT INTO query to the database.
 			$this->db->sql_multi_insert($this->table_name, array($row));
-			return;
+
+			return true;
 		}
 
 		$this->buffer[] = $row;
 
 		if (sizeof($this->buffer) >= $this->max_buffered_rows)
 		{
-			$this->flush();
+			return $this->flush();
 		}
+
+		return false;
 	}
 
 	/**
@@ -116,20 +120,26 @@ class phpbb_db_sql_insert_buffer
 	*
 	* @param array $rows 
 	*
-	* @return null
+	* @return bool		True when some data was flushed to the database.
+	*					False otherwise.
 	*/
 	public function insert_all(array $rows)
 	{
+		$result = false;
+
 		foreach ($rows as $row)
 		{
-			$this->insert($row);
+			$result |= $this->insert($row);
 		}
+
+		return $result;
 	}
 
 	/**
 	* Flushes the buffer content to the DB and clears the buffer.
 	*
-	* @return null
+	* @return bool		True when some data was flushed to the database.
+	*					False otherwise.
 	*/
 	public function flush()
 	{
@@ -137,6 +147,10 @@ class phpbb_db_sql_insert_buffer
 		{
 			$this->db->sql_multi_insert($this->table_name, $this->buffer);
 			$this->buffer = array();
+
+			return true;
 		}
+
+		return false;
 	}
 }
-- 
cgit v1.2.1


From 53f9e2131c9b87d35207ea585981fc9b084d0a11 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 27 Mar 2013 19:27:27 +0100
Subject: [ticket/11469] Add note about calling flush() after batch insert is
 done.

PHPBB3-11469
---
 phpBB/includes/db/sql_insert_buffer.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
index dd4a62a948..3bd96616b3 100644
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -31,6 +31,11 @@ if (!defined('IN_PHPBB'))
 *  - Usage of less PHP memory because data no longer needed is discarded on
 *    buffer flush.
 *
+* Attention:
+* Please note that users of this class have to call flush() to flush the
+* remaining rows to the database after their batch insert operation is
+* finished.
+*
 * Usage:
 * <code>
 *	$buffer = new phpbb_db_sql_insert_buffer($db, 'test_table', 1234);
-- 
cgit v1.2.1


From c9f059c4f2793e9f98c3e0fbaad06708dd557d31 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 27 Mar 2013 20:55:48 +0100
Subject: [ticket/11469] Cast $result to boolean in insert_all()

|= returns integer values

PHPBB3-11469
---
 phpBB/includes/db/sql_insert_buffer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
index 3bd96616b3..dd7932c7bd 100644
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -137,7 +137,7 @@ class phpbb_db_sql_insert_buffer
 			$result |= $this->insert($row);
 		}
 
-		return $result;
+		return (bool) $result;
 	}
 
 	/**
-- 
cgit v1.2.1


From 4132573088c376fcb44cc588d9341c8d38b6d694 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 27 Mar 2013 23:35:36 +0100
Subject: [ticket/11469] Use buffer with a single element instead of extra code
 path.

PHPBB3-11469
---
 phpBB/includes/db/sql_insert_buffer.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
index dd7932c7bd..03c8a875b9 100644
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -96,19 +96,11 @@ class phpbb_db_sql_insert_buffer
 	*/
 	public function insert(array $row)
 	{
-		if (!$this->db_supports_multi_insert)
-		{
-			// The database does not support multi inserts.
-			// Pass data on to sql_multi_insert right away which will
-			// immediately send an INSERT INTO query to the database.
-			$this->db->sql_multi_insert($this->table_name, array($row));
-
-			return true;
-		}
-
 		$this->buffer[] = $row;
 
-		if (sizeof($this->buffer) >= $this->max_buffered_rows)
+		// Flush buffer if it is full or when DB does not support multi inserts.
+		// In the later case, the buffer will always only contain one row.
+		if (!$this->db_supports_multi_insert || sizeof($this->buffer) >= $this->max_buffered_rows)
 		{
 			return $this->flush();
 		}
-- 
cgit v1.2.1


From 1bd13acb753553ed5b9ab54144d0ca6507b031a3 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 27 Mar 2013 23:37:08 +0100
Subject: [ticket/11469] Use multi insert property from DB. Do not copy value
 to buffer.

PHPBB3-11469
---
 phpBB/includes/db/sql_insert_buffer.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
index 03c8a875b9..46d397e7b4 100644
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -58,9 +58,6 @@ class phpbb_db_sql_insert_buffer
 	/** @var phpbb_db_driver */
 	protected $db;
 
-	/** @var bool */
-	protected $db_supports_multi_insert;
-
 	/** @var string */
 	protected $table_name;
 
@@ -78,7 +75,6 @@ class phpbb_db_sql_insert_buffer
 	public function __construct(phpbb_db_driver $db, $table_name, $max_buffered_rows = 500)
 	{
 		$this->db = $db;
-		$this->db_supports_multi_insert = $db->multi_insert;
 		$this->table_name = $table_name;
 		$this->max_buffered_rows = $max_buffered_rows;
 	}
@@ -100,7 +96,7 @@ class phpbb_db_sql_insert_buffer
 
 		// Flush buffer if it is full or when DB does not support multi inserts.
 		// In the later case, the buffer will always only contain one row.
-		if (!$this->db_supports_multi_insert || sizeof($this->buffer) >= $this->max_buffered_rows)
+		if (!$this->db->multi_insert || sizeof($this->buffer) >= $this->max_buffered_rows)
 		{
 			return $this->flush();
 		}
-- 
cgit v1.2.1


From 4bd5f279dc98f036021c04172ecbb30c092de59f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 28 Mar 2013 00:27:02 +0100
Subject: [ticket/11469] Add comment about using bitwise operator.

PHPBB3-11469
---
 phpBB/includes/db/sql_insert_buffer.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
index 46d397e7b4..c18f908429 100644
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ b/phpBB/includes/db/sql_insert_buffer.php
@@ -118,11 +118,12 @@ class phpbb_db_sql_insert_buffer
 	*/
 	public function insert_all(array $rows)
 	{
-		$result = false;
+		// Using bitwise |= because PHP does not have logical ||=
+		$result = 0;
 
 		foreach ($rows as $row)
 		{
-			$result |= $this->insert($row);
+			$result |= (int) $this->insert($row);
 		}
 
 		return (bool) $result;
-- 
cgit v1.2.1


From 9e5cde7f668a614ff74dc15d9c72df48dd114dbc Mon Sep 17 00:00:00 2001
From: Tabitha Backoff <t_backoff@yahoo.com>
Date: Thu, 28 Mar 2013 02:34:36 -0400
Subject: Ticket# 11477 - Allow customisation of "Board index"

---
 phpBB/includes/acp/acp_board.php             | 1 +
 phpBB/includes/db/migration/data/310/dev.php | 2 ++
 phpBB/includes/functions.php                 | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 6543427677..e609eab01e 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -55,6 +55,7 @@ class acp_board
 						'site_desc'				=> array('lang' => 'SITE_DESC',				'validate' => 'string',	'type' => 'text:40:255', 'explain' => false),
 						'site_home_url'			=> array('lang' => 'SITE_HOME_URL',			'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
 						'site_home_text'		=> array('lang' => 'SITE_HOME_TEXT',		'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
+						'board_home_text'		=> array('lang' => 'BOARD_HOME_TEXT',		'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
 						'board_disable'			=> array('lang' => 'DISABLE_BOARD',			'validate' => 'bool',	'type' => 'custom', 'method' => 'board_disable', 'explain' => true),
 						'board_disable_msg'		=> false,
 						'default_lang'			=> array('lang' => 'DEFAULT_LANGUAGE',		'validate' => 'lang',	'type' => 'select', 'function' => 'language_select', 'params' => array('{CONFIG_VALUE}'), 'explain' => false),
diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 13b36bbf30..950d84c09e 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -108,6 +108,8 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 			array('config.add', array('site_home_url', '')),
 			array('config.add', array('site_home_text', '')),
 
+			array('config.add', array('board_home_text', '')),
+
 			array('permission.add', array('u_chgprofileinfo', true, 'u_sig')),
 
 			array('module.add', array(
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 98a2c0db79..0dca9bb2dc 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5292,7 +5292,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'BOARD_URL'			=> $board_url,
 
 		'L_LOGIN_LOGOUT'	=> $l_login_logout,
-		'L_INDEX'			=> $user->lang['FORUM_INDEX'],
+		'L_INDEX'			=> ($config['board_home_text'] !== '') ? $config['board_home_text'] : $user->lang['FORUM_INDEX'],
 		'L_SITE_HOME'		=> ($config['site_home_text'] !== '') ? $config['site_home_text'] : $user->lang['HOME'],
 		'L_ONLINE_EXPLAIN'	=> $l_online_time,
 
-- 
cgit v1.2.1


From a8f5695666229512ccd5d122daa0a7ad7004015b Mon Sep 17 00:00:00 2001
From: Tabitha Backoff <t_backoff@yahoo.com>
Date: Thu, 28 Mar 2013 17:53:14 -0400
Subject: Migration file and change board_home_text to board_index_text

---
 phpBB/includes/acp/acp_board.php                   |  2 +-
 .../includes/db/migration/data/310/boardindex.php  | 23 ++++++++++++++++++++++
 phpBB/includes/db/migration/data/310/dev.php       |  2 --
 phpBB/includes/functions.php                       |  2 +-
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 phpBB/includes/db/migration/data/310/boardindex.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index e609eab01e..bacf0d6e57 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -55,7 +55,7 @@ class acp_board
 						'site_desc'				=> array('lang' => 'SITE_DESC',				'validate' => 'string',	'type' => 'text:40:255', 'explain' => false),
 						'site_home_url'			=> array('lang' => 'SITE_HOME_URL',			'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
 						'site_home_text'		=> array('lang' => 'SITE_HOME_TEXT',		'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
-						'board_home_text'		=> array('lang' => 'BOARD_HOME_TEXT',		'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
+						'board_index_text'		=> array('lang' => 'BOARD_INDEX_TEXT',		'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
 						'board_disable'			=> array('lang' => 'DISABLE_BOARD',			'validate' => 'bool',	'type' => 'custom', 'method' => 'board_disable', 'explain' => true),
 						'board_disable_msg'		=> false,
 						'default_lang'			=> array('lang' => 'DEFAULT_LANGUAGE',		'validate' => 'lang',	'type' => 'select', 'function' => 'language_select', 'params' => array('{CONFIG_VALUE}'), 'explain' => false),
diff --git a/phpBB/includes/db/migration/data/310/boardindex.php b/phpBB/includes/db/migration/data/310/boardindex.php
new file mode 100644
index 0000000000..5a1ff62a47
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/boardindex.php
@@ -0,0 +1,23 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_boardindex extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.1.0-dev', '>=');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('board_index_text', '')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 950d84c09e..13b36bbf30 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -108,8 +108,6 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 			array('config.add', array('site_home_url', '')),
 			array('config.add', array('site_home_text', '')),
 
-			array('config.add', array('board_home_text', '')),
-
 			array('permission.add', array('u_chgprofileinfo', true, 'u_sig')),
 
 			array('module.add', array(
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 0dca9bb2dc..58d2ad4760 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5292,7 +5292,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'BOARD_URL'			=> $board_url,
 
 		'L_LOGIN_LOGOUT'	=> $l_login_logout,
-		'L_INDEX'			=> ($config['board_home_text'] !== '') ? $config['board_home_text'] : $user->lang['FORUM_INDEX'],
+		'L_INDEX'			=> ($config['board_index_text'] !== '') ? $config['board_index_text'] : $user->lang['FORUM_INDEX'],
 		'L_SITE_HOME'		=> ($config['site_home_text'] !== '') ? $config['site_home_text'] : $user->lang['HOME'],
 		'L_ONLINE_EXPLAIN'	=> $l_online_time,
 
-- 
cgit v1.2.1


From 6910d441546f5213eab11b2329b49e5a6626ad67 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 17 Mar 2013 22:15:10 +0100
Subject: [ticket/11403] phpbb_notification_manager: Use SQL multi insert in
 batches.

PHPBB3-11403
---
 phpBB/includes/notification/manager.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 4e26234390..ee81cc0f7c 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -430,6 +430,13 @@ class phpbb_notification_manager
 			// Store the creation array in our new rows that will be inserted later
 			$new_rows[] = $notification->create_insert_array($data, $pre_create_data);
 
+			// Flush to DB if $new_rows is big enough.
+			if (sizeof($new_rows) > 500)
+			{
+				$this->db->sql_multi_insert($this->notifications_table, $new_rows);
+				$new_rows = array();
+			}
+
 			// Users are needed to send notifications
 			$user_ids = array_merge($user_ids, $notification->users_to_query());
 
@@ -448,8 +455,10 @@ class phpbb_notification_manager
 			}
 		}
 
-		// insert into the db
-		$this->db->sql_multi_insert($this->notifications_table, $new_rows);
+		if (!empty($new_rows))
+		{
+			$this->db->sql_multi_insert($this->notifications_table, $new_rows);
+		}
 
 		// We need to load all of the users to send notifications
 		$this->user_loader->load_users($user_ids);
-- 
cgit v1.2.1


From b156b22f35eab64a9780167bfe8d515f2e2a8480 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 29 Mar 2013 16:44:29 +0100
Subject: [ticket/11403] Use an instance of phpbb_db_sql_insert_buffer instead.

PHPBB3-11403
---
 phpBB/includes/notification/manager.php | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index ee81cc0f7c..9eceeb753a 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -390,7 +390,6 @@ class phpbb_notification_manager
 
 		$user_ids = array();
 		$notification_objects = $notification_methods = array();
-		$new_rows = array();
 
 		// Never send notifications to the anonymous user!
 		unset($notify_users[ANONYMOUS]);
@@ -420,6 +419,8 @@ class phpbb_notification_manager
 		$pre_create_data = $notification->pre_create_insert_array($data, $notify_users);
 		unset($notification);
 
+		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $this->notifications_table);
+
 		// Go through each user so we can insert a row in the DB and then notify them by their desired means
 		foreach ($notify_users as $user => $methods)
 		{
@@ -427,15 +428,8 @@ class phpbb_notification_manager
 
 			$notification->user_id = (int) $user;
 
-			// Store the creation array in our new rows that will be inserted later
-			$new_rows[] = $notification->create_insert_array($data, $pre_create_data);
-
-			// Flush to DB if $new_rows is big enough.
-			if (sizeof($new_rows) > 500)
-			{
-				$this->db->sql_multi_insert($this->notifications_table, $new_rows);
-				$new_rows = array();
-			}
+			// Insert notification row using buffer.
+			$insert_buffer->insert($notification->create_insert_array($data, $pre_create_data));
 
 			// Users are needed to send notifications
 			$user_ids = array_merge($user_ids, $notification->users_to_query());
@@ -455,10 +449,7 @@ class phpbb_notification_manager
 			}
 		}
 
-		if (!empty($new_rows))
-		{
-			$this->db->sql_multi_insert($this->notifications_table, $new_rows);
-		}
+		$insert_buffer->flush();
 
 		// We need to load all of the users to send notifications
 		$this->user_loader->load_users($user_ids);
-- 
cgit v1.2.1


From 5d669ed1c52250d6f0a378f6aa4ee6538daf86e3 Mon Sep 17 00:00:00 2001
From: Tabitha Backoff <t_backoff@yahoo.com>
Date: Sun, 31 Mar 2013 18:46:25 -0400
Subject: Changing effectively_installed function to check if the config var is
 set.

---
 phpBB/includes/db/migration/data/310/boardindex.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/boardindex.php b/phpBB/includes/db/migration/data/310/boardindex.php
index 5a1ff62a47..965e32c15c 100644
--- a/phpBB/includes/db/migration/data/310/boardindex.php
+++ b/phpBB/includes/db/migration/data/310/boardindex.php
@@ -11,7 +11,7 @@ class phpbb_db_migration_data_310_boardindex extends phpbb_db_migration
 {
 	public function effectively_installed()
 	{
-		return version_compare($this->config['version'], '3.1.0-dev', '>=');
+		return isset($this->config['board_index_text']);
 	}
 
 	public function update_data()
-- 
cgit v1.2.1


From 29a5db25ec21a8b349195d01bdd0cfea09814653 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 7 Apr 2013 19:12:04 +0300
Subject: [ticket/11482] Implementation of advanced DEFINE tag

Implementation of advanced DEFINE tag and ENDDEFINE

PHPBB3-11482
---
 phpBB/includes/template/filter.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 9e8ad2fef0..a3894905e5 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -329,6 +329,10 @@ class phpbb_template_filter extends php_user_filter
 				return '<?php ' . $this->compile_tag_define($matches[2], false) . ' ?>';
 			break;
 
+			case 'ENDDEFINE':
+				return '<?php ' . $this->compile_tag_enddefine() . ' ?>';
+			break;
+
 			case 'INCLUDE':
 				return '<?php ' . $this->compile_tag_include($matches[2]) . ' ?>';
 			break;
@@ -833,6 +837,16 @@ class phpbb_template_filter extends php_user_filter
 		$match = array();
 		preg_match('#^((?:' . self::REGEX_NS . '\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (.*?))?$#', $tag_args, $match);
 
+		if (!empty($match[2]) && !isset($match[3]) && $op)
+		{
+			// DEFINE tag with ENDDEFINE
+			$array = '$_tpldata[\'DEFINE\'][\'.vars\']';
+			$code = 'ob_start(); ';
+			$code .= 'if (!isset(' . $array . ')) { ' . $array . ' = array(); } ';
+			$code .= $array . '[] = \'' . $match[2] . '\'';
+			return $code;
+		}
+
 		if (empty($match[2]) || (!isset($match[3]) && $op))
 		{
 			return '';
@@ -859,6 +873,20 @@ class phpbb_template_filter extends php_user_filter
 		return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $parsed_statement . ';';
 	}
 
+	/**
+	* Compile ENDDEFINE tag
+	*
+	* @return string compiled template code
+	*/
+	private function compile_tag_enddefine()
+	{
+		$array = '$_tpldata[\'DEFINE\'][\'.vars\']';
+		$code = 'if (!isset(' . $array . ') || !sizeof(' . $array . ')) { trigger_error(\'ENDDEFINE tag without DEFINE in \' . basename(__FILE__), E_USER_ERROR); }';
+		$code .= '$define_var = array_pop(' . $array . '); ';
+		$code .= '$_tpldata[\'DEFINE\'][\'.\'][$define_var] = ob_get_clean();';
+		return $code;
+	}
+
 	/**
 	* Compile INCLUDE tag
 	*
-- 
cgit v1.2.1


From 7c261f64dc14eaa7321d824e8e75271c5c6a191e Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Tue, 9 Apr 2013 15:22:14 +0530
Subject: [ticket/11485] add columns to styles table during updating schema
 before updating the data

PHPBB3-10485
---
 phpBB/includes/db/migration/data/310/style_update_p1.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/style_update_p1.php b/phpBB/includes/db/migration/data/310/style_update_p1.php
index e324ce7f24..9a936e5f53 100644
--- a/phpBB/includes/db/migration/data/310/style_update_p1.php
+++ b/phpBB/includes/db/migration/data/310/style_update_p1.php
@@ -19,6 +19,20 @@ class phpbb_db_migration_data_310_style_update_p1 extends phpbb_db_migration
 		return array('phpbb_db_migration_data_30x_3_0_11');
 	}
 
+	public function update_schema()
+	{
+		return array(
+			'add_columns'	=> array(
+				$this->table_prefix . 'styles'		=> array(
+					'style_path'			=> array('VCHAR:100', ''),
+					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+					'style_parent_id'		=> array('UINT', 0),
+					'style_parent_tree'		=> array('TEXT', ''),
+				),
+			),
+		);
+	}
+
 	public function update_data()
 	{
 		return array(
-- 
cgit v1.2.1


From 5a4438d486bc9a8738765fb671e584e269353c06 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Tue, 9 Apr 2013 15:38:28 +0530
Subject: [ticket/11485] add revert_schema for the updated columns

PHPBB3-11485
---
 phpBB/includes/db/migration/data/310/style_update_p1.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/style_update_p1.php b/phpBB/includes/db/migration/data/310/style_update_p1.php
index 9a936e5f53..d43537559d 100644
--- a/phpBB/includes/db/migration/data/310/style_update_p1.php
+++ b/phpBB/includes/db/migration/data/310/style_update_p1.php
@@ -33,6 +33,20 @@ class phpbb_db_migration_data_310_style_update_p1 extends phpbb_db_migration
 		);
 	}
 
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns'	=> array(
+				$this->table_prefix . 'styles'		=> array(
+					'style_path',
+					'bbcode_bitfield',
+					'style_parent_id',
+					'style_parent_tree',
+				),
+			),
+		);
+	}
+
 	public function update_data()
 	{
 		return array(
-- 
cgit v1.2.1


From 78bcc31a5d0cb01a4748f184fddd00a9b50f09f1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 10 Apr 2013 13:08:31 +0200
Subject: [ticket/11465] The info file does not have _info suffix

PHPBB3-11465
---
 phpBB/includes/acp/acp_modules.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 9cf6bf0214..62af12ad32 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -577,10 +577,11 @@ class acp_modules
 			// manually because it does not support auto loading
 			if (!class_exists($info_class))
 			{
-				$info_class = str_replace("phpbb_{$module_class}_info_", '', $cur_module) . '_info';
-				if (file_exists($directory . $info_class . '.' . $phpEx))
+				$info_class_file = str_replace("phpbb_{$module_class}_info_", '', $cur_module);
+				$info_class = $info_class_file . '_info';
+				if (file_exists($directory . $info_class_file . '.' . $phpEx))
 				{
-					include($directory . $info_class . '.' . $phpEx);
+					include($directory . $info_class_file . '.' . $phpEx);
 				}
 			}
 
-- 
cgit v1.2.1


From 8567aaed324eb87856ee6274f8330c52beecd0a3 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 10 Apr 2013 20:12:03 +0300
Subject: [ticket/11482] Use double quotes for code

Use double quotes for code to avoid excessive escaping

PHPBB3-11482
---
 phpBB/includes/template/filter.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index a3894905e5..5b0957280d 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -840,10 +840,10 @@ class phpbb_template_filter extends php_user_filter
 		if (!empty($match[2]) && !isset($match[3]) && $op)
 		{
 			// DEFINE tag with ENDDEFINE
-			$array = '$_tpldata[\'DEFINE\'][\'.vars\']';
+			$array = "\$_tpldata['DEFINE']['.vars']";
 			$code = 'ob_start(); ';
-			$code .= 'if (!isset(' . $array . ')) { ' . $array . ' = array(); } ';
-			$code .= $array . '[] = \'' . $match[2] . '\'';
+			$code .= "if (!isset($array)) { $array = array(); } ";
+			$code .= "{$array}[] = '{$match[2]}'";
 			return $code;
 		}
 
@@ -880,10 +880,10 @@ class phpbb_template_filter extends php_user_filter
 	*/
 	private function compile_tag_enddefine()
 	{
-		$array = '$_tpldata[\'DEFINE\'][\'.vars\']';
-		$code = 'if (!isset(' . $array . ') || !sizeof(' . $array . ')) { trigger_error(\'ENDDEFINE tag without DEFINE in \' . basename(__FILE__), E_USER_ERROR); }';
-		$code .= '$define_var = array_pop(' . $array . '); ';
-		$code .= '$_tpldata[\'DEFINE\'][\'.\'][$define_var] = ob_get_clean();';
+		$array = "\$_tpldata['DEFINE']['.vars']";
+		$code = "if (!isset($array) || !sizeof($array)) { trigger_error('ENDDEFINE tag without DEFINE in ' . basename(__FILE__), E_USER_ERROR); }";
+		$code .= "\$define_var = array_pop($array); ";
+		$code .= "\$_tpldata['DEFINE']['.'][\$define_var] = ob_get_clean();";
 		return $code;
 	}
 
-- 
cgit v1.2.1


From 694eb3ccb50c064acf7b3f9aba23620111b8814a Mon Sep 17 00:00:00 2001
From: rechosen <rechosen@gmail.com>
Date: Thu, 11 Apr 2013 12:47:33 +0200
Subject: [ticket/11116] Made ACP "extension not available" error message
 E_USER_WARNING

The error message generated when an administrator tries to enable an
incompatible extension used to be displayed in the green of the default
E_USER_NOTICE. Changed it to E_USER_WARNING to make it appear in red, as
requested in the ticket.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 24211196bd..e4f8059b45 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -81,7 +81,7 @@ class acp_extensions
 			case 'enable_pre':
 				if (!$md_manager->validate_enable())
 				{
-					trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action));
+					trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
 				if ($phpbb_extension_manager->enabled($ext_name))
@@ -100,7 +100,7 @@ class acp_extensions
 			case 'enable':
 				if (!$md_manager->validate_enable())
 				{
-					trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action));
+					trigger_error($user->lang['EXTENSION_NOT_AVAILABLE'] . adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
 				try
-- 
cgit v1.2.1


From 00b45fa4dcc287f395e994e461173adf10764126 Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Tue, 5 Mar 2013 07:29:41 +0530
Subject: [ticket/11358] Fixed the code according to coding guidlines.

Added proper indentation and new line after break in switch
statement.

PHPBB3-11358
---
 phpBB/includes/acp/acp_groups.php | 85 ++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 00ca26dfa6..b4aa102fcd 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -141,57 +141,58 @@ class acp_groups
 						'action'	=> $action))
 					);
 				}
-
-				break;
+			break;
+				
 			case 'set_default_on_all':
-					if (confirm_box(true))
-					{
-						$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-							
-						$start = 0;
+				if (confirm_box(true))
+				{
+					$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
+						
+					$start = 0;
 
-						do
+					do
+					{
+						$sql = 'SELECT user_id
+							FROM ' . USER_GROUP_TABLE . "
+							WHERE group_id = $group_id
+							ORDER BY user_id";
+						$result = $db->sql_query_limit($sql, 200, $start);
+
+						$mark_ary = array();
+						if ($row = $db->sql_fetchrow($result))
 						{
-							$sql = 'SELECT user_id
-								FROM ' . USER_GROUP_TABLE . "
-								WHERE group_id = $group_id
-								ORDER BY user_id";
-							$result = $db->sql_query_limit($sql, 200, $start);
-
-							$mark_ary = array();
-							if ($row = $db->sql_fetchrow($result))
+							do
 							{
-								do
-								{
-									$mark_ary[] = $row['user_id'];
-								}
-								while ($row = $db->sql_fetchrow($result));
+								$mark_ary[] = $row['user_id'];
+							}
+							while ($row = $db->sql_fetchrow($result));
 
-								group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
+							group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
 
-								$start = (sizeof($mark_ary) < 200) ? 0 : $start + 200;
-							}
-							else
-							{
-								$start = 0;
-							}
-							$db->sql_freeresult($result);
+							$start = (sizeof($mark_ary) < 200) ? 0 : $start + 200;
 						}
-						while ($start);
-							
-						trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
-					}
-					else
-					{
-						confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
-							'mark'		=> $mark_ary,
-							'g'			=> $group_id,
-							'i'			=> $id,
-							'mode'		=> $mode,
-							'action'	=> $action))
-						);
+						else
+						{
+							$start = 0;
+						}
+						$db->sql_freeresult($result);
 					}
+					while ($start);
+						
+					trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
+				}
+				else
+				{
+					confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+						'mark'		=> $mark_ary,
+						'g'			=> $group_id,
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'action'	=> $action))
+					);
+				}
 			break;
+			
 			case 'deleteusers':
 				if (empty($mark_ary))
 				{
-- 
cgit v1.2.1


From 7d8bbcd596ca2d6a3821134c6f8c7478650a2d7a Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Tue, 5 Mar 2013 23:52:15 +0530
Subject: [ticket/11358] Removed all trailing white spaces.

Removed all trailing white spaces with new lines.

PHPBB3-11358
---
 phpBB/includes/acp/acp_groups.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index b4aa102fcd..beb7aefee5 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -142,12 +142,12 @@ class acp_groups
 					);
 				}
 			break;
-				
+
 			case 'set_default_on_all':
 				if (confirm_box(true))
 				{
 					$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
-						
+
 					$start = 0;
 
 					do
@@ -178,7 +178,7 @@ class acp_groups
 						$db->sql_freeresult($result);
 					}
 					while ($start);
-						
+
 					trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
 				}
 				else
@@ -192,7 +192,7 @@ class acp_groups
 					);
 				}
 			break;
-			
+
 			case 'deleteusers':
 				if (empty($mark_ary))
 				{
-- 
cgit v1.2.1


From 6a3d77d76e9a6ee17acbd29da8486742f60a2514 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 1 Apr 2013 10:34:06 +0200
Subject: [ticket/10844] Add phpbb_root_path to
 phpbb_style_extension_path_provider

The phpbb_root_path needs to be removed from the style path, before giving
the path to the finder, because the finder prepends it later again and is
therefor unable to find style files when the root path is not ./

PHPBB3-10844
---
 phpBB/includes/bbcode.php                        |  2 +-
 phpBB/includes/functions_messenger.php           |  2 +-
 phpBB/includes/style/extension_path_provider.php | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index e8681420d4..c198abeb54 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -133,7 +133,7 @@ class bbcode
 			$this->template_bitfield = new bitfield($user->style['bbcode_bitfield']);
 
 			$style_resource_locator = new phpbb_style_resource_locator();
-			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
+			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path);
 			$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template);
 			$style->set_style();
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 821f0d970d..e580f6b675 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -209,7 +209,7 @@ class messenger
 		if (!isset($this->tpl_msg[$template_lang . $template_file]))
 		{
 			$style_resource_locator = new phpbb_style_resource_locator();
-			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
+			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path);
 			$tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
 
diff --git a/phpBB/includes/style/extension_path_provider.php b/phpBB/includes/style/extension_path_provider.php
index 6976a45ed0..e658abcb42 100644
--- a/phpBB/includes/style/extension_path_provider.php
+++ b/phpBB/includes/style/extension_path_provider.php
@@ -40,17 +40,22 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple
 	*/
 	protected $base_path_provider;
 
+	/** @var string */
+	protected $phpbb_root_path;
+
 	/**
 	* Constructor stores extension manager
 	*
 	* @param phpbb_extension_manager $extension_manager phpBB extension manager
 	* @param phpbb_style_path_provider $base_path_provider A simple path provider
 	*            to provide paths to be located in extensions
+	* @param string		$phpbb_root_path	phpBB root path
 	*/
-	public function __construct(phpbb_extension_manager $extension_manager, phpbb_style_path_provider $base_path_provider)
+	public function __construct(phpbb_extension_manager $extension_manager, phpbb_style_path_provider $base_path_provider, $phpbb_root_path)
 	{
 		parent::__construct($extension_manager);
 		$this->base_path_provider = $base_path_provider;
+		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
 	/**
@@ -91,6 +96,14 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple
 					$directories['style'][] = $path;
 					if ($path && !phpbb_is_absolute($path))
 					{
+						// Remove phpBB root path from the style path,
+						// so the finder is able to find extension styles,
+						// when the root path is not ./
+						if (strpos($path, $this->phpbb_root_path) === 0)
+						{
+							$path = substr($path, strlen($this->phpbb_root_path));
+						}
+
 						$result = $finder->directory('/' . $this->ext_dir_prefix . $path)
 							->get_directories(true, false, true);
 						foreach ($result as $ext => $ext_path)
-- 
cgit v1.2.1


From bbaa3411b04c06c519e8dd215a0251c97263eac4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 12 Apr 2013 21:19:09 +0200
Subject: [ticket/10844] Make sure ext_path has no trailing slash

PHPBB3-10844
---
 phpBB/includes/style/extension_path_provider.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/extension_path_provider.php b/phpBB/includes/style/extension_path_provider.php
index e658abcb42..ec1d85f821 100644
--- a/phpBB/includes/style/extension_path_provider.php
+++ b/phpBB/includes/style/extension_path_provider.php
@@ -108,6 +108,11 @@ class phpbb_style_extension_path_provider extends phpbb_extension_provider imple
 							->get_directories(true, false, true);
 						foreach ($result as $ext => $ext_path)
 						{
+							// Make sure $ext_path has no ending slash
+							if (substr($ext_path, -1) === '/')
+							{
+								$ext_path = substr($ext_path, 0, -1);
+							}
 							$directories[$ext][] = $ext_path;
 						}
 					}
-- 
cgit v1.2.1


From 474b4a60a527a4c0cd853872ce80ae50fdd2f374 Mon Sep 17 00:00:00 2001
From: OpenShift guest <dachebodt@gmail.com>
Date: Sat, 13 Apr 2013 10:49:59 -0400
Subject: [ticket/11458] We still auto add language files from the mods and acp
 folders in the language directory, so we revert some changes here

PHPBB3-11458
---
 phpBB/includes/functions_admin.php | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 5d71f55d1a..b5efa49159 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -3045,20 +3045,47 @@ function add_permission_language()
 	// First of all, our own file. We need to include it as the first file because it presets all relevant variables.
 	$user->add_lang('acp/permissions_phpbb');
 
-	// add permission language files from extensions
+	$files_to_add = array();
+
+	// Now search in acp and mods folder for permissions_ files.
+	foreach (array('acp/', 'mods/') as $path)
+	{
+		$dh = @opendir($user->lang_path . $user->lang_name . '/' . $path);
+
+		if ($dh)
+		{
+			while (($file = readdir($dh)) !== false)
+			{
+				if ($file !== 'permissions_phpbb.' . $phpEx && strpos($file, 'permissions_') === 0 && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx)
+				{
+					$files_to_add[] = $path . substr($file, 0, -(strlen($phpEx) + 1));
+				}
+			}
+			closedir($dh);
+		}
+	}
+
+	// find permission language files from extensions
 	$finder = $phpbb_extension_manager->get_finder();
 
-	$lang_files = $finder
+	$ext_lang_files = $finder
 		->prefix('permissions_')
 		->suffix(".$phpEx")
 		->extension_directory('/language/' . $user->lang_name)
-		->core_path('language/' . $user->lang_name . '/mods')
 		->find();
 
-	foreach ($lang_files as $lang_file => $ext_name)
+	foreach ($ext_lang_files as $lang_file => $ext_name)
 	{
 		$user->add_lang_ext($ext_name, $lang_file);
 	}
+
+	if (!sizeof($files_to_add))
+	{
+		return false;
+	}
+
+	$user->add_lang($files_to_add);
+	return true;
 }
 
 /**
-- 
cgit v1.2.1


From 7240759e34d4e67fbce632c03ae6818aad36a07c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 14 Apr 2013 17:25:45 +0200
Subject: [ticket/11465] Check if class exists before including info file

PHPBB3-11465
---
 phpBB/includes/acp/acp_modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 62af12ad32..ab416fb406 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -579,7 +579,7 @@ class acp_modules
 			{
 				$info_class_file = str_replace("phpbb_{$module_class}_info_", '', $cur_module);
 				$info_class = $info_class_file . '_info';
-				if (file_exists($directory . $info_class_file . '.' . $phpEx))
+				if (!class_exists($info_class) && file_exists($directory . $info_class_file . '.' . $phpEx))
 				{
 					include($directory . $info_class_file . '.' . $phpEx);
 				}
-- 
cgit v1.2.1


From c1dedabdfb688501dceade55f6f3e96e3495e5dd Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 15 Apr 2013 12:50:21 +0200
Subject: [ticket/11488] Use correct base class in email notification method

In ticket/11451 this was not correctly changed to reflect the new class
phpbb_notifcation_method_messenger_base. Additionally, an undefined
variable error has been fixed in messenger_base.php (change should be
confirmed by bantu though).

PHPBB3-11488
---
 phpBB/includes/notification/method/email.php          | 2 +-
 phpBB/includes/notification/method/messenger_base.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index dc505c0d41..44666b1422 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notification_method_email extends phpbb_notification_method_base
+class phpbb_notification_method_email extends phpbb_notification_method_messenger_base
 {
 	/**
 	* Get notification method name
diff --git a/phpBB/includes/notification/method/messenger_base.php b/phpBB/includes/notification/method/messenger_base.php
index ce1ecc09ce..2f9073e80b 100644
--- a/phpBB/includes/notification/method/messenger_base.php
+++ b/phpBB/includes/notification/method/messenger_base.php
@@ -78,7 +78,7 @@ abstract class phpbb_notification_method_messenger_base extends phpbb_notificati
 				continue;
 			}
 
-			$messenger->template($email_template_base_dir . $notification->get_email_template(), $user['user_lang']);
+			$messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']);
 
 			$messenger->to($user['user_email'], $user['username']);
 
-- 
cgit v1.2.1


From a1183a58894967bfec7da01c5004138e4daeb583 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 16 Apr 2013 23:07:48 +0200
Subject: [ticket/11495] Add basic interface with nestedset operations

PHPBB3-11495
---
 phpBB/includes/nestedset/interface.php      | 131 ++++++++++++++++++++++++++++
 phpBB/includes/nestedset/item/interface.php |  61 +++++++++++++
 2 files changed, 192 insertions(+)
 create mode 100644 phpBB/includes/nestedset/interface.php
 create mode 100644 phpBB/includes/nestedset/item/interface.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
new file mode 100644
index 0000000000..7ef6ff87bb
--- /dev/null
+++ b/phpBB/includes/nestedset/interface.php
@@ -0,0 +1,131 @@
+<?php
+/**
+*
+* @package Nested Set
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+interface phpbb_nestedset_interface
+{
+	/**
+	* Insert an item into the nested set (also insert the rows into the table)
+	*
+	* @param phpbb_nestedset_item_interface	$item	The item to be added
+	* @return array Array with item data as set in the database
+	*/
+	public function insert(array $additional_data);
+
+	/**
+	* Add an item at the end of the nested set
+	*
+	* @param phpbb_nestedset_item_interface	$item	The item to be added
+	* @return bool True if the item was added
+	*/
+	public function add(phpbb_nestedset_item_interface $item);
+
+	/**
+	* Remove an item from the nested set
+	*
+	* Also removes all subitems from the nested set
+	*
+	* @param phpbb_nestedset_item_interface	$item	The item to be removed
+	* @return array		Items that have been removed
+	*/
+	public function remove(phpbb_nestedset_item_interface $item);
+
+	/**
+	* Delete an item from the nested set (also deletes the rows form the table)
+	*
+	* Also deletes all subitems from the nested set
+	*
+	* @param phpbb_nestedset_item_interface	$item	The item to be deleted
+	* @return array		Items that have been deleted
+	*/
+	public function delete(phpbb_nestedset_item_interface $item);
+
+	/**
+	* Move an item by a given delta
+	*
+	* @param phpbb_nestedset_item_interface	$item	The item to be moved
+	* @param int	$delta	Number of steps to move this item, < 0 => down, > 0 => up
+	* @return bool True if the item was moved
+	*/
+	public function move(phpbb_nestedset_item_interface $item, $delta);
+
+	/**
+	* Move an item down by 1
+	*
+	* @param phpbb_nestedset_item_interface	$item	The item to be moved
+	* @return bool True if the item was moved
+	*/
+	public function move_down(phpbb_nestedset_item_interface $item);
+
+	/**
+	* Move an item up by 1
+	*
+	* @param phpbb_nestedset_item_interface	$item	The item to be moved
+	* @return bool True if the item was moved
+	*/
+	public function move_up(phpbb_nestedset_item_interface $item);
+
+	/**
+	* Moves all children of one item to another item
+	*
+	* @param phpbb_nestedset_item_interface	$current_parent		The current parent item
+	* @param phpbb_nestedset_item_interface	$new_parent			The new parent item
+	* @return bool True if any items where moved
+	*/
+	public function move_children(phpbb_nestedset_item_interface $current_parent, phpbb_nestedset_item_interface $new_parent);
+
+	/**
+	* Set the parent item
+	*
+	* @param phpbb_nestedset_item_interface	$item		The item to be moved
+	* @param phpbb_nestedset_item_interface	$new_parent	The new parent item
+	* @return bool True if the parent was set successfully
+	*/
+	public function set_parent(phpbb_nestedset_item_interface $item, phpbb_nestedset_item_interface $new_parent);
+
+	/**
+	* Get branch of the item
+	*
+	* This method can return all parents, children or both of the given item
+	*
+	* @param phpbb_nestedset_item_interface	$item		The item to get the branch from
+	* @param string		$type			One of all|parent|children
+	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param bool		$include_item	Should the given item be included in the list aswell
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_branch_data(phpbb_nestedset_item_interface $item, $type, $order_desc, $include_item);
+
+	/**
+	* Get base information of parent items
+	*
+	* @param phpbb_nestedset_item_interface	$item		The item to get the parents from
+	* @return array			Array of items (containing basic columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_parent_data(phpbb_nestedset_item_interface $item);
+
+	/**
+	* Recalculate Nested Sets
+	*
+	* @param int	$new_id		First left_id to be used (should start with 1)
+	* @param int	$parent_id	parent_id of the current set (default = 0)
+	* @param bool	$reset_ids	Should we reset all left_id/right_id on the first call?
+	* @return	int		$new_id		The next left_id/right_id that should be used
+	*/
+	public function recalculate_nested_set($new_id, $parent_id = 0, $reset_ids = false);
+}
diff --git a/phpBB/includes/nestedset/item/interface.php b/phpBB/includes/nestedset/item/interface.php
new file mode 100644
index 0000000000..18206d752e
--- /dev/null
+++ b/phpBB/includes/nestedset/item/interface.php
@@ -0,0 +1,61 @@
+<?php
+/**
+*
+* @package Nested Set
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+interface phpbb_nestedset_item_interface
+{
+	/**
+	* Returns the ID of the item
+	*
+	* @return int
+	*/
+	public function get_item_id();
+
+	/**
+	* Returns the ID of the parent item
+	*
+	* @return int
+	*/
+	public function get_parent_id();
+
+	/**
+	* Returns a serialized or empty string with the data of the item's parents
+	*
+	* @return string
+	*/
+	public function get_item_parents_data();
+
+	/**
+	* Returns the left_id of the item
+	*
+	* @return int
+	*/
+	public function get_left_id();
+
+	/**
+	* Returns the right_id of the item
+	*
+	* @return int
+	*/
+	public function get_right_id();
+
+	/**
+	* Does the item have sub-items?
+	*
+	* @return bool
+	*/
+	public function has_children();
+}
-- 
cgit v1.2.1


From 0d5efcc1d569b3907eebfacef84ac0be3fd11143 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 16 Apr 2013 23:08:35 +0200
Subject: [ticket/11495] Add abstract implementation of the interface

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php      | 632 +++++++++++++++++++++++++++++++++
 phpBB/includes/nestedset/item/base.php |  82 +++++
 2 files changed, 714 insertions(+)
 create mode 100644 phpBB/includes/nestedset/base.php
 create mode 100644 phpBB/includes/nestedset/item/base.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
new file mode 100644
index 0000000000..7f4691b7e0
--- /dev/null
+++ b/phpBB/includes/nestedset/base.php
@@ -0,0 +1,632 @@
+<?php
+/**
+*
+* @package Nested Set
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
+{
+	/** @var phpbb_db_driver*/
+	protected $db;
+
+	/** @var String */
+	protected $table_name;
+
+	/** @var String */
+	protected $item_class = 'phpbb_nestedset_item_base';
+
+	/**
+	* Column names in the table
+	* @var array
+	*/
+	protected $table_columns = array(
+		'item_id'	=> 'item_id',
+		'left_id'	=> 'left_id',
+		'right_id'	=> 'right_id',
+		'parent_id'	=> 'parent_id',
+		'item_parents'	=> 'item_parents',
+	);
+
+	/**
+	* Additional SQL restrictions
+	* Allows to have multiple nested sets in one table
+	* @var String
+	*/
+	protected $sql_where = '';
+
+	/**
+	* List of item properties to be cached in $item_parents
+	* @var array
+	*/
+	protected $item_basic_data = array('*');
+
+	/**
+	* Delete an item from the nested set (also deletes the rows form the table)
+	*
+	* Also deletes all subitems from the nested set
+	*
+	* @param string		$operator		SQL operator that needs to be prepended to sql_where,
+	*									if it is not empty.
+	* @param string		$column_prefix	Prefix that needs to be prepended to column names
+	* @return bool True if the item was deleted
+	*/
+	public function get_sql_where($operator = 'AND', $column_prefix = '')
+	{
+		return (!$this->sql_where) ? '' : $operator . ' ' . sprintf($this->sql_where, $column_prefix);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function insert(array $additional_data)
+	{
+		$item_data = array_merge($additional_data, array(
+			$this->table_columns['parent_id']		=> 0,
+			$this->table_columns['left_id']			=> 0,
+			$this->table_columns['right_id']		=> 0,
+			$this->table_columns['item_parents']	=> '',
+		));
+
+		unset($item_data[$this->table_columns['item_id']]);
+
+		$sql = 'INSERT INTO ' . $this->table_name . ' ' . $this->db->sql_build_array('INSERT', $item_data);
+		$this->db->sql_query($sql);
+
+		$item_data[$this->table_columns['item_id']] = (int) $this->db->sql_nextid();
+
+		$item = new $this->item_class($item_data);
+
+		return array_merge($item_data, $this->add($item));
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function add(phpbb_nestedset_item_interface $item)
+	{
+		$sql = 'SELECT MAX(' . $this->table_columns['right_id'] . ') AS ' . $this->table_columns['right_id'] . '
+			FROM ' . $this->table_name . '
+			' . $this->get_sql_where('WHERE');
+		$result = $this->db->sql_query($sql);
+		$current_max_right_id = (int) $this->db->sql_fetchfield($this->table_columns['right_id']);
+		$this->db->sql_freeresult($result);
+
+		$update_item_data = array(
+			$this->table_columns['parent_id']		=> 0,
+			$this->table_columns['left_id']			=> $current_max_right_id + 1,
+			$this->table_columns['right_id']		=> $current_max_right_id + 2,
+			$this->table_columns['item_parents']	=> '',
+		);
+
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->db->sql_build_array('UPDATE', $update_item_data) . '
+			WHERE ' . $this->table_columns['item_id'] . ' = ' . $item->get_item_id();
+		$this->db->sql_query($sql);
+
+		return $update_item_data;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function remove(phpbb_nestedset_item_interface $item)
+	{
+		if ($item->has_children())
+		{
+			$items = array_keys($this->get_branch_data($item, 'children'));
+		}
+		else
+		{
+			$items = array($item->get_item_id());
+		}
+
+		$this->remove_subset($items, $item);
+
+		return $items;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function delete(phpbb_nestedset_item_interface $item)
+	{
+		$removed_items = $this->remove($item);
+
+		$sql = 'DELETE FROM ' . $this->table_name . '
+			WHERE ' . $this->db->sql_in_set($this->table_columns['item_id'], $removed_items) . '
+			' . $this->get_sql_where('AND');
+		$this->db->sql_query($sql);
+
+		return $removed_items;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function move(phpbb_nestedset_item_interface $item, $delta)
+	{
+		if ($delta == 0)
+		{
+			return false;
+		}
+
+		$action = ($delta > 0) ? 'move_up' : 'move_down';
+		$delta = abs($delta);
+
+		/**
+		* Fetch all the siblings between the item's current spot
+		* and where we want to move it to. If there are less than $delta
+		* siblings between the current spot and the target then the
+		* item will move as far as possible
+		*/
+		$sql = 'SELECT ' . implode(', ', $this->table_columns) . '
+			FROM ' . $this->table_name . '
+			WHERE ' . $this->table_columns['parent_id'] . ' = ' . $item->get_parent_id() . '
+				' . $this->get_sql_where() . '
+				AND ';
+
+		if ($action == 'move_up')
+		{
+			$sql .= $this->table_columns['right_id'] . ' < ' . $item->get_right_id() . ' ORDER BY ' . $this->table_columns['right_id'] . ' DESC';
+		}
+		else
+		{
+			$sql .= $this->table_columns['left_id'] . ' > ' . $item->get_left_id() . ' ORDER BY ' . $this->table_columns['left_id'] . ' ASC';
+		}
+
+		$result = $this->db->sql_query_limit($sql, $delta);
+
+		$target = null;
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$target = new $this->item_class($row);
+		}
+		$this->db->sql_freeresult($result);
+
+		if (is_null($target))
+		{
+			// The item is already on top or bottom
+			return false;
+		}
+
+		/**
+		* $left_id and $right_id define the scope of the items that are affected by the move.
+		* $diff_up and $diff_down are the values to substract or add to each item's left_id
+		* and right_id in order to move them up or down.
+		* $move_up_left and $move_up_right define the scope of the items that are moving
+		* up. Other items in the scope of ($left_id, $right_id) are considered to move down.
+		*/
+		if ($action == 'move_up')
+		{
+			$left_id = $target->get_left_id();
+			$right_id = $item->get_right_id();
+
+			$diff_up = $item->get_left_id() - $target->get_left_id();
+			$diff_down = $item->get_right_id() + 1 - $item->get_left_id();
+
+			$move_up_left = $item->get_left_id();
+			$move_up_right = $item->get_right_id();
+		}
+		else
+		{
+			$left_id = $item->get_left_id();
+			$right_id = $target->get_right_id();
+
+			$diff_up = $item->get_right_id() + 1 - $item->get_left_id();
+			$diff_down = $target->get_right_id() - $item->get_right_id();
+
+			$move_up_left = $item->get_right_id() + 1;
+			$move_up_right = $target->get_right_id();
+		}
+
+		// Now do the dirty job
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->table_columns['left_id'] . ' = ' . $this->table_columns['left_id'] . ' + CASE
+				WHEN ' . $this->table_columns['left_id'] . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
+				ELSE {$diff_down}
+			END,
+			" . $this->table_columns['right_id'] . ' = ' . $this->table_columns['right_id'] . ' + CASE
+				WHEN ' . $this->table_columns['right_id'] . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
+				ELSE {$diff_down}
+			END,
+			" . $this->table_columns['item_parents'] . " = ''
+			WHERE
+				" . $this->table_columns['left_id'] . " BETWEEN {$left_id} AND {$right_id}
+				AND " . $this->table_columns['right_id'] . " BETWEEN {$left_id} AND {$right_id}
+				" . $this->get_sql_where();
+		$this->db->sql_query($sql);
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function move_down(phpbb_nestedset_item_interface $item)
+	{
+		return $this->move($item, -1);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function move_up(phpbb_nestedset_item_interface $item)
+	{
+		return $this->move($item, 1);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function move_children(phpbb_nestedset_item_interface $current_parent, phpbb_nestedset_item_interface $new_parent)
+	{
+		if (!$current_parent->has_children() || !$current_parent->get_item_id() || $current_parent->get_item_id() == $new_parent->get_item_id())
+		{
+			return false;
+		}
+
+		$move_items = array_keys($this->get_branch_data($current_parent, 'children', true, false));
+
+		if (in_array($new_parent->get_item_id(), $move_items))
+		{
+			throw new phpbb_nestedset_exception('INVALID_PARENT');
+		}
+
+		$diff = sizeof($move_items) * 2;
+		$sql_exclude_moved_items = $this->db->sql_in_set($this->table_columns['item_id'], $move_items, true);
+
+		$this->db->sql_transaction('begin');
+
+		$this->remove_subset($move_items, $current_parent, false);
+
+		if ($new_parent->get_item_id())
+		{
+			// Retrieve new-parent again, it may have been changed...
+			$sql = 'SELECT *
+				FROM ' . $this->table_name . '
+				WHERE ' . $this->table_columns['item_id'] . ' = ' . $new_parent->get_item_id();
+			$result = $this->db->sql_query($sql);
+			$parent_data = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$parent_data)
+			{
+				$this->db->sql_transaction('rollback');
+				throw new phpbb_nestedset_exception('INVALID_PARENT');
+			}
+
+			$new_parent = new $this->item_class($parent_data);
+
+			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
+
+			if ($new_right_id > $current_parent->get_right_id())
+			{
+				$diff = ' + ' . ($new_right_id - $current_parent->get_right_id());
+			}
+			else
+			{
+				$diff = ' - ' . abs($new_right_id - $current_parent->get_right_id());
+			}
+		}
+		else
+		{
+			$sql = 'SELECT MAX(' . $this->table_columns['right_id'] . ') AS ' . $this->table_columns['right_id'] . '
+				FROM ' . $this->table_name . '
+				WHERE ' . $sql_exclude_moved_items . '
+					' . $this->get_sql_where('AND');
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			$diff = ' + ' . ($row[$this->table_columns['right_id']] - $current_parent->get_left_id());
+		}
+
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->table_columns['left_id'] . ' = ' . $this->table_columns['left_id'] . $diff . ',
+				' . $this->table_columns['right_id'] . ' = ' . $this->table_columns['right_id'] . $diff . ',
+				' . $this->table_columns['parent_id'] . ' = ' . $this->db->sql_case($this->table_columns['parent_id'] . ' = ' . $current_parent->get_item_id(), $new_parent->get_item_id(), $this->table_columns['parent_id']) . ',
+				' . $this->table_columns['item_parents'] . " = ''
+			WHERE " . $this->db->sql_in_set($this->table_columns['item_id'], $move_items) . '
+				' . $this->get_sql_where('AND');
+		$this->db->sql_query($sql);
+
+		$this->db->sql_transaction('commit');
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function set_parent(phpbb_nestedset_item_interface $item, phpbb_nestedset_item_interface $new_parent)
+	{
+		$move_items = array_keys($this->get_branch_data($item, 'children'));
+
+		if (in_array($new_parent->get_item_id(), $move_items))
+		{
+			throw new phpbb_nestedset_exception('INVALID_PARENT');
+		}
+
+		$diff = sizeof($move_items) * 2;
+		$sql_exclude_moved_items = $this->db->sql_in_set($this->table_columns['item_id'], $move_items, true);
+
+		$this->db->sql_transaction('begin');
+
+		$this->remove_subset($move_items, $item, false);
+
+		if ($new_parent->get_item_id())
+		{
+			// Retrieve new-parent again, it may have been changed...
+			$sql = 'SELECT *
+				FROM ' . $this->table_name . '
+				WHERE ' . $this->table_columns['item_id'] . ' = ' . $new_parent->get_item_id();
+			$result = $this->db->sql_query($sql);
+			$parent_data = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$parent_data)
+			{
+				$this->db->sql_transaction('rollback');
+				throw new phpbb_nestedset_exception('INVALID_PARENT');
+			}
+
+			$new_parent = new $this->item_class($parent_data);
+
+			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
+
+			if ($new_right_id > $item->get_right_id())
+			{
+				$diff = ' + ' . ($new_right_id - $item->get_right_id() - 1);
+			}
+			else
+			{
+				$diff = ' - ' . abs($new_right_id - $item->get_right_id() - 1);
+			}
+		}
+		else
+		{
+			$sql = 'SELECT MAX(' . $this->table_columns['right_id'] . ') AS ' . $this->table_columns['right_id'] . '
+				FROM ' . $this->table_name . '
+				WHERE ' . $sql_exclude_moved_items . '
+					' . $this->get_sql_where('AND');
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			$diff = ' + ' . ($row[$this->table_columns['right_id']] - $item->get_left_id() + 1);
+		}
+
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->table_columns['left_id'] . ' = ' . $this->table_columns['left_id'] . $diff . ',
+				' . $this->table_columns['right_id'] . ' = ' . $this->table_columns['right_id'] . $diff . ',
+				' . $this->table_columns['parent_id'] . ' = ' . $this->db->sql_case($this->table_columns['item_id'] . ' = ' . $item->get_item_id(), $new_parent->get_item_id(), $this->table_columns['parent_id']) . ',
+				' . $this->table_columns['item_parents'] . " = ''
+			WHERE " . $this->db->sql_in_set($this->table_columns['item_id'], $move_items) . '
+				' . $this->get_sql_where('AND');
+		$this->db->sql_query($sql);
+
+		$this->db->sql_transaction('commit');
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_branch_data(phpbb_nestedset_item_interface $item, $type = 'all', $order_desc = true, $include_item = true)
+	{
+		switch ($type)
+		{
+			case 'parents':
+				$condition = 'i1.' . $this->table_columns['left_id'] . ' BETWEEN i2.' . $this->table_columns['left_id'] . ' AND i2.' . $this->table_columns['right_id'] . '';
+			break;
+
+			case 'children':
+				$condition = 'i2.' . $this->table_columns['left_id'] . ' BETWEEN i1.' . $this->table_columns['left_id'] . ' AND i1.' . $this->table_columns['right_id'] . '';
+			break;
+
+			default:
+				$condition = 'i2.' . $this->table_columns['left_id'] . ' BETWEEN i1.' . $this->table_columns['left_id'] . ' AND i1.' . $this->table_columns['right_id'] . '
+					OR i1.' . $this->table_columns['left_id'] . ' BETWEEN i2.' . $this->table_columns['left_id'] . ' AND i2.' . $this->table_columns['right_id'];
+			break;
+		}
+
+		$rows = array();
+
+		$sql = 'SELECT i2.*
+			FROM ' . $this->table_name . ' i1
+			LEFT JOIN ' . $this->table_name . " i2
+				ON (($condition) " . $this->get_sql_where('AND', 'i2.') . ')
+			WHERE i1.' . $this->table_columns['item_id'] . ' = ' . $item->get_item_id() . '
+				' . $this->get_sql_where('AND', 'i1.') . '
+			ORDER BY i2.' . $this->table_columns['left_id'] . ' ' . ($order_desc ? 'ASC' : 'DESC');
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (!$include_item && $item->get_item_id() === (int) $row[$this->table_columns['item_id']])
+			{
+				continue;
+			}
+
+			$rows[$row[$this->table_columns['item_id']]] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $rows;
+	}
+
+	/**
+	* Get base information of parent items
+	*
+	* Data is cached in the item_parents column in the item table
+	*
+	* @inheritdoc
+	*/
+	public function get_parent_data(phpbb_nestedset_item_interface $item)
+	{
+		$parents = array();
+		if ($item->get_parent_id())
+		{
+			if (!$item->get_item_parents_data())
+			{
+				$sql = 'SELECT ' . implode(', ', $this->item_basic_data) . '
+					FROM ' . $this->table_name . '
+					WHERE ' . $this->table_columns['left_id'] . ' < ' . $item->get_left_id() . '
+						AND ' . $this->table_columns['right_id'] . ' > ' . $item->get_right_id() . '
+						' . $this->get_sql_where('AND') . '
+					ORDER BY ' . $this->table_columns['left_id'] . ' ASC';
+				$result = $this->db->sql_query($sql);
+
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$parents[$row[$this->table_columns['item_id']]] = $row;
+				}
+				$this->db->sql_freeresult($result);
+
+				$item_parents = serialize($parents);
+
+				$sql = 'UPDATE ' . $this->table_name . '
+					SET ' . $this->table_columns['item_parents'] . " = '" . $this->db->sql_escape($item_parents) . "'
+					WHERE " . $this->table_columns['parent_id'] . ' = ' . $item->get_parent_id();
+				$this->db->sql_query($sql);
+			}
+			else
+			{
+				$parents = unserialize($item->get_item_parents_data());
+			}
+		}
+
+		return $parents;
+	}
+
+	/**
+	* Remove a subset from the nested set
+	*
+	* @param array	$subset_items		Subset of items to remove
+	* @param phpbb_nestedset_item_interface	$bounding_item	Item containing the right bound of the subset
+	* @param bool	$set_subset_zero	Should the parent, left and right id of the item be set to 0, or kept unchanged?
+	* @return	null
+	*/
+	protected function remove_subset(array $subset_items, phpbb_nestedset_item_interface $bounding_item, $set_subset_zero = true)
+	{
+		$diff = sizeof($subset_items) * 2;
+		$sql_subset_items = $this->db->sql_in_set($this->table_columns['item_id'], $subset_items);
+		$sql_not_subset_items = $this->db->sql_in_set($this->table_columns['item_id'], $subset_items, true);
+
+		$sql_is_parent = $this->table_columns['left_id'] . ' <= ' . $bounding_item->get_right_id() . '
+			AND ' . $this->table_columns['right_id'] . ' >= ' . $bounding_item->get_right_id();
+
+		$sql_is_right = $this->table_columns['left_id'] . ' > ' . $bounding_item->get_right_id();
+
+		$set_left_id = $this->db->sql_case($sql_is_right, $this->table_columns['left_id'] . ' - ' . $diff, $this->table_columns['left_id']);
+		$set_right_id = $this->db->sql_case($sql_is_parent . ' OR ' . $sql_is_right, $this->table_columns['right_id'] . ' - ' . $diff, $this->table_columns['right_id']);
+
+		if ($set_subset_zero)
+		{
+			$set_left_id = $this->db->sql_case($sql_subset_items, 0, $set_left_id);
+			$set_right_id = $this->db->sql_case($sql_subset_items, 0, $set_right_id);
+		}
+
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->table_columns['left_id'] . ' = ' . $set_left_id . ',
+				' . $this->table_columns['right_id'] . ' = ' . $set_right_id . ',
+				' . (($set_subset_zero) ? $this->table_columns['parent_id'] . ' = ' . $this->db->sql_case($sql_subset_items, 0, $this->table_columns['parent_id']) . ',' : '') . '
+				' . $this->table_columns['item_parents'] . " = ''
+			" . ((!$set_subset_zero) ? ' WHERE ' . $sql_not_subset_items . ' ' . $this->get_sql_where('AND') : $this->get_sql_where('WHERE'));
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Add a subset to the nested set
+	*
+	* @param array	$subset_items		Subset of items to add
+	* @param phpbb_nestedset_item_interface	$new_parent	Item containing the right bound of the new parent
+	* @return	int		New right id of the parent item
+	*/
+	protected function prepare_adding_subset(array $subset_items, phpbb_nestedset_item_interface $new_parent)
+	{
+		$diff = sizeof($subset_items) * 2;
+		$sql_not_subset_items = $this->db->sql_in_set($this->table_columns['item_id'], $subset_items, true);
+
+		$set_left_id = $this->db->sql_case($this->table_columns['left_id'] . ' > ' . $new_parent->get_right_id(), $this->table_columns['left_id'] . ' + ' . $diff, $this->table_columns['left_id']);
+		$set_right_id = $this->db->sql_case($this->table_columns['right_id'] . ' >= ' . $new_parent->get_right_id(), $this->table_columns['right_id'] . ' + ' . $diff, $this->table_columns['right_id']);
+
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->table_columns['left_id'] . ' = ' . $set_left_id . ',
+				' . $this->table_columns['right_id'] . ' = ' . $set_right_id . ',
+				' . $this->table_columns['item_parents'] . " = ''
+			WHERE " . $sql_not_subset_items . '
+				' . $this->get_sql_where('AND');
+		$this->db->sql_query($sql);
+
+		return $new_parent->get_right_id() + $diff;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function recalculate_nested_set($new_id, $parent_id = 0, $reset_ids = false)
+	{
+		if ($reset_ids)
+		{
+			$sql = 'UPDATE ' . $this->table_name . '
+				SET ' . $this->db->sql_build_array('UPDATE', array(
+					$this->table_columns['left_id'] => 0,
+					$this->table_columns['right_id'] => 0,
+					$this->table_columns['item_parents'] => '',
+				)) . '
+				' . $this->get_sql_where('WHERE');
+			$this->db->sql_query($sql);
+		}
+
+		$sql = 'SELECT *
+			FROM ' . $this->table_name . '
+			WHERE ' . $this->table_columns['parent_id'] . ' = ' . (int) $parent_id . '
+				' . $this->get_sql_where('AND') . '
+			ORDER BY ' . $this->table_columns['left_id'] . ', ' . $this->table_columns['item_id'] . ' ASC';
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			// First we update the left_id for this module
+			if ($row[$this->table_columns['left_id']] != $new_id)
+			{
+				$sql = 'UPDATE ' . $this->table_name . '
+					SET ' . $this->db->sql_build_array('UPDATE', array(
+						$this->table_columns['left_id'] => $new_id,
+						$this->table_columns['item_parents'] => '',
+					)) . '
+					WHERE ' . $this->table_columns['item_id'] . ' = ' . $row[$this->table_columns['item_id']];
+				$this->db->sql_query($sql);
+			}
+			$new_id++;
+
+			// Then we go through any children and update their left/right id's
+			$new_id = $this->recalculate_nested_set($new_id, $row[$this->table_columns['item_id']]);
+
+			// Then we come back and update the right_id for this module
+			if ($row[$this->table_columns['right_id']] != $new_id)
+			{
+				$sql = 'UPDATE ' . $this->table_name . '
+					SET ' . $this->db->sql_build_array('UPDATE', array($this->table_columns['right_id'] => $new_id)) . '
+					WHERE ' . $this->table_columns['item_id'] . ' = ' . $row[$this->table_columns['item_id']];
+				$this->db->sql_query($sql);
+			}
+			$new_id++;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $new_id;
+	}
+}
diff --git a/phpBB/includes/nestedset/item/base.php b/phpBB/includes/nestedset/item/base.php
new file mode 100644
index 0000000000..c3a7600827
--- /dev/null
+++ b/phpBB/includes/nestedset/item/base.php
@@ -0,0 +1,82 @@
+<?php
+/**
+*
+* @package Nested Set
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+abstract class phpbb_nestedset_item_base implements phpbb_nestedset_item_interface
+{
+	/** @var int */
+	protected $item_id;
+
+	/** @var int */
+	protected $parent_id;
+
+	/** @var string */
+	protected $item_parents_data;
+
+	/** @var int */
+	protected $left_id;
+
+	/** @var int */
+	protected $right_id;
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_item_id()
+	{
+		return (int) $this->item_id;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_parent_id()
+	{
+		return (int) $this->parent_id;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_item_parents_data()
+	{
+		return (string) $this->item_parents_data;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_left_id()
+	{
+		return (int) $this->left_id;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_right_id()
+	{
+		return (int) $this->right_id;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function has_children()
+	{
+		return $this->right_id - $this->left_id > 1;
+	}
+}
-- 
cgit v1.2.1


From 57a05e7cf509f56309591aaf9344226a8f1a9a8e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 16 Apr 2013 23:09:21 +0200
Subject: [ticket/11495] Add forum implementation of nestedset

PHPBB3-11495
---
 phpBB/includes/nestedset/exception.php  |  20 ++++++
 phpBB/includes/nestedset/forum.php      | 121 ++++++++++++++++++++++++++++++++
 phpBB/includes/nestedset/item/forum.php |  28 ++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 phpBB/includes/nestedset/exception.php
 create mode 100644 phpBB/includes/nestedset/forum.php
 create mode 100644 phpBB/includes/nestedset/item/forum.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/exception.php b/phpBB/includes/nestedset/exception.php
new file mode 100644
index 0000000000..10937d0b29
--- /dev/null
+++ b/phpBB/includes/nestedset/exception.php
@@ -0,0 +1,20 @@
+<?php
+/**
+*
+* @package Nested Set
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_nestedset_exception extends \Exception
+{
+}
diff --git a/phpBB/includes/nestedset/forum.php b/phpBB/includes/nestedset/forum.php
new file mode 100644
index 0000000000..7ad4d2c85e
--- /dev/null
+++ b/phpBB/includes/nestedset/forum.php
@@ -0,0 +1,121 @@
+<?php
+/**
+*
+* @package Nested Set
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_nestedset_forum extends phpbb_nestedset_base
+{
+	/** @var phpbb_db_driver */
+	protected $db;
+
+	/** @var phpbb_lock_db */
+	protected $lock;
+
+	/** @var String */
+	protected $table_name;
+
+	/** @var String */
+	protected $item_class = 'phpbb_nestedset_item_forum';
+
+	/**
+	* Column names in the table
+	* @var array
+	*/
+	protected $table_columns = array(
+		'item_id'	=> 'forum_id',
+		'left_id'	=> 'left_id',
+		'right_id'	=> 'right_id',
+		'parent_id'	=> 'parent_id',
+		'item_parents'	=> 'forum_parents',
+	);
+
+	/**
+	* Additional SQL restrictions
+	* Allows to have multiple nestedsets in one table
+	* Columns must be prefixed with %1$s
+	* @var String
+	*/
+	protected $sql_where = '';
+
+	/**
+	* List of item properties to be cached in $item_parents
+	* @var array
+	*/
+	protected $item_basic_data = array('forum_id', 'forum_name', 'forum_type');
+
+	/**
+	* Construct
+	*
+	* @param phpbb_db_driver	$db		Database connection
+	* @param phpbb_lock_db		$lock	Lock class used to lock the table when moving forums around
+	* @param string				$table_name		Table name
+	*/
+	public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name)
+	{
+		$this->db = $db;
+		$this->lock = $lock;
+		$this->table_name = $table_name;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function move_children(phpbb_nestedset_item_interface $current_parent, phpbb_nestedset_item_interface $new_parent)
+	{
+		while (!$this->lock->acquire())
+		{
+			// Retry after 0.2 seconds
+			usleep(200 * 1000);
+		}
+
+		try
+		{
+			$return = parent::move_children($current_parent, $new_parent);
+		}
+		catch (phpbb_nestedset_exception $e)
+		{
+			$this->lock->release();
+			throw new phpbb_nestedset_exception('FORUM_NESTEDSET_' . $e->getMessage());
+		}
+		$this->lock->release();
+
+		return $return;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function set_parent(phpbb_nestedset_item_interface $item, phpbb_nestedset_item_interface $new_parent)
+	{
+		while (!$this->lock->acquire())
+		{
+			// Retry after 0.2 seconds
+			usleep(200 * 1000);
+		}
+
+		try
+		{
+			$return = parent::set_parent($item, $new_parent);
+		}
+		catch (phpbb_nestedset_exception $e)
+		{
+			$this->lock->release();
+			throw new phpbb_nestedset_exception('FORUM_NESTEDSET_' . $e->getMessage());
+		}
+		$this->lock->release();
+
+		return $return;
+	}
+}
diff --git a/phpBB/includes/nestedset/item/forum.php b/phpBB/includes/nestedset/item/forum.php
new file mode 100644
index 0000000000..9475517999
--- /dev/null
+++ b/phpBB/includes/nestedset/item/forum.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package Nested Set
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_nestedset_item_forum extends phpbb_nestedset_item_base
+{
+	public function __construct(array $forum_row)
+	{
+		$this->item_id = (int) $forum_row['forum_id'];
+		$this->parent_id = (int) $forum_row['parent_id'];
+		$this->left_id = (int) $forum_row['left_id'];
+		$this->right_id = (int) $forum_row['right_id'];
+		$this->item_parents_data = (string) $forum_row['forum_parents'];
+	}
+}
-- 
cgit v1.2.1


From 869e00a23b0400b9ad81c1130227cc4c29d6a38d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Apr 2013 17:45:49 +0200
Subject: [ticket/11362] Move phpbb_clean_path into a simple filesystem service

PHPBB3-11362
---
 phpBB/includes/filesystem.php | 52 +++++++++++++++++++++++++++++++++++++++++++
 phpBB/includes/functions.php  | 30 -------------------------
 2 files changed, 52 insertions(+), 30 deletions(-)
 create mode 100644 phpBB/includes/filesystem.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/filesystem.php b/phpBB/includes/filesystem.php
new file mode 100644
index 0000000000..27cab48fb0
--- /dev/null
+++ b/phpBB/includes/filesystem.php
@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* A class with various functions that are related to paths, files and the filesystem
+* @package phpBB3
+*/
+class phpbb_filesystem
+{
+	/**
+	* Eliminates useless . and .. components from specified path.
+	*
+	* @param string $path Path to clean
+	* @return string Cleaned path
+	*/
+	public function clean_path($path)
+	{
+		$exploded = explode('/', $path);
+		$filtered = array();
+		foreach ($exploded as $part)
+		{
+			if ($part === '.' && !empty($filtered))
+			{
+				continue;
+			}
+
+			if ($part === '..' && !empty($filtered) && $filtered[sizeof($filtered) - 1] !== '..')
+			{
+				array_pop($filtered);
+			}
+			else
+			{
+				$filtered[] = $part;
+			}
+		}
+		$path = implode('/', $filtered);
+		return $path;
+	}
+}
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 98a2c0db79..39a8dbc880 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1046,36 +1046,6 @@ else
 	}
 }
 
-/**
-* Eliminates useless . and .. components from specified path.
-*
-* @param string $path Path to clean
-* @return string Cleaned path
-*/
-function phpbb_clean_path($path)
-{
-	$exploded = explode('/', $path);
-	$filtered = array();
-	foreach ($exploded as $part)
-	{
-		if ($part === '.' && !empty($filtered))
-		{
-			continue;
-		}
-
-		if ($part === '..' && !empty($filtered) && $filtered[sizeof($filtered) - 1] !== '..')
-		{
-			array_pop($filtered);
-		}
-		else
-		{
-			$filtered[] = $part;
-		}
-	}
-	$path = implode('/', $filtered);
-	return $path;
-}
-
 // functions used for building option fields
 
 /**
-- 
cgit v1.2.1


From 158bce02095b1fbff19955cbad19be3d1b1a3f80 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Apr 2013 17:50:44 +0200
Subject: [ticket/11362] Use new filesystem class in finder

PHPBB3-11362
---
 phpBB/includes/extension/finder.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index d9aacc38ff..02a9ebb8c3 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -23,6 +23,7 @@ if (!defined('IN_PHPBB'))
 class phpbb_extension_finder
 {
 	protected $extension_manager;
+	protected $filesystem;
 	protected $phpbb_root_path;
 	protected $cache;
 	protected $php_ext;
@@ -54,15 +55,17 @@ class phpbb_extension_finder
 	* @param phpbb_extension_manager $extension_manager An extension manager
 	*            instance that provides the finder with a list of active
 	*            extensions and their locations
+	* @param phpbb_filesystem $filesystem Filesystem instance
 	* @param string $phpbb_root_path Path to the phpbb root directory
 	* @param phpbb_cache_driver_interface $cache A cache instance or null
 	* @param string $php_ext php file extension
 	* @param string $cache_name The name of the cache variable, defaults to
 	*                           _ext_finder
 	*/
-	public function __construct(phpbb_extension_manager $extension_manager, $phpbb_root_path = '', phpbb_cache_driver_interface $cache = null, $php_ext = '.php', $cache_name = '_ext_finder')
+	public function __construct(phpbb_extension_manager $extension_manager, phpbb_filesystem $filesystem, $phpbb_root_path = '', phpbb_cache_driver_interface $cache = null, $php_ext = '.php', $cache_name = '_ext_finder')
 	{
 		$this->extension_manager = $extension_manager;
+		$this->filesystem = $filesystem;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->cache = $cache;
 		$this->php_ext = $php_ext;
@@ -227,7 +230,7 @@ class phpbb_extension_finder
 	*/
 	protected function sanitise_directory($directory)
 	{
-		$directory = phpbb_clean_path($directory);
+		$directory = $this->filesystem->clean_path($directory);
 		$dir_len = strlen($directory);
 
 		if ($dir_len > 1 && $directory[$dir_len - 1] === '/')
-- 
cgit v1.2.1


From 423b310e2acbbc72814a4278a4cccf2900114f85 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Apr 2013 18:43:19 +0200
Subject: [ticket/11362] Extension manager depends on filesystem

PHPBB3-11362
---
 phpBB/includes/extension/manager.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 44a30c6280..de9a3937c3 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -44,13 +44,14 @@ class phpbb_extension_manager
 	* @param phpbb_db_driver $db A database connection
 	* @param phpbb_config $config phpbb_config
 	* @param phpbb_db_migrator $migrator
+	* @param phpbb_filesystem $filesystem
 	* @param string $extension_table The name of the table holding extensions
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
 	* @param string $php_ext php file extension
 	* @param phpbb_cache_driver_interface $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_db_migrator $migrator, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
+	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_db_migrator $migrator, phpbb_filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
 	{
 		$this->container = $container;
 		$this->phpbb_root_path = $phpbb_root_path;
@@ -58,6 +59,7 @@ class phpbb_extension_manager
 		$this->config = $config;
 		$this->migrator = $migrator;
 		$this->cache = $cache;
+		$this->filesystem = $filesystem;
 		$this->php_ext = $php_ext;
 		$this->extension_table = $extension_table;
 		$this->cache_name = $cache_name;
@@ -510,7 +512,7 @@ class phpbb_extension_manager
 	*/
 	public function get_finder()
 	{
-		return new phpbb_extension_finder($this, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder');
+		return new phpbb_extension_finder($this, $this->filesystem, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder');
 	}
 
 	/**
-- 
cgit v1.2.1


From e2875a7e170770a92fa02db3a75f1552cc33005a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Apr 2013 21:23:47 +0200
Subject: [ticket/10966] Introduce MySQL base class

PHPBB3-10966
---
 phpBB/includes/db/driver/mysql.php      | 124 +--------------------------
 phpBB/includes/db/driver/mysql_base.php | 145 ++++++++++++++++++++++++++++++++
 phpBB/includes/db/driver/mysqli.php     | 125 +--------------------------
 3 files changed, 148 insertions(+), 246 deletions(-)
 create mode 100644 phpBB/includes/db/driver/mysql_base.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/driver/mysql.php b/phpBB/includes/db/driver/mysql.php
index 9de7283a42..f3744ac09d 100644
--- a/phpBB/includes/db/driver/mysql.php
+++ b/phpBB/includes/db/driver/mysql.php
@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
 * MySQL 5.0+
 * @package dbal
 */
-class phpbb_db_driver_mysql extends phpbb_db_driver
+class phpbb_db_driver_mysql extends phpbb_db_driver_mysql_base
 {
 	var $multi_insert = true;
 	var $connect_error = '';
@@ -135,14 +135,6 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 		return ($raw) ? $this->sql_server_version : 'MySQL ' . $this->sql_server_version;
 	}
 
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
-	}
-
 	/**
 	* SQL Transaction
 	* @access private
@@ -226,25 +218,6 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 		return $this->query_result;
 	}
 
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			// Having a value of -1 was always a bug
-			$total = '18446744073709551615';
-		}
-
-		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
 	/**
 	* Return number of affected rows
 	*/
@@ -341,101 +314,6 @@ class phpbb_db_driver_mysql extends phpbb_db_driver
 		return @mysql_real_escape_string($msg, $this->db_connect_id);
 	}
 
-	/**
-	* Gets the estimated number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Number of rows in $table_name.
-	*								Prefixed with ~ if estimated (otherwise exact).
-	*
-	* @access public
-	*/
-	function get_estimated_row_count($table_name)
-	{
-		$table_status = $this->get_table_status($table_name);
-
-		if (isset($table_status['Engine']))
-		{
-			if ($table_status['Engine'] === 'MyISAM')
-			{
-				return $table_status['Rows'];
-			}
-			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
-			{
-				return '~' . $table_status['Rows'];
-			}
-		}
-
-		return parent::get_row_count($table_name);
-	}
-
-	/**
-	* Gets the exact number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Exact number of rows in $table_name.
-	*
-	* @access public
-	*/
-	function get_row_count($table_name)
-	{
-		$table_status = $this->get_table_status($table_name);
-
-		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
-		{
-			return $table_status['Rows'];
-		}
-
-		return parent::get_row_count($table_name);
-	}
-
-	/**
-	* Gets some information about the specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return array
-	*
-	* @access protected
-	*/
-	function get_table_status($table_name)
-	{
-		$sql = "SHOW TABLE STATUS
-			LIKE '" . $this->sql_escape($table_name) . "'";
-		$result = $this->sql_query($sql);
-		$table_status = $this->sql_fetchrow($result);
-		$this->sql_freeresult($result);
-
-		return $table_status;
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		switch ($stage)
-		{
-			case 'FROM':
-				$data = '(' . $data . ')';
-			break;
-		}
-
-		return $data;
-	}
-
 	/**
 	* return sql error array
 	* @access private
diff --git a/phpBB/includes/db/driver/mysql_base.php b/phpBB/includes/db/driver/mysql_base.php
new file mode 100644
index 0000000000..ba44ea61aa
--- /dev/null
+++ b/phpBB/includes/db/driver/mysql_base.php
@@ -0,0 +1,145 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Abstract MySQL Database Base Abstraction Layer
+* @package dbal
+*/
+abstract class phpbb_db_driver_mysql_base extends phpbb_db_driver
+{
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_concatenate($expr1, $expr2)
+	{
+		return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
+	}
+
+	/**
+	* Build LIMIT query
+	*/
+	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
+	{
+		$this->query_result = false;
+
+		// if $total is set to 0 we do not want to limit the number of rows
+		if ($total == 0)
+		{
+			// MySQL 4.1+ no longer supports -1 in limit queries
+			$total = '18446744073709551615';
+		}
+
+		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
+
+		return $this->sql_query($query, $cache_ttl);
+	}
+
+	/**
+	* Gets the estimated number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Number of rows in $table_name.
+	*								Prefixed with ~ if estimated (otherwise exact).
+	*
+	* @access public
+	*/
+	function get_estimated_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']))
+		{
+			if ($table_status['Engine'] === 'MyISAM')
+			{
+				return $table_status['Rows'];
+			}
+			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
+			{
+				return '~' . $table_status['Rows'];
+			}
+		}
+
+		return parent::get_row_count($table_name);
+	}
+
+	/**
+	* Gets the exact number of rows in a specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return string				Exact number of rows in $table_name.
+	*
+	* @access public
+	*/
+	function get_row_count($table_name)
+	{
+		$table_status = $this->get_table_status($table_name);
+
+		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
+		{
+			return $table_status['Rows'];
+		}
+
+		return parent::get_row_count($table_name);
+	}
+
+	/**
+	* Gets some information about the specified table.
+	*
+	* @param string $table_name		Table name
+	*
+	* @return array
+	*
+	* @access protected
+	*/
+	function get_table_status($table_name)
+	{
+		$sql = "SHOW TABLE STATUS
+			LIKE '" . $this->sql_escape($table_name) . "'";
+		$result = $this->sql_query($sql);
+		$table_status = $this->sql_fetchrow($result);
+		$this->sql_freeresult($result);
+
+		return $table_status;
+	}
+
+	/**
+	* Build LIKE expression
+	* @access private
+	*/
+	function _sql_like_expression($expression)
+	{
+		return $expression;
+	}
+
+	/**
+	* Build db-specific query data
+	* @access private
+	*/
+	function _sql_custom_build($stage, $data)
+	{
+		switch ($stage)
+		{
+			case 'FROM':
+				$data = '(' . $data . ')';
+			break;
+		}
+
+		return $data;
+	}
+}
diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/includes/db/driver/mysqli.php
index 7448bf1670..0f7a73ee6e 100644
--- a/phpBB/includes/db/driver/mysqli.php
+++ b/phpBB/includes/db/driver/mysqli.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 * MySQL 4.1+ or MySQL 5.0+
 * @package dbal
 */
-class phpbb_db_driver_mysqli extends phpbb_db_driver
+class phpbb_db_driver_mysqli extends phpbb_db_driver_mysql_base
 {
 	var $multi_insert = true;
 	var $connect_error = '';
@@ -103,6 +103,7 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 
 	/**
 	* Version information about used database
+	* @param bool $raw if true, only return the fetched sql_server_version
 	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
 	* @return string sql server version
 	*/
@@ -127,14 +128,6 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 		return ($raw) ? $this->sql_server_version : 'MySQL(i) ' . $this->sql_server_version;
 	}
 
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
-	}
-
 	/**
 	* SQL Transaction
 	* @access private
@@ -217,25 +210,6 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 		return $this->query_result;
 	}
 
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			// MySQL 4.1+ no longer supports -1 in limit queries
-			$total = '18446744073709551615';
-		}
-
-		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
 	/**
 	* Return number of affected rows
 	*/
@@ -327,101 +301,6 @@ class phpbb_db_driver_mysqli extends phpbb_db_driver
 		return @mysqli_real_escape_string($this->db_connect_id, $msg);
 	}
 
-	/**
-	* Gets the estimated number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Number of rows in $table_name.
-	*								Prefixed with ~ if estimated (otherwise exact).
-	*
-	* @access public
-	*/
-	function get_estimated_row_count($table_name)
-	{
-		$table_status = $this->get_table_status($table_name);
-
-		if (isset($table_status['Engine']))
-		{
-			if ($table_status['Engine'] === 'MyISAM')
-			{
-				return $table_status['Rows'];
-			}
-			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
-			{
-				return '~' . $table_status['Rows'];
-			}
-		}
-
-		return parent::get_row_count($table_name);
-	}
-
-	/**
-	* Gets the exact number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Exact number of rows in $table_name.
-	*
-	* @access public
-	*/
-	function get_row_count($table_name)
-	{
-		$table_status = $this->get_table_status($table_name);
-
-		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
-		{
-			return $table_status['Rows'];
-		}
-
-		return parent::get_row_count($table_name);
-	}
-
-	/**
-	* Gets some information about the specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return array
-	*
-	* @access protected
-	*/
-	function get_table_status($table_name)
-	{
-		$sql = "SHOW TABLE STATUS
-			LIKE '" . $this->sql_escape($table_name) . "'";
-		$result = $this->sql_query($sql);
-		$table_status = $this->sql_fetchrow($result);
-		$this->sql_freeresult($result);
-
-		return $table_status;
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		switch ($stage)
-		{
-			case 'FROM':
-				$data = '(' . $data . ')';
-			break;
-		}
-
-		return $data;
-	}
-
 	/**
 	* return sql error array
 	* @access private
-- 
cgit v1.2.1


From f831e3c66efe79841a0bcc01cf0b2d37e6d4e65c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Apr 2013 22:52:17 +0200
Subject: [ticket/11495] Use unique properties for the column names

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php  | 186 ++++++++++++++++++-------------------
 phpBB/includes/nestedset/forum.php |  11 +--
 2 files changed, 95 insertions(+), 102 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index 7f4691b7e0..4dfe3e6203 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -28,15 +28,13 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 	/**
 	* Column names in the table
-	* @var array
+	* @var String
 	*/
-	protected $table_columns = array(
-		'item_id'	=> 'item_id',
-		'left_id'	=> 'left_id',
-		'right_id'	=> 'right_id',
-		'parent_id'	=> 'parent_id',
-		'item_parents'	=> 'item_parents',
-	);
+	protected $columns_item_id = 'item_id';
+	protected $columns_left_id = 'left_id';
+	protected $columns_right_id = 'right_id';
+	protected $columns_parent_id = 'parent_id';
+	protected $columns_item_parents = 'item_parents';
 
 	/**
 	* Additional SQL restrictions
@@ -72,18 +70,18 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	public function insert(array $additional_data)
 	{
 		$item_data = array_merge($additional_data, array(
-			$this->table_columns['parent_id']		=> 0,
-			$this->table_columns['left_id']			=> 0,
-			$this->table_columns['right_id']		=> 0,
-			$this->table_columns['item_parents']	=> '',
+			$this->column_parent_id		=> 0,
+			$this->column_left_id		=> 0,
+			$this->column_right_id		=> 0,
+			$this->column_item_parents	=> '',
 		));
 
-		unset($item_data[$this->table_columns['item_id']]);
+		unset($item_data[$this->column_item_id]);
 
 		$sql = 'INSERT INTO ' . $this->table_name . ' ' . $this->db->sql_build_array('INSERT', $item_data);
 		$this->db->sql_query($sql);
 
-		$item_data[$this->table_columns['item_id']] = (int) $this->db->sql_nextid();
+		$item_data[$this->column_item_id] = (int) $this->db->sql_nextid();
 
 		$item = new $this->item_class($item_data);
 
@@ -95,23 +93,23 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	*/
 	public function add(phpbb_nestedset_item_interface $item)
 	{
-		$sql = 'SELECT MAX(' . $this->table_columns['right_id'] . ') AS ' . $this->table_columns['right_id'] . '
+		$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
 			FROM ' . $this->table_name . '
 			' . $this->get_sql_where('WHERE');
 		$result = $this->db->sql_query($sql);
-		$current_max_right_id = (int) $this->db->sql_fetchfield($this->table_columns['right_id']);
+		$current_max_right_id = (int) $this->db->sql_fetchfield($this->column_right_id);
 		$this->db->sql_freeresult($result);
 
 		$update_item_data = array(
-			$this->table_columns['parent_id']		=> 0,
-			$this->table_columns['left_id']			=> $current_max_right_id + 1,
-			$this->table_columns['right_id']		=> $current_max_right_id + 2,
-			$this->table_columns['item_parents']	=> '',
+			$this->column_parent_id		=> 0,
+			$this->column_left_id		=> $current_max_right_id + 1,
+			$this->column_right_id		=> $current_max_right_id + 2,
+			$this->column_item_parents	=> '',
 		);
 
 		$sql = 'UPDATE ' . $this->table_name . '
 			SET ' . $this->db->sql_build_array('UPDATE', $update_item_data) . '
-			WHERE ' . $this->table_columns['item_id'] . ' = ' . $item->get_item_id();
+			WHERE ' . $this->column_item_id . ' = ' . $item->get_item_id();
 		$this->db->sql_query($sql);
 
 		return $update_item_data;
@@ -144,7 +142,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		$removed_items = $this->remove($item);
 
 		$sql = 'DELETE FROM ' . $this->table_name . '
-			WHERE ' . $this->db->sql_in_set($this->table_columns['item_id'], $removed_items) . '
+			WHERE ' . $this->db->sql_in_set($this->column_item_id, $removed_items) . '
 			' . $this->get_sql_where('AND');
 		$this->db->sql_query($sql);
 
@@ -172,17 +170,17 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		*/
 		$sql = 'SELECT ' . implode(', ', $this->table_columns) . '
 			FROM ' . $this->table_name . '
-			WHERE ' . $this->table_columns['parent_id'] . ' = ' . $item->get_parent_id() . '
+			WHERE ' . $this->column_parent_id . ' = ' . $item->get_parent_id() . '
 				' . $this->get_sql_where() . '
 				AND ';
 
 		if ($action == 'move_up')
 		{
-			$sql .= $this->table_columns['right_id'] . ' < ' . $item->get_right_id() . ' ORDER BY ' . $this->table_columns['right_id'] . ' DESC';
+			$sql .= $this->column_right_id . ' < ' . $item->get_right_id() . ' ORDER BY ' . $this->column_right_id . ' DESC';
 		}
 		else
 		{
-			$sql .= $this->table_columns['left_id'] . ' > ' . $item->get_left_id() . ' ORDER BY ' . $this->table_columns['left_id'] . ' ASC';
+			$sql .= $this->column_left_id . ' > ' . $item->get_left_id() . ' ORDER BY ' . $this->column_left_id . ' ASC';
 		}
 
 		$result = $this->db->sql_query_limit($sql, $delta);
@@ -232,18 +230,18 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		// Now do the dirty job
 		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->table_columns['left_id'] . ' = ' . $this->table_columns['left_id'] . ' + CASE
-				WHEN ' . $this->table_columns['left_id'] . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
+			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . ' + CASE
+				WHEN ' . $this->column_left_id . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
 				ELSE {$diff_down}
 			END,
-			" . $this->table_columns['right_id'] . ' = ' . $this->table_columns['right_id'] . ' + CASE
-				WHEN ' . $this->table_columns['right_id'] . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
+			" . $this->column_right_id . ' = ' . $this->column_right_id . ' + CASE
+				WHEN ' . $this->column_right_id . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
 				ELSE {$diff_down}
 			END,
-			" . $this->table_columns['item_parents'] . " = ''
+			" . $this->column_item_parents . " = ''
 			WHERE
-				" . $this->table_columns['left_id'] . " BETWEEN {$left_id} AND {$right_id}
-				AND " . $this->table_columns['right_id'] . " BETWEEN {$left_id} AND {$right_id}
+				" . $this->column_left_id . " BETWEEN {$left_id} AND {$right_id}
+				AND " . $this->column_right_id . " BETWEEN {$left_id} AND {$right_id}
 				" . $this->get_sql_where();
 		$this->db->sql_query($sql);
 
@@ -284,7 +282,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		}
 
 		$diff = sizeof($move_items) * 2;
-		$sql_exclude_moved_items = $this->db->sql_in_set($this->table_columns['item_id'], $move_items, true);
+		$sql_exclude_moved_items = $this->db->sql_in_set($this->column_item_id, $move_items, true);
 
 		$this->db->sql_transaction('begin');
 
@@ -295,7 +293,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			// Retrieve new-parent again, it may have been changed...
 			$sql = 'SELECT *
 				FROM ' . $this->table_name . '
-				WHERE ' . $this->table_columns['item_id'] . ' = ' . $new_parent->get_item_id();
+				WHERE ' . $this->column_item_id . ' = ' . $new_parent->get_item_id();
 			$result = $this->db->sql_query($sql);
 			$parent_data = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
@@ -321,7 +319,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		}
 		else
 		{
-			$sql = 'SELECT MAX(' . $this->table_columns['right_id'] . ') AS ' . $this->table_columns['right_id'] . '
+			$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
 				FROM ' . $this->table_name . '
 				WHERE ' . $sql_exclude_moved_items . '
 					' . $this->get_sql_where('AND');
@@ -329,15 +327,15 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			$row = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 
-			$diff = ' + ' . ($row[$this->table_columns['right_id']] - $current_parent->get_left_id());
+			$diff = ' + ' . ($row[$this->column_right_id] - $current_parent->get_left_id());
 		}
 
 		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->table_columns['left_id'] . ' = ' . $this->table_columns['left_id'] . $diff . ',
-				' . $this->table_columns['right_id'] . ' = ' . $this->table_columns['right_id'] . $diff . ',
-				' . $this->table_columns['parent_id'] . ' = ' . $this->db->sql_case($this->table_columns['parent_id'] . ' = ' . $current_parent->get_item_id(), $new_parent->get_item_id(), $this->table_columns['parent_id']) . ',
-				' . $this->table_columns['item_parents'] . " = ''
-			WHERE " . $this->db->sql_in_set($this->table_columns['item_id'], $move_items) . '
+			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
+				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
+				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_parent_id . ' = ' . $current_parent->get_item_id(), $new_parent->get_item_id(), $this->column_parent_id) . ',
+				' . $this->column_item_parents . " = ''
+			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
 				' . $this->get_sql_where('AND');
 		$this->db->sql_query($sql);
 
@@ -359,7 +357,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		}
 
 		$diff = sizeof($move_items) * 2;
-		$sql_exclude_moved_items = $this->db->sql_in_set($this->table_columns['item_id'], $move_items, true);
+		$sql_exclude_moved_items = $this->db->sql_in_set($this->column_item_id, $move_items, true);
 
 		$this->db->sql_transaction('begin');
 
@@ -370,7 +368,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			// Retrieve new-parent again, it may have been changed...
 			$sql = 'SELECT *
 				FROM ' . $this->table_name . '
-				WHERE ' . $this->table_columns['item_id'] . ' = ' . $new_parent->get_item_id();
+				WHERE ' . $this->column_item_id . ' = ' . $new_parent->get_item_id();
 			$result = $this->db->sql_query($sql);
 			$parent_data = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
@@ -396,7 +394,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		}
 		else
 		{
-			$sql = 'SELECT MAX(' . $this->table_columns['right_id'] . ') AS ' . $this->table_columns['right_id'] . '
+			$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
 				FROM ' . $this->table_name . '
 				WHERE ' . $sql_exclude_moved_items . '
 					' . $this->get_sql_where('AND');
@@ -404,15 +402,15 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			$row = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 
-			$diff = ' + ' . ($row[$this->table_columns['right_id']] - $item->get_left_id() + 1);
+			$diff = ' + ' . ($row[$this->column_right_id] - $item->get_left_id() + 1);
 		}
 
 		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->table_columns['left_id'] . ' = ' . $this->table_columns['left_id'] . $diff . ',
-				' . $this->table_columns['right_id'] . ' = ' . $this->table_columns['right_id'] . $diff . ',
-				' . $this->table_columns['parent_id'] . ' = ' . $this->db->sql_case($this->table_columns['item_id'] . ' = ' . $item->get_item_id(), $new_parent->get_item_id(), $this->table_columns['parent_id']) . ',
-				' . $this->table_columns['item_parents'] . " = ''
-			WHERE " . $this->db->sql_in_set($this->table_columns['item_id'], $move_items) . '
+			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
+				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
+				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_item_id . ' = ' . $item->get_item_id(), $new_parent->get_item_id(), $this->column_parent_id) . ',
+				' . $this->column_item_parents . " = ''
+			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
 				' . $this->get_sql_where('AND');
 		$this->db->sql_query($sql);
 
@@ -429,16 +427,16 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		switch ($type)
 		{
 			case 'parents':
-				$condition = 'i1.' . $this->table_columns['left_id'] . ' BETWEEN i2.' . $this->table_columns['left_id'] . ' AND i2.' . $this->table_columns['right_id'] . '';
+				$condition = 'i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id . '';
 			break;
 
 			case 'children':
-				$condition = 'i2.' . $this->table_columns['left_id'] . ' BETWEEN i1.' . $this->table_columns['left_id'] . ' AND i1.' . $this->table_columns['right_id'] . '';
+				$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '';
 			break;
 
 			default:
-				$condition = 'i2.' . $this->table_columns['left_id'] . ' BETWEEN i1.' . $this->table_columns['left_id'] . ' AND i1.' . $this->table_columns['right_id'] . '
-					OR i1.' . $this->table_columns['left_id'] . ' BETWEEN i2.' . $this->table_columns['left_id'] . ' AND i2.' . $this->table_columns['right_id'];
+				$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '
+					OR i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id;
 			break;
 		}
 
@@ -448,19 +446,19 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			FROM ' . $this->table_name . ' i1
 			LEFT JOIN ' . $this->table_name . " i2
 				ON (($condition) " . $this->get_sql_where('AND', 'i2.') . ')
-			WHERE i1.' . $this->table_columns['item_id'] . ' = ' . $item->get_item_id() . '
+			WHERE i1.' . $this->column_item_id . ' = ' . $item->get_item_id() . '
 				' . $this->get_sql_where('AND', 'i1.') . '
-			ORDER BY i2.' . $this->table_columns['left_id'] . ' ' . ($order_desc ? 'ASC' : 'DESC');
+			ORDER BY i2.' . $this->column_left_id . ' ' . ($order_desc ? 'ASC' : 'DESC');
 		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			if (!$include_item && $item->get_item_id() === (int) $row[$this->table_columns['item_id']])
+			if (!$include_item && $item->get_item_id() === (int) $row[$this->column_item_id])
 			{
 				continue;
 			}
 
-			$rows[$row[$this->table_columns['item_id']]] = $row;
+			$rows[$row[$this->column_item_id]] = $row;
 		}
 		$this->db->sql_freeresult($result);
 
@@ -483,23 +481,23 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			{
 				$sql = 'SELECT ' . implode(', ', $this->item_basic_data) . '
 					FROM ' . $this->table_name . '
-					WHERE ' . $this->table_columns['left_id'] . ' < ' . $item->get_left_id() . '
-						AND ' . $this->table_columns['right_id'] . ' > ' . $item->get_right_id() . '
+					WHERE ' . $this->column_left_id . ' < ' . $item->get_left_id() . '
+						AND ' . $this->column_right_id . ' > ' . $item->get_right_id() . '
 						' . $this->get_sql_where('AND') . '
-					ORDER BY ' . $this->table_columns['left_id'] . ' ASC';
+					ORDER BY ' . $this->column_left_id . ' ASC';
 				$result = $this->db->sql_query($sql);
 
 				while ($row = $this->db->sql_fetchrow($result))
 				{
-					$parents[$row[$this->table_columns['item_id']]] = $row;
+					$parents[$row[$this->column_item_id]] = $row;
 				}
 				$this->db->sql_freeresult($result);
 
 				$item_parents = serialize($parents);
 
 				$sql = 'UPDATE ' . $this->table_name . '
-					SET ' . $this->table_columns['item_parents'] . " = '" . $this->db->sql_escape($item_parents) . "'
-					WHERE " . $this->table_columns['parent_id'] . ' = ' . $item->get_parent_id();
+					SET ' . $this->column_item_parents . " = '" . $this->db->sql_escape($item_parents) . "'
+					WHERE " . $this->column_parent_id . ' = ' . $item->get_parent_id();
 				$this->db->sql_query($sql);
 			}
 			else
@@ -522,16 +520,16 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	protected function remove_subset(array $subset_items, phpbb_nestedset_item_interface $bounding_item, $set_subset_zero = true)
 	{
 		$diff = sizeof($subset_items) * 2;
-		$sql_subset_items = $this->db->sql_in_set($this->table_columns['item_id'], $subset_items);
-		$sql_not_subset_items = $this->db->sql_in_set($this->table_columns['item_id'], $subset_items, true);
+		$sql_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items);
+		$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
 
-		$sql_is_parent = $this->table_columns['left_id'] . ' <= ' . $bounding_item->get_right_id() . '
-			AND ' . $this->table_columns['right_id'] . ' >= ' . $bounding_item->get_right_id();
+		$sql_is_parent = $this->column_left_id . ' <= ' . $bounding_item->get_right_id() . '
+			AND ' . $this->column_right_id . ' >= ' . $bounding_item->get_right_id();
 
-		$sql_is_right = $this->table_columns['left_id'] . ' > ' . $bounding_item->get_right_id();
+		$sql_is_right = $this->column_left_id . ' > ' . $bounding_item->get_right_id();
 
-		$set_left_id = $this->db->sql_case($sql_is_right, $this->table_columns['left_id'] . ' - ' . $diff, $this->table_columns['left_id']);
-		$set_right_id = $this->db->sql_case($sql_is_parent . ' OR ' . $sql_is_right, $this->table_columns['right_id'] . ' - ' . $diff, $this->table_columns['right_id']);
+		$set_left_id = $this->db->sql_case($sql_is_right, $this->column_left_id . ' - ' . $diff, $this->column_left_id);
+		$set_right_id = $this->db->sql_case($sql_is_parent . ' OR ' . $sql_is_right, $this->column_right_id . ' - ' . $diff, $this->column_right_id);
 
 		if ($set_subset_zero)
 		{
@@ -540,10 +538,10 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		}
 
 		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->table_columns['left_id'] . ' = ' . $set_left_id . ',
-				' . $this->table_columns['right_id'] . ' = ' . $set_right_id . ',
-				' . (($set_subset_zero) ? $this->table_columns['parent_id'] . ' = ' . $this->db->sql_case($sql_subset_items, 0, $this->table_columns['parent_id']) . ',' : '') . '
-				' . $this->table_columns['item_parents'] . " = ''
+			SET ' . $this->column_left_id . ' = ' . $set_left_id . ',
+				' . $this->column_right_id . ' = ' . $set_right_id . ',
+				' . (($set_subset_zero) ? $this->column_parent_id . ' = ' . $this->db->sql_case($sql_subset_items, 0, $this->column_parent_id) . ',' : '') . '
+				' . $this->column_item_parents . " = ''
 			" . ((!$set_subset_zero) ? ' WHERE ' . $sql_not_subset_items . ' ' . $this->get_sql_where('AND') : $this->get_sql_where('WHERE'));
 		$this->db->sql_query($sql);
 	}
@@ -558,15 +556,15 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	protected function prepare_adding_subset(array $subset_items, phpbb_nestedset_item_interface $new_parent)
 	{
 		$diff = sizeof($subset_items) * 2;
-		$sql_not_subset_items = $this->db->sql_in_set($this->table_columns['item_id'], $subset_items, true);
+		$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
 
-		$set_left_id = $this->db->sql_case($this->table_columns['left_id'] . ' > ' . $new_parent->get_right_id(), $this->table_columns['left_id'] . ' + ' . $diff, $this->table_columns['left_id']);
-		$set_right_id = $this->db->sql_case($this->table_columns['right_id'] . ' >= ' . $new_parent->get_right_id(), $this->table_columns['right_id'] . ' + ' . $diff, $this->table_columns['right_id']);
+		$set_left_id = $this->db->sql_case($this->column_left_id . ' > ' . $new_parent->get_right_id(), $this->column_left_id . ' + ' . $diff, $this->column_left_id);
+		$set_right_id = $this->db->sql_case($this->column_right_id . ' >= ' . $new_parent->get_right_id(), $this->column_right_id . ' + ' . $diff, $this->column_right_id);
 
 		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->table_columns['left_id'] . ' = ' . $set_left_id . ',
-				' . $this->table_columns['right_id'] . ' = ' . $set_right_id . ',
-				' . $this->table_columns['item_parents'] . " = ''
+			SET ' . $this->column_left_id . ' = ' . $set_left_id . ',
+				' . $this->column_right_id . ' = ' . $set_right_id . ',
+				' . $this->column_item_parents . " = ''
 			WHERE " . $sql_not_subset_items . '
 				' . $this->get_sql_where('AND');
 		$this->db->sql_query($sql);
@@ -583,9 +581,9 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		{
 			$sql = 'UPDATE ' . $this->table_name . '
 				SET ' . $this->db->sql_build_array('UPDATE', array(
-					$this->table_columns['left_id'] => 0,
-					$this->table_columns['right_id'] => 0,
-					$this->table_columns['item_parents'] => '',
+					$this->column_left_id		=> 0,
+					$this->column_right_id		=> 0,
+					$this->column_item_parents	=> '',
 				)) . '
 				' . $this->get_sql_where('WHERE');
 			$this->db->sql_query($sql);
@@ -593,34 +591,34 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		$sql = 'SELECT *
 			FROM ' . $this->table_name . '
-			WHERE ' . $this->table_columns['parent_id'] . ' = ' . (int) $parent_id . '
+			WHERE ' . $this->column_parent_id . ' = ' . (int) $parent_id . '
 				' . $this->get_sql_where('AND') . '
-			ORDER BY ' . $this->table_columns['left_id'] . ', ' . $this->table_columns['item_id'] . ' ASC';
+			ORDER BY ' . $this->column_left_id . ', ' . $this->column_item_id . ' ASC';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			// First we update the left_id for this module
-			if ($row[$this->table_columns['left_id']] != $new_id)
+			if ($row[$this->column_left_id] != $new_id)
 			{
 				$sql = 'UPDATE ' . $this->table_name . '
 					SET ' . $this->db->sql_build_array('UPDATE', array(
-						$this->table_columns['left_id'] => $new_id,
-						$this->table_columns['item_parents'] => '',
+						$this->column_left_id		=> $new_id,
+						$this->column_item_parents	=> '',
 					)) . '
-					WHERE ' . $this->table_columns['item_id'] . ' = ' . $row[$this->table_columns['item_id']];
+					WHERE ' . $this->column_item_id . ' = ' . $row[$this->column_item_id];
 				$this->db->sql_query($sql);
 			}
 			$new_id++;
 
 			// Then we go through any children and update their left/right id's
-			$new_id = $this->recalculate_nested_set($new_id, $row[$this->table_columns['item_id']]);
+			$new_id = $this->recalculate_nested_set($new_id, $row[$this->column_item_id]);
 
 			// Then we come back and update the right_id for this module
-			if ($row[$this->table_columns['right_id']] != $new_id)
+			if ($row[$this->column_right_id] != $new_id)
 			{
 				$sql = 'UPDATE ' . $this->table_name . '
-					SET ' . $this->db->sql_build_array('UPDATE', array($this->table_columns['right_id'] => $new_id)) . '
-					WHERE ' . $this->table_columns['item_id'] . ' = ' . $row[$this->table_columns['item_id']];
+					SET ' . $this->db->sql_build_array('UPDATE', array($this->column_right_id => $new_id)) . '
+					WHERE ' . $this->column_item_id . ' = ' . $row[$this->column_item_id];
 				$this->db->sql_query($sql);
 			}
 			$new_id++;
diff --git a/phpBB/includes/nestedset/forum.php b/phpBB/includes/nestedset/forum.php
index 7ad4d2c85e..b1df3c7e45 100644
--- a/phpBB/includes/nestedset/forum.php
+++ b/phpBB/includes/nestedset/forum.php
@@ -31,15 +31,10 @@ class phpbb_nestedset_forum extends phpbb_nestedset_base
 
 	/**
 	* Column names in the table
-	* @var array
+	* @var String
 	*/
-	protected $table_columns = array(
-		'item_id'	=> 'forum_id',
-		'left_id'	=> 'left_id',
-		'right_id'	=> 'right_id',
-		'parent_id'	=> 'parent_id',
-		'item_parents'	=> 'forum_parents',
-	);
+	protected $columns_item_id = 'forum_id';
+	protected $columns_item_parents = 'forum_parents';
 
 	/**
 	* Additional SQL restrictions
-- 
cgit v1.2.1


From 5c379db085bab4ff0f807a9e7dfe6edb52ef25ab Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Apr 2013 22:56:12 +0200
Subject: [ticket/11495] Fix description of get_sql_where

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index 4dfe3e6203..ae6a77dc8d 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -50,9 +50,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	protected $item_basic_data = array('*');
 
 	/**
-	* Delete an item from the nested set (also deletes the rows form the table)
-	*
-	* Also deletes all subitems from the nested set
+	* Returns additional sql where restrictions
 	*
 	* @param string		$operator		SQL operator that needs to be prepended to sql_where,
 	*									if it is not empty.
-- 
cgit v1.2.1


From 8c3443ba996c57a0420e4559022c97c2547404c0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 18 Apr 2013 00:13:19 +0200
Subject: [ticket/11495] Use array directly instead of
 phpbb_nestedset_item_interface

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php      | 150 ++++++++++++++++-----------------
 phpBB/includes/nestedset/forum.php     |   4 +-
 phpBB/includes/nestedset/interface.php |  46 +++++-----
 3 files changed, 97 insertions(+), 103 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index ae6a77dc8d..56422f52a5 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -81,15 +81,13 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		$item_data[$this->column_item_id] = (int) $this->db->sql_nextid();
 
-		$item = new $this->item_class($item_data);
-
-		return array_merge($item_data, $this->add($item));
+		return array_merge($item_data, $this->add($item_data));
 	}
 
 	/**
 	* @inheritdoc
 	*/
-	public function add(phpbb_nestedset_item_interface $item)
+	public function add(array $item)
 	{
 		$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
 			FROM ' . $this->table_name . '
@@ -107,7 +105,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		$sql = 'UPDATE ' . $this->table_name . '
 			SET ' . $this->db->sql_build_array('UPDATE', $update_item_data) . '
-			WHERE ' . $this->column_item_id . ' = ' . $item->get_item_id();
+			WHERE ' . $this->column_item_id . ' = ' . (int) $item[$this->column_item_id];
 		$this->db->sql_query($sql);
 
 		return $update_item_data;
@@ -116,15 +114,15 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function remove(phpbb_nestedset_item_interface $item)
+	public function remove(array $item)
 	{
-		if ($item->has_children())
+		if ($item[$this->column_right_id] - $item[$this->column_left_id] > 1)
 		{
 			$items = array_keys($this->get_branch_data($item, 'children'));
 		}
 		else
 		{
-			$items = array($item->get_item_id());
+			$items = array((int) $item[$this->column_item_id]);
 		}
 
 		$this->remove_subset($items, $item);
@@ -135,7 +133,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function delete(phpbb_nestedset_item_interface $item)
+	public function delete(array $item)
 	{
 		$removed_items = $this->remove($item);
 
@@ -150,7 +148,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function move(phpbb_nestedset_item_interface $item, $delta)
+	public function move(array $item, $delta)
 	{
 		if ($delta == 0)
 		{
@@ -168,17 +166,17 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		*/
 		$sql = 'SELECT ' . implode(', ', $this->table_columns) . '
 			FROM ' . $this->table_name . '
-			WHERE ' . $this->column_parent_id . ' = ' . $item->get_parent_id() . '
+			WHERE ' . $this->column_parent_id . ' = ' . (int) $item[$this->column_parent_id] . '
 				' . $this->get_sql_where() . '
 				AND ';
 
 		if ($action == 'move_up')
 		{
-			$sql .= $this->column_right_id . ' < ' . $item->get_right_id() . ' ORDER BY ' . $this->column_right_id . ' DESC';
+			$sql .= $this->column_right_id . ' < ' . (int) $item[$this->column_right_id] . ' ORDER BY ' . $this->column_right_id . ' DESC';
 		}
 		else
 		{
-			$sql .= $this->column_left_id . ' > ' . $item->get_left_id() . ' ORDER BY ' . $this->column_left_id . ' ASC';
+			$sql .= $this->column_left_id . ' > ' . (int) $item[$this->column_left_id] . ' ORDER BY ' . $this->column_left_id . ' ASC';
 		}
 
 		$result = $this->db->sql_query_limit($sql, $delta);
@@ -186,7 +184,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		$target = null;
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$target = new $this->item_class($row);
+			$target = $row;
 		}
 		$this->db->sql_freeresult($result);
 
@@ -205,25 +203,25 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		*/
 		if ($action == 'move_up')
 		{
-			$left_id = $target->get_left_id();
-			$right_id = $item->get_right_id();
+			$left_id = $target[$this->column_left_id];
+			$right_id = (int) $item[$this->column_right_id];
 
-			$diff_up = $item->get_left_id() - $target->get_left_id();
-			$diff_down = $item->get_right_id() + 1 - $item->get_left_id();
+			$diff_up = (int) $item[$this->column_left_id] - $target[$this->column_left_id];
+			$diff_down = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
 
-			$move_up_left = $item->get_left_id();
-			$move_up_right = $item->get_right_id();
+			$move_up_left = (int) $item[$this->column_left_id];
+			$move_up_right = (int) $item[$this->column_right_id];
 		}
 		else
 		{
-			$left_id = $item->get_left_id();
-			$right_id = $target->get_right_id();
+			$left_id = (int) $item[$this->column_left_id];
+			$right_id = $target[$this->column_right_id];
 
-			$diff_up = $item->get_right_id() + 1 - $item->get_left_id();
-			$diff_down = $target->get_right_id() - $item->get_right_id();
+			$diff_up = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
+			$diff_down = $target[$this->column_right_id] - (int) $item[$this->column_right_id];
 
-			$move_up_left = $item->get_right_id() + 1;
-			$move_up_right = $target->get_right_id();
+			$move_up_left = (int) $item[$this->column_right_id] + 1;
+			$move_up_right = $target[$this->column_right_id];
 		}
 
 		// Now do the dirty job
@@ -249,7 +247,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function move_down(phpbb_nestedset_item_interface $item)
+	public function move_down(array $item)
 	{
 		return $this->move($item, -1);
 	}
@@ -257,7 +255,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function move_up(phpbb_nestedset_item_interface $item)
+	public function move_up(array $item)
 	{
 		return $this->move($item, 1);
 	}
@@ -265,16 +263,16 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function move_children(phpbb_nestedset_item_interface $current_parent, phpbb_nestedset_item_interface $new_parent)
+	public function move_children(array $current_parent, array $new_parent)
 	{
-		if (!$current_parent->has_children() || !$current_parent->get_item_id() || $current_parent->get_item_id() == $new_parent->get_item_id())
+		if (($current_parent[$this->column_right_id] - $current_parent[$this->column_left_id]) <= 1 || !$current_parent[$this->column_item_id] || $current_parent[$this->column_item_id] == $new_parent[$this->column_item_id])
 		{
 			return false;
 		}
 
 		$move_items = array_keys($this->get_branch_data($current_parent, 'children', true, false));
 
-		if (in_array($new_parent->get_item_id(), $move_items))
+		if (in_array($new_parent[$this->column_item_id], $move_items))
 		{
 			throw new phpbb_nestedset_exception('INVALID_PARENT');
 		}
@@ -286,33 +284,31 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		$this->remove_subset($move_items, $current_parent, false);
 
-		if ($new_parent->get_item_id())
+		if ($new_parent[$this->column_item_id])
 		{
 			// Retrieve new-parent again, it may have been changed...
 			$sql = 'SELECT *
 				FROM ' . $this->table_name . '
-				WHERE ' . $this->column_item_id . ' = ' . $new_parent->get_item_id();
+				WHERE ' . $this->column_item_id . ' = ' . (int) $new_parent[$this->column_item_id];
 			$result = $this->db->sql_query($sql);
-			$parent_data = $this->db->sql_fetchrow($result);
+			$new_parent = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 
-			if (!$parent_data)
+			if (!$new_parent)
 			{
 				$this->db->sql_transaction('rollback');
 				throw new phpbb_nestedset_exception('INVALID_PARENT');
 			}
 
-			$new_parent = new $this->item_class($parent_data);
-
 			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
 
-			if ($new_right_id > $current_parent->get_right_id())
+			if ($new_right_id > $current_parent[$this->column_right_id])
 			{
-				$diff = ' + ' . ($new_right_id - $current_parent->get_right_id());
+				$diff = ' + ' . ($new_right_id - $current_parent[$this->column_right_id]);
 			}
 			else
 			{
-				$diff = ' - ' . abs($new_right_id - $current_parent->get_right_id());
+				$diff = ' - ' . abs($new_right_id - $current_parent[$this->column_right_id]);
 			}
 		}
 		else
@@ -325,13 +321,13 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			$row = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 
-			$diff = ' + ' . ($row[$this->column_right_id] - $current_parent->get_left_id());
+			$diff = ' + ' . ($row[$this->column_right_id] - $current_parent[$this->column_left_id]);
 		}
 
 		$sql = 'UPDATE ' . $this->table_name . '
 			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
 				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
-				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_parent_id . ' = ' . $current_parent->get_item_id(), $new_parent->get_item_id(), $this->column_parent_id) . ',
+				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_parent_id . ' = ' . (int) $current_parent[$this->column_item_id], (int) $new_parent[$this->column_item_id], $this->column_parent_id) . ',
 				' . $this->column_item_parents . " = ''
 			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
 				' . $this->get_sql_where('AND');
@@ -345,11 +341,11 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function set_parent(phpbb_nestedset_item_interface $item, phpbb_nestedset_item_interface $new_parent)
+	public function set_parent(array $item, array $new_parent)
 	{
 		$move_items = array_keys($this->get_branch_data($item, 'children'));
 
-		if (in_array($new_parent->get_item_id(), $move_items))
+		if (in_array($new_parent[$this->column_item_id], $move_items))
 		{
 			throw new phpbb_nestedset_exception('INVALID_PARENT');
 		}
@@ -361,33 +357,31 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		$this->remove_subset($move_items, $item, false);
 
-		if ($new_parent->get_item_id())
+		if ($new_parent[$this->column_item_id])
 		{
 			// Retrieve new-parent again, it may have been changed...
 			$sql = 'SELECT *
 				FROM ' . $this->table_name . '
-				WHERE ' . $this->column_item_id . ' = ' . $new_parent->get_item_id();
+				WHERE ' . $this->column_item_id . ' = ' . (int) $new_parent[$this->column_item_id];
 			$result = $this->db->sql_query($sql);
-			$parent_data = $this->db->sql_fetchrow($result);
+			$new_parent = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 
-			if (!$parent_data)
+			if (!$new_parent)
 			{
 				$this->db->sql_transaction('rollback');
 				throw new phpbb_nestedset_exception('INVALID_PARENT');
 			}
 
-			$new_parent = new $this->item_class($parent_data);
-
 			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
 
-			if ($new_right_id > $item->get_right_id())
+			if ($new_right_id > (int) $item[$this->column_right_id])
 			{
-				$diff = ' + ' . ($new_right_id - $item->get_right_id() - 1);
+				$diff = ' + ' . ($new_right_id - (int) $item[$this->column_right_id] - 1);
 			}
 			else
 			{
-				$diff = ' - ' . abs($new_right_id - $item->get_right_id() - 1);
+				$diff = ' - ' . abs($new_right_id - (int) $item[$this->column_right_id] - 1);
 			}
 		}
 		else
@@ -400,13 +394,13 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			$row = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 
-			$diff = ' + ' . ($row[$this->column_right_id] - $item->get_left_id() + 1);
+			$diff = ' + ' . ($row[$this->column_right_id] - (int) $item[$this->column_left_id] + 1);
 		}
 
 		$sql = 'UPDATE ' . $this->table_name . '
 			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
 				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
-				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_item_id . ' = ' . $item->get_item_id(), $new_parent->get_item_id(), $this->column_parent_id) . ',
+				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_item_id . ' = ' . (int) $item[$this->column_item_id], $new_parent[$this->column_item_id], $this->column_parent_id) . ',
 				' . $this->column_item_parents . " = ''
 			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
 				' . $this->get_sql_where('AND');
@@ -420,7 +414,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function get_branch_data(phpbb_nestedset_item_interface $item, $type = 'all', $order_desc = true, $include_item = true)
+	public function get_branch_data(array $item, $type = 'all', $order_desc = true, $include_item = true)
 	{
 		switch ($type)
 		{
@@ -444,19 +438,19 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			FROM ' . $this->table_name . ' i1
 			LEFT JOIN ' . $this->table_name . " i2
 				ON (($condition) " . $this->get_sql_where('AND', 'i2.') . ')
-			WHERE i1.' . $this->column_item_id . ' = ' . $item->get_item_id() . '
+			WHERE i1.' . $this->column_item_id . ' = ' . (int) $item[$this->column_item_id] . '
 				' . $this->get_sql_where('AND', 'i1.') . '
 			ORDER BY i2.' . $this->column_left_id . ' ' . ($order_desc ? 'ASC' : 'DESC');
 		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			if (!$include_item && $item->get_item_id() === (int) $row[$this->column_item_id])
+			if (!$include_item && $item[$this->column_item_id] == $row[$this->column_item_id])
 			{
 				continue;
 			}
 
-			$rows[$row[$this->column_item_id]] = $row;
+			$rows[(int) $row[$this->column_item_id]] = $row;
 		}
 		$this->db->sql_freeresult($result);
 
@@ -470,17 +464,17 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	*
 	* @inheritdoc
 	*/
-	public function get_parent_data(phpbb_nestedset_item_interface $item)
+	public function get_parent_data(array $item)
 	{
 		$parents = array();
-		if ($item->get_parent_id())
+		if ((int) $item[$this->column_parent_id])
 		{
-			if (!$item->get_item_parents_data())
+			if (!$item[$this->column_item_parents])
 			{
 				$sql = 'SELECT ' . implode(', ', $this->item_basic_data) . '
 					FROM ' . $this->table_name . '
-					WHERE ' . $this->column_left_id . ' < ' . $item->get_left_id() . '
-						AND ' . $this->column_right_id . ' > ' . $item->get_right_id() . '
+					WHERE ' . $this->column_left_id . ' < ' . (int) $item[$this->column_left_id] . '
+						AND ' . $this->column_right_id . ' > ' . (int) $item[$this->column_right_id] . '
 						' . $this->get_sql_where('AND') . '
 					ORDER BY ' . $this->column_left_id . ' ASC';
 				$result = $this->db->sql_query($sql);
@@ -495,12 +489,12 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 				$sql = 'UPDATE ' . $this->table_name . '
 					SET ' . $this->column_item_parents . " = '" . $this->db->sql_escape($item_parents) . "'
-					WHERE " . $this->column_parent_id . ' = ' . $item->get_parent_id();
+					WHERE " . $this->column_parent_id . ' = ' . (int) $item[$this->column_parent_id];
 				$this->db->sql_query($sql);
 			}
 			else
 			{
-				$parents = unserialize($item->get_item_parents_data());
+				$parents = unserialize($item[$this->column_item_parents]);
 			}
 		}
 
@@ -511,20 +505,20 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	* Remove a subset from the nested set
 	*
 	* @param array	$subset_items		Subset of items to remove
-	* @param phpbb_nestedset_item_interface	$bounding_item	Item containing the right bound of the subset
+	* @param array	$bounding_item	Item containing the right bound of the subset
 	* @param bool	$set_subset_zero	Should the parent, left and right id of the item be set to 0, or kept unchanged?
 	* @return	null
 	*/
-	protected function remove_subset(array $subset_items, phpbb_nestedset_item_interface $bounding_item, $set_subset_zero = true)
+	protected function remove_subset(array $subset_items, array $bounding_item, $set_subset_zero = true)
 	{
 		$diff = sizeof($subset_items) * 2;
 		$sql_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items);
 		$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
 
-		$sql_is_parent = $this->column_left_id . ' <= ' . $bounding_item->get_right_id() . '
-			AND ' . $this->column_right_id . ' >= ' . $bounding_item->get_right_id();
+		$sql_is_parent = $this->column_left_id . ' <= ' . (int) $bounding_item[$this->column_right_id] . '
+			AND ' . $this->column_right_id . ' >= ' . (int) $bounding_item[$this->column_right_id];
 
-		$sql_is_right = $this->column_left_id . ' > ' . $bounding_item->get_right_id();
+		$sql_is_right = $this->column_left_id . ' > ' . (int) $bounding_item[$this->column_right_id];
 
 		$set_left_id = $this->db->sql_case($sql_is_right, $this->column_left_id . ' - ' . $diff, $this->column_left_id);
 		$set_right_id = $this->db->sql_case($sql_is_parent . ' OR ' . $sql_is_right, $this->column_right_id . ' - ' . $diff, $this->column_right_id);
@@ -548,16 +542,16 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	* Add a subset to the nested set
 	*
 	* @param array	$subset_items		Subset of items to add
-	* @param phpbb_nestedset_item_interface	$new_parent	Item containing the right bound of the new parent
+	* @param array	$new_parent	Item containing the right bound of the new parent
 	* @return	int		New right id of the parent item
 	*/
-	protected function prepare_adding_subset(array $subset_items, phpbb_nestedset_item_interface $new_parent)
+	protected function prepare_adding_subset(array $subset_items, array $new_parent)
 	{
 		$diff = sizeof($subset_items) * 2;
 		$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
 
-		$set_left_id = $this->db->sql_case($this->column_left_id . ' > ' . $new_parent->get_right_id(), $this->column_left_id . ' + ' . $diff, $this->column_left_id);
-		$set_right_id = $this->db->sql_case($this->column_right_id . ' >= ' . $new_parent->get_right_id(), $this->column_right_id . ' + ' . $diff, $this->column_right_id);
+		$set_left_id = $this->db->sql_case($this->column_left_id . ' > ' . (int) $new_parent[$this->column_right_id], $this->column_left_id . ' + ' . $diff, $this->column_left_id);
+		$set_right_id = $this->db->sql_case($this->column_right_id . ' >= ' . (int) $new_parent[$this->column_right_id], $this->column_right_id . ' + ' . $diff, $this->column_right_id);
 
 		$sql = 'UPDATE ' . $this->table_name . '
 			SET ' . $this->column_left_id . ' = ' . $set_left_id . ',
@@ -567,7 +561,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 				' . $this->get_sql_where('AND');
 		$this->db->sql_query($sql);
 
-		return $new_parent->get_right_id() + $diff;
+		return $new_parent[$this->column_right_id] + $diff;
 	}
 
 	/**
@@ -603,7 +597,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 						$this->column_left_id		=> $new_id,
 						$this->column_item_parents	=> '',
 					)) . '
-					WHERE ' . $this->column_item_id . ' = ' . $row[$this->column_item_id];
+					WHERE ' . $this->column_item_id . ' = ' . (int) $row[$this->column_item_id];
 				$this->db->sql_query($sql);
 			}
 			$new_id++;
@@ -616,7 +610,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			{
 				$sql = 'UPDATE ' . $this->table_name . '
 					SET ' . $this->db->sql_build_array('UPDATE', array($this->column_right_id => $new_id)) . '
-					WHERE ' . $this->column_item_id . ' = ' . $row[$this->column_item_id];
+					WHERE ' . $this->column_item_id . ' = ' . (int) $row[$this->column_item_id];
 				$this->db->sql_query($sql);
 			}
 			$new_id++;
diff --git a/phpBB/includes/nestedset/forum.php b/phpBB/includes/nestedset/forum.php
index b1df3c7e45..e00754eb68 100644
--- a/phpBB/includes/nestedset/forum.php
+++ b/phpBB/includes/nestedset/forum.php
@@ -67,7 +67,7 @@ class phpbb_nestedset_forum extends phpbb_nestedset_base
 	/**
 	* @inheritdoc
 	*/
-	public function move_children(phpbb_nestedset_item_interface $current_parent, phpbb_nestedset_item_interface $new_parent)
+	public function move_children(array $current_parent, array $new_parent)
 	{
 		while (!$this->lock->acquire())
 		{
@@ -92,7 +92,7 @@ class phpbb_nestedset_forum extends phpbb_nestedset_base
 	/**
 	* @inheritdoc
 	*/
-	public function set_parent(phpbb_nestedset_item_interface $item, phpbb_nestedset_item_interface $new_parent)
+	public function set_parent(array $item, array $new_parent)
 	{
 		while (!$this->lock->acquire())
 		{
diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
index 7ef6ff87bb..2d353544dd 100644
--- a/phpBB/includes/nestedset/interface.php
+++ b/phpBB/includes/nestedset/interface.php
@@ -20,7 +20,7 @@ interface phpbb_nestedset_interface
 	/**
 	* Insert an item into the nested set (also insert the rows into the table)
 	*
-	* @param phpbb_nestedset_item_interface	$item	The item to be added
+	* @param array	$item	The item to be added
 	* @return array Array with item data as set in the database
 	*/
 	public function insert(array $additional_data);
@@ -28,96 +28,96 @@ interface phpbb_nestedset_interface
 	/**
 	* Add an item at the end of the nested set
 	*
-	* @param phpbb_nestedset_item_interface	$item	The item to be added
+	* @param array	$item	The item to be added
 	* @return bool True if the item was added
 	*/
-	public function add(phpbb_nestedset_item_interface $item);
+	public function add(array $item);
 
 	/**
 	* Remove an item from the nested set
 	*
 	* Also removes all subitems from the nested set
 	*
-	* @param phpbb_nestedset_item_interface	$item	The item to be removed
+	* @param array	$item	The item to be removed
 	* @return array		Items that have been removed
 	*/
-	public function remove(phpbb_nestedset_item_interface $item);
+	public function remove(array $item);
 
 	/**
 	* Delete an item from the nested set (also deletes the rows form the table)
 	*
 	* Also deletes all subitems from the nested set
 	*
-	* @param phpbb_nestedset_item_interface	$item	The item to be deleted
+	* @param array	$item	The item to be deleted
 	* @return array		Items that have been deleted
 	*/
-	public function delete(phpbb_nestedset_item_interface $item);
+	public function delete(array $item);
 
 	/**
 	* Move an item by a given delta
 	*
-	* @param phpbb_nestedset_item_interface	$item	The item to be moved
+	* @param array	$item	The item to be moved
 	* @param int	$delta	Number of steps to move this item, < 0 => down, > 0 => up
 	* @return bool True if the item was moved
 	*/
-	public function move(phpbb_nestedset_item_interface $item, $delta);
+	public function move(array $item, $delta);
 
 	/**
 	* Move an item down by 1
 	*
-	* @param phpbb_nestedset_item_interface	$item	The item to be moved
+	* @param array	$item	The item to be moved
 	* @return bool True if the item was moved
 	*/
-	public function move_down(phpbb_nestedset_item_interface $item);
+	public function move_down(array $item);
 
 	/**
 	* Move an item up by 1
 	*
-	* @param phpbb_nestedset_item_interface	$item	The item to be moved
+	* @param array	$item	The item to be moved
 	* @return bool True if the item was moved
 	*/
-	public function move_up(phpbb_nestedset_item_interface $item);
+	public function move_up(array $item);
 
 	/**
 	* Moves all children of one item to another item
 	*
-	* @param phpbb_nestedset_item_interface	$current_parent		The current parent item
-	* @param phpbb_nestedset_item_interface	$new_parent			The new parent item
+	* @param array	$current_parent		The current parent item
+	* @param array	$new_parent			The new parent item
 	* @return bool True if any items where moved
 	*/
-	public function move_children(phpbb_nestedset_item_interface $current_parent, phpbb_nestedset_item_interface $new_parent);
+	public function move_children(array $current_parent, array $new_parent);
 
 	/**
 	* Set the parent item
 	*
-	* @param phpbb_nestedset_item_interface	$item		The item to be moved
-	* @param phpbb_nestedset_item_interface	$new_parent	The new parent item
+	* @param array	$item		The item to be moved
+	* @param array	$new_parent	The new parent item
 	* @return bool True if the parent was set successfully
 	*/
-	public function set_parent(phpbb_nestedset_item_interface $item, phpbb_nestedset_item_interface $new_parent);
+	public function set_parent(array $item, array $new_parent);
 
 	/**
 	* Get branch of the item
 	*
 	* This method can return all parents, children or both of the given item
 	*
-	* @param phpbb_nestedset_item_interface	$item		The item to get the branch from
+	* @param array	$item		The item to get the branch from
 	* @param string		$type			One of all|parent|children
 	* @param bool		$order_desc		Order the items descending (most outer parent first)
 	* @param bool		$include_item	Should the given item be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-	public function get_branch_data(phpbb_nestedset_item_interface $item, $type, $order_desc, $include_item);
+	public function get_branch_data(array $item, $type, $order_desc, $include_item);
 
 	/**
 	* Get base information of parent items
 	*
-	* @param phpbb_nestedset_item_interface	$item		The item to get the parents from
+	* @param array	$item		The item to get the parents from
 	* @return array			Array of items (containing basic columns from the item table)
 	*							ID => Item data
 	*/
-	public function get_parent_data(phpbb_nestedset_item_interface $item);
+	public function get_parent_data(array $item);
 
 	/**
 	* Recalculate Nested Sets
-- 
cgit v1.2.1


From 86937e03ec4af92b6467427d9ee69467139f8119 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 18 Apr 2013 00:15:02 +0200
Subject: [ticket/11495] Remove item classes

PHPBB3-11495
---
 phpBB/includes/nestedset/item/base.php      | 82 -----------------------------
 phpBB/includes/nestedset/item/forum.php     | 28 ----------
 phpBB/includes/nestedset/item/interface.php | 61 ---------------------
 3 files changed, 171 deletions(-)
 delete mode 100644 phpBB/includes/nestedset/item/base.php
 delete mode 100644 phpBB/includes/nestedset/item/forum.php
 delete mode 100644 phpBB/includes/nestedset/item/interface.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/item/base.php b/phpBB/includes/nestedset/item/base.php
deleted file mode 100644
index c3a7600827..0000000000
--- a/phpBB/includes/nestedset/item/base.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
-*
-* @package Nested Set
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-abstract class phpbb_nestedset_item_base implements phpbb_nestedset_item_interface
-{
-	/** @var int */
-	protected $item_id;
-
-	/** @var int */
-	protected $parent_id;
-
-	/** @var string */
-	protected $item_parents_data;
-
-	/** @var int */
-	protected $left_id;
-
-	/** @var int */
-	protected $right_id;
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_item_id()
-	{
-		return (int) $this->item_id;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_parent_id()
-	{
-		return (int) $this->parent_id;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_item_parents_data()
-	{
-		return (string) $this->item_parents_data;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_left_id()
-	{
-		return (int) $this->left_id;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_right_id()
-	{
-		return (int) $this->right_id;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function has_children()
-	{
-		return $this->right_id - $this->left_id > 1;
-	}
-}
diff --git a/phpBB/includes/nestedset/item/forum.php b/phpBB/includes/nestedset/item/forum.php
deleted file mode 100644
index 9475517999..0000000000
--- a/phpBB/includes/nestedset/item/forum.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package Nested Set
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class phpbb_nestedset_item_forum extends phpbb_nestedset_item_base
-{
-	public function __construct(array $forum_row)
-	{
-		$this->item_id = (int) $forum_row['forum_id'];
-		$this->parent_id = (int) $forum_row['parent_id'];
-		$this->left_id = (int) $forum_row['left_id'];
-		$this->right_id = (int) $forum_row['right_id'];
-		$this->item_parents_data = (string) $forum_row['forum_parents'];
-	}
-}
diff --git a/phpBB/includes/nestedset/item/interface.php b/phpBB/includes/nestedset/item/interface.php
deleted file mode 100644
index 18206d752e..0000000000
--- a/phpBB/includes/nestedset/item/interface.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
-*
-* @package Nested Set
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-interface phpbb_nestedset_item_interface
-{
-	/**
-	* Returns the ID of the item
-	*
-	* @return int
-	*/
-	public function get_item_id();
-
-	/**
-	* Returns the ID of the parent item
-	*
-	* @return int
-	*/
-	public function get_parent_id();
-
-	/**
-	* Returns a serialized or empty string with the data of the item's parents
-	*
-	* @return string
-	*/
-	public function get_item_parents_data();
-
-	/**
-	* Returns the left_id of the item
-	*
-	* @return int
-	*/
-	public function get_left_id();
-
-	/**
-	* Returns the right_id of the item
-	*
-	* @return int
-	*/
-	public function get_right_id();
-
-	/**
-	* Does the item have sub-items?
-	*
-	* @return bool
-	*/
-	public function has_children();
-}
-- 
cgit v1.2.1


From e0393a3062c6bde9314ad061db781d8823cf5b97 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 18 Apr 2013 00:34:09 +0200
Subject: [ticket/11495] Fix column variable names

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php  | 10 +++++-----
 phpBB/includes/nestedset/forum.php |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index 56422f52a5..630512d713 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -30,11 +30,11 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	* Column names in the table
 	* @var String
 	*/
-	protected $columns_item_id = 'item_id';
-	protected $columns_left_id = 'left_id';
-	protected $columns_right_id = 'right_id';
-	protected $columns_parent_id = 'parent_id';
-	protected $columns_item_parents = 'item_parents';
+	protected $column_item_id = 'item_id';
+	protected $column_left_id = 'left_id';
+	protected $column_right_id = 'right_id';
+	protected $column_parent_id = 'parent_id';
+	protected $column_item_parents = 'item_parents';
 
 	/**
 	* Additional SQL restrictions
diff --git a/phpBB/includes/nestedset/forum.php b/phpBB/includes/nestedset/forum.php
index e00754eb68..18936c1c55 100644
--- a/phpBB/includes/nestedset/forum.php
+++ b/phpBB/includes/nestedset/forum.php
@@ -33,8 +33,8 @@ class phpbb_nestedset_forum extends phpbb_nestedset_base
 	* Column names in the table
 	* @var String
 	*/
-	protected $columns_item_id = 'forum_id';
-	protected $columns_item_parents = 'forum_parents';
+	protected $column_item_id = 'forum_id';
+	protected $column_item_parents = 'forum_parents';
 
 	/**
 	* Additional SQL restrictions
-- 
cgit v1.2.1


From 514bcb2fac1a11a53e20c789ea95be6207c38e80 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 18 Apr 2013 00:50:30 +0200
Subject: [ticket/11495] Move nestedset default values to new method

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index 630512d713..5673a913fc 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -67,14 +67,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	*/
 	public function insert(array $additional_data)
 	{
-		$item_data = array_merge($additional_data, array(
-			$this->column_parent_id		=> 0,
-			$this->column_left_id		=> 0,
-			$this->column_right_id		=> 0,
-			$this->column_item_parents	=> '',
-		));
-
-		unset($item_data[$this->column_item_id]);
+		$item_data = $this->reset_nestedset_values($additional_data);
 
 		$sql = 'INSERT INTO ' . $this->table_name . ' ' . $this->db->sql_build_array('INSERT', $item_data);
 		$this->db->sql_query($sql);
@@ -564,6 +557,26 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		return $new_parent[$this->column_right_id] + $diff;
 	}
 
+	/**
+	* Resets values required for the nested set system
+	*
+	* @param array	$item		Original item data
+	* @return	array		Original item data + nested set defaults
+	*/
+	protected function reset_nestedset_values(array $item)
+	{
+		$item_data = array_merge($item, array(
+			$this->column_parent_id		=> 0,
+			$this->column_left_id		=> 0,
+			$this->column_right_id		=> 0,
+			$this->column_item_parents	=> '',
+		));
+
+		unset($item_data[$this->column_item_id]);
+
+		return $item_data;
+	}
+
 	/**
 	* @inheritdoc
 	*/
-- 
cgit v1.2.1


From a183fc1118b5ec3b1654ab4fda9c56fa1144e4ce Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 18 Apr 2013 00:54:26 +0200
Subject: [ticket/11495] Manually specify the table columns

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index 5673a913fc..7c1e7f631e 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -157,8 +157,8 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		* siblings between the current spot and the target then the
 		* item will move as far as possible
 		*/
-		$sql = 'SELECT ' . implode(', ', $this->table_columns) . '
-			FROM ' . $this->table_name . '
+		$sql = "SELECT {$this->column_item_id}, {$this->column_parent_id}, {$this->column_left_id}, {$this->column_right_id}, {$this->column_item_parents}
+			FROM " . $this->table_name . '
 			WHERE ' . $this->column_parent_id . ' = ' . (int) $item[$this->column_parent_id] . '
 				' . $this->get_sql_where() . '
 				AND ';
-- 
cgit v1.2.1


From ccd4a725da5269189cdb73a3d7048359a5d2cd4d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 18 Apr 2013 09:53:02 +0200
Subject: [ticket/11362] Add compatibility function phpbb_clean_path() again

The function first depends on the container, but also works without it and
without autoload. The reason for this is, it might be used before that
stuff is set up, like it has been in our common.php

PHPBB3-11362
---
 phpBB/includes/functions.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 39a8dbc880..998c52b7c6 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1046,6 +1046,38 @@ else
 	}
 }
 
+/**
+* Eliminates useless . and .. components from specified path.
+*
+* Deprecated, use filesystem class instead
+*
+* @param string $path Path to clean
+* @return string Cleaned path
+*
+* @deprecated
+*/
+function phpbb_clean_path($path)
+{
+	global $phpbb_container;
+
+	if ($phpbb_container)
+	{
+		$phpbb_filesystem = new phpbb_filesystem();
+	}
+	else
+	{
+		// The container is not yet loaded, use a new instance
+		if (!class_exists('phpbb_filesystem'))
+		{
+			global $phpbb_root_path, $phpEx;
+			require($phpbb_root_path . 'includes/filesystem.' . $phpEx);
+		}
+		$phpbb_filesystem = new phpbb_filesystem();
+	}
+
+	return $phpbb_filesystem->clean_path($path);
+}
+
 // functions used for building option fields
 
 /**
-- 
cgit v1.2.1


From 153b29c6c9dad621e03bf2296a93306c30ea23f0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 18 Apr 2013 19:31:08 +0200
Subject: [ticket/11495] Remove item class as its no longer required

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php  | 3 ---
 phpBB/includes/nestedset/forum.php | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index 7c1e7f631e..d16e33a6db 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -23,9 +23,6 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/** @var String */
 	protected $table_name;
 
-	/** @var String */
-	protected $item_class = 'phpbb_nestedset_item_base';
-
 	/**
 	* Column names in the table
 	* @var String
diff --git a/phpBB/includes/nestedset/forum.php b/phpBB/includes/nestedset/forum.php
index 18936c1c55..e723e3bf18 100644
--- a/phpBB/includes/nestedset/forum.php
+++ b/phpBB/includes/nestedset/forum.php
@@ -26,9 +26,6 @@ class phpbb_nestedset_forum extends phpbb_nestedset_base
 	/** @var String */
 	protected $table_name;
 
-	/** @var String */
-	protected $item_class = 'phpbb_nestedset_item_forum';
-
 	/**
 	* Column names in the table
 	* @var String
-- 
cgit v1.2.1


From b28180be1d911364e5c00e3e97e8dac9be6f3d6f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 18 Apr 2013 22:16:14 +0200
Subject: [ticket/11495] Acquire locks for operations that manipulate the tree

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php | 75 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 66 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index d16e33a6db..e36f45e689 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -20,9 +20,18 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/** @var phpbb_db_driver*/
 	protected $db;
 
+	/** @var phpbb_lock_db */
+	protected $lock;
+
 	/** @var String */
 	protected $table_name;
 
+	/**
+	* Prefix for the language keys returned by exceptions
+	* @var String
+	*/
+	protected $message_prefix = '';
+
 	/**
 	* Column names in the table
 	* @var String
@@ -145,6 +154,11 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			return false;
 		}
 
+		if (!$this->lock->acquire())
+		{
+			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+		}
+
 		$action = ($delta > 0) ? 'move_up' : 'move_down';
 		$delta = abs($delta);
 
@@ -180,6 +194,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		if (is_null($target))
 		{
+			$this->lock->release();
 			// The item is already on top or bottom
 			return false;
 		}
@@ -231,6 +246,8 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 				" . $this->get_sql_where();
 		$this->db->sql_query($sql);
 
+		$this->lock->release();
+
 		return true;
 	}
 
@@ -260,11 +277,17 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			return false;
 		}
 
+		if (!$this->lock->acquire())
+		{
+			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+		}
+
 		$move_items = array_keys($this->get_branch_data($current_parent, 'children', true, false));
 
 		if (in_array($new_parent[$this->column_item_id], $move_items))
 		{
-			throw new phpbb_nestedset_exception('INVALID_PARENT');
+			$this->lock->release();
+			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_PARENT');
 		}
 
 		$diff = sizeof($move_items) * 2;
@@ -272,7 +295,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		$this->db->sql_transaction('begin');
 
-		$this->remove_subset($move_items, $current_parent, false);
+		$this->remove_subset($move_items, $current_parent, false, true);
 
 		if ($new_parent[$this->column_item_id])
 		{
@@ -287,10 +310,11 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			if (!$new_parent)
 			{
 				$this->db->sql_transaction('rollback');
-				throw new phpbb_nestedset_exception('INVALID_PARENT');
+				$this->lock->release();
+				throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_PARENT');
 			}
 
-			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
+			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
 
 			if ($new_right_id > $current_parent[$this->column_right_id])
 			{
@@ -324,6 +348,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		$this->db->sql_query($sql);
 
 		$this->db->sql_transaction('commit');
+		$this->lock->release();
 
 		return true;
 	}
@@ -333,11 +358,17 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	*/
 	public function set_parent(array $item, array $new_parent)
 	{
+		if (!$this->lock->acquire())
+		{
+			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+		}
+
 		$move_items = array_keys($this->get_branch_data($item, 'children'));
 
 		if (in_array($new_parent[$this->column_item_id], $move_items))
 		{
-			throw new phpbb_nestedset_exception('INVALID_PARENT');
+			$this->lock->release();
+			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_PARENT');
 		}
 
 		$diff = sizeof($move_items) * 2;
@@ -345,7 +376,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		$this->db->sql_transaction('begin');
 
-		$this->remove_subset($move_items, $item, false);
+		$this->remove_subset($move_items, $item, false, true);
 
 		if ($new_parent[$this->column_item_id])
 		{
@@ -360,10 +391,11 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			if (!$new_parent)
 			{
 				$this->db->sql_transaction('rollback');
-				throw new phpbb_nestedset_exception('INVALID_PARENT');
+				$this->lock->release();
+				throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_PARENT');
 			}
 
-			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent);
+			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
 
 			if ($new_right_id > (int) $item[$this->column_right_id])
 			{
@@ -397,6 +429,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		$this->db->sql_query($sql);
 
 		$this->db->sql_transaction('commit');
+		$this->lock->release();
 
 		return true;
 	}
@@ -497,10 +530,16 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	* @param array	$subset_items		Subset of items to remove
 	* @param array	$bounding_item	Item containing the right bound of the subset
 	* @param bool	$set_subset_zero	Should the parent, left and right id of the item be set to 0, or kept unchanged?
+	* @param bool	$table_already_locked	Is the table already locked, or should we acquire a new lock?
 	* @return	null
 	*/
-	protected function remove_subset(array $subset_items, array $bounding_item, $set_subset_zero = true)
+	protected function remove_subset(array $subset_items, array $bounding_item, $set_subset_zero = true, $table_already_locked = false)
 	{
+		if (!$table_already_locked && !$this->lock->acquire())
+		{
+			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+		}
+
 		$diff = sizeof($subset_items) * 2;
 		$sql_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items);
 		$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
@@ -526,6 +565,11 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 				' . $this->column_item_parents . " = ''
 			" . ((!$set_subset_zero) ? ' WHERE ' . $sql_not_subset_items . ' ' . $this->get_sql_where('AND') : $this->get_sql_where('WHERE'));
 		$this->db->sql_query($sql);
+
+		if (!$table_already_locked)
+		{
+			$this->lock->release();
+		}
 	}
 
 	/**
@@ -581,6 +625,12 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	{
 		if ($reset_ids)
 		{
+			if (!$this->lock->acquire())
+			{
+				throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+			}
+			$this->db->sql_transaction('begin');
+
 			$sql = 'UPDATE ' . $this->table_name . '
 				SET ' . $this->db->sql_build_array('UPDATE', array(
 					$this->column_left_id		=> 0,
@@ -627,6 +677,13 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		}
 		$this->db->sql_freeresult($result);
 
+
+		if ($reset_ids)
+		{
+			$this->db->sql_transaction('commit');
+			$this->lock->release();
+		}
+
 		return $new_id;
 	}
 }
-- 
cgit v1.2.1


From 5cb7342dd3b7abd2366abbdb7c0ba11d3d27f922 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 18 Apr 2013 22:17:05 +0200
Subject: [ticket/11495] Remove acquire locks from forum implementation

PHPBB3-11495
---
 phpBB/includes/nestedset/forum.php | 65 ++------------------------------------
 1 file changed, 2 insertions(+), 63 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/forum.php b/phpBB/includes/nestedset/forum.php
index e723e3bf18..54a26772d5 100644
--- a/phpBB/includes/nestedset/forum.php
+++ b/phpBB/includes/nestedset/forum.php
@@ -17,15 +17,6 @@ if (!defined('IN_PHPBB'))
 
 class phpbb_nestedset_forum extends phpbb_nestedset_base
 {
-	/** @var phpbb_db_driver */
-	protected $db;
-
-	/** @var phpbb_lock_db */
-	protected $lock;
-
-	/** @var String */
-	protected $table_name;
-
 	/**
 	* Column names in the table
 	* @var String
@@ -34,12 +25,10 @@ class phpbb_nestedset_forum extends phpbb_nestedset_base
 	protected $column_item_parents = 'forum_parents';
 
 	/**
-	* Additional SQL restrictions
-	* Allows to have multiple nestedsets in one table
-	* Columns must be prefixed with %1$s
+	* Prefix for the language keys returned by exceptions
 	* @var String
 	*/
-	protected $sql_where = '';
+	protected $message_prefix = 'FORUM_NESTEDSET_';
 
 	/**
 	* List of item properties to be cached in $item_parents
@@ -60,54 +49,4 @@ class phpbb_nestedset_forum extends phpbb_nestedset_base
 		$this->lock = $lock;
 		$this->table_name = $table_name;
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function move_children(array $current_parent, array $new_parent)
-	{
-		while (!$this->lock->acquire())
-		{
-			// Retry after 0.2 seconds
-			usleep(200 * 1000);
-		}
-
-		try
-		{
-			$return = parent::move_children($current_parent, $new_parent);
-		}
-		catch (phpbb_nestedset_exception $e)
-		{
-			$this->lock->release();
-			throw new phpbb_nestedset_exception('FORUM_NESTEDSET_' . $e->getMessage());
-		}
-		$this->lock->release();
-
-		return $return;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function set_parent(array $item, array $new_parent)
-	{
-		while (!$this->lock->acquire())
-		{
-			// Retry after 0.2 seconds
-			usleep(200 * 1000);
-		}
-
-		try
-		{
-			$return = parent::set_parent($item, $new_parent);
-		}
-		catch (phpbb_nestedset_exception $e)
-		{
-			$this->lock->release();
-			throw new phpbb_nestedset_exception('FORUM_NESTEDSET_' . $e->getMessage());
-		}
-		$this->lock->release();
-
-		return $return;
-	}
 }
-- 
cgit v1.2.1


From f3ff8b36be01bf6414268d9dca0500b6c7d4f47f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 19 Apr 2013 01:14:38 +0200
Subject: [ticket/11495] Fix Spacing and lowercase on docs

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php  | 10 +++++-----
 phpBB/includes/nestedset/forum.php |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index e36f45e689..3383fd90c4 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -17,24 +17,24 @@ if (!defined('IN_PHPBB'))
 
 abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 {
-	/** @var phpbb_db_driver*/
+	/** @var phpbb_db_driver */
 	protected $db;
 
 	/** @var phpbb_lock_db */
 	protected $lock;
 
-	/** @var String */
+	/** @var string */
 	protected $table_name;
 
 	/**
 	* Prefix for the language keys returned by exceptions
-	* @var String
+	* @var string
 	*/
 	protected $message_prefix = '';
 
 	/**
 	* Column names in the table
-	* @var String
+	* @var string
 	*/
 	protected $column_item_id = 'item_id';
 	protected $column_left_id = 'left_id';
@@ -45,7 +45,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* Additional SQL restrictions
 	* Allows to have multiple nested sets in one table
-	* @var String
+	* @var string
 	*/
 	protected $sql_where = '';
 
diff --git a/phpBB/includes/nestedset/forum.php b/phpBB/includes/nestedset/forum.php
index 54a26772d5..dbf0e70202 100644
--- a/phpBB/includes/nestedset/forum.php
+++ b/phpBB/includes/nestedset/forum.php
@@ -19,14 +19,14 @@ class phpbb_nestedset_forum extends phpbb_nestedset_base
 {
 	/**
 	* Column names in the table
-	* @var String
+	* @var string
 	*/
 	protected $column_item_id = 'forum_id';
 	protected $column_item_parents = 'forum_parents';
 
 	/**
 	* Prefix for the language keys returned by exceptions
-	* @var String
+	* @var string
 	*/
 	protected $message_prefix = 'FORUM_NESTEDSET_';
 
-- 
cgit v1.2.1


From d24ff2329fe145864712cb37ec19183bd4e21a42 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 19 Apr 2013 16:18:03 +0200
Subject: [ticket/11495] Use item_id only as parameter for get_branch_data()

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php      | 19 ++++++-------------
 phpBB/includes/nestedset/interface.php |  6 +++---
 2 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index 3383fd90c4..a3c878a47e 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -115,14 +115,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	*/
 	public function remove(array $item)
 	{
-		if ($item[$this->column_right_id] - $item[$this->column_left_id] > 1)
-		{
-			$items = array_keys($this->get_branch_data($item, 'children'));
-		}
-		else
-		{
-			$items = array((int) $item[$this->column_item_id]);
-		}
+		$items = array_keys($this->get_branch_data($item[$this->column_item_id], 'children'));
 
 		$this->remove_subset($items, $item);
 
@@ -282,7 +275,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
-		$move_items = array_keys($this->get_branch_data($current_parent, 'children', true, false));
+		$move_items = array_keys($this->get_branch_data((int) $current_parent[$this->column_item_id], 'children', true, false));
 
 		if (in_array($new_parent[$this->column_item_id], $move_items))
 		{
@@ -363,7 +356,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
-		$move_items = array_keys($this->get_branch_data($item, 'children'));
+		$move_items = array_keys($this->get_branch_data((int) $item[$this->column_item_id], 'children'));
 
 		if (in_array($new_parent[$this->column_item_id], $move_items))
 		{
@@ -437,7 +430,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function get_branch_data(array $item, $type = 'all', $order_desc = true, $include_item = true)
+	public function get_branch_data($item_id, $type = 'all', $order_desc = true, $include_item = true)
 	{
 		switch ($type)
 		{
@@ -461,14 +454,14 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			FROM ' . $this->table_name . ' i1
 			LEFT JOIN ' . $this->table_name . " i2
 				ON (($condition) " . $this->get_sql_where('AND', 'i2.') . ')
-			WHERE i1.' . $this->column_item_id . ' = ' . (int) $item[$this->column_item_id] . '
+			WHERE i1.' . $this->column_item_id . ' = ' . (int) $item_id . '
 				' . $this->get_sql_where('AND', 'i1.') . '
 			ORDER BY i2.' . $this->column_left_id . ' ' . ($order_desc ? 'ASC' : 'DESC');
 		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			if (!$include_item && $item[$this->column_item_id] == $row[$this->column_item_id])
+			if (!$include_item && $item_id == $row[$this->column_item_id])
 			{
 				continue;
 			}
diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
index 2d353544dd..c632c09dbf 100644
--- a/phpBB/includes/nestedset/interface.php
+++ b/phpBB/includes/nestedset/interface.php
@@ -101,19 +101,19 @@ interface phpbb_nestedset_interface
 	*
 	* This method can return all parents, children or both of the given item
 	*
-	* @param array	$item		The item to get the branch from
+	* @param int		$item_id		The item id to get the parents from
 	* @param string		$type			One of all|parent|children
 	* @param bool		$order_desc		Order the items descending (most outer parent first)
 	* @param bool		$include_item	Should the given item be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-	public function get_branch_data(array $item, $type, $order_desc, $include_item);
+	public function get_branch_data($item_id, $type, $order_desc, $include_item);
 
 	/**
 	* Get base information of parent items
 	*
-	* @param array	$item		The item to get the parents from
+	* @param array	$item		The item to get the branch from
 	* @return array			Array of items (containing basic columns from the item table)
 	*							ID => Item data
 	*/
-- 
cgit v1.2.1


From 3d54a81ed9394f13aff4c40d524ed7cff0546604 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 19 Apr 2013 16:19:01 +0200
Subject: [ticket/11495] Use item_id only as parameter for delete() and
 remove()

The data is acquired again anyway

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php      | 13 +++++++------
 phpBB/includes/nestedset/interface.php | 12 ++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index a3c878a47e..c1feb48534 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -113,21 +113,22 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function remove(array $item)
+	public function remove($item_id)
 	{
-		$items = array_keys($this->get_branch_data($item[$this->column_item_id], 'children'));
+		$items = $this->get_branch_data($item_id, 'children');
+		$item_ids = array_keys($items);
 
-		$this->remove_subset($items, $item);
+		$this->remove_subset($item_ids, $items[$item_id]);
 
-		return $items;
+		return $item_ids;
 	}
 
 	/**
 	* @inheritdoc
 	*/
-	public function delete(array $item)
+	public function delete($item_id)
 	{
-		$removed_items = $this->remove($item);
+		$removed_items = $this->remove($item_id);
 
 		$sql = 'DELETE FROM ' . $this->table_name . '
 			WHERE ' . $this->db->sql_in_set($this->column_item_id, $removed_items) . '
diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
index c632c09dbf..1a6b09f975 100644
--- a/phpBB/includes/nestedset/interface.php
+++ b/phpBB/includes/nestedset/interface.php
@@ -38,20 +38,20 @@ interface phpbb_nestedset_interface
 	*
 	* Also removes all subitems from the nested set
 	*
-	* @param array	$item	The item to be removed
-	* @return array		Items that have been removed
+	* @param int	$item_id	The item to be deleted
+	* @return array		Item ids that have been removed
 	*/
-	public function remove(array $item);
+	public function remove($item);
 
 	/**
 	* Delete an item from the nested set (also deletes the rows form the table)
 	*
 	* Also deletes all subitems from the nested set
 	*
-	* @param array	$item	The item to be deleted
-	* @return array		Items that have been deleted
+	* @param int	$item_id	The item to be deleted
+	* @return array		Item ids that have been deleted
 	*/
-	public function delete(array $item);
+	public function delete($item);
 
 	/**
 	* Move an item by a given delta
-- 
cgit v1.2.1


From f66b5323a75db084686d9a16c7090b15c5c13e54 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 19 Apr 2013 19:09:22 +0200
Subject: [ticket/11495] Cast some values to int

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index c1feb48534..bb7acca0fb 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -202,10 +202,10 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		*/
 		if ($action == 'move_up')
 		{
-			$left_id = $target[$this->column_left_id];
+			$left_id = (int) $target[$this->column_left_id];
 			$right_id = (int) $item[$this->column_right_id];
 
-			$diff_up = (int) $item[$this->column_left_id] - $target[$this->column_left_id];
+			$diff_up = (int) $item[$this->column_left_id] - (int) $target[$this->column_left_id];
 			$diff_down = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
 
 			$move_up_left = (int) $item[$this->column_left_id];
@@ -214,13 +214,13 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		else
 		{
 			$left_id = (int) $item[$this->column_left_id];
-			$right_id = $target[$this->column_right_id];
+			$right_id = (int) $target[$this->column_right_id];
 
 			$diff_up = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
-			$diff_down = $target[$this->column_right_id] - (int) $item[$this->column_right_id];
+			$diff_down = (int) $target[$this->column_right_id] - (int) $item[$this->column_right_id];
 
 			$move_up_left = (int) $item[$this->column_right_id] + 1;
-			$move_up_right = $target[$this->column_right_id];
+			$move_up_right = (int) $target[$this->column_right_id];
 		}
 
 		// Now do the dirty job
-- 
cgit v1.2.1


From db5df5b6ac025f360cdc97182678536d88c0dccb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 19 Apr 2013 10:15:03 +0200
Subject: [ticket/10966] Introduce MSSQL base class for native and ODBC

PHPBB3-10966
---
 phpBB/includes/db/driver/mssql_base.php  | 65 ++++++++++++++++++++++++++++++++
 phpBB/includes/db/driver/mssql_odbc.php  | 44 +--------------------
 phpBB/includes/db/driver/mssqlnative.php | 44 +--------------------
 3 files changed, 67 insertions(+), 86 deletions(-)
 create mode 100644 phpBB/includes/db/driver/mssql_base.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/driver/mssql_base.php b/phpBB/includes/db/driver/mssql_base.php
new file mode 100644
index 0000000000..56c111c871
--- /dev/null
+++ b/phpBB/includes/db/driver/mssql_base.php
@@ -0,0 +1,65 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* MSSQL Database Base Abstraction Layer
+* @package dbal
+ */
+abstract class phpbb_db_driver_mssql_base extends phpbb_db_driver
+{
+	/**
+	* {@inheritDoc}
+	*/
+	public function sql_concatenate($expr1, $expr2)
+	{
+		return $expr1 . ' + ' . $expr2;
+	}
+
+	/**
+	* Escape string used in sql query
+	*/
+	function sql_escape($msg)
+	{
+		return str_replace(array("'", "\0"), array("''", ''), $msg);
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	function sql_lower_text($column_name)
+	{
+		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
+	}
+
+	/**
+	* Build LIKE expression
+	* @access private
+	*/
+	function _sql_like_expression($expression)
+	{
+		return $expression . " ESCAPE '\\'";
+	}
+
+	/**
+	* Build db-specific query data
+	* @access private
+	*/
+	function _sql_custom_build($stage, $data)
+	{
+		return $data;
+	}
+}
diff --git a/phpBB/includes/db/driver/mssql_odbc.php b/phpBB/includes/db/driver/mssql_odbc.php
index f7834443eb..cde9d332ba 100644
--- a/phpBB/includes/db/driver/mssql_odbc.php
+++ b/phpBB/includes/db/driver/mssql_odbc.php
@@ -26,7 +26,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package dbal
 */
-class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
+class phpbb_db_driver_mssql_odbc extends phpbb_db_driver_mssql_base
 {
 	var $last_query_text = '';
 	var $connect_error = '';
@@ -125,14 +125,6 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
 		return ($this->sql_server_version) ? 'MSSQL (ODBC)<br />' . $this->sql_server_version : 'MSSQL (ODBC)';
 	}
 
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return $expr1 . ' + ' . $expr2;
-	}
-
 	/**
 	* SQL Transaction
 	* @access private
@@ -325,40 +317,6 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver
 		return false;
 	}
 
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_lower_text($column_name)
-	{
-		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
 	/**
 	* return sql error array
 	* @access private
diff --git a/phpBB/includes/db/driver/mssqlnative.php b/phpBB/includes/db/driver/mssqlnative.php
index 656cbd2437..6f433e10cf 100644
--- a/phpBB/includes/db/driver/mssqlnative.php
+++ b/phpBB/includes/db/driver/mssqlnative.php
@@ -191,7 +191,7 @@ class result_mssqlnative
 /**
 * @package dbal
 */
-class phpbb_db_driver_mssqlnative extends phpbb_db_driver
+class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
 {
 	var $m_insert_id = NULL;
 	var $last_query_text = '';
@@ -256,14 +256,6 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
 	}
 
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return $expr1 . ' + ' . $expr2;
-	}
-
 	/**
 	* {@inheritDoc}
 	*/
@@ -490,31 +482,6 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 		return false;
 	}
 
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_lower_text($column_name)
-	{
-		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
 	/**
 	* return sql error array
 	* @access private
@@ -560,15 +527,6 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver
 		return $error;
 	}
 
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
 	/**
 	* Close sql connection
 	* @access private
-- 
cgit v1.2.1


From 87dc3b1e55bcfcade98eedfaa07e77c454dd7d4f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 19 Apr 2013 21:07:42 +0200
Subject: [ticket/11495] Use item ids instead of requiring all data

The data is grabbed again in most cases anyway, so it just makes the system
easier to use.

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php      | 95 +++++++++++++++++++++++++++-------
 phpBB/includes/nestedset/interface.php | 26 +++++-----
 2 files changed, 90 insertions(+), 31 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index bb7acca0fb..f3bdfe1c7d 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -141,7 +141,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function move(array $item, $delta)
+	public function move($item_id, $delta)
 	{
 		if ($delta == 0)
 		{
@@ -156,6 +156,21 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		$action = ($delta > 0) ? 'move_up' : 'move_down';
 		$delta = abs($delta);
 
+		// Keep $this->get_sql_where() here, to ensure we are in the right tree.
+		$sql = 'SELECT *
+			FROM ' . $this->table_name . '
+			WHERE ' . $this->column_item_id . ' = ' . (int) $item_id . '
+				' . $this->get_sql_where();
+		$result = $this->db->sql_query_limit($sql, $delta);
+		$item = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$item)
+		{
+			$this->lock->release();
+			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_ITEM');
+		}
+
 		/**
 		* Fetch all the siblings between the item's current spot
 		* and where we want to move it to. If there are less than $delta
@@ -248,37 +263,60 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function move_down(array $item)
+	public function move_down($item_id)
 	{
-		return $this->move($item, -1);
+		return $this->move($item_id, -1);
 	}
 
 	/**
 	* @inheritdoc
 	*/
-	public function move_up(array $item)
+	public function move_up($item_id)
 	{
-		return $this->move($item, 1);
+		return $this->move($item_id, 1);
 	}
 
 	/**
 	* @inheritdoc
 	*/
-	public function move_children(array $current_parent, array $new_parent)
+	public function move_children($current_parent_id, $new_parent_id)
 	{
-		if (($current_parent[$this->column_right_id] - $current_parent[$this->column_left_id]) <= 1 || !$current_parent[$this->column_item_id] || $current_parent[$this->column_item_id] == $new_parent[$this->column_item_id])
+		$current_parent_id = (int) $current_parent_id;
+		$new_parent_id = (int) $new_parent_id;
+
+		if ($current_parent_id == $new_parent_id)
 		{
 			return false;
 		}
 
+		if (!$current_parent_id)
+		{
+			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_ITEM');
+		}
+
 		if (!$this->lock->acquire())
 		{
 			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
-		$move_items = array_keys($this->get_branch_data((int) $current_parent[$this->column_item_id], 'children', true, false));
+		$item_data = $this->get_branch_data($current_parent_id, 'children');
+		if (!isset($item_data[$current_parent_id]))
+		{
+			$this->lock->release();
+			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_ITEM');
+		}
+
+		$current_parent = $item_data[$current_parent_id];
+		unset($item_data[$current_parent_id]);
+		$move_items = array_keys($item_data);
 
-		if (in_array($new_parent[$this->column_item_id], $move_items))
+		if (($current_parent[$this->column_right_id] - $current_parent[$this->column_left_id]) <= 1)
+		{
+			$this->lock->release();
+			return false;
+		}
+
+		if (in_array($new_parent_id, $move_items))
 		{
 			$this->lock->release();
 			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_PARENT');
@@ -291,12 +329,12 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		$this->remove_subset($move_items, $current_parent, false, true);
 
-		if ($new_parent[$this->column_item_id])
+		if ($new_parent_id)
 		{
 			// Retrieve new-parent again, it may have been changed...
 			$sql = 'SELECT *
 				FROM ' . $this->table_name . '
-				WHERE ' . $this->column_item_id . ' = ' . (int) $new_parent[$this->column_item_id];
+				WHERE ' . $this->column_item_id . ' = ' . $new_parent_id;
 			$result = $this->db->sql_query($sql);
 			$new_parent = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
@@ -335,7 +373,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		$sql = 'UPDATE ' . $this->table_name . '
 			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
 				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
-				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_parent_id . ' = ' . (int) $current_parent[$this->column_item_id], (int) $new_parent[$this->column_item_id], $this->column_parent_id) . ',
+				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_parent_id . ' = ' . $current_parent_id, $new_parent_id, $this->column_parent_id) . ',
 				' . $this->column_item_parents . " = ''
 			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
 				' . $this->get_sql_where('AND');
@@ -350,16 +388,37 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function set_parent(array $item, array $new_parent)
+	public function set_parent($item_id, $new_parent_id)
 	{
+		$item_id = (int) $item_id;
+		$new_parent_id = (int) $new_parent_id;
+
+		if ($item_id == $new_parent_id)
+		{
+			return false;
+		}
+
+		if (!$item_id)
+		{
+			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_ITEM');
+		}
+
 		if (!$this->lock->acquire())
 		{
 			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
-		$move_items = array_keys($this->get_branch_data((int) $item[$this->column_item_id], 'children'));
+		$item_data = $this->get_branch_data($item_id, 'children');
+		if (!isset($item_data[$item_id]))
+		{
+			$this->lock->release();
+			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_ITEM');
+		}
+
+		$item = $item_data[$item_id];
+		$move_items = array_keys($item_data);
 
-		if (in_array($new_parent[$this->column_item_id], $move_items))
+		if (in_array($new_parent_id, $move_items))
 		{
 			$this->lock->release();
 			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_PARENT');
@@ -372,12 +431,12 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		$this->remove_subset($move_items, $item, false, true);
 
-		if ($new_parent[$this->column_item_id])
+		if ($new_parent_id)
 		{
 			// Retrieve new-parent again, it may have been changed...
 			$sql = 'SELECT *
 				FROM ' . $this->table_name . '
-				WHERE ' . $this->column_item_id . ' = ' . (int) $new_parent[$this->column_item_id];
+				WHERE ' . $this->column_item_id . ' = ' . $new_parent_id;
 			$result = $this->db->sql_query($sql);
 			$new_parent = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
@@ -416,7 +475,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		$sql = 'UPDATE ' . $this->table_name . '
 			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
 				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
-				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_item_id . ' = ' . (int) $item[$this->column_item_id], $new_parent[$this->column_item_id], $this->column_parent_id) . ',
+				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_item_id . ' = ' . $item_id, $new_parent_id, $this->column_parent_id) . ',
 				' . $this->column_item_parents . " = ''
 			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
 				' . $this->get_sql_where('AND');
diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
index 1a6b09f975..aedd57821a 100644
--- a/phpBB/includes/nestedset/interface.php
+++ b/phpBB/includes/nestedset/interface.php
@@ -56,45 +56,45 @@ interface phpbb_nestedset_interface
 	/**
 	* Move an item by a given delta
 	*
-	* @param array	$item	The item to be moved
-	* @param int	$delta	Number of steps to move this item, < 0 => down, > 0 => up
+	* @param int	$item_id	The item to be moved
+	* @param int	$delta		Number of steps to move this item, < 0 => down, > 0 => up
 	* @return bool True if the item was moved
 	*/
-	public function move(array $item, $delta);
+	public function move($item_id, $delta);
 
 	/**
 	* Move an item down by 1
 	*
-	* @param array	$item	The item to be moved
+	* @param int	$item_id	The item to be moved
 	* @return bool True if the item was moved
 	*/
-	public function move_down(array $item);
+	public function move_down($item_id);
 
 	/**
 	* Move an item up by 1
 	*
-	* @param array	$item	The item to be moved
+	* @param int	$item_id	The item to be moved
 	* @return bool True if the item was moved
 	*/
-	public function move_up(array $item);
+	public function move_up($item_id);
 
 	/**
 	* Moves all children of one item to another item
 	*
-	* @param array	$current_parent		The current parent item
-	* @param array	$new_parent			The new parent item
+	* @param int	$current_parent_id	The current parent item
+	* @param int	$new_parent_id		The new parent item
 	* @return bool True if any items where moved
 	*/
-	public function move_children(array $current_parent, array $new_parent);
+	public function move_children($current_parent_id, $new_parent_id);
 
 	/**
 	* Set the parent item
 	*
-	* @param array	$item		The item to be moved
-	* @param array	$new_parent	The new parent item
+	* @param int	$item_id			The item to be moved
+	* @param int	$new_parent_id		The new parent item
 	* @return bool True if the parent was set successfully
 	*/
-	public function set_parent(array $item, array $new_parent);
+	public function set_parent($item, $new_parent_id);
 
 	/**
 	* Get branch of the item
-- 
cgit v1.2.1


From 802fbbb444a580698b130fa54754d26c12321c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= <m.gaetan89@gmail.com>
Date: Sun, 21 Apr 2013 16:14:33 +0200
Subject: [ticket/9975] Translate missing style error message

The error message about missing style data was not
translated

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index b93f2ff65e..fe5357f32e 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1661,7 +1661,7 @@ class user extends session
 
 		if (!$this->theme)
 		{
-			trigger_error('Could not get style data', E_USER_ERROR);
+			trigger_error('NO_STYLE_DATA', E_USER_ERROR);
 		}
 
 		// Now parse the cfg file and cache it
-- 
cgit v1.2.1


From 16e70fa08610227d96e149eba2019803ad37c85f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 22 Apr 2013 00:49:41 +0200
Subject: [ticket/11362] Use container when available instead of creating a new
 instance

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 998c52b7c6..231825525f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1062,7 +1062,7 @@ function phpbb_clean_path($path)
 
 	if ($phpbb_container)
 	{
-		$phpbb_filesystem = new phpbb_filesystem();
+		$phpbb_filesystem = $phpbb_container->get('filesystem');
 	}
 	else
 	{
-- 
cgit v1.2.1


From 9f545a7f6ba7ddd54fae083563b5b582e05f5c1c Mon Sep 17 00:00:00 2001
From: asperous <theandychase@gmail.com>
Date: Tue, 23 Apr 2013 09:55:36 -0700
Subject: [ticket/9975] Moved a few E_USER_ERROR errors to /language

There were a few error messages that a user could experience that would, previously, be without any the ability to be localized. There are some more E_USER_ERRORs that I did not change to a constant, for example the error message that is displayed if there aren't any folders in /language.

PHPBB3-9975
---
 phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 2 +-
 phpBB/includes/functions.php                              | 6 +++---
 phpBB/includes/user.php                                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 83d40bbba7..cb21b04ec5 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -270,7 +270,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
 		$response = '';
 		if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10)))
 		{
-			trigger_error('Could not open socket', E_USER_ERROR);
+			trigger_error('RECAPTCHA_SOCKET_ERROR', E_USER_ERROR);
 		}
 
 		fwrite($fs, $http_request);
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 58d2ad4760..6b5d7bd1df 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2731,7 +2731,7 @@ function redirect($url, $return = false, $disable_cd_check = false)
 	// Make sure no linebreaks are there... to prevent http response splitting for PHP < 4.4.2
 	if (strpos(urldecode($url), "\n") !== false || strpos(urldecode($url), "\r") !== false || strpos($url, ';') !== false)
 	{
-		trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR);
+		trigger_error('INSECURE_REDIRECT', E_USER_ERROR);
 	}
 
 	// Now, also check the protocol and for a valid url the last time...
@@ -2740,7 +2740,7 @@ function redirect($url, $return = false, $disable_cd_check = false)
 
 	if ($url_parts === false || empty($url_parts['scheme']) || !in_array($url_parts['scheme'], $allowed_protocols))
 	{
-		trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR);
+		trigger_error('INSECURE_REDIRECT', E_USER_ERROR);
 	}
 
 	if ($return)
@@ -4182,7 +4182,7 @@ function phpbb_checkdnsrr($host, $type = 'MX')
 // Handler, header and footer
 
 /**
-* Error and message handler, call with trigger_error if reqd
+* Error and message handler, call with trigger_error if read
 */
 function msg_handler($errno, $msg_text, $errfile, $errline)
 {
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php
index 9ddd806b27..4477c98097 100644
--- a/phpBB/includes/user.php
+++ b/phpBB/includes/user.php
@@ -215,7 +215,7 @@ class phpbb_user extends phpbb_session
 
 		if (!$this->style)
 		{
-			trigger_error('Could not get style data', E_USER_ERROR);
+			trigger_error('STYLE_NOT_FOUND', E_USER_ERROR);
 		}
 
 		// Now parse the cfg file and cache it
-- 
cgit v1.2.1


From 212971a3a6c7d2b336408f6432218ced55ac36a0 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 10:37:53 -0500
Subject: [ticket/11454] Correct jabber global available check

Copied from msg_jabber()

PBPBB3-11454
---
 phpBB/includes/notification/method/jabber.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
index debffa8ce5..d3b756d020 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/includes/notification/method/jabber.php
@@ -48,7 +48,13 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_messeng
 	*/
 	public function global_available()
 	{
-		return ($this->config['jab_enable'] && @extension_loaded('xml'));
+		return !(
+			empty($this->config['jab_enable']) ||
+			empty($this->config['jab_host']) ||
+			empty($this->config['jab_username']) ||
+			empty($this->config['jab_password']) ||
+			!@extension_loaded('xml')
+		);
 	}
 
 	public function notify()
-- 
cgit v1.2.1


From ebb5169a463db9a2e7c552abf87eaf1ac8d086a2 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 10:38:57 -0500
Subject: [ticket/11454] Add messenger function set_addresses

Automatically fills to/im from a user row

Send messenger the Jabber address if using Jabber notifications

PHPBB3-11454
---
 phpBB/includes/functions_messenger.php                | 18 ++++++++++++++++++
 phpBB/includes/notification/method/messenger_base.php |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 821f0d970d..5c0c182f4f 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -55,6 +55,24 @@ class messenger
 		$this->vars = $this->msg = $this->replyto = $this->from = '';
 		$this->mail_priority = MAIL_NORMAL_PRIORITY;
 	}
+	
+	/**
+	* Set addresses for to/im as available
+	* 
+	* @param array $user User row
+	*/
+	function set_addresses($user)
+	{
+		if ($user['user_email'])
+		{
+			$this->to($user['user_email'], ($user['username']) ?: '');
+		}
+
+		if ($user['user_jabber'])
+		{
+			$this->im($user['user_jabber'], ($user['username']) ?: '');
+		}
+	}
 
 	/**
 	* Sets an email address to send to
diff --git a/phpBB/includes/notification/method/messenger_base.php b/phpBB/includes/notification/method/messenger_base.php
index 2f9073e80b..4966aa94bc 100644
--- a/phpBB/includes/notification/method/messenger_base.php
+++ b/phpBB/includes/notification/method/messenger_base.php
@@ -80,7 +80,7 @@ abstract class phpbb_notification_method_messenger_base extends phpbb_notificati
 
 			$messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']);
 
-			$messenger->to($user['user_email'], $user['username']);
+			$messenger->set_addresses($user);
 
 			$messenger->assign_vars(array_merge(array(
 				'USERNAME'						=> $user['username'],
-- 
cgit v1.2.1


From fcdfe748b89426ed9d29c9e589fc5b98ed53a797 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 15:34:12 -0500
Subject: [ticket/11454] Use set_addresses in other applicable areas

This should fix some other bugs that may not have yet been recognized--some
areas only set to(), but sent according to user_notify_type, which is not
necessarily email.

PHPBB3-11454
---
 phpBB/includes/acp/acp_inactive.php | 5 ++---
 phpBB/includes/acp/acp_users.php    | 4 ++--
 phpBB/includes/functions_user.php   | 3 +--
 phpBB/includes/ucp/ucp_activate.php | 2 +-
 phpBB/includes/ucp/ucp_groups.php   | 3 +--
 phpBB/includes/ucp/ucp_profile.php  | 3 +--
 phpBB/includes/ucp/ucp_register.php | 3 +--
 phpBB/includes/ucp/ucp_remind.php   | 3 +--
 phpBB/includes/ucp/ucp_resend.php   | 5 ++---
 9 files changed, 12 insertions(+), 19 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php
index e61115f681..de4679b58d 100644
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -115,7 +115,7 @@ class acp_inactive
 							{
 								$messenger->template('admin_welcome_activated', $row['user_lang']);
 
-								$messenger->to($row['user_email'], $row['username']);
+								$messenger->set_addresses($row);
 
 								$messenger->anti_abuse_headers($config, $user);
 
@@ -203,8 +203,7 @@ class acp_inactive
 						{
 							$messenger->template('user_remind_inactive', $row['user_lang']);
 
-							$messenger->to($row['user_email'], $row['username']);
-							$messenger->im($row['user_jabber'], $row['username']);
+							$messenger->set_addresses($row);
 
 							$messenger->anti_abuse_headers($config, $user);
 
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 8f4a22b61f..c8542ddbe7 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -347,7 +347,7 @@ class acp_users
 
 								$messenger->template($email_template, $user_row['user_lang']);
 
-								$messenger->to($user_row['user_email'], $user_row['username']);
+								$messenger->set_addresses($user_row);
 
 								$messenger->anti_abuse_headers($config, $user);
 
@@ -402,7 +402,7 @@ class acp_users
 
 									$messenger->template('admin_welcome_activated', $user_row['user_lang']);
 
-									$messenger->to($user_row['user_email'], $user_row['username']);
+									$messenger->set_addresses($user_row);
 
 									$messenger->anti_abuse_headers($config, $user);
 
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index bc636acabb..599cb24f75 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2924,8 +2924,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna
 			{
 				$messenger->template('group_approved', $row['user_lang']);
 
-				$messenger->to($row['user_email'], $row['username']);
-				$messenger->im($row['user_jabber'], $row['username']);
+				$messenger->set_addresses($row);
 
 				$messenger->assign_vars(array(
 					'USERNAME'		=> htmlspecialchars_decode($row['username']),
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index 577761dfde..898dacd831 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -114,7 +114,7 @@ class ucp_activate
 
 			$messenger->template('admin_welcome_activated', $user_row['user_lang']);
 
-			$messenger->to($user_row['user_email'], $user_row['username']);
+			$messenger->set_addresses($user_row);
 
 			$messenger->anti_abuse_headers($config, $user);
 
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 8516682633..50d13e00b1 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -212,8 +212,7 @@ class ucp_groups
 									{
 										$messenger->template('group_request', $row['user_lang']);
 
-										$messenger->to($row['user_email'], $row['username']);
-										$messenger->im($row['user_jabber'], $row['username']);
+										$messenger->set_addresses($row);
 
 										$messenger->assign_vars(array(
 											'USERNAME'			=> htmlspecialchars_decode($row['username']),
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index d2507e5dbd..55df5f610c 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -175,8 +175,7 @@ class ucp_profile
 								while ($row = $db->sql_fetchrow($result))
 								{
 									$messenger->template('admin_activate', $row['user_lang']);
-									$messenger->to($row['user_email'], $row['username']);
-									$messenger->im($row['user_jabber'], $row['username']);
+									$messenger->set_addresses($row);
 
 									$messenger->assign_vars(array(
 										'USERNAME'			=> htmlspecialchars_decode($data['username']),
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 1de38fddb7..70fbfe46fb 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -384,8 +384,7 @@ class ucp_register
 						while ($row = $db->sql_fetchrow($result))
 						{
 							$messenger->template('admin_activate', $row['user_lang']);
-							$messenger->to($row['user_email'], $row['username']);
-							$messenger->im($row['user_jabber'], $row['username']);
+							$messenger->set_addresses($row);
 
 							$messenger->assign_vars(array(
 								'USERNAME'			=> htmlspecialchars_decode($data['username']),
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index 4f65ed1866..8a7ba5d0ca 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -94,8 +94,7 @@ class ucp_remind
 
 			$messenger->template('user_activate_passwd', $user_row['user_lang']);
 
-			$messenger->to($user_row['user_email'], $user_row['username']);
-			$messenger->im($user_row['user_jabber'], $user_row['username']);
+			$messenger->set_addresses($user_row);
 
 			$messenger->assign_vars(array(
 				'USERNAME'		=> htmlspecialchars_decode($user_row['username']),
diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php
index 5f1e3a92c3..ab396cdec9 100644
--- a/phpBB/includes/ucp/ucp_resend.php
+++ b/phpBB/includes/ucp/ucp_resend.php
@@ -91,7 +91,7 @@ class ucp_resend
 			if ($config['require_activation'] == USER_ACTIVATION_SELF || $coppa)
 			{
 				$messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']);
-				$messenger->to($user_row['user_email'], $user_row['username']);
+				$messenger->set_addresses($user_row);
 
 				$messenger->anti_abuse_headers($config, $user);
 
@@ -126,8 +126,7 @@ class ucp_resend
 				while ($row = $db->sql_fetchrow($result))
 				{
 					$messenger->template('admin_activate', $row['user_lang']);
-					$messenger->to($row['user_email'], $row['username']);
-					$messenger->im($row['user_jabber'], $row['username']);
+					$messenger->set_addresses($row);
 
 					$messenger->anti_abuse_headers($config, $user);
 
-- 
cgit v1.2.1


From e870c04067772d227c4254533826f01252608f26 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 17:07:30 -0500
Subject: [ticket/11335] (class loader) Make php_ext 'php' not '.php'

PHPBB3-11335
---
 phpBB/includes/class_loader.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/class_loader.php b/phpBB/includes/class_loader.php
index 6082800908..02a2d584dc 100644
--- a/phpBB/includes/class_loader.php
+++ b/phpBB/includes/class_loader.php
@@ -52,7 +52,7 @@ class phpbb_class_loader
 	* @param string $php_ext The file extension for PHP files
 	* @param phpbb_cache_driver_interface $cache An implementation of the phpBB cache interface.
 	*/
-	public function __construct($prefix, $path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null)
+	public function __construct($prefix, $path, $php_ext = 'php', phpbb_cache_driver_interface $cache = null)
 	{
 		$this->prefix = $prefix;
 		$this->path = $path;
@@ -111,7 +111,7 @@ class phpbb_class_loader
 	{
 		if (isset($this->cached_paths[$class]))
 		{
-			return $this->path . $this->cached_paths[$class] . $this->php_ext;
+			return $this->path . $this->cached_paths[$class] . '.' . $this->php_ext;
 		}
 
 		if (!preg_match('/^' . $this->prefix . '[a-zA-Z0-9_]+$/', $class))
@@ -136,7 +136,7 @@ class phpbb_class_loader
 
 		$relative_path = $dirs . implode(array_slice($parts, $i, sizeof($parts) - $i), '_');
 
-		if (!file_exists($this->path . $relative_path . $this->php_ext))
+		if (!file_exists($this->path . $relative_path . '.' . $this->php_ext))
 		{
 			return false;
 		}
@@ -147,7 +147,7 @@ class phpbb_class_loader
 			$this->cache->put('class_loader_' . $this->prefix, $this->cached_paths);
 		}
 
-		return $this->path . $relative_path . $this->php_ext;
+		return $this->path . $relative_path . '.' . $this->php_ext;
 	}
 
 	/**
-- 
cgit v1.2.1


From 6ef363547abf98445d20db61ffa5bac66b260603 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 17:10:17 -0500
Subject: [ticket/11335] (controller/helper.php) Make php_ext 'php' not '.php'

PHPBB3-11335
---
 phpBB/includes/controller/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index 46c6307cb4..74410ddfd1 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -117,7 +117,7 @@ class phpbb_controller_helper
 			$params = array('controller' => $route);
 		}
 
-		return append_sid($this->phpbb_root_path . 'app' . $this->php_ext . $route_params, $params, $is_amp, $session_id);
+		return append_sid($this->phpbb_root_path . 'app.' . $this->php_ext . $route_params, $params, $is_amp, $session_id);
 	}
 
 	/**
-- 
cgit v1.2.1


From ce230f8dea4afb585e7aca5a1763c547b2c39e81 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 17:15:28 -0500
Subject: [ticket/11335] (extension manager/finder) Make php_ext 'php' not
 '.php'

PHPBB3-11335
---
 phpBB/includes/extension/finder.php           | 8 ++++----
 phpBB/includes/extension/manager.php          | 4 ++--
 phpBB/includes/extension/metadata_manager.php | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index 02a9ebb8c3..766b9e9b63 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -62,7 +62,7 @@ class phpbb_extension_finder
 	* @param string $cache_name The name of the cache variable, defaults to
 	*                           _ext_finder
 	*/
-	public function __construct(phpbb_extension_manager $extension_manager, phpbb_filesystem $filesystem, $phpbb_root_path = '', phpbb_cache_driver_interface $cache = null, $php_ext = '.php', $cache_name = '_ext_finder')
+	public function __construct(phpbb_extension_manager $extension_manager, phpbb_filesystem $filesystem, $phpbb_root_path = '', phpbb_cache_driver_interface $cache = null, $php_ext = 'php', $cache_name = '_ext_finder')
 	{
 		$this->extension_manager = $extension_manager;
 		$this->filesystem = $filesystem;
@@ -256,8 +256,8 @@ class phpbb_extension_finder
 	*/
 	public function get_classes($cache = true, $use_all_available = false)
 	{
-		$this->query['extension_suffix'] .= $this->php_ext;
-		$this->query['core_suffix'] .= $this->php_ext;
+		$this->query['extension_suffix'] .= '.' . $this->php_ext;
+		$this->query['core_suffix'] .= '.' . $this->php_ext;
 
 		$files = $this->find($cache, false, $use_all_available);
 
@@ -277,7 +277,7 @@ class phpbb_extension_finder
 		{
 			$file = preg_replace('#^includes/#', '', $file);
 
-			$classes[] = 'phpbb_' . str_replace('/', '_', substr($file, 0, -strlen($this->php_ext)));
+			$classes[] = 'phpbb_' . str_replace('/', '_', substr($file, 0, -strlen('.' . $this->php_ext)));
 		}
 		return $classes;
 	}
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index de9a3937c3..a1022762b8 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -51,7 +51,7 @@ class phpbb_extension_manager
 	* @param phpbb_cache_driver_interface $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_db_migrator $migrator, phpbb_filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = '.php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
+	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_db_migrator $migrator, phpbb_filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
 	{
 		$this->container = $container;
 		$this->phpbb_root_path = $phpbb_root_path;
@@ -412,7 +412,7 @@ class phpbb_extension_manager
 			RecursiveIteratorIterator::SELF_FIRST);
 		foreach ($iterator as $file_info)
 		{
-			if ($file_info->isFile() && $file_info->getFilename() == 'ext' . $this->php_ext)
+			if ($file_info->isFile() && $file_info->getFilename() == 'ext.' . $this->php_ext)
 			{
 				$ext_name = $iterator->getInnerIterator()->getSubPath();
 
diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php
index 36b0f8b184..1637abd340 100644
--- a/phpBB/includes/extension/metadata_manager.php
+++ b/phpBB/includes/extension/metadata_manager.php
@@ -39,7 +39,7 @@ class phpbb_extension_metadata_manager
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
 	* @param string $phpEx php file extension
 	*/
-	public function __construct($ext_name, phpbb_db_driver $db, phpbb_extension_manager $extension_manager, $phpbb_root_path, $phpEx = '.php', phpbb_template $template, phpbb_config $config)
+	public function __construct($ext_name, phpbb_db_driver $db, phpbb_extension_manager $extension_manager, $phpbb_root_path, $phpEx = 'php', phpbb_template $template, phpbb_config $config)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->db = $db;
-- 
cgit v1.2.1


From fe89e566869e91a582129b1174c1831b8ee2f865 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 17:17:53 -0500
Subject: [ticket/11335] (hook finder) Make php_ext 'php' not '.php'

PHPBB3-11335
---
 phpBB/includes/hook/finder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/hook/finder.php b/phpBB/includes/hook/finder.php
index 065e685514..7b0412f733 100644
--- a/phpBB/includes/hook/finder.php
+++ b/phpBB/includes/hook/finder.php
@@ -66,7 +66,7 @@ class phpbb_hook_finder
 		{
 			while (($file = readdir($dh)) !== false)
 			{
-				if (strpos($file, 'hook_') === 0 && substr($file, -(strlen($this->php_ext) + 1)) === '.' . $this->php_ext)
+				if (strpos($file, 'hook_') === 0 && substr($file, -strlen('.' . $this->php_ext)) === '.' . $this->php_ext)
 				{
 					$hook_files[] = substr($file, 0, -(strlen($this->php_ext) + 1));
 				}
-- 
cgit v1.2.1


From df70b6ebe6590f3b8de32f6f4c6dbdcce1e2db34 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 17:19:48 -0500
Subject: [ticket/11335] (kernel request subscriber) Make php_ext 'php' not
 '.php'

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php
index 7280cb74eb..a89ab7b126 100644
--- a/phpBB/includes/functions_url_matcher.php
+++ b/phpBB/includes/functions_url_matcher.php
@@ -60,7 +60,7 @@ function phpbb_create_dumped_url_matcher(phpbb_extension_finder $finder, $root_p
 		'class'			=> 'phpbb_url_matcher',
 	));
 
-	file_put_contents($root_path . 'cache/url_matcher' . $php_ext, $cached_url_matcher_dump);
+	file_put_contents($root_path . 'cache/url_matcher.' . $php_ext, $cached_url_matcher_dump);
 }
 
 /**
@@ -87,7 +87,7 @@ function phpbb_create_url_matcher(phpbb_extension_finder $finder, RequestContext
 */
 function phpbb_load_url_matcher(RequestContext $context, $root_path, $php_ext)
 {
-	require($root_path . 'cache/url_matcher' . $php_ext);
+	require($root_path . 'cache/url_matcher.' . $php_ext);
 	return new phpbb_url_matcher($context);
 }
 
@@ -102,5 +102,5 @@ function phpbb_load_url_matcher(RequestContext $context, $root_path, $php_ext)
 */
 function phpbb_url_matcher_dumped($root_path, $php_ext)
 {
-	return file_exists($root_path . 'cache/url_matcher' . $php_ext);
+	return file_exists($root_path . 'cache/url_matcher.' . $php_ext);
 }
-- 
cgit v1.2.1


From 14f1340903ce76fd4d72dfaf041a0e03b4272f1a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 17:22:58 -0500
Subject: [ticket/11335] (avatars) Make php_ext 'php' not '.php'

PHPBB3-11335
---
 phpBB/includes/avatar/driver/gravatar.php | 2 +-
 phpBB/includes/avatar/driver/remote.php   | 4 ++--
 phpBB/includes/avatar/driver/upload.php   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 2e2ae2071f..d559da1c0d 100644
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -74,7 +74,7 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 
 		if (!function_exists('validate_data'))
 		{
-			require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
+			require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 		}
 
 		$validate_array = validate_data(
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index 3661e16160..7da58107a1 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -63,7 +63,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 
 		if (!function_exists('validate_data'))
 		{
-			require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
+			require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 		}
 
 		$validate_array = validate_data(
@@ -117,7 +117,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 
 		if (!class_exists('fileupload'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+			include($this->phpbb_root_path . 'includes/functions_upload.' . $this->php_ext);
 		}
 
 		$types = fileupload::image_types();
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index f91d170d7c..19737693fd 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -27,7 +27,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	public function get_data($row, $ignore_config = false)
 	{
 		return array(
-			'src' => $this->phpbb_root_path . 'download/file' . $this->php_ext . '?avatar=' . $row['avatar'],
+			'src' => $this->phpbb_root_path . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'],
 			'width' => $row['avatar_width'],
 			'height' => $row['avatar_height'],
 		);
@@ -63,7 +63,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 
 		if (!class_exists('fileupload'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+			include($this->phpbb_root_path . 'includes/functions_upload.' . $this->php_ext);
 		}
 
 		$upload = new fileupload('AVATAR_', $this->allowed_extensions, $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
-- 
cgit v1.2.1


From f49993766e2bcf4efe346e29972f3721b1b1438a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 17:41:27 -0500
Subject: [ticket/11335] (more) Make php_ext 'php' not '.php'

PHPBB3-11335
---
 phpBB/includes/acp/acp_extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index e4f8059b45..9b5a8da3aa 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -54,7 +54,7 @@ class acp_extensions
 		// If they've specified an extension, let's load the metadata manager and validate it.
 		if ($ext_name)
 		{
-			$md_manager = new phpbb_extension_metadata_manager($ext_name, $db, $phpbb_extension_manager, $phpbb_root_path, ".$phpEx", $template, $config);
+			$md_manager = new phpbb_extension_metadata_manager($ext_name, $db, $phpbb_extension_manager, $phpbb_root_path, "$phpEx", $template, $config);
 
 			try
 			{
-- 
cgit v1.2.1


From 0d2d72e8ee5cca9e6bc9048cfa1c3ad81ef51949 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 20:28:35 -0500
Subject: [ticket/11454] Check if the fields are set

PHPBB3-11454
---
 phpBB/includes/functions_messenger.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 5c0c182f4f..f24a4c1eac 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -63,14 +63,14 @@ class messenger
 	*/
 	function set_addresses($user)
 	{
-		if ($user['user_email'])
+		if (isset($user['user_email']) && $user['user_email'])
 		{
-			$this->to($user['user_email'], ($user['username']) ?: '');
+			$this->to($user['user_email'], (isset($user['username']) ? $user['username'] : ''));
 		}
 
-		if ($user['user_jabber'])
+		if (isset($user['user_jabber']) && $user['user_jabber'])
 		{
-			$this->im($user['user_jabber'], ($user['username']) ?: '');
+			$this->im($user['user_jabber'], (isset($user['username']) ? $user['username'] : ''));
 		}
 	}
 
-- 
cgit v1.2.1


From 9c4553c41f0e0f2c28fb95b5e56886f77cb759ba Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Apr 2013 20:39:24 -0500
Subject: [ticket/11335] Replace "$phpEx" with $phpEx

PHPBB3-11335
---
 phpBB/includes/acp/acp_extensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 9b5a8da3aa..e4defa0400 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -54,7 +54,7 @@ class acp_extensions
 		// If they've specified an extension, let's load the metadata manager and validate it.
 		if ($ext_name)
 		{
-			$md_manager = new phpbb_extension_metadata_manager($ext_name, $db, $phpbb_extension_manager, $phpbb_root_path, "$phpEx", $template, $config);
+			$md_manager = new phpbb_extension_metadata_manager($ext_name, $db, $phpbb_extension_manager, $phpbb_root_path, $phpEx, $template, $config);
 
 			try
 			{
-- 
cgit v1.2.1


From e8b192fa32a4e7bba6d772075eb430424d0c4750 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 12:57:21 +0200
Subject: [ticket/11495] Do not compare to null anymore (left over from item
 class)

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index f3bdfe1c7d..9f83bd757c 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -194,14 +194,14 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		$result = $this->db->sql_query_limit($sql, $delta);
 
-		$target = null;
+		$target = false;
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$target = $row;
 		}
 		$this->db->sql_freeresult($result);
 
-		if (is_null($target))
+		if (!$target)
 		{
 			$this->lock->release();
 			// The item is already on top or bottom
-- 
cgit v1.2.1


From 61e72d3a1000c48146466305c6693595324f5282 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 13:09:00 +0200
Subject: [ticket/11495] Explain move() more

An item is only moved up/down within the same parent. If the delta is larger
then the number of children, the item is moved to the top/bottom of the list
of children within this parent.

PHPBB3-11495
---
 phpBB/includes/nestedset/interface.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
index aedd57821a..b8a2e4b239 100644
--- a/phpBB/includes/nestedset/interface.php
+++ b/phpBB/includes/nestedset/interface.php
@@ -56,6 +56,10 @@ interface phpbb_nestedset_interface
 	/**
 	* Move an item by a given delta
 	*
+	* An item is only moved up/down within the same parent. If the delta is
+	* larger then the number of children, the item is moved to the top/bottom
+	* of the list of children within this parent.
+	*
 	* @param int	$item_id	The item to be moved
 	* @param int	$delta		Number of steps to move this item, < 0 => down, > 0 => up
 	* @return bool True if the item was moved
-- 
cgit v1.2.1


From 4bff28a0eeaf44eae9e99725ead6ff2cf770b857 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 13:40:25 +0200
Subject: [ticket/11495] Rename fix function to regenerate_left_right_ids()

This method regenerates the left/right ids for the nested set based on the
parent/child relations. This function executes three queries per item, so
it should only be called, when the set has one of the following problems:
- The set has a duplicated value inside the left/right id chain
- The set has a missing value inside the left/right id chain
- The set has items that do not have a left/right is set

When regenerating the items, the items are sorted by parent id and their
current left id, so the current child/parent relationships are kept and
running the function on a working set will not change any orders.

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php      |  4 ++--
 phpBB/includes/nestedset/interface.php | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index 9f83bd757c..1a6b578e79 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -674,7 +674,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function recalculate_nested_set($new_id, $parent_id = 0, $reset_ids = false)
+	public function regenerate_left_right_ids($new_id, $parent_id = 0, $reset_ids = false)
 	{
 		if ($reset_ids)
 		{
@@ -716,7 +716,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			$new_id++;
 
 			// Then we go through any children and update their left/right id's
-			$new_id = $this->recalculate_nested_set($new_id, $row[$this->column_item_id]);
+			$new_id = $this->regenerate_left_right_ids($new_id, $row[$this->column_item_id]);
 
 			// Then we come back and update the right_id for this module
 			if ($row[$this->column_right_id] != $new_id)
diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
index b8a2e4b239..9948ccf019 100644
--- a/phpBB/includes/nestedset/interface.php
+++ b/phpBB/includes/nestedset/interface.php
@@ -124,12 +124,24 @@ interface phpbb_nestedset_interface
 	public function get_parent_data(array $item);
 
 	/**
-	* Recalculate Nested Sets
+	* Regenerate left/right ids from parent/child relationship
+	*
+	* This method regenerates the left/right ids for the nested set based on
+	* the parent/child relations. This function executes three queries per
+	* item, so it should only be called, when the set has one of the following
+	* problems:
+	*	- The set has a duplicated value inside the left/right id chain
+	*	- The set has a missing value inside the left/right id chain
+	*	- The set has items that do not have a left/right is set
+	*
+	* When regenerating the items, the items are sorted by parent id and their
+	* current left id, so the current child/parent relationships are kept
+	* and running the function on a working set will not change any orders.
 	*
 	* @param int	$new_id		First left_id to be used (should start with 1)
 	* @param int	$parent_id	parent_id of the current set (default = 0)
 	* @param bool	$reset_ids	Should we reset all left_id/right_id on the first call?
 	* @return	int		$new_id		The next left_id/right_id that should be used
 	*/
-	public function recalculate_nested_set($new_id, $parent_id = 0, $reset_ids = false);
+	public function regenerate_left_right_ids($new_id, $parent_id = 0, $reset_ids = false);
 }
-- 
cgit v1.2.1


From 3efae6d8af6dfe22c0790d3004fdbf20eb16a292 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 13:44:52 +0200
Subject: [ticket/11495] Explain whether move_children
 prepends/appends/overwrittes

PHPBB3-11495
---
 phpBB/includes/nestedset/interface.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
index 9948ccf019..9a8f9c4eea 100644
--- a/phpBB/includes/nestedset/interface.php
+++ b/phpBB/includes/nestedset/interface.php
@@ -85,6 +85,9 @@ interface phpbb_nestedset_interface
 	/**
 	* Moves all children of one item to another item
 	*
+	* If the new parent already has children, the new children are appended
+	* to the list.
+	*
 	* @param int	$current_parent_id	The current parent item
 	* @param int	$new_parent_id		The new parent item
 	* @return bool True if any items where moved
-- 
cgit v1.2.1


From ab7054445fbf397ae5bf4c13eb44a2019d71cc2d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 13:48:19 +0200
Subject: [ticket/11495] Rename set_parent to change_parent()

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php      | 2 +-
 phpBB/includes/nestedset/interface.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index 1a6b578e79..3817a6d217 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -388,7 +388,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function set_parent($item_id, $new_parent_id)
+	public function change_parent($item_id, $new_parent_id)
 	{
 		$item_id = (int) $item_id;
 		$new_parent_id = (int) $new_parent_id;
diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
index 9a8f9c4eea..a2dbc55c7d 100644
--- a/phpBB/includes/nestedset/interface.php
+++ b/phpBB/includes/nestedset/interface.php
@@ -95,13 +95,15 @@ interface phpbb_nestedset_interface
 	public function move_children($current_parent_id, $new_parent_id);
 
 	/**
-	* Set the parent item
+	* Change parent item
+	*
+	* Moves the item to the bottom of the new parent's list of children
 	*
 	* @param int	$item_id			The item to be moved
 	* @param int	$new_parent_id		The new parent item
 	* @return bool True if the parent was set successfully
 	*/
-	public function set_parent($item, $new_parent_id);
+	public function change_parent($item, $new_parent_id);
 
 	/**
 	* Get branch of the item
-- 
cgit v1.2.1


From fe97915fc91e4fbfb211e3eb6038dd1b482553dd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 14:05:41 +0200
Subject: [ticket/11495] Split get_branch_data into multiple methods

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php      | 56 +++++++++++++++++++++++-----------
 phpBB/includes/nestedset/interface.php | 27 +++++++++++++---
 2 files changed, 62 insertions(+), 21 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index 3817a6d217..fe6318304d 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -115,7 +115,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	*/
 	public function remove($item_id)
 	{
-		$items = $this->get_branch_data($item_id, 'children');
+		$items = $this->get_children_branch_data($item_id);
 		$item_ids = array_keys($items);
 
 		$this->remove_subset($item_ids, $items[$item_id]);
@@ -299,7 +299,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
-		$item_data = $this->get_branch_data($current_parent_id, 'children');
+		$item_data = $this->get_children_branch_data($current_parent_id);
 		if (!isset($item_data[$current_parent_id]))
 		{
 			$this->lock->release();
@@ -408,7 +408,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
-		$item_data = $this->get_branch_data($item_id, 'children');
+		$item_data = $this->get_children_branch_data($item_id);
 		if (!isset($item_data[$item_id]))
 		{
 			$this->lock->release();
@@ -490,24 +490,46 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	/**
 	* @inheritdoc
 	*/
-	public function get_branch_data($item_id, $type = 'all', $order_desc = true, $include_item = true)
+	public function get_full_branch_data($item_id, $order_desc = true, $include_item = true)
 	{
-		switch ($type)
-		{
-			case 'parents':
-				$condition = 'i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id . '';
-			break;
+		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '
+			OR i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id;
 
-			case 'children':
-				$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '';
-			break;
+		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
+	}
 
-			default:
-				$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '
-					OR i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id;
-			break;
-		}
+	/**
+	* @inheritdoc
+	*/
+	public function get_parent_branch_data($item_id, $order_desc = true, $include_item = true)
+	{
+		$condition = 'i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id . '';
+
+		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_children_branch_data($item_id, $order_desc = true, $include_item = true)
+	{
+		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '';
+
+		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
+	}
 
+	/**
+	* Get children and parent branch of the item
+	*
+	* @param int		$item_id		The item id to get the parents/children from
+	* @param string		$condition		Query string restricting the item list
+	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param bool		$include_item	Should the given item be included in the list aswell
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	protected function get_branch_data($item_id, $condition, $order_desc = true, $include_item = true)
+	{
 		$rows = array();
 
 		$sql = 'SELECT i2.*
diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
index a2dbc55c7d..ee78016425 100644
--- a/phpBB/includes/nestedset/interface.php
+++ b/phpBB/includes/nestedset/interface.php
@@ -106,18 +106,37 @@ interface phpbb_nestedset_interface
 	public function change_parent($item, $new_parent_id);
 
 	/**
-	* Get branch of the item
+	* Get children and parent branch of the item
 	*
-	* This method can return all parents, children or both of the given item
+	* @param int		$item_id		The item id to get the parents/children from
+	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param bool		$include_item	Should the given item be included in the list aswell
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_full_branch_data($item_id, $order_desc, $include_item);
+
+	/**
+	* Get parent branch of the item
 	*
 	* @param int		$item_id		The item id to get the parents from
-	* @param string		$type			One of all|parent|children
 	* @param bool		$order_desc		Order the items descending (most outer parent first)
 	* @param bool		$include_item	Should the given item be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-	public function get_branch_data($item_id, $type, $order_desc, $include_item);
+	public function get_parent_branch_data($item_id, $order_desc, $include_item);
+
+	/**
+	* Get children branch of the item
+	*
+	* @param int		$item_id		The item id to get the children from
+	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param bool		$include_item	Should the given item be included in the list aswell
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_children_branch_data($item_id, $order_desc, $include_item);
 
 	/**
 	* Get base information of parent items
-- 
cgit v1.2.1


From 9d7d962c0db3425e9448eb07649c6709664a56bd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 14:08:06 +0200
Subject: [ticket/11495] Explain what "given item" means

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php      | 2 +-
 phpBB/includes/nestedset/interface.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index fe6318304d..328621a68d 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -524,7 +524,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	* @param int		$item_id		The item id to get the parents/children from
 	* @param string		$condition		Query string restricting the item list
 	* @param bool		$order_desc		Order the items descending (most outer parent first)
-	* @param bool		$include_item	Should the given item be included in the list aswell
+	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
index ee78016425..eadc9083b1 100644
--- a/phpBB/includes/nestedset/interface.php
+++ b/phpBB/includes/nestedset/interface.php
@@ -110,7 +110,7 @@ interface phpbb_nestedset_interface
 	*
 	* @param int		$item_id		The item id to get the parents/children from
 	* @param bool		$order_desc		Order the items descending (most outer parent first)
-	* @param bool		$include_item	Should the given item be included in the list aswell
+	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
@@ -121,7 +121,7 @@ interface phpbb_nestedset_interface
 	*
 	* @param int		$item_id		The item id to get the parents from
 	* @param bool		$order_desc		Order the items descending (most outer parent first)
-	* @param bool		$include_item	Should the given item be included in the list aswell
+	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
@@ -132,7 +132,7 @@ interface phpbb_nestedset_interface
 	*
 	* @param int		$item_id		The item id to get the children from
 	* @param bool		$order_desc		Order the items descending (most outer parent first)
-	* @param bool		$include_item	Should the given item be included in the list aswell
+	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-- 
cgit v1.2.1


From 804f139be0534691fc1c8f6ddaf7ebc68a7d0a1c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 16:17:58 +0200
Subject: [ticket/11495] Use default exceptions

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php      | 28 ++++++++++++++--------------
 phpBB/includes/nestedset/exception.php | 20 --------------------
 2 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 phpBB/includes/nestedset/exception.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index 328621a68d..da6c056313 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -150,7 +150,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		if (!$this->lock->acquire())
 		{
-			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
 		$action = ($delta > 0) ? 'move_up' : 'move_down';
@@ -168,7 +168,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		if (!$item)
 		{
 			$this->lock->release();
-			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_ITEM');
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
 		/**
@@ -291,19 +291,19 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		if (!$current_parent_id)
 		{
-			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_ITEM');
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
 		if (!$this->lock->acquire())
 		{
-			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
 		$item_data = $this->get_children_branch_data($current_parent_id);
 		if (!isset($item_data[$current_parent_id]))
 		{
 			$this->lock->release();
-			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_ITEM');
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
 		$current_parent = $item_data[$current_parent_id];
@@ -319,7 +319,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		if (in_array($new_parent_id, $move_items))
 		{
 			$this->lock->release();
-			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_PARENT');
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 		}
 
 		$diff = sizeof($move_items) * 2;
@@ -343,7 +343,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			{
 				$this->db->sql_transaction('rollback');
 				$this->lock->release();
-				throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_PARENT');
+				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 			}
 
 			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
@@ -400,19 +400,19 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 
 		if (!$item_id)
 		{
-			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_ITEM');
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
 		if (!$this->lock->acquire())
 		{
-			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
 		$item_data = $this->get_children_branch_data($item_id);
 		if (!isset($item_data[$item_id]))
 		{
 			$this->lock->release();
-			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_ITEM');
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
 		$item = $item_data[$item_id];
@@ -421,7 +421,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		if (in_array($new_parent_id, $move_items))
 		{
 			$this->lock->release();
-			throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_PARENT');
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 		}
 
 		$diff = sizeof($move_items) * 2;
@@ -445,7 +445,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 			{
 				$this->db->sql_transaction('rollback');
 				$this->lock->release();
-				throw new phpbb_nestedset_exception($this->message_prefix . 'INVALID_PARENT');
+				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 			}
 
 			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
@@ -612,7 +612,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	{
 		if (!$table_already_locked && !$this->lock->acquire())
 		{
-			throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
 		$diff = sizeof($subset_items) * 2;
@@ -702,7 +702,7 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 		{
 			if (!$this->lock->acquire())
 			{
-				throw new phpbb_nestedset_exception($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+				throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 			}
 			$this->db->sql_transaction('begin');
 
diff --git a/phpBB/includes/nestedset/exception.php b/phpBB/includes/nestedset/exception.php
deleted file mode 100644
index 10937d0b29..0000000000
--- a/phpBB/includes/nestedset/exception.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
-*
-* @package Nested Set
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class phpbb_nestedset_exception extends \Exception
-{
-}
-- 
cgit v1.2.1


From c72f5bf48704675b673e1eae26c9bf9471fc72ed Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 16:23:47 +0200
Subject: [ticket/11495] Explain use of set_subset_zero on remove_subset()

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
index da6c056313..cb06a0dabe 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/nestedset/base.php
@@ -603,8 +603,10 @@ abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
 	* Remove a subset from the nested set
 	*
 	* @param array	$subset_items		Subset of items to remove
-	* @param array	$bounding_item	Item containing the right bound of the subset
-	* @param bool	$set_subset_zero	Should the parent, left and right id of the item be set to 0, or kept unchanged?
+	* @param array	$bounding_item		Item containing the right bound of the subset
+	* @param bool	$set_subset_zero	Should the parent, left and right id of the items be set to 0, or kept unchanged?
+	*									In case of removing an item from the tree, we should the values to 0
+	*									In case of moving an item, we shouldkeep the original values, in order to allow "+ diff" later
 	* @param bool	$table_already_locked	Is the table already locked, or should we acquire a new lock?
 	* @return	null
 	*/
-- 
cgit v1.2.1


From b334a2ce0fe3ae196da9686028667c430eb411d1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 17:04:37 +0200
Subject: [ticket/11495] Move classes to tree/ as they all implement a tree

PHPBB3-11495
---
 phpBB/includes/nestedset/base.php       | 766 --------------------------------
 phpBB/includes/nestedset/forum.php      |  52 ---
 phpBB/includes/nestedset/interface.php  | 171 -------
 phpBB/includes/tree/interface.php       | 171 +++++++
 phpBB/includes/tree/nestedset.php       | 766 ++++++++++++++++++++++++++++++++
 phpBB/includes/tree/nestedset_forum.php |  52 +++
 6 files changed, 989 insertions(+), 989 deletions(-)
 delete mode 100644 phpBB/includes/nestedset/base.php
 delete mode 100644 phpBB/includes/nestedset/forum.php
 delete mode 100644 phpBB/includes/nestedset/interface.php
 create mode 100644 phpBB/includes/tree/interface.php
 create mode 100644 phpBB/includes/tree/nestedset.php
 create mode 100644 phpBB/includes/tree/nestedset_forum.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/nestedset/base.php
deleted file mode 100644
index cb06a0dabe..0000000000
--- a/phpBB/includes/nestedset/base.php
+++ /dev/null
@@ -1,766 +0,0 @@
-<?php
-/**
-*
-* @package Nested Set
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
-{
-	/** @var phpbb_db_driver */
-	protected $db;
-
-	/** @var phpbb_lock_db */
-	protected $lock;
-
-	/** @var string */
-	protected $table_name;
-
-	/**
-	* Prefix for the language keys returned by exceptions
-	* @var string
-	*/
-	protected $message_prefix = '';
-
-	/**
-	* Column names in the table
-	* @var string
-	*/
-	protected $column_item_id = 'item_id';
-	protected $column_left_id = 'left_id';
-	protected $column_right_id = 'right_id';
-	protected $column_parent_id = 'parent_id';
-	protected $column_item_parents = 'item_parents';
-
-	/**
-	* Additional SQL restrictions
-	* Allows to have multiple nested sets in one table
-	* @var string
-	*/
-	protected $sql_where = '';
-
-	/**
-	* List of item properties to be cached in $item_parents
-	* @var array
-	*/
-	protected $item_basic_data = array('*');
-
-	/**
-	* Returns additional sql where restrictions
-	*
-	* @param string		$operator		SQL operator that needs to be prepended to sql_where,
-	*									if it is not empty.
-	* @param string		$column_prefix	Prefix that needs to be prepended to column names
-	* @return bool True if the item was deleted
-	*/
-	public function get_sql_where($operator = 'AND', $column_prefix = '')
-	{
-		return (!$this->sql_where) ? '' : $operator . ' ' . sprintf($this->sql_where, $column_prefix);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function insert(array $additional_data)
-	{
-		$item_data = $this->reset_nestedset_values($additional_data);
-
-		$sql = 'INSERT INTO ' . $this->table_name . ' ' . $this->db->sql_build_array('INSERT', $item_data);
-		$this->db->sql_query($sql);
-
-		$item_data[$this->column_item_id] = (int) $this->db->sql_nextid();
-
-		return array_merge($item_data, $this->add($item_data));
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function add(array $item)
-	{
-		$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
-			FROM ' . $this->table_name . '
-			' . $this->get_sql_where('WHERE');
-		$result = $this->db->sql_query($sql);
-		$current_max_right_id = (int) $this->db->sql_fetchfield($this->column_right_id);
-		$this->db->sql_freeresult($result);
-
-		$update_item_data = array(
-			$this->column_parent_id		=> 0,
-			$this->column_left_id		=> $current_max_right_id + 1,
-			$this->column_right_id		=> $current_max_right_id + 2,
-			$this->column_item_parents	=> '',
-		);
-
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->db->sql_build_array('UPDATE', $update_item_data) . '
-			WHERE ' . $this->column_item_id . ' = ' . (int) $item[$this->column_item_id];
-		$this->db->sql_query($sql);
-
-		return $update_item_data;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function remove($item_id)
-	{
-		$items = $this->get_children_branch_data($item_id);
-		$item_ids = array_keys($items);
-
-		$this->remove_subset($item_ids, $items[$item_id]);
-
-		return $item_ids;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function delete($item_id)
-	{
-		$removed_items = $this->remove($item_id);
-
-		$sql = 'DELETE FROM ' . $this->table_name . '
-			WHERE ' . $this->db->sql_in_set($this->column_item_id, $removed_items) . '
-			' . $this->get_sql_where('AND');
-		$this->db->sql_query($sql);
-
-		return $removed_items;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function move($item_id, $delta)
-	{
-		if ($delta == 0)
-		{
-			return false;
-		}
-
-		if (!$this->lock->acquire())
-		{
-			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
-		}
-
-		$action = ($delta > 0) ? 'move_up' : 'move_down';
-		$delta = abs($delta);
-
-		// Keep $this->get_sql_where() here, to ensure we are in the right tree.
-		$sql = 'SELECT *
-			FROM ' . $this->table_name . '
-			WHERE ' . $this->column_item_id . ' = ' . (int) $item_id . '
-				' . $this->get_sql_where();
-		$result = $this->db->sql_query_limit($sql, $delta);
-		$item = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (!$item)
-		{
-			$this->lock->release();
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		/**
-		* Fetch all the siblings between the item's current spot
-		* and where we want to move it to. If there are less than $delta
-		* siblings between the current spot and the target then the
-		* item will move as far as possible
-		*/
-		$sql = "SELECT {$this->column_item_id}, {$this->column_parent_id}, {$this->column_left_id}, {$this->column_right_id}, {$this->column_item_parents}
-			FROM " . $this->table_name . '
-			WHERE ' . $this->column_parent_id . ' = ' . (int) $item[$this->column_parent_id] . '
-				' . $this->get_sql_where() . '
-				AND ';
-
-		if ($action == 'move_up')
-		{
-			$sql .= $this->column_right_id . ' < ' . (int) $item[$this->column_right_id] . ' ORDER BY ' . $this->column_right_id . ' DESC';
-		}
-		else
-		{
-			$sql .= $this->column_left_id . ' > ' . (int) $item[$this->column_left_id] . ' ORDER BY ' . $this->column_left_id . ' ASC';
-		}
-
-		$result = $this->db->sql_query_limit($sql, $delta);
-
-		$target = false;
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$target = $row;
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!$target)
-		{
-			$this->lock->release();
-			// The item is already on top or bottom
-			return false;
-		}
-
-		/**
-		* $left_id and $right_id define the scope of the items that are affected by the move.
-		* $diff_up and $diff_down are the values to substract or add to each item's left_id
-		* and right_id in order to move them up or down.
-		* $move_up_left and $move_up_right define the scope of the items that are moving
-		* up. Other items in the scope of ($left_id, $right_id) are considered to move down.
-		*/
-		if ($action == 'move_up')
-		{
-			$left_id = (int) $target[$this->column_left_id];
-			$right_id = (int) $item[$this->column_right_id];
-
-			$diff_up = (int) $item[$this->column_left_id] - (int) $target[$this->column_left_id];
-			$diff_down = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
-
-			$move_up_left = (int) $item[$this->column_left_id];
-			$move_up_right = (int) $item[$this->column_right_id];
-		}
-		else
-		{
-			$left_id = (int) $item[$this->column_left_id];
-			$right_id = (int) $target[$this->column_right_id];
-
-			$diff_up = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
-			$diff_down = (int) $target[$this->column_right_id] - (int) $item[$this->column_right_id];
-
-			$move_up_left = (int) $item[$this->column_right_id] + 1;
-			$move_up_right = (int) $target[$this->column_right_id];
-		}
-
-		// Now do the dirty job
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . ' + CASE
-				WHEN ' . $this->column_left_id . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
-				ELSE {$diff_down}
-			END,
-			" . $this->column_right_id . ' = ' . $this->column_right_id . ' + CASE
-				WHEN ' . $this->column_right_id . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
-				ELSE {$diff_down}
-			END,
-			" . $this->column_item_parents . " = ''
-			WHERE
-				" . $this->column_left_id . " BETWEEN {$left_id} AND {$right_id}
-				AND " . $this->column_right_id . " BETWEEN {$left_id} AND {$right_id}
-				" . $this->get_sql_where();
-		$this->db->sql_query($sql);
-
-		$this->lock->release();
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function move_down($item_id)
-	{
-		return $this->move($item_id, -1);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function move_up($item_id)
-	{
-		return $this->move($item_id, 1);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function move_children($current_parent_id, $new_parent_id)
-	{
-		$current_parent_id = (int) $current_parent_id;
-		$new_parent_id = (int) $new_parent_id;
-
-		if ($current_parent_id == $new_parent_id)
-		{
-			return false;
-		}
-
-		if (!$current_parent_id)
-		{
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		if (!$this->lock->acquire())
-		{
-			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
-		}
-
-		$item_data = $this->get_children_branch_data($current_parent_id);
-		if (!isset($item_data[$current_parent_id]))
-		{
-			$this->lock->release();
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		$current_parent = $item_data[$current_parent_id];
-		unset($item_data[$current_parent_id]);
-		$move_items = array_keys($item_data);
-
-		if (($current_parent[$this->column_right_id] - $current_parent[$this->column_left_id]) <= 1)
-		{
-			$this->lock->release();
-			return false;
-		}
-
-		if (in_array($new_parent_id, $move_items))
-		{
-			$this->lock->release();
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
-		}
-
-		$diff = sizeof($move_items) * 2;
-		$sql_exclude_moved_items = $this->db->sql_in_set($this->column_item_id, $move_items, true);
-
-		$this->db->sql_transaction('begin');
-
-		$this->remove_subset($move_items, $current_parent, false, true);
-
-		if ($new_parent_id)
-		{
-			// Retrieve new-parent again, it may have been changed...
-			$sql = 'SELECT *
-				FROM ' . $this->table_name . '
-				WHERE ' . $this->column_item_id . ' = ' . $new_parent_id;
-			$result = $this->db->sql_query($sql);
-			$new_parent = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$new_parent)
-			{
-				$this->db->sql_transaction('rollback');
-				$this->lock->release();
-				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
-			}
-
-			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
-
-			if ($new_right_id > $current_parent[$this->column_right_id])
-			{
-				$diff = ' + ' . ($new_right_id - $current_parent[$this->column_right_id]);
-			}
-			else
-			{
-				$diff = ' - ' . abs($new_right_id - $current_parent[$this->column_right_id]);
-			}
-		}
-		else
-		{
-			$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
-				FROM ' . $this->table_name . '
-				WHERE ' . $sql_exclude_moved_items . '
-					' . $this->get_sql_where('AND');
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			$diff = ' + ' . ($row[$this->column_right_id] - $current_parent[$this->column_left_id]);
-		}
-
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
-				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
-				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_parent_id . ' = ' . $current_parent_id, $new_parent_id, $this->column_parent_id) . ',
-				' . $this->column_item_parents . " = ''
-			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
-				' . $this->get_sql_where('AND');
-		$this->db->sql_query($sql);
-
-		$this->db->sql_transaction('commit');
-		$this->lock->release();
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function change_parent($item_id, $new_parent_id)
-	{
-		$item_id = (int) $item_id;
-		$new_parent_id = (int) $new_parent_id;
-
-		if ($item_id == $new_parent_id)
-		{
-			return false;
-		}
-
-		if (!$item_id)
-		{
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		if (!$this->lock->acquire())
-		{
-			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
-		}
-
-		$item_data = $this->get_children_branch_data($item_id);
-		if (!isset($item_data[$item_id]))
-		{
-			$this->lock->release();
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		$item = $item_data[$item_id];
-		$move_items = array_keys($item_data);
-
-		if (in_array($new_parent_id, $move_items))
-		{
-			$this->lock->release();
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
-		}
-
-		$diff = sizeof($move_items) * 2;
-		$sql_exclude_moved_items = $this->db->sql_in_set($this->column_item_id, $move_items, true);
-
-		$this->db->sql_transaction('begin');
-
-		$this->remove_subset($move_items, $item, false, true);
-
-		if ($new_parent_id)
-		{
-			// Retrieve new-parent again, it may have been changed...
-			$sql = 'SELECT *
-				FROM ' . $this->table_name . '
-				WHERE ' . $this->column_item_id . ' = ' . $new_parent_id;
-			$result = $this->db->sql_query($sql);
-			$new_parent = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$new_parent)
-			{
-				$this->db->sql_transaction('rollback');
-				$this->lock->release();
-				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
-			}
-
-			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
-
-			if ($new_right_id > (int) $item[$this->column_right_id])
-			{
-				$diff = ' + ' . ($new_right_id - (int) $item[$this->column_right_id] - 1);
-			}
-			else
-			{
-				$diff = ' - ' . abs($new_right_id - (int) $item[$this->column_right_id] - 1);
-			}
-		}
-		else
-		{
-			$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
-				FROM ' . $this->table_name . '
-				WHERE ' . $sql_exclude_moved_items . '
-					' . $this->get_sql_where('AND');
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			$diff = ' + ' . ($row[$this->column_right_id] - (int) $item[$this->column_left_id] + 1);
-		}
-
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
-				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
-				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_item_id . ' = ' . $item_id, $new_parent_id, $this->column_parent_id) . ',
-				' . $this->column_item_parents . " = ''
-			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
-				' . $this->get_sql_where('AND');
-		$this->db->sql_query($sql);
-
-		$this->db->sql_transaction('commit');
-		$this->lock->release();
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_full_branch_data($item_id, $order_desc = true, $include_item = true)
-	{
-		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '
-			OR i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id;
-
-		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_parent_branch_data($item_id, $order_desc = true, $include_item = true)
-	{
-		$condition = 'i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id . '';
-
-		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_children_branch_data($item_id, $order_desc = true, $include_item = true)
-	{
-		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '';
-
-		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
-	}
-
-	/**
-	* Get children and parent branch of the item
-	*
-	* @param int		$item_id		The item id to get the parents/children from
-	* @param string		$condition		Query string restricting the item list
-	* @param bool		$order_desc		Order the items descending (most outer parent first)
-	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
-	* @return array			Array of items (containing all columns from the item table)
-	*							ID => Item data
-	*/
-	protected function get_branch_data($item_id, $condition, $order_desc = true, $include_item = true)
-	{
-		$rows = array();
-
-		$sql = 'SELECT i2.*
-			FROM ' . $this->table_name . ' i1
-			LEFT JOIN ' . $this->table_name . " i2
-				ON (($condition) " . $this->get_sql_where('AND', 'i2.') . ')
-			WHERE i1.' . $this->column_item_id . ' = ' . (int) $item_id . '
-				' . $this->get_sql_where('AND', 'i1.') . '
-			ORDER BY i2.' . $this->column_left_id . ' ' . ($order_desc ? 'ASC' : 'DESC');
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (!$include_item && $item_id == $row[$this->column_item_id])
-			{
-				continue;
-			}
-
-			$rows[(int) $row[$this->column_item_id]] = $row;
-		}
-		$this->db->sql_freeresult($result);
-
-		return $rows;
-	}
-
-	/**
-	* Get base information of parent items
-	*
-	* Data is cached in the item_parents column in the item table
-	*
-	* @inheritdoc
-	*/
-	public function get_parent_data(array $item)
-	{
-		$parents = array();
-		if ((int) $item[$this->column_parent_id])
-		{
-			if (!$item[$this->column_item_parents])
-			{
-				$sql = 'SELECT ' . implode(', ', $this->item_basic_data) . '
-					FROM ' . $this->table_name . '
-					WHERE ' . $this->column_left_id . ' < ' . (int) $item[$this->column_left_id] . '
-						AND ' . $this->column_right_id . ' > ' . (int) $item[$this->column_right_id] . '
-						' . $this->get_sql_where('AND') . '
-					ORDER BY ' . $this->column_left_id . ' ASC';
-				$result = $this->db->sql_query($sql);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$parents[$row[$this->column_item_id]] = $row;
-				}
-				$this->db->sql_freeresult($result);
-
-				$item_parents = serialize($parents);
-
-				$sql = 'UPDATE ' . $this->table_name . '
-					SET ' . $this->column_item_parents . " = '" . $this->db->sql_escape($item_parents) . "'
-					WHERE " . $this->column_parent_id . ' = ' . (int) $item[$this->column_parent_id];
-				$this->db->sql_query($sql);
-			}
-			else
-			{
-				$parents = unserialize($item[$this->column_item_parents]);
-			}
-		}
-
-		return $parents;
-	}
-
-	/**
-	* Remove a subset from the nested set
-	*
-	* @param array	$subset_items		Subset of items to remove
-	* @param array	$bounding_item		Item containing the right bound of the subset
-	* @param bool	$set_subset_zero	Should the parent, left and right id of the items be set to 0, or kept unchanged?
-	*									In case of removing an item from the tree, we should the values to 0
-	*									In case of moving an item, we shouldkeep the original values, in order to allow "+ diff" later
-	* @param bool	$table_already_locked	Is the table already locked, or should we acquire a new lock?
-	* @return	null
-	*/
-	protected function remove_subset(array $subset_items, array $bounding_item, $set_subset_zero = true, $table_already_locked = false)
-	{
-		if (!$table_already_locked && !$this->lock->acquire())
-		{
-			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
-		}
-
-		$diff = sizeof($subset_items) * 2;
-		$sql_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items);
-		$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
-
-		$sql_is_parent = $this->column_left_id . ' <= ' . (int) $bounding_item[$this->column_right_id] . '
-			AND ' . $this->column_right_id . ' >= ' . (int) $bounding_item[$this->column_right_id];
-
-		$sql_is_right = $this->column_left_id . ' > ' . (int) $bounding_item[$this->column_right_id];
-
-		$set_left_id = $this->db->sql_case($sql_is_right, $this->column_left_id . ' - ' . $diff, $this->column_left_id);
-		$set_right_id = $this->db->sql_case($sql_is_parent . ' OR ' . $sql_is_right, $this->column_right_id . ' - ' . $diff, $this->column_right_id);
-
-		if ($set_subset_zero)
-		{
-			$set_left_id = $this->db->sql_case($sql_subset_items, 0, $set_left_id);
-			$set_right_id = $this->db->sql_case($sql_subset_items, 0, $set_right_id);
-		}
-
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->column_left_id . ' = ' . $set_left_id . ',
-				' . $this->column_right_id . ' = ' . $set_right_id . ',
-				' . (($set_subset_zero) ? $this->column_parent_id . ' = ' . $this->db->sql_case($sql_subset_items, 0, $this->column_parent_id) . ',' : '') . '
-				' . $this->column_item_parents . " = ''
-			" . ((!$set_subset_zero) ? ' WHERE ' . $sql_not_subset_items . ' ' . $this->get_sql_where('AND') : $this->get_sql_where('WHERE'));
-		$this->db->sql_query($sql);
-
-		if (!$table_already_locked)
-		{
-			$this->lock->release();
-		}
-	}
-
-	/**
-	* Add a subset to the nested set
-	*
-	* @param array	$subset_items		Subset of items to add
-	* @param array	$new_parent	Item containing the right bound of the new parent
-	* @return	int		New right id of the parent item
-	*/
-	protected function prepare_adding_subset(array $subset_items, array $new_parent)
-	{
-		$diff = sizeof($subset_items) * 2;
-		$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
-
-		$set_left_id = $this->db->sql_case($this->column_left_id . ' > ' . (int) $new_parent[$this->column_right_id], $this->column_left_id . ' + ' . $diff, $this->column_left_id);
-		$set_right_id = $this->db->sql_case($this->column_right_id . ' >= ' . (int) $new_parent[$this->column_right_id], $this->column_right_id . ' + ' . $diff, $this->column_right_id);
-
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->column_left_id . ' = ' . $set_left_id . ',
-				' . $this->column_right_id . ' = ' . $set_right_id . ',
-				' . $this->column_item_parents . " = ''
-			WHERE " . $sql_not_subset_items . '
-				' . $this->get_sql_where('AND');
-		$this->db->sql_query($sql);
-
-		return $new_parent[$this->column_right_id] + $diff;
-	}
-
-	/**
-	* Resets values required for the nested set system
-	*
-	* @param array	$item		Original item data
-	* @return	array		Original item data + nested set defaults
-	*/
-	protected function reset_nestedset_values(array $item)
-	{
-		$item_data = array_merge($item, array(
-			$this->column_parent_id		=> 0,
-			$this->column_left_id		=> 0,
-			$this->column_right_id		=> 0,
-			$this->column_item_parents	=> '',
-		));
-
-		unset($item_data[$this->column_item_id]);
-
-		return $item_data;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function regenerate_left_right_ids($new_id, $parent_id = 0, $reset_ids = false)
-	{
-		if ($reset_ids)
-		{
-			if (!$this->lock->acquire())
-			{
-				throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
-			}
-			$this->db->sql_transaction('begin');
-
-			$sql = 'UPDATE ' . $this->table_name . '
-				SET ' . $this->db->sql_build_array('UPDATE', array(
-					$this->column_left_id		=> 0,
-					$this->column_right_id		=> 0,
-					$this->column_item_parents	=> '',
-				)) . '
-				' . $this->get_sql_where('WHERE');
-			$this->db->sql_query($sql);
-		}
-
-		$sql = 'SELECT *
-			FROM ' . $this->table_name . '
-			WHERE ' . $this->column_parent_id . ' = ' . (int) $parent_id . '
-				' . $this->get_sql_where('AND') . '
-			ORDER BY ' . $this->column_left_id . ', ' . $this->column_item_id . ' ASC';
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			// First we update the left_id for this module
-			if ($row[$this->column_left_id] != $new_id)
-			{
-				$sql = 'UPDATE ' . $this->table_name . '
-					SET ' . $this->db->sql_build_array('UPDATE', array(
-						$this->column_left_id		=> $new_id,
-						$this->column_item_parents	=> '',
-					)) . '
-					WHERE ' . $this->column_item_id . ' = ' . (int) $row[$this->column_item_id];
-				$this->db->sql_query($sql);
-			}
-			$new_id++;
-
-			// Then we go through any children and update their left/right id's
-			$new_id = $this->regenerate_left_right_ids($new_id, $row[$this->column_item_id]);
-
-			// Then we come back and update the right_id for this module
-			if ($row[$this->column_right_id] != $new_id)
-			{
-				$sql = 'UPDATE ' . $this->table_name . '
-					SET ' . $this->db->sql_build_array('UPDATE', array($this->column_right_id => $new_id)) . '
-					WHERE ' . $this->column_item_id . ' = ' . (int) $row[$this->column_item_id];
-				$this->db->sql_query($sql);
-			}
-			$new_id++;
-		}
-		$this->db->sql_freeresult($result);
-
-
-		if ($reset_ids)
-		{
-			$this->db->sql_transaction('commit');
-			$this->lock->release();
-		}
-
-		return $new_id;
-	}
-}
diff --git a/phpBB/includes/nestedset/forum.php b/phpBB/includes/nestedset/forum.php
deleted file mode 100644
index dbf0e70202..0000000000
--- a/phpBB/includes/nestedset/forum.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
-*
-* @package Nested Set
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class phpbb_nestedset_forum extends phpbb_nestedset_base
-{
-	/**
-	* Column names in the table
-	* @var string
-	*/
-	protected $column_item_id = 'forum_id';
-	protected $column_item_parents = 'forum_parents';
-
-	/**
-	* Prefix for the language keys returned by exceptions
-	* @var string
-	*/
-	protected $message_prefix = 'FORUM_NESTEDSET_';
-
-	/**
-	* List of item properties to be cached in $item_parents
-	* @var array
-	*/
-	protected $item_basic_data = array('forum_id', 'forum_name', 'forum_type');
-
-	/**
-	* Construct
-	*
-	* @param phpbb_db_driver	$db		Database connection
-	* @param phpbb_lock_db		$lock	Lock class used to lock the table when moving forums around
-	* @param string				$table_name		Table name
-	*/
-	public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name)
-	{
-		$this->db = $db;
-		$this->lock = $lock;
-		$this->table_name = $table_name;
-	}
-}
diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/nestedset/interface.php
deleted file mode 100644
index eadc9083b1..0000000000
--- a/phpBB/includes/nestedset/interface.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
-*
-* @package Nested Set
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-interface phpbb_nestedset_interface
-{
-	/**
-	* Insert an item into the nested set (also insert the rows into the table)
-	*
-	* @param array	$item	The item to be added
-	* @return array Array with item data as set in the database
-	*/
-	public function insert(array $additional_data);
-
-	/**
-	* Add an item at the end of the nested set
-	*
-	* @param array	$item	The item to be added
-	* @return bool True if the item was added
-	*/
-	public function add(array $item);
-
-	/**
-	* Remove an item from the nested set
-	*
-	* Also removes all subitems from the nested set
-	*
-	* @param int	$item_id	The item to be deleted
-	* @return array		Item ids that have been removed
-	*/
-	public function remove($item);
-
-	/**
-	* Delete an item from the nested set (also deletes the rows form the table)
-	*
-	* Also deletes all subitems from the nested set
-	*
-	* @param int	$item_id	The item to be deleted
-	* @return array		Item ids that have been deleted
-	*/
-	public function delete($item);
-
-	/**
-	* Move an item by a given delta
-	*
-	* An item is only moved up/down within the same parent. If the delta is
-	* larger then the number of children, the item is moved to the top/bottom
-	* of the list of children within this parent.
-	*
-	* @param int	$item_id	The item to be moved
-	* @param int	$delta		Number of steps to move this item, < 0 => down, > 0 => up
-	* @return bool True if the item was moved
-	*/
-	public function move($item_id, $delta);
-
-	/**
-	* Move an item down by 1
-	*
-	* @param int	$item_id	The item to be moved
-	* @return bool True if the item was moved
-	*/
-	public function move_down($item_id);
-
-	/**
-	* Move an item up by 1
-	*
-	* @param int	$item_id	The item to be moved
-	* @return bool True if the item was moved
-	*/
-	public function move_up($item_id);
-
-	/**
-	* Moves all children of one item to another item
-	*
-	* If the new parent already has children, the new children are appended
-	* to the list.
-	*
-	* @param int	$current_parent_id	The current parent item
-	* @param int	$new_parent_id		The new parent item
-	* @return bool True if any items where moved
-	*/
-	public function move_children($current_parent_id, $new_parent_id);
-
-	/**
-	* Change parent item
-	*
-	* Moves the item to the bottom of the new parent's list of children
-	*
-	* @param int	$item_id			The item to be moved
-	* @param int	$new_parent_id		The new parent item
-	* @return bool True if the parent was set successfully
-	*/
-	public function change_parent($item, $new_parent_id);
-
-	/**
-	* Get children and parent branch of the item
-	*
-	* @param int		$item_id		The item id to get the parents/children from
-	* @param bool		$order_desc		Order the items descending (most outer parent first)
-	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
-	* @return array			Array of items (containing all columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_full_branch_data($item_id, $order_desc, $include_item);
-
-	/**
-	* Get parent branch of the item
-	*
-	* @param int		$item_id		The item id to get the parents from
-	* @param bool		$order_desc		Order the items descending (most outer parent first)
-	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
-	* @return array			Array of items (containing all columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_parent_branch_data($item_id, $order_desc, $include_item);
-
-	/**
-	* Get children branch of the item
-	*
-	* @param int		$item_id		The item id to get the children from
-	* @param bool		$order_desc		Order the items descending (most outer parent first)
-	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
-	* @return array			Array of items (containing all columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_children_branch_data($item_id, $order_desc, $include_item);
-
-	/**
-	* Get base information of parent items
-	*
-	* @param array	$item		The item to get the branch from
-	* @return array			Array of items (containing basic columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_parent_data(array $item);
-
-	/**
-	* Regenerate left/right ids from parent/child relationship
-	*
-	* This method regenerates the left/right ids for the nested set based on
-	* the parent/child relations. This function executes three queries per
-	* item, so it should only be called, when the set has one of the following
-	* problems:
-	*	- The set has a duplicated value inside the left/right id chain
-	*	- The set has a missing value inside the left/right id chain
-	*	- The set has items that do not have a left/right is set
-	*
-	* When regenerating the items, the items are sorted by parent id and their
-	* current left id, so the current child/parent relationships are kept
-	* and running the function on a working set will not change any orders.
-	*
-	* @param int	$new_id		First left_id to be used (should start with 1)
-	* @param int	$parent_id	parent_id of the current set (default = 0)
-	* @param bool	$reset_ids	Should we reset all left_id/right_id on the first call?
-	* @return	int		$new_id		The next left_id/right_id that should be used
-	*/
-	public function regenerate_left_right_ids($new_id, $parent_id = 0, $reset_ids = false);
-}
diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
new file mode 100644
index 0000000000..fd10bd357f
--- /dev/null
+++ b/phpBB/includes/tree/interface.php
@@ -0,0 +1,171 @@
+<?php
+/**
+*
+* @package Tree
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+interface phpbb_tree_interface
+{
+	/**
+	* Insert an item into the nested set (also insert the rows into the table)
+	*
+	* @param array	$item	The item to be added
+	* @return array Array with item data as set in the database
+	*/
+	public function insert(array $additional_data);
+
+	/**
+	* Add an item at the end of the nested set
+	*
+	* @param array	$item	The item to be added
+	* @return bool True if the item was added
+	*/
+	public function add(array $item);
+
+	/**
+	* Remove an item from the nested set
+	*
+	* Also removes all subitems from the nested set
+	*
+	* @param int	$item_id	The item to be deleted
+	* @return array		Item ids that have been removed
+	*/
+	public function remove($item);
+
+	/**
+	* Delete an item from the nested set (also deletes the rows form the table)
+	*
+	* Also deletes all subitems from the nested set
+	*
+	* @param int	$item_id	The item to be deleted
+	* @return array		Item ids that have been deleted
+	*/
+	public function delete($item);
+
+	/**
+	* Move an item by a given delta
+	*
+	* An item is only moved up/down within the same parent. If the delta is
+	* larger then the number of children, the item is moved to the top/bottom
+	* of the list of children within this parent.
+	*
+	* @param int	$item_id	The item to be moved
+	* @param int	$delta		Number of steps to move this item, < 0 => down, > 0 => up
+	* @return bool True if the item was moved
+	*/
+	public function move($item_id, $delta);
+
+	/**
+	* Move an item down by 1
+	*
+	* @param int	$item_id	The item to be moved
+	* @return bool True if the item was moved
+	*/
+	public function move_down($item_id);
+
+	/**
+	* Move an item up by 1
+	*
+	* @param int	$item_id	The item to be moved
+	* @return bool True if the item was moved
+	*/
+	public function move_up($item_id);
+
+	/**
+	* Moves all children of one item to another item
+	*
+	* If the new parent already has children, the new children are appended
+	* to the list.
+	*
+	* @param int	$current_parent_id	The current parent item
+	* @param int	$new_parent_id		The new parent item
+	* @return bool True if any items where moved
+	*/
+	public function move_children($current_parent_id, $new_parent_id);
+
+	/**
+	* Change parent item
+	*
+	* Moves the item to the bottom of the new parent's list of children
+	*
+	* @param int	$item_id			The item to be moved
+	* @param int	$new_parent_id		The new parent item
+	* @return bool True if the parent was set successfully
+	*/
+	public function change_parent($item, $new_parent_id);
+
+	/**
+	* Get children and parent branch of the item
+	*
+	* @param int		$item_id		The item id to get the parents/children from
+	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_full_branch_data($item_id, $order_desc, $include_item);
+
+	/**
+	* Get parent branch of the item
+	*
+	* @param int		$item_id		The item id to get the parents from
+	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_parent_branch_data($item_id, $order_desc, $include_item);
+
+	/**
+	* Get children branch of the item
+	*
+	* @param int		$item_id		The item id to get the children from
+	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_children_branch_data($item_id, $order_desc, $include_item);
+
+	/**
+	* Get base information of parent items
+	*
+	* @param array	$item		The item to get the branch from
+	* @return array			Array of items (containing basic columns from the item table)
+	*							ID => Item data
+	*/
+	public function get_parent_data(array $item);
+
+	/**
+	* Regenerate left/right ids from parent/child relationship
+	*
+	* This method regenerates the left/right ids for the nested set based on
+	* the parent/child relations. This function executes three queries per
+	* item, so it should only be called, when the set has one of the following
+	* problems:
+	*	- The set has a duplicated value inside the left/right id chain
+	*	- The set has a missing value inside the left/right id chain
+	*	- The set has items that do not have a left/right is set
+	*
+	* When regenerating the items, the items are sorted by parent id and their
+	* current left id, so the current child/parent relationships are kept
+	* and running the function on a working set will not change any orders.
+	*
+	* @param int	$new_id		First left_id to be used (should start with 1)
+	* @param int	$parent_id	parent_id of the current set (default = 0)
+	* @param bool	$reset_ids	Should we reset all left_id/right_id on the first call?
+	* @return	int		$new_id		The next left_id/right_id that should be used
+	*/
+	public function regenerate_left_right_ids($new_id, $parent_id = 0, $reset_ids = false);
+}
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
new file mode 100644
index 0000000000..2110e1a6d2
--- /dev/null
+++ b/phpBB/includes/tree/nestedset.php
@@ -0,0 +1,766 @@
+<?php
+/**
+*
+* @package Tree - Nested Set
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+abstract class phpbb_tree_nestedset implements phpbb_tree_interface
+{
+	/** @var phpbb_db_driver */
+	protected $db;
+
+	/** @var phpbb_lock_db */
+	protected $lock;
+
+	/** @var string */
+	protected $table_name;
+
+	/**
+	* Prefix for the language keys returned by exceptions
+	* @var string
+	*/
+	protected $message_prefix = '';
+
+	/**
+	* Column names in the table
+	* @var string
+	*/
+	protected $column_item_id = 'item_id';
+	protected $column_left_id = 'left_id';
+	protected $column_right_id = 'right_id';
+	protected $column_parent_id = 'parent_id';
+	protected $column_item_parents = 'item_parents';
+
+	/**
+	* Additional SQL restrictions
+	* Allows to have multiple nested sets in one table
+	* @var string
+	*/
+	protected $sql_where = '';
+
+	/**
+	* List of item properties to be cached in $item_parents
+	* @var array
+	*/
+	protected $item_basic_data = array('*');
+
+	/**
+	* Returns additional sql where restrictions
+	*
+	* @param string		$operator		SQL operator that needs to be prepended to sql_where,
+	*									if it is not empty.
+	* @param string		$column_prefix	Prefix that needs to be prepended to column names
+	* @return bool True if the item was deleted
+	*/
+	public function get_sql_where($operator = 'AND', $column_prefix = '')
+	{
+		return (!$this->sql_where) ? '' : $operator . ' ' . sprintf($this->sql_where, $column_prefix);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function insert(array $additional_data)
+	{
+		$item_data = $this->reset_nestedset_values($additional_data);
+
+		$sql = 'INSERT INTO ' . $this->table_name . ' ' . $this->db->sql_build_array('INSERT', $item_data);
+		$this->db->sql_query($sql);
+
+		$item_data[$this->column_item_id] = (int) $this->db->sql_nextid();
+
+		return array_merge($item_data, $this->add($item_data));
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function add(array $item)
+	{
+		$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
+			FROM ' . $this->table_name . '
+			' . $this->get_sql_where('WHERE');
+		$result = $this->db->sql_query($sql);
+		$current_max_right_id = (int) $this->db->sql_fetchfield($this->column_right_id);
+		$this->db->sql_freeresult($result);
+
+		$update_item_data = array(
+			$this->column_parent_id		=> 0,
+			$this->column_left_id		=> $current_max_right_id + 1,
+			$this->column_right_id		=> $current_max_right_id + 2,
+			$this->column_item_parents	=> '',
+		);
+
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->db->sql_build_array('UPDATE', $update_item_data) . '
+			WHERE ' . $this->column_item_id . ' = ' . (int) $item[$this->column_item_id];
+		$this->db->sql_query($sql);
+
+		return $update_item_data;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function remove($item_id)
+	{
+		$items = $this->get_children_branch_data($item_id);
+		$item_ids = array_keys($items);
+
+		$this->remove_subset($item_ids, $items[$item_id]);
+
+		return $item_ids;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function delete($item_id)
+	{
+		$removed_items = $this->remove($item_id);
+
+		$sql = 'DELETE FROM ' . $this->table_name . '
+			WHERE ' . $this->db->sql_in_set($this->column_item_id, $removed_items) . '
+			' . $this->get_sql_where('AND');
+		$this->db->sql_query($sql);
+
+		return $removed_items;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function move($item_id, $delta)
+	{
+		if ($delta == 0)
+		{
+			return false;
+		}
+
+		if (!$this->lock->acquire())
+		{
+			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+		}
+
+		$action = ($delta > 0) ? 'move_up' : 'move_down';
+		$delta = abs($delta);
+
+		// Keep $this->get_sql_where() here, to ensure we are in the right tree.
+		$sql = 'SELECT *
+			FROM ' . $this->table_name . '
+			WHERE ' . $this->column_item_id . ' = ' . (int) $item_id . '
+				' . $this->get_sql_where();
+		$result = $this->db->sql_query_limit($sql, $delta);
+		$item = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$item)
+		{
+			$this->lock->release();
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
+		}
+
+		/**
+		* Fetch all the siblings between the item's current spot
+		* and where we want to move it to. If there are less than $delta
+		* siblings between the current spot and the target then the
+		* item will move as far as possible
+		*/
+		$sql = "SELECT {$this->column_item_id}, {$this->column_parent_id}, {$this->column_left_id}, {$this->column_right_id}, {$this->column_item_parents}
+			FROM " . $this->table_name . '
+			WHERE ' . $this->column_parent_id . ' = ' . (int) $item[$this->column_parent_id] . '
+				' . $this->get_sql_where() . '
+				AND ';
+
+		if ($action == 'move_up')
+		{
+			$sql .= $this->column_right_id . ' < ' . (int) $item[$this->column_right_id] . ' ORDER BY ' . $this->column_right_id . ' DESC';
+		}
+		else
+		{
+			$sql .= $this->column_left_id . ' > ' . (int) $item[$this->column_left_id] . ' ORDER BY ' . $this->column_left_id . ' ASC';
+		}
+
+		$result = $this->db->sql_query_limit($sql, $delta);
+
+		$target = false;
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$target = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!$target)
+		{
+			$this->lock->release();
+			// The item is already on top or bottom
+			return false;
+		}
+
+		/**
+		* $left_id and $right_id define the scope of the items that are affected by the move.
+		* $diff_up and $diff_down are the values to substract or add to each item's left_id
+		* and right_id in order to move them up or down.
+		* $move_up_left and $move_up_right define the scope of the items that are moving
+		* up. Other items in the scope of ($left_id, $right_id) are considered to move down.
+		*/
+		if ($action == 'move_up')
+		{
+			$left_id = (int) $target[$this->column_left_id];
+			$right_id = (int) $item[$this->column_right_id];
+
+			$diff_up = (int) $item[$this->column_left_id] - (int) $target[$this->column_left_id];
+			$diff_down = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
+
+			$move_up_left = (int) $item[$this->column_left_id];
+			$move_up_right = (int) $item[$this->column_right_id];
+		}
+		else
+		{
+			$left_id = (int) $item[$this->column_left_id];
+			$right_id = (int) $target[$this->column_right_id];
+
+			$diff_up = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
+			$diff_down = (int) $target[$this->column_right_id] - (int) $item[$this->column_right_id];
+
+			$move_up_left = (int) $item[$this->column_right_id] + 1;
+			$move_up_right = (int) $target[$this->column_right_id];
+		}
+
+		// Now do the dirty job
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . ' + CASE
+				WHEN ' . $this->column_left_id . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
+				ELSE {$diff_down}
+			END,
+			" . $this->column_right_id . ' = ' . $this->column_right_id . ' + CASE
+				WHEN ' . $this->column_right_id . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
+				ELSE {$diff_down}
+			END,
+			" . $this->column_item_parents . " = ''
+			WHERE
+				" . $this->column_left_id . " BETWEEN {$left_id} AND {$right_id}
+				AND " . $this->column_right_id . " BETWEEN {$left_id} AND {$right_id}
+				" . $this->get_sql_where();
+		$this->db->sql_query($sql);
+
+		$this->lock->release();
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function move_down($item_id)
+	{
+		return $this->move($item_id, -1);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function move_up($item_id)
+	{
+		return $this->move($item_id, 1);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function move_children($current_parent_id, $new_parent_id)
+	{
+		$current_parent_id = (int) $current_parent_id;
+		$new_parent_id = (int) $new_parent_id;
+
+		if ($current_parent_id == $new_parent_id)
+		{
+			return false;
+		}
+
+		if (!$current_parent_id)
+		{
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
+		}
+
+		if (!$this->lock->acquire())
+		{
+			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+		}
+
+		$item_data = $this->get_children_branch_data($current_parent_id);
+		if (!isset($item_data[$current_parent_id]))
+		{
+			$this->lock->release();
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
+		}
+
+		$current_parent = $item_data[$current_parent_id];
+		unset($item_data[$current_parent_id]);
+		$move_items = array_keys($item_data);
+
+		if (($current_parent[$this->column_right_id] - $current_parent[$this->column_left_id]) <= 1)
+		{
+			$this->lock->release();
+			return false;
+		}
+
+		if (in_array($new_parent_id, $move_items))
+		{
+			$this->lock->release();
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
+		}
+
+		$diff = sizeof($move_items) * 2;
+		$sql_exclude_moved_items = $this->db->sql_in_set($this->column_item_id, $move_items, true);
+
+		$this->db->sql_transaction('begin');
+
+		$this->remove_subset($move_items, $current_parent, false, true);
+
+		if ($new_parent_id)
+		{
+			// Retrieve new-parent again, it may have been changed...
+			$sql = 'SELECT *
+				FROM ' . $this->table_name . '
+				WHERE ' . $this->column_item_id . ' = ' . $new_parent_id;
+			$result = $this->db->sql_query($sql);
+			$new_parent = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$new_parent)
+			{
+				$this->db->sql_transaction('rollback');
+				$this->lock->release();
+				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
+			}
+
+			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
+
+			if ($new_right_id > $current_parent[$this->column_right_id])
+			{
+				$diff = ' + ' . ($new_right_id - $current_parent[$this->column_right_id]);
+			}
+			else
+			{
+				$diff = ' - ' . abs($new_right_id - $current_parent[$this->column_right_id]);
+			}
+		}
+		else
+		{
+			$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
+				FROM ' . $this->table_name . '
+				WHERE ' . $sql_exclude_moved_items . '
+					' . $this->get_sql_where('AND');
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			$diff = ' + ' . ($row[$this->column_right_id] - $current_parent[$this->column_left_id]);
+		}
+
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
+				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
+				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_parent_id . ' = ' . $current_parent_id, $new_parent_id, $this->column_parent_id) . ',
+				' . $this->column_item_parents . " = ''
+			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
+				' . $this->get_sql_where('AND');
+		$this->db->sql_query($sql);
+
+		$this->db->sql_transaction('commit');
+		$this->lock->release();
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function change_parent($item_id, $new_parent_id)
+	{
+		$item_id = (int) $item_id;
+		$new_parent_id = (int) $new_parent_id;
+
+		if ($item_id == $new_parent_id)
+		{
+			return false;
+		}
+
+		if (!$item_id)
+		{
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
+		}
+
+		if (!$this->lock->acquire())
+		{
+			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+		}
+
+		$item_data = $this->get_children_branch_data($item_id);
+		if (!isset($item_data[$item_id]))
+		{
+			$this->lock->release();
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
+		}
+
+		$item = $item_data[$item_id];
+		$move_items = array_keys($item_data);
+
+		if (in_array($new_parent_id, $move_items))
+		{
+			$this->lock->release();
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
+		}
+
+		$diff = sizeof($move_items) * 2;
+		$sql_exclude_moved_items = $this->db->sql_in_set($this->column_item_id, $move_items, true);
+
+		$this->db->sql_transaction('begin');
+
+		$this->remove_subset($move_items, $item, false, true);
+
+		if ($new_parent_id)
+		{
+			// Retrieve new-parent again, it may have been changed...
+			$sql = 'SELECT *
+				FROM ' . $this->table_name . '
+				WHERE ' . $this->column_item_id . ' = ' . $new_parent_id;
+			$result = $this->db->sql_query($sql);
+			$new_parent = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$new_parent)
+			{
+				$this->db->sql_transaction('rollback');
+				$this->lock->release();
+				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
+			}
+
+			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
+
+			if ($new_right_id > (int) $item[$this->column_right_id])
+			{
+				$diff = ' + ' . ($new_right_id - (int) $item[$this->column_right_id] - 1);
+			}
+			else
+			{
+				$diff = ' - ' . abs($new_right_id - (int) $item[$this->column_right_id] - 1);
+			}
+		}
+		else
+		{
+			$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
+				FROM ' . $this->table_name . '
+				WHERE ' . $sql_exclude_moved_items . '
+					' . $this->get_sql_where('AND');
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			$diff = ' + ' . ($row[$this->column_right_id] - (int) $item[$this->column_left_id] + 1);
+		}
+
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
+				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
+				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_item_id . ' = ' . $item_id, $new_parent_id, $this->column_parent_id) . ',
+				' . $this->column_item_parents . " = ''
+			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
+				' . $this->get_sql_where('AND');
+		$this->db->sql_query($sql);
+
+		$this->db->sql_transaction('commit');
+		$this->lock->release();
+
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_full_branch_data($item_id, $order_desc = true, $include_item = true)
+	{
+		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '
+			OR i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id;
+
+		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_parent_branch_data($item_id, $order_desc = true, $include_item = true)
+	{
+		$condition = 'i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id . '';
+
+		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_children_branch_data($item_id, $order_desc = true, $include_item = true)
+	{
+		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '';
+
+		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
+	}
+
+	/**
+	* Get children and parent branch of the item
+	*
+	* @param int		$item_id		The item id to get the parents/children from
+	* @param string		$condition		Query string restricting the item list
+	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
+	* @return array			Array of items (containing all columns from the item table)
+	*							ID => Item data
+	*/
+	protected function get_branch_data($item_id, $condition, $order_desc = true, $include_item = true)
+	{
+		$rows = array();
+
+		$sql = 'SELECT i2.*
+			FROM ' . $this->table_name . ' i1
+			LEFT JOIN ' . $this->table_name . " i2
+				ON (($condition) " . $this->get_sql_where('AND', 'i2.') . ')
+			WHERE i1.' . $this->column_item_id . ' = ' . (int) $item_id . '
+				' . $this->get_sql_where('AND', 'i1.') . '
+			ORDER BY i2.' . $this->column_left_id . ' ' . ($order_desc ? 'ASC' : 'DESC');
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (!$include_item && $item_id == $row[$this->column_item_id])
+			{
+				continue;
+			}
+
+			$rows[(int) $row[$this->column_item_id]] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $rows;
+	}
+
+	/**
+	* Get base information of parent items
+	*
+	* Data is cached in the item_parents column in the item table
+	*
+	* @inheritdoc
+	*/
+	public function get_parent_data(array $item)
+	{
+		$parents = array();
+		if ((int) $item[$this->column_parent_id])
+		{
+			if (!$item[$this->column_item_parents])
+			{
+				$sql = 'SELECT ' . implode(', ', $this->item_basic_data) . '
+					FROM ' . $this->table_name . '
+					WHERE ' . $this->column_left_id . ' < ' . (int) $item[$this->column_left_id] . '
+						AND ' . $this->column_right_id . ' > ' . (int) $item[$this->column_right_id] . '
+						' . $this->get_sql_where('AND') . '
+					ORDER BY ' . $this->column_left_id . ' ASC';
+				$result = $this->db->sql_query($sql);
+
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$parents[$row[$this->column_item_id]] = $row;
+				}
+				$this->db->sql_freeresult($result);
+
+				$item_parents = serialize($parents);
+
+				$sql = 'UPDATE ' . $this->table_name . '
+					SET ' . $this->column_item_parents . " = '" . $this->db->sql_escape($item_parents) . "'
+					WHERE " . $this->column_parent_id . ' = ' . (int) $item[$this->column_parent_id];
+				$this->db->sql_query($sql);
+			}
+			else
+			{
+				$parents = unserialize($item[$this->column_item_parents]);
+			}
+		}
+
+		return $parents;
+	}
+
+	/**
+	* Remove a subset from the nested set
+	*
+	* @param array	$subset_items		Subset of items to remove
+	* @param array	$bounding_item		Item containing the right bound of the subset
+	* @param bool	$set_subset_zero	Should the parent, left and right id of the items be set to 0, or kept unchanged?
+	*									In case of removing an item from the tree, we should the values to 0
+	*									In case of moving an item, we shouldkeep the original values, in order to allow "+ diff" later
+	* @param bool	$table_already_locked	Is the table already locked, or should we acquire a new lock?
+	* @return	null
+	*/
+	protected function remove_subset(array $subset_items, array $bounding_item, $set_subset_zero = true, $table_already_locked = false)
+	{
+		if (!$table_already_locked && !$this->lock->acquire())
+		{
+			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+		}
+
+		$diff = sizeof($subset_items) * 2;
+		$sql_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items);
+		$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
+
+		$sql_is_parent = $this->column_left_id . ' <= ' . (int) $bounding_item[$this->column_right_id] . '
+			AND ' . $this->column_right_id . ' >= ' . (int) $bounding_item[$this->column_right_id];
+
+		$sql_is_right = $this->column_left_id . ' > ' . (int) $bounding_item[$this->column_right_id];
+
+		$set_left_id = $this->db->sql_case($sql_is_right, $this->column_left_id . ' - ' . $diff, $this->column_left_id);
+		$set_right_id = $this->db->sql_case($sql_is_parent . ' OR ' . $sql_is_right, $this->column_right_id . ' - ' . $diff, $this->column_right_id);
+
+		if ($set_subset_zero)
+		{
+			$set_left_id = $this->db->sql_case($sql_subset_items, 0, $set_left_id);
+			$set_right_id = $this->db->sql_case($sql_subset_items, 0, $set_right_id);
+		}
+
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->column_left_id . ' = ' . $set_left_id . ',
+				' . $this->column_right_id . ' = ' . $set_right_id . ',
+				' . (($set_subset_zero) ? $this->column_parent_id . ' = ' . $this->db->sql_case($sql_subset_items, 0, $this->column_parent_id) . ',' : '') . '
+				' . $this->column_item_parents . " = ''
+			" . ((!$set_subset_zero) ? ' WHERE ' . $sql_not_subset_items . ' ' . $this->get_sql_where('AND') : $this->get_sql_where('WHERE'));
+		$this->db->sql_query($sql);
+
+		if (!$table_already_locked)
+		{
+			$this->lock->release();
+		}
+	}
+
+	/**
+	* Add a subset to the nested set
+	*
+	* @param array	$subset_items		Subset of items to add
+	* @param array	$new_parent	Item containing the right bound of the new parent
+	* @return	int		New right id of the parent item
+	*/
+	protected function prepare_adding_subset(array $subset_items, array $new_parent)
+	{
+		$diff = sizeof($subset_items) * 2;
+		$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
+
+		$set_left_id = $this->db->sql_case($this->column_left_id . ' > ' . (int) $new_parent[$this->column_right_id], $this->column_left_id . ' + ' . $diff, $this->column_left_id);
+		$set_right_id = $this->db->sql_case($this->column_right_id . ' >= ' . (int) $new_parent[$this->column_right_id], $this->column_right_id . ' + ' . $diff, $this->column_right_id);
+
+		$sql = 'UPDATE ' . $this->table_name . '
+			SET ' . $this->column_left_id . ' = ' . $set_left_id . ',
+				' . $this->column_right_id . ' = ' . $set_right_id . ',
+				' . $this->column_item_parents . " = ''
+			WHERE " . $sql_not_subset_items . '
+				' . $this->get_sql_where('AND');
+		$this->db->sql_query($sql);
+
+		return $new_parent[$this->column_right_id] + $diff;
+	}
+
+	/**
+	* Resets values required for the nested set system
+	*
+	* @param array	$item		Original item data
+	* @return	array		Original item data + nested set defaults
+	*/
+	protected function reset_nestedset_values(array $item)
+	{
+		$item_data = array_merge($item, array(
+			$this->column_parent_id		=> 0,
+			$this->column_left_id		=> 0,
+			$this->column_right_id		=> 0,
+			$this->column_item_parents	=> '',
+		));
+
+		unset($item_data[$this->column_item_id]);
+
+		return $item_data;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function regenerate_left_right_ids($new_id, $parent_id = 0, $reset_ids = false)
+	{
+		if ($reset_ids)
+		{
+			if (!$this->lock->acquire())
+			{
+				throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+			}
+			$this->db->sql_transaction('begin');
+
+			$sql = 'UPDATE ' . $this->table_name . '
+				SET ' . $this->db->sql_build_array('UPDATE', array(
+					$this->column_left_id		=> 0,
+					$this->column_right_id		=> 0,
+					$this->column_item_parents	=> '',
+				)) . '
+				' . $this->get_sql_where('WHERE');
+			$this->db->sql_query($sql);
+		}
+
+		$sql = 'SELECT *
+			FROM ' . $this->table_name . '
+			WHERE ' . $this->column_parent_id . ' = ' . (int) $parent_id . '
+				' . $this->get_sql_where('AND') . '
+			ORDER BY ' . $this->column_left_id . ', ' . $this->column_item_id . ' ASC';
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			// First we update the left_id for this module
+			if ($row[$this->column_left_id] != $new_id)
+			{
+				$sql = 'UPDATE ' . $this->table_name . '
+					SET ' . $this->db->sql_build_array('UPDATE', array(
+						$this->column_left_id		=> $new_id,
+						$this->column_item_parents	=> '',
+					)) . '
+					WHERE ' . $this->column_item_id . ' = ' . (int) $row[$this->column_item_id];
+				$this->db->sql_query($sql);
+			}
+			$new_id++;
+
+			// Then we go through any children and update their left/right id's
+			$new_id = $this->regenerate_left_right_ids($new_id, $row[$this->column_item_id]);
+
+			// Then we come back and update the right_id for this module
+			if ($row[$this->column_right_id] != $new_id)
+			{
+				$sql = 'UPDATE ' . $this->table_name . '
+					SET ' . $this->db->sql_build_array('UPDATE', array($this->column_right_id => $new_id)) . '
+					WHERE ' . $this->column_item_id . ' = ' . (int) $row[$this->column_item_id];
+				$this->db->sql_query($sql);
+			}
+			$new_id++;
+		}
+		$this->db->sql_freeresult($result);
+
+
+		if ($reset_ids)
+		{
+			$this->db->sql_transaction('commit');
+			$this->lock->release();
+		}
+
+		return $new_id;
+	}
+}
diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/includes/tree/nestedset_forum.php
new file mode 100644
index 0000000000..0a66e68915
--- /dev/null
+++ b/phpBB/includes/tree/nestedset_forum.php
@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* @package Tree - Nested Set Forum
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset
+{
+	/**
+	* Column names in the table
+	* @var string
+	*/
+	protected $column_item_id = 'forum_id';
+	protected $column_item_parents = 'forum_parents';
+
+	/**
+	* Prefix for the language keys returned by exceptions
+	* @var string
+	*/
+	protected $message_prefix = 'FORUM_NESTEDSET_';
+
+	/**
+	* List of item properties to be cached in $item_parents
+	* @var array
+	*/
+	protected $item_basic_data = array('forum_id', 'forum_name', 'forum_type');
+
+	/**
+	* Construct
+	*
+	* @param phpbb_db_driver	$db		Database connection
+	* @param phpbb_lock_db		$lock	Lock class used to lock the table when moving forums around
+	* @param string				$table_name		Table name
+	*/
+	public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name)
+	{
+		$this->db = $db;
+		$this->lock = $lock;
+		$this->table_name = $table_name;
+	}
+}
-- 
cgit v1.2.1


From 5de14b940e71941853d3bb279779631ae75b9b6f Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 26 Jan 2013 00:22:56 +0530
Subject: [ticket/10325] add allow forgot password option in acp

PHPBB3-10325
---
 phpBB/includes/acp/acp_board.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index bacf0d6e57..1956ade31a 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -398,6 +398,7 @@ class acp_board
 					'vars'	=> array(
 						'legend1'				=> 'ACP_SECURITY_SETTINGS',
 						'allow_autologin'		=> array('lang' => 'ALLOW_AUTOLOGIN',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'allow_forgot_password'	=> array('lang' => 'ALLOW_FORGOT_PASSWORD',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'max_autologin_time'	=> array('lang' => 'AUTOLOGIN_LENGTH',		'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
 						'ip_check'				=> array('lang' => 'IP_VALID',				'validate' => 'int',	'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
 						'browser_check'			=> array('lang' => 'BROWSER_VALID',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-- 
cgit v1.2.1


From c6e9bd13a75441e9b35a1bfa5d2a08cc38ff1fa5 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 26 Jan 2013 01:01:57 +0530
Subject: [ticket/10325] trigger error if forgot password option disabled

PHPBB3-10325
---
 phpBB/includes/ucp/ucp_remind.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index 8a7ba5d0ca..dd95c29def 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -29,6 +29,11 @@ class ucp_remind
 		global $config, $phpbb_root_path, $phpEx;
 		global $db, $user, $auth, $template;
 
+		if (!$config['allow_forgot_password'])
+		{
+			trigger_error('UCP_FORGOT_PASSWORD_DISABLE');
+		}
+
 		$username	= request_var('username', '', true);
 		$email		= strtolower(request_var('email', ''));
 		$submit		= (isset($_POST['submit'])) ? true : false;
-- 
cgit v1.2.1


From 73d873548400f18b02167ef49195a50a11970c24 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 17:19:52 +0200
Subject: [ticket/11495] Remove fixing function from tree interface

The fixing function is implementation dependent.

PHPBB3-11495
---
 phpBB/includes/tree/interface.php | 34 ++++++----------------------------
 phpBB/includes/tree/nestedset.php | 19 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 29 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index fd10bd357f..babd0ad03d 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -18,7 +18,7 @@ if (!defined('IN_PHPBB'))
 interface phpbb_tree_interface
 {
 	/**
-	* Insert an item into the nested set (also insert the rows into the table)
+	* Insert an item into the tree (also insert the rows into the table)
 	*
 	* @param array	$item	The item to be added
 	* @return array Array with item data as set in the database
@@ -26,7 +26,7 @@ interface phpbb_tree_interface
 	public function insert(array $additional_data);
 
 	/**
-	* Add an item at the end of the nested set
+	* Add an item at the end of the tree
 	*
 	* @param array	$item	The item to be added
 	* @return bool True if the item was added
@@ -34,9 +34,9 @@ interface phpbb_tree_interface
 	public function add(array $item);
 
 	/**
-	* Remove an item from the nested set
+	* Remove an item from the tree
 	*
-	* Also removes all subitems from the nested set
+	* Also removes all subitems from the tree
 	*
 	* @param int	$item_id	The item to be deleted
 	* @return array		Item ids that have been removed
@@ -44,9 +44,9 @@ interface phpbb_tree_interface
 	public function remove($item);
 
 	/**
-	* Delete an item from the nested set (also deletes the rows form the table)
+	* Delete an item from the tree
 	*
-	* Also deletes all subitems from the nested set
+	* Also deletes all subitems from the tree
 	*
 	* @param int	$item_id	The item to be deleted
 	* @return array		Item ids that have been deleted
@@ -146,26 +146,4 @@ interface phpbb_tree_interface
 	*							ID => Item data
 	*/
 	public function get_parent_data(array $item);
-
-	/**
-	* Regenerate left/right ids from parent/child relationship
-	*
-	* This method regenerates the left/right ids for the nested set based on
-	* the parent/child relations. This function executes three queries per
-	* item, so it should only be called, when the set has one of the following
-	* problems:
-	*	- The set has a duplicated value inside the left/right id chain
-	*	- The set has a missing value inside the left/right id chain
-	*	- The set has items that do not have a left/right is set
-	*
-	* When regenerating the items, the items are sorted by parent id and their
-	* current left id, so the current child/parent relationships are kept
-	* and running the function on a working set will not change any orders.
-	*
-	* @param int	$new_id		First left_id to be used (should start with 1)
-	* @param int	$parent_id	parent_id of the current set (default = 0)
-	* @param bool	$reset_ids	Should we reset all left_id/right_id on the first call?
-	* @return	int		$new_id		The next left_id/right_id that should be used
-	*/
-	public function regenerate_left_right_ids($new_id, $parent_id = 0, $reset_ids = false);
 }
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 2110e1a6d2..72e3aa4d71 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -696,7 +696,24 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	}
 
 	/**
-	* @inheritdoc
+	* Regenerate left/right ids from parent/child relationship
+	*
+	* This method regenerates the left/right ids for the tree based on
+	* the parent/child relations. This function executes three queries per
+	* item, so it should only be called, when the set has one of the following
+	* problems:
+	*	- The set has a duplicated value inside the left/right id chain
+	*	- The set has a missing value inside the left/right id chain
+	*	- The set has items that do not have a left/right is set
+	*
+	* When regenerating the items, the items are sorted by parent id and their
+	* current left id, so the current child/parent relationships are kept
+	* and running the function on a working set will not change any orders.
+	*
+	* @param int	$new_id		First left_id to be used (should start with 1)
+	* @param int	$parent_id	parent_id of the current set (default = 0)
+	* @param bool	$reset_ids	Should we reset all left_id/right_id on the first call?
+	* @return	int		$new_id		The next left_id/right_id that should be used
 	*/
 	public function regenerate_left_right_ids($new_id, $parent_id = 0, $reset_ids = false)
 	{
-- 
cgit v1.2.1


From abfb7bc51fa254edd6274e39625eb8a4edec32be Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 17:24:18 +0200
Subject: [ticket/11495] Remove add/remove from the interface

PHPBB3-11495
---
 phpBB/includes/tree/interface.php | 20 +-------------------
 phpBB/includes/tree/nestedset.php | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 23 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index babd0ad03d..3f03363151 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -18,31 +18,13 @@ if (!defined('IN_PHPBB'))
 interface phpbb_tree_interface
 {
 	/**
-	* Insert an item into the tree (also insert the rows into the table)
+	* Insert an item into the tree
 	*
 	* @param array	$item	The item to be added
 	* @return array Array with item data as set in the database
 	*/
 	public function insert(array $additional_data);
 
-	/**
-	* Add an item at the end of the tree
-	*
-	* @param array	$item	The item to be added
-	* @return bool True if the item was added
-	*/
-	public function add(array $item);
-
-	/**
-	* Remove an item from the tree
-	*
-	* Also removes all subitems from the tree
-	*
-	* @param int	$item_id	The item to be deleted
-	* @return array		Item ids that have been removed
-	*/
-	public function remove($item);
-
 	/**
 	* Delete an item from the tree
 	*
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 72e3aa4d71..8f73b9181e 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -84,9 +84,12 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	}
 
 	/**
-	* @inheritdoc
+	* Add an existing item at the end of the tree
+	*
+	* @param array	$item	The item to be added
+	* @return bool True if the item was added
 	*/
-	public function add(array $item)
+	protected function add(array $item)
 	{
 		$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
 			FROM ' . $this->table_name . '
@@ -111,9 +114,14 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	}
 
 	/**
-	* @inheritdoc
+	* Remove an item from the tree WITHOUT removing the items from the table
+	*
+	* Also removes all subitems from the tree
+	*
+	* @param int	$item_id	The item to be deleted
+	* @return array		Item ids that have been removed
 	*/
-	public function remove($item_id)
+	protected function remove($item_id)
 	{
 		$items = $this->get_children_branch_data($item_id);
 		$item_ids = array_keys($items);
-- 
cgit v1.2.1


From 2dbe3b3c975d61b84310f7da27b8d525a22d1723 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 26 Jan 2013 01:09:30 +0530
Subject: [ticket/10325] add new config value to database

PHPBB3-10325
---
 phpBB/includes/db/migration/data/310/dev.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 13b36bbf30..d3f3a341b2 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -84,6 +84,8 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 		return array(
 			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
 
+			array('config.add', array('allow_forgot_password', 1)),
+
 			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
 			array('config.add', array('fulltext_postgres_min_word_len', 4)),
 			array('config.add', array('fulltext_postgres_max_word_len', 254)),
-- 
cgit v1.2.1


From f8012cc239d8b442e78bbbb8a5cc5856d2a714a0 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 26 Jan 2013 11:10:17 +0530
Subject: [ticket/10325] fix language

PHPBB3-10325
---
 phpBB/includes/ucp/ucp_remind.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index dd95c29def..a25d7da91a 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -31,7 +31,7 @@ class ucp_remind
 
 		if (!$config['allow_forgot_password'])
 		{
-			trigger_error('UCP_FORGOT_PASSWORD_DISABLE');
+			trigger_error($user->lang('UCP_FORGOT_PASSWORD_DISABLE', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'));
 		}
 
 		$username	= request_var('username', '', true);
-- 
cgit v1.2.1


From 1a51abcca293b0e2bd836af0dcb9d77054c1d401 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 27 Jan 2013 03:07:52 +0530
Subject: [ticket/10325] change language var

PHPBB3-10325
---
 phpBB/includes/acp/acp_board.php             | 2 +-
 phpBB/includes/db/migration/data/310/dev.php | 2 +-
 phpBB/includes/ucp/ucp_remind.php            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 1956ade31a..ab44920f0a 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -398,7 +398,7 @@ class acp_board
 					'vars'	=> array(
 						'legend1'				=> 'ACP_SECURITY_SETTINGS',
 						'allow_autologin'		=> array('lang' => 'ALLOW_AUTOLOGIN',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'allow_forgot_password'	=> array('lang' => 'ALLOW_FORGOT_PASSWORD',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'allow_password_reset'	=> array('lang' => 'ALLOW_PASSWORD_RESET',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'max_autologin_time'	=> array('lang' => 'AUTOLOGIN_LENGTH',		'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
 						'ip_check'				=> array('lang' => 'IP_VALID',				'validate' => 'int',	'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
 						'browser_check'			=> array('lang' => 'BROWSER_VALID',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index d3f3a341b2..0794567f1b 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -84,7 +84,7 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 		return array(
 			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
 
-			array('config.add', array('allow_forgot_password', 1)),
+			array('config.add', array('allow_password_reset', 1)),
 
 			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
 			array('config.add', array('fulltext_postgres_min_word_len', 4)),
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index a25d7da91a..4a2d06e99a 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -29,7 +29,7 @@ class ucp_remind
 		global $config, $phpbb_root_path, $phpEx;
 		global $db, $user, $auth, $template;
 
-		if (!$config['allow_forgot_password'])
+		if (!$config['allow_password_reset'])
 		{
 			trigger_error($user->lang('UCP_FORGOT_PASSWORD_DISABLE', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'));
 		}
-- 
cgit v1.2.1


From f1e615c4297a509325b764e1966118fe171ebbb5 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 27 Jan 2013 03:09:52 +0530
Subject: [ticket/10325] fix language variable

PHPBB3-10325
---
 phpBB/includes/ucp/ucp_remind.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index 4a2d06e99a..cd4d13c8a7 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -31,7 +31,7 @@ class ucp_remind
 
 		if (!$config['allow_password_reset'])
 		{
-			trigger_error($user->lang('UCP_FORGOT_PASSWORD_DISABLE', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'));
+			trigger_error($user->lang('UCP_FORGOT_PASSWORD_DISABLED', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'));
 		}
 
 		$username	= request_var('username', '', true);
-- 
cgit v1.2.1


From c048067bbd45b51595cc243cc4edde1d84eda405 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sun, 27 Jan 2013 11:27:28 +0530
Subject: [ticket/10325] fix language key

PHPBB3-10325
---
 phpBB/includes/ucp/ucp_remind.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index cd4d13c8a7..ff7ab53736 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -31,7 +31,7 @@ class ucp_remind
 
 		if (!$config['allow_password_reset'])
 		{
-			trigger_error($user->lang('UCP_FORGOT_PASSWORD_DISABLED', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'));
+			trigger_error($user->lang('UCP_PASSWORD_RESET_DISABLED', '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'));
 		}
 
 		$username	= request_var('username', '', true);
-- 
cgit v1.2.1


From 42cfb7264dec3a1e8f141ff40b17b841e5c998cc Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 25 Apr 2013 10:58:48 -0500
Subject: [ticket/11237] Fix PHP error in acp_prune.php

Also making the code a bit more efficient (removing one SQL query)

PHPBB3-11237
---
 phpBB/includes/acp/acp_prune.php | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index a5dc02849a..54ffe24594 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -491,11 +491,12 @@ class acp_prune
 
 		if ($group_id)
 		{
-			$sql = 'SELECT user_id
-				FROM ' . USER_GROUP_TABLE . '
-				WHERE group_id = ' . (int) $group_id . '
-					AND user_pending = 0
-					AND ' . $db->sql_in_set('user_id', $user_ids, false, true);
+			$sql = 'SELECT u.user_id, u.username
+				FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u
+				WHERE ug.group_id = ' . (int) $group_id . '
+					AND ug.user_pending = 0
+					AND ' . $db->sql_in_set('ug.user_id', $user_ids, false, true) . '
+					AND u.user_id = ug.user_id';
 			$result = $db->sql_query($sql);
 
 			// we're performing an intersection operation, so all the relevant users
@@ -504,24 +505,19 @@ class acp_prune
 			$user_ids = $usernames = array();
 			while ($row = $db->sql_fetchrow($result))
 			{
-				$user_ids[] = $row['poster_id'];
+				$user_ids[] = $row['user_id'];
+				$usernames[$row['user_id']] = $row['username'];
 			}
 			$db->sql_freeresult($result);
-
-			// only get usernames if they are needed (not part of some later query)
-			if (!$posts_on_queue)
-			{
-				// this is an additional query aginst the users table
-				user_get_id_name($user_ids, $usernames);
-			}
 		}
 
 		if ($posts_on_queue)
 		{
-			$sql = 'SELECT poster_id, COUNT(post_id) AS queue_posts
-				FROM ' . POSTS_TABLE . '
-				WHERE ' . $db->sql_in_set('poster_id', $user_ids, false, true) . '
-				GROUP BY poster_id
+			$sql = 'SELECT u.user_id, u.username, COUNT(p.post_id) AS queue_posts
+				FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
+				WHERE ' . $db->sql_in_set('p.poster_id', $user_ids, false, true) . '
+					AND u.user_id = p.poster_id
+				GROUP BY p.poster_id
 				HAVING queue_posts ' . $key_match[$queue_select] . ' ' . $posts_on_queue;
 			$result = $db->sql_query($result);
 
@@ -529,12 +525,10 @@ class acp_prune
 			$user_ids = $usernames = array();
 			while ($row = $db->sql_fetchrow($result))
 			{
-				$user_ids[] = $row['poster_id'];
+				$user_ids[] = $row['user_id'];
+				$usernames[$row['user_id']] = $row['username'];
 			}
 			$db->sql_freeresult($result);
-
-			// do an additional query to get the correct set of usernames
-			user_get_id_name($user_ids, $usernames);
 		}
 	}
 }
-- 
cgit v1.2.1


From 0def8b7d9cb06cd2abf462f18f1404fc119861bd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 18:09:21 +0200
Subject: [ticket/11495] Use constructor arguments over properties in
 implementation

PHPBB3-11495
---
 phpBB/includes/tree/nestedset.php       | 31 +++++++++++++++++++++++++++
 phpBB/includes/tree/nestedset_forum.php | 38 ++++++++++++++-------------------
 2 files changed, 47 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 8f73b9181e..245a8165ef 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -55,6 +55,37 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	*/
 	protected $item_basic_data = array('*');
 
+	/**
+	* Construct
+	*
+	* @param phpbb_db_driver	$db		Database connection
+	* @param phpbb_lock_db		$lock	Lock class used to lock the table when moving forums around
+	* @param string			$table_name			Table name
+	* @param string			$message_prefix		Prefix for the messages thrown by exceptions
+	* @param string			$sql_where			Additional SQL restrictions for the queries
+	* @param array			$item_basic_data	Array with basic item data that is stored in item_parents
+	* @param array			$columns			Array with column names to overwrite
+	*/
+	public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name, $message_prefix = '', $sql_where = '', $item_basic_data = array(), $columns = array())
+	{
+		$this->db = $db;
+		$this->lock = $lock;
+
+		$this->table_name = $table_name;
+		$this->message_prefix = $message_prefix;
+		$this->sql_where = $sql_where;
+		$this->item_basic_data = (!empty($item_basic_data)) ? $item_basic_data : array('*');
+
+		if (!empty($columns))
+		{
+			foreach ($columns as $column => $name)
+			{
+				$column_name = 'column_' . $column;
+				$this->$column_name = $name;
+			}
+		}
+	}
+
 	/**
 	* Returns additional sql where restrictions
 	*
diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/includes/tree/nestedset_forum.php
index 0a66e68915..7dcb12331c 100644
--- a/phpBB/includes/tree/nestedset_forum.php
+++ b/phpBB/includes/tree/nestedset_forum.php
@@ -17,25 +17,6 @@ if (!defined('IN_PHPBB'))
 
 class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset
 {
-	/**
-	* Column names in the table
-	* @var string
-	*/
-	protected $column_item_id = 'forum_id';
-	protected $column_item_parents = 'forum_parents';
-
-	/**
-	* Prefix for the language keys returned by exceptions
-	* @var string
-	*/
-	protected $message_prefix = 'FORUM_NESTEDSET_';
-
-	/**
-	* List of item properties to be cached in $item_parents
-	* @var array
-	*/
-	protected $item_basic_data = array('forum_id', 'forum_name', 'forum_type');
-
 	/**
 	* Construct
 	*
@@ -45,8 +26,21 @@ class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset
 	*/
 	public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name)
 	{
-		$this->db = $db;
-		$this->lock = $lock;
-		$this->table_name = $table_name;
+		parent::__construct(
+			$db,
+			$lock,
+			$table_name,
+			'FORUM_NESTEDSET_',
+			'',
+			array(
+				'forum_id',
+				'forum_name',
+				'forum_type',
+			),
+			array(
+				'item_id'		=> 'forum_id',
+				'item_parents'	=> 'forum_parents',
+			)
+		);
 	}
 }
-- 
cgit v1.2.1


From ee457e584c66938cc521eecf0ec303a81c536896 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 25 Apr 2013 11:16:00 -0500
Subject: [ticket/11236] Correct HTML

PHPBB3-11236
---
 phpBB/includes/acp/acp_prune.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index a5dc02849a..e43f1558b1 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -340,7 +340,7 @@ class acp_prune
 
 		while ($row = $db->sql_fetchrow($result))
 		{
-			$s_group_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</select>';
+			$s_group_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
 		}
 		$db->sql_freeresult($result);
 
-- 
cgit v1.2.1


From 1a16ee4cb270f81ebeb8697e4bffaaa305010116 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 25 Apr 2013 11:20:13 -0500
Subject: [ticket/11236] Do not require group selection in prune users

PHPBB3-11236
---
 phpBB/includes/acp/acp_prune.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index e43f1558b1..dc0f9a345f 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -331,7 +331,7 @@ class acp_prune
 			$s_find_active_time .= '<option value="' . $key . '">' . $value . '</option>';
 		}
 
-		$s_group_list = '';
+		$s_group_list = '<option value="0"></option>';
 		$sql = 'SELECT group_id, group_name
 			FROM ' . GROUPS_TABLE . '
 			WHERE group_type <> ' . GROUP_SPECIAL . '
-- 
cgit v1.2.1


From baff4287e5a7142b7af41e56c29b064bb56fd7fb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 25 Apr 2013 22:39:24 +0200
Subject: [ticket/11495] Fix comments and package docs

PHPBB3-11495
---
 phpBB/includes/tree/interface.php       | 6 +++---
 phpBB/includes/tree/nestedset.php       | 2 +-
 phpBB/includes/tree/nestedset_forum.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index 3f03363151..4e22e322f3 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Tree
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
@@ -18,7 +18,7 @@ if (!defined('IN_PHPBB'))
 interface phpbb_tree_interface
 {
 	/**
-	* Insert an item into the tree
+	* Insert an item into the tree (also insert the rows into the table)
 	*
 	* @param array	$item	The item to be added
 	* @return array Array with item data as set in the database
@@ -26,7 +26,7 @@ interface phpbb_tree_interface
 	public function insert(array $additional_data);
 
 	/**
-	* Delete an item from the tree
+	* Delete an item from the tree (also deletes the rows form the table)
 	*
 	* Also deletes all subitems from the tree
 	*
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 245a8165ef..ffe8687e54 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Tree - Nested Set
+* @package tree - nestedset
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/includes/tree/nestedset_forum.php
index 7dcb12331c..06ef37e971 100644
--- a/phpBB/includes/tree/nestedset_forum.php
+++ b/phpBB/includes/tree/nestedset_forum.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Tree - Nested Set Forum
+* @package tree - nestedset forum
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
-- 
cgit v1.2.1


From a9f02d1efa0fc5210a0c113a3cf832b1d1f856ab Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 26 Apr 2013 00:04:58 +0200
Subject: [ticket/11495] Make method names for add/remove more descriptive

PHPBB3-11495
---
 phpBB/includes/tree/nestedset.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index ffe8687e54..ab6a9d6bb4 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -111,7 +111,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		$item_data[$this->column_item_id] = (int) $this->db->sql_nextid();
 
-		return array_merge($item_data, $this->add($item_data));
+		return array_merge($item_data, $this->add_item_to_nestedset($item_data));
 	}
 
 	/**
@@ -120,7 +120,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	* @param array	$item	The item to be added
 	* @return bool True if the item was added
 	*/
-	protected function add(array $item)
+	protected function add_item_to_nestedset(array $item)
 	{
 		$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
 			FROM ' . $this->table_name . '
@@ -152,7 +152,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	* @param int	$item_id	The item to be deleted
 	* @return array		Item ids that have been removed
 	*/
-	protected function remove($item_id)
+	protected function remove_item_from_nestedset($item_id)
 	{
 		$items = $this->get_children_branch_data($item_id);
 		$item_ids = array_keys($items);
@@ -167,7 +167,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	*/
 	public function delete($item_id)
 	{
-		$removed_items = $this->remove($item_id);
+		$removed_items = $this->remove_item_from_nestedset($item_id);
 
 		$sql = 'DELETE FROM ' . $this->table_name . '
 			WHERE ' . $this->db->sql_in_set($this->column_item_id, $removed_items) . '
-- 
cgit v1.2.1


From 2afa6730232cc2e92ae6543852d031a29c8a361f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 26 Apr 2013 08:42:44 +0200
Subject: [ticket/11495] Fix doc blocks once more

PHPBB3-11495
---
 phpBB/includes/tree/interface.php | 6 +++---
 phpBB/includes/tree/nestedset.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index 4e22e322f3..ed0ccca3f1 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -18,7 +18,7 @@ if (!defined('IN_PHPBB'))
 interface phpbb_tree_interface
 {
 	/**
-	* Insert an item into the tree (also insert the rows into the table)
+	* Inserts an item into the database table and into the tree.
 	*
 	* @param array	$item	The item to be added
 	* @return array Array with item data as set in the database
@@ -26,9 +26,9 @@ interface phpbb_tree_interface
 	public function insert(array $additional_data);
 
 	/**
-	* Delete an item from the tree (also deletes the rows form the table)
+	* Delete an item from the tree and from the database table
 	*
-	* Also deletes all subitems from the tree
+	* Also deletes all subitems from the tree and from the database table
 	*
 	* @param int	$item_id	The item to be deleted
 	* @return array		Item ids that have been deleted
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index ab6a9d6bb4..9655a08aa5 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -115,7 +115,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	}
 
 	/**
-	* Add an existing item at the end of the tree
+	* Add an item which already has a database row at the end of the tree
 	*
 	* @param array	$item	The item to be added
 	* @return bool True if the item was added
@@ -145,9 +145,9 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	}
 
 	/**
-	* Remove an item from the tree WITHOUT removing the items from the table
+	* Remove an item from the tree without deleting it from the database
 	*
-	* Also removes all subitems from the tree
+	* Also removes all subitems from the tree without deleting them from the database either
 	*
 	* @param int	$item_id	The item to be deleted
 	* @return array		Item ids that have been removed
-- 
cgit v1.2.1


From 198b992dcef0a0a7099eb3db6185d567b58b6e5a Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 28 Apr 2013 22:53:05 -0500
Subject: [ticket/11413] Schema changes and migration file

Notifications tables are dropped because phpBB currently does not have
any way to make the necessary changes to the DB schema (and no release
has yet been made with these changes).

This will fix the following bugs:
PHPBB3-11411
PHPBB3-11413
PHPBB3-11414
PHPBB3-11416
PHPBB3-11420

PHPBB3-11413
---
 .../db/migration/data/310/notifications.php        |  64 -------
 .../db/migration/data/310/notifications2.php       | 206 +++++++++++++++++++++
 2 files changed, 206 insertions(+), 64 deletions(-)
 create mode 100644 phpBB/includes/db/migration/data/310/notifications2.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notifications.php b/phpBB/includes/db/migration/data/310/notifications.php
index 82bfd4cb2d..17c939d95a 100644
--- a/phpBB/includes/db/migration/data/310/notifications.php
+++ b/phpBB/includes/db/migration/data/310/notifications.php
@@ -91,70 +91,6 @@ class phpbb_db_migration_data_310_notifications extends phpbb_db_migration
 				),
 			)),
 			array('config.add', array('load_notifications', 1)),
-			array('custom', array(array($this, 'convert_notifications'))),
 		);
 	}
-
-	public function convert_notifications()
-	{
-		$convert_notifications = array(
-			array(
-				'check'			=> ($this->config['allow_topic_notify']),
-				'item_type'		=> 'post',
-			),
-			array(
-				'check'			=> ($this->config['allow_forum_notify']),
-				'item_type'		=> 'topic',
-			),
-			array(
-				'check'			=> ($this->config['allow_bookmarks']),
-				'item_type'		=> 'bookmark',
-			),
-			array(
-				'check'			=> ($this->config['allow_privmsg']),
-				'item_type'		=> 'pm',
-			),
-		);
-
-		foreach ($convert_notifications as $convert_data)
-		{
-			if ($convert_data['check'])
-			{
-				$sql = 'SELECT user_id, user_notify_type
-					FROM ' . USERS_TABLE . '
-						WHERE user_notify = 1';
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
-						'item_type'		=> $convert_data['item_type'],
-						'item_id'		=> 0,
-						'user_id'		=> $row['user_id'],
-						'method'		=> '',
-					)));
-
-					if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
-					{
-						$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
-							'item_type'		=> $convert_data['item_type'],
-							'item_id'		=> 0,
-							'user_id'		=> $row['user_id'],
-							'method'		=> 'email',
-						)));
-					}
-
-					if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
-					{
-						$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
-							'item_type'		=> $convert_data['item_type'],
-							'item_id'		=> 0,
-							'user_id'		=> $row['user_id'],
-							'method'		=> 'jabber',
-						)));
-					}
-				}
-				$this->db->sql_freeresult($result);
-			}
-		}
-	}
 }
diff --git a/phpBB/includes/db/migration/data/310/notifications2.php b/phpBB/includes/db/migration/data/310/notifications2.php
new file mode 100644
index 0000000000..a3f29b073a
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/notifications2.php
@@ -0,0 +1,206 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
+{
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_notifications');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_tables'		=> array(
+				$this->table_prefix . 'notification_types',
+				$this->table_prefix . 'notifications',
+				$this->table_prefix . 'user_notifications',
+			),
+			'add_tables'		=> array(
+				$this->table_prefix . 'notification_types'	=> array(
+					'COLUMNS'			=> array(
+						'notification_type_id'		=> array('USINT', NULL, 'auto_increment'),
+						'notification_type_name'	=> array('VCHAR:255', ''),
+						'notification_type_enabled'	=> array('BOOL', 1),
+					),
+					'PRIMARY_KEY'		=> array('notification_type_id'),
+					'KEYS'				=> array(
+						'type'			=> array('UNIQUE', array('notification_type_name')),
+					),
+				),
+				$this->table_prefix . 'notifications'		=> array(
+					'COLUMNS'			=> array(
+						'notification_id'				=> array('UINT:10', NULL, 'auto_increment'),
+						'notification_type_id'			=> array('USINT', 0),
+						'item_id'						=> array('UINT', 0),
+						'item_parent_id'				=> array('UINT', 0),
+						'user_id'						=> array('UINT', 0),
+						'notification_read'				=> array('BOOL', 0),
+						'notification_time'				=> array('TIMESTAMP', 1),
+						'notification_data'				=> array('TEXT_UNI', ''),
+					),
+					'PRIMARY_KEY'		=> 'notification_id',
+					'KEYS'				=> array(
+						'item_ident'		=> array('INDEX', array('notification_type_id', 'item_id')),
+						'user'				=> array('INDEX', array('user_id', 'notification_read')),
+					),
+				),
+				$this->table_prefix . 'user_notifications'	=> array(
+					'COLUMNS'		=> array(
+						'notification_type_id'		=> array('USINT', 0),
+						'item_id'					=> array('UINT', 0),
+						'user_id'					=> array('UINT', 0),
+						'method'					=> array('VCHAR:255', ''),
+						'notify'					=> array('BOOL', 1),
+					),
+					'PRIMARY_KEY'		=> array(
+						'notification_type_id',
+						'item_id',
+						'user_id',
+					),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'	=> array(
+				$this->table_prefix . 'notification_types',
+				$this->table_prefix . 'notifications',
+				$this->table_prefix . 'user_notifications',
+			),
+			'add_tables'		=> array(
+				$this->table_prefix . 'notification_types'	=> array(
+					'COLUMNS'			=> array(
+						'notification_type'			=> array('VCHAR:255', ''),
+						'notification_type_enabled'	=> array('BOOL', 1),
+					),
+					'PRIMARY_KEY'		=> array('notification_type', 'notification_type_enabled'),
+				),
+				$this->table_prefix . 'notifications'		=> array(
+					'COLUMNS'			=> array(
+						'notification_id'  				=> array('UINT', NULL, 'auto_increment'),
+						'item_type'			   			=> array('VCHAR:255', ''),
+						'item_id'		  				=> array('UINT', 0),
+						'item_parent_id'   				=> array('UINT', 0),
+						'user_id'						=> array('UINT', 0),
+						'notification_read'				=> array('BOOL', 0),
+						'notification_time'				=> array('TIMESTAMP', 1),
+						'notification_data'			   	=> array('TEXT_UNI', ''),
+					),
+					'PRIMARY_KEY'		=> 'notification_id',
+					'KEYS'				=> array(
+						'item_ident'		=> array('INDEX', array('item_type', 'item_id')),
+						'user'				=> array('INDEX', array('user_id', 'notification_read')),
+					),
+				),
+				$this->table_prefix . 'user_notifications'	=> array(
+					'COLUMNS'			=> array(
+						'item_type'			=> array('VCHAR:255', ''),
+						'item_id'			=> array('UINT', 0),
+						'user_id'			=> array('UINT', 0),
+						'method'			=> array('VCHAR:255', ''),
+						'notify'			=> array('BOOL', 1),
+					),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'convert_notifications'))),
+		);
+	}
+
+	public function convert_notifications()
+	{
+		$insert_table = $this->table_prefix . 'user_notifications';
+
+		$sql = 'SELECT user_id, user_notify_type, user_notify_pm
+			FROM ' . USERS_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		$sql_insert_data = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$notification_methods = array();
+
+			// In-board notification
+			$notification_methods[] = '';
+
+			if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
+			{
+				$notification_methods[] = 'email';
+			}
+
+			if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
+			{
+				$notification_methods[] = 'jabber';
+			}
+
+			// Notifications for  posts
+			foreach (array('post', 'topic') as $item_type)
+			{
+				$sql_insert_data = $this->add_method_rows(
+					$sql_insert_data,
+					$item_type,
+					0,
+					$row['user_id'],
+					$notification_methods
+				);
+			}
+
+			if ($row['user_notify_pm'])
+			{
+				// Notifications for private messages
+				// User either gets all methods or no method
+				$sql_insert_data = $this->add_method_rows(
+					$sql_insert_data,
+					'pm',
+					0,
+					$row['user_id'],
+					$notification_methods
+				);
+			}
+
+			if (sizeof($sql_insert_data) > 500)
+			{
+				$this->db->sql_multi_insert($insert_table, $sql_insert_data);
+				$sql_insert_data = array();
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($sql_insert_data))
+		{
+			$this->db->sql_multi_insert($insert_table, $sql_insert_data);
+		}
+	}
+
+	protected function add_method_rows(array $sql_insert_data, $item_type, $item_id, $user_id, array $methods)
+	{
+		$row_base = array(
+			'item_type'		=> $item_type,
+			'item_id'		=> (int) $item_id,
+			'user_id'		=> (int) $user_id,
+		);
+
+		foreach ($methods as $method)
+		{
+			$row_base['method'] = $method;
+			$sql_insert_data[] = $row_base;
+		}
+
+		return $sql_insert_data;
+	}
+}
-- 
cgit v1.2.1


From 4c5e51e379f770d9bd3610e7235dafcb985494e1 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sun, 28 Apr 2013 23:40:48 -0500
Subject: [ticket/11413] Rename columns in notification/manager.php

PHPBB3-11413
---
 phpBB/includes/notification/manager.php | 276 +++++++++++++++++++-------------
 1 file changed, 165 insertions(+), 111 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 9eceeb753a..8ea4cdc121 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -36,6 +36,9 @@ class phpbb_notification_manager
 	/** @var phpbb_db_driver */
 	protected $db;
 
+	/** @var phpbb_cache_service */
+	protected $cache;
+
 	/** @var phpbb_user */
 	protected $user;
 
@@ -70,7 +73,7 @@ class phpbb_notification_manager
 	* @param string $user_notifications_table
 	* @return phpbb_notification_manager
 	*/
-	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, phpbb_db_driver $db, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
+	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_service $cache, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
 	{
 		$this->notification_types = $notification_types;
 		$this->notification_methods = $notification_methods;
@@ -78,6 +81,7 @@ class phpbb_notification_manager
 
 		$this->user_loader = $user_loader;
 		$this->db = $db;
+		$this->cache = $cache;
 		$this->user = $user;
 
 		$this->phpbb_root_path = $phpbb_root_path;
@@ -145,7 +149,7 @@ class phpbb_notification_manager
 				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
 				WHERE n.user_id = ' . (int) $options['user_id'] . '
 					AND n.notification_read = 0
-					AND nt.notification_type = n.item_type
+					AND nt.notification_type_id = n.notification_type_id
 					AND nt.notification_type_enabled = 1';
 			$result = $this->db->sql_query($sql);
 			$unread_count = (int) $this->db->sql_fetchfield('unread_count', $result);
@@ -158,7 +162,7 @@ class phpbb_notification_manager
 			$sql = 'SELECT COUNT(n.notification_id) AS total_count
 				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
 				WHERE n.user_id = ' . (int) $options['user_id'] . '
-					AND nt.notification_type = n.item_type
+					AND nt.notification_type_id = n.notification_type_id
 					AND nt.notification_type_enabled = 1';
 			$result = $this->db->sql_query($sql);
 			$total_count = (int) $this->db->sql_fetchfield('total_count', $result);
@@ -170,11 +174,11 @@ class phpbb_notification_manager
 			$rowset = array();
 
 			// Get the main notifications
-			$sql = 'SELECT n.*
+			$sql = 'SELECT n.*, nt.notification_type_name
 				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
 				WHERE n.user_id = ' . (int) $options['user_id'] .
 					(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('n.notification_id', $options['notification_id']) : ' AND n.notification_id = ' . (int) $options['notification_id']) : '') . '
-					AND nt.notification_type = n.item_type
+					AND nt.notification_type_id = n.notification_type_id
 					AND nt.notification_type_enabled = 1
 				ORDER BY n.' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 			$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
@@ -188,12 +192,12 @@ class phpbb_notification_manager
 			// Get all unread notifications
 			if ($unread_count && $options['all_unread'] && !empty($rowset))
 			{
-				$sql = 'SELECT n.*
+				$sql = 'SELECT n.*, nt.notification_type_name
 				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
 					WHERE n.user_id = ' . (int) $options['user_id'] . '
 						AND n.notification_read = 0
 						AND ' . $this->db->sql_in_set('n.notification_id', array_keys($rowset), true) . '
-						AND nt.notification_type = n.item_type
+						AND nt.notification_type_id = n.notification_type_id
 						AND nt.notification_type_enabled = 1
 					ORDER BY n.' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
 				$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
@@ -207,17 +211,17 @@ class phpbb_notification_manager
 
 			foreach ($rowset as $row)
 			{
-				$notification = $this->get_item_type_class($row['item_type'], $row);
+				$notification = $this->get_item_type_class($row['notification_type_name'], $row);
 
 				// Array of user_ids to query all at once
 				$user_ids = array_merge($user_ids, $notification->users_to_query());
 
 				// Some notification types also require querying additional tables themselves
-				if (!isset($load_special[$row['item_type']]))
+				if (!isset($load_special[$row['notification_type_name']]))
 				{
-					$load_special[$row['item_type']] = array();
+					$load_special[$row['notification_type_name']] = array();
 				}
-				$load_special[$row['item_type']] = array_merge($load_special[$row['item_type']], $notification->get_load_special());
+				$load_special[$row['notification_type_name']] = array_merge($load_special[$row['notification_type_name']], $notification->get_load_special());
 
 				$notifications[$row['notification_id']] = $notification;
 			}
@@ -243,19 +247,21 @@ class phpbb_notification_manager
 	/**
 	* Mark notifications read
 	*
-	* @param bool|string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types). False to mark read for all item types
+	* @param bool|string|array $notification_type_name Type identifier or array of item types (only acceptable if the $data is identical for the specified types). False to mark read for all item types
 	* @param bool|int|array $item_id Item id or array of item ids. False to mark read for all item ids
 	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
 	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
 	*/
-	public function mark_notifications_read($item_type, $item_id, $user_id, $time = false)
+	public function mark_notifications_read($notification_type_name, $item_id, $user_id, $time = false)
 	{
 		$time = ($time !== false) ? $time : time();
 
 		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET notification_read = 1
 			WHERE notification_time <= " . (int) $time .
-				(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
+				(($notification_type_name !== false) ? ' AND ' .
+					(is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name))
+					 : '') .
 				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '') .
 				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '');
 		$this->db->sql_query($sql);
@@ -264,29 +270,21 @@ class phpbb_notification_manager
 	/**
 	* Mark notifications read from a parent identifier
 	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
+	* @param string|array $notification_type_name Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
 	* @param bool|int|array $item_parent_id Item parent id or array of item parent ids. False to mark read for all item parent ids
 	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
 	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
 	*/
-	public function mark_notifications_read_by_parent($item_type, $item_parent_id, $user_id, $time = false)
+	public function mark_notifications_read_by_parent($notification_type_name, $item_parent_id, $user_id, $time = false)
 	{
-		if (is_array($item_type))
-		{
-			foreach ($item_type as $type)
-			{
-				$this->mark_notifications_read_by_parent($type, $item_parent_id, $user_id, $time);
-			}
-
-			return;
-		}
-
 		$time = ($time !== false) ? $time : time();
 
 		$sql = 'UPDATE ' . $this->notifications_table . "
 			SET notification_read = 1
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND notification_time <= " . (int) $time .
+			WHERE notification_time <= " . (int) $time .
+				(($notification_type_name !== false) ? ' AND ' .
+					(is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name))
+					 : '') .
 				(($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') .
 				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
 		$this->db->sql_query($sql);
@@ -312,7 +310,7 @@ class phpbb_notification_manager
 	/**
 	* Add a notification
 	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
+	* @param string|array $notification_type_name Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
 	*			Note: If you send an array of types, any user who could receive multiple notifications from this single item will only receive
 	* 			a single notification. If they MUST receive multiple notifications, call this function multiple times instead of sending an array
 	* @param array $data Data specific for this type that will be inserted
@@ -320,18 +318,18 @@ class phpbb_notification_manager
 	* 			ignore_users	array of data to specify which users should not receive certain types of notifications
 	* @return array Information about what users were notified and how they were notified
 	*/
-	public function add_notifications($item_type, $data, array $options = array())
+	public function add_notifications($notification_type_name, $data, array $options = array())
 	{
 		$options = array_merge(array(
 			'ignore_users'		=> array(),
 		), $options);
 
-		if (is_array($item_type))
+		if (is_array($notification_type_name))
 		{
 			$notified_users = array();
 			$temp_options = $options;
 
-			foreach ($item_type as $type)
+			foreach ($notification_type_name as $type)
 			{
 				$temp_options['ignore_users'] = $options['ignore_users'] + $notified_users;
 				$notified_users += $this->add_notifications($type, $data, $temp_options);
@@ -340,12 +338,12 @@ class phpbb_notification_manager
 			return $notified_users;
 		}
 
-		$item_id = $this->get_item_type_class($item_type)->get_item_id($data);
+		$item_id = $this->get_item_type_class($notification_type_name)->get_item_id($data);
 
 		// find out which users want to receive this type of notification
-		$notify_users = $this->get_item_type_class($item_type)->find_users_for_notification($data, $options);
+		$notify_users = $this->get_item_type_class($notification_type_name)->find_users_for_notification($data, $options);
 
-		$this->add_notifications_for_users($item_type, $data, $notify_users);
+		$this->add_notifications_for_users($notification_type_name, $data, $notify_users);
 
 		return $notify_users;
 	}
@@ -353,15 +351,15 @@ class phpbb_notification_manager
 	/**
 	* Add a notification for specific users
 	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
+	* @param string|array $notification_type_name Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
 	* @param array $data Data specific for this type that will be inserted
 	* @param array $notify_users User list to notify
 	*/
-	public function add_notifications_for_users($item_type, $data, $notify_users)
+	public function add_notifications_for_users($notification_type_name, $data, $notify_users)
 	{
-		if (is_array($item_type))
+		if (is_array($notification_type_name))
 		{
-			foreach ($item_type as $type)
+			foreach ($notification_type_name as $type)
 			{
 				$this->add_notifications_for_users($type, $data, $notify_users);
 			}
@@ -369,24 +367,9 @@ class phpbb_notification_manager
 			return;
 		}
 
-		$sql = 'SELECT notification_type
-			FROM ' . $this->notification_types_table . "
-			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
-		$result = $this->db->sql_query($sql);
+		$notification_type_id = $this->get_notification_type_id($notification_type_name);
 
-		if ($this->db->sql_fetchrow($result) === false)
-		{
-			// Does not exist in the database, must add the item type
-			$sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array(
-				'notification_type'				=> $item_type,
-				'notification_type_enabled'		=> 1,
-			));
-			$this->db->sql_query($sql);
-		}
-
-		$this->db->sql_freeresult($result);
-
-		$item_id = $this->get_item_type_class($item_type)->get_item_id($data);
+		$item_id = $this->get_item_type_class($notification_type_name)->get_item_id($data);
 
 		$user_ids = array();
 		$notification_objects = $notification_methods = array();
@@ -397,10 +380,10 @@ class phpbb_notification_manager
 		// Make sure not to send new notifications to users who've already been notified about this item
 		// This may happen when an item was added, but now new users are able to see the item
 		$sql = 'SELECT n.user_id
-			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
-			WHERE n.item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND n.item_id = " . (int) $item_id . '
-				AND nt.notification_type = n.item_type
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+			WHERE n.notification_type_id = ' . (int) $notification_type_id . '
+				AND n.item_id = ' . (int) $item_id . '
+				AND nt.notification_type_id = n.notification_type_id
 				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
@@ -415,7 +398,7 @@ class phpbb_notification_manager
 		}
 
 		// Allow notifications to perform actions before creating the insert array (such as run a query to cache some data needed for all notifications)
-		$notification = $this->get_item_type_class($item_type);
+		$notification = $this->get_item_type_class($notification_type_name);
 		$pre_create_data = $notification->pre_create_insert_array($data, $notify_users);
 		unset($notification);
 
@@ -424,7 +407,7 @@ class phpbb_notification_manager
 		// Go through each user so we can insert a row in the DB and then notify them by their desired means
 		foreach ($notify_users as $user => $methods)
 		{
-			$notification = $this->get_item_type_class($item_type);
+			$notification = $this->get_item_type_class($notification_type_name);
 
 			$notification->user_id = (int) $user;
 
@@ -464,14 +447,14 @@ class phpbb_notification_manager
 	/**
 	* Update a notification
 	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
+	* @param string|array $notification_type_name Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
 	* @param array $data Data specific for this type that will be updated
 	*/
-	public function update_notifications($item_type, $data)
+	public function update_notifications($notification_type_name, $data)
 	{
-		if (is_array($item_type))
+		if (is_array($notification_type_name))
 		{
-			foreach ($item_type as $type)
+			foreach ($notification_type_name as $type)
 			{
 				$this->update_notifications($type, $data);
 			}
@@ -479,7 +462,7 @@ class phpbb_notification_manager
 			return;
 		}
 
-		$notification = $this->get_item_type_class($item_type);
+		$notification = $this->get_item_type_class($notification_type_name);
 
 		// Allow the notifications class to over-ride the update_notifications functionality
 		if (method_exists($notification, 'update_notifications'))
@@ -491,28 +474,29 @@ class phpbb_notification_manager
 			}
 		}
 
+		$notification_type_id = $this->get_notification_type_id($notification_type_name);
 		$item_id = $notification->get_item_id($data);
 		$update_array = $notification->create_update_array($data);
 
 		$sql = 'UPDATE ' . $this->notifications_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $update_array) . "
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id;
+			SET ' . $this->db->sql_build_array('UPDATE', $update_array) . '
+			WHERE notification_type_id = ' . (int) $notification_type_id . '
+				AND item_id = ' . (int) $item_id;
 		$this->db->sql_query($sql);
 	}
 
 	/**
 	* Delete a notification
 	*
-	* @param string|array $item_type Type identifier or array of item types (only acceptable if the $item_id is identical for the specified types)
+	* @param string|array $notification_type_name Type identifier or array of item types (only acceptable if the $item_id is identical for the specified types)
 	* @param int|array $item_id Identifier within the type (or array of ids)
 	* @param array $data Data specific for this type that will be updated
 	*/
-	public function delete_notifications($item_type, $item_id)
+	public function delete_notifications($notification_type_name, $item_id)
 	{
-		if (is_array($item_type))
+		if (is_array($notification_type_name))
 		{
-			foreach ($item_type as $type)
+			foreach ($notification_type_name as $type)
 			{
 				$this->delete_notifications($type, $item_id);
 			}
@@ -520,9 +504,11 @@ class phpbb_notification_manager
 			return;
 		}
 
-		$sql = 'DELETE FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND " . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id);
+		$notification_type_id = $this->get_notification_type_id($notification_type_name);
+
+		$sql = 'DELETE FROM ' . $this->notifications_table . '
+			WHERE notification_type_id = ' . (int) $notification_type_id . '
+				AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id);
 		$this->db->sql_query($sql);
 	}
 
@@ -646,24 +632,25 @@ class phpbb_notification_manager
 	/**
 	* Add a subscription
 	*
-	* @param string $item_type Type identifier of the subscription
+	* @param string $notification_type_name Type identifier of the subscription
 	* @param int $item_id The id of the item
 	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
 	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
 	*/
-	public function add_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
+	public function add_subscription($notification_type_name, $item_id = 0, $method = '', $user_id = false)
 	{
 		if ($method !== '')
 		{
-			$this->add_subscription($item_type, $item_type, '', $user_id);
+			$this->add_subscription($notification_type_name, $item_id, '', $user_id);
 		}
 
+		$notification_type_id = $this->get_notification_type_id($notification_type_name);
 		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
 		$sql = 'SELECT notify
-			FROM ' . $this->user_notifications_table . "
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id . '
+			FROM ' . $this->user_notifications_table . '
+			WHERE notification_type_id = ' . (int) $notification_type_name . '
+				AND item_id = ' . (int) $item_id . '
 				AND user_id = ' .(int) $user_id . "
 				AND method = '" . $this->db->sql_escape($method) . "'";
 		$this->db->sql_query($sql);
@@ -674,7 +661,7 @@ class phpbb_notification_manager
 		{
 			$sql = 'INSERT INTO ' . $this->user_notifications_table . ' ' .
 				$this->db->sql_build_array('INSERT', array(
-					'item_type'		=> $item_type,
+					'notification_type_id'		=> $notification_type_id,
 					'item_id'		=> (int) $item_id,
 					'user_id'		=> (int) $user_id,
 					'method'		=> $method,
@@ -684,10 +671,10 @@ class phpbb_notification_manager
 		}
 		else if (!$current)
 		{
-			$sql = 'UPDATE ' . $this->user_notifications_table . "
+			$sql = 'UPDATE ' . $this->user_notifications_table . '
 				SET notify = 1
-				WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-					AND item_id = " . (int) $item_id . '
+				WHERE notification_type_id = ' . (int) $notification_type_id . '
+					AND item_id = ' . (int) $item_id . '
 					AND user_id = ' .(int) $user_id . "
 					AND method = '" . $this->db->sql_escape($method) . "'";
 			$this->db->sql_query($sql);
@@ -697,22 +684,23 @@ class phpbb_notification_manager
 	/**
 	* Delete a subscription
 	*
-	* @param string $item_type Type identifier of the subscription
+	* @param string $notification_type_name Type identifier of the subscription
 	* @param int $item_id The id of the item
 	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
 	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
 	*/
-	public function delete_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
+	public function delete_subscription($notification_type_name, $item_id = 0, $method = '', $user_id = false)
 	{
+		$notification_type_id = $this->get_notification_type_id($notification_type_name);
 		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
 		// If no method, make sure that no other notification methods for this item are selected before deleting
 		if ($method === '')
 		{
 			$sql = 'SELECT COUNT(*) as num_notifications
-				FROM ' . $this->user_notifications_table . "
-				WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-					AND item_id = " . (int) $item_id . '
+				FROM ' . $this->user_notifications_table . '
+				WHERE notification_type_id = ' . (int) $notification_type_id . '
+					AND item_id = ' . (int) $item_id . '
 					AND user_id = ' .(int) $user_id . "
 					AND method <> ''
 					AND notify = 1";
@@ -726,10 +714,10 @@ class phpbb_notification_manager
 			}
 		}
 
-		$sql = 'UPDATE ' . $this->user_notifications_table . "
+		$sql = 'UPDATE ' . $this->user_notifications_table . '
 			SET notify = 0
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id . '
+			WHERE notification_type_id = ' . (int) $notification_type_id . '
+				AND item_id = '. (int) $item_id . '
 				AND user_id = ' .(int) $user_id . "
 				AND method = '" . $this->db->sql_escape($method) . "'";
 		$this->db->sql_query($sql);
@@ -738,7 +726,7 @@ class phpbb_notification_manager
 		{
 			$sql = 'INSERT INTO ' . $this->user_notifications_table . ' ' .
 				$this->db->sql_build_array('INSERT', array(
-					'item_type'		=> $item_type,
+					'notification_type_id'		=> (int) $notification_type_id,
 					'item_id'		=> (int) $item_id,
 					'user_id'		=> (int) $user_id,
 					'method'		=> $method,
@@ -755,13 +743,13 @@ class phpbb_notification_manager
 	* is disabled so that all those notifications are hidden and do not
 	* cause errors
 	*
-	* @param string $item_type Type identifier of the subscription
+	* @param string $notification_type_name Type identifier of the subscription
 	*/
-	public function disable_notifications($item_type)
+	public function disable_notifications($notification_type_name)
 	{
 		$sql = 'UPDATE ' . $this->notification_types_table . "
 			SET notification_type_enabled = 0
-			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
+			WHERE notification_type_name = '" . $this->db->sql_escape($notification_type_name) . "'";
 		$this->db->sql_query($sql);
 	}
 
@@ -771,17 +759,21 @@ class phpbb_notification_manager
 	* This should be called when an extension which has notification types
 	* is purged so that all those notifications are removed
 	*
-	* @param string $item_type Type identifier of the subscription
+	* @param string $notification_type_name Type identifier of the subscription
 	*/
-	public function purge_notifications($item_type)
+	public function purge_notifications($notification_type_name)
 	{
-		$sql = 'DELETE FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
+		$notification_type_id = $this->get_notification_type_id($notification_type_name);
+
+		$sql = 'DELETE FROM ' . $this->notifications_table . '
+			WHERE notification_type_id = ' . (int) $notification_type_id;
 		$this->db->sql_query($sql);
 
-		$sql = 'DELETE FROM ' . $this->notification_types_table . "
-			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
+		$sql = 'DELETE FROM ' . $this->notification_types_table . '
+			WHERE notification_type_id = ' . (int) $notification_type_id;
 		$this->db->sql_query($sql);
+
+		$this->cache->destroy('notification_type_ids');
 	}
 
 	/**
@@ -791,13 +783,13 @@ class phpbb_notification_manager
 	* that was disabled is re-enabled so that all those notifications that
 	* were hidden are shown again
 	*
-	* @param string $item_type Type identifier of the subscription
+	* @param string $notification_type_name Type identifier of the subscription
 	*/
-	public function enable_notifications($item_type)
+	public function enable_notifications($notification_type_name)
 	{
 		$sql = 'UPDATE ' . $this->notification_types_table . "
 			SET notification_type_enabled = 1
-			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
+			WHERE notification_type_name = '" . $this->db->sql_escape($notification_type_name) . "'";
 		$this->db->sql_query($sql);
 	}
 
@@ -816,11 +808,11 @@ class phpbb_notification_manager
 	/**
 	* Helper to get the notifications item type class and set it up
 	*/
-	public function get_item_type_class($item_type, $data = array())
+	public function get_item_type_class($notification_type_name, $data = array())
 	{
-		$item_type = (strpos($item_type, 'notification.type.') === 0) ? $item_type : 'notification.type.' . $item_type;
+		$notification_type_name = (strpos($notification_type_name, 'notification.type.') === 0) ? $notification_type_name : 'notification.type.' . $notification_type_name;
 
-		$item = $this->load_object($item_type);
+		$item = $this->load_object($notification_type_name);
 
 		$item->set_initial_data($data);
 
@@ -851,4 +843,66 @@ class phpbb_notification_manager
 		
 		return $object;
 	}
+
+	/**
+	* Get the notification type id from the name
+	*
+	* @param string $notification_type_name The name
+	* @return int the notification_type_id
+	*/
+	public function get_notification_type_id($notification_type_name)
+	{
+		$notification_type_ids = $this->cache->get('notification_type_ids');
+
+		if ($notification_type_ids === false)
+		{
+			$notification_type_ids = array();
+
+			$sql = 'SELECT notification_type_id, notification_type_name
+				FROM ' . $this->notification_types_table;
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$notification_type_ids[$row['notification_type_name']] = (int) $row['notification_type_id'];
+			}
+			$this->db->sql_freeresult($result);
+
+			$this->cache->put('notification_type_ids', $notification_type_ids);
+		}
+
+		if (!isset($notification_type_ids[$notification_type_name]))
+		{
+			$notification_type = $this->get_item_type_class($notification_type_name);
+
+			$sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array(
+				'notification_type_name'		=> $notification_type_name,
+				'notification_type_enabled'		=> 1,
+			));
+			$this->db->sql_query($sql);
+
+			$notification_type_ids[$notification_type_name] = (int) $this->db->sql_nextid();
+
+			$this->cache->put('notification_type_ids', $notification_type_ids);
+		}
+
+		return $notification_type_ids[$notification_type_name];
+	}
+
+	/**
+	* Get notification type ids (as an array)
+	*
+	* @param array $notification_type_names Array of strings
+	* @return array Array of integers
+	*/
+	public function get_notification_type_ids(array $notification_type_names)
+	{
+		$notification_type_ids = array();
+
+		foreach ($notification_type_names as $name)
+		{
+			$notification_type_ids[$name] = $this->get_notification_type_id($name);
+		}
+
+		return $notification_type_ids;
+	}
 }
-- 
cgit v1.2.1


From 33287a73609a99f33f3d0718fceaf72e39d5283e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Apr 2013 21:22:07 -0500
Subject: [ticket/11413] Undo editing the user_notifications table

item_type is not equivalent to notification_type_name, it can be a generic
string (typically used to be able to subscribe to multiple notification
types while only subscribing to one item

PHPBB3-11413
---
 .../db/migration/data/310/notifications2.php       | 28 ++-------------
 phpBB/includes/notification/manager.php            | 41 +++++++++++-----------
 phpBB/includes/notification/type/base.php          | 20 ++++++++---
 phpBB/includes/notification/type/bookmark.php      |  8 ++---
 phpBB/includes/notification/type/post.php          |  8 ++---
 phpBB/includes/notification/type/quote.php         | 22 ++++++------
 6 files changed, 57 insertions(+), 70 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notifications2.php b/phpBB/includes/db/migration/data/310/notifications2.php
index a3f29b073a..cd078f8f60 100644
--- a/phpBB/includes/db/migration/data/310/notifications2.php
+++ b/phpBB/includes/db/migration/data/310/notifications2.php
@@ -20,7 +20,6 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 			'drop_tables'		=> array(
 				$this->table_prefix . 'notification_types',
 				$this->table_prefix . 'notifications',
-				$this->table_prefix . 'user_notifications',
 			),
 			'add_tables'		=> array(
 				$this->table_prefix . 'notification_types'	=> array(
@@ -51,20 +50,6 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 						'user'				=> array('INDEX', array('user_id', 'notification_read')),
 					),
 				),
-				$this->table_prefix . 'user_notifications'	=> array(
-					'COLUMNS'		=> array(
-						'notification_type_id'		=> array('USINT', 0),
-						'item_id'					=> array('UINT', 0),
-						'user_id'					=> array('UINT', 0),
-						'method'					=> array('VCHAR:255', ''),
-						'notify'					=> array('BOOL', 1),
-					),
-					'PRIMARY_KEY'		=> array(
-						'notification_type_id',
-						'item_id',
-						'user_id',
-					),
-				),
 			),
 		);
 	}
@@ -75,7 +60,6 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 			'drop_tables'	=> array(
 				$this->table_prefix . 'notification_types',
 				$this->table_prefix . 'notifications',
-				$this->table_prefix . 'user_notifications',
 			),
 			'add_tables'		=> array(
 				$this->table_prefix . 'notification_types'	=> array(
@@ -102,15 +86,6 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 						'user'				=> array('INDEX', array('user_id', 'notification_read')),
 					),
 				),
-				$this->table_prefix . 'user_notifications'	=> array(
-					'COLUMNS'			=> array(
-						'item_type'			=> array('VCHAR:255', ''),
-						'item_id'			=> array('UINT', 0),
-						'user_id'			=> array('UINT', 0),
-						'method'			=> array('VCHAR:255', ''),
-						'notify'			=> array('BOOL', 1),
-					),
-				),
 			),
 		);
 	}
@@ -126,6 +101,9 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 	{
 		$insert_table = $this->table_prefix . 'user_notifications';
 
+		$sql = 'DELETE FROM ' . $insert_table;
+		$this->db->sql_query($sql);
+
 		$sql = 'SELECT user_id, user_notify_type, user_notify_pm
 			FROM ' . USERS_TABLE;
 		$result = $this->db->sql_query($sql);
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index 8ea4cdc121..e7d6af71b8 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -632,25 +632,25 @@ class phpbb_notification_manager
 	/**
 	* Add a subscription
 	*
-	* @param string $notification_type_name Type identifier of the subscription
+	* @param string $item_type Type identifier of the subscription
 	* @param int $item_id The id of the item
 	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
 	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
 	*/
-	public function add_subscription($notification_type_name, $item_id = 0, $method = '', $user_id = false)
+	public function add_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
 	{
 		if ($method !== '')
 		{
-			$this->add_subscription($notification_type_name, $item_id, '', $user_id);
+			// Make sure to subscribe them to the base subscription
+			$this->add_subscription($item_type, $item_id, '', $user_id);
 		}
 
-		$notification_type_id = $this->get_notification_type_id($notification_type_name);
 		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
 		$sql = 'SELECT notify
-			FROM ' . $this->user_notifications_table . '
-			WHERE notification_type_id = ' . (int) $notification_type_name . '
-				AND item_id = ' . (int) $item_id . '
+			FROM ' . $this->user_notifications_table . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id . '
 				AND user_id = ' .(int) $user_id . "
 				AND method = '" . $this->db->sql_escape($method) . "'";
 		$this->db->sql_query($sql);
@@ -661,7 +661,7 @@ class phpbb_notification_manager
 		{
 			$sql = 'INSERT INTO ' . $this->user_notifications_table . ' ' .
 				$this->db->sql_build_array('INSERT', array(
-					'notification_type_id'		=> $notification_type_id,
+					'item_type'		=> $item_type,
 					'item_id'		=> (int) $item_id,
 					'user_id'		=> (int) $user_id,
 					'method'		=> $method,
@@ -671,10 +671,10 @@ class phpbb_notification_manager
 		}
 		else if (!$current)
 		{
-			$sql = 'UPDATE ' . $this->user_notifications_table . '
+			$sql = 'UPDATE ' . $this->user_notifications_table . "
 				SET notify = 1
-				WHERE notification_type_id = ' . (int) $notification_type_id . '
-					AND item_id = ' . (int) $item_id . '
+				WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+					AND item_id = " . (int) $item_id . '
 					AND user_id = ' .(int) $user_id . "
 					AND method = '" . $this->db->sql_escape($method) . "'";
 			$this->db->sql_query($sql);
@@ -684,23 +684,22 @@ class phpbb_notification_manager
 	/**
 	* Delete a subscription
 	*
-	* @param string $notification_type_name Type identifier of the subscription
+	* @param string $item_type Type identifier of the subscription
 	* @param int $item_id The id of the item
 	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
 	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
 	*/
-	public function delete_subscription($notification_type_name, $item_id = 0, $method = '', $user_id = false)
+	public function delete_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
 	{
-		$notification_type_id = $this->get_notification_type_id($notification_type_name);
 		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
 
 		// If no method, make sure that no other notification methods for this item are selected before deleting
 		if ($method === '')
 		{
 			$sql = 'SELECT COUNT(*) as num_notifications
-				FROM ' . $this->user_notifications_table . '
-				WHERE notification_type_id = ' . (int) $notification_type_id . '
-					AND item_id = ' . (int) $item_id . '
+				FROM ' . $this->user_notifications_table . "
+				WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+					AND item_id = " . (int) $item_id . '
 					AND user_id = ' .(int) $user_id . "
 					AND method <> ''
 					AND notify = 1";
@@ -714,10 +713,10 @@ class phpbb_notification_manager
 			}
 		}
 
-		$sql = 'UPDATE ' . $this->user_notifications_table . '
+		$sql = 'UPDATE ' . $this->user_notifications_table . "
 			SET notify = 0
-			WHERE notification_type_id = ' . (int) $notification_type_id . '
-				AND item_id = '. (int) $item_id . '
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id . '
 				AND user_id = ' .(int) $user_id . "
 				AND method = '" . $this->db->sql_escape($method) . "'";
 		$this->db->sql_query($sql);
@@ -726,7 +725,7 @@ class phpbb_notification_manager
 		{
 			$sql = 'INSERT INTO ' . $this->user_notifications_table . ' ' .
 				$this->db->sql_build_array('INSERT', array(
-					'notification_type_id'		=> (int) $notification_type_id,
+					'item_type'		=> $item_type,
 					'item_id'		=> (int) $item_id,
 					'user_id'		=> (int) $user_id,
 					'method'		=> $method,
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 600ef7c965..f56956d16a 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -68,11 +68,19 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	*/
 	public static $notification_option = false;
 
+	/**
+	* The notification_type_id, set upon creation of the class
+	* This is the notification_type_id from the notification_types table
+	*
+	* @var int
+	*/
+	protected $notification_type_id;
+
 	/**
 	* Indentification data
-	* item_type			- Type of the item (translates to the notification type)
-	* item_id			- ID of the item (e.g. post_id, msg_id)
-	* item_parent_id	- Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
+	* notification_type_id	- ID of the item type (auto generated, from notification types table)
+	* item_id				- ID of the item (e.g. post_id, msg_id)
+	* item_parent_id		- Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
 	* user_id
 	* notification_read
 	* notification_time
@@ -124,6 +132,8 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	public function set_notification_manager(phpbb_notification_manager $notification_manager)
 	{
 		$this->notification_manager = $notification_manager;
+
+		$this->notification_type_id = $this->notification_manager->get_notification_type_id($this->get_type());
 	}
 
 	/**
@@ -211,7 +221,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		// Defaults
 		$this->data = array_merge(array(
 			'item_id'				=> static::get_item_id($type_data),
-			'item_type'	   			=> $this->get_type(),
+			'notification_type_id'	=> $this->notification_type_id,
 			'item_parent_id'		=> static::get_item_parent_id($type_data),
 
 			'notification_time'		=> time(),
@@ -460,7 +470,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 		$this->notification_read = (bool) !$unread;
 
 		$where = array(
-			"item_type = '" . $this->db->sql_escape($this->item_type) . "'",
+			'notification_type_id = ' . (int) $this->notification_type_id,
 			'item_id = ' . (int) $this->item_id,
 			'user_id = ' . (int) $this->user_id,
 		);
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index 946cb9b4ed..ae2e75d3eb 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -103,11 +103,11 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
 		$sql = 'SELECT n.*
-			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
-			WHERE n.item_type = '" . $this->get_type() . "'
-				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+			WHERE n.notification_type_id = ' . (int) $this->notification_type_id . '
+				AND n.item_parent_id = ' . (int) self::get_item_parent_id($post) . '
 				AND n.notification_read = 0
-				AND nt.notification_type = n.item_type
+				AND nt.notification_type_id = n.notification_type_id
 				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 626c13b7fd..9207fd866e 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -138,11 +138,11 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
 		$sql = 'SELECT n.*
-			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
-			WHERE n.item_type = '" . $this->get_type() . "'
-				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+			WHERE n.notification_type_id = ' . (int) $this->notification_type_id . '
+				AND n.item_parent_id = ' . (int) self::get_item_parent_id($post) . '
 				AND n.notification_read = 0
-				AND nt.notification_type = n.item_type
+				AND nt.notification_type_id = n.notification_type_id
 				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index e9eb7bea21..0ed13f36fb 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -122,11 +122,11 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
 		$sql = 'SELECT n.*
-			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
-			WHERE n.item_type = '" . $this->get_type() . "'
-				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+			WHERE n.notification_type_id = ' . (int) $this->notification_type_id . '
+				AND n.item_parent_id = ' . (int) self::get_item_parent_id($post) . '
 				AND n.notification_read = 0
-				AND nt.notification_type = n.item_type
+				AND nt.notification_type_id = n.notification_type_id
 				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
@@ -154,10 +154,10 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 	{
 		$old_notifications = array();
 		$sql = 'SELECT n.user_id
-			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
-			WHERE n.item_type = '" . $this->get_type() . "'
-				AND n.item_id = " . self::get_item_id($post) . '
-				AND nt.notification_type = n.item_type
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+			WHERE n.notification_type_id = ' . (int) $this->notification_type_id . '
+				AND n.item_id = ' . self::get_item_id($post) . '
+				AND nt.notification_type_id = n.notification_type_id
 				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
@@ -185,9 +185,9 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		// Remove the necessary notifications
 		if (!empty($remove_notifications))
 		{
-			$sql = 'DELETE FROM ' . $this->notifications_table . "
-				WHERE item_type = '" . $this->get_type() . "'
-					AND item_id = " . self::get_item_id($post) . '
+			$sql = 'DELETE FROM ' . $this->notifications_table . '
+				WHERE notification_type_id = ' . (int) $this->notification_type_id . '
+					AND item_id = ' . self::get_item_id($post) . '
 					AND ' . $this->db->sql_in_set('user_id', $remove_notifications);
 			$this->db->sql_query($sql);
 		}
-- 
cgit v1.2.1


From 7bda5a016a726711855fb7a749f9f3638e63d1e3 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Apr 2013 21:42:14 -0500
Subject: [ticket/11413] Prevent recursive function calls

PHPBB3-11413
---
 phpBB/includes/notification/manager.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index e7d6af71b8..a9eb503fb8 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -871,7 +871,10 @@ class phpbb_notification_manager
 
 		if (!isset($notification_type_ids[$notification_type_name]))
 		{
-			$notification_type = $this->get_item_type_class($notification_type_name);
+			if (!isset($this->notification_types[$notification_type_name]) && !isset($this->notification_types['notification.type.' . $notification_type_name]))
+			{
+				throw new phpbb_notification_exception('Notification type ' . $notification_type_name . ' does not exist');
+			}
 
 			$sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array(
 				'notification_type_name'		=> $notification_type_name,
-- 
cgit v1.2.1


From 4cd0914f8976913de0ec46cc78c8ac5731415838 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Apr 2013 22:16:46 -0500
Subject: [ticket/11413] Fix notification tests

Send types/methods the cache service, not the driver (not sure why the
driver was sent before)

PHPBB3-11413
---
 phpBB/includes/notification/exception.php   | 29 +++++++++++++++++++++++++++++
 phpBB/includes/notification/method/base.php |  4 ++--
 phpBB/includes/notification/type/base.php   |  4 ++--
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 phpBB/includes/notification/exception.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/exception.php b/phpBB/includes/notification/exception.php
new file mode 100644
index 0000000000..a52d6fdc57
--- /dev/null
+++ b/phpBB/includes/notification/exception.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Notifications exception
+*
+* @package notifications
+*/
+class phpbb_notification_exception extends \Exception
+{
+	public function __toString()
+	{
+		return $this->getMessage();
+	}
+}
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index 22418c9be8..bae85310b2 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -66,7 +66,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	* 
 	* @param phpbb_user_loader $user_loader
 	* @param phpbb_db_driver $db
-	* @param phpbb_cache_driver_interface $cache
+	* @param phpbb_cache_service $cache
 	* @param phpbb_user $user
 	* @param phpbb_auth $auth
 	* @param phpbb_config $config
@@ -74,7 +74,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	* @param string $php_ext
 	* @return phpbb_notification_method_base
 	*/
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_service $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index f56956d16a..983383ce2a 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -96,7 +96,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* 
 	* @param phpbb_user_loader $user_loader
 	* @param phpbb_db_driver $db
-	* @param phpbb_cache_driver_interface $cache
+	* @param phpbb_cache_service $cache
 	* @param phpbb_user $user
 	* @param phpbb_auth $auth
 	* @param phpbb_config $config
@@ -107,7 +107,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* @param string $user_notifications_table
 	* @return phpbb_notification_type_base
 	*/
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
+	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_service $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
-- 
cgit v1.2.1


From 8a4260703fa76bb92f144b527b3d55289568db74 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 10:32:01 +0200
Subject: [ticket/11495] Fix some docs and replace branch with other terms

PHPBB3-11495
---
 phpBB/includes/tree/interface.php | 20 ++++++++++----------
 phpBB/includes/tree/nestedset.php | 24 ++++++++++++------------
 2 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index ed0ccca3f1..1b462768a0 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -28,12 +28,12 @@ interface phpbb_tree_interface
 	/**
 	* Delete an item from the tree and from the database table
 	*
-	* Also deletes all subitems from the tree and from the database table
+	* Also deletes the subtree from the tree and from the database table
 	*
 	* @param int	$item_id	The item to be deleted
 	* @return array		Item ids that have been deleted
 	*/
-	public function delete($item);
+	public function delete($item_id);
 
 	/**
 	* Move an item by a given delta
@@ -79,16 +79,16 @@ interface phpbb_tree_interface
 	/**
 	* Change parent item
 	*
-	* Moves the item to the bottom of the new parent's list of children
+	* Moves the item to the bottom of the new parent's subtree
 	*
 	* @param int	$item_id			The item to be moved
 	* @param int	$new_parent_id		The new parent item
 	* @return bool True if the parent was set successfully
 	*/
-	public function change_parent($item, $new_parent_id);
+	public function change_parent($item_id, $new_parent_id);
 
 	/**
-	* Get children and parent branch of the item
+	* Get all items that are either a parent or part of the subtree of the item
 	*
 	* @param int		$item_id		The item id to get the parents/children from
 	* @param bool		$order_desc		Order the items descending (most outer parent first)
@@ -96,10 +96,10 @@ interface phpbb_tree_interface
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-	public function get_full_branch_data($item_id, $order_desc, $include_item);
+	public function get_path_and_subtree_data($item_id, $order_desc, $include_item);
 
 	/**
-	* Get parent branch of the item
+	* Get all parent items of the item
 	*
 	* @param int		$item_id		The item id to get the parents from
 	* @param bool		$order_desc		Order the items descending (most outer parent first)
@@ -107,10 +107,10 @@ interface phpbb_tree_interface
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-	public function get_parent_branch_data($item_id, $order_desc, $include_item);
+	public function get_path_data($item_id, $order_desc, $include_item);
 
 	/**
-	* Get children branch of the item
+	* Get all items of the item's subtree
 	*
 	* @param int		$item_id		The item id to get the children from
 	* @param bool		$order_desc		Order the items descending (most outer parent first)
@@ -118,7 +118,7 @@ interface phpbb_tree_interface
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-	public function get_children_branch_data($item_id, $order_desc, $include_item);
+	public function get_subtree_data($item_id, $order_desc, $include_item);
 
 	/**
 	* Get base information of parent items
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 9655a08aa5..10ab6a86e3 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -154,7 +154,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	*/
 	protected function remove_item_from_nestedset($item_id)
 	{
-		$items = $this->get_children_branch_data($item_id);
+		$items = $this->get_subtree_data($item_id);
 		$item_ids = array_keys($items);
 
 		$this->remove_subset($item_ids, $items[$item_id]);
@@ -338,7 +338,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
-		$item_data = $this->get_children_branch_data($current_parent_id);
+		$item_data = $this->get_subtree_data($current_parent_id);
 		if (!isset($item_data[$current_parent_id]))
 		{
 			$this->lock->release();
@@ -447,7 +447,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
-		$item_data = $this->get_children_branch_data($item_id);
+		$item_data = $this->get_subtree_data($item_id);
 		if (!isset($item_data[$item_id]))
 		{
 			$this->lock->release();
@@ -529,45 +529,45 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	/**
 	* @inheritdoc
 	*/
-	public function get_full_branch_data($item_id, $order_desc = true, $include_item = true)
+	public function get_path_and_subtree_data($item_id, $order_desc = true, $include_item = true)
 	{
 		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '
 			OR i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id;
 
-		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
+		return $this->get_set_of_nodes_data($item_id, $condition, $order_desc, $include_item);
 	}
 
 	/**
 	* @inheritdoc
 	*/
-	public function get_parent_branch_data($item_id, $order_desc = true, $include_item = true)
+	public function get_path_data($item_id, $order_desc = true, $include_item = true)
 	{
 		$condition = 'i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id . '';
 
-		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
+		return $this->get_set_of_nodes_data($item_id, $condition, $order_desc, $include_item);
 	}
 
 	/**
 	* @inheritdoc
 	*/
-	public function get_children_branch_data($item_id, $order_desc = true, $include_item = true)
+	public function get_subtree_data($item_id, $order_desc = true, $include_item = true)
 	{
 		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '';
 
-		return $this->get_branch_data($item_id, $condition, $order_desc, $include_item);
+		return $this->get_set_of_nodes_data($item_id, $condition, $order_desc, $include_item);
 	}
 
 	/**
-	* Get children and parent branch of the item
+	* Get items that are related to the given item by the condition
 	*
-	* @param int		$item_id		The item id to get the parents/children from
+	* @param int		$item_id		The item id to get the node set from
 	* @param string		$condition		Query string restricting the item list
 	* @param bool		$order_desc		Order the items descending (most outer parent first)
 	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-	protected function get_branch_data($item_id, $condition, $order_desc = true, $include_item = true)
+	protected function get_set_of_nodes_data($item_id, $condition, $order_desc = true, $include_item = true)
 	{
 		$rows = array();
 
-- 
cgit v1.2.1


From 4810c61fd7b912ea2914b99f7db502b6f503068f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 10:37:59 +0200
Subject: [ticket/11495] Remove get_parent_data from interface and rename it

The method is implementation specific and has no use, apart from cache, that is
not covered by get_path_data().

PHPBB3-11495
---
 phpBB/includes/tree/interface.php | 9 ---------
 phpBB/includes/tree/nestedset.php | 9 ++++++---
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index 1b462768a0..bd8181beb2 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -119,13 +119,4 @@ interface phpbb_tree_interface
 	*							ID => Item data
 	*/
 	public function get_subtree_data($item_id, $order_desc, $include_item);
-
-	/**
-	* Get base information of parent items
-	*
-	* @param array	$item		The item to get the branch from
-	* @return array			Array of items (containing basic columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_parent_data(array $item);
 }
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 10ab6a86e3..89a91ccb16 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -595,13 +595,16 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	}
 
 	/**
-	* Get base information of parent items
+	* Get basic data of all parent items
 	*
+	* Basic data is defined in the $item_basic_data property.
 	* Data is cached in the item_parents column in the item table
 	*
-	* @inheritdoc
+	* @param array	$item		The item to get the path from
+	* @return array			Array of items (containing basic columns from the item table)
+	*							ID => Item data
 	*/
-	public function get_parent_data(array $item)
+	public function get_path_basic_data(array $item)
 	{
 		$parents = array();
 		if ((int) $item[$this->column_parent_id])
-- 
cgit v1.2.1


From 67f2edae170576104e619ffb38672cabf44e20fa Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 13:54:50 +0200
Subject: [ticket/11495] Use descendants and ancestors instead of
 parents/children

PHPBB3-11495
---
 phpBB/includes/tree/interface.php | 28 ++++++++++++++--------------
 phpBB/includes/tree/nestedset.php | 18 +++++++++---------
 2 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index bd8181beb2..e09fcea4fa 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -65,9 +65,9 @@ interface phpbb_tree_interface
 	public function move_up($item_id);
 
 	/**
-	* Moves all children of one item to another item
+	* Moves all descendants of one item to another item
 	*
-	* If the new parent already has children, the new children are appended
+	* If the new parent already has descendants, the new descendants are appended
 	* to the list.
 	*
 	* @param int	$current_parent_id	The current parent item
@@ -88,35 +88,35 @@ interface phpbb_tree_interface
 	public function change_parent($item_id, $new_parent_id);
 
 	/**
-	* Get all items that are either a parent or part of the subtree of the item
+	* Get all items that are either an ancestors or descendants of the item
 	*
-	* @param int		$item_id		The item id to get the parents/children from
-	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param int		$item_id		The item to get the ancestors/descendants from
+	* @param bool		$order_asc		Order the items ascending (most outer ancestor first)
 	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-	public function get_path_and_subtree_data($item_id, $order_desc, $include_item);
+	public function get_path_and_subtree_data($item_id, $order_asc, $include_item);
 
 	/**
-	* Get all parent items of the item
+	* Get all ancestors items of the item
 	*
-	* @param int		$item_id		The item id to get the parents from
-	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param int		$item_id		The item id to get the ancestors from
+	* @param bool		$order_asc		Order the items ascending (most outer ancestor first)
 	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-	public function get_path_data($item_id, $order_desc, $include_item);
+	public function get_path_data($item_id, $order_asc, $include_item);
 
 	/**
-	* Get all items of the item's subtree
+	* Get all descendants of the item
 	*
-	* @param int		$item_id		The item id to get the children from
-	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param int		$item_id		The item id to get the descendants from
+	* @param bool		$order_asc		Order the items ascending
 	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-	public function get_subtree_data($item_id, $order_desc, $include_item);
+	public function get_subtree_data($item_id, $order_asc, $include_item);
 }
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 89a91ccb16..7710895a25 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -529,32 +529,32 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	/**
 	* @inheritdoc
 	*/
-	public function get_path_and_subtree_data($item_id, $order_desc = true, $include_item = true)
+	public function get_path_and_subtree_data($item_id, $order_asc = true, $include_item = true)
 	{
 		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '
 			OR i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id;
 
-		return $this->get_set_of_nodes_data($item_id, $condition, $order_desc, $include_item);
+		return $this->get_set_of_nodes_data($item_id, $condition, $order_asc, $include_item);
 	}
 
 	/**
 	* @inheritdoc
 	*/
-	public function get_path_data($item_id, $order_desc = true, $include_item = true)
+	public function get_path_data($item_id, $order_asc = true, $include_item = true)
 	{
 		$condition = 'i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id . '';
 
-		return $this->get_set_of_nodes_data($item_id, $condition, $order_desc, $include_item);
+		return $this->get_set_of_nodes_data($item_id, $condition, $order_asc, $include_item);
 	}
 
 	/**
 	* @inheritdoc
 	*/
-	public function get_subtree_data($item_id, $order_desc = true, $include_item = true)
+	public function get_subtree_data($item_id, $order_asc = true, $include_item = true)
 	{
 		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '';
 
-		return $this->get_set_of_nodes_data($item_id, $condition, $order_desc, $include_item);
+		return $this->get_set_of_nodes_data($item_id, $condition, $order_asc, $include_item);
 	}
 
 	/**
@@ -562,12 +562,12 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	*
 	* @param int		$item_id		The item id to get the node set from
 	* @param string		$condition		Query string restricting the item list
-	* @param bool		$order_desc		Order the items descending (most outer parent first)
+	* @param bool		$order_asc		Order the items ascending by their left_id
 	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-	protected function get_set_of_nodes_data($item_id, $condition, $order_desc = true, $include_item = true)
+	protected function get_set_of_nodes_data($item_id, $condition, $order_asc = true, $include_item = true)
 	{
 		$rows = array();
 
@@ -577,7 +577,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 				ON (($condition) " . $this->get_sql_where('AND', 'i2.') . ')
 			WHERE i1.' . $this->column_item_id . ' = ' . (int) $item_id . '
 				' . $this->get_sql_where('AND', 'i1.') . '
-			ORDER BY i2.' . $this->column_left_id . ' ' . ($order_desc ? 'ASC' : 'DESC');
+			ORDER BY i2.' . $this->column_left_id . ' ' . ($order_asc ? 'ASC' : 'DESC');
 		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
-- 
cgit v1.2.1


From 87e8e60d3c09c96a4495dda748673fb8b9078a3e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 14:12:45 +0200
Subject: [ticket/11495] Correctly distinguish between children and descendants

PHPBB3-11495
---
 phpBB/includes/tree/interface.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index e09fcea4fa..5e43478e22 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -65,9 +65,9 @@ interface phpbb_tree_interface
 	public function move_up($item_id);
 
 	/**
-	* Moves all descendants of one item to another item
+	* Moves all children of one item to another item
 	*
-	* If the new parent already has descendants, the new descendants are appended
+	* If the new parent already has children, the new children are appended
 	* to the list.
 	*
 	* @param int	$current_parent_id	The current parent item
@@ -79,7 +79,7 @@ interface phpbb_tree_interface
 	/**
 	* Change parent item
 	*
-	* Moves the item to the bottom of the new parent's subtree
+	* Moves the item to the bottom of the new parent's list of children
 	*
 	* @param int	$item_id			The item to be moved
 	* @param int	$new_parent_id		The new parent item
@@ -88,7 +88,7 @@ interface phpbb_tree_interface
 	public function change_parent($item_id, $new_parent_id);
 
 	/**
-	* Get all items that are either an ancestors or descendants of the item
+	* Get all items that are either ancestors or descendants of the item
 	*
 	* @param int		$item_id		The item to get the ancestors/descendants from
 	* @param bool		$order_asc		Order the items ascending (most outer ancestor first)
-- 
cgit v1.2.1


From 863d0c7687cc926dfda0ddd20b34e7942748fb2e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 14:36:26 +0200
Subject: [ticket/11495] Fix some more comments and the package tag

PHPBB3-11495
---
 phpBB/includes/tree/interface.php       | 2 +-
 phpBB/includes/tree/nestedset.php       | 8 ++++----
 phpBB/includes/tree/nestedset_forum.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index 5e43478e22..9bd633a5eb 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -99,7 +99,7 @@ interface phpbb_tree_interface
 	public function get_path_and_subtree_data($item_id, $order_asc, $include_item);
 
 	/**
-	* Get all ancestors items of the item
+	* Get all ancestors of the item
 	*
 	* @param int		$item_id		The item id to get the ancestors from
 	* @param bool		$order_asc		Order the items ascending (most outer ancestor first)
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 7710895a25..ae9805aa45 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package tree - nestedset
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
@@ -50,7 +50,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	protected $sql_where = '';
 
 	/**
-	* List of item properties to be cached in $item_parents
+	* List of item properties to be cached in the item_parents column
 	* @var array
 	*/
 	protected $item_basic_data = array('*');
@@ -746,11 +746,11 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	* problems:
 	*	- The set has a duplicated value inside the left/right id chain
 	*	- The set has a missing value inside the left/right id chain
-	*	- The set has items that do not have a left/right is set
+	*	- The set has items that do not have a left/right id set
 	*
 	* When regenerating the items, the items are sorted by parent id and their
 	* current left id, so the current child/parent relationships are kept
-	* and running the function on a working set will not change any orders.
+	* and running the function on a working set will not change the order.
 	*
 	* @param int	$new_id		First left_id to be used (should start with 1)
 	* @param int	$parent_id	parent_id of the current set (default = 0)
diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/includes/tree/nestedset_forum.php
index 06ef37e971..ff09ef55d0 100644
--- a/phpBB/includes/tree/nestedset_forum.php
+++ b/phpBB/includes/tree/nestedset_forum.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package tree - nestedset forum
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
-- 
cgit v1.2.1


From 202484ebb48d5c8b2514af2ab519b37179ba3c12 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 14:45:22 +0200
Subject: [ticket/11495] Fix docs of add_item_to_nestedset() and take id as
 argument

PHPBB3-11495
---
 phpBB/includes/tree/nestedset.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index ae9805aa45..934eb933e0 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -111,16 +111,17 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		$item_data[$this->column_item_id] = (int) $this->db->sql_nextid();
 
-		return array_merge($item_data, $this->add_item_to_nestedset($item_data));
+		return array_merge($item_data, $this->add_item_to_nestedset($item_data[$this->column_item_id]));
 	}
 
 	/**
 	* Add an item which already has a database row at the end of the tree
 	*
-	* @param array	$item	The item to be added
-	* @return bool True if the item was added
+	* @param int	$item_id	The item to be added
+	* @return array		Array with updated data, if the item was added successfully
+	*					Empty array otherwise
 	*/
-	protected function add_item_to_nestedset(array $item)
+	protected function add_item_to_nestedset($item_id)
 	{
 		$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
 			FROM ' . $this->table_name . '
@@ -138,10 +139,13 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		$sql = 'UPDATE ' . $this->table_name . '
 			SET ' . $this->db->sql_build_array('UPDATE', $update_item_data) . '
-			WHERE ' . $this->column_item_id . ' = ' . (int) $item[$this->column_item_id];
+			WHERE ' . $this->column_item_id . ' = ' . (int) $item_id . '
+				AND ' . $this->column_parent_id . ' = 0
+				AND ' . $this->column_left_id . ' = 0
+				AND ' . $this->column_right_id . ' = 0';
 		$this->db->sql_query($sql);
 
-		return $update_item_data;
+		return ($this->db->sql_affectedrows() == 1) ? $update_item_data : array();
 	}
 
 	/**
-- 
cgit v1.2.1


From 529e4c00fbb78ba513afbbacfb3d5465efbd82ef Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 15:07:56 +0200
Subject: [ticket/11495] Move lock code into two methods to allow easier
 handling

This also allows to simply remove the lock handling by overwriting the two
methods acquire_lock() and release_lock().

PHPBB3-11495
---
 phpBB/includes/tree/nestedset.php | 111 ++++++++++++++++++++++++--------------
 1 file changed, 71 insertions(+), 40 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 934eb933e0..85e04cd1cf 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -55,6 +55,12 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	*/
 	protected $item_basic_data = array('*');
 
+	/**
+	* Does the class currently have a lock on the item table?
+	* @var bool
+	*/
+	protected $lock_acquired = false;
+
 	/**
 	* Construct
 	*
@@ -99,6 +105,46 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		return (!$this->sql_where) ? '' : $operator . ' ' . sprintf($this->sql_where, $column_prefix);
 	}
 
+	/**
+	* Acquires a lock on the item table
+	*
+	* @return bool	True if the lock was acquired, false if it has been acquired previously
+	*
+	* @throws RuntimeException If the lock could not be acquired
+	*/
+	protected function acquire_lock()
+	{
+		if ($this->lock_acquired)
+		{
+			return false;
+		}
+
+		if (!$this->lock->acquire())
+		{
+			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
+		}
+
+		$this->lock_acquired = true;
+		return true;
+	}
+
+	/**
+	* Releases the lock on the item table
+	*
+	* @return bool	False, if there was no lock to release, true otherwise
+	*/
+	protected function release_lock()
+	{
+		if (!$this->lock_acquired)
+		{
+			return false;
+		}
+
+		$this->lock->release();
+		$this->lock_acquired = false;
+		return true;
+	}
+
 	/**
 	* @inheritdoc
 	*/
@@ -191,10 +237,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			return false;
 		}
 
-		if (!$this->lock->acquire())
-		{
-			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
-		}
+		$this->acquire_lock();
 
 		$action = ($delta > 0) ? 'move_up' : 'move_down';
 		$delta = abs($delta);
@@ -210,7 +253,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		if (!$item)
 		{
-			$this->lock->release();
+			$this->release_lock();
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
@@ -246,7 +289,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		if (!$target)
 		{
-			$this->lock->release();
+			$this->release_lock();
 			// The item is already on top or bottom
 			return false;
 		}
@@ -298,7 +341,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 				" . $this->get_sql_where();
 		$this->db->sql_query($sql);
 
-		$this->lock->release();
+		$this->release_lock();
 
 		return true;
 	}
@@ -337,15 +380,12 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
-		if (!$this->lock->acquire())
-		{
-			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
-		}
+		$this->acquire_lock();
 
 		$item_data = $this->get_subtree_data($current_parent_id);
 		if (!isset($item_data[$current_parent_id]))
 		{
-			$this->lock->release();
+			$this->release_lock();
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
@@ -355,13 +395,13 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		if (($current_parent[$this->column_right_id] - $current_parent[$this->column_left_id]) <= 1)
 		{
-			$this->lock->release();
+			$this->release_lock();
 			return false;
 		}
 
 		if (in_array($new_parent_id, $move_items))
 		{
-			$this->lock->release();
+			$this->release_lock();
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 		}
 
@@ -385,7 +425,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			if (!$new_parent)
 			{
 				$this->db->sql_transaction('rollback');
-				$this->lock->release();
+				$this->release_lock();
 				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 			}
 
@@ -423,7 +463,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		$this->db->sql_query($sql);
 
 		$this->db->sql_transaction('commit');
-		$this->lock->release();
+		$this->release_lock();
 
 		return true;
 	}
@@ -446,15 +486,12 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
-		if (!$this->lock->acquire())
-		{
-			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
-		}
+		$this->acquire_lock();
 
 		$item_data = $this->get_subtree_data($item_id);
 		if (!isset($item_data[$item_id]))
 		{
-			$this->lock->release();
+			$this->release_lock();
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
@@ -463,7 +500,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		if (in_array($new_parent_id, $move_items))
 		{
-			$this->lock->release();
+			$this->release_lock();
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 		}
 
@@ -487,7 +524,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			if (!$new_parent)
 			{
 				$this->db->sql_transaction('rollback');
-				$this->lock->release();
+				$this->release_lock();
 				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 			}
 
@@ -525,7 +562,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		$this->db->sql_query($sql);
 
 		$this->db->sql_transaction('commit');
-		$this->lock->release();
+		$this->release_lock();
 
 		return true;
 	}
@@ -653,15 +690,11 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	* @param bool	$set_subset_zero	Should the parent, left and right id of the items be set to 0, or kept unchanged?
 	*									In case of removing an item from the tree, we should the values to 0
 	*									In case of moving an item, we shouldkeep the original values, in order to allow "+ diff" later
-	* @param bool	$table_already_locked	Is the table already locked, or should we acquire a new lock?
 	* @return	null
 	*/
-	protected function remove_subset(array $subset_items, array $bounding_item, $set_subset_zero = true, $table_already_locked = false)
+	protected function remove_subset(array $subset_items, array $bounding_item, $set_subset_zero = true)
 	{
-		if (!$table_already_locked && !$this->lock->acquire())
-		{
-			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
-		}
+		$acquired_new_lock = $this->acquire_lock();
 
 		$diff = sizeof($subset_items) * 2;
 		$sql_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items);
@@ -689,9 +722,9 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			" . ((!$set_subset_zero) ? ' WHERE ' . $sql_not_subset_items . ' ' . $this->get_sql_where('AND') : $this->get_sql_where('WHERE'));
 		$this->db->sql_query($sql);
 
-		if (!$table_already_locked)
+		if ($acquired_new_lock)
 		{
-			$this->lock->release();
+			$this->release_lock();
 		}
 	}
 
@@ -763,14 +796,13 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	*/
 	public function regenerate_left_right_ids($new_id, $parent_id = 0, $reset_ids = false)
 	{
-		if ($reset_ids)
+		if ($acquired_new_lock = $this->acquire_lock())
 		{
-			if (!$this->lock->acquire())
-			{
-				throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
-			}
 			$this->db->sql_transaction('begin');
+		}
 
+		if ($reset_ids)
+		{
 			$sql = 'UPDATE ' . $this->table_name . '
 				SET ' . $this->db->sql_build_array('UPDATE', array(
 					$this->column_left_id		=> 0,
@@ -817,11 +849,10 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		}
 		$this->db->sql_freeresult($result);
 
-
-		if ($reset_ids)
+		if ($acquired_new_lock)
 		{
 			$this->db->sql_transaction('commit');
-			$this->lock->release();
+			$this->release_lock();
 		}
 
 		return $new_id;
-- 
cgit v1.2.1


From 055ee41065fb0b7c08c66daff196eb2d3460b0cc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 15:16:41 +0200
Subject: [ticket/11495] Remove useless cast

PHPBB3-11495
---
 phpBB/includes/tree/nestedset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 85e04cd1cf..6819f9791b 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -648,7 +648,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	public function get_path_basic_data(array $item)
 	{
 		$parents = array();
-		if ((int) $item[$this->column_parent_id])
+		if ($item[$this->column_parent_id])
 		{
 			if (!$item[$this->column_item_parents])
 			{
-- 
cgit v1.2.1


From 714092ab4e52dc039536a05846b50f4d4d488799 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 15:48:29 +0200
Subject: [ticket/11495] Add owns_lock() method to lock classes

PHPBB3-11495
---
 phpBB/includes/lock/db.php    | 11 +++++++++++
 phpBB/includes/lock/flock.php | 11 +++++++++++
 2 files changed, 22 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/lock/db.php b/phpBB/includes/lock/db.php
index ccdaed0b28..5cc0821aa0 100644
--- a/phpBB/includes/lock/db.php
+++ b/phpBB/includes/lock/db.php
@@ -116,6 +116,17 @@ class phpbb_lock_db
 		return $this->locked;
 	}
 
+	/**
+	* Does this process own the lock?
+	*
+	* @return	bool			true if lock is owned
+	*							false otherwise
+	*/
+	public function owns_lock()
+	{
+		return (bool) $this->locked;
+	}
+
 	/**
 	* Releases the lock.
 	*
diff --git a/phpBB/includes/lock/flock.php b/phpBB/includes/lock/flock.php
index 97bc7dd2b9..17de0847c0 100644
--- a/phpBB/includes/lock/flock.php
+++ b/phpBB/includes/lock/flock.php
@@ -110,6 +110,17 @@ class phpbb_lock_flock
 		return (bool) $this->lock_fp;
 	}
 
+	/**
+	* Does this process own the lock?
+	*
+	* @return	bool			true if lock is owned
+	*							false otherwise
+	*/
+	public function owns_lock()
+	{
+		return (bool) $this->lock_fp;
+	}
+
 	/**
 	* Releases the lock.
 	*
-- 
cgit v1.2.1


From 78b0d3e723ab57c2e32b95a66159861fe461d77f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 15:50:14 +0200
Subject: [ticket/11495] Use $lock->owns_lock() instead of own property

PHPBB3-11495
---
 phpBB/includes/tree/nestedset.php | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 6819f9791b..26152e6c10 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -55,12 +55,6 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	*/
 	protected $item_basic_data = array('*');
 
-	/**
-	* Does the class currently have a lock on the item table?
-	* @var bool
-	*/
-	protected $lock_acquired = false;
-
 	/**
 	* Construct
 	*
@@ -114,7 +108,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	*/
 	protected function acquire_lock()
 	{
-		if ($this->lock_acquired)
+		if ($this->lock->owns_lock())
 		{
 			return false;
 		}
@@ -124,25 +118,17 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
 		}
 
-		$this->lock_acquired = true;
 		return true;
 	}
 
 	/**
 	* Releases the lock on the item table
 	*
-	* @return bool	False, if there was no lock to release, true otherwise
+	* @return null
 	*/
 	protected function release_lock()
 	{
-		if (!$this->lock_acquired)
-		{
-			return false;
-		}
-
 		$this->lock->release();
-		$this->lock_acquired = false;
-		return true;
 	}
 
 	/**
-- 
cgit v1.2.1


From 6055a3cc7ed76cfe458ea524bfad66f475f35ce8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 16:19:25 +0200
Subject: [ticket/11495] Remove useless release_lock() method

PHPBB3-11495
---
 phpBB/includes/tree/nestedset.php | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 26152e6c10..f92606a4c4 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -121,16 +121,6 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		return true;
 	}
 
-	/**
-	* Releases the lock on the item table
-	*
-	* @return null
-	*/
-	protected function release_lock()
-	{
-		$this->lock->release();
-	}
-
 	/**
 	* @inheritdoc
 	*/
@@ -239,7 +229,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		if (!$item)
 		{
-			$this->release_lock();
+			$this->lock->release();
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
@@ -275,7 +265,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		if (!$target)
 		{
-			$this->release_lock();
+			$this->lock->release();
 			// The item is already on top or bottom
 			return false;
 		}
@@ -327,7 +317,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 				" . $this->get_sql_where();
 		$this->db->sql_query($sql);
 
-		$this->release_lock();
+		$this->lock->release();
 
 		return true;
 	}
@@ -371,7 +361,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		$item_data = $this->get_subtree_data($current_parent_id);
 		if (!isset($item_data[$current_parent_id]))
 		{
-			$this->release_lock();
+			$this->lock->release();
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
@@ -381,13 +371,13 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		if (($current_parent[$this->column_right_id] - $current_parent[$this->column_left_id]) <= 1)
 		{
-			$this->release_lock();
+			$this->lock->release();
 			return false;
 		}
 
 		if (in_array($new_parent_id, $move_items))
 		{
-			$this->release_lock();
+			$this->lock->release();
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 		}
 
@@ -411,7 +401,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			if (!$new_parent)
 			{
 				$this->db->sql_transaction('rollback');
-				$this->release_lock();
+				$this->lock->release();
 				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 			}
 
@@ -449,7 +439,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		$this->db->sql_query($sql);
 
 		$this->db->sql_transaction('commit');
-		$this->release_lock();
+		$this->lock->release();
 
 		return true;
 	}
@@ -477,7 +467,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		$item_data = $this->get_subtree_data($item_id);
 		if (!isset($item_data[$item_id]))
 		{
-			$this->release_lock();
+			$this->lock->release();
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
 		}
 
@@ -486,7 +476,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		if (in_array($new_parent_id, $move_items))
 		{
-			$this->release_lock();
+			$this->lock->release();
 			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 		}
 
@@ -510,7 +500,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			if (!$new_parent)
 			{
 				$this->db->sql_transaction('rollback');
-				$this->release_lock();
+				$this->lock->release();
 				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
 			}
 
@@ -548,7 +538,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		$this->db->sql_query($sql);
 
 		$this->db->sql_transaction('commit');
-		$this->release_lock();
+		$this->lock->release();
 
 		return true;
 	}
@@ -710,7 +700,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		if ($acquired_new_lock)
 		{
-			$this->release_lock();
+			$this->lock->release();
 		}
 	}
 
@@ -838,7 +828,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		if ($acquired_new_lock)
 		{
 			$this->db->sql_transaction('commit');
-			$this->release_lock();
+			$this->lock->release();
 		}
 
 		return $new_id;
-- 
cgit v1.2.1


From f3f7be4cd1a0495cf44787c713480d5aceb1bae1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 17:11:55 +0200
Subject: [ticket/11495] Fix @return doc of get_sql_where()

PHPBB3-11495
---
 phpBB/includes/tree/nestedset.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index f92606a4c4..5a12afdfe9 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -92,7 +92,8 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	* @param string		$operator		SQL operator that needs to be prepended to sql_where,
 	*									if it is not empty.
 	* @param string		$column_prefix	Prefix that needs to be prepended to column names
-	* @return bool True if the item was deleted
+	* @return string		Returns additional where statements to narrow down the tree,
+	*						prefixed with operator and prepended column_prefix to column names
 	*/
 	public function get_sql_where($operator = 'AND', $column_prefix = '')
 	{
-- 
cgit v1.2.1


From 5c4d69581afb9fd9b00d6b7b13cec257a97e875c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 18:06:29 +0200
Subject: [ticket/11495] Do not reset item_parent if not required

PHPBB3-11495
---
 phpBB/includes/tree/nestedset.php | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 5a12afdfe9..1f414164df 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -310,8 +310,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			" . $this->column_right_id . ' = ' . $this->column_right_id . ' + CASE
 				WHEN ' . $this->column_right_id . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
 				ELSE {$diff_down}
-			END,
-			" . $this->column_item_parents . " = ''
+			END
 			WHERE
 				" . $this->column_left_id . " BETWEEN {$left_id} AND {$right_id}
 				AND " . $this->column_right_id . " BETWEEN {$left_id} AND {$right_id}
@@ -692,11 +691,10 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		}
 
 		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->column_left_id . ' = ' . $set_left_id . ',
-				' . $this->column_right_id . ' = ' . $set_right_id . ',
-				' . (($set_subset_zero) ? $this->column_parent_id . ' = ' . $this->db->sql_case($sql_subset_items, 0, $this->column_parent_id) . ',' : '') . '
-				' . $this->column_item_parents . " = ''
-			" . ((!$set_subset_zero) ? ' WHERE ' . $sql_not_subset_items . ' ' . $this->get_sql_where('AND') : $this->get_sql_where('WHERE'));
+			SET ' . (($set_subset_zero) ? $this->column_parent_id . ' = ' . $this->db->sql_case($sql_subset_items, 0, $this->column_parent_id) . ',' : '') . '
+				' . $this->column_left_id . ' = ' . $set_left_id . ',
+				' . $this->column_right_id . ' = ' . $set_right_id . '
+			' . ((!$set_subset_zero) ? ' WHERE ' . $sql_not_subset_items . ' ' . $this->get_sql_where('AND') : $this->get_sql_where('WHERE'));
 		$this->db->sql_query($sql);
 
 		if ($acquired_new_lock)
@@ -706,7 +704,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	}
 
 	/**
-	* Add a subset to the nested set
+	* Prepare adding a subset to the nested set
 	*
 	* @param array	$subset_items		Subset of items to add
 	* @param array	$new_parent	Item containing the right bound of the new parent
@@ -722,9 +720,8 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 
 		$sql = 'UPDATE ' . $this->table_name . '
 			SET ' . $this->column_left_id . ' = ' . $set_left_id . ',
-				' . $this->column_right_id . ' = ' . $set_right_id . ',
-				' . $this->column_item_parents . " = ''
-			WHERE " . $sql_not_subset_items . '
+				' . $this->column_right_id . ' = ' . $set_right_id . '
+			WHERE ' . $sql_not_subset_items . '
 				' . $this->get_sql_where('AND');
 		$this->db->sql_query($sql);
 
@@ -776,6 +773,14 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 		if ($acquired_new_lock = $this->acquire_lock())
 		{
 			$this->db->sql_transaction('begin');
+
+			if (!$reset_ids)
+			{
+				$sql = 'UPDATE ' . $this->table_name . '
+					SET ' . $this->column_item_parents . " = ''
+					" . $this->get_sql_where('WHERE');
+				$this->db->sql_query($sql);
+			}
 		}
 
 		if ($reset_ids)
@@ -802,10 +807,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 			if ($row[$this->column_left_id] != $new_id)
 			{
 				$sql = 'UPDATE ' . $this->table_name . '
-					SET ' . $this->db->sql_build_array('UPDATE', array(
-						$this->column_left_id		=> $new_id,
-						$this->column_item_parents	=> '',
-					)) . '
+					SET ' . $this->db->sql_build_array('UPDATE', array($this->column_left_id => $new_id)) . '
 					WHERE ' . $this->column_item_id . ' = ' . (int) $row[$this->column_item_id];
 				$this->db->sql_query($sql);
 			}
-- 
cgit v1.2.1


From 98e6207c35910bf9761433e62ca5fe5af3459873 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 18:13:32 +0200
Subject: [ticket/11495] Fix "as well" typo and remove brackets

PHPBB3-11495
---
 phpBB/includes/tree/interface.php | 6 +++---
 phpBB/includes/tree/nestedset.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index 9bd633a5eb..546e00ed06 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -92,7 +92,7 @@ interface phpbb_tree_interface
 	*
 	* @param int		$item_id		The item to get the ancestors/descendants from
 	* @param bool		$order_asc		Order the items ascending (most outer ancestor first)
-	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
+	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
@@ -103,7 +103,7 @@ interface phpbb_tree_interface
 	*
 	* @param int		$item_id		The item id to get the ancestors from
 	* @param bool		$order_asc		Order the items ascending (most outer ancestor first)
-	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
+	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
@@ -114,7 +114,7 @@ interface phpbb_tree_interface
 	*
 	* @param int		$item_id		The item id to get the descendants from
 	* @param bool		$order_asc		Order the items ascending
-	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
+	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 1f414164df..2a639d8907 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -580,7 +580,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	* @param int		$item_id		The item id to get the node set from
 	* @param string		$condition		Query string restricting the item list
 	* @param bool		$order_asc		Order the items ascending by their left_id
-	* @param bool		$include_item	Should the item (matching the given item id) be included in the list aswell
+	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
 	*/
-- 
cgit v1.2.1


From 2f54a63b0fb998c84730e21a3af4150281c22cab Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 18:24:54 +0200
Subject: [ticket/11495] Fix more grammar issues in doc blocks

PHPBB3-11495
---
 phpBB/includes/tree/interface.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index 546e00ed06..2eb40b066c 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -90,8 +90,8 @@ interface phpbb_tree_interface
 	/**
 	* Get all items that are either ancestors or descendants of the item
 	*
-	* @param int		$item_id		The item to get the ancestors/descendants from
-	* @param bool		$order_asc		Order the items ascending (most outer ancestor first)
+	* @param int		$item_id		The item id the ancestors/descendants should be retrieved from
+	* @param bool		$order_asc		Order the items ascendingly (most outer ancestor first)
 	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
@@ -99,10 +99,10 @@ interface phpbb_tree_interface
 	public function get_path_and_subtree_data($item_id, $order_asc, $include_item);
 
 	/**
-	* Get all ancestors of the item
+	* Get all of the item's ancestors
 	*
-	* @param int		$item_id		The item id to get the ancestors from
-	* @param bool		$order_asc		Order the items ascending (most outer ancestor first)
+	* @param int		$item_id		The item id the ancestors should be retrieved from
+	* @param bool		$order_asc		Order the items ascendingly (most outer ancestor first)
 	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
@@ -110,10 +110,10 @@ interface phpbb_tree_interface
 	public function get_path_data($item_id, $order_asc, $include_item);
 
 	/**
-	* Get all descendants of the item
+	* Get all of the item's descendants
 	*
-	* @param int		$item_id		The item id to get the descendants from
-	* @param bool		$order_asc		Order the items ascending
+	* @param int		$item_id		The item id the descendants should be retrieved from
+	* @param bool		$order_asc		Order the items ascendingly
 	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
 	* @return array			Array of items (containing all columns from the item table)
 	*							ID => Item data
-- 
cgit v1.2.1


From 6a7378ecbdeea1ad356cbde8a085aa7510c61788 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 18:39:22 +0200
Subject: [ticket/11495] Some more doc changes

PHPBB3-11495
---
 phpBB/includes/tree/interface.php | 6 +++---
 phpBB/includes/tree/nestedset.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index 2eb40b066c..cc8aab2115 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -90,7 +90,7 @@ interface phpbb_tree_interface
 	/**
 	* Get all items that are either ancestors or descendants of the item
 	*
-	* @param int		$item_id		The item id the ancestors/descendants should be retrieved from
+	* @param int		$item_id		Id of the item to retrieve the ancestors/descendants from
 	* @param bool		$order_asc		Order the items ascendingly (most outer ancestor first)
 	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
 	* @return array			Array of items (containing all columns from the item table)
@@ -101,7 +101,7 @@ interface phpbb_tree_interface
 	/**
 	* Get all of the item's ancestors
 	*
-	* @param int		$item_id		The item id the ancestors should be retrieved from
+	* @param int		$item_id		Id of the item to retrieve the ancestors from
 	* @param bool		$order_asc		Order the items ascendingly (most outer ancestor first)
 	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
 	* @return array			Array of items (containing all columns from the item table)
@@ -112,7 +112,7 @@ interface phpbb_tree_interface
 	/**
 	* Get all of the item's descendants
 	*
-	* @param int		$item_id		The item id the descendants should be retrieved from
+	* @param int		$item_id		Id of the item to retrieve the descendants from
 	* @param bool		$order_asc		Order the items ascendingly
 	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
 	* @return array			Array of items (containing all columns from the item table)
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 2a639d8907..2f17ebab02 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -577,7 +577,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	/**
 	* Get items that are related to the given item by the condition
 	*
-	* @param int		$item_id		The item id to get the node set from
+	* @param int		$item_id		Id of the item to retrieve the node set from
 	* @param string		$condition		Query string restricting the item list
 	* @param bool		$order_asc		Order the items ascending by their left_id
 	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
-- 
cgit v1.2.1


From d7787682df0474b7bb78434339f8edde3727c580 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 30 Apr 2013 22:19:35 +0200
Subject: [ticket/11495] Throw exception when item that should be deleted does
 not exist

PHPBB3-11495
---
 phpBB/includes/tree/nestedset.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 2f17ebab02..4d851a87a8 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -181,9 +181,20 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	*/
 	protected function remove_item_from_nestedset($item_id)
 	{
+		$item_id = (int) $item_id;
+		if (!$item_id)
+		{
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
+		}
+
 		$items = $this->get_subtree_data($item_id);
 		$item_ids = array_keys($items);
 
+		if (empty($items) || !isset($items[$item_id]))
+		{
+			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
+		}
+
 		$this->remove_subset($item_ids, $items[$item_id]);
 
 		return $item_ids;
-- 
cgit v1.2.1


From 81b2ad158c272cd306ea35a9b44875a5c11e7135 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 30 Apr 2013 21:01:46 -0500
Subject: [ticket/11413] Use sql_insert_buffer

PHPBB3-11413
---
 .../db/migration/data/310/notifications2.php       | 27 +++++++---------------
 1 file changed, 8 insertions(+), 19 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notifications2.php b/phpBB/includes/db/migration/data/310/notifications2.php
index cd078f8f60..44b3f8fd49 100644
--- a/phpBB/includes/db/migration/data/310/notifications2.php
+++ b/phpBB/includes/db/migration/data/310/notifications2.php
@@ -108,7 +108,7 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 			FROM ' . USERS_TABLE;
 		$result = $this->db->sql_query($sql);
 
-		$sql_insert_data = array();
+		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$notification_methods = array();
@@ -129,8 +129,8 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 			// Notifications for  posts
 			foreach (array('post', 'topic') as $item_type)
 			{
-				$sql_insert_data = $this->add_method_rows(
-					$sql_insert_data,
+				$this->add_method_rows(
+					$insert_buffer,
 					$item_type,
 					0,
 					$row['user_id'],
@@ -142,30 +142,21 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 			{
 				// Notifications for private messages
 				// User either gets all methods or no method
-				$sql_insert_data = $this->add_method_rows(
-					$sql_insert_data,
+				$this->add_method_rows(
+					$insert_buffer,
 					'pm',
 					0,
 					$row['user_id'],
 					$notification_methods
 				);
 			}
-
-			if (sizeof($sql_insert_data) > 500)
-			{
-				$this->db->sql_multi_insert($insert_table, $sql_insert_data);
-				$sql_insert_data = array();
-			}
 		}
 		$this->db->sql_freeresult($result);
 
-		if (!empty($sql_insert_data))
-		{
-			$this->db->sql_multi_insert($insert_table, $sql_insert_data);
-		}
+		$insert_buffer->flush();
 	}
 
-	protected function add_method_rows(array $sql_insert_data, $item_type, $item_id, $user_id, array $methods)
+	protected function add_method_rows(phpbb_db_sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods)
 	{
 		$row_base = array(
 			'item_type'		=> $item_type,
@@ -176,9 +167,7 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 		foreach ($methods as $method)
 		{
 			$row_base['method'] = $method;
-			$sql_insert_data[] = $row_base;
+			$insert_buffer->insert($row_base);
 		}
-
-		return $sql_insert_data;
 	}
 }
-- 
cgit v1.2.1


From 2f2feaa4e8ad9a18fd9ddcb7d65ae958c544dbcb Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 30 Apr 2013 21:38:40 -0500
Subject: [ticket/11413] Don't use the database for the convert test

Different databases seem to work slightly differently here and are causing
errors

PHPBB3-11413
---
 phpBB/includes/db/migration/data/310/notifications2.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notifications2.php b/phpBB/includes/db/migration/data/310/notifications2.php
index 44b3f8fd49..c90944dcc9 100644
--- a/phpBB/includes/db/migration/data/310/notifications2.php
+++ b/phpBB/includes/db/migration/data/310/notifications2.php
@@ -100,7 +100,16 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 	public function convert_notifications()
 	{
 		$insert_table = $this->table_prefix . 'user_notifications';
+		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table);
+
+		$this->perform_conversion($insert_buffer, $insert_table);
+	}
 
+	/**
+	* Perform the conversion (separate for testability)
+	*/
+	public function perform_conversion($insert_buffer, $insert_table)
+	{
 		$sql = 'DELETE FROM ' . $insert_table;
 		$this->db->sql_query($sql);
 
@@ -108,7 +117,6 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 			FROM ' . USERS_TABLE;
 		$result = $this->db->sql_query($sql);
 
-		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$notification_methods = array();
@@ -162,6 +170,7 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 			'item_type'		=> $item_type,
 			'item_id'		=> (int) $item_id,
 			'user_id'		=> (int) $user_id,
+			'notify'		=> 1
 		);
 
 		foreach ($methods as $method)
-- 
cgit v1.2.1


From 9db4e856db426c68d0e3055dbcad9754ce65779d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 1 May 2013 13:00:43 -0500
Subject: [ticket/11415] Move while loop from ext manager to acp_extensions.php

Now enable_step works as it's supposed to (do one step at a time) and
less refreshes are required for the user.

PHPBB3-11415
---
 phpBB/includes/acp/acp_extensions.php | 34 +++++++++++++++++++++++++---------
 phpBB/includes/extension/manager.php  | 21 +++------------------
 2 files changed, 28 insertions(+), 27 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index e4defa0400..7fdeb1ff8b 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -44,6 +44,10 @@ class acp_extensions
 		$action = $request->variable('action', 'list');
 		$ext_name = $request->variable('ext_name', '');
 
+		// What is a safe limit of execution time? Half the max execution time should be safe.
+		$safe_time_limit = (ini_get('max_execution_time') / 2);
+		$start_time = time();
+
 		// Cancel action
 		if ($request->is_set_post('cancel'))
 		{
@@ -105,11 +109,15 @@ class acp_extensions
 
 				try
 				{
-					if ($phpbb_extension_manager->enable_step($ext_name))
+					while ($phpbb_extension_manager->enable_step($ext_name))
 					{
-						$template->assign_var('S_NEXT_STEP', true);
+						// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+						if ((time() - $start_time) >= $safe_time_limit)
+						{
+							$template->assign_var('S_NEXT_STEP', true);
 
-						meta_refresh(0, $this->u_action . '&amp;action=enable&amp;ext_name=' . urlencode($ext_name));
+							meta_refresh(0, $this->u_action . '&amp;action=enable&amp;ext_name=' . urlencode($ext_name));
+						}
 					}
 				}
 				catch (phpbb_db_migration_exception $e)
@@ -139,11 +147,15 @@ class acp_extensions
 			break;
 
 			case 'disable':
-				if ($phpbb_extension_manager->disable_step($ext_name))
+				while ($phpbb_extension_manager->disable_step($ext_name))
 				{
-					$template->assign_var('S_NEXT_STEP', true);
+					// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+					if ((time() - $start_time) >= $safe_time_limit)
+					{
+						$template->assign_var('S_NEXT_STEP', true);
 
-					meta_refresh(0, $this->u_action . '&amp;action=disable&amp;ext_name=' . urlencode($ext_name));
+						meta_refresh(0, $this->u_action . '&amp;action=disable&amp;ext_name=' . urlencode($ext_name));
+					}
 				}
 
 				$this->tpl_name = 'acp_ext_disable';
@@ -165,11 +177,15 @@ class acp_extensions
 			case 'purge':
 				try
 				{
-					if ($phpbb_extension_manager->purge_step($ext_name))
+					while ($phpbb_extension_manager->purge_step($ext_name))
 					{
-						$template->assign_var('S_NEXT_STEP', true);
+						// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
+						if ((time() - $start_time) >= $safe_time_limit)
+						{
+							$template->assign_var('S_NEXT_STEP', true);
 
-						meta_refresh(0, $this->u_action . '&amp;action=purge&amp;ext_name=' . urlencode($ext_name));
+							meta_refresh(0, $this->u_action . '&amp;action=purge&amp;ext_name=' . urlencode($ext_name));
+						}
 					}
 				}
 				catch (phpbb_db_migration_exception $e)
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index a1022762b8..d3e9d56501 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -546,22 +546,11 @@ class phpbb_extension_manager
 		$migrations = $finder->get_classes_from_files($migrations);
 		$this->migrator->set_migrations($migrations);
 
-		// What is a safe limit of execution time? Half the max execution time should be safe.
-		$safe_time_limit = (ini_get('max_execution_time') / 2);
-		$start_time = time();
-
 		if ($mode == 'enable')
 		{
-			while (!$this->migrator->finished())
-			{
-				$this->migrator->update();
+			$this->migrator->update();
 
-				// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
-				if ((time() - $start_time) >= $safe_time_limit)
-				{
-					return false;
-				}
-			}
+			return $this->migrator->finished();
 		}
 		else if ($mode == 'purge')
 		{
@@ -571,11 +560,7 @@ class phpbb_extension_manager
 				{
 					$this->migrator->revert($migration);
 
-					// Are we approaching the time limit? If so we want to pause the update and continue after refreshing
-					if ((time() - $start_time) >= $safe_time_limit)
-					{
-						return false;
-					}
+					return false;
 				}
 			}
 		}
-- 
cgit v1.2.1


From 7ed21cc6f2b7eee305d0c7c00821ef1ce680b77e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 1 May 2013 14:02:13 -0500
Subject: [ticket/11415] Move migrator to base extension class from ext.manager

PHPBB3-11415
---
 phpBB/includes/extension/base.php    | 75 +++++++++++++++++++++++++++++--
 phpBB/includes/extension/manager.php | 86 +++++++-----------------------------
 2 files changed, 86 insertions(+), 75 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/base.php b/phpBB/includes/extension/base.php
index d51589d719..dc6d771672 100644
--- a/phpBB/includes/extension/base.php
+++ b/phpBB/includes/extension/base.php
@@ -27,25 +27,42 @@ class phpbb_extension_base implements phpbb_extension_interface
 	/** @var ContainerInterface */
 	protected $container;
 
+	/** @var string */
+	protected $extension_name;
+
+	/** @var string */
+	protected $extension_path;
+
 	/**
 	* Constructor
 	*
 	* @param ContainerInterface $container Container object
+	* @param string $extension_name Name of this extension (from ext.manager)
+	* @param string $extension_path Relative path to this extension
 	*/
-	public function __construct(ContainerInterface $container)
+	public function __construct(ContainerInterface $container, $extension_name, $extension_path)
 	{
 		$this->container = $container;
+
+		$this->extension_name = $extension_name;
+		$this->extension_path = $extension_path;
 	}
 
 	/**
-	* Single enable step that does nothing
+	* Single enable step that installs any included migrations
 	*
 	* @param mixed $old_state State returned by previous call of this method
 	* @return false Indicates no further steps are required
 	*/
 	public function enable_step($old_state)
 	{
-		return false;
+		$migrations = $this->get_migration_file_list();
+		$migrator = $this->container->get('migrator');
+		$migrator->set_migrations($migrations);
+
+		$migrator->update();
+
+		return !$migrator->finished();
 	}
 
 	/**
@@ -60,13 +77,63 @@ class phpbb_extension_base implements phpbb_extension_interface
 	}
 
 	/**
-	* Single purge step that does nothing
+	* Single purge step that reverts any included and installed migrations
 	*
 	* @param mixed $old_state State returned by previous call of this method
 	* @return false Indicates no further steps are required
 	*/
 	public function purge_step($old_state)
 	{
+		$migrations = $this->get_migration_file_list();
+		$migrator = $this->container->get('migrator');
+		$migrator->set_migrations($migrations);
+
+		foreach ($migrations as $migration)
+		{
+			while ($migrator->migration_state($migration) !== false)
+			{
+				$migrator->revert($migration);
+
+				return true;
+			}
+		}
+
 		return false;
 	}
+
+	/**
+	* Get the list of migration files from this extension
+	*
+	* @return array
+	*/
+	protected function get_migration_file_list()
+	{
+		static $migrations = false;
+
+		if ($migrations !== false)
+		{
+			return $migrations;
+		}
+
+		// Only have the finder search in this extension path directory
+		$extensions = array(
+			$this->extension_name => $this->extension_path,
+		);
+
+		$extension_manager = $this->container->get('ext.manager');
+		$finder = $extension_manager->get_finder();
+		$migrations = array();
+		$file_list = $finder
+			->extension_directory('/migrations')
+			->find_from_paths($extensions);
+
+		foreach ($file_list as $file)
+		{
+			$migrations[$file['named_path']] = $file['ext_name'];
+		}
+
+		$migrations = $finder->get_classes_from_files($migrations);
+
+		return $migrations;
+	}
 }
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index d3e9d56501..8b8a69f14c 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -138,11 +138,11 @@ class phpbb_extension_manager
 
 		if (class_exists($extension_class_name))
 		{
-			return new $extension_class_name($this->container);
+			return new $extension_class_name($this->container, $name, $this->get_extension_path($name, true));
 		}
 		else
 		{
-			return new phpbb_extension_base($this->container);
+			return new phpbb_extension_base($this->container, $name, $this->get_extension_path($name, true));
 		}
 	}
 
@@ -178,12 +178,6 @@ class phpbb_extension_manager
 
 		$old_state = (isset($this->extensions[$name]['ext_state'])) ? unserialize($this->extensions[$name]['ext_state']) : false;
 
-		// Returns false if not completed
-		if (!$this->handle_migrations($name, 'enable'))
-		{
-			return true;
-		}
-
 		$extension = $this->get_extension($name);
 		$state = $extension->enable_step($old_state);
 
@@ -199,12 +193,21 @@ class phpbb_extension_manager
 		$this->extensions[$name]['ext_path'] = $this->get_extension_path($extension_data['ext_name']);
 		ksort($this->extensions);
 
-		$sql = 'UPDATE ' . $this->extension_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $extension_data) . "
+		$sql = 'SELECT COUNT(ext_name) as row_count
+			FROM ' . $this->extension_table . "
 			WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
-		$this->db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
+		$count = $this->db->sql_fetchfield('row_count');
+		$this->db->sql_freeresult($result);
 
-		if (!$this->db->sql_affectedrows())
+		if ($count)
+		{
+			$sql = 'UPDATE ' . $this->extension_table . '
+				SET ' . $this->db->sql_build_array('UPDATE', $extension_data) . "
+				WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
+			$this->db->sql_query($sql);
+		}
+		else
 		{
 			$sql = 'INSERT INTO ' . $this->extension_table . '
 				' . $this->db->sql_build_array('INSERT', $extension_data);
@@ -335,12 +338,6 @@ class phpbb_extension_manager
 
 		$old_state = unserialize($this->extensions[$name]['ext_state']);
 
-		// Returns false if not completed
-		if (!$this->handle_migrations($name, 'purge'))
-		{
-			return true;
-		}
-
 		$extension = $this->get_extension($name);
 		$state = $extension->purge_step($old_state);
 
@@ -514,57 +511,4 @@ class phpbb_extension_manager
 	{
 		return new phpbb_extension_finder($this, $this->filesystem, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder');
 	}
-
-	/**
-	* Handle installing/reverting migrations
-	*
-	* @param string $extension_name Name of the extension
-	* @param string $mode enable or purge
-	* @return bool True if completed, False if not completed
-	*/
-	protected function handle_migrations($extension_name, $mode)
-	{
-		$extensions = array(
-			$extension_name => $this->phpbb_root_path . $this->get_extension_path($extension_name),
-		);
-
-		$finder = $this->get_finder();
-		$migrations = array();
-		$file_list = $finder
-			->extension_directory('/migrations')
-			->find_from_paths($extensions);
-
-		if (empty($file_list))
-		{
-			return true;
-		}
-
-		foreach ($file_list as $file)
-		{
-			$migrations[$file['named_path']] = $file['ext_name'];
-		}
-		$migrations = $finder->get_classes_from_files($migrations);
-		$this->migrator->set_migrations($migrations);
-
-		if ($mode == 'enable')
-		{
-			$this->migrator->update();
-
-			return $this->migrator->finished();
-		}
-		else if ($mode == 'purge')
-		{
-			foreach ($migrations as $migration)
-			{
-				while ($this->migrator->migration_state($migration) !== false)
-				{
-					$this->migrator->revert($migration);
-
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
 }
-- 
cgit v1.2.1


From 60e32728393d4258f92f7893f8275889278a995f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 1 May 2013 14:09:08 -0500
Subject: [ticket/11415] Remove migrator dependency from extension manager

PHPBB3-11415
---
 phpBB/includes/extension/manager.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 8b8a69f14c..b42043748f 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -29,7 +29,6 @@ class phpbb_extension_manager
 
 	protected $db;
 	protected $config;
-	protected $migrator;
 	protected $cache;
 	protected $php_ext;
 	protected $extensions;
@@ -43,7 +42,6 @@ class phpbb_extension_manager
 	* @param ContainerInterface $container A container
 	* @param phpbb_db_driver $db A database connection
 	* @param phpbb_config $config phpbb_config
-	* @param phpbb_db_migrator $migrator
 	* @param phpbb_filesystem $filesystem
 	* @param string $extension_table The name of the table holding extensions
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
@@ -51,13 +49,12 @@ class phpbb_extension_manager
 	* @param phpbb_cache_driver_interface $cache A cache instance or null
 	* @param string $cache_name The name of the cache variable, defaults to _ext
 	*/
-	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_db_migrator $migrator, phpbb_filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
+	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
 	{
 		$this->container = $container;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->db = $db;
 		$this->config = $config;
-		$this->migrator = $migrator;
 		$this->cache = $cache;
 		$this->filesystem = $filesystem;
 		$this->php_ext = $php_ext;
-- 
cgit v1.2.1


From 87b01fc854b22e3839776505486d5a564e671f5f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 1 May 2013 15:18:53 -0500
Subject: [ticket/11415] Make migrator/ext.manager dependencies of the base ext
 class

PHPBB3-11415
---
 phpBB/includes/extension/base.php    | 30 +++++++++++++++++++-----------
 phpBB/includes/extension/manager.php |  6 ++++--
 2 files changed, 23 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/base.php b/phpBB/includes/extension/base.php
index dc6d771672..2d22658ff1 100644
--- a/phpBB/includes/extension/base.php
+++ b/phpBB/includes/extension/base.php
@@ -27,6 +27,12 @@ class phpbb_extension_base implements phpbb_extension_interface
 	/** @var ContainerInterface */
 	protected $container;
 
+	/** @var phpbb_extension_manager */
+	protected $extension_manager;
+
+	/** @var phpbb_db_migrator */
+	protected $migrator;
+
 	/** @var string */
 	protected $extension_name;
 
@@ -37,12 +43,15 @@ class phpbb_extension_base implements phpbb_extension_interface
 	* Constructor
 	*
 	* @param ContainerInterface $container Container object
+	* @param phpbb_extension_manager $extension_manager
 	* @param string $extension_name Name of this extension (from ext.manager)
 	* @param string $extension_path Relative path to this extension
 	*/
-	public function __construct(ContainerInterface $container, $extension_name, $extension_path)
+	public function __construct(ContainerInterface $container, phpbb_extension_manager $extension_manager, phpbb_db_migrator $migrator, $extension_name, $extension_path)
 	{
 		$this->container = $container;
+		$this->extension_manager = $extension_manager;
+		$this->migrator = $migrator;
 
 		$this->extension_name = $extension_name;
 		$this->extension_path = $extension_path;
@@ -57,12 +66,12 @@ class phpbb_extension_base implements phpbb_extension_interface
 	public function enable_step($old_state)
 	{
 		$migrations = $this->get_migration_file_list();
-		$migrator = $this->container->get('migrator');
-		$migrator->set_migrations($migrations);
 
-		$migrator->update();
+		$this->migrator->set_migrations($migrations);
 
-		return !$migrator->finished();
+		$this->migrator->update();
+
+		return !$this->migrator->finished();
 	}
 
 	/**
@@ -85,14 +94,14 @@ class phpbb_extension_base implements phpbb_extension_interface
 	public function purge_step($old_state)
 	{
 		$migrations = $this->get_migration_file_list();
-		$migrator = $this->container->get('migrator');
-		$migrator->set_migrations($migrations);
+
+		$this->migrator->set_migrations($migrations);
 
 		foreach ($migrations as $migration)
 		{
-			while ($migrator->migration_state($migration) !== false)
+			while ($this->migrator->migration_state($migration) !== false)
 			{
-				$migrator->revert($migration);
+				$this->migrator->revert($migration);
 
 				return true;
 			}
@@ -120,8 +129,7 @@ class phpbb_extension_base implements phpbb_extension_interface
 			$this->extension_name => $this->extension_path,
 		);
 
-		$extension_manager = $this->container->get('ext.manager');
-		$finder = $extension_manager->get_finder();
+		$finder = $this->extension_manager->get_finder();
 		$migrations = array();
 		$file_list = $finder
 			->extension_directory('/migrations')
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index b42043748f..799c8b2418 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -133,13 +133,15 @@ class phpbb_extension_manager
 	{
 		$extension_class_name = 'phpbb_ext_' . str_replace('/', '_', $name) . '_ext';
 
+		$migrator = $this->container->get('migrator');
+
 		if (class_exists($extension_class_name))
 		{
-			return new $extension_class_name($this->container, $name, $this->get_extension_path($name, true));
+			return new $extension_class_name($this->container, $this, $migrator, $name, $this->get_extension_path($name, true));
 		}
 		else
 		{
-			return new phpbb_extension_base($this->container, $name, $this->get_extension_path($name, true));
+			return new phpbb_extension_base($this->container, $this, $migrator, $name, $this->get_extension_path($name, true));
 		}
 	}
 
-- 
cgit v1.2.1


From 32f247ed603a2b57ba0b30f4ce0d2429df33ab7e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 1 May 2013 17:14:36 -0400
Subject: [ticket/11435] Fit comment into 80 columns and link to php manual.

PHPBB3-11435
---
 phpBB/includes/template/filter.php | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 9e8ad2fef0..c2c100e93e 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -224,28 +224,34 @@ class phpbb_template_filter extends php_user_filter
 		}
 
 		/*
-			Preserve whitespace.
-			PHP removes a newline after the closing tag (if it's there). This is by design.
 
+		Preserve whitespace.
+		PHP removes a newline after the closing tag (if it's there).
+		This is by design:
 
-			Consider the following template:
+		http://www.php.net/manual/en/language.basic-syntax.phpmode.php
+		http://www.php.net/manual/en/language.basic-syntax.instruction-separation.php
 
-				<!-- IF condition -->
-				some content
-				<!-- ENDIF -->
 
-			If we were to simply preserve all whitespace, we could simply replace all "?>" tags
-			with "?>\n".
-			Doing that, would add additional newlines to the compiled tempalte in place of the
-			IF and ENDIF statements. These newlines are unwanted (and one is conditional).
-			The IF and ENDIF are usually on their own line for ease of reading.
+		Consider the following template:
 
-			This replacement preserves newlines only for statements that aren't the only statement on a line.
-			It will NOT preserve newlines at the end of statements in the above examle.
-			It will preserve newlines in situations like:
+			<!-- IF condition -->
+			some content
+			<!-- ENDIF -->
 
-				<!-- IF condition -->inline content<!-- ENDIF -->
+		If we were to simply preserve all whitespace, we could simply
+		replace all "?>" tags with "?>\n".
+		Doing that, would add additional newlines to the compiled
+		template in place of the IF and ENDIF statements. These
+		newlines are unwanted (and one is conditional). The IF and
+		ENDIF are usually on their own line for ease of reading.
 
+		This replacement preserves newlines only for statements that
+		are not the only statement on a line. It will NOT preserve
+		newlines at the end of statements in the above example.
+		It will preserve newlines in situations like:
+
+			<!-- IF condition -->inline content<!-- ENDIF -->
 
 		*/
 
-- 
cgit v1.2.1


From 07c972f5d71f7aa56d6623774e977ea7958a906e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 2 May 2013 15:39:26 -0500
Subject: [ticket/11413] Remove changes for ticket 11420 from this branch

PHPBB3-11413
---
 .../db/migration/data/310/notifications.php        | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notifications.php b/phpBB/includes/db/migration/data/310/notifications.php
index 17c939d95a..82bfd4cb2d 100644
--- a/phpBB/includes/db/migration/data/310/notifications.php
+++ b/phpBB/includes/db/migration/data/310/notifications.php
@@ -91,6 +91,70 @@ class phpbb_db_migration_data_310_notifications extends phpbb_db_migration
 				),
 			)),
 			array('config.add', array('load_notifications', 1)),
+			array('custom', array(array($this, 'convert_notifications'))),
 		);
 	}
+
+	public function convert_notifications()
+	{
+		$convert_notifications = array(
+			array(
+				'check'			=> ($this->config['allow_topic_notify']),
+				'item_type'		=> 'post',
+			),
+			array(
+				'check'			=> ($this->config['allow_forum_notify']),
+				'item_type'		=> 'topic',
+			),
+			array(
+				'check'			=> ($this->config['allow_bookmarks']),
+				'item_type'		=> 'bookmark',
+			),
+			array(
+				'check'			=> ($this->config['allow_privmsg']),
+				'item_type'		=> 'pm',
+			),
+		);
+
+		foreach ($convert_notifications as $convert_data)
+		{
+			if ($convert_data['check'])
+			{
+				$sql = 'SELECT user_id, user_notify_type
+					FROM ' . USERS_TABLE . '
+						WHERE user_notify = 1';
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
+						'item_type'		=> $convert_data['item_type'],
+						'item_id'		=> 0,
+						'user_id'		=> $row['user_id'],
+						'method'		=> '',
+					)));
+
+					if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
+					{
+						$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
+							'item_type'		=> $convert_data['item_type'],
+							'item_id'		=> 0,
+							'user_id'		=> $row['user_id'],
+							'method'		=> 'email',
+						)));
+					}
+
+					if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
+					{
+						$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
+							'item_type'		=> $convert_data['item_type'],
+							'item_id'		=> 0,
+							'user_id'		=> $row['user_id'],
+							'method'		=> 'jabber',
+						)));
+					}
+				}
+				$this->db->sql_freeresult($result);
+			}
+		}
+	}
 }
-- 
cgit v1.2.1


From a4fe72bd533ef6ebe2040b0dbc8c26ebed1528e2 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 2 May 2013 15:40:43 -0500
Subject: [ticket/11420] Fix notification options conversion

PHPBB3-11420
---
 .../db/migration/data/310/notifications.php        |  64 -------------
 .../db/migration/data/310/notifications3.php       | 106 +++++++++++++++++++++
 2 files changed, 106 insertions(+), 64 deletions(-)
 create mode 100644 phpBB/includes/db/migration/data/310/notifications3.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notifications.php b/phpBB/includes/db/migration/data/310/notifications.php
index 82bfd4cb2d..17c939d95a 100644
--- a/phpBB/includes/db/migration/data/310/notifications.php
+++ b/phpBB/includes/db/migration/data/310/notifications.php
@@ -91,70 +91,6 @@ class phpbb_db_migration_data_310_notifications extends phpbb_db_migration
 				),
 			)),
 			array('config.add', array('load_notifications', 1)),
-			array('custom', array(array($this, 'convert_notifications'))),
 		);
 	}
-
-	public function convert_notifications()
-	{
-		$convert_notifications = array(
-			array(
-				'check'			=> ($this->config['allow_topic_notify']),
-				'item_type'		=> 'post',
-			),
-			array(
-				'check'			=> ($this->config['allow_forum_notify']),
-				'item_type'		=> 'topic',
-			),
-			array(
-				'check'			=> ($this->config['allow_bookmarks']),
-				'item_type'		=> 'bookmark',
-			),
-			array(
-				'check'			=> ($this->config['allow_privmsg']),
-				'item_type'		=> 'pm',
-			),
-		);
-
-		foreach ($convert_notifications as $convert_data)
-		{
-			if ($convert_data['check'])
-			{
-				$sql = 'SELECT user_id, user_notify_type
-					FROM ' . USERS_TABLE . '
-						WHERE user_notify = 1';
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
-						'item_type'		=> $convert_data['item_type'],
-						'item_id'		=> 0,
-						'user_id'		=> $row['user_id'],
-						'method'		=> '',
-					)));
-
-					if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
-					{
-						$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
-							'item_type'		=> $convert_data['item_type'],
-							'item_id'		=> 0,
-							'user_id'		=> $row['user_id'],
-							'method'		=> 'email',
-						)));
-					}
-
-					if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
-					{
-						$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
-							'item_type'		=> $convert_data['item_type'],
-							'item_id'		=> 0,
-							'user_id'		=> $row['user_id'],
-							'method'		=> 'jabber',
-						)));
-					}
-				}
-				$this->db->sql_freeresult($result);
-			}
-		}
-	}
 }
diff --git a/phpBB/includes/db/migration/data/310/notifications3.php b/phpBB/includes/db/migration/data/310/notifications3.php
new file mode 100644
index 0000000000..22839dbd7b
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/notifications3.php
@@ -0,0 +1,106 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_notifications3 extends phpbb_db_migration
+{
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_notifications2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'convert_notifications'))),
+		);
+	}
+
+	public function convert_notifications()
+	{
+		$insert_table = $this->table_prefix . 'user_notifications';
+		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table);
+
+		$this->perform_conversion($insert_buffer, $insert_table);
+	}
+
+	/**
+	* Perform the conversion (separate for testability)
+	*/
+	public function perform_conversion($insert_buffer, $insert_table)
+	{
+		$sql = 'DELETE FROM ' . $insert_table;
+		$this->db->sql_query($sql);
+
+		$sql = 'SELECT user_id, user_notify_type, user_notify_pm
+			FROM ' . USERS_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$notification_methods = array();
+
+			// In-board notification
+			$notification_methods[] = '';
+
+			if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
+			{
+				$notification_methods[] = 'email';
+			}
+
+			if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
+			{
+				$notification_methods[] = 'jabber';
+			}
+
+			// Notifications for  posts
+			foreach (array('post', 'topic') as $item_type)
+			{
+				$this->add_method_rows(
+					$insert_buffer,
+					$item_type,
+					0,
+					$row['user_id'],
+					$notification_methods
+				);
+			}
+
+			if ($row['user_notify_pm'])
+			{
+				// Notifications for private messages
+				// User either gets all methods or no method
+				$this->add_method_rows(
+					$insert_buffer,
+					'pm',
+					0,
+					$row['user_id'],
+					$notification_methods
+				);
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		$insert_buffer->flush();
+	}
+
+	protected function add_method_rows(phpbb_db_sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods)
+	{
+		$row_base = array(
+			'item_type'		=> $item_type,
+			'item_id'		=> (int) $item_id,
+			'user_id'		=> (int) $user_id,
+			'notify'		=> 1
+		);
+
+		foreach ($methods as $method)
+		{
+			$row_base['method'] = $method;
+			$insert_buffer->insert($row_base);
+		}
+	}
+}
-- 
cgit v1.2.1


From bc9b6c3b6c4081b1671224d69f973c923e105675 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 2 May 2013 15:49:17 -0500
Subject: [ticket/11413] Correct copyright year

PHPBB3-11413
---
 phpBB/includes/db/migration/data/310/notifications2.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notifications2.php b/phpBB/includes/db/migration/data/310/notifications2.php
index c90944dcc9..f655c6734b 100644
--- a/phpBB/includes/db/migration/data/310/notifications2.php
+++ b/phpBB/includes/db/migration/data/310/notifications2.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package migration
-* @copyright (c) 2012 phpBB Group
+* @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
 *
 */
-- 
cgit v1.2.1


From 5edae8af1f7d8d94141596b6391c8f967d9694db Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 2 May 2013 15:52:20 -0500
Subject: [ticket/11413] Remove conversion of user_notifications

PHPBB3-11413
---
 .../db/migration/data/310/notifications2.php       | 90 ----------------------
 1 file changed, 90 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notifications2.php b/phpBB/includes/db/migration/data/310/notifications2.php
index f655c6734b..ce8343089f 100644
--- a/phpBB/includes/db/migration/data/310/notifications2.php
+++ b/phpBB/includes/db/migration/data/310/notifications2.php
@@ -89,94 +89,4 @@ class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
 			),
 		);
 	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'convert_notifications'))),
-		);
-	}
-
-	public function convert_notifications()
-	{
-		$insert_table = $this->table_prefix . 'user_notifications';
-		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table);
-
-		$this->perform_conversion($insert_buffer, $insert_table);
-	}
-
-	/**
-	* Perform the conversion (separate for testability)
-	*/
-	public function perform_conversion($insert_buffer, $insert_table)
-	{
-		$sql = 'DELETE FROM ' . $insert_table;
-		$this->db->sql_query($sql);
-
-		$sql = 'SELECT user_id, user_notify_type, user_notify_pm
-			FROM ' . USERS_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$notification_methods = array();
-
-			// In-board notification
-			$notification_methods[] = '';
-
-			if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
-			{
-				$notification_methods[] = 'email';
-			}
-
-			if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
-			{
-				$notification_methods[] = 'jabber';
-			}
-
-			// Notifications for  posts
-			foreach (array('post', 'topic') as $item_type)
-			{
-				$this->add_method_rows(
-					$insert_buffer,
-					$item_type,
-					0,
-					$row['user_id'],
-					$notification_methods
-				);
-			}
-
-			if ($row['user_notify_pm'])
-			{
-				// Notifications for private messages
-				// User either gets all methods or no method
-				$this->add_method_rows(
-					$insert_buffer,
-					'pm',
-					0,
-					$row['user_id'],
-					$notification_methods
-				);
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		$insert_buffer->flush();
-	}
-
-	protected function add_method_rows(phpbb_db_sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods)
-	{
-		$row_base = array(
-			'item_type'		=> $item_type,
-			'item_id'		=> (int) $item_id,
-			'user_id'		=> (int) $user_id,
-			'notify'		=> 1
-		);
-
-		foreach ($methods as $method)
-		{
-			$row_base['method'] = $method;
-			$insert_buffer->insert($row_base);
-		}
-	}
 }
-- 
cgit v1.2.1


From 3c76cdeb6701a4aded7a7c39b8c9b44c00b5848a Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 3 May 2013 08:50:27 -0500
Subject: [ticket/11413] Remove remaining irrelevant code to this PR

PHPBB3-11413
---
 phpBB/includes/notification/type/base.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 983383ce2a..46517f1c9b 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -30,7 +30,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/** @var phpbb_db_driver */
 	protected $db;
 
-	/** @var phpbb_cache_service */
+	/** @var phpbb_cache_driver_interface */
 	protected $cache;
 
 	/** @var phpbb_template */
@@ -96,7 +96,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* 
 	* @param phpbb_user_loader $user_loader
 	* @param phpbb_db_driver $db
-	* @param phpbb_cache_service $cache
+	* @param phpbb_cache_driver_interface $cache
 	* @param phpbb_user $user
 	* @param phpbb_auth $auth
 	* @param phpbb_config $config
@@ -107,7 +107,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* @param string $user_notifications_table
 	* @return phpbb_notification_type_base
 	*/
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_service $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
+	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
-- 
cgit v1.2.1


From bfdc6e19300da8fa62d8661fcbd92548a2d2cf97 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 4 May 2013 18:56:52 +0530
Subject: [ticket/11288] fix regex in postgres

Postgres search backend now uses updated regex being used by
mysql search backend.

PHPBB3-11288
---
 phpBB/includes/search/fulltext_postgres.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index eeb628b18f..5080587681 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -214,7 +214,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	{
 		if ($terms == 'all')
 		{
-			$match		= array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#\+#', '#-#', '#\|#');
+			$match		= array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#(^|\s)\+#', '#(^|\s)-#', '#(^|\s)\|#');
 			$replace	= array(' +', ' |', ' -', ' +', ' -', ' |');
 
 			$keywords = preg_replace($match, $replace, $keywords);
-- 
cgit v1.2.1


From 153be855ca8fdee9549be9f51f940a385a0b4e03 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 6 May 2013 09:49:37 -0700
Subject: [ticket/10155] Update copyright in new migration file to 2013

PHPBB3-10155
---
 phpBB/includes/db/migration/data/310/jquery_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/jquery_update.php b/phpBB/includes/db/migration/data/310/jquery_update.php
index bb0c48550a..dc49f74fcb 100644
--- a/phpBB/includes/db/migration/data/310/jquery_update.php
+++ b/phpBB/includes/db/migration/data/310/jquery_update.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package migration
-* @copyright (c) 2012 phpBB Group
+* @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
 *
 */
-- 
cgit v1.2.1


From 828d3b6b68acad606fe150cff7993c216ebc4474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= <m.gaetan89@gmail.com>
Date: Sun, 21 Apr 2013 14:22:45 +0200
Subject: [ticket/11144] Add missing {FORUM_NAME} variable

The template variable {FORUM_NAME} was missing from
the login page of a password protected forum

PHPBB3-11144
---
 phpBB/includes/functions.php          |  1 +
 phpBB/includes/ucp/ucp_pm_compose.php | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index ccd2d3147c..98a1dab722 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3272,6 +3272,7 @@ function login_forum_box($forum_data)
 	page_header($user->lang['LOGIN'], false);
 
 	$template->assign_vars(array(
+		'FORUM_NAME'			=> isset($forum_data['forum_name']) ? $forum_data['forum_name'] : '',
 		'S_LOGIN_ACTION'		=> build_url(array('f')),
 		'S_HIDDEN_FIELDS'		=> build_hidden_fields(array('f' => $forum_data['forum_id'])))
 	);
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 8e82188aff..d7509a1072 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -271,19 +271,16 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 			// Passworded forum?
 			if ($post['forum_id'])
 			{
-				$sql = 'SELECT forum_password
+				$sql = 'SELECT forum_id, forum_name, forum_password
 					FROM ' . FORUMS_TABLE . '
 					WHERE forum_id = ' . (int) $post['forum_id'];
 				$result = $db->sql_query($sql);
-				$forum_password = (string) $db->sql_fetchfield('forum_password');
+				$forum_data = $db->sql_fetchrow($result);
 				$db->sql_freeresult($result);
 
-				if ($forum_password)
+				if (!empty($forum_data['forum_password']))
 				{
-					login_forum_box(array(
-						'forum_id'			=> $post['forum_id'],
-						'forum_password'	=> $forum_password,
-					));
+					login_forum_box($forum_data);
 				}
 			}
 		}
-- 
cgit v1.2.1


From b63a148e088572fd2b410705442aa575b8fe538f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 18 Mar 2013 17:09:12 +0100
Subject: [ticket/11450] Remove unused $db and $phpEx from metadata_manager
 construct()

PHPBB3-11450
---
 phpBB/includes/extension/metadata_manager.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php
index 1637abd340..5f16a5bcd5 100644
--- a/phpBB/includes/extension/metadata_manager.php
+++ b/phpBB/includes/extension/metadata_manager.php
@@ -22,9 +22,7 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_extension_metadata_manager
 {
-	protected $phpEx;
 	protected $extension_manager;
-	protected $db;
 	protected $phpbb_root_path;
 	protected $template;
 	protected $ext_name;
@@ -34,17 +32,13 @@ class phpbb_extension_metadata_manager
 	/**
 	* Creates the metadata manager
 	*
-	* @param phpbb_db_driver $db A database connection
 	* @param string $extension_manager An instance of the phpbb extension manager
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
-	* @param string $phpEx php file extension
 	*/
-	public function __construct($ext_name, phpbb_db_driver $db, phpbb_extension_manager $extension_manager, $phpbb_root_path, $phpEx = 'php', phpbb_template $template, phpbb_config $config)
+	public function __construct($ext_name, phpbb_extension_manager $extension_manager, $phpbb_root_path, phpbb_template $template, phpbb_config $config)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
-		$this->db = $db;
 		$this->config = $config;
-		$this->phpEx = $phpEx;
 		$this->template = $template;
 		$this->extension_manager = $extension_manager;
 		$this->ext_name = $ext_name;
-- 
cgit v1.2.1


From 5794b3d621b9d48b9bf7dcdcc7cc15585bddd021 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 18 Mar 2013 23:02:24 +0100
Subject: [ticket/11450] Sort parameters alphabetically

PHPBB3-11450
---
 phpBB/includes/extension/metadata_manager.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php
index 5f16a5bcd5..030e1bdb9d 100644
--- a/phpBB/includes/extension/metadata_manager.php
+++ b/phpBB/includes/extension/metadata_manager.php
@@ -35,12 +35,13 @@ class phpbb_extension_metadata_manager
 	* @param string $extension_manager An instance of the phpbb extension manager
 	* @param string $phpbb_root_path Path to the phpbb includes directory.
 	*/
-	public function __construct($ext_name, phpbb_extension_manager $extension_manager, $phpbb_root_path, phpbb_template $template, phpbb_config $config)
+	public function __construct($ext_name, phpbb_config $config, phpbb_extension_manager $extension_manager, phpbb_template $template, $phpbb_root_path)
 	{
-		$this->phpbb_root_path = $phpbb_root_path;
 		$this->config = $config;
-		$this->template = $template;
 		$this->extension_manager = $extension_manager;
+		$this->template = $template;
+		$this->phpbb_root_path = $phpbb_root_path;
+
 		$this->ext_name = $ext_name;
 		$this->metadata = array();
 		$this->metadata_file = '';
-- 
cgit v1.2.1


From 001e3ebe9e9534ba0f05dd3a391a2a163a77347a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 18 Mar 2013 23:09:37 +0100
Subject: [ticket/11450] Fix doc blocks and add missing class var $config

PHPBB3-11450
---
 phpBB/includes/extension/metadata_manager.php | 44 +++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php
index 030e1bdb9d..14b77c085b 100644
--- a/phpBB/includes/extension/metadata_manager.php
+++ b/phpBB/includes/extension/metadata_manager.php
@@ -22,18 +22,56 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_extension_metadata_manager
 {
+	/**
+	* phpBB Config instance
+	* @var phpbb_config
+	*/
+	protected $config;
+
+	/**
+	* phpBB Extension Manager
+	* @var phpbb_extension_manager
+	*/
 	protected $extension_manager;
-	protected $phpbb_root_path;
+
+	/**
+	* phpBB Template instance
+	* @var phpbb_template
+	*/
 	protected $template;
+
+	/**
+	* phpBB root path
+	* @var string
+	*/
+	protected $phpbb_root_path;
+
+	/**
+	* Name (including vendor) of the extension
+	* @var string
+	*/
 	protected $ext_name;
+
+	/**
+	* Metadata from the composer.json file
+	* @var array
+	*/
 	protected $metadata;
+
+	/**
+	* Link (including root path) to the metadata file
+	* @var string
+	*/
 	protected $metadata_file;
 
 	/**
 	* Creates the metadata manager
 	*
-	* @param string $extension_manager An instance of the phpbb extension manager
-	* @param string $phpbb_root_path Path to the phpbb includes directory.
+	* @param string				$ext_name			Name (including vendor) of the extension
+	* @param phpbb_config		$config				phpBB Config instance
+	* @param phpbb_extension_manager	$extension_manager An instance of the phpBBb extension manager
+	* @param phpbb_template		$template			phpBB Template instance
+	* @param string				$phpbb_root_path	Path to the phpbb includes directory.
 	*/
 	public function __construct($ext_name, phpbb_config $config, phpbb_extension_manager $extension_manager, phpbb_template $template, $phpbb_root_path)
 	{
-- 
cgit v1.2.1


From 62f35121d948bd177004628a4be2b4e8810a50bd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 18 Mar 2013 23:15:27 +0100
Subject: [ticket/11450] Fix all instances of phpbb_extension_metadata_manager

PHPBB3-11450
---
 phpBB/includes/acp/acp_extensions.php | 2 +-
 phpBB/includes/extension/manager.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index e4defa0400..c52e4e0473 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -54,7 +54,7 @@ class acp_extensions
 		// If they've specified an extension, let's load the metadata manager and validate it.
 		if ($ext_name)
 		{
-			$md_manager = new phpbb_extension_metadata_manager($ext_name, $db, $phpbb_extension_manager, $phpbb_root_path, $phpEx, $template, $config);
+			$md_manager = new phpbb_extension_metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $phpbb_root_path);
 
 			try
 			{
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index a1022762b8..653117adfa 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -155,7 +155,7 @@ class phpbb_extension_manager
 	*/
 	public function create_extension_metadata_manager($name, phpbb_template $template)
 	{
-		return new phpbb_extension_metadata_manager($name, $this->db, $this, $this->phpbb_root_path, $this->php_ext, $template, $this->config);
+		return new phpbb_extension_metadata_manager($name, $this->config, $this, $template, $this->phpbb_root_path);
 	}
 
 	/**
-- 
cgit v1.2.1


From 284011ebf256bffb9544493c7b82f90eeff4ae39 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Wed, 8 May 2013 17:04:03 +0530
Subject: [ticket/10325] move migration into a new file

PHPBB3-10325
---
 phpBB/includes/db/migration/data/310/dev.php       |  2 --
 .../db/migration/data/310/forgot_password.php      | 28 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 phpBB/includes/db/migration/data/310/forgot_password.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 0794567f1b..13b36bbf30 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -84,8 +84,6 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 		return array(
 			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
 
-			array('config.add', array('allow_password_reset', 1)),
-
 			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
 			array('config.add', array('fulltext_postgres_min_word_len', 4)),
 			array('config.add', array('fulltext_postgres_max_word_len', 254)),
diff --git a/phpBB/includes/db/migration/data/310/forgot_password.php b/phpBB/includes/db/migration/data/310/forgot_password.php
new file mode 100644
index 0000000000..a553e51f35
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/forgot_password.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_forgot_password extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return isset($this->config['allow_password_reset']);
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('allow_password_reset', 1)),
+		);
+	}
+}
-- 
cgit v1.2.1


From a50d23078e8964396bda1e2c9cfc6e503f4f6fb9 Mon Sep 17 00:00:00 2001
From: OpenShift guest <dachebodt@gmail.com>
Date: Fri, 10 May 2013 10:15:25 -0400
Subject: [ticket/11458] Use finder to get all permission language files

PHPBB3-11458
---
 phpBB/includes/functions_admin.php | 47 ++++++++++----------------------------
 1 file changed, 12 insertions(+), 35 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index b5efa49159..d9e445cff9 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -3042,50 +3042,27 @@ function add_permission_language()
 {
 	global $user, $phpEx, $phpbb_extension_manager;
 
-	// First of all, our own file. We need to include it as the first file because it presets all relevant variables.
-	$user->add_lang('acp/permissions_phpbb');
-
-	$files_to_add = array();
-
-	// Now search in acp and mods folder for permissions_ files.
-	foreach (array('acp/', 'mods/') as $path)
-	{
-		$dh = @opendir($user->lang_path . $user->lang_name . '/' . $path);
-
-		if ($dh)
-		{
-			while (($file = readdir($dh)) !== false)
-			{
-				if ($file !== 'permissions_phpbb.' . $phpEx && strpos($file, 'permissions_') === 0 && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx)
-				{
-					$files_to_add[] = $path . substr($file, 0, -(strlen($phpEx) + 1));
-				}
-			}
-			closedir($dh);
-		}
-	}
-
-	// find permission language files from extensions
+	// add permission language files from extensions
 	$finder = $phpbb_extension_manager->get_finder();
 
-	$ext_lang_files = $finder
+	$lang_files = $finder
 		->prefix('permissions_')
 		->suffix(".$phpEx")
+		->core_path('language/' . $user->lang_name . '/')
 		->extension_directory('/language/' . $user->lang_name)
 		->find();
 
-	foreach ($ext_lang_files as $lang_file => $ext_name)
+	foreach ($lang_files as $lang_file => $ext_name)
 	{
-		$user->add_lang_ext($ext_name, $lang_file);
-	}
-
-	if (!sizeof($files_to_add))
-	{
-		return false;
+		if ($ext_name === '/')
+		{
+			$user->add_lang($lang_file);
+		}
+		else
+		{
+			$user->add_lang_ext($ext_name, $lang_file);
+		}
 	}
-
-	$user->add_lang($files_to_add);
-	return true;
 }
 
 /**
-- 
cgit v1.2.1


From c9ff3151323fd764354dad5538740baa7c9d8104 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 10 May 2013 13:40:49 -0500
Subject: [ticket/11413] Rename file to something more helpful

PHPBB3-11413
---
 .../db/migration/data/310/notifications2.php       | 92 ----------------------
 .../data/310/notifications_schema_fix.php          | 92 ++++++++++++++++++++++
 2 files changed, 92 insertions(+), 92 deletions(-)
 delete mode 100644 phpBB/includes/db/migration/data/310/notifications2.php
 create mode 100644 phpBB/includes/db/migration/data/310/notifications_schema_fix.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notifications2.php b/phpBB/includes/db/migration/data/310/notifications2.php
deleted file mode 100644
index ce8343089f..0000000000
--- a/phpBB/includes/db/migration/data/310/notifications2.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_notifications2 extends phpbb_db_migration
-{
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_310_notifications');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_tables'		=> array(
-				$this->table_prefix . 'notification_types',
-				$this->table_prefix . 'notifications',
-			),
-			'add_tables'		=> array(
-				$this->table_prefix . 'notification_types'	=> array(
-					'COLUMNS'			=> array(
-						'notification_type_id'		=> array('USINT', NULL, 'auto_increment'),
-						'notification_type_name'	=> array('VCHAR:255', ''),
-						'notification_type_enabled'	=> array('BOOL', 1),
-					),
-					'PRIMARY_KEY'		=> array('notification_type_id'),
-					'KEYS'				=> array(
-						'type'			=> array('UNIQUE', array('notification_type_name')),
-					),
-				),
-				$this->table_prefix . 'notifications'		=> array(
-					'COLUMNS'			=> array(
-						'notification_id'				=> array('UINT:10', NULL, 'auto_increment'),
-						'notification_type_id'			=> array('USINT', 0),
-						'item_id'						=> array('UINT', 0),
-						'item_parent_id'				=> array('UINT', 0),
-						'user_id'						=> array('UINT', 0),
-						'notification_read'				=> array('BOOL', 0),
-						'notification_time'				=> array('TIMESTAMP', 1),
-						'notification_data'				=> array('TEXT_UNI', ''),
-					),
-					'PRIMARY_KEY'		=> 'notification_id',
-					'KEYS'				=> array(
-						'item_ident'		=> array('INDEX', array('notification_type_id', 'item_id')),
-						'user'				=> array('INDEX', array('user_id', 'notification_read')),
-					),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_tables'	=> array(
-				$this->table_prefix . 'notification_types',
-				$this->table_prefix . 'notifications',
-			),
-			'add_tables'		=> array(
-				$this->table_prefix . 'notification_types'	=> array(
-					'COLUMNS'			=> array(
-						'notification_type'			=> array('VCHAR:255', ''),
-						'notification_type_enabled'	=> array('BOOL', 1),
-					),
-					'PRIMARY_KEY'		=> array('notification_type', 'notification_type_enabled'),
-				),
-				$this->table_prefix . 'notifications'		=> array(
-					'COLUMNS'			=> array(
-						'notification_id'  				=> array('UINT', NULL, 'auto_increment'),
-						'item_type'			   			=> array('VCHAR:255', ''),
-						'item_id'		  				=> array('UINT', 0),
-						'item_parent_id'   				=> array('UINT', 0),
-						'user_id'						=> array('UINT', 0),
-						'notification_read'				=> array('BOOL', 0),
-						'notification_time'				=> array('TIMESTAMP', 1),
-						'notification_data'			   	=> array('TEXT_UNI', ''),
-					),
-					'PRIMARY_KEY'		=> 'notification_id',
-					'KEYS'				=> array(
-						'item_ident'		=> array('INDEX', array('item_type', 'item_id')),
-						'user'				=> array('INDEX', array('user_id', 'notification_read')),
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/notifications_schema_fix.php b/phpBB/includes/db/migration/data/310/notifications_schema_fix.php
new file mode 100644
index 0000000000..27e63e10d0
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/notifications_schema_fix.php
@@ -0,0 +1,92 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_notifications_schema_fix extends phpbb_db_migration
+{
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_notifications');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_tables'		=> array(
+				$this->table_prefix . 'notification_types',
+				$this->table_prefix . 'notifications',
+			),
+			'add_tables'		=> array(
+				$this->table_prefix . 'notification_types'	=> array(
+					'COLUMNS'			=> array(
+						'notification_type_id'		=> array('USINT', NULL, 'auto_increment'),
+						'notification_type_name'	=> array('VCHAR:255', ''),
+						'notification_type_enabled'	=> array('BOOL', 1),
+					),
+					'PRIMARY_KEY'		=> array('notification_type_id'),
+					'KEYS'				=> array(
+						'type'			=> array('UNIQUE', array('notification_type_name')),
+					),
+				),
+				$this->table_prefix . 'notifications'		=> array(
+					'COLUMNS'			=> array(
+						'notification_id'				=> array('UINT:10', NULL, 'auto_increment'),
+						'notification_type_id'			=> array('USINT', 0),
+						'item_id'						=> array('UINT', 0),
+						'item_parent_id'				=> array('UINT', 0),
+						'user_id'						=> array('UINT', 0),
+						'notification_read'				=> array('BOOL', 0),
+						'notification_time'				=> array('TIMESTAMP', 1),
+						'notification_data'				=> array('TEXT_UNI', ''),
+					),
+					'PRIMARY_KEY'		=> 'notification_id',
+					'KEYS'				=> array(
+						'item_ident'		=> array('INDEX', array('notification_type_id', 'item_id')),
+						'user'				=> array('INDEX', array('user_id', 'notification_read')),
+					),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'	=> array(
+				$this->table_prefix . 'notification_types',
+				$this->table_prefix . 'notifications',
+			),
+			'add_tables'		=> array(
+				$this->table_prefix . 'notification_types'	=> array(
+					'COLUMNS'			=> array(
+						'notification_type'			=> array('VCHAR:255', ''),
+						'notification_type_enabled'	=> array('BOOL', 1),
+					),
+					'PRIMARY_KEY'		=> array('notification_type', 'notification_type_enabled'),
+				),
+				$this->table_prefix . 'notifications'		=> array(
+					'COLUMNS'			=> array(
+						'notification_id'  				=> array('UINT', NULL, 'auto_increment'),
+						'item_type'			   			=> array('VCHAR:255', ''),
+						'item_id'		  				=> array('UINT', 0),
+						'item_parent_id'   				=> array('UINT', 0),
+						'user_id'						=> array('UINT', 0),
+						'notification_read'				=> array('BOOL', 0),
+						'notification_time'				=> array('TIMESTAMP', 1),
+						'notification_data'			   	=> array('TEXT_UNI', ''),
+					),
+					'PRIMARY_KEY'		=> 'notification_id',
+					'KEYS'				=> array(
+						'item_ident'		=> array('INDEX', array('item_type', 'item_id')),
+						'user'				=> array('INDEX', array('user_id', 'notification_read')),
+					),
+				),
+			),
+		);
+	}
+}
-- 
cgit v1.2.1


From 7d66a9ad525049b8df453ba0325e3dd38fb1157a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 10 May 2013 13:42:54 -0500
Subject: [ticket/11413] Translate the error

PHPBB3-11413
---
 phpBB/includes/notification/manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index a9eb503fb8..bf437e95f0 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -873,7 +873,7 @@ class phpbb_notification_manager
 		{
 			if (!isset($this->notification_types[$notification_type_name]) && !isset($this->notification_types['notification.type.' . $notification_type_name]))
 			{
-				throw new phpbb_notification_exception('Notification type ' . $notification_type_name . ' does not exist');
+				throw new phpbb_notification_exception($user->lang('NOTIFICATION_TYPE_NOT_EXIST', $notification_type_name));
 			}
 
 			$sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array(
-- 
cgit v1.2.1


From cb13747c4bdff5fb8ab034909474f276eff212ee Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 10 May 2013 13:44:38 -0500
Subject: [ticket/11420] Rename migrations file to something more helpful

PHPBB3-11420
---
 .../data/310/notification_options_reconvert.php    | 106 +++++++++++++++++++++
 .../db/migration/data/310/notifications3.php       | 106 ---------------------
 2 files changed, 106 insertions(+), 106 deletions(-)
 create mode 100644 phpBB/includes/db/migration/data/310/notification_options_reconvert.php
 delete mode 100644 phpBB/includes/db/migration/data/310/notifications3.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notification_options_reconvert.php b/phpBB/includes/db/migration/data/310/notification_options_reconvert.php
new file mode 100644
index 0000000000..9f2d4b2d75
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/notification_options_reconvert.php
@@ -0,0 +1,106 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_db_migration
+{
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_notifications_schema_fix');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'convert_notifications'))),
+		);
+	}
+
+	public function convert_notifications()
+	{
+		$insert_table = $this->table_prefix . 'user_notifications';
+		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table);
+
+		$this->perform_conversion($insert_buffer, $insert_table);
+	}
+
+	/**
+	* Perform the conversion (separate for testability)
+	*/
+	public function perform_conversion($insert_buffer, $insert_table)
+	{
+		$sql = 'DELETE FROM ' . $insert_table;
+		$this->db->sql_query($sql);
+
+		$sql = 'SELECT user_id, user_notify_type, user_notify_pm
+			FROM ' . USERS_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$notification_methods = array();
+
+			// In-board notification
+			$notification_methods[] = '';
+
+			if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
+			{
+				$notification_methods[] = 'email';
+			}
+
+			if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
+			{
+				$notification_methods[] = 'jabber';
+			}
+
+			// Notifications for  posts
+			foreach (array('post', 'topic') as $item_type)
+			{
+				$this->add_method_rows(
+					$insert_buffer,
+					$item_type,
+					0,
+					$row['user_id'],
+					$notification_methods
+				);
+			}
+
+			if ($row['user_notify_pm'])
+			{
+				// Notifications for private messages
+				// User either gets all methods or no method
+				$this->add_method_rows(
+					$insert_buffer,
+					'pm',
+					0,
+					$row['user_id'],
+					$notification_methods
+				);
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		$insert_buffer->flush();
+	}
+
+	protected function add_method_rows(phpbb_db_sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods)
+	{
+		$row_base = array(
+			'item_type'		=> $item_type,
+			'item_id'		=> (int) $item_id,
+			'user_id'		=> (int) $user_id,
+			'notify'		=> 1
+		);
+
+		foreach ($methods as $method)
+		{
+			$row_base['method'] = $method;
+			$insert_buffer->insert($row_base);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/notifications3.php b/phpBB/includes/db/migration/data/310/notifications3.php
deleted file mode 100644
index 22839dbd7b..0000000000
--- a/phpBB/includes/db/migration/data/310/notifications3.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_notifications3 extends phpbb_db_migration
-{
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_310_notifications2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'convert_notifications'))),
-		);
-	}
-
-	public function convert_notifications()
-	{
-		$insert_table = $this->table_prefix . 'user_notifications';
-		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table);
-
-		$this->perform_conversion($insert_buffer, $insert_table);
-	}
-
-	/**
-	* Perform the conversion (separate for testability)
-	*/
-	public function perform_conversion($insert_buffer, $insert_table)
-	{
-		$sql = 'DELETE FROM ' . $insert_table;
-		$this->db->sql_query($sql);
-
-		$sql = 'SELECT user_id, user_notify_type, user_notify_pm
-			FROM ' . USERS_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$notification_methods = array();
-
-			// In-board notification
-			$notification_methods[] = '';
-
-			if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
-			{
-				$notification_methods[] = 'email';
-			}
-
-			if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
-			{
-				$notification_methods[] = 'jabber';
-			}
-
-			// Notifications for  posts
-			foreach (array('post', 'topic') as $item_type)
-			{
-				$this->add_method_rows(
-					$insert_buffer,
-					$item_type,
-					0,
-					$row['user_id'],
-					$notification_methods
-				);
-			}
-
-			if ($row['user_notify_pm'])
-			{
-				// Notifications for private messages
-				// User either gets all methods or no method
-				$this->add_method_rows(
-					$insert_buffer,
-					'pm',
-					0,
-					$row['user_id'],
-					$notification_methods
-				);
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		$insert_buffer->flush();
-	}
-
-	protected function add_method_rows(phpbb_db_sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods)
-	{
-		$row_base = array(
-			'item_type'		=> $item_type,
-			'item_id'		=> (int) $item_id,
-			'user_id'		=> (int) $user_id,
-			'notify'		=> 1
-		);
-
-		foreach ($methods as $method)
-		{
-			$row_base['method'] = $method;
-			$insert_buffer->insert($row_base);
-		}
-	}
-}
-- 
cgit v1.2.1


From 27b2bbb8ff9efc6e06cfc5077dc939b1f1f7d0e5 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 10 May 2013 13:58:55 -0500
Subject: [ticket/11415] Create function in finder find_from_extension

PHPBB3-11415
---
 phpBB/includes/extension/base.php   | 15 ++-------------
 phpBB/includes/extension/finder.php | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/base.php b/phpBB/includes/extension/base.php
index 2d22658ff1..a6c9bbb5bc 100644
--- a/phpBB/includes/extension/base.php
+++ b/phpBB/includes/extension/base.php
@@ -125,21 +125,10 @@ class phpbb_extension_base implements phpbb_extension_interface
 		}
 
 		// Only have the finder search in this extension path directory
-		$extensions = array(
-			$this->extension_name => $this->extension_path,
-		);
-
 		$finder = $this->extension_manager->get_finder();
-		$migrations = array();
-		$file_list = $finder
+		$migrations = $finder
 			->extension_directory('/migrations')
-			->find_from_paths($extensions);
-
-		foreach ($file_list as $file)
-		{
-			$migrations[$file['named_path']] = $file['ext_name'];
-		}
-
+			->find_from_extension($this->extension_name, $this->extension_path);
 		$migrations = $finder->get_classes_from_files($migrations);
 
 		return $migrations;
diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
index 766b9e9b63..49bb2a514f 100644
--- a/phpBB/includes/extension/finder.php
+++ b/phpBB/includes/extension/finder.php
@@ -377,6 +377,34 @@ class phpbb_extension_finder
 
 		return $files;
 	}
+	
+	/**
+	* Finds all file system entries matching the configured options for one
+	* specific extension
+	*
+	* @param string $extension_name Name of the extension
+	* @param string $extension_path Relative path to the extension root directory
+	* @param bool $cache Whether the result should be cached
+	* @param bool $is_dir Directories will be returned when true, only files
+	*                     otherwise
+	* @return array An array of paths to found items
+	*/
+	public function find_from_extension($extension_name, $extension_path, $cache = true, $is_dir = false)
+	{
+		$extensions = array(
+			$extension_name => $extension_path,
+		);
+
+		$files = array();
+		$file_list = $this->find_from_paths($extensions, $cache, $is_dir);
+
+		foreach ($file_list as $file)
+		{
+			$files[$file['named_path']] = $file['ext_name'];
+		}
+
+		return $files;
+	}
 
 	/**
 	* Finds all file system entries matching the configured options from
-- 
cgit v1.2.1


From f91f8666fd423c3e9f74d05355c8fa3e8ece2de9 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 10 May 2013 14:01:31 -0500
Subject: [ticket/11415] Send the extension base the finder rather than the
 manager

PHPBB3-11415
---
 phpBB/includes/extension/base.php    | 15 +++++++--------
 phpBB/includes/extension/manager.php |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/extension/base.php b/phpBB/includes/extension/base.php
index a6c9bbb5bc..c4462b64d8 100644
--- a/phpBB/includes/extension/base.php
+++ b/phpBB/includes/extension/base.php
@@ -27,8 +27,8 @@ class phpbb_extension_base implements phpbb_extension_interface
 	/** @var ContainerInterface */
 	protected $container;
 
-	/** @var phpbb_extension_manager */
-	protected $extension_manager;
+	/** @var phpbb_extension_finder */
+	protected $finder;
 
 	/** @var phpbb_db_migrator */
 	protected $migrator;
@@ -43,14 +43,14 @@ class phpbb_extension_base implements phpbb_extension_interface
 	* Constructor
 	*
 	* @param ContainerInterface $container Container object
-	* @param phpbb_extension_manager $extension_manager
+	* @param phpbb_extension_finder $extension_finder
 	* @param string $extension_name Name of this extension (from ext.manager)
 	* @param string $extension_path Relative path to this extension
 	*/
-	public function __construct(ContainerInterface $container, phpbb_extension_manager $extension_manager, phpbb_db_migrator $migrator, $extension_name, $extension_path)
+	public function __construct(ContainerInterface $container, phpbb_extension_finder $extension_finder, phpbb_db_migrator $migrator, $extension_name, $extension_path)
 	{
 		$this->container = $container;
-		$this->extension_manager = $extension_manager;
+		$this->extension_finder = $extension_finder;
 		$this->migrator = $migrator;
 
 		$this->extension_name = $extension_name;
@@ -125,11 +125,10 @@ class phpbb_extension_base implements phpbb_extension_interface
 		}
 
 		// Only have the finder search in this extension path directory
-		$finder = $this->extension_manager->get_finder();
-		$migrations = $finder
+		$migrations = $this->extension_finder
 			->extension_directory('/migrations')
 			->find_from_extension($this->extension_name, $this->extension_path);
-		$migrations = $finder->get_classes_from_files($migrations);
+		$migrations = $this->extension_finder->get_classes_from_files($migrations);
 
 		return $migrations;
 	}
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
index 799c8b2418..48b72bcdd0 100644
--- a/phpBB/includes/extension/manager.php
+++ b/phpBB/includes/extension/manager.php
@@ -137,11 +137,11 @@ class phpbb_extension_manager
 
 		if (class_exists($extension_class_name))
 		{
-			return new $extension_class_name($this->container, $this, $migrator, $name, $this->get_extension_path($name, true));
+			return new $extension_class_name($this->container, $this->get_finder(), $migrator, $name, $this->get_extension_path($name, true));
 		}
 		else
 		{
-			return new phpbb_extension_base($this->container, $this, $migrator, $name, $this->get_extension_path($name, true));
+			return new phpbb_extension_base($this->container, $this->get_finder(), $migrator, $name, $this->get_extension_path($name, true));
 		}
 	}
 
-- 
cgit v1.2.1


From b40c6fe46ae6e9ebdbbafd22b75d2d0ac0804e97 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 11 May 2013 23:30:44 +0300
Subject: [ticket/11533] Columns counter for notification settings

Add columns counter template variable. It counts number of
notification types + column for name + column for checkbox

PHPBB3-11533
---
 phpBB/includes/ucp/ucp_notifications.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 338c921e94..72c41776b3 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -200,6 +200,10 @@ class ucp_notifications
 				}
 			}
 		}
+
+		$template->assign_vars(array(
+			strtoupper($block) . '_COLS' => sizeof($notification_methods) + 2,
+		));
 	}
 
 	/**
-- 
cgit v1.2.1


From d680aac7c5662223f1f491b244456220450cac23 Mon Sep 17 00:00:00 2001
From: gamerchan <gamerchandan@gmail.com>
Date: Fri, 3 May 2013 11:10:53 +0530
Subject: [ticket/11105] Added spaces between ; and "url=" to adhere to w3c
 conventions.

There was no space between ; and the string "url=". But according to w3c, we
should have atleast one space between them. So, added space characters
accordingly.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 98a1dab722..cf676a3351 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2740,7 +2740,7 @@ function meta_refresh($time, $url, $disable_cd_check = false)
 
 	// For XHTML compatibility we change back & to &amp;
 	$template->assign_vars(array(
-		'META' => '<meta http-equiv="refresh" content="' . $time . ';url=' . $url . '" />')
+		'META' => '<meta http-equiv="refresh" content="' . $time . '; url=' . $url . '" />')
 	);
 
 	return $url;
-- 
cgit v1.2.1


From ad430ae406fc2bfc21f35ee068b1eb809f39f963 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 13 May 2013 00:41:57 -0500
Subject: [ticket/11413] $user should have been $this->user

PHPBB3-11413
---
 phpBB/includes/notification/manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index bf437e95f0..97833710c0 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -873,7 +873,7 @@ class phpbb_notification_manager
 		{
 			if (!isset($this->notification_types[$notification_type_name]) && !isset($this->notification_types['notification.type.' . $notification_type_name]))
 			{
-				throw new phpbb_notification_exception($user->lang('NOTIFICATION_TYPE_NOT_EXIST', $notification_type_name));
+				throw new phpbb_notification_exception($this->user->lang('NOTIFICATION_TYPE_NOT_EXIST', $notification_type_name));
 			}
 
 			$sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array(
-- 
cgit v1.2.1


From 05cd045923068b08962856ec5e0c36f72f8f831c Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 13 May 2013 00:56:08 -0500
Subject: [ticket/11413] Revert some cache service related changes from earlier

PHPBB3-11413
---
 phpBB/includes/notification/method/base.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
index bae85310b2..b633956d01 100644
--- a/phpBB/includes/notification/method/base.php
+++ b/phpBB/includes/notification/method/base.php
@@ -30,7 +30,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	/** @var phpbb_db_driver */
 	protected $db;
 
-	/** @var phpbb_cache_service */
+	/** @var phpbb_cache_driver_interface */
 	protected $cache;
 
 	/** @var phpbb_template */
@@ -66,7 +66,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	* 
 	* @param phpbb_user_loader $user_loader
 	* @param phpbb_db_driver $db
-	* @param phpbb_cache_service $cache
+	* @param phpbb_cache_driver_interface $cache
 	* @param phpbb_user $user
 	* @param phpbb_auth $auth
 	* @param phpbb_config $config
@@ -74,7 +74,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	* @param string $php_ext
 	* @return phpbb_notification_method_base
 	*/
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_service $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
-- 
cgit v1.2.1


From 6890bf9f8d97473d55f2d6819c8ec155f9d52658 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 13 May 2013 12:17:31 +0200
Subject: [ticket/11535] Correctly merge avatar_errors array into primary error
 array

The $avatar_errors array needs to be merged into the primary $error array
before the group settings get applied. This is currently not the case.
Functional tests for this will be provided by PR #1401.

PHPBB3-11535
---
 phpBB/includes/acp/acp_groups.php | 10 ++++++++--
 phpBB/includes/ucp/ucp_groups.php | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 865810687b..37c49d7d72 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -381,6 +381,9 @@ class acp_groups
 							$submit_ary['avatar_width'] = 0;
 							$submit_ary['avatar_height'] = 0;
 						}
+
+						// Merge any avatar errors into the primary error array
+						$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
 					}
 
 					// Validate the length of "Maximum number of allowed recipients per private message" setting.
@@ -570,8 +573,11 @@ class acp_groups
 
 				$avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
 
-				// Merge any avatar errors into the primary error array
-				$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
+				if (!$update)
+				{
+					// Merge any avatar errors into the primary error array
+					$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
+				}
 
 				$back_link = request_var('back_link', '');
 
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 50d13e00b1..a633ce448c 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -547,6 +547,9 @@ class ucp_groups
 									$submit_ary['avatar_width'] = 0;
 									$submit_ary['avatar_height'] = 0;
 								}
+
+								// Merge any avatars errors into the primary error array
+								$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
 							}
 
 							if (!check_form_key('ucp_groups'))
@@ -672,8 +675,11 @@ class ucp_groups
 							}
 						}
 
-						// Merge any avatars errors into the primary error array
-						$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
+						if (!$update)
+						{
+							// Merge any avatars errors into the primary error array
+							$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
+						}
 
 						$template->assign_vars(array(
 							'S_EDIT'			=> true,
-- 
cgit v1.2.1


From b7b0b0ccc3fbf92324948e8c5e616a3e06343600 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 14 May 2013 13:43:53 +0200
Subject: [ticket/11538] Make sure group color can't exceed maximum of 6
 characters

In order to prevent future issues with this, a basic set of functional
tests for the UCP groups manage page have been added.

PHPBB3-11538
---
 phpBB/includes/ucp/ucp_groups.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index d62dbb1866..c1db19774a 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -597,6 +597,16 @@ class ucp_groups
 
 							if (!sizeof($error))
 							{
+								// Make sure maximum length of 6 of group color is not exceeded
+								if (strpos($submit_ary['colour'], '#') === 0)
+								{
+									$submit_ary['colour'] = substr($submit_ary['colour'], 1, 6);
+								}
+								else
+								{
+									$submit_ary['colour'] = substr($submit_ary['colour'], 0, 6);
+								}
+
 								// Only set the rank, colour, etc. if it's changed or if we're adding a new
 								// group. This prevents existing group members being updated if no changes
 								// were made.
-- 
cgit v1.2.1


From a547ba3f9d569410107574a151af9a2f301bb68e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 14 May 2013 19:44:55 +0200
Subject: [ticket/11538] Use regex for testing color value and improve tests

We are now using a regex with preg_match() in order to properly check
if the entered color value is in hex color format or not. A proper
error message is triggered if an incorrect color value is entered and
the prepended '#' is removed if necessary.

PHPBB3-11538
---
 phpBB/includes/ucp/ucp_groups.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index c1db19774a..3f06e74159 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -595,18 +595,22 @@ class ucp_groups
 								$error[] = $user->lang['FORM_INVALID'];
 							}
 
-							if (!sizeof($error))
+							if (!empty($submit_ary['colour']))
 							{
-								// Make sure maximum length of 6 of group color is not exceeded
-								if (strpos($submit_ary['colour'], '#') === 0)
+								preg_match('/^(#?)+(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})\b/', $submit_ary['colour'], $group_colour);
+
+								if (sizeof($group_colour))
 								{
-									$submit_ary['colour'] = substr($submit_ary['colour'], 1, 6);
+									$submit_ary['colour'] = (strpos($group_colour[0], '#') !== false) ? str_replace('#', '', $group_colour[0]) : $group_colour[0];
 								}
 								else
 								{
-									$submit_ary['colour'] = substr($submit_ary['colour'], 0, 6);
+									$error[] = $user->lang['COLOUR_INVALID'];
 								}
+							}
 
+							if (!sizeof($error))
+							{
 								// Only set the rank, colour, etc. if it's changed or if we're adding a new
 								// group. This prevents existing group members being updated if no changes
 								// were made.
-- 
cgit v1.2.1


From 1fae7720e43c8ff853225e16d0de54395d9ab051 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 14 May 2013 21:27:25 +0200
Subject: [ticket/11538] Fix incorrect regex and test for duplicate # in color
 string

PHPBB3-11538
---
 phpBB/includes/ucp/ucp_groups.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 3f06e74159..8ff76eac42 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -597,7 +597,7 @@ class ucp_groups
 
 							if (!empty($submit_ary['colour']))
 							{
-								preg_match('/^(#?)+(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})\b/', $submit_ary['colour'], $group_colour);
+								preg_match('/^#?(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})\b/', $submit_ary['colour'], $group_colour);
 
 								if (sizeof($group_colour))
 								{
-- 
cgit v1.2.1


From deefe5c0e48534cea1327cf685255d109d9d7e2c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 14 May 2013 22:39:33 +0200
Subject: [ticket/11538] Simplify colour value check and remove support for '#'

The input length for the hex color is now limited to 6 characters and
the support for colors starting with a '#' has been dropped. The allowed
input length of 7 in prosilver seems to have been a relict from old ages
of phpBB3. In order to have proper support for correct checking of the
colour value, the new code was also ported to the ACP groups manage page.
The tests have been modified to reflect the changes to the behavior of
the color check. Tests for the ACP will follow.

PHPBB3-11538
---
 phpBB/includes/acp/acp_groups.php |  7 +++++++
 phpBB/includes/ucp/ucp_groups.php | 15 ++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index beb7aefee5..3b0d53d52c 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -422,6 +422,13 @@ class acp_groups
 						$error = array_merge($error, array_map(array(&$user, 'lang'), $max_recipients_error));
 					}
 
+					// Validate submitted colour value
+					if ($colour_error = validate_data($submit_ary, array('colour'	=> array('match', true, '/^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})\b/'))))
+					{
+						// Replace "error" string with its real, localised form
+						$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
+					}
+
 					if (!sizeof($error))
 					{
 						// Only set the rank, colour, etc. if it's changed or if we're adding a new
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 8ff76eac42..bf6af8b6f1 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -595,18 +595,11 @@ class ucp_groups
 								$error[] = $user->lang['FORM_INVALID'];
 							}
 
-							if (!empty($submit_ary['colour']))
+							// Validate submitted colour value
+							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('match', true, '/^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})\b/'))))
 							{
-								preg_match('/^#?(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})\b/', $submit_ary['colour'], $group_colour);
-
-								if (sizeof($group_colour))
-								{
-									$submit_ary['colour'] = (strpos($group_colour[0], '#') !== false) ? str_replace('#', '', $group_colour[0]) : $group_colour[0];
-								}
-								else
-								{
-									$error[] = $user->lang['COLOUR_INVALID'];
-								}
+								// Replace "error" string with its real, localised form
+								$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
 							}
 
 							if (!sizeof($error))
-- 
cgit v1.2.1


From 204cdb21640aead9f7560034bb8e686c17707476 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 15 May 2013 12:30:05 +0200
Subject: [ticket/11538] Make sure regex doesn't allow multiple color values

This will now make sure that 'AAFF00' will be matched but strings like
'AAFF00 AABB00' will not.

PHPBB3-11538
---
 phpBB/includes/acp/acp_groups.php | 2 +-
 phpBB/includes/ucp/ucp_groups.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 3b0d53d52c..ffbce33667 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -423,7 +423,7 @@ class acp_groups
 					}
 
 					// Validate submitted colour value
-					if ($colour_error = validate_data($submit_ary, array('colour'	=> array('match', true, '/^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})\b/'))))
+					if ($colour_error = validate_data($submit_ary, array('colour'	=> array('match', true, '/^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/'))))
 					{
 						// Replace "error" string with its real, localised form
 						$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index bf6af8b6f1..58c8d1ae4a 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -596,7 +596,7 @@ class ucp_groups
 							}
 
 							// Validate submitted colour value
-							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('match', true, '/^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})\b/'))))
+							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('match', true, '/^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/'))))
 							{
 								// Replace "error" string with its real, localised form
 								$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
-- 
cgit v1.2.1


From 06edf15ac3e63350b7973b04f07578de1c4565d0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 15 May 2013 13:55:35 +0200
Subject: [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index cf676a3351..4b144a20a1 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1005,7 +1005,7 @@ if (!function_exists('stripos'))
 */
 function is_absolute($path)
 {
-	return ($path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:[/\\\]#i', $path))) ? true : false;
+	return (isset($path[0]) && $path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:[/\\\]#i', $path))) ? true : false;
 }
 
 /**
-- 
cgit v1.2.1


From 1715619fda2aebd7ebae960e5fcbdf4b24ce4dca Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 16 May 2013 13:22:43 +0200
Subject: [ticket/11538] Add function phpbb_validate_colour for validating
 colours

It will be possible to use this function via the validate_data() function
interface that has already been used previously. Thus, this new function
will extend the capabilities of validate_data() to checking hex color
values.

PHPBB3-11538
---
 phpBB/includes/acp/acp_groups.php |  2 +-
 phpBB/includes/functions_user.php | 24 +++++++++++++++++++++++-
 phpBB/includes/ucp/ucp_groups.php |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index ffbce33667..9a9a723605 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -423,7 +423,7 @@ class acp_groups
 					}
 
 					// Validate submitted colour value
-					if ($colour_error = validate_data($submit_ary, array('colour'	=> array('match', true, '/^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/'))))
+					if ($colour_error = validate_data($submit_ary, array('colour'	=> array('colour'))))
 					{
 						// Replace "error" string with its real, localised form
 						$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 5a6a0b4a05..b7fdb7a6ad 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1247,8 +1247,9 @@ function validate_data($data, $val_ary)
 		{
 			$function = array_shift($validate);
 			array_unshift($validate, $data[$var]);
+			$function_prefix = (function_exists('phpbb_validate_' . $function)) ? 'phpbb_validate_' : 'validate';
 
-			if ($result = call_user_func_array('validate_' . $function, $validate))
+			if ($result = call_user_func_array($function_prefix . $function, $validate))
 			{
 				// Since errors are checked later for their language file existence, we need to make sure custom errors are not adjusted.
 				$error[] = (empty($user->lang[$result . '_' . strtoupper($var)])) ? $result : $result . '_' . strtoupper($var);
@@ -1898,6 +1899,27 @@ function validate_jabber($jid)
 	return false;
 }
 
+/**
+* Validate hex colour value
+*
+* @param string $colour The hex colour value
+* @return bool/string Error message if colour value is incorrect, false if it fits the hex colour code
+*/
+function phpbb_validate_colour($colour)
+{
+	if (empty($colour))
+	{
+		return false;
+	}
+
+	if (!preg_match('/^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/', $colour))
+	{
+		return 'WRONG_DATA';
+	}
+
+	return false;
+}
+
 /**
 * Verifies whether a style ID corresponds to an active style.
 *
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 58c8d1ae4a..9d2cf2728d 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -596,7 +596,7 @@ class ucp_groups
 							}
 
 							// Validate submitted colour value
-							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('match', true, '/^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/'))))
+							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('colour'))))
 							{
 								// Replace "error" string with its real, localised form
 								$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
-- 
cgit v1.2.1


From 38dbfc17a782f72737451103b8e4067f152bd0b7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 16 May 2013 17:30:23 +0200
Subject: [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute

The given path is an absolute path in general, just not on our current system.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4b144a20a1..b2b12c1445 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1005,7 +1005,7 @@ if (!function_exists('stripos'))
 */
 function is_absolute($path)
 {
-	return (isset($path[0]) && $path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:[/\\\]#i', $path))) ? true : false;
+	return (isset($path[0]) && $path[0] == '/' || preg_match('#^[a-z]:[/\\\]#i', $path)) ? true : false;
 }
 
 /**
-- 
cgit v1.2.1


From b49ce5eb3a54a6c256955d3510fe409a6f4511aa Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 19 May 2013 11:29:11 +0200
Subject: [ticket/11538] Rename phpbb_validate_colour to
 phpbb_validate_hex_colour

PHPBB3-11538
---
 phpBB/includes/acp/acp_groups.php | 2 +-
 phpBB/includes/functions_user.php | 5 +++--
 phpBB/includes/ucp/ucp_groups.php | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 9a9a723605..25df9e357e 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -423,7 +423,7 @@ class acp_groups
 					}
 
 					// Validate submitted colour value
-					if ($colour_error = validate_data($submit_ary, array('colour'	=> array('colour'))))
+					if ($colour_error = validate_data($submit_ary, array('colour'	=> array('hex_colour'))))
 					{
 						// Replace "error" string with its real, localised form
 						$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index b7fdb7a6ad..f8e1fcaa45 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1903,9 +1903,10 @@ function validate_jabber($jid)
 * Validate hex colour value
 *
 * @param string $colour The hex colour value
-* @return bool/string Error message if colour value is incorrect, false if it fits the hex colour code
+* @return bool|string 	Error message if colour value is incorrect, false if it
+*			fits the hex colour code
 */
-function phpbb_validate_colour($colour)
+function phpbb_validate_hex_colour($colour)
 {
 	if (empty($colour))
 	{
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 9d2cf2728d..20a55d8c32 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -596,7 +596,7 @@ class ucp_groups
 							}
 
 							// Validate submitted colour value
-							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('colour'))))
+							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('hex_colour'))))
 							{
 								// Replace "error" string with its real, localised form
 								$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
-- 
cgit v1.2.1


From 373e26ca746699f466e768406b951e6cf09ed284 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 19 May 2013 11:38:11 +0200
Subject: [ticket/11538] Merge calls to validate_data() in acp_groups

PHPBB3-11538
---
 phpBB/includes/acp/acp_groups.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 25df9e357e..bddad78bf2 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -413,20 +413,21 @@ class acp_groups
 						}
 					}
 
-					// Validate the length of "Maximum number of allowed recipients per private message" setting.
-					// We use 16777215 as a maximum because it matches MySQL unsigned mediumint maximum value
-					// which is the lowest amongst DBMSes supported by phpBB3
-					if ($max_recipients_error = validate_data($submit_ary, array('max_recipients' => array('num', false, 0, 16777215))))
-					{
-						// Replace "error" string with its real, localised form
-						$error = array_merge($error, array_map(array(&$user, 'lang'), $max_recipients_error));
-					}
+					/*
+					* Validate the length of "Maximum number of allowed recipients per private message" setting.
+					* We use 16777215 as a maximum because it matches MySQL unsigned mediumint maximum value
+					* which is the lowest amongst DBMSes supported by phpBB3.
+					* Also validate the submitted colour value.
+					*/
+					$validation_checks = array(
+						'max_recipients' => array('num', false, 0, 16777215),
+						'colour'	=> array('hex_colour'),
+					);
 
-					// Validate submitted colour value
-					if ($colour_error = validate_data($submit_ary, array('colour'	=> array('hex_colour'))))
+					if ($validation_error = validate_data($submit_ary, $validation_checks))
 					{
 						// Replace "error" string with its real, localised form
-						$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
+						$error = array_merge($error, array_map(array(&$user, 'lang'), $validation_error));
 					}
 
 					if (!sizeof($error))
-- 
cgit v1.2.1


From 7898dd945966232060bf4ff39a31b319f4962ae1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 19 May 2013 15:13:37 +0200
Subject: [ticket/11538] Limit comment in acp_groups to 80 characters per line

PHPBB3-11538
---
 phpBB/includes/acp/acp_groups.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index bddad78bf2..089fe4baa1 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -414,10 +414,10 @@ class acp_groups
 					}
 
 					/*
-					* Validate the length of "Maximum number of allowed recipients per private message" setting.
-					* We use 16777215 as a maximum because it matches MySQL unsigned mediumint maximum value
-					* which is the lowest amongst DBMSes supported by phpBB3.
-					* Also validate the submitted colour value.
+					* Validate the length of "Maximum number of allowed recipients per
+					* private message" setting. We use 16777215 as a maximum because it matches
+					* MySQL unsigned mediumint maximum value which is the lowest amongst DBMSes
+					* supported by phpBB3. Also validate the submitted colour value.
 					*/
 					$validation_checks = array(
 						'max_recipients' => array('num', false, 0, 16777215),
-- 
cgit v1.2.1


From cd1da92d8540d6b4aa0fa1ccf2bcafe68007288a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 19 May 2013 17:45:45 +0200
Subject: [ticket/11538] Add optional switch as argument to hex colour
 validation

The value of $optional will decide whether an empty string will be
treated as incorrect input or if it is allowed. The optional argument
will default to false and therefore treat an empty string as incorrect
unless explicitly told to not do so.

PHPBB3-11538
---
 phpBB/includes/acp/acp_groups.php | 2 +-
 phpBB/includes/functions_user.php | 8 +++++---
 phpBB/includes/ucp/ucp_groups.php | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 089fe4baa1..83c355540e 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -421,7 +421,7 @@ class acp_groups
 					*/
 					$validation_checks = array(
 						'max_recipients' => array('num', false, 0, 16777215),
-						'colour'	=> array('hex_colour'),
+						'colour'	=> array('hex_colour', true),
 					);
 
 					if ($validation_error = validate_data($submit_ary, $validation_checks))
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index f8e1fcaa45..61972c3876 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1903,14 +1903,16 @@ function validate_jabber($jid)
 * Validate hex colour value
 *
 * @param string $colour The hex colour value
-* @return bool|string 	Error message if colour value is incorrect, false if it
+* @param bool $optional Whether the colour value is optional. True if an empty
+*			string will be accepted as correct input, false if not.
+* @return bool|string Error message if colour value is incorrect, false if it
 *			fits the hex colour code
 */
-function phpbb_validate_hex_colour($colour)
+function phpbb_validate_hex_colour($colour, $optional = false)
 {
 	if (empty($colour))
 	{
-		return false;
+		return (($optional) ? false : 'WRONG_DATA');
 	}
 
 	if (!preg_match('/^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/', $colour))
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 20a55d8c32..9365913541 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -596,7 +596,7 @@ class ucp_groups
 							}
 
 							// Validate submitted colour value
-							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('hex_colour'))))
+							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('hex_colour', true))))
 							{
 								// Replace "error" string with its real, localised form
 								$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
-- 
cgit v1.2.1


From 901955e45264aef53c7b1ddd68d2181032357376 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 20 May 2013 12:20:55 -0400
Subject: [ticket/11551] Fix error in system tab if get_remote_file returns
 empty string

Currently a debug error is thrown. With this patch, it fails without keeping
the admin from being able to access the rest of the System modules by showing
a nicer error "Failed to obtain latest version information."

PHPBB3-11551
---
 phpBB/includes/acp/acp_update.php  | 2 +-
 phpBB/includes/functions_admin.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php
index 7e3d1a1024..5d3e9abcea 100644
--- a/phpBB/includes/acp/acp_update.php
+++ b/phpBB/includes/acp/acp_update.php
@@ -39,7 +39,7 @@ class acp_update
 
 		$info = obtain_latest_version_info(request_var('versioncheck_force', false));
 
-		if ($info === false)
+		if (empty($info))
 		{
 			trigger_error('VERSIONCHECK_FAIL', E_USER_WARNING);
 		}
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 190185cfcf..a9d1db24a5 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -3319,7 +3319,7 @@ function obtain_latest_version_info($force_update = false, $warn_fail = false, $
 		$info = get_remote_file('version.phpbb.com', '/phpbb',
 				((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
 
-		if ($info === false)
+		if (empty($info))
 		{
 			$cache->destroy('versioncheck');
 			if ($warn_fail)
-- 
cgit v1.2.1


From 66a943cfd8f35cc55f15168d586a9b71c076ab7b Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Wed, 8 Aug 2012 13:35:34 +0200
Subject: [ticket/11010] adding new input types into build_cfg_template()

PHPBB3-11010
---
 phpBB/includes/functions_acp.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index d6bd9e35dd..f4e9613d3b 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -249,6 +249,8 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 	{
 		case 'text':
 		case 'password':
+		case 'url':
+		case 'email':
 			$size = (int) $tpl_type[1];
 			$maxlength = (int) $tpl_type[2];
 
-- 
cgit v1.2.1


From 4fe7ba5daf16abdb50297b60398aaed1b9d9edce Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Wed, 8 Aug 2012 21:03:45 +0200
Subject: [ticket/11010] changing email and url input types in php files

PHPBB3-11010
---
 phpBB/includes/acp/acp_attachments.php | 4 ++--
 phpBB/includes/acp/acp_board.php       | 6 +++---
 phpBB/includes/auth/auth_ldap.php      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 9d6c2d5de1..38dbb35f7f 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1203,8 +1203,8 @@ class acp_attachments
 
 				// Just get the files
 				$sql = 'SELECT a.*, u.username, u.user_colour, t.topic_title
-					FROM ' . ATTACHMENTS_TABLE . ' a 
-					LEFT JOIN ' . USERS_TABLE . ' u ON (u.user_id = a.poster_id) 
+					FROM ' . ATTACHMENTS_TABLE . ' a
+					LEFT JOIN ' . USERS_TABLE . ' u ON (u.user_id = a.poster_id)
 					LEFT JOIN ' . TOPICS_TABLE . " t ON (a.topic_id = t.topic_id)
 					WHERE a.is_orphan = 0
 						$limit_filetime
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index ab44920f0a..90dec62770 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -431,8 +431,8 @@ class acp_board
 						'board_email_form'		=> array('lang' => 'BOARD_EMAIL_FORM',		'validate' => 'bool',	'type' => 'radio:enabled_disabled', 'explain' => true),
 						'email_function_name'	=> array('lang' => 'EMAIL_FUNCTION_NAME',	'validate' => 'string',	'type' => 'text:20:50', 'explain' => true),
 						'email_package_size'	=> array('lang' => 'EMAIL_PACKAGE_SIZE',	'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true),
-						'board_contact'			=> array('lang' => 'CONTACT_EMAIL',			'validate' => 'email',	'type' => 'text:25:100', 'explain' => true),
-						'board_email'			=> array('lang' => 'ADMIN_EMAIL',			'validate' => 'email',	'type' => 'text:25:100', 'explain' => true),
+						'board_contact'			=> array('lang' => 'CONTACT_EMAIL',			'validate' => 'email',	'type' => 'email:25:100', 'explain' => true),
+						'board_email'			=> array('lang' => 'ADMIN_EMAIL',			'validate' => 'email',	'type' => 'email:25:100', 'explain' => true),
 						'board_email_sig'		=> array('lang' => 'EMAIL_SIG',				'validate' => 'string',	'type' => 'textarea:5:30', 'explain' => true),
 						'board_hide_emails'		=> array('lang' => 'BOARD_HIDE_EMAILS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
@@ -805,7 +805,7 @@ class acp_board
 		{
 			$act_ary['ACC_USER'] = USER_ACTIVATION_SELF;
 			$act_ary['ACC_ADMIN'] = USER_ACTIVATION_ADMIN;
-		}		
+		}
 		$act_options = '';
 
 		foreach ($act_ary as $key => $value)
diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php
index 24823f9ce7..98355dd044 100644
--- a/phpBB/includes/auth/auth_ldap.php
+++ b/phpBB/includes/auth/auth_ldap.php
@@ -330,7 +330,7 @@ function acp_ldap(&$new)
 	</dl>
 	<dl>
 		<dt><label for="ldap_email">' . $user->lang['LDAP_EMAIL'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd>
+		<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="ldap_user">' . $user->lang['LDAP_USER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_USER_EXPLAIN'] . '</span></dt>
-- 
cgit v1.2.1


From 49c1e0e3480d92f3b29c323c8441550a6f8aec5b Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Wed, 15 Aug 2012 13:29:41 +0200
Subject: [ticket/11010] adding type="number" in ACP; adding type="email" in
 install

PHPBB3-11010
---
 phpBB/includes/acp/acp_attachments.php | 15 +++---
 phpBB/includes/acp/acp_board.php       | 97 +++++++++++++++++-----------------
 phpBB/includes/functions_acp.php       | 20 +++++--
 3 files changed, 73 insertions(+), 59 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 38dbb35f7f..4dd5b33388 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -117,8 +117,8 @@ class acp_attachments
 						'attachment_quota'		=> array('lang' => 'ATTACH_QUOTA',			'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
 						'max_filesize'			=> array('lang' => 'ATTACH_MAX_FILESIZE',	'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
 						'max_filesize_pm'		=> array('lang' => 'ATTACH_MAX_PM_FILESIZE','validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
-						'max_attachments'		=> array('lang' => 'MAX_ATTACHMENTS',		'validate' => 'int',	'type' => 'text:3:3', 'explain' => false),
-						'max_attachments_pm'	=> array('lang' => 'MAX_ATTACHMENTS_PM',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => false),
+						'max_attachments'		=> array('lang' => 'MAX_ATTACHMENTS',		'validate' => 'int',	'type' => 'number:0:3', 'explain' => false),
+						'max_attachments_pm'	=> array('lang' => 'MAX_ATTACHMENTS_PM',	'validate' => 'int',	'type' => 'number:0:3', 'explain' => false),
 						'secure_downloads'		=> array('lang' => 'SECURE_DOWNLOADS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'secure_allow_deny'		=> array('lang' => 'SECURE_ALLOW_DENY',		'validate' => 'int',	'type' => 'custom', 'method' => 'select_allow_deny', 'explain' => true),
 						'secure_allow_empty_referer'	=> array('lang' => 'SECURE_EMPTY_REFERRER', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
@@ -128,11 +128,11 @@ class acp_attachments
 						'legend2'					=> $l_legend_cat_images,
 						'img_display_inlined'		=> array('lang' => 'DISPLAY_INLINED',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'img_create_thumbnail'		=> array('lang' => 'CREATE_THUMBNAIL',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'img_max_thumb_width'		=> array('lang' => 'MAX_THUMB_WIDTH',		'validate' => 'int',	'type' => 'text:7:15', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'img_min_thumb_filesize'	=> array('lang' => 'MIN_THUMB_FILESIZE',	'validate' => 'int',	'type' => 'text:7:15', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
+						'img_max_thumb_width'		=> array('lang' => 'MAX_THUMB_WIDTH',		'validate' => 'int',	'type' => 'number:0:15', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'img_min_thumb_filesize'	=> array('lang' => 'MIN_THUMB_FILESIZE',	'validate' => 'int',	'type' => 'number:0:15', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
 						'img_imagick'				=> array('lang' => 'IMAGICK_PATH',			'validate' => 'string',	'type' => 'text:20:200', 'explain' => true, 'append' => '&nbsp;&nbsp;<span>[ <a href="' . $this->u_action . '&amp;action=imgmagick">' . $user->lang['SEARCH_IMAGICK'] . '</a> ]</span>'),
-						'img_max'					=> array('lang' => 'MAX_IMAGE_SIZE',		'validate' => 'int',	'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'img_link'					=> array('lang' => 'IMAGE_LINK_SIZE',		'validate' => 'int',	'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'img_max'					=> array('lang' => 'MAX_IMAGE_SIZE',		'validate' => 'int',	'type' => 'dimension:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'img_link'					=> array('lang' => 'IMAGE_LINK_SIZE',		'validate' => 'int',	'type' => 'dimension:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 					)
 				);
 
@@ -1670,7 +1670,8 @@ class acp_attachments
 		$size_var = $filesize['si_identifier'];
 		$value = $filesize['value'];
 
-		return '<input type="text" id="' . $key . '" size="8" maxlength="15" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
+		// size="8" and maxlength="15" attributes as a fallback for browsers that do not support type="number" yet.
+		return '<input type="number" id="' . $key . '" size="8" maxlength="15" min="0" max="999999999999999" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
 	}
 
 	/**
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 90dec62770..b0b01b6981 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -65,7 +65,7 @@ class acp_board
 						'override_user_style'	=> array('lang' => 'OVERRIDE_STYLE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
 						'legend2'				=> 'WARNINGS',
-						'warnings_expire_days'	=> array('lang' => 'WARNINGS_EXPIRE',		'validate' => 'int',	'type' => 'text:3:4', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+						'warnings_expire_days'	=> array('lang' => 'WARNINGS_EXPIRE',		'validate' => 'int',	'type' => 'number:0:4', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
 
 						'legend3'					=> 'ACP_SUBMIT_CHANGES',
 					)
@@ -154,11 +154,11 @@ class acp_board
 					'vars'	=> array(
 						'legend1'				=> 'GENERAL_SETTINGS',
 						'allow_privmsg'			=> array('lang' => 'BOARD_PM',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'pm_max_boxes'			=> array('lang' => 'BOXES_MAX',				'validate' => 'int:0',	'type' => 'text:4:4', 'explain' => true),
-						'pm_max_msgs'			=> array('lang' => 'BOXES_LIMIT',			'validate' => 'int:0',	'type' => 'text:4:4', 'explain' => true),
+						'pm_max_boxes'			=> array('lang' => 'BOXES_MAX',				'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
+						'pm_max_msgs'			=> array('lang' => 'BOXES_LIMIT',			'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
 						'full_folder_action'	=> array('lang' => 'FULL_FOLDER_ACTION',	'validate' => 'int',	'type' => 'select', 'method' => 'full_folder_select', 'explain' => true),
-						'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
-						'pm_max_recipients'		=> array('lang' => 'PM_MAX_RECIPIENTS',		'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true),
+						'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'validate' => 'int:0',	'type' => 'number:0:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'pm_max_recipients'		=> array('lang' => 'PM_MAX_RECIPIENTS',		'validate' => 'int:0',	'type' => 'number:0:5', 'explain' => true),
 
 						'legend2'				=> 'GENERAL_OPTIONS',
 						'allow_mass_pm'			=> array('lang' => 'ALLOW_MASS_PM',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
@@ -195,24 +195,24 @@ class acp_board
 
 						'legend2'				=> 'POSTING',
 						'bump_type'				=> false,
-						'edit_time'				=> array('lang' => 'EDIT_TIME',				'validate' => 'int:0',		'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
-						'delete_time'			=> array('lang' => 'DELETE_TIME',			'validate' => 'int:0',		'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'edit_time'				=> array('lang' => 'EDIT_TIME',				'validate' => 'int:0',		'type' => 'number:0:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'delete_time'			=> array('lang' => 'DELETE_TIME',			'validate' => 'int:0',		'type' => 'number:0:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
 						'display_last_edited'	=> array('lang' => 'DISPLAY_LAST_EDITED',	'validate' => 'bool',		'type' => 'radio:yes_no', 'explain' => true),
-						'flood_interval'		=> array('lang' => 'FLOOD_INTERVAL',		'validate' => 'int:0',		'type' => 'text:3:10', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'flood_interval'		=> array('lang' => 'FLOOD_INTERVAL',		'validate' => 'int:0',		'type' => 'number:0:10', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
 						'bump_interval'			=> array('lang' => 'BUMP_INTERVAL',			'validate' => 'int:0',		'type' => 'custom', 'method' => 'bump_interval', 'explain' => true),
-						'topics_per_page'		=> array('lang' => 'TOPICS_PER_PAGE',		'validate' => 'int:1',		'type' => 'text:3:4', 'explain' => false),
-						'posts_per_page'		=> array('lang' => 'POSTS_PER_PAGE',		'validate' => 'int:1',		'type' => 'text:3:4', 'explain' => false),
-						'smilies_per_page'		=> array('lang' => 'SMILIES_PER_PAGE',		'validate' => 'int:1',		'type' => 'text:3:4', 'explain' => false),
-						'hot_threshold'			=> array('lang' => 'HOT_THRESHOLD',			'validate' => 'int:0',		'type' => 'text:3:4', 'explain' => true),
-						'max_poll_options'		=> array('lang' => 'MAX_POLL_OPTIONS',		'validate' => 'int:2:127',	'type' => 'text:4:4', 'explain' => false),
-						'max_post_chars'		=> array('lang' => 'CHAR_LIMIT',			'validate' => 'int:0',		'type' => 'text:4:6', 'explain' => true),
-						'min_post_chars'		=> array('lang' => 'MIN_CHAR_LIMIT',		'validate' => 'int:1',		'type' => 'text:4:6', 'explain' => true),
-						'max_post_smilies'		=> array('lang' => 'SMILIES_LIMIT',			'validate' => 'int:0',		'type' => 'text:4:4', 'explain' => true),
-						'max_post_urls'			=> array('lang' => 'MAX_POST_URLS',			'validate' => 'int:0',		'type' => 'text:5:4', 'explain' => true),
-						'max_post_font_size'	=> array('lang' => 'MAX_POST_FONT_SIZE',	'validate' => 'int:0',		'type' => 'text:5:4', 'explain' => true, 'append' => ' %'),
-						'max_quote_depth'		=> array('lang' => 'QUOTE_DEPTH_LIMIT',		'validate' => 'int:0',		'type' => 'text:4:4', 'explain' => true),
-						'max_post_img_width'	=> array('lang' => 'MAX_POST_IMG_WIDTH',	'validate' => 'int:0',		'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'max_post_img_height'	=> array('lang' => 'MAX_POST_IMG_HEIGHT',	'validate' => 'int:0',		'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'topics_per_page'		=> array('lang' => 'TOPICS_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:4', 'explain' => false),
+						'posts_per_page'		=> array('lang' => 'POSTS_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:4', 'explain' => false),
+						'smilies_per_page'		=> array('lang' => 'SMILIES_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:4', 'explain' => false),
+						'hot_threshold'			=> array('lang' => 'HOT_THRESHOLD',			'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true),
+						'max_poll_options'		=> array('lang' => 'MAX_POLL_OPTIONS',		'validate' => 'int:2:127',	'type' => 'number:2:127:true', 'explain' => false),
+						'max_post_chars'		=> array('lang' => 'CHAR_LIMIT',			'validate' => 'int:0',		'type' => 'number:0:6', 'explain' => true),
+						'min_post_chars'		=> array('lang' => 'MIN_CHAR_LIMIT',		'validate' => 'int:1',		'type' => 'number:1:6', 'explain' => true),
+						'max_post_smilies'		=> array('lang' => 'SMILIES_LIMIT',			'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true),
+						'max_post_urls'			=> array('lang' => 'MAX_POST_URLS',			'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true),
+						'max_post_font_size'	=> array('lang' => 'MAX_POST_FONT_SIZE',	'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true, 'append' => ' %'),
+						'max_quote_depth'		=> array('lang' => 'QUOTE_DEPTH_LIMIT',		'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true),
+						'max_post_img_width'	=> array('lang' => 'MAX_POST_IMG_WIDTH',	'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_post_img_height'	=> array('lang' => 'MAX_POST_IMG_HEIGHT',	'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 
 						'legend3'					=> 'ACP_SUBMIT_CHANGES',
 					)
@@ -232,12 +232,12 @@ class acp_board
 						'allow_sig_links'		=> array('lang' => 'ALLOW_SIG_LINKS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
 						'legend2'				=> 'GENERAL_SETTINGS',
-						'max_sig_chars'			=> array('lang' => 'MAX_SIG_LENGTH',		'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true),
-						'max_sig_urls'			=> array('lang' => 'MAX_SIG_URLS',			'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true),
-						'max_sig_font_size'		=> array('lang' => 'MAX_SIG_FONT_SIZE',		'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true, 'append' => ' %'),
-						'max_sig_smilies'		=> array('lang' => 'MAX_SIG_SMILIES',		'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true),
-						'max_sig_img_width'		=> array('lang' => 'MAX_SIG_IMG_WIDTH',		'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'max_sig_img_height'	=> array('lang' => 'MAX_SIG_IMG_HEIGHT',	'validate' => 'int:0',	'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_sig_chars'			=> array('lang' => 'MAX_SIG_LENGTH',		'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
+						'max_sig_urls'			=> array('lang' => 'MAX_SIG_URLS',			'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
+						'max_sig_font_size'		=> array('lang' => 'MAX_SIG_FONT_SIZE',		'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true, 'append' => ' %'),
+						'max_sig_smilies'		=> array('lang' => 'MAX_SIG_SMILIES',		'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
+						'max_sig_img_width'		=> array('lang' => 'MAX_SIG_IMG_WIDTH',		'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_sig_img_height'	=> array('lang' => 'MAX_SIG_IMG_HEIGHT',	'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 
 						'legend3'					=> 'ACP_SUBMIT_CHANGES',
 					)
@@ -253,20 +253,20 @@ class acp_board
 						'max_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:8:255', 'type' => false, 'method' => false, 'explain' => false,),
 
 						'require_activation'	=> array('lang' => 'ACC_ACTIVATION',	'validate' => 'int',	'type' => 'select', 'method' => 'select_acc_activation', 'explain' => true),
-						'new_member_post_limit'	=> array('lang' => 'NEW_MEMBER_POST_LIMIT', 'validate' => 'int:0:255', 'type' => 'text:4:4', 'explain' => true, 'append' => ' ' . $user->lang['POSTS']),
+						'new_member_post_limit'	=> array('lang' => 'NEW_MEMBER_POST_LIMIT', 'validate' => 'int:0:255', 'type' => 'number:0:255:true', 'explain' => true, 'append' => ' ' . $user->lang['POSTS']),
 						'new_member_group_default'=> array('lang' => 'NEW_MEMBER_GROUP_DEFAULT', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 						'min_name_chars'		=> array('lang' => 'USERNAME_LENGTH',	'validate' => 'int:1',	'type' => 'custom:5:180', 'method' => 'username_length', 'explain' => true),
 						'min_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH',	'validate' => 'int:1',	'type' => 'custom', 'method' => 'password_length', 'explain' => true),
 						'allow_name_chars'		=> array('lang' => 'USERNAME_CHARS',	'validate' => 'string',	'type' => 'select', 'method' => 'select_username_chars', 'explain' => true),
 						'pass_complex'			=> array('lang' => 'PASSWORD_TYPE',		'validate' => 'string',	'type' => 'select', 'method' => 'select_password_chars', 'explain' => true),
-						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',	'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',	'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
 
 						'legend2'				=> 'GENERAL_OPTIONS',
 						'allow_namechange'		=> array('lang' => 'ALLOW_NAME_CHANGE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
 						'allow_emailreuse'		=> array('lang' => 'ALLOW_EMAIL_REUSE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'enable_confirm'		=> array('lang' => 'VISUAL_CONFIRM_REG',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true),
-						'max_reg_attempts'		=> array('lang' => 'REG_LIMIT',				'validate' => 'int:0',	'type' => 'text:4:4', 'explain' => true),
+						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true),
+						'max_reg_attempts'		=> array('lang' => 'REG_LIMIT',				'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
 
 						'legend3'			=> 'COPPA',
 						'coppa_enable'		=> array('lang' => 'ENABLE_COPPA',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
@@ -288,13 +288,13 @@ class acp_board
 						'feed_http_auth'			=> array('lang' => 'ACP_FEED_HTTP_AUTH',			'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true),
 
 						'legend2'					=> 'ACP_FEED_POST_BASED',
-						'feed_limit_post'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5',	'type' => 'text:3:4',				'explain' => true),
+						'feed_limit_post'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5',	'type' => 'number:5:4',				'explain' => true),
 						'feed_overall'				=> array('lang' => 'ACP_FEED_OVERALL',				'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_forum'				=> array('lang' => 'ACP_FEED_FORUM',				'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_topic'				=> array('lang' => 'ACP_FEED_TOPIC',				'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 
 						'legend3'					=> 'ACP_FEED_TOPIC_BASED',
-						'feed_limit_topic'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5',	'type' => 'text:3:4',				'explain' => true),
+						'feed_limit_topic'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5',	'type' => 'number:5:4',				'explain' => true),
 						'feed_topics_new'			=> array('lang' => 'ACP_FEED_TOPICS_NEW',			'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_topics_active'		=> array('lang' => 'ACP_FEED_TOPICS_ACTIVE',		'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_news_id'				=> array('lang' => 'ACP_FEED_NEWS',					'validate' => 'string',	'type' => 'custom', 'method' => 'select_news_forums', 'explain' => true),
@@ -324,10 +324,10 @@ class acp_board
 					'title'	=> 'ACP_LOAD_SETTINGS',
 					'vars'	=> array(
 						'legend1'			=> 'GENERAL_SETTINGS',
-						'limit_load'		=> array('lang' => 'LIMIT_LOAD',		'validate' => 'string',	'type' => 'text:4:4', 'explain' => true),
-						'session_length'	=> array('lang' => 'SESSION_LENGTH',	'validate' => 'int:60',	'type' => 'text:5:10', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
-						'active_sessions'	=> array('lang' => 'LIMIT_SESSIONS',	'validate' => 'int:0',	'type' => 'text:4:4', 'explain' => true),
-						'load_online_time'	=> array('lang' => 'ONLINE_LENGTH',		'validate' => 'int:0',	'type' => 'text:4:3', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'limit_load'		=> array('lang' => 'LIMIT_LOAD',		'validate' => 'string',	'type' => 'number:0:4', 'explain' => true),
+						'session_length'	=> array('lang' => 'SESSION_LENGTH',	'validate' => 'int:60',	'type' => 'number:60:10', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'active_sessions'	=> array('lang' => 'LIMIT_SESSIONS',	'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
+						'load_online_time'	=> array('lang' => 'ONLINE_LENGTH',		'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
 
 						'legend2'				=> 'GENERAL_OPTIONS',
 						'load_notifications'	=> array('lang' => 'LOAD_NOTIFICATIONS',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
@@ -384,7 +384,7 @@ class acp_board
 						'force_server_vars'		=> array('lang' => 'FORCE_SERVER_VARS',	'validate' => 'bool',			'type' => 'radio:yes_no', 'explain' => true),
 						'server_protocol'		=> array('lang' => 'SERVER_PROTOCOL',	'validate' => 'string',			'type' => 'text:10:10', 'explain' => true),
 						'server_name'			=> array('lang' => 'SERVER_NAME',		'validate' => 'string',			'type' => 'text:40:255', 'explain' => true),
-						'server_port'			=> array('lang' => 'SERVER_PORT',		'validate' => 'int:0',			'type' => 'text:5:5', 'explain' => true),
+						'server_port'			=> array('lang' => 'SERVER_PORT',		'validate' => 'int:0',			'type' => 'number:0:5', 'explain' => true),
 						'script_path'			=> array('lang' => 'SCRIPT_PATH',		'validate' => 'script_path',	'type' => 'text::255', 'explain' => true),
 
 						'legend4'					=> 'ACP_SUBMIT_CHANGES',
@@ -399,8 +399,7 @@ class acp_board
 						'legend1'				=> 'ACP_SECURITY_SETTINGS',
 						'allow_autologin'		=> array('lang' => 'ALLOW_AUTOLOGIN',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'allow_password_reset'	=> array('lang' => 'ALLOW_PASSWORD_RESET',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'max_autologin_time'	=> array('lang' => 'AUTOLOGIN_LENGTH',		'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
-						'ip_check'				=> array('lang' => 'IP_VALID',				'validate' => 'int',	'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
+						'max_autologin_time'  => array('lang' => 'AUTOLOGIN_LENGTH',		'validate' => 'int:0:99999',	'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']), 						'ip_check'				=> array('lang' => 'IP_VALID',				'validate' => 'int',	'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
 						'browser_check'			=> array('lang' => 'BROWSER_VALID',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'forwarded_for_check'	=> array('lang' => 'FORWARDED_FOR_VALID',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'referer_validation'	=> array('lang' => 'REFERER_VALID',		'validate' => 'int:0:3','type' => 'custom', 'method' => 'select_ref_check', 'explain' => true),
@@ -409,13 +408,13 @@ class acp_board
 						'max_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:8:255', 'type' => false, 'method' => false, 'explain' => false,),
 						'min_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH',	'validate' => 'int:1',	'type' => 'custom', 'method' => 'password_length', 'explain' => true),
 						'pass_complex'			=> array('lang' => 'PASSWORD_TYPE',			'validate' => 'string',	'type' => 'select', 'method' => 'select_password_chars', 'explain' => true),
-						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',		'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
-						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true),
-						'ip_login_limit_max'	=> array('lang' => 'IP_LOGIN_LIMIT_MAX',	'validate' => 'int:0',	'type' => 'text:3:3', 'explain' => true),
-						'ip_login_limit_time'	=> array('lang' => 'IP_LOGIN_LIMIT_TIME',	'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',		'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true),
+						'ip_login_limit_max'	=> array('lang' => 'IP_LOGIN_LIMIT_MAX',	'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true),
+						'ip_login_limit_time'	=> array('lang' => 'IP_LOGIN_LIMIT_TIME',	'validate' => 'int:0',	'type' => 'number:0:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
 						'ip_login_limit_use_forwarded'	=> array('lang' => 'IP_LOGIN_LIMIT_USE_FORWARDED',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'tpl_allow_php'			=> array('lang' => 'TPL_ALLOW_PHP',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'form_token_lifetime'	=> array('lang' => 'FORM_TIME_MAX',			'validate' => 'int:-1',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'form_token_lifetime'	=> array('lang' => 'FORM_TIME_MAX',			'validate' => 'int:-1',	'type' => 'number:-1:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
 						'form_token_sid_guests'	=> array('lang' => 'FORM_SID_GUESTS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
 					)
@@ -430,7 +429,7 @@ class acp_board
 						'email_enable'			=> array('lang' => 'ENABLE_EMAIL',			'validate' => 'bool',	'type' => 'radio:enabled_disabled', 'explain' => true),
 						'board_email_form'		=> array('lang' => 'BOARD_EMAIL_FORM',		'validate' => 'bool',	'type' => 'radio:enabled_disabled', 'explain' => true),
 						'email_function_name'	=> array('lang' => 'EMAIL_FUNCTION_NAME',	'validate' => 'string',	'type' => 'text:20:50', 'explain' => true),
-						'email_package_size'	=> array('lang' => 'EMAIL_PACKAGE_SIZE',	'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true),
+						'email_package_size'	=> array('lang' => 'EMAIL_PACKAGE_SIZE',	'validate' => 'int:0',	'type' => 'number:0:5', 'explain' => true),
 						'board_contact'			=> array('lang' => 'CONTACT_EMAIL',			'validate' => 'email',	'type' => 'email:25:100', 'explain' => true),
 						'board_email'			=> array('lang' => 'ADMIN_EMAIL',			'validate' => 'email',	'type' => 'email:25:100', 'explain' => true),
 						'board_email_sig'		=> array('lang' => 'EMAIL_SIG',				'validate' => 'string',	'type' => 'textarea:5:30', 'explain' => true),
@@ -439,7 +438,7 @@ class acp_board
 						'legend2'				=> 'SMTP_SETTINGS',
 						'smtp_delivery'			=> array('lang' => 'USE_SMTP',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'smtp_host'				=> array('lang' => 'SMTP_SERVER',			'validate' => 'string',	'type' => 'text:25:50', 'explain' => false),
-						'smtp_port'				=> array('lang' => 'SMTP_PORT',				'validate' => 'int:0',	'type' => 'text:4:5', 'explain' => true),
+						'smtp_port'				=> array('lang' => 'SMTP_PORT',				'validate' => 'int:0',	'type' => 'number:0:5', 'explain' => true),
 						'smtp_auth_method'		=> array('lang' => 'SMTP_AUTH_METHOD',		'validate' => 'string',	'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true),
 						'smtp_username'			=> array('lang' => 'SMTP_USERNAME',			'validate' => 'string',	'type' => 'text:25:255', 'explain' => true),
 						'smtp_password'			=> array('lang' => 'SMTP_PASSWORD',			'validate' => 'string',	'type' => 'password:25:255', 'explain' => true),
@@ -824,7 +823,7 @@ class acp_board
 	{
 		global $user;
 
-		return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_name_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="text" size="3" maxlength="3" name="config[max_name_chars]" value="' . $this->new_config['max_name_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
+		return '<input id="' . $key . '" type="number" size="3" maxlength="3" min="1" max="999" name="config[min_name_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="number" size="3" maxlength="3" min="8" max="180" name="config[max_name_chars]" value="' . $this->new_config['max_name_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
 	}
 
 	/**
@@ -852,7 +851,7 @@ class acp_board
 	{
 		global $user;
 
-		return '<input id="' . $key . '" type="text" size="3" maxlength="3" name="config[min_pass_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="text" size="3" maxlength="3" name="config[max_pass_chars]" value="' . $this->new_config['max_pass_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
+		return '<input id="' . $key . '" type="number" size="3" maxlength="3" min="1" max="999" name="config[min_pass_chars]" value="' . $value . '" /> ' . $user->lang['MIN_CHARS'] . '&nbsp;&nbsp;<input type="number" size="3" maxlength="3" min="8" max="255" name="config[max_pass_chars]" value="' . $this->new_config['max_pass_chars'] . '" /> ' . $user->lang['MAX_CHARS'];
 	}
 
 	/**
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index f4e9613d3b..38ddff0c38 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -257,11 +257,25 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			$tpl = '<input id="' . $key . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $new[$config_key] . '"' . (($tpl_type[0] === 'password') ?  ' autocomplete="off"' : '') . ' />';
 		break;
 
+		case 'number':
+			$min = (int) $tpl_type[1];
+			$max = $maxlength = (int) $tpl_type[2];
+
+			if ($tpl_type[3] != 'true')
+			{
+				$max = str_repeat('9', $max);
+			}
+
+			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (($maxlength) ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="' . $name . '" value="' . $new[$config_key] . '"' . (($tpl_type[0] === 'password') ?  ' autocomplete="off"' : '') . ' />';
+		break;
+
 		case 'dimension':
-			$size = (int) $tpl_type[1];
-			$maxlength = (int) $tpl_type[2];
+			$min = (int) $tpl_type[1];
+			$max = $maxlength = (int) $tpl_type[2];
+
+			$max = str_repeat('9', $max);
 
-			$tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
+			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (($maxlength) ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="number" maxlength="' . (($maxlength) ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
 		break;
 
 		case 'textarea':
-- 
cgit v1.2.1


From 8993fa940f9920b161639e39c483a1476a9c71ab Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Mon, 20 Aug 2012 09:25:25 +0200
Subject: [ticket/11010] fixing problems with 4th parameter in number type

PHPBB3-11010
---
 phpBB/includes/functions_acp.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 38ddff0c38..3aca1af229 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -261,7 +261,8 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			$min = (int) $tpl_type[1];
 			$max = $maxlength = (int) $tpl_type[2];
 
-			if ($tpl_type[3] != 'true')
+			// $tpl_type[3] is not always present
+			if (!isset($tpl_type[3]) || (isset($tpl_type[3]) && $tpl_type[3] != 'true'))
 			{
 				$max = str_repeat('9', $max);
 			}
-- 
cgit v1.2.1


From d6e239bdd9d492aee7394d2bcfdc0896d1802d8d Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Mon, 17 Sep 2012 20:07:56 +0200
Subject: [ticket/11010] adding type="number" to inputs in
 functions_profile_fields.php

PHPBB3-11010
---
 phpBB/includes/functions_profile_fields.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 10af997bff..63b0eab3e1 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -1040,9 +1040,9 @@ class custom_profile_admin extends custom_profile
 		global $user;
 
 		$options = array(
-			0 => array('TITLE' => $user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="text" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="text" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="text" name="field_maxlen" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
+			0 => array('TITLE' => $user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
+			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
+			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="99999" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
 			3 => array('TITLE' => $user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')
 		);
 
@@ -1057,9 +1057,9 @@ class custom_profile_admin extends custom_profile
 		global $user;
 
 		$options = array(
-			0 => array('TITLE' => $user->lang['FIELD_LENGTH'],		'FIELD' => '<input name="rows" size="5" value="' . $this->vars['rows'] . '" /> ' . $user->lang['ROWS'] . '</dd><dd><input name="columns" size="5" value="' . $this->vars['columns'] . '" /> ' . $user->lang['COLUMNS'] . ' <input type="hidden" name="field_length" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="text" name="field_minlen" size="10" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="text" name="field_maxlen" size="10" value="' . $this->vars['field_maxlen'] . '" />'),
+			0 => array('TITLE' => $user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="rows" size="5" value="' . $this->vars['rows'] . '" /> ' . $user->lang['ROWS'] . '</dd><dd><input type="number" min="0" max="99999" name="columns" size="5" value="' . $this->vars['columns'] . '" /> ' . $user->lang['COLUMNS'] . ' <input type="hidden" name="field_length" value="' . $this->vars['field_length'] . '" />'),
+			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="9999999999" name="field_minlen" size="10" value="' . $this->vars['field_minlen'] . '" />'),
+			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="9999999999" name="field_maxlen" size="10" value="' . $this->vars['field_maxlen'] . '" />'),
 			3 => array('TITLE' => $user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')
 		);
 
@@ -1074,9 +1074,9 @@ class custom_profile_admin extends custom_profile
 		global $user;
 
 		$options = array(
-			0 => array('TITLE' => $user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="text" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => $user->lang['MIN_FIELD_NUMBER'],	'FIELD' => '<input type="text" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => $user->lang['MAX_FIELD_NUMBER'],	'FIELD' => '<input type="text" name="field_maxlen" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
+			0 => array('TITLE' => $user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
+			1 => array('TITLE' => $user->lang['MIN_FIELD_NUMBER'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
+			2 => array('TITLE' => $user->lang['MAX_FIELD_NUMBER'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_maxlen" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
 			3 => array('TITLE' => $user->lang['DEFAULT_VALUE'],		'FIELD' => '<input type="post" name="field_default_value" value="' . $this->vars['field_default_value'] . '" />')
 		);
 
-- 
cgit v1.2.1


From f75aa972820ff8a30787f9a48fba3934739e209c Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Tue, 2 Oct 2012 21:46:22 +0200
Subject: [ticket/11010] adding type="url" to 'site_home_url'

PHPBB3-11010
---
 phpBB/includes/acp/acp_board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index b0b01b6981..e11d5a3c44 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -53,7 +53,7 @@ class acp_board
 						'legend1'				=> 'ACP_BOARD_SETTINGS',
 						'sitename'				=> array('lang' => 'SITE_NAME',				'validate' => 'string',	'type' => 'text:40:255', 'explain' => false),
 						'site_desc'				=> array('lang' => 'SITE_DESC',				'validate' => 'string',	'type' => 'text:40:255', 'explain' => false),
-						'site_home_url'			=> array('lang' => 'SITE_HOME_URL',			'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
+						'site_home_url'			=> array('lang' => 'SITE_HOME_URL',			'validate' => 'string',	'type' => 'url:40:255', 'explain' => true),
 						'site_home_text'		=> array('lang' => 'SITE_HOME_TEXT',		'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
 						'board_index_text'		=> array('lang' => 'BOARD_INDEX_TEXT',		'validate' => 'string',	'type' => 'text:40:255', 'explain' => true),
 						'board_disable'			=> array('lang' => 'DISABLE_BOARD',			'validate' => 'bool',	'type' => 'custom', 'method' => 'board_disable', 'explain' => true),
-- 
cgit v1.2.1


From cf9d407493d76cee76987edf38ae0191360bb661 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Sun, 27 Jan 2013 22:45:45 +0100
Subject: [ticket/11010] applying some of EXreaction notes

PHPBB3-11010
---
 phpBB/includes/acp/acp_attachments.php      | 2 +-
 phpBB/includes/functions_profile_fields.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 4dd5b33388..5a0f670ed2 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1671,7 +1671,7 @@ class acp_attachments
 		$value = $filesize['value'];
 
 		// size="8" and maxlength="15" attributes as a fallback for browsers that do not support type="number" yet.
-		return '<input type="number" id="' . $key . '" size="8" maxlength="15" min="0" max="999999999999999" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
+		return '<input type="number" id="' . $key . '" size="8" maxlength="15" min="0" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
 	}
 
 	/**
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 63b0eab3e1..1261e363c7 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -1040,9 +1040,9 @@ class custom_profile_admin extends custom_profile
 		global $user;
 
 		$options = array(
-			0 => array('TITLE' => $user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="99999" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
+			0 => array('TITLE' => $user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" maxlength="5" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
+			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" maxlength="5" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
+			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" maxlength="5" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
 			3 => array('TITLE' => $user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')
 		);
 
-- 
cgit v1.2.1


From 6c0f3513d99c3af965bdc8a03b2bae9978477c27 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Wed, 6 Feb 2013 22:43:52 +0100
Subject: [ticket/11010] replacing maxlenght with max

PHPBB3-11010
---
 phpBB/includes/acp/acp_attachments.php | 12 ++---
 phpBB/includes/acp/acp_board.php       | 90 +++++++++++++++++-----------------
 phpBB/includes/functions_acp.php       | 24 ++++-----
 3 files changed, 64 insertions(+), 62 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 5a0f670ed2..272fc51d40 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -117,8 +117,8 @@ class acp_attachments
 						'attachment_quota'		=> array('lang' => 'ATTACH_QUOTA',			'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
 						'max_filesize'			=> array('lang' => 'ATTACH_MAX_FILESIZE',	'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
 						'max_filesize_pm'		=> array('lang' => 'ATTACH_MAX_PM_FILESIZE','validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
-						'max_attachments'		=> array('lang' => 'MAX_ATTACHMENTS',		'validate' => 'int',	'type' => 'number:0:3', 'explain' => false),
-						'max_attachments_pm'	=> array('lang' => 'MAX_ATTACHMENTS_PM',	'validate' => 'int',	'type' => 'number:0:3', 'explain' => false),
+						'max_attachments'		=> array('lang' => 'MAX_ATTACHMENTS',		'validate' => 'int',	'type' => 'number:0:999', 'explain' => false),
+						'max_attachments_pm'	=> array('lang' => 'MAX_ATTACHMENTS_PM',	'validate' => 'int',	'type' => 'number:0:999', 'explain' => false),
 						'secure_downloads'		=> array('lang' => 'SECURE_DOWNLOADS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'secure_allow_deny'		=> array('lang' => 'SECURE_ALLOW_DENY',		'validate' => 'int',	'type' => 'custom', 'method' => 'select_allow_deny', 'explain' => true),
 						'secure_allow_empty_referer'	=> array('lang' => 'SECURE_EMPTY_REFERRER', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
@@ -128,11 +128,11 @@ class acp_attachments
 						'legend2'					=> $l_legend_cat_images,
 						'img_display_inlined'		=> array('lang' => 'DISPLAY_INLINED',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'img_create_thumbnail'		=> array('lang' => 'CREATE_THUMBNAIL',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'img_max_thumb_width'		=> array('lang' => 'MAX_THUMB_WIDTH',		'validate' => 'int',	'type' => 'number:0:15', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'img_min_thumb_filesize'	=> array('lang' => 'MIN_THUMB_FILESIZE',	'validate' => 'int',	'type' => 'number:0:15', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
+						'img_max_thumb_width'		=> array('lang' => 'MAX_THUMB_WIDTH',		'validate' => 'int',	'type' => 'number:0:999999999999999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'img_min_thumb_filesize'	=> array('lang' => 'MIN_THUMB_FILESIZE',	'validate' => 'int',	'type' => 'number:0:999999999999999', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
 						'img_imagick'				=> array('lang' => 'IMAGICK_PATH',			'validate' => 'string',	'type' => 'text:20:200', 'explain' => true, 'append' => '&nbsp;&nbsp;<span>[ <a href="' . $this->u_action . '&amp;action=imgmagick">' . $user->lang['SEARCH_IMAGICK'] . '</a> ]</span>'),
-						'img_max'					=> array('lang' => 'MAX_IMAGE_SIZE',		'validate' => 'int',	'type' => 'dimension:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'img_link'					=> array('lang' => 'IMAGE_LINK_SIZE',		'validate' => 'int',	'type' => 'dimension:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'img_max'					=> array('lang' => 'MAX_IMAGE_SIZE',		'validate' => 'int',	'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'img_link'					=> array('lang' => 'IMAGE_LINK_SIZE',		'validate' => 'int',	'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 					)
 				);
 
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index e11d5a3c44..d894d158a7 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -65,7 +65,7 @@ class acp_board
 						'override_user_style'	=> array('lang' => 'OVERRIDE_STYLE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
 						'legend2'				=> 'WARNINGS',
-						'warnings_expire_days'	=> array('lang' => 'WARNINGS_EXPIRE',		'validate' => 'int',	'type' => 'number:0:4', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+						'warnings_expire_days'	=> array('lang' => 'WARNINGS_EXPIRE',		'validate' => 'int',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
 
 						'legend3'					=> 'ACP_SUBMIT_CHANGES',
 					)
@@ -154,11 +154,11 @@ class acp_board
 					'vars'	=> array(
 						'legend1'				=> 'GENERAL_SETTINGS',
 						'allow_privmsg'			=> array('lang' => 'BOARD_PM',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'pm_max_boxes'			=> array('lang' => 'BOXES_MAX',				'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
-						'pm_max_msgs'			=> array('lang' => 'BOXES_LIMIT',			'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
+						'pm_max_boxes'			=> array('lang' => 'BOXES_MAX',				'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
+						'pm_max_msgs'			=> array('lang' => 'BOXES_LIMIT',			'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
 						'full_folder_action'	=> array('lang' => 'FULL_FOLDER_ACTION',	'validate' => 'int',	'type' => 'select', 'method' => 'full_folder_select', 'explain' => true),
-						'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'validate' => 'int:0',	'type' => 'number:0:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
-						'pm_max_recipients'		=> array('lang' => 'PM_MAX_RECIPIENTS',		'validate' => 'int:0',	'type' => 'number:0:5', 'explain' => true),
+						'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'validate' => 'int:0',	'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'pm_max_recipients'		=> array('lang' => 'PM_MAX_RECIPIENTS',		'validate' => 'int:0',	'type' => 'number:0:99999', 'explain' => true),
 
 						'legend2'				=> 'GENERAL_OPTIONS',
 						'allow_mass_pm'			=> array('lang' => 'ALLOW_MASS_PM',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
@@ -195,24 +195,24 @@ class acp_board
 
 						'legend2'				=> 'POSTING',
 						'bump_type'				=> false,
-						'edit_time'				=> array('lang' => 'EDIT_TIME',				'validate' => 'int:0',		'type' => 'number:0:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
-						'delete_time'			=> array('lang' => 'DELETE_TIME',			'validate' => 'int:0',		'type' => 'number:0:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'edit_time'				=> array('lang' => 'EDIT_TIME',				'validate' => 'int:0',		'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'delete_time'			=> array('lang' => 'DELETE_TIME',			'validate' => 'int:0',		'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
 						'display_last_edited'	=> array('lang' => 'DISPLAY_LAST_EDITED',	'validate' => 'bool',		'type' => 'radio:yes_no', 'explain' => true),
-						'flood_interval'		=> array('lang' => 'FLOOD_INTERVAL',		'validate' => 'int:0',		'type' => 'number:0:10', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'flood_interval'		=> array('lang' => 'FLOOD_INTERVAL',		'validate' => 'int:0',		'type' => 'number:0:9999999999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
 						'bump_interval'			=> array('lang' => 'BUMP_INTERVAL',			'validate' => 'int:0',		'type' => 'custom', 'method' => 'bump_interval', 'explain' => true),
-						'topics_per_page'		=> array('lang' => 'TOPICS_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:4', 'explain' => false),
-						'posts_per_page'		=> array('lang' => 'POSTS_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:4', 'explain' => false),
-						'smilies_per_page'		=> array('lang' => 'SMILIES_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:4', 'explain' => false),
-						'hot_threshold'			=> array('lang' => 'HOT_THRESHOLD',			'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true),
-						'max_poll_options'		=> array('lang' => 'MAX_POLL_OPTIONS',		'validate' => 'int:2:127',	'type' => 'number:2:127:true', 'explain' => false),
-						'max_post_chars'		=> array('lang' => 'CHAR_LIMIT',			'validate' => 'int:0',		'type' => 'number:0:6', 'explain' => true),
-						'min_post_chars'		=> array('lang' => 'MIN_CHAR_LIMIT',		'validate' => 'int:1',		'type' => 'number:1:6', 'explain' => true),
-						'max_post_smilies'		=> array('lang' => 'SMILIES_LIMIT',			'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true),
-						'max_post_urls'			=> array('lang' => 'MAX_POST_URLS',			'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true),
-						'max_post_font_size'	=> array('lang' => 'MAX_POST_FONT_SIZE',	'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true, 'append' => ' %'),
-						'max_quote_depth'		=> array('lang' => 'QUOTE_DEPTH_LIMIT',		'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true),
-						'max_post_img_width'	=> array('lang' => 'MAX_POST_IMG_WIDTH',	'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'max_post_img_height'	=> array('lang' => 'MAX_POST_IMG_HEIGHT',	'validate' => 'int:0',		'type' => 'number:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'topics_per_page'		=> array('lang' => 'TOPICS_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:9999', 'explain' => false),
+						'posts_per_page'		=> array('lang' => 'POSTS_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:9999', 'explain' => false),
+						'smilies_per_page'		=> array('lang' => 'SMILIES_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:9999', 'explain' => false),
+						'hot_threshold'			=> array('lang' => 'HOT_THRESHOLD',			'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true),
+						'max_poll_options'		=> array('lang' => 'MAX_POLL_OPTIONS',		'validate' => 'int:2:127',	'type' => 'number:2:127', 'explain' => false),
+						'max_post_chars'		=> array('lang' => 'CHAR_LIMIT',			'validate' => 'int:0',		'type' => 'number:0:999999', 'explain' => true),
+						'min_post_chars'		=> array('lang' => 'MIN_CHAR_LIMIT',		'validate' => 'int:1',		'type' => 'number:1:999999', 'explain' => true),
+						'max_post_smilies'		=> array('lang' => 'SMILIES_LIMIT',			'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true),
+						'max_post_urls'			=> array('lang' => 'MAX_POST_URLS',			'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true),
+						'max_post_font_size'	=> array('lang' => 'MAX_POST_FONT_SIZE',	'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true, 'append' => ' %'),
+						'max_quote_depth'		=> array('lang' => 'QUOTE_DEPTH_LIMIT',		'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true),
+						'max_post_img_width'	=> array('lang' => 'MAX_POST_IMG_WIDTH',	'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_post_img_height'	=> array('lang' => 'MAX_POST_IMG_HEIGHT',	'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 
 						'legend3'					=> 'ACP_SUBMIT_CHANGES',
 					)
@@ -232,12 +232,12 @@ class acp_board
 						'allow_sig_links'		=> array('lang' => 'ALLOW_SIG_LINKS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
 						'legend2'				=> 'GENERAL_SETTINGS',
-						'max_sig_chars'			=> array('lang' => 'MAX_SIG_LENGTH',		'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
-						'max_sig_urls'			=> array('lang' => 'MAX_SIG_URLS',			'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
-						'max_sig_font_size'		=> array('lang' => 'MAX_SIG_FONT_SIZE',		'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true, 'append' => ' %'),
-						'max_sig_smilies'		=> array('lang' => 'MAX_SIG_SMILIES',		'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
-						'max_sig_img_width'		=> array('lang' => 'MAX_SIG_IMG_WIDTH',		'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'max_sig_img_height'	=> array('lang' => 'MAX_SIG_IMG_HEIGHT',	'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_sig_chars'			=> array('lang' => 'MAX_SIG_LENGTH',		'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
+						'max_sig_urls'			=> array('lang' => 'MAX_SIG_URLS',			'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
+						'max_sig_font_size'		=> array('lang' => 'MAX_SIG_FONT_SIZE',		'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' %'),
+						'max_sig_smilies'		=> array('lang' => 'MAX_SIG_SMILIES',		'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
+						'max_sig_img_width'		=> array('lang' => 'MAX_SIG_IMG_WIDTH',		'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_sig_img_height'	=> array('lang' => 'MAX_SIG_IMG_HEIGHT',	'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 
 						'legend3'					=> 'ACP_SUBMIT_CHANGES',
 					)
@@ -253,20 +253,20 @@ class acp_board
 						'max_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:8:255', 'type' => false, 'method' => false, 'explain' => false,),
 
 						'require_activation'	=> array('lang' => 'ACC_ACTIVATION',	'validate' => 'int',	'type' => 'select', 'method' => 'select_acc_activation', 'explain' => true),
-						'new_member_post_limit'	=> array('lang' => 'NEW_MEMBER_POST_LIMIT', 'validate' => 'int:0:255', 'type' => 'number:0:255:true', 'explain' => true, 'append' => ' ' . $user->lang['POSTS']),
+						'new_member_post_limit'	=> array('lang' => 'NEW_MEMBER_POST_LIMIT', 'validate' => 'int:0:255', 'type' => 'number:0:255', 'explain' => true, 'append' => ' ' . $user->lang['POSTS']),
 						'new_member_group_default'=> array('lang' => 'NEW_MEMBER_GROUP_DEFAULT', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 						'min_name_chars'		=> array('lang' => 'USERNAME_LENGTH',	'validate' => 'int:1',	'type' => 'custom:5:180', 'method' => 'username_length', 'explain' => true),
 						'min_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH',	'validate' => 'int:1',	'type' => 'custom', 'method' => 'password_length', 'explain' => true),
 						'allow_name_chars'		=> array('lang' => 'USERNAME_CHARS',	'validate' => 'string',	'type' => 'select', 'method' => 'select_username_chars', 'explain' => true),
 						'pass_complex'			=> array('lang' => 'PASSWORD_TYPE',		'validate' => 'string',	'type' => 'select', 'method' => 'select_password_chars', 'explain' => true),
-						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',	'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',	'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
 
 						'legend2'				=> 'GENERAL_OPTIONS',
 						'allow_namechange'		=> array('lang' => 'ALLOW_NAME_CHANGE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
 						'allow_emailreuse'		=> array('lang' => 'ALLOW_EMAIL_REUSE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'enable_confirm'		=> array('lang' => 'VISUAL_CONFIRM_REG',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true),
-						'max_reg_attempts'		=> array('lang' => 'REG_LIMIT',				'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
+						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true),
+						'max_reg_attempts'		=> array('lang' => 'REG_LIMIT',				'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
 
 						'legend3'			=> 'COPPA',
 						'coppa_enable'		=> array('lang' => 'ENABLE_COPPA',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
@@ -288,13 +288,13 @@ class acp_board
 						'feed_http_auth'			=> array('lang' => 'ACP_FEED_HTTP_AUTH',			'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true),
 
 						'legend2'					=> 'ACP_FEED_POST_BASED',
-						'feed_limit_post'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5',	'type' => 'number:5:4',				'explain' => true),
+						'feed_limit_post'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5',	'type' => 'number:5:9999',				'explain' => true),
 						'feed_overall'				=> array('lang' => 'ACP_FEED_OVERALL',				'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_forum'				=> array('lang' => 'ACP_FEED_FORUM',				'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_topic'				=> array('lang' => 'ACP_FEED_TOPIC',				'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 
 						'legend3'					=> 'ACP_FEED_TOPIC_BASED',
-						'feed_limit_topic'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5',	'type' => 'number:5:4',				'explain' => true),
+						'feed_limit_topic'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5',	'type' => 'number:5:9999',				'explain' => true),
 						'feed_topics_new'			=> array('lang' => 'ACP_FEED_TOPICS_NEW',			'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_topics_active'		=> array('lang' => 'ACP_FEED_TOPICS_ACTIVE',		'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_news_id'				=> array('lang' => 'ACP_FEED_NEWS',					'validate' => 'string',	'type' => 'custom', 'method' => 'select_news_forums', 'explain' => true),
@@ -324,10 +324,10 @@ class acp_board
 					'title'	=> 'ACP_LOAD_SETTINGS',
 					'vars'	=> array(
 						'legend1'			=> 'GENERAL_SETTINGS',
-						'limit_load'		=> array('lang' => 'LIMIT_LOAD',		'validate' => 'string',	'type' => 'number:0:4', 'explain' => true),
-						'session_length'	=> array('lang' => 'SESSION_LENGTH',	'validate' => 'int:60',	'type' => 'number:60:10', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
-						'active_sessions'	=> array('lang' => 'LIMIT_SESSIONS',	'validate' => 'int:0',	'type' => 'number:0:4', 'explain' => true),
-						'load_online_time'	=> array('lang' => 'ONLINE_LENGTH',		'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'limit_load'		=> array('lang' => 'LIMIT_LOAD',		'validate' => 'string',	'type' => 'number:0:9999', 'explain' => true),
+						'session_length'	=> array('lang' => 'SESSION_LENGTH',	'validate' => 'int:60',	'type' => 'number:60:9999999999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'active_sessions'	=> array('lang' => 'LIMIT_SESSIONS',	'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
+						'load_online_time'	=> array('lang' => 'ONLINE_LENGTH',		'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
 
 						'legend2'				=> 'GENERAL_OPTIONS',
 						'load_notifications'	=> array('lang' => 'LOAD_NOTIFICATIONS',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
@@ -384,7 +384,7 @@ class acp_board
 						'force_server_vars'		=> array('lang' => 'FORCE_SERVER_VARS',	'validate' => 'bool',			'type' => 'radio:yes_no', 'explain' => true),
 						'server_protocol'		=> array('lang' => 'SERVER_PROTOCOL',	'validate' => 'string',			'type' => 'text:10:10', 'explain' => true),
 						'server_name'			=> array('lang' => 'SERVER_NAME',		'validate' => 'string',			'type' => 'text:40:255', 'explain' => true),
-						'server_port'			=> array('lang' => 'SERVER_PORT',		'validate' => 'int:0',			'type' => 'number:0:5', 'explain' => true),
+						'server_port'			=> array('lang' => 'SERVER_PORT',		'validate' => 'int:0',			'type' => 'number:0:99999', 'explain' => true),
 						'script_path'			=> array('lang' => 'SCRIPT_PATH',		'validate' => 'script_path',	'type' => 'text::255', 'explain' => true),
 
 						'legend4'					=> 'ACP_SUBMIT_CHANGES',
@@ -408,13 +408,13 @@ class acp_board
 						'max_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:8:255', 'type' => false, 'method' => false, 'explain' => false,),
 						'min_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH',	'validate' => 'int:1',	'type' => 'custom', 'method' => 'password_length', 'explain' => true),
 						'pass_complex'			=> array('lang' => 'PASSWORD_TYPE',			'validate' => 'string',	'type' => 'select', 'method' => 'select_password_chars', 'explain' => true),
-						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',		'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
-						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true),
-						'ip_login_limit_max'	=> array('lang' => 'IP_LOGIN_LIMIT_MAX',	'validate' => 'int:0',	'type' => 'number:0:3', 'explain' => true),
-						'ip_login_limit_time'	=> array('lang' => 'IP_LOGIN_LIMIT_TIME',	'validate' => 'int:0',	'type' => 'number:0:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',		'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true),
+						'ip_login_limit_max'	=> array('lang' => 'IP_LOGIN_LIMIT_MAX',	'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true),
+						'ip_login_limit_time'	=> array('lang' => 'IP_LOGIN_LIMIT_TIME',	'validate' => 'int:0',	'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
 						'ip_login_limit_use_forwarded'	=> array('lang' => 'IP_LOGIN_LIMIT_USE_FORWARDED',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'tpl_allow_php'			=> array('lang' => 'TPL_ALLOW_PHP',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'form_token_lifetime'	=> array('lang' => 'FORM_TIME_MAX',			'validate' => 'int:-1',	'type' => 'number:-1:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'form_token_lifetime'	=> array('lang' => 'FORM_TIME_MAX',			'validate' => 'int:-1',	'type' => 'number:-1:99999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
 						'form_token_sid_guests'	=> array('lang' => 'FORM_SID_GUESTS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
 					)
@@ -429,7 +429,7 @@ class acp_board
 						'email_enable'			=> array('lang' => 'ENABLE_EMAIL',			'validate' => 'bool',	'type' => 'radio:enabled_disabled', 'explain' => true),
 						'board_email_form'		=> array('lang' => 'BOARD_EMAIL_FORM',		'validate' => 'bool',	'type' => 'radio:enabled_disabled', 'explain' => true),
 						'email_function_name'	=> array('lang' => 'EMAIL_FUNCTION_NAME',	'validate' => 'string',	'type' => 'text:20:50', 'explain' => true),
-						'email_package_size'	=> array('lang' => 'EMAIL_PACKAGE_SIZE',	'validate' => 'int:0',	'type' => 'number:0:5', 'explain' => true),
+						'email_package_size'	=> array('lang' => 'EMAIL_PACKAGE_SIZE',	'validate' => 'int:0',	'type' => 'number:0:99999', 'explain' => true),
 						'board_contact'			=> array('lang' => 'CONTACT_EMAIL',			'validate' => 'email',	'type' => 'email:25:100', 'explain' => true),
 						'board_email'			=> array('lang' => 'ADMIN_EMAIL',			'validate' => 'email',	'type' => 'email:25:100', 'explain' => true),
 						'board_email_sig'		=> array('lang' => 'EMAIL_SIG',				'validate' => 'string',	'type' => 'textarea:5:30', 'explain' => true),
@@ -438,7 +438,7 @@ class acp_board
 						'legend2'				=> 'SMTP_SETTINGS',
 						'smtp_delivery'			=> array('lang' => 'USE_SMTP',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'smtp_host'				=> array('lang' => 'SMTP_SERVER',			'validate' => 'string',	'type' => 'text:25:50', 'explain' => false),
-						'smtp_port'				=> array('lang' => 'SMTP_PORT',				'validate' => 'int:0',	'type' => 'number:0:5', 'explain' => true),
+						'smtp_port'				=> array('lang' => 'SMTP_PORT',				'validate' => 'int:0',	'type' => 'number:0:99999', 'explain' => true),
 						'smtp_auth_method'		=> array('lang' => 'SMTP_AUTH_METHOD',		'validate' => 'string',	'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true),
 						'smtp_username'			=> array('lang' => 'SMTP_USERNAME',			'validate' => 'string',	'type' => 'text:25:255', 'explain' => true),
 						'smtp_password'			=> array('lang' => 'SMTP_PASSWORD',			'validate' => 'string',	'type' => 'password:25:255', 'explain' => true),
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 3aca1af229..d3b1942180 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -258,25 +258,27 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 		break;
 
 		case 'number':
-			$min = (int) $tpl_type[1];
-			$max = $maxlength = (int) $tpl_type[2];
-
-			// $tpl_type[3] is not always present
-			if (!isset($tpl_type[3]) || (isset($tpl_type[3]) && $tpl_type[3] != 'true'))
+			$min = $max = $maxlength = '';
+			$min = ( isset($tpl_type[1]) ) ? (int) $tpl_type[1] : false;
+			if ( isset($tpl_type[2]) )
 			{
-				$max = str_repeat('9', $max);
+				$max = (int) $tpl_type[2];
+				$maxlength = strlen( (string) $max );
 			}
 
-			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (($maxlength) ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="' . $name . '" value="' . $new[$config_key] . '"' . (($tpl_type[0] === 'password') ?  ' autocomplete="off"' : '') . ' />';
+			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (( $maxlength != '' ) ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="' . $name . '" value="' . $new[$config_key] . '" />';
 		break;
 
 		case 'dimension':
+			$min = $max = $maxlength = '';
 			$min = (int) $tpl_type[1];
-			$max = $maxlength = (int) $tpl_type[2];
-
-			$max = str_repeat('9', $max);
+			if ( isset($tpl_type[2]) )
+			{
+				$max = (int) $tpl_type[2];
+				$maxlength = strlen( (string) $max );
+			}
 
-			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (($maxlength) ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="number" maxlength="' . (($maxlength) ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
+			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (($maxlength != '') ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="number" maxlength="' . (($maxlength != '') ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
 		break;
 
 		case 'textarea':
-- 
cgit v1.2.1


From 05639b85ad9d1f00a5fbdb7638375d773b77bf26 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Mon, 11 Mar 2013 20:00:09 +0100
Subject: [ticket/11010] displaying min and max only if they are set

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index d3b1942180..8c0fde70e5 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -266,7 +266,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 				$maxlength = strlen( (string) $max );
 			}
 
-			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (( $maxlength != '' ) ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="' . $name . '" value="' . $new[$config_key] . '" />';
+			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (( $maxlength != '' ) ? $maxlength : 255) . '"' . (( $min != '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="' . $name . '" value="' . $new[$config_key] . '" />';
 		break;
 
 		case 'dimension':
@@ -278,7 +278,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 				$maxlength = strlen( (string) $max );
 			}
 
-			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (($maxlength != '') ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="number" maxlength="' . (($maxlength != '') ? $maxlength : 255) . '" min="' . $min . '" max="' . $max . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
+			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min != '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="number" maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min != '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
 		break;
 
 		case 'textarea':
-- 
cgit v1.2.1


From 3547b9738a64ef2a97dd1865d6169e84f9c02c24 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Mon, 11 Mar 2013 20:00:45 +0100
Subject: [ticket/11010] validation to match type

PHPBB3-11010
---
 phpBB/includes/acp/acp_attachments.php | 12 ++---
 phpBB/includes/acp/acp_board.php       | 84 +++++++++++++++++-----------------
 2 files changed, 48 insertions(+), 48 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 272fc51d40..d0e8ff3882 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -117,8 +117,8 @@ class acp_attachments
 						'attachment_quota'		=> array('lang' => 'ATTACH_QUOTA',			'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
 						'max_filesize'			=> array('lang' => 'ATTACH_MAX_FILESIZE',	'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
 						'max_filesize_pm'		=> array('lang' => 'ATTACH_MAX_PM_FILESIZE','validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
-						'max_attachments'		=> array('lang' => 'MAX_ATTACHMENTS',		'validate' => 'int',	'type' => 'number:0:999', 'explain' => false),
-						'max_attachments_pm'	=> array('lang' => 'MAX_ATTACHMENTS_PM',	'validate' => 'int',	'type' => 'number:0:999', 'explain' => false),
+						'max_attachments'		=> array('lang' => 'MAX_ATTACHMENTS',		'validate' => 'int:0:999',	'type' => 'number:0:999', 'explain' => false),
+						'max_attachments_pm'	=> array('lang' => 'MAX_ATTACHMENTS_PM',	'validate' => 'int:0:999',	'type' => 'number:0:999', 'explain' => false),
 						'secure_downloads'		=> array('lang' => 'SECURE_DOWNLOADS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'secure_allow_deny'		=> array('lang' => 'SECURE_ALLOW_DENY',		'validate' => 'int',	'type' => 'custom', 'method' => 'select_allow_deny', 'explain' => true),
 						'secure_allow_empty_referer'	=> array('lang' => 'SECURE_EMPTY_REFERRER', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
@@ -128,11 +128,11 @@ class acp_attachments
 						'legend2'					=> $l_legend_cat_images,
 						'img_display_inlined'		=> array('lang' => 'DISPLAY_INLINED',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'img_create_thumbnail'		=> array('lang' => 'CREATE_THUMBNAIL',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'img_max_thumb_width'		=> array('lang' => 'MAX_THUMB_WIDTH',		'validate' => 'int',	'type' => 'number:0:999999999999999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'img_min_thumb_filesize'	=> array('lang' => 'MIN_THUMB_FILESIZE',	'validate' => 'int',	'type' => 'number:0:999999999999999', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
+						'img_max_thumb_width'		=> array('lang' => 'MAX_THUMB_WIDTH',		'validate' => 'int:0:999999999999999',	'type' => 'number:0:999999999999999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'img_min_thumb_filesize'	=> array('lang' => 'MIN_THUMB_FILESIZE',	'validate' => 'int:0:999999999999999',	'type' => 'number:0:999999999999999', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
 						'img_imagick'				=> array('lang' => 'IMAGICK_PATH',			'validate' => 'string',	'type' => 'text:20:200', 'explain' => true, 'append' => '&nbsp;&nbsp;<span>[ <a href="' . $this->u_action . '&amp;action=imgmagick">' . $user->lang['SEARCH_IMAGICK'] . '</a> ]</span>'),
-						'img_max'					=> array('lang' => 'MAX_IMAGE_SIZE',		'validate' => 'int',	'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'img_link'					=> array('lang' => 'IMAGE_LINK_SIZE',		'validate' => 'int',	'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'img_max'					=> array('lang' => 'MAX_IMAGE_SIZE',		'validate' => 'int:0:9999',	'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'img_link'					=> array('lang' => 'IMAGE_LINK_SIZE',		'validate' => 'int:0:9999',	'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 					)
 				);
 
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index d894d158a7..0c6a5d4e33 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -65,7 +65,7 @@ class acp_board
 						'override_user_style'	=> array('lang' => 'OVERRIDE_STYLE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
 						'legend2'				=> 'WARNINGS',
-						'warnings_expire_days'	=> array('lang' => 'WARNINGS_EXPIRE',		'validate' => 'int',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+						'warnings_expire_days'	=> array('lang' => 'WARNINGS_EXPIRE',		'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
 
 						'legend3'					=> 'ACP_SUBMIT_CHANGES',
 					)
@@ -154,11 +154,11 @@ class acp_board
 					'vars'	=> array(
 						'legend1'				=> 'GENERAL_SETTINGS',
 						'allow_privmsg'			=> array('lang' => 'BOARD_PM',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'pm_max_boxes'			=> array('lang' => 'BOXES_MAX',				'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
-						'pm_max_msgs'			=> array('lang' => 'BOXES_LIMIT',			'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
+						'pm_max_boxes'			=> array('lang' => 'BOXES_MAX',				'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true),
+						'pm_max_msgs'			=> array('lang' => 'BOXES_LIMIT',			'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true),
 						'full_folder_action'	=> array('lang' => 'FULL_FOLDER_ACTION',	'validate' => 'int',	'type' => 'select', 'method' => 'full_folder_select', 'explain' => true),
-						'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'validate' => 'int:0',	'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
-						'pm_max_recipients'		=> array('lang' => 'PM_MAX_RECIPIENTS',		'validate' => 'int:0',	'type' => 'number:0:99999', 'explain' => true),
+						'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'validate' => 'int:0:99999',	'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'pm_max_recipients'		=> array('lang' => 'PM_MAX_RECIPIENTS',		'validate' => 'int:0:99999',	'type' => 'number:0:99999', 'explain' => true),
 
 						'legend2'				=> 'GENERAL_OPTIONS',
 						'allow_mass_pm'			=> array('lang' => 'ALLOW_MASS_PM',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
@@ -195,24 +195,24 @@ class acp_board
 
 						'legend2'				=> 'POSTING',
 						'bump_type'				=> false,
-						'edit_time'				=> array('lang' => 'EDIT_TIME',				'validate' => 'int:0',		'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
-						'delete_time'			=> array('lang' => 'DELETE_TIME',			'validate' => 'int:0',		'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'edit_time'				=> array('lang' => 'EDIT_TIME',				'validate' => 'int:0:99999',		'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'delete_time'			=> array('lang' => 'DELETE_TIME',			'validate' => 'int:0:99999',		'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
 						'display_last_edited'	=> array('lang' => 'DISPLAY_LAST_EDITED',	'validate' => 'bool',		'type' => 'radio:yes_no', 'explain' => true),
-						'flood_interval'		=> array('lang' => 'FLOOD_INTERVAL',		'validate' => 'int:0',		'type' => 'number:0:9999999999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'flood_interval'		=> array('lang' => 'FLOOD_INTERVAL',		'validate' => 'int:0:9999999999',		'type' => 'number:0:9999999999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
 						'bump_interval'			=> array('lang' => 'BUMP_INTERVAL',			'validate' => 'int:0',		'type' => 'custom', 'method' => 'bump_interval', 'explain' => true),
-						'topics_per_page'		=> array('lang' => 'TOPICS_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:9999', 'explain' => false),
-						'posts_per_page'		=> array('lang' => 'POSTS_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:9999', 'explain' => false),
-						'smilies_per_page'		=> array('lang' => 'SMILIES_PER_PAGE',		'validate' => 'int:1',		'type' => 'number:1:9999', 'explain' => false),
-						'hot_threshold'			=> array('lang' => 'HOT_THRESHOLD',			'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true),
+						'topics_per_page'		=> array('lang' => 'TOPICS_PER_PAGE',		'validate' => 'int:1:9999',		'type' => 'number:1:9999', 'explain' => false),
+						'posts_per_page'		=> array('lang' => 'POSTS_PER_PAGE',		'validate' => 'int:1:9999',		'type' => 'number:1:9999', 'explain' => false),
+						'smilies_per_page'		=> array('lang' => 'SMILIES_PER_PAGE',		'validate' => 'int:1:9999',		'type' => 'number:1:9999', 'explain' => false),
+						'hot_threshold'			=> array('lang' => 'HOT_THRESHOLD',			'validate' => 'int:0:9999',		'type' => 'number:0:9999', 'explain' => true),
 						'max_poll_options'		=> array('lang' => 'MAX_POLL_OPTIONS',		'validate' => 'int:2:127',	'type' => 'number:2:127', 'explain' => false),
-						'max_post_chars'		=> array('lang' => 'CHAR_LIMIT',			'validate' => 'int:0',		'type' => 'number:0:999999', 'explain' => true),
-						'min_post_chars'		=> array('lang' => 'MIN_CHAR_LIMIT',		'validate' => 'int:1',		'type' => 'number:1:999999', 'explain' => true),
-						'max_post_smilies'		=> array('lang' => 'SMILIES_LIMIT',			'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true),
-						'max_post_urls'			=> array('lang' => 'MAX_POST_URLS',			'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true),
-						'max_post_font_size'	=> array('lang' => 'MAX_POST_FONT_SIZE',	'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true, 'append' => ' %'),
-						'max_quote_depth'		=> array('lang' => 'QUOTE_DEPTH_LIMIT',		'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true),
-						'max_post_img_width'	=> array('lang' => 'MAX_POST_IMG_WIDTH',	'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'max_post_img_height'	=> array('lang' => 'MAX_POST_IMG_HEIGHT',	'validate' => 'int:0',		'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_post_chars'		=> array('lang' => 'CHAR_LIMIT',			'validate' => 'int:0:999999',		'type' => 'number:0:999999', 'explain' => true),
+						'min_post_chars'		=> array('lang' => 'MIN_CHAR_LIMIT',		'validate' => 'int:1:999999',		'type' => 'number:1:999999', 'explain' => true),
+						'max_post_smilies'		=> array('lang' => 'SMILIES_LIMIT',			'validate' => 'int:0:9999',		'type' => 'number:0:9999', 'explain' => true),
+						'max_post_urls'			=> array('lang' => 'MAX_POST_URLS',			'validate' => 'int:0:9999',		'type' => 'number:0:9999', 'explain' => true),
+						'max_post_font_size'	=> array('lang' => 'MAX_POST_FONT_SIZE',	'validate' => 'int:0:9999',		'type' => 'number:0:9999', 'explain' => true, 'append' => ' %'),
+						'max_quote_depth'		=> array('lang' => 'QUOTE_DEPTH_LIMIT',		'validate' => 'int:0:9999',		'type' => 'number:0:9999', 'explain' => true),
+						'max_post_img_width'	=> array('lang' => 'MAX_POST_IMG_WIDTH',	'validate' => 'int:0:9999',		'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_post_img_height'	=> array('lang' => 'MAX_POST_IMG_HEIGHT',	'validate' => 'int:0:9999',		'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 
 						'legend3'					=> 'ACP_SUBMIT_CHANGES',
 					)
@@ -232,12 +232,12 @@ class acp_board
 						'allow_sig_links'		=> array('lang' => 'ALLOW_SIG_LINKS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
 						'legend2'				=> 'GENERAL_SETTINGS',
-						'max_sig_chars'			=> array('lang' => 'MAX_SIG_LENGTH',		'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
-						'max_sig_urls'			=> array('lang' => 'MAX_SIG_URLS',			'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
-						'max_sig_font_size'		=> array('lang' => 'MAX_SIG_FONT_SIZE',		'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' %'),
-						'max_sig_smilies'		=> array('lang' => 'MAX_SIG_SMILIES',		'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
-						'max_sig_img_width'		=> array('lang' => 'MAX_SIG_IMG_WIDTH',		'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'max_sig_img_height'	=> array('lang' => 'MAX_SIG_IMG_HEIGHT',	'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_sig_chars'			=> array('lang' => 'MAX_SIG_LENGTH',		'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true),
+						'max_sig_urls'			=> array('lang' => 'MAX_SIG_URLS',			'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true),
+						'max_sig_font_size'		=> array('lang' => 'MAX_SIG_FONT_SIZE',		'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' %'),
+						'max_sig_smilies'		=> array('lang' => 'MAX_SIG_SMILIES',		'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true),
+						'max_sig_img_width'		=> array('lang' => 'MAX_SIG_IMG_WIDTH',		'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'max_sig_img_height'	=> array('lang' => 'MAX_SIG_IMG_HEIGHT',	'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 
 						'legend3'					=> 'ACP_SUBMIT_CHANGES',
 					)
@@ -259,14 +259,14 @@ class acp_board
 						'min_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH',	'validate' => 'int:1',	'type' => 'custom', 'method' => 'password_length', 'explain' => true),
 						'allow_name_chars'		=> array('lang' => 'USERNAME_CHARS',	'validate' => 'string',	'type' => 'select', 'method' => 'select_username_chars', 'explain' => true),
 						'pass_complex'			=> array('lang' => 'PASSWORD_TYPE',		'validate' => 'string',	'type' => 'select', 'method' => 'select_password_chars', 'explain' => true),
-						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',	'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',	'validate' => 'int:0:999',	'type' => 'number:0:999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
 
 						'legend2'				=> 'GENERAL_OPTIONS',
 						'allow_namechange'		=> array('lang' => 'ALLOW_NAME_CHANGE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
 						'allow_emailreuse'		=> array('lang' => 'ALLOW_EMAIL_REUSE',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'enable_confirm'		=> array('lang' => 'VISUAL_CONFIRM_REG',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true),
-						'max_reg_attempts'		=> array('lang' => 'REG_LIMIT',				'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
+						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0:999',	'type' => 'number:0:999', 'explain' => true),
+						'max_reg_attempts'		=> array('lang' => 'REG_LIMIT',				'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true),
 
 						'legend3'			=> 'COPPA',
 						'coppa_enable'		=> array('lang' => 'ENABLE_COPPA',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
@@ -288,13 +288,13 @@ class acp_board
 						'feed_http_auth'			=> array('lang' => 'ACP_FEED_HTTP_AUTH',			'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true),
 
 						'legend2'					=> 'ACP_FEED_POST_BASED',
-						'feed_limit_post'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5',	'type' => 'number:5:9999',				'explain' => true),
+						'feed_limit_post'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5:9999',	'type' => 'number:5:9999',				'explain' => true),
 						'feed_overall'				=> array('lang' => 'ACP_FEED_OVERALL',				'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_forum'				=> array('lang' => 'ACP_FEED_FORUM',				'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_topic'				=> array('lang' => 'ACP_FEED_TOPIC',				'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 
 						'legend3'					=> 'ACP_FEED_TOPIC_BASED',
-						'feed_limit_topic'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5',	'type' => 'number:5:9999',				'explain' => true),
+						'feed_limit_topic'			=> array('lang' => 'ACP_FEED_LIMIT',				'validate' => 'int:5:9999',	'type' => 'number:5:9999',				'explain' => true),
 						'feed_topics_new'			=> array('lang' => 'ACP_FEED_TOPICS_NEW',			'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_topics_active'		=> array('lang' => 'ACP_FEED_TOPICS_ACTIVE',		'validate' => 'bool',	'type' => 'radio:enabled_disabled',	'explain' => true ),
 						'feed_news_id'				=> array('lang' => 'ACP_FEED_NEWS',					'validate' => 'string',	'type' => 'custom', 'method' => 'select_news_forums', 'explain' => true),
@@ -324,10 +324,10 @@ class acp_board
 					'title'	=> 'ACP_LOAD_SETTINGS',
 					'vars'	=> array(
 						'legend1'			=> 'GENERAL_SETTINGS',
-						'limit_load'		=> array('lang' => 'LIMIT_LOAD',		'validate' => 'string',	'type' => 'number:0:9999', 'explain' => true),
-						'session_length'	=> array('lang' => 'SESSION_LENGTH',	'validate' => 'int:60',	'type' => 'number:60:9999999999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
-						'active_sessions'	=> array('lang' => 'LIMIT_SESSIONS',	'validate' => 'int:0',	'type' => 'number:0:9999', 'explain' => true),
-						'load_online_time'	=> array('lang' => 'ONLINE_LENGTH',		'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'limit_load'		=> array('lang' => 'LIMIT_LOAD',		'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true),
+						'session_length'	=> array('lang' => 'SESSION_LENGTH',	'validate' => 'int:60:9999999999',	'type' => 'number:60:9999999999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'active_sessions'	=> array('lang' => 'LIMIT_SESSIONS',	'validate' => 'int:0:9999',	'type' => 'number:0:9999', 'explain' => true),
+						'load_online_time'	=> array('lang' => 'ONLINE_LENGTH',		'validate' => 'int:0:999',	'type' => 'number:0:999', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
 
 						'legend2'				=> 'GENERAL_OPTIONS',
 						'load_notifications'	=> array('lang' => 'LOAD_NOTIFICATIONS',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
@@ -384,7 +384,7 @@ class acp_board
 						'force_server_vars'		=> array('lang' => 'FORCE_SERVER_VARS',	'validate' => 'bool',			'type' => 'radio:yes_no', 'explain' => true),
 						'server_protocol'		=> array('lang' => 'SERVER_PROTOCOL',	'validate' => 'string',			'type' => 'text:10:10', 'explain' => true),
 						'server_name'			=> array('lang' => 'SERVER_NAME',		'validate' => 'string',			'type' => 'text:40:255', 'explain' => true),
-						'server_port'			=> array('lang' => 'SERVER_PORT',		'validate' => 'int:0',			'type' => 'number:0:99999', 'explain' => true),
+						'server_port'			=> array('lang' => 'SERVER_PORT',		'validate' => 'int:0:99999',			'type' => 'number:0:99999', 'explain' => true),
 						'script_path'			=> array('lang' => 'SCRIPT_PATH',		'validate' => 'script_path',	'type' => 'text::255', 'explain' => true),
 
 						'legend4'					=> 'ACP_SUBMIT_CHANGES',
@@ -408,13 +408,13 @@ class acp_board
 						'max_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int:8:255', 'type' => false, 'method' => false, 'explain' => false,),
 						'min_pass_chars'		=> array('lang' => 'PASSWORD_LENGTH',	'validate' => 'int:1',	'type' => 'custom', 'method' => 'password_length', 'explain' => true),
 						'pass_complex'			=> array('lang' => 'PASSWORD_TYPE',			'validate' => 'string',	'type' => 'select', 'method' => 'select_password_chars', 'explain' => true),
-						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',		'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
-						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true),
-						'ip_login_limit_max'	=> array('lang' => 'IP_LOGIN_LIMIT_MAX',	'validate' => 'int:0',	'type' => 'number:0:999', 'explain' => true),
-						'ip_login_limit_time'	=> array('lang' => 'IP_LOGIN_LIMIT_TIME',	'validate' => 'int:0',	'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'chg_passforce'			=> array('lang' => 'FORCE_PASS_CHANGE',		'validate' => 'int:0:999',	'type' => 'number:0:999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+						'max_login_attempts'	=> array('lang' => 'MAX_LOGIN_ATTEMPTS',	'validate' => 'int:0:999',	'type' => 'number:0:999', 'explain' => true),
+						'ip_login_limit_max'	=> array('lang' => 'IP_LOGIN_LIMIT_MAX',	'validate' => 'int:0:999',	'type' => 'number:0:999', 'explain' => true),
+						'ip_login_limit_time'	=> array('lang' => 'IP_LOGIN_LIMIT_TIME',	'validate' => 'int:0:99999',	'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
 						'ip_login_limit_use_forwarded'	=> array('lang' => 'IP_LOGIN_LIMIT_USE_FORWARDED',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'tpl_allow_php'			=> array('lang' => 'TPL_ALLOW_PHP',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'form_token_lifetime'	=> array('lang' => 'FORM_TIME_MAX',			'validate' => 'int:-1',	'type' => 'number:-1:99999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
+						'form_token_lifetime'	=> array('lang' => 'FORM_TIME_MAX',			'validate' => 'int:-1:99999',	'type' => 'number:-1:99999', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
 						'form_token_sid_guests'	=> array('lang' => 'FORM_SID_GUESTS',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 
 					)
@@ -438,7 +438,7 @@ class acp_board
 						'legend2'				=> 'SMTP_SETTINGS',
 						'smtp_delivery'			=> array('lang' => 'USE_SMTP',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'smtp_host'				=> array('lang' => 'SMTP_SERVER',			'validate' => 'string',	'type' => 'text:25:50', 'explain' => false),
-						'smtp_port'				=> array('lang' => 'SMTP_PORT',				'validate' => 'int:0',	'type' => 'number:0:99999', 'explain' => true),
+						'smtp_port'				=> array('lang' => 'SMTP_PORT',				'validate' => 'int:0:99999',	'type' => 'number:0:99999', 'explain' => true),
 						'smtp_auth_method'		=> array('lang' => 'SMTP_AUTH_METHOD',		'validate' => 'string',	'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true),
 						'smtp_username'			=> array('lang' => 'SMTP_USERNAME',			'validate' => 'string',	'type' => 'text:25:255', 'explain' => true),
 						'smtp_password'			=> array('lang' => 'SMTP_PASSWORD',			'validate' => 'string',	'type' => 'password:25:255', 'explain' => true),
-- 
cgit v1.2.1


From 06b7e424fca4e42428a54b1cc7eba572a2ec2620 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 9 Apr 2013 22:41:53 +0300
Subject: [ticket/11010] Add all HTML5 input types to ACP

Add all new HTML5 input types to functions_acp.php, handle them as text for now

PHPBB3-11010
---
 phpBB/includes/functions_acp.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 8c0fde70e5..eb89dbebc8 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -251,6 +251,18 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 		case 'password':
 		case 'url':
 		case 'email':
+		case 'color':
+		case 'date':
+		case 'time':
+		case 'datetime':
+		case 'datetime-local':
+		case 'month':
+		case 'range':
+		case 'search':
+		case 'tel':
+		case 'time':
+		case 'url':
+		case 'week':
 			$size = (int) $tpl_type[1];
 			$maxlength = (int) $tpl_type[2];
 
-- 
cgit v1.2.1


From 4c03c22e503a4317db93e7e61f676a396318b097 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Sat, 13 Apr 2013 11:29:53 +0200
Subject: [ticket/11010] dealing with dimensions problem, removing extra code

PHPBB3-11010
---
 phpBB/includes/functions_acp.php            | 7 +++++--
 phpBB/includes/functions_profile_fields.php | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index eb89dbebc8..247d181fb0 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -282,15 +282,18 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 		break;
 
 		case 'dimension':
-			$min = $max = $maxlength = '';
+			$min = $max = $maxlength = $size = '';
+
 			$min = (int) $tpl_type[1];
+
 			if ( isset($tpl_type[2]) )
 			{
 				$max = (int) $tpl_type[2];
 				$maxlength = strlen( (string) $max );
+				$size = strlen( (string) $max );
 			}
 
-			$tpl = '<input id="' . $key . '" type="number" maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min != '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="number" maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min != '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
+			$tpl = '<input id="' . $key . '" type="number" ' . (( $size != '' ) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min != '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="number" ' . (( $size != '' ) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min != '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
 		break;
 
 		case 'textarea':
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 1261e363c7..7dd0b0e87d 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -1040,9 +1040,9 @@ class custom_profile_admin extends custom_profile
 		global $user;
 
 		$options = array(
-			0 => array('TITLE' => $user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" maxlength="5" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" maxlength="5" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" maxlength="5" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
+			0 => array('TITLE' => $user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
+			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
+			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
 			3 => array('TITLE' => $user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')
 		);
 
-- 
cgit v1.2.1


From ae2700eef29a0cda1ff9abecb9bdc6beaf199982 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Sun, 12 May 2013 15:01:43 +0200
Subject: [ticket/11010] updating tests

PHPBB3-11010
---
 phpBB/includes/functions_acp.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 247d181fb0..f384d242ce 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -289,11 +289,10 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			if ( isset($tpl_type[2]) )
 			{
 				$max = (int) $tpl_type[2];
-				$maxlength = strlen( (string) $max );
-				$size = strlen( (string) $max );
+				$size = $maxlength = strlen( (string) $max );
 			}
 
-			$tpl = '<input id="' . $key . '" type="number" ' . (( $size != '' ) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min != '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="number" ' . (( $size != '' ) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min != '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
+			$tpl = '<input id="' . $key . '" type="number"' . (( $size != '' ) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min !== '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="number"' . (( $size != '' ) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength != '') ? $maxlength : 255) . '"' . (( $min !== '' ) ? ' min="' . $min . '"' : '') . (( $max != '' ) ? ' max="' . $max . '"' : '') . ' name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
 		break;
 
 		case 'textarea':
-- 
cgit v1.2.1


From 3e64c1b5d77dd4333c94c3688e0ba47ca7dcf328 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 13 May 2013 23:20:34 +0300
Subject: [ticket/11010] Fixes for number input in acp

PHPBB3-11010
---
 phpBB/includes/acp/acp_board.php            | 4 ++--
 phpBB/includes/avatar/driver/upload.php     | 2 +-
 phpBB/includes/search/fulltext_native.php   | 4 ++--
 phpBB/includes/search/fulltext_postgres.php | 4 ++--
 phpBB/includes/search/fulltext_sphinx.php   | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 0c6a5d4e33..6ac79c09a0 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -136,8 +136,8 @@ class acp_board
 						'avatar_max_height'		=> array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false),
 
 						'allow_avatar'			=> array('lang' => 'ALLOW_AVATARS',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'avatar_min'			=> array('lang' => 'MIN_AVATAR_SIZE',		'validate' => 'int:0',	'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
-						'avatar_max'			=> array('lang' => 'MAX_AVATAR_SIZE',		'validate' => 'int:0',	'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'avatar_min'			=> array('lang' => 'MIN_AVATAR_SIZE',		'validate' => 'int:0',	'type' => 'dimension:0', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
+						'avatar_max'			=> array('lang' => 'MAX_AVATAR_SIZE',		'validate' => 'int:0',	'type' => 'dimension:0', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
 					)
 				);
 
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 19737693fd..baf51f61c1 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -126,7 +126,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 	{
 		return array(
 			'allow_avatar_remote_upload'=> array('lang' => 'ALLOW_REMOTE_UPLOAD', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-			'avatar_filesize'		=> array('lang' => 'MAX_FILESIZE',			'validate' => 'int:0',	'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
+			'avatar_filesize'		=> array('lang' => 'MAX_FILESIZE',			'validate' => 'int:0',	'type' => 'number:0', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
 			'avatar_path'			=> array('lang' => 'AVATAR_STORAGE_PATH',	'validate' => 'rwpath',	'type' => 'text:20:255', 'explain' => true),
 		);
 	}
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index c9f33054fc..b9c784ea67 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -1819,11 +1819,11 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 		</dl>
 		<dl>
 			<dt><label for="fulltext_native_min_chars">' . $this->user->lang['MIN_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_min_chars" type="text" size="3" maxlength="3" name="config[fulltext_native_min_chars]" value="' . (int) $this->config['fulltext_native_min_chars'] . '" /></dd>
+			<dd><input id="fulltext_native_min_chars" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_native_min_chars]" value="' . (int) $this->config['fulltext_native_min_chars'] . '" /></dd>
 		</dl>
 		<dl>
 			<dt><label for="fulltext_native_max_chars">' . $this->user->lang['MAX_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_max_chars" type="text" size="3" maxlength="3" name="config[fulltext_native_max_chars]" value="' . (int) $this->config['fulltext_native_max_chars'] . '" /></dd>
+			<dd><input id="fulltext_native_max_chars" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_native_max_chars]" value="' . (int) $this->config['fulltext_native_max_chars'] . '" /></dd>
 		</dl>
 		<dl>
 			<dt><label for="fulltext_native_common_thres">' . $this->user->lang['COMMON_WORD_THRESHOLD'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['COMMON_WORD_THRESHOLD_EXPLAIN'] . '</span></dt>
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index 5080587681..496a29f5a3 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -970,11 +970,11 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 		</dl>
                 <dl>
                         <dt><label for="fulltext_postgres_min_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'] . '</span></dt>
-                        <dd><input id="fulltext_postgres_min_word_len" type="text" size="3" maxlength="3" name="config[fulltext_postgres_min_word_len]" value="' . (int) $this->config['fulltext_postgres_min_word_len'] . '" /></dd>
+                        <dd><input id="fulltext_postgres_min_word_len" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_postgres_min_word_len]" value="' . (int) $this->config['fulltext_postgres_min_word_len'] . '" /></dd>
                 </dl>
                 <dl>
                         <dt><label for="fulltext_postgres_max_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'] . '</span></dt>
-                        <dd><input id="fulltext_postgres_max_word_len" type="text" size="3" maxlength="3" name="config[fulltext_postgres_max_word_len]" value="' . (int) $this->config['fulltext_postgres_max_word_len'] . '" /></dd>
+                        <dd><input id="fulltext_postgres_max_word_len" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_postgres_max_word_len]" value="' . (int) $this->config['fulltext_postgres_max_word_len'] . '" /></dd>
                 </dl>
 		';
 
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 28761792ec..63e35eb4af 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -888,11 +888,11 @@ class phpbb_search_fulltext_sphinx
 		</dl>
 		<dl>
 			<dt><label for="fulltext_sphinx_port">' . $this->user->lang['FULLTEXT_SPHINX_PORT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_PORT_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_port" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_port]" value="' . $this->config['fulltext_sphinx_port'] . '" /></dd>
+			<dd><input id="fulltext_sphinx_port" type="number" size="4" maxlength="10" name="config[fulltext_sphinx_port]" value="' . $this->config['fulltext_sphinx_port'] . '" /></dd>
 		</dl>
 		<dl>
 			<dt><label for="fulltext_sphinx_indexer_mem_limit">' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" /> ' . $this->user->lang['MIB'] . '</dd>
+			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="number" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" /> ' . $this->user->lang['MIB'] . '</dd>
 		</dl>
 		<dl>
 			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</span></dt>
-- 
cgit v1.2.1


From c84fc97e9059792d244d49d0d379d627227b12ab Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 20 May 2013 11:45:32 -0500
Subject: [ticket/11435] Create new template filter option (cleanup)

This allows us to only run cleanup on the last run of template compilation
and not cleanup during event parsing

PHPBB3-11435
---
 phpBB/includes/template/compile.php | 39 ++++++++++++++++++---
 phpBB/includes/template/filter.php  | 69 +++++++++++++++++++++++--------------
 2 files changed, 78 insertions(+), 30 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/template/compile.php
index fcdaf7abda..76cb3011df 100644
--- a/phpBB/includes/template/compile.php
+++ b/phpBB/includes/template/compile.php
@@ -32,6 +32,13 @@ class phpbb_template_compile
 	*/
 	private $filter_params;
 
+	/**
+	* Array of default parameters
+	*
+	* @var array
+	*/
+	private $default_filter_params;
+
 	/**
 	* Constructor.
 	*
@@ -44,17 +51,39 @@ class phpbb_template_compile
 	*/
 	public function __construct($allow_php, $style_names, $locator, $phpbb_root_path, $extension_manager = null, $user = null)
 	{
-		$this->filter_params = array(
-			'allow_php'	=> $allow_php,
-			'style_names'	=> $style_names,
-			'locator'	=> $locator,
+		$this->filter_params = $this->default_filter_params = array(
+			'allow_php'			=> $allow_php,
+			'style_names'		=> $style_names,
+			'locator'			=> $locator,
 			'phpbb_root_path'	=> $phpbb_root_path,
 			'extension_manager'	=> $extension_manager,
-			'user'          => $user,
+			'user'          	=> $user,
 			'template_compile'	=> $this,
+			'cleanup'			=> true,
 		);
 	}
 
+	/**
+	* Set filter parameters
+	*
+	* @param array $params Array of parameters (will be merged onto $this->filter_params)
+	*/
+	public function set_filter_params($params)
+	{
+		$this->filter_params = array_merge(
+			$this->filter_params,
+			$params
+		);
+	}
+
+	/**
+	* Reset filter parameters to their default settings
+	*/
+	public function reset_filter_params()
+	{
+		$this->filter_params = $this->default_filter_params;
+	}
+
 	/**
 	* Compiles template in $source_file and writes compiled template to
 	* cache directory
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index ea7990da53..f2bd442010 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -75,6 +75,14 @@ class phpbb_template_filter extends php_user_filter
 	*/
 	private $allow_php;
 
+	/**
+	* Whether cleanup will be performed on resulting code, see compile()
+	* (Preserve whitespace)
+	*
+	* @var bool
+	*/
+	private $cleanup = true;
+
 	/**
 	* Resource locator.
 	*
@@ -183,6 +191,7 @@ class phpbb_template_filter extends php_user_filter
 		$this->phpbb_root_path = $this->params['phpbb_root_path'];
 		$this->style_names = $this->params['style_names'];
 		$this->extension_manager = $this->params['extension_manager'];
+		$this->cleanup = $this->params['cleanup'];
 		if (isset($this->params['user']))
 		{
 			$this->user = $this->params['user'];
@@ -223,41 +232,45 @@ class phpbb_template_filter extends php_user_filter
 			$data = preg_replace('~<!-- ENDPHP -->.*?$~', '', $data);
 		}
 
-		/*
+		if ($this->cleanup)
+		{
+			/*
 
-		Preserve whitespace.
-		PHP removes a newline after the closing tag (if it's there).
-		This is by design:
+			Preserve whitespace.
+			PHP removes a newline after the closing tag (if it's there).
+			This is by design:
 
-		http://www.php.net/manual/en/language.basic-syntax.phpmode.php
-		http://www.php.net/manual/en/language.basic-syntax.instruction-separation.php
+			http://www.php.net/manual/en/language.basic-syntax.phpmode.php
+			http://www.php.net/manual/en/language.basic-syntax.instruction-separation.php
 
 
-		Consider the following template:
+			Consider the following template:
 
-			<!-- IF condition -->
-			some content
-			<!-- ENDIF -->
+				<!-- IF condition -->
+				some content
+				<!-- ENDIF -->
 
-		If we were to simply preserve all whitespace, we could simply
-		replace all "?>" tags with "?>\n".
-		Doing that, would add additional newlines to the compiled
-		template in place of the IF and ENDIF statements. These
-		newlines are unwanted (and one is conditional). The IF and
-		ENDIF are usually on their own line for ease of reading.
+			If we were to simply preserve all whitespace, we could simply
+			replace all "?>" tags with "?>\n".
+			Doing that, would add additional newlines to the compiled
+			template in place of the IF and ENDIF statements. These
+			newlines are unwanted (and one is conditional). The IF and
+			ENDIF are usually on their own line for ease of reading.
 
-		This replacement preserves newlines only for statements that
-		are not the only statement on a line. It will NOT preserve
-		newlines at the end of statements in the above example.
-		It will preserve newlines in situations like:
+			This replacement preserves newlines only for statements that
+			are not the only statement on a line. It will NOT preserve
+			newlines at the end of statements in the above example.
+			It will preserve newlines in situations like:
 
-			<!-- IF condition -->inline content<!-- ENDIF -->
+				<!-- IF condition -->inline content<!-- ENDIF -->
 
-		*/
+			*/
+
+			$data = preg_replace('~(?<!^)(<\?php.+(?<!/\*\*/)\?>)$~m', "$1\n", $data);
+			$data = str_replace('/**/?>', "?>\n", $data);
+			$data = str_replace('?><?php', '', $data);
+		}
 
-		$data = preg_replace('~(?<!^)(<\?php.+(?<!/\*\*/)\?>)$~m', "$1\n", $data);
-		$data = str_replace('/**/?>', "?>\n", $data);
-		$data = str_replace('?><?php', '', $data);
 		return $data;
 	}
 
@@ -995,8 +1008,14 @@ class phpbb_template_filter extends php_user_filter
 			$all_compiled = '';
 			foreach ($files as $file)
 			{
+				$this->template_compile->set_filter_params(array(
+					'cleanup'	=> false,
+				));
+
 				$compiled = $this->template_compile->compile_file($file);
 
+				$this->template_compile->reset_filter_params();
+
 				if ($compiled === false)
 				{
 					if ($this->user)
-- 
cgit v1.2.1


From 930f4c70ed7acca6a85e95e00c6562c25e0d67a2 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Tue, 21 May 2013 11:55:45 +0200
Subject: [ticket/11010] resolving latest comments

PHPBB3-11010
---
 phpBB/includes/acp/acp_board.php | 3 ++-
 phpBB/includes/functions_acp.php | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 6ac79c09a0..34040367fb 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -399,7 +399,8 @@ class acp_board
 						'legend1'				=> 'ACP_SECURITY_SETTINGS',
 						'allow_autologin'		=> array('lang' => 'ALLOW_AUTOLOGIN',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'allow_password_reset'	=> array('lang' => 'ALLOW_PASSWORD_RESET',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'max_autologin_time'  => array('lang' => 'AUTOLOGIN_LENGTH',		'validate' => 'int:0:99999',	'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']), 						'ip_check'				=> array('lang' => 'IP_VALID',				'validate' => 'int',	'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
+						'max_autologin_time'  => array('lang' => 'AUTOLOGIN_LENGTH',		'validate' => 'int:0:99999',	'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+						'ip_check'				=> array('lang' => 'IP_VALID',				'validate' => 'int',	'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
 						'browser_check'			=> array('lang' => 'BROWSER_VALID',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'forwarded_for_check'	=> array('lang' => 'FORWARDED_FOR_VALID',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'referer_validation'	=> array('lang' => 'REFERER_VALID',		'validate' => 'int:0:3','type' => 'custom', 'method' => 'select_ref_check', 'explain' => true),
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index f384d242ce..ff0e2a1ac1 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -260,7 +260,6 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 		case 'range':
 		case 'search':
 		case 'tel':
-		case 'time':
 		case 'url':
 		case 'week':
 			$size = (int) $tpl_type[1];
-- 
cgit v1.2.1


From 721bc03b2b992f4df14afcbe64bb2f0cb7d73cf5 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Tue, 21 May 2013 11:57:33 +0200
Subject: [ticket/11010] properly tabifying 'max_autologin_time'

PHPBB3-11010
---
 phpBB/includes/acp/acp_board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 34040367fb..6881e03fdb 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -399,7 +399,7 @@ class acp_board
 						'legend1'				=> 'ACP_SECURITY_SETTINGS',
 						'allow_autologin'		=> array('lang' => 'ALLOW_AUTOLOGIN',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'allow_password_reset'	=> array('lang' => 'ALLOW_PASSWORD_RESET',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'max_autologin_time'  => array('lang' => 'AUTOLOGIN_LENGTH',		'validate' => 'int:0:99999',	'type' => 'number:0:99999', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']),
+						'max_autologin_time'	=> array('lang' => 'AUTOLOGIN_LENGTH',		'validate' => 'int:0:99999',	'type' => 'number:0:99999',	'explain' => true,	'append' => ' ' . $user->lang['DAYS']),
 						'ip_check'				=> array('lang' => 'IP_VALID',				'validate' => 'int',	'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
 						'browser_check'			=> array('lang' => 'BROWSER_VALID',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'forwarded_for_check'	=> array('lang' => 'FORWARDED_FOR_VALID',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-- 
cgit v1.2.1


From 8191755cca418ad2124e11e4e93559b9cad7d8bd Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Sat, 25 May 2013 10:50:43 +0530
Subject: [ticket/11145] Wrong error thrown when uploading a bigger image.

When attaching an image to a post with a size larger than maximum defined in
php.ini, 'ATTACHED_IMAGE_NOT_IMAGE' error is thrown. $file->is_image() is
returning false value when image size is too large. Therefore, moved
not image test down after image size test.

PHPBB3-11145
---
 phpBB/includes/functions_posting.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

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');
-- 
cgit v1.2.1


From 401e9466bffb3c312228a99aa6a63a15342fe79b Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 26 May 2013 17:51:41 +0200
Subject: [ticket/11538] Compare to '' instead of using empty(), so '0' does
 not pass.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 61972c3876..6b6a9b1f9f 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1910,7 +1910,7 @@ function validate_jabber($jid)
 */
 function phpbb_validate_hex_colour($colour, $optional = false)
 {
-	if (empty($colour))
+	if ($colour === '')
 	{
 		return (($optional) ? false : 'WRONG_DATA');
 	}
-- 
cgit v1.2.1


From b75f67231f77c7f982bdde363cf7765ebe08d2f6 Mon Sep 17 00:00:00 2001
From: marc1706 <admin@m-a-styles.de>
Date: Mon, 27 May 2013 22:56:49 +0200
Subject: [ticket/11578] Add missing underscore after 'validate' function
 prefix

The underscore after the 'validate' function prefix for the older
functions was dropped by accident in PR #1407. This patch will add it
back.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 6b6a9b1f9f..2b26c6787c 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1247,7 +1247,7 @@ function validate_data($data, $val_ary)
 		{
 			$function = array_shift($validate);
 			array_unshift($validate, $data[$var]);
-			$function_prefix = (function_exists('phpbb_validate_' . $function)) ? 'phpbb_validate_' : 'validate';
+			$function_prefix = (function_exists('phpbb_validate_' . $function)) ? 'phpbb_validate_' : 'validate_';
 
 			if ($result = call_user_func_array($function_prefix . $function, $validate))
 			{
-- 
cgit v1.2.1


From 6d5da402ecfe686a918608875eda8d0d817d4c07 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 30 May 2013 16:09:06 +0200
Subject: [ticket/11579] Remove unnecessary globals from validate_password()

The globals $db and $user are not used in that function.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 2b26c6787c..ea8b0a4640 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1554,7 +1554,7 @@ function validate_username($username, $allowed_username = false)
 */
 function validate_password($password)
 {
-	global $config, $db, $user;
+	global $config;
 
 	if ($password === '' || $config['pass_complex'] === 'PASS_TYPE_ANY')
 	{
-- 
cgit v1.2.1


From faf804c70f74c6721d6ab95cd77b37a46de73449 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Fri, 31 May 2013 14:45:38 +0200
Subject: [ticket/11409] Add success message after updating group position
 settings

PHPBB3-11409
---
 phpBB/includes/acp/acp_groups.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index c740ff7ddc..246ba5709b 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -920,10 +920,12 @@ class acp_groups
 				case 'set_config_teampage':
 					$config->set('teampage_forums', $request->variable('teampage_forums', 0));
 					$config->set('teampage_memberships', $request->variable('teampage_memberships', 0));
+					trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
 				break;
 
 				case 'set_config_legend':
 					$config->set('legend_sort_groupname', $request->variable('legend_sort_groupname', 0));
+					trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
 				break;
 			}
 		}
-- 
cgit v1.2.1


From d0e45e17dd67918ceeed7a0b11cc8723a51ec28f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 1 Jun 2013 04:09:33 +0200
Subject: [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4
 or higher.

PHPBB3-11583
---
 phpBB/includes/search/fulltext_mysql.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index bd4c003397..a2211bbe9b 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -86,7 +86,14 @@ 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'];
 		}
-- 
cgit v1.2.1


From 0eae9eb75d4a66d0064df7095aacb8907cde3572 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 3 Jun 2013 10:54:16 +0200
Subject: [ticket/10840] Add check_form_key to acp_groups.php

PHPBB3-10840
---
 phpBB/includes/acp/acp_groups.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'phpBB/includes')

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);
-- 
cgit v1.2.1


From 81140ec8877236050b822517f735b49503bcd44d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 3 Jun 2013 12:15:23 +0200
Subject: [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse

The description says:
"The URL must be relative to the topic page and cannot contain a server name
or protocol."
We now enforce this and will add a new token with the current behaviour back.

PHPBB3-8319
---
 phpBB/includes/acp/acp_bbcodes.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 0644b38eb1..2cb1390c8e 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -427,7 +427,15 @@ class acp_bbcodes
 				$fp_replace = str_replace($token, $replace, $fp_replace);
 
 				$sp_match = str_replace(preg_quote($token, '!'), $sp_tokens[$token_type], $sp_match);
-				$sp_replace = str_replace($token, '${' . ($n + 1) . '}', $sp_replace);
+				if ($token_type === 'LOCAL_URL')
+				{
+					// Prepend the board url to local relative links
+					$sp_replace = str_replace($token, generate_board_url() . '/' . '${' . ($n + 1) . '}', $sp_replace);
+				}
+				else
+				{
+					$sp_replace = str_replace($token, '${' . ($n + 1) . '}', $sp_replace);
+				}
 			}
 
 			$fp_match = '!' . $fp_match . '!' . $modifiers;
-- 
cgit v1.2.1


From c0e0c13cf17bac9256e3acb1ea2d67134d6122dd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 3 Jun 2013 11:57:40 +0200
Subject: [ticket/8319] Add new token RELATIVE_URL to allow foreign relative
 URL parts

PHPBB3-8319
---
 phpBB/includes/acp/acp_bbcodes.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 2cb1390c8e..02ec8af5b9 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -345,6 +345,9 @@ class acp_bbcodes
 			'LOCAL_URL'	 => array(
 				'!(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')!e'	=>	"\$this->bbcode_specialchars('$1')"
 			),
+			'RELATIVE_URL'	=> array(
+				'!(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')!e'	=>	"\$this->bbcode_specialchars('$1')"
+			),
 			'EMAIL' => array(
 				'!(' . get_preg_expression('email') . ')!ie'	=>	"\$this->bbcode_specialchars('$1')"
 			),
@@ -371,6 +374,7 @@ class acp_bbcodes
 		$sp_tokens = array(
 			'URL'	 => '(?i)((?:' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('url')) . ')|(?:' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('www_url')) . '))(?-i)',
 			'LOCAL_URL'	 => '(?i)(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')(?-i)',
+			'RELATIVE_URL'	 => '(?i)(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')(?-i)',
 			'EMAIL' => '(' . get_preg_expression('email') . ')',
 			'TEXT' => '(.*?)',
 			'SIMPLETEXT' => '([a-zA-Z0-9-+.,_ ]+)',
-- 
cgit v1.2.1


From 6206d4aa4ea08df513154d8b87d35785f69a9f2a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 3 Jun 2013 12:35:57 +0200
Subject: [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL

The explanation now states that links are prefixed with the board URL.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 02ec8af5b9..ead716b300 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -113,8 +113,8 @@ class acp_bbcodes
 				{
 					$template->assign_block_vars('token', array(
 						'TOKEN'		=> '{' . $token . '}',
-						'EXPLAIN'	=> $token_explain)
-					);
+						'EXPLAIN'	=> ($token === 'LOCAL_URL') ? sprintf($token_explain, generate_board_url() . '/') : $token_explain,
+					));
 				}
 
 				return;
-- 
cgit v1.2.1


From d925c8d0daca58ce6f2a7b327e496c072c8a9fc8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 3 Jun 2013 15:16:57 +0200
Subject: [ticket/11583] Use a new lang key instead of giving the old one a new
 meaning.

PHPBB3-11583
---
 phpBB/includes/search/fulltext_mysql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index a2211bbe9b..f28b8885e7 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -95,7 +95,7 @@ class fulltext_mysql extends search_backend
 
 		if (!$fulltext_supported)
 		{
-			return $user->lang['FULLTEXT_MYSQL_NOT_MYISAM'];
+			return $user->lang['FULLTEXT_MYSQL_NOT_SUPPORTED'];
 		}
 
 		$sql = 'SHOW VARIABLES
-- 
cgit v1.2.1


From cb54f56c3db0bedefaa76113f7491203962004ed Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Mar 2013 02:39:44 +0100
Subject: [ticket/11586] Combine administrator/moderator checks together.

PHPBB3-11586
---
 phpBB/includes/functions_posting.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index e823f8be75..8b4a833d8e 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -434,15 +434,15 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 	// Do we have to create a thumbnail?
 	$filedata['thumbnail'] = ($cat_id == ATTACHMENT_CATEGORY_IMAGE && $config['img_create_thumbnail']) ? 1 : 0;
 
-	// Check Image Size, if it is an image
-	if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id) && $cat_id == ATTACHMENT_CATEGORY_IMAGE)
-	{
-		$file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']);
-	}
-
-	// Admins and mods are allowed to exceed the allowed filesize
 	if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id))
 	{
+		// Check Image Size, if it is an image
+		if ($cat_id == ATTACHMENT_CATEGORY_IMAGE)
+		{
+			$file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']);
+		}
+
+		// Admins and mods are allowed to exceed the allowed filesize
 		if (!empty($extensions[$file->get('extension')]['max_filesize']))
 		{
 			$allowed_filesize = $extensions[$file->get('extension')]['max_filesize'];
-- 
cgit v1.2.1


From 11c80c040243244757ea75ef4ab23a70a725254f Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Mar 2013 02:43:48 +0100
Subject: [ticket/11586] Use a variable for $cat_id ==
 ATTACHMENT_CATEGORY_IMAGE.

PHPBB3-11586
---
 phpBB/includes/functions_posting.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 8b4a833d8e..a31d3b5a3f 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -429,15 +429,16 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 		return $filedata;
 	}
 
-	$cat_id = (isset($extensions[$file->get('extension')]['display_cat'])) ? $extensions[$file->get('extension')]['display_cat'] : ATTACHMENT_CATEGORY_NONE;
+	// Whether the uploaded file is in the image category
+	$is_image = (isset($extensions[$file->get('extension')]['display_cat'])) ? $extensions[$file->get('extension')]['display_cat'] == ATTACHMENT_CATEGORY_IMAGE : false;
 
 	// Do we have to create a thumbnail?
-	$filedata['thumbnail'] = ($cat_id == ATTACHMENT_CATEGORY_IMAGE && $config['img_create_thumbnail']) ? 1 : 0;
+	$filedata['thumbnail'] = ($is_image && $config['img_create_thumbnail']) ? 1 : 0;
 
 	if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id))
 	{
 		// Check Image Size, if it is an image
-		if ($cat_id == ATTACHMENT_CATEGORY_IMAGE)
+		if ($is_image)
 		{
 			$file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']);
 		}
@@ -457,10 +458,9 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 
 	$file->clean_filename('unique', $user->data['user_id'] . '_');
 
-	// Are we uploading an image *and* this image being within the image category? Only then perform additional image checks.
-	$no_image = ($cat_id == ATTACHMENT_CATEGORY_IMAGE) ? false : true;
-
-	$file->move_file($config['upload_path'], false, $no_image);
+	// Are we uploading an image *and* this image being within the image category?
+	// Only then perform additional image checks.
+	$file->move_file($config['upload_path'], false, !$is_image);
 
 	if (sizeof($file->error))
 	{
@@ -472,7 +472,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 	}
 
 	// Make sure the image category only holds valid images...
-	if ($cat_id == ATTACHMENT_CATEGORY_IMAGE && !$file->is_image())
+	if ($is_image && !$file->is_image())
 	{
 		$file->remove();
 
-- 
cgit v1.2.1


From 50e3173e8c2f8304ad79e228df8526f9caf7b999 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Mar 2013 02:46:12 +0100
Subject: [ticket/11586] Combine $filedata['post_attach'] assign into a single
 statement.

PHPBB3-11586
---
 phpBB/includes/functions_posting.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index a31d3b5a3f..d6f7c9bab4 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -403,14 +403,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 		$upload->set_disallowed_content(explode('|', $config['mime_triggers']));
 	}
 
-	if (!$local)
-	{
-		$filedata['post_attach'] = ($upload->is_valid($form_name)) ? true : false;
-	}
-	else
-	{
-		$filedata['post_attach'] = true;
-	}
+	$filedata['post_attach'] = $local || $upload->is_valid($form_name);
 
 	if (!$filedata['post_attach'])
 	{
-- 
cgit v1.2.1


From 5fa25880e23f1ad72321da2e04c574d99f5546a2 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 4 Mar 2013 02:49:48 +0100
Subject: [ticket/11586] Move $filedata['thumbnail'] to where it might be
 returned.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index d6f7c9bab4..b9b518ad32 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -425,9 +425,6 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 	// Whether the uploaded file is in the image category
 	$is_image = (isset($extensions[$file->get('extension')]['display_cat'])) ? $extensions[$file->get('extension')]['display_cat'] == ATTACHMENT_CATEGORY_IMAGE : false;
 
-	// Do we have to create a thumbnail?
-	$filedata['thumbnail'] = ($is_image && $config['img_create_thumbnail']) ? 1 : 0;
-
 	if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id))
 	{
 		// Check Image Size, if it is an image
@@ -455,6 +452,9 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 	// Only then perform additional image checks.
 	$file->move_file($config['upload_path'], false, !$is_image);
 
+	// Do we have to create a thumbnail?
+	$filedata['thumbnail'] = ($is_image && $config['img_create_thumbnail']) ? 1 : 0;
+
 	if (sizeof($file->error))
 	{
 		$file->remove();
-- 
cgit v1.2.1


From 27bcf25c3b944cd8448ed666f42f7c00ca5066bc Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 4 Jun 2013 14:25:37 +0200
Subject: [ticket/11587] Pass legend and teampage settings to group_create()

Without passing those values, the group is removed from the teampage and
the legend while submitting the edit form on the ucp groups manage page.

PHPBB3-11587
---
 phpBB/includes/ucp/ucp_groups.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index efc88e6e37..af08533a7d 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -416,9 +416,11 @@ class ucp_groups
 
 				if ($group_id)
 				{
-					$sql = 'SELECT *
-						FROM ' . GROUPS_TABLE . "
-						WHERE group_id = $group_id";
+					$sql = 'SELECT g.*, t.teampage_position AS group_teampage
+						FROM ' . GROUPS_TABLE . ' g
+						LEFT JOIN ' . TEAMPAGE_TABLE . ' t
+							ON (t.group_id = g.group_id)
+						WHERE g.group_id = ' . $group_id;
 					$result = $db->sql_query($sql);
 					$group_row = $db->sql_fetchrow($result);
 					$db->sql_freeresult($result);
@@ -514,6 +516,8 @@ class ucp_groups
 								'receive_pm'	=> isset($_REQUEST['group_receive_pm']) ? 1 : 0,
 								'message_limit'	=> request_var('group_message_limit', 0),
 								'max_recipients'=> request_var('group_max_recipients', 0),
+								'legend'	=> $group_row['group_legend'],
+								'teampage'	=> $group_row['group_teampage'],
 							);
 
 							if ($config['allow_avatar'])
@@ -569,6 +573,9 @@ class ucp_groups
 								// Only set the rank, colour, etc. if it's changed or if we're adding a new
 								// group. This prevents existing group members being updated if no changes
 								// were made.
+								// However there are some attributes that need to be set everytime,
+								// otherwise the group gets removed from the feature.
+								$set_attributes = array('legend', 'teampage');
 
 								$group_attributes = array();
 								$test_variables = array(
@@ -580,13 +587,14 @@ class ucp_groups
 									'avatar_height'	=> 'int',
 									'receive_pm'	=> 'int',
 									'legend'		=> 'int',
+									'teampage'		=> 'int',
 									'message_limit'	=> 'int',
 									'max_recipients'=> 'int',
 								);
 
 								foreach ($test_variables as $test => $type)
 								{
-									if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || isset($group_attributes['group_avatar']) && strpos($test, 'avatar') === 0))
+									if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test] || isset($group_attributes['group_avatar']) && strpos($test, 'avatar') === 0 || in_array($test, $set_attributes)))
 									{
 										settype($submit_ary[$test], $type);
 										$group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test];
@@ -596,6 +604,7 @@ class ucp_groups
 								if (!($error = group_create($group_id, $group_type, $group_name, $group_desc, $group_attributes, $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies)))
 								{
 									$cache->destroy('sql', GROUPS_TABLE);
+									$cache->destroy('sql', TEAMPAGE_TABLE);
 
 									$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
 									trigger_error($user->lang[$message] . $return_page);
-- 
cgit v1.2.1


From a839896ddd532268f96da25231efba0c0f311b29 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 17:02:45 +0200
Subject: [ticket/11481] Move feed factory to own file

PHPBB3-11481
---
 phpBB/includes/feed/factory.php | 104 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 phpBB/includes/feed/factory.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/factory.php b/phpBB/includes/feed/factory.php
new file mode 100644
index 0000000000..30a415cacb
--- /dev/null
+++ b/phpBB/includes/feed/factory.php
@@ -0,0 +1,104 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Factory class to return correct object
+* @package phpBB3
+*/
+class phpbb_feed_factory
+{
+	/**
+	* Return correct object for specified mode
+	*
+	* @param string	$mode		The feeds mode.
+	* @param int	$forum_id	Forum id specified by the script if forum feed provided.
+	* @param int	$topic_id	Topic id specified by the script if topic feed provided.
+	*
+	* @return object	Returns correct feeds object for specified mode.
+	*/
+	function init($mode, $forum_id, $topic_id)
+	{
+		global $config;
+
+		switch ($mode)
+		{
+			case 'forums':
+				if (!$config['feed_overall_forums'])
+				{
+					return false;
+				}
+
+				return new phpbb_feed_forums();
+			break;
+
+			case 'topics':
+			case 'topics_new':
+				if (!$config['feed_topics_new'])
+				{
+					return false;
+				}
+
+				return new phpbb_feed_topics();
+			break;
+
+			case 'topics_active':
+				if (!$config['feed_topics_active'])
+				{
+					return false;
+				}
+
+				return new phpbb_feed_topics_active();
+			break;
+
+			case 'news':
+				global $db;
+
+				// Get at least one news forum
+				$sql = 'SELECT forum_id
+					FROM ' . FORUMS_TABLE . '
+					WHERE ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_NEWS, '<> 0');
+				$result = $db->sql_query_limit($sql, 1, 0, 600);
+				$s_feed_news = (int) $db->sql_fetchfield('forum_id');
+				$db->sql_freeresult($result);
+
+				if (!$s_feed_news)
+				{
+					return false;
+				}
+
+				return new phpbb_feed_news();
+			break;
+
+			default:
+				if ($topic_id && $config['feed_topic'])
+				{
+					return new phpbb_feed_topic($topic_id);
+				}
+				else if ($forum_id && $config['feed_forum'])
+				{
+					return new phpbb_feed_forum($forum_id);
+				}
+				else if ($config['feed_overall'])
+				{
+					return new phpbb_feed_overall();
+				}
+
+				return false;
+			break;
+		}
+	}
+}
-- 
cgit v1.2.1


From 2916ddc38c964992b44fd5be50963521f59c1858 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 17:03:10 +0200
Subject: [ticket/11481] Move feed base to own file

PHPBB3-11481
---
 phpBB/includes/feed/base.php | 230 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 230 insertions(+)
 create mode 100644 phpBB/includes/feed/base.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/base.php b/phpBB/includes/feed/base.php
new file mode 100644
index 0000000000..300ccf9b1e
--- /dev/null
+++ b/phpBB/includes/feed/base.php
@@ -0,0 +1,230 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base class with some generic functions and settings.
+*
+* @package phpBB3
+*/
+abstract class phpbb_feed_base
+{
+	/**
+	* SQL Query to be executed to get feed items
+	*/
+	var $sql = array();
+
+	/**
+	* Keys specified for retrieval of title, content, etc.
+	*/
+	var $keys = array();
+
+	/**
+	* Number of items to fetch. Usually overwritten by $config['feed_something']
+	*/
+	var $num_items = 15;
+
+	/**
+	* Separator for title elements to separate items (for example forum / topic)
+	*/
+	var $separator = "\xE2\x80\xA2"; // &bull;
+
+	/**
+	* Separator for the statistics row (Posted by, post date, replies, etc.)
+	*/
+	var $separator_stats = "\xE2\x80\x94"; // &mdash;
+
+	/**
+	* Constructor
+	*/
+	function __construct()
+	{
+		global $config;
+
+		$this->set_keys();
+
+		// Allow num_items to be string
+		if (is_string($this->num_items))
+		{
+			$this->num_items = (int) $config[$this->num_items];
+
+			// A precaution
+			if (!$this->num_items)
+			{
+				$this->num_items = 10;
+			}
+		}
+	}
+
+	/**
+	* Set keys.
+	*/
+	function set_keys()
+	{
+	}
+
+	/**
+	* Open feed
+	*/
+	function open()
+	{
+	}
+
+	/**
+	* Close feed
+	*/
+	function close()
+	{
+		global $db;
+
+		if (!empty($this->result))
+		{
+			$db->sql_freeresult($this->result);
+		}
+	}
+
+	/**
+	* Set key
+	*/
+	function set($key, $value)
+	{
+		$this->keys[$key] = $value;
+	}
+
+	/**
+	* Get key
+	*/
+	function get($key)
+	{
+		return (isset($this->keys[$key])) ? $this->keys[$key] : NULL;
+	}
+
+	function get_readable_forums()
+	{
+		global $auth;
+		static $forum_ids;
+
+		if (!isset($forum_ids))
+		{
+			$forum_ids = array_keys($auth->acl_getf('f_read', true));
+		}
+
+		return $forum_ids;
+	}
+
+	function get_moderator_approve_forums()
+	{
+		global $auth;
+		static $forum_ids;
+
+		if (!isset($forum_ids))
+		{
+			$forum_ids = array_keys($auth->acl_getf('m_approve', true));
+		}
+
+		return $forum_ids;
+	}
+
+	function is_moderator_approve_forum($forum_id)
+	{
+		static $forum_ids;
+
+		if (!isset($forum_ids))
+		{
+			$forum_ids = array_flip($this->get_moderator_approve_forums());
+		}
+
+		return (isset($forum_ids[$forum_id])) ? true : false;
+	}
+
+	function get_excluded_forums()
+	{
+		global $db, $cache;
+		static $forum_ids;
+
+		// Matches acp/acp_board.php
+		$cache_name	= 'feed_excluded_forum_ids';
+
+		if (!isset($forum_ids) && ($forum_ids = $cache->get('_' . $cache_name)) === false)
+		{
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_EXCLUDE, '<> 0');
+			$result = $db->sql_query($sql);
+
+			$forum_ids = array();
+			while ($forum_id = (int) $db->sql_fetchfield('forum_id'))
+			{
+				$forum_ids[$forum_id] = $forum_id;
+			}
+			$db->sql_freeresult($result);
+
+			$cache->put('_' . $cache_name, $forum_ids);
+		}
+
+		return $forum_ids;
+	}
+
+	function is_excluded_forum($forum_id)
+	{
+		$forum_ids = $this->get_excluded_forums();
+
+		return isset($forum_ids[$forum_id]) ? true : false;
+	}
+
+	function get_passworded_forums()
+	{
+		global $user;
+
+		return $user->get_passworded_forums();
+	}
+
+	function get_item()
+	{
+		global $db, $cache;
+		static $result;
+
+		if (!isset($result))
+		{
+			if (!$this->get_sql())
+			{
+				return false;
+			}
+
+			// Query database
+			$sql = $db->sql_build_query('SELECT', $this->sql);
+			$result = $db->sql_query_limit($sql, $this->num_items);
+		}
+
+		return $db->sql_fetchrow($result);
+	}
+
+	function user_viewprofile($row)
+	{
+		global $phpEx, $user;
+
+		$author_id = (int) $row[$this->get('author_id')];
+
+		if ($author_id == ANONYMOUS)
+		{
+			// Since we cannot link to a profile, we just return GUEST
+			// instead of $row['username']
+			return $user->lang['GUEST'];
+		}
+
+		return '<a href="' . feed_append_sid('/memberlist.' . $phpEx, 'mode=viewprofile&amp;u=' . $author_id) . '">' . $row[$this->get('creator')] . '</a>';
+	}
+}
-- 
cgit v1.2.1


From 06a51b09f1414f350b0c199a7c79b81a96bb98a7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 17:03:40 +0200
Subject: [ticket/11481] Move feed post base to own file

PHPBB3-11481
---
 phpBB/includes/feed/post_base.php | 59 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 phpBB/includes/feed/post_base.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/post_base.php b/phpBB/includes/feed/post_base.php
new file mode 100644
index 0000000000..5af30f686b
--- /dev/null
+++ b/phpBB/includes/feed/post_base.php
@@ -0,0 +1,59 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Abstract class for post based feeds
+*
+* @package phpBB3
+*/
+abstract class phpbb_feed_post_base extends phpbb_feed_base
+{
+	var $num_items = 'feed_limit_post';
+
+	function set_keys()
+	{
+		$this->set('title',		'post_subject');
+		$this->set('title2',	'topic_title');
+
+		$this->set('author_id',	'user_id');
+		$this->set('creator',	'username');
+		$this->set('published',	'post_time');
+		$this->set('updated',	'post_edit_time');
+		$this->set('text',		'post_text');
+
+		$this->set('bitfield',	'bbcode_bitfield');
+		$this->set('bbcode_uid','bbcode_uid');
+
+		$this->set('enable_bbcode',		'enable_bbcode');
+		$this->set('enable_smilies',	'enable_smilies');
+		$this->set('enable_magic_url',	'enable_magic_url');
+	}
+
+	function adjust_item(&$item_row, &$row)
+	{
+		global $phpEx, $config, $user;
+
+		$item_row['link'] = feed_append_sid('/viewtopic.' . $phpEx, "t={$row['topic_id']}&amp;p={$row['post_id']}#p{$row['post_id']}");
+
+		if ($config['feed_item_statistics'])
+		{
+			$item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
+				. ' ' . $this->separator_stats . ' ' . $user->format_date($row[$this->get('published')])
+				. (($this->is_moderator_approve_forum($row['forum_id']) && !$row['post_approved']) ? ' ' . $this->separator_stats . ' ' . $user->lang['POST_UNAPPROVED'] : '');
+		}
+	}
+}
-- 
cgit v1.2.1


From f592072b4b6253914dde4342ec163c6b427c58b2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 17:04:05 +0200
Subject: [ticket/11481] Move feed topic base to own file

PHPBB3-11481
---
 phpBB/includes/feed/topic_base.php | 61 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 phpBB/includes/feed/topic_base.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/topic_base.php b/phpBB/includes/feed/topic_base.php
new file mode 100644
index 0000000000..353b9cac15
--- /dev/null
+++ b/phpBB/includes/feed/topic_base.php
@@ -0,0 +1,61 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Abstract class for topic based feeds
+*
+* @package phpBB3
+*/
+abstract class phpbb_feed_topic_base extends phpbb_feed_base
+{
+	var $num_items = 'feed_limit_topic';
+
+	function set_keys()
+	{
+		$this->set('title',		'topic_title');
+		$this->set('title2',	'forum_name');
+
+		$this->set('author_id',	'topic_poster');
+		$this->set('creator',	'topic_first_poster_name');
+		$this->set('published',	'post_time');
+		$this->set('updated',	'post_edit_time');
+		$this->set('text',		'post_text');
+
+		$this->set('bitfield',	'bbcode_bitfield');
+		$this->set('bbcode_uid','bbcode_uid');
+
+		$this->set('enable_bbcode',		'enable_bbcode');
+		$this->set('enable_smilies',	'enable_smilies');
+		$this->set('enable_magic_url',	'enable_magic_url');
+	}
+
+	function adjust_item(&$item_row, &$row)
+	{
+		global $phpEx, $config, $user;
+
+		$item_row['link'] = feed_append_sid('/viewtopic.' . $phpEx, 't=' . $row['topic_id'] . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']);
+
+		if ($config['feed_item_statistics'])
+		{
+			$item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
+				. ' ' . $this->separator_stats . ' ' . $user->format_date($row[$this->get('published')])
+				. ' ' . $this->separator_stats . ' ' . $user->lang['REPLIES'] . ' ' . (($this->is_moderator_approve_forum($row['forum_id'])) ? $row['topic_replies_real'] : $row['topic_replies'])
+				. ' ' . $this->separator_stats . ' ' . $user->lang['VIEWS'] . ' ' . $row['topic_views']
+				. (($this->is_moderator_approve_forum($row['forum_id']) && ($row['topic_replies_real'] != $row['topic_replies'])) ? ' ' . $this->separator_stats . ' ' . $user->lang['POSTS_UNAPPROVED'] : '');
+		}
+	}
+}
-- 
cgit v1.2.1


From a995deb1897f3b6e21b3915c801835a9aac0663a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 17:04:37 +0200
Subject: [ticket/11481] Move overall feed to own file

PHPBB3-11481
---
 phpBB/includes/feed/overall.php | 99 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 phpBB/includes/feed/overall.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/overall.php b/phpBB/includes/feed/overall.php
new file mode 100644
index 0000000000..630f67660a
--- /dev/null
+++ b/phpBB/includes/feed/overall.php
@@ -0,0 +1,99 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Board wide feed (aka overall feed)
+*
+* This will give you the newest {$this->num_items} posts
+* from the whole board.
+*
+* @package phpBB3
+*/
+class phpbb_feed_overall extends phpbb_feed_post_base
+{
+	function get_sql()
+	{
+		global $auth, $db;
+
+		$forum_ids = array_diff($this->get_readable_forums(), $this->get_excluded_forums(), $this->get_passworded_forums());
+		if (empty($forum_ids))
+		{
+			return false;
+		}
+
+		// m_approve forums
+		$fid_m_approve = $this->get_moderator_approve_forums();
+		$sql_m_approve = (!empty($fid_m_approve)) ? 'OR ' . $db->sql_in_set('forum_id', $fid_m_approve) : '';
+
+		// Determine topics with recent activity
+		$sql = 'SELECT topic_id, topic_last_post_time
+			FROM ' . TOPICS_TABLE . '
+			WHERE ' . $db->sql_in_set('forum_id', $forum_ids) . '
+				AND topic_moved_id = 0
+				AND (topic_approved = 1
+					' . $sql_m_approve . ')
+			ORDER BY topic_last_post_time DESC';
+		$result = $db->sql_query_limit($sql, $this->num_items);
+
+		$topic_ids = array();
+		$min_post_time = 0;
+		while ($row = $db->sql_fetchrow())
+		{
+			$topic_ids[] = (int) $row['topic_id'];
+
+			$min_post_time = (int) $row['topic_last_post_time'];
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($topic_ids))
+		{
+			return false;
+		}
+
+		// Get the actual data
+		$this->sql = array(
+			'SELECT'	=>	'f.forum_id, f.forum_name, ' .
+							'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
+							'u.username, u.user_id',
+			'FROM'		=> array(
+				USERS_TABLE		=> 'u',
+				POSTS_TABLE		=> 'p',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(FORUMS_TABLE	=> 'f'),
+					'ON'	=> 'f.forum_id = p.forum_id',
+				),
+			),
+			'WHERE'		=> $db->sql_in_set('p.topic_id', $topic_ids) . '
+							AND (p.post_approved = 1
+								' . str_replace('forum_id', 'p.forum_id', $sql_m_approve) . ')
+							AND p.post_time >= ' . $min_post_time . '
+							AND u.user_id = p.poster_id',
+			'ORDER_BY'	=> 'p.post_time DESC',
+		);
+
+		return true;
+	}
+
+	function adjust_item(&$item_row, &$row)
+	{
+		parent::adjust_item($item_row, $row);
+
+		$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
+	}
+}
-- 
cgit v1.2.1


From d94ec8faab1b6c7e776d6ff24b91dd9d0a7a7cf8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 17:04:57 +0200
Subject: [ticket/11481] Move forum feed to own file

PHPBB3-11481
---
 phpBB/includes/feed/forum.php | 145 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 phpBB/includes/feed/forum.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/forum.php b/phpBB/includes/feed/forum.php
new file mode 100644
index 0000000000..d625751ec3
--- /dev/null
+++ b/phpBB/includes/feed/forum.php
@@ -0,0 +1,145 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Forum feed
+*
+* This will give you the last {$this->num_items} posts made
+* within a specific forum.
+*
+* @package phpBB3
+*/
+class phpbb_feed_forum extends phpbb_feed_post_base
+{
+	var $forum_id		= 0;
+	var $forum_data		= array();
+
+	function __construct($forum_id)
+	{
+		parent::__construct();
+
+		$this->forum_id = (int) $forum_id;
+	}
+
+	function open()
+	{
+		global $db, $auth;
+
+		// Check if forum exists
+		$sql = 'SELECT forum_id, forum_name, forum_password, forum_type, forum_options
+			FROM ' . FORUMS_TABLE . '
+			WHERE forum_id = ' . $this->forum_id;
+		$result = $db->sql_query($sql);
+		$this->forum_data = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		if (empty($this->forum_data))
+		{
+			trigger_error('NO_FORUM');
+		}
+
+		// Forum needs to be postable
+		if ($this->forum_data['forum_type'] != FORUM_POST)
+		{
+			trigger_error('NO_FEED');
+		}
+
+		// Make sure forum is not excluded from feed
+		if (phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $this->forum_data['forum_options']))
+		{
+			trigger_error('NO_FEED');
+		}
+
+		// Make sure we can read this forum
+		if (!$auth->acl_get('f_read', $this->forum_id))
+		{
+			trigger_error('SORRY_AUTH_READ');
+		}
+
+		// Make sure forum is not passworded or user is authed
+		if ($this->forum_data['forum_password'])
+		{
+			$forum_ids_passworded = $this->get_passworded_forums();
+
+			if (isset($forum_ids_passworded[$this->forum_id]))
+			{
+				trigger_error('SORRY_AUTH_READ');
+			}
+
+			unset($forum_ids_passworded);
+		}
+	}
+
+	function get_sql()
+	{
+		global $auth, $db;
+
+		$m_approve = ($auth->acl_get('m_approve', $this->forum_id)) ? true : false;
+
+		// Determine topics with recent activity
+		$sql = 'SELECT topic_id, topic_last_post_time
+			FROM ' . TOPICS_TABLE . '
+			WHERE forum_id = ' . $this->forum_id . '
+				AND topic_moved_id = 0
+				' . ((!$m_approve) ? 'AND topic_approved = 1' : '') . '
+			ORDER BY topic_last_post_time DESC';
+		$result = $db->sql_query_limit($sql, $this->num_items);
+
+		$topic_ids = array();
+		$min_post_time = 0;
+		while ($row = $db->sql_fetchrow())
+		{
+			$topic_ids[] = (int) $row['topic_id'];
+
+			$min_post_time = (int) $row['topic_last_post_time'];
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($topic_ids))
+		{
+			return false;
+		}
+
+		$this->sql = array(
+			'SELECT'	=>	'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
+							'u.username, u.user_id',
+			'FROM'		=> array(
+				POSTS_TABLE		=> 'p',
+				USERS_TABLE		=> 'u',
+			),
+			'WHERE'		=> $db->sql_in_set('p.topic_id', $topic_ids) . '
+							' . ((!$m_approve) ? 'AND p.post_approved = 1' : '') . '
+							AND p.post_time >= ' . $min_post_time . '
+							AND p.poster_id = u.user_id',
+			'ORDER_BY'	=> 'p.post_time DESC',
+		);
+
+		return true;
+	}
+
+	function adjust_item(&$item_row, &$row)
+	{
+		parent::adjust_item($item_row, $row);
+
+		$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
+	}
+
+	function get_item()
+	{
+		return ($row = parent::get_item()) ? array_merge($this->forum_data, $row) : $row;
+	}
+}
-- 
cgit v1.2.1


From ffdb5c9388f345ee63c2df573638b267f091f033 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 17:05:22 +0200
Subject: [ticket/11481] Move topic feed to own file

PHPBB3-11481
---
 phpBB/includes/feed/topic.php | 114 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 phpBB/includes/feed/topic.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/topic.php b/phpBB/includes/feed/topic.php
new file mode 100644
index 0000000000..eb77eddb5c
--- /dev/null
+++ b/phpBB/includes/feed/topic.php
@@ -0,0 +1,114 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Topic feed for a specific topic
+*
+* This will give you the last {$this->num_items} posts made within this topic.
+*
+* @package phpBB3
+*/
+class phpbb_feed_topic extends phpbb_feed_post_base
+{
+	var $topic_id		= 0;
+	var $forum_id		= 0;
+	var $topic_data		= array();
+
+	function __construct($topic_id)
+	{
+		parent::__construct();
+
+		$this->topic_id = (int) $topic_id;
+	}
+
+	function open()
+	{
+		global $auth, $db, $user;
+
+		$sql = 'SELECT f.forum_options, f.forum_password, t.topic_id, t.forum_id, t.topic_approved, t.topic_title, t.topic_time, t.topic_views, t.topic_replies, t.topic_type
+			FROM ' . TOPICS_TABLE . ' t
+			LEFT JOIN ' . FORUMS_TABLE . ' f
+				ON (f.forum_id = t.forum_id)
+			WHERE t.topic_id = ' . $this->topic_id;
+		$result = $db->sql_query($sql);
+		$this->topic_data = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		if (empty($this->topic_data))
+		{
+			trigger_error('NO_TOPIC');
+		}
+
+		$this->forum_id = (int) $this->topic_data['forum_id'];
+
+		// Make sure topic is either approved or user authed
+		if (!$this->topic_data['topic_approved'] && !$auth->acl_get('m_approve', $this->forum_id))
+		{
+			trigger_error('SORRY_AUTH_READ');
+		}
+
+		// Make sure forum is not excluded from feed
+		if (phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $this->topic_data['forum_options']))
+		{
+			trigger_error('NO_FEED');
+		}
+
+		// Make sure we can read this forum
+		if (!$auth->acl_get('f_read', $this->forum_id))
+		{
+			trigger_error('SORRY_AUTH_READ');
+		}
+
+		// Make sure forum is not passworded or user is authed
+		if ($this->topic_data['forum_password'])
+		{
+			$forum_ids_passworded = $this->get_passworded_forums();
+
+			if (isset($forum_ids_passworded[$this->forum_id]))
+			{
+				trigger_error('SORRY_AUTH_READ');
+			}
+
+			unset($forum_ids_passworded);
+		}
+	}
+
+	function get_sql()
+	{
+		global $auth, $db;
+
+		$this->sql = array(
+			'SELECT'	=>	'p.post_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
+							'u.username, u.user_id',
+			'FROM'		=> array(
+				POSTS_TABLE		=> 'p',
+				USERS_TABLE		=> 'u',
+			),
+			'WHERE'		=> 'p.topic_id = ' . $this->topic_id . '
+								' . ($this->forum_id && !$auth->acl_get('m_approve', $this->forum_id) ? 'AND p.post_approved = 1' : '') . '
+								AND p.poster_id = u.user_id',
+			'ORDER_BY'	=> 'p.post_time DESC',
+		);
+
+		return true;
+	}
+
+	function get_item()
+	{
+		return ($row = parent::get_item()) ? array_merge($this->topic_data, $row) : $row;
+	}
+}
-- 
cgit v1.2.1


From caf7c45fb4c63eb138078a8d6c2da270d2dba935 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 17:05:41 +0200
Subject: [ticket/11481] Move forums feed to own file

PHPBB3-11481
---
 phpBB/includes/feed/forums.php | 78 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 phpBB/includes/feed/forums.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/forums.php b/phpBB/includes/feed/forums.php
new file mode 100644
index 0000000000..f1c3e3531f
--- /dev/null
+++ b/phpBB/includes/feed/forums.php
@@ -0,0 +1,78 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* 'All Forums' feed
+*
+* This will give you a list of all postable forums where feeds are enabled
+* including forum description, topic stats and post stats
+*
+* @package phpBB3
+*/
+class phpbb_feed_forums extends phpbb_feed_base
+{
+	var $num_items	= 0;
+
+	function set_keys()
+	{
+		$this->set('title',		'forum_name');
+		$this->set('text',		'forum_desc');
+		$this->set('bitfield',	'forum_desc_bitfield');
+		$this->set('bbcode_uid','forum_desc_uid');
+		$this->set('updated',	'forum_last_post_time');
+		$this->set('options',	'forum_desc_options');
+	}
+
+	function get_sql()
+	{
+		global $auth, $db;
+
+		$in_fid_ary = array_diff($this->get_readable_forums(), $this->get_excluded_forums());
+		if (empty($in_fid_ary))
+		{
+			return false;
+		}
+
+		// Build SQL Query
+		$this->sql = array(
+			'SELECT'	=> 'f.forum_id, f.left_id, f.forum_name, f.forum_last_post_time,
+							f.forum_desc, f.forum_desc_bitfield, f.forum_desc_uid, f.forum_desc_options,
+							f.forum_topics, f.forum_posts',
+			'FROM'		=> array(FORUMS_TABLE => 'f'),
+			'WHERE'		=> 'f.forum_type = ' . FORUM_POST . '
+							AND ' . $db->sql_in_set('f.forum_id', $in_fid_ary),
+			'ORDER_BY'	=> 'f.left_id ASC',
+		);
+
+		return true;
+	}
+
+	function adjust_item(&$item_row, &$row)
+	{
+		global $phpEx, $config;
+
+		$item_row['link'] = feed_append_sid('/viewforum.' . $phpEx, 'f=' . $row['forum_id']);
+
+		if ($config['feed_item_statistics'])
+		{
+			global $user;
+
+			$item_row['statistics'] = $user->lang('TOTAL_TOPICS', (int) $row['forum_topics'])
+				. ' ' . $this->separator_stats . ' ' . $user->lang('TOTAL_POSTS_COUNT', (int) $row['forum_posts']);
+		}
+	}
+}
-- 
cgit v1.2.1


From 3e30c731b51178a4e8d6dec2a6643b65d616b2a5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 17:05:59 +0200
Subject: [ticket/11481] Move news feed to own file

PHPBB3-11481
---
 phpBB/includes/feed/news.php | 115 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 phpBB/includes/feed/news.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/news.php b/phpBB/includes/feed/news.php
new file mode 100644
index 0000000000..12deb69ae4
--- /dev/null
+++ b/phpBB/includes/feed/news.php
@@ -0,0 +1,115 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* News feed
+*
+* This will give you {$this->num_items} first posts
+* of all topics in the selected news forums.
+*
+* @package phpBB3
+*/
+class phpbb_feed_news extends phpbb_feed_topic_base
+{
+	function get_news_forums()
+	{
+		global $db, $cache;
+		static $forum_ids;
+
+		// Matches acp/acp_board.php
+		$cache_name	= 'feed_news_forum_ids';
+
+		if (!isset($forum_ids) && ($forum_ids = $cache->get('_' . $cache_name)) === false)
+		{
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_NEWS, '<> 0');
+			$result = $db->sql_query($sql);
+
+			$forum_ids = array();
+			while ($forum_id = (int) $db->sql_fetchfield('forum_id'))
+			{
+				$forum_ids[$forum_id] = $forum_id;
+			}
+			$db->sql_freeresult($result);
+
+			$cache->put('_' . $cache_name, $forum_ids);
+		}
+
+		return $forum_ids;
+	}
+
+	function get_sql()
+	{
+		global $auth, $config, $db;
+
+		// Determine forum ids
+		$in_fid_ary = array_intersect($this->get_news_forums(), $this->get_readable_forums());
+		if (empty($in_fid_ary))
+		{
+			return false;
+		}
+
+		$in_fid_ary = array_diff($in_fid_ary, $this->get_passworded_forums());
+		if (empty($in_fid_ary))
+		{
+			return false;
+		}
+
+		// We really have to get the post ids first!
+		$sql = 'SELECT topic_first_post_id, topic_time
+			FROM ' . TOPICS_TABLE . '
+			WHERE ' . $db->sql_in_set('forum_id', $in_fid_ary) . '
+				AND topic_moved_id = 0
+				AND topic_approved = 1
+			ORDER BY topic_time DESC';
+		$result = $db->sql_query_limit($sql, $this->num_items);
+
+		$post_ids = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$post_ids[] = (int) $row['topic_first_post_id'];
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($post_ids))
+		{
+			return false;
+		}
+
+		$this->sql = array(
+			'SELECT'	=> 'f.forum_id, f.forum_name,
+							t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_replies, t.topic_replies_real, t.topic_views, t.topic_time, t.topic_last_post_time,
+							p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
+			'FROM'		=> array(
+				TOPICS_TABLE	=> 't',
+				POSTS_TABLE		=> 'p',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(FORUMS_TABLE => 'f'),
+					'ON'	=> 'p.forum_id = f.forum_id',
+				),
+			),
+			'WHERE'		=> 'p.topic_id = t.topic_id
+							AND ' . $db->sql_in_set('p.post_id', $post_ids),
+			'ORDER_BY'	=> 'p.post_time DESC',
+		);
+
+		return true;
+	}
+}
-- 
cgit v1.2.1


From 65a527f87744ccc4b02c7fecb98a565c59f76d39 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 17:06:24 +0200
Subject: [ticket/11481] Move topics feed to own file

PHPBB3-11481
---
 phpBB/includes/feed/topics.php | 93 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 phpBB/includes/feed/topics.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/topics.php b/phpBB/includes/feed/topics.php
new file mode 100644
index 0000000000..7cd557ffcc
--- /dev/null
+++ b/phpBB/includes/feed/topics.php
@@ -0,0 +1,93 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* New Topics feed
+*
+* This will give you the last {$this->num_items} created topics
+* including the first post.
+*
+* @package phpBB3
+*/
+class phpbb_feed_topics extends phpbb_feed_topic_base
+{
+	function get_sql()
+	{
+		global $db, $config;
+
+		$forum_ids_read = $this->get_readable_forums();
+		if (empty($forum_ids_read))
+		{
+			return false;
+		}
+
+		$in_fid_ary = array_diff($forum_ids_read, $this->get_excluded_forums(), $this->get_passworded_forums());
+		if (empty($in_fid_ary))
+		{
+			return false;
+		}
+
+		// We really have to get the post ids first!
+		$sql = 'SELECT topic_first_post_id, topic_time
+			FROM ' . TOPICS_TABLE . '
+			WHERE ' . $db->sql_in_set('forum_id', $in_fid_ary) . '
+				AND topic_moved_id = 0
+				AND topic_approved = 1
+			ORDER BY topic_time DESC';
+		$result = $db->sql_query_limit($sql, $this->num_items);
+
+		$post_ids = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$post_ids[] = (int) $row['topic_first_post_id'];
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($post_ids))
+		{
+			return false;
+		}
+
+		$this->sql = array(
+			'SELECT'	=> 'f.forum_id, f.forum_name,
+							t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_replies, t.topic_replies_real, t.topic_views, t.topic_time, t.topic_last_post_time,
+							p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
+			'FROM'		=> array(
+				TOPICS_TABLE	=> 't',
+				POSTS_TABLE		=> 'p',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(FORUMS_TABLE => 'f'),
+					'ON'	=> 'p.forum_id = f.forum_id',
+				),
+			),
+			'WHERE'		=> 'p.topic_id = t.topic_id
+							AND ' . $db->sql_in_set('p.post_id', $post_ids),
+			'ORDER_BY'	=> 'p.post_time DESC',
+		);
+
+		return true;
+	}
+
+	function adjust_item(&$item_row, &$row)
+	{
+		parent::adjust_item($item_row, $row);
+
+		$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
+	}
+}
-- 
cgit v1.2.1


From b25af0fa683c84db1bea5b32953aa5a6e178b878 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 17:06:52 +0200
Subject: [ticket/11481] Move active topics feed to own file

PHPBB3-11481
---
 phpBB/includes/feed/topics_active.php | 139 ++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 phpBB/includes/feed/topics_active.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/topics_active.php b/phpBB/includes/feed/topics_active.php
new file mode 100644
index 0000000000..36b6bcb1a2
--- /dev/null
+++ b/phpBB/includes/feed/topics_active.php
@@ -0,0 +1,139 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Active Topics feed
+*
+* This will give you the last {$this->num_items} topics
+* with replies made withing the last {$this->sort_days} days
+* including the last post.
+*
+* @package phpBB3
+*/
+class phpbb_feed_topics_active extends phpbb_feed_topic_base
+{
+	var $sort_days = 7;
+
+	function set_keys()
+	{
+		parent::set_keys();
+
+		$this->set('author_id',	'topic_last_poster_id');
+		$this->set('creator',	'topic_last_poster_name');
+	}
+
+	function get_sql()
+	{
+		global $db, $config;
+
+		$forum_ids_read = $this->get_readable_forums();
+		if (empty($forum_ids_read))
+		{
+			return false;
+		}
+
+		$in_fid_ary = array_intersect($forum_ids_read, $this->get_forum_ids());
+		$in_fid_ary = array_diff($in_fid_ary, $this->get_passworded_forums());
+		if (empty($in_fid_ary))
+		{
+			return false;
+		}
+
+		// Search for topics in last X days
+		$last_post_time_sql = ($this->sort_days) ? ' AND topic_last_post_time > ' . (time() - ($this->sort_days * 24 * 3600)) : '';
+
+		// We really have to get the post ids first!
+		$sql = 'SELECT topic_last_post_id, topic_last_post_time
+			FROM ' . TOPICS_TABLE . '
+			WHERE ' . $db->sql_in_set('forum_id', $in_fid_ary) . '
+				AND topic_moved_id = 0
+				AND topic_approved = 1
+				' . $last_post_time_sql . '
+			ORDER BY topic_last_post_time DESC';
+		$result = $db->sql_query_limit($sql, $this->num_items);
+
+		$post_ids = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$post_ids[] = (int) $row['topic_last_post_id'];
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($post_ids))
+		{
+			return false;
+		}
+
+		$this->sql = array(
+			'SELECT'	=> 'f.forum_id, f.forum_name,
+							t.topic_id, t.topic_title, t.topic_replies, t.topic_replies_real, t.topic_views,
+							t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_post_time,
+							p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
+			'FROM'		=> array(
+				TOPICS_TABLE	=> 't',
+				POSTS_TABLE		=> 'p',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(FORUMS_TABLE => 'f'),
+					'ON'	=> 'p.forum_id = f.forum_id',
+				),
+			),
+			'WHERE'		=> 'p.topic_id = t.topic_id
+							AND ' . $db->sql_in_set('p.post_id', $post_ids),
+			'ORDER_BY'	=> 'p.post_time DESC',
+		);
+
+		return true;
+	}
+
+	function get_forum_ids()
+	{
+		global $db, $cache;
+		static $forum_ids;
+
+		$cache_name	= 'feed_topic_active_forum_ids';
+
+		if (!isset($forum_ids) && ($forum_ids = $cache->get('_' . $cache_name)) === false)
+		{
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type = ' . FORUM_POST . '
+					AND ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_EXCLUDE, '= 0') . '
+					AND ' . $db->sql_bit_and('forum_flags', log(FORUM_FLAG_ACTIVE_TOPICS, 2), '<> 0');
+			$result = $db->sql_query($sql);
+
+			$forum_ids = array();
+			while ($forum_id = (int) $db->sql_fetchfield('forum_id'))
+			{
+				$forum_ids[$forum_id] = $forum_id;
+			}
+			$db->sql_freeresult($result);
+
+			$cache->put('_' . $cache_name, $forum_ids, 180);
+		}
+
+		return $forum_ids;
+	}
+
+	function adjust_item(&$item_row, &$row)
+	{
+		parent::adjust_item($item_row, $row);
+
+		$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
+	}
+}
-- 
cgit v1.2.1


From b5f148474450e6101e25ee0afbd04d945d21083d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 19:35:36 +0200
Subject: [ticket/11481] Move functions from feed into helper class

PHPBB3-11481
---
 phpBB/includes/feed/helper.php | 159 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 phpBB/includes/feed/helper.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/helper.php b/phpBB/includes/feed/helper.php
new file mode 100644
index 0000000000..20a399bcd7
--- /dev/null
+++ b/phpBB/includes/feed/helper.php
@@ -0,0 +1,159 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Class with some helpful functions used in feeds
+* @package phpBB3
+*/
+class phpbb_feed_helper
+{
+	/** @var phpbb_config */
+	protected $config;
+
+	/** @var phpbb_user */
+	protected $user;
+
+	/** @var string */
+	protected $phpbb_root_path;
+
+	/**
+	* Constructor
+	*
+	* @param	phpbb_config	$config		Config object
+	* @param	phpbb_user		$user		User object
+	* @param	string	$phpbb_root_path	Root path
+	* @return	null
+	*/
+	public function __construct(phpbb_config $config, phpbb_user $user, $phpbb_root_path)
+	{
+		$this->config = $config;
+		$this->user = $user;
+		$this->phpbb_root_path = $phpbb_root_path;
+	}
+
+	/**
+	* Run links through append_sid(), prepend generate_board_url() and remove session id
+	*/
+	public function get_board_url()
+	{
+		static $board_url;
+
+		if (empty($board_url))
+		{
+			$board_url = generate_board_url();
+		}
+
+		return $board_url;
+	}
+
+	/**
+	* Run links through append_sid(), prepend generate_board_url() and remove session id
+	*/
+	public function append_sid($url, $params)
+	{
+		return append_sid($this->get_board_url() . $url, $params, true, '');
+	}
+
+	/**
+	* Generate ISO 8601 date string (RFC 3339)
+	*/
+	public function format_date($time)
+	{
+		static $zone_offset;
+		static $offset_string;
+
+		if (empty($offset_string))
+		{
+			$zone_offset = $this->user->create_datetime()->getOffset();
+			$offset_string = phpbb_format_timezone_offset($zone_offset);
+		}
+
+		return gmdate("Y-m-d\TH:i:s", $time + $zone_offset) . $offset_string;
+	}
+
+	/**
+	* Generate text content
+	*/
+	public function generate_content($content, $uid, $bitfield, $options)
+	{
+		if (empty($content))
+		{
+			return '';
+		}
+
+		// Prepare some bbcodes for better parsing
+		$content	= preg_replace("#\[quote(=&quot;.*?&quot;)?:$uid\]\s*(.*?)\s*\[/quote:$uid\]#si", "[quote$1:$uid]<br />$2<br />[/quote:$uid]", $content);
+
+		$content = generate_text_for_display($content, $uid, $bitfield, $options);
+
+		// Add newlines
+		$content = str_replace('<br />', '<br />' . "\n", $content);
+
+		// Convert smiley Relative paths to Absolute path, Windows style
+		$content = str_replace($this->phpbb_root_path . $this->config['smilies_path'], $this->get_board_url() . '/' . $this->config['smilies_path'], $content);
+
+		// Remove "Select all" link and mouse events
+		$content = str_replace('<a href="#" onclick="selectCode(this); return false;">' . $this->user->lang['SELECT_ALL_CODE'] . '</a>', '', $content);
+		$content = preg_replace('#(onkeypress|onclick)="(.*?)"#si', '', $content);
+
+		// Firefox does not support CSS for feeds, though
+
+		// Remove font sizes
+	//	$content = preg_replace('#<span style="font-size: [0-9]+%; line-height: [0-9]+%;">([^>]+)</span>#iU', '\1', $content);
+
+		// Make text strong :P
+	//	$content = preg_replace('#<span style="font-weight: bold?">(.*?)</span>#iU', '<strong>\1</strong>', $content);
+
+		// Italic
+	//	$content = preg_replace('#<span style="font-style: italic?">([^<]+)</span>#iU', '<em>\1</em>', $content);
+
+		// Underline
+	//	$content = preg_replace('#<span style="text-decoration: underline?">([^<]+)</span>#iU', '<u>\1</u>', $content);
+
+		// Remove embed Windows Media Streams
+		$content	= preg_replace( '#<\!--\[if \!IE\]>-->([^[]+)<\!--<!\[endif\]-->#si', '', $content);
+
+		// Do not use &lt; and &gt;, because we want to retain code contained in [code][/code]
+
+		// Remove embed and objects
+		$content	= preg_replace( '#<(object|embed)(.*?) (value|src)=(.*?) ([^[]+)(object|embed)>#si',' <a href=$4 target="_blank"><strong>$1</strong></a> ',$content);
+
+		// Remove some specials html tag, because somewhere there are a mod to allow html tags ;)
+		$content	= preg_replace( '#<(script|iframe)([^[]+)\1>#siU', ' <strong>$1</strong> ', $content);
+
+		// Remove Comments from inline attachments [ia]
+		$content	= preg_replace('#<div class="(inline-attachment|attachtitle)">(.*?)<!-- ia(.*?) -->(.*?)<!-- ia(.*?) -->(.*?)</div>#si','$4',$content);
+
+		// Replace some entities with their unicode counterpart
+		$entities = array(
+			'&nbsp;'	=> "\xC2\xA0",
+			'&bull;'	=> "\xE2\x80\xA2",
+			'&middot;'	=> "\xC2\xB7",
+			'&copy;'	=> "\xC2\xA9",
+		);
+
+		$content = str_replace(array_keys($entities), array_values($entities), $content);
+
+		// Remove CDATA blocks. ;)
+		$content = preg_replace('#\<\!\[CDATA\[(.*?)\]\]\>#s', '', $content);
+
+		// Other control characters
+		$content = preg_replace('#(?:[\x00-\x1F\x7F]+|(?:\xC2[\x80-\x9F])+)#', '', $content);
+
+		return $content;
+	}
+}
-- 
cgit v1.2.1


From 3efe0eb24687a0e36e316b60887eff3ed45ae9b4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 20:04:23 +0200
Subject: [ticket/11481] Use container for all classes and inject dependencies

PHPBB3-11481
---
 phpBB/includes/feed/base.php       | 15 +++++++--
 phpBB/includes/feed/factory.php    | 69 ++++++++++++++++++++++++++------------
 phpBB/includes/feed/forum.php      | 12 +++++--
 phpBB/includes/feed/forums.php     |  2 +-
 phpBB/includes/feed/post_base.php  |  2 +-
 phpBB/includes/feed/topic.php      | 12 +++++--
 phpBB/includes/feed/topic_base.php |  2 +-
 7 files changed, 81 insertions(+), 33 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/base.php b/phpBB/includes/feed/base.php
index 300ccf9b1e..2ffd20d31a 100644
--- a/phpBB/includes/feed/base.php
+++ b/phpBB/includes/feed/base.php
@@ -22,6 +22,12 @@ if (!defined('IN_PHPBB'))
 */
 abstract class phpbb_feed_base
 {
+	/**
+	* Feed helper object
+	* @var phpbb_feed_helper
+	*/
+	protected $helper;
+
 	/**
 	* SQL Query to be executed to get feed items
 	*/
@@ -49,8 +55,11 @@ abstract class phpbb_feed_base
 
 	/**
 	* Constructor
+	*
+	* @param phpbb_feed_helper $helper Feed helper
+	* @return	null
 	*/
-	function __construct()
+	function __construct(phpbb_feed_helper $helper)
 	{
 		global $config;
 
@@ -67,6 +76,8 @@ abstract class phpbb_feed_base
 				$this->num_items = 10;
 			}
 		}
+
+		$this->helper = $helper;
 	}
 
 	/**
@@ -225,6 +236,6 @@ abstract class phpbb_feed_base
 			return $user->lang['GUEST'];
 		}
 
-		return '<a href="' . feed_append_sid('/memberlist.' . $phpEx, 'mode=viewprofile&amp;u=' . $author_id) . '">' . $row[$this->get('creator')] . '</a>';
+		return '<a href="' . $this->helper->append_sid('/memberlist.' . $phpEx, 'mode=viewprofile&amp;u=' . $author_id) . '">' . $row[$this->get('creator')] . '</a>';
 	}
 }
diff --git a/phpBB/includes/feed/factory.php b/phpBB/includes/feed/factory.php
index 30a415cacb..346cf9d870 100644
--- a/phpBB/includes/feed/factory.php
+++ b/phpBB/includes/feed/factory.php
@@ -21,6 +21,33 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_feed_factory
 {
+	/**
+	* Service container object
+	* @var object
+	*/
+	protected $container;
+
+	/** @var phpbb_config */
+	protected $config;
+
+	/** @var phpbb_db_driver */
+	protected $driver;
+
+	/**
+	* Constructor
+	*
+	* @param objec				$container	Container object
+	* @param phpbb_config		$config		Config object
+	* @param phpbb_db_driver	$db			Database connection
+	* @return	null
+	*/
+	public function __construct($container, phpbb_config $config, phpbb_db_driver $db)
+	{
+		$this->container = $container;
+		$this->config = $config;
+		$this->db = $db;
+	}
+
 	/**
 	* Return correct object for specified mode
 	*
@@ -30,71 +57,69 @@ class phpbb_feed_factory
 	*
 	* @return object	Returns correct feeds object for specified mode.
 	*/
-	function init($mode, $forum_id, $topic_id)
+	function get_feed($mode, $forum_id, $topic_id)
 	{
-		global $config;
-
 		switch ($mode)
 		{
 			case 'forums':
-				if (!$config['feed_overall_forums'])
+				if (!$this->config['feed_overall_forums'])
 				{
 					return false;
 				}
 
-				return new phpbb_feed_forums();
+				return $this->container->get('feed.forums');
 			break;
 
 			case 'topics':
 			case 'topics_new':
-				if (!$config['feed_topics_new'])
+				if (!$this->config['feed_topics_new'])
 				{
 					return false;
 				}
 
-				return new phpbb_feed_topics();
+				return $this->container->get('feed.topics');
 			break;
 
 			case 'topics_active':
-				if (!$config['feed_topics_active'])
+				if (!$this->config['feed_topics_active'])
 				{
 					return false;
 				}
 
-				return new phpbb_feed_topics_active();
+				return $this->container->get('feed.topics_active');
 			break;
 
 			case 'news':
-				global $db;
-
 				// Get at least one news forum
 				$sql = 'SELECT forum_id
 					FROM ' . FORUMS_TABLE . '
-					WHERE ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_NEWS, '<> 0');
-				$result = $db->sql_query_limit($sql, 1, 0, 600);
-				$s_feed_news = (int) $db->sql_fetchfield('forum_id');
-				$db->sql_freeresult($result);
+					WHERE ' . $this->db->sql_bit_and('forum_options', FORUM_OPTION_FEED_NEWS, '<> 0');
+				$result = $this->db->sql_query_limit($sql, 1, 0, 600);
+				$s_feed_news = (int) $this->db->sql_fetchfield('forum_id');
+				$this->db->sql_freeresult($result);
 
 				if (!$s_feed_news)
 				{
 					return false;
 				}
 
-				return new phpbb_feed_news();
+				return $this->container->get('feed.news');
 			break;
 
 			default:
-				if ($topic_id && $config['feed_topic'])
+				if ($topic_id && $this->config['feed_topic'])
 				{
-					return new phpbb_feed_topic($topic_id);
+					return $this->container->get('feed.topic')
+								->set_topic_id($topic_id);
 				}
-				else if ($forum_id && $config['feed_forum'])
+				else if ($forum_id && $this->config['feed_forum'])
 				{
-					return new phpbb_feed_forum($forum_id);
+					return $this->container->get('feed.forum')
+								->set_forum_id($forum_id);
 				}
-				else if ($config['feed_overall'])
+				else if ($this->config['feed_overall'])
 				{
-					return new phpbb_feed_overall();
+				return $this->container->get('feed.overall');
 				}
 
 				return false;
diff --git a/phpBB/includes/feed/forum.php b/phpBB/includes/feed/forum.php
index d625751ec3..ec95cabe89 100644
--- a/phpBB/includes/feed/forum.php
+++ b/phpBB/includes/feed/forum.php
@@ -28,11 +28,17 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 	var $forum_id		= 0;
 	var $forum_data		= array();
 
-	function __construct($forum_id)
+	/**
+	* Set the Forum ID
+	*
+	* @param int	$forum_id			Forum ID
+	* @return	phpbb_feed_forum
+	*/
+	public function set_forum_id($topic_id)
 	{
-		parent::__construct();
-
 		$this->forum_id = (int) $forum_id;
+
+		return $this;
 	}
 
 	function open()
diff --git a/phpBB/includes/feed/forums.php b/phpBB/includes/feed/forums.php
index f1c3e3531f..5f56d28d2c 100644
--- a/phpBB/includes/feed/forums.php
+++ b/phpBB/includes/feed/forums.php
@@ -65,7 +65,7 @@ class phpbb_feed_forums extends phpbb_feed_base
 	{
 		global $phpEx, $config;
 
-		$item_row['link'] = feed_append_sid('/viewforum.' . $phpEx, 'f=' . $row['forum_id']);
+		$item_row['link'] = $this->helper->append_sid('/viewforum.' . $phpEx, 'f=' . $row['forum_id']);
 
 		if ($config['feed_item_statistics'])
 		{
diff --git a/phpBB/includes/feed/post_base.php b/phpBB/includes/feed/post_base.php
index 5af30f686b..b4ce467b9c 100644
--- a/phpBB/includes/feed/post_base.php
+++ b/phpBB/includes/feed/post_base.php
@@ -47,7 +47,7 @@ abstract class phpbb_feed_post_base extends phpbb_feed_base
 	{
 		global $phpEx, $config, $user;
 
-		$item_row['link'] = feed_append_sid('/viewtopic.' . $phpEx, "t={$row['topic_id']}&amp;p={$row['post_id']}#p{$row['post_id']}");
+		$item_row['link'] = $this->helper->append_sid('/viewtopic.' . $phpEx, "t={$row['topic_id']}&amp;p={$row['post_id']}#p{$row['post_id']}");
 
 		if ($config['feed_item_statistics'])
 		{
diff --git a/phpBB/includes/feed/topic.php b/phpBB/includes/feed/topic.php
index eb77eddb5c..e4805e5539 100644
--- a/phpBB/includes/feed/topic.php
+++ b/phpBB/includes/feed/topic.php
@@ -28,11 +28,17 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 	var $forum_id		= 0;
 	var $topic_data		= array();
 
-	function __construct($topic_id)
+	/**
+	* Set the Topic ID
+	*
+	* @param int	$topic_id			Topic ID
+	* @return	phpbb_feed_topic
+	*/
+	public function set_topic_id($topic_id)
 	{
-		parent::__construct();
-
 		$this->topic_id = (int) $topic_id;
+
+		return $this;
 	}
 
 	function open()
diff --git a/phpBB/includes/feed/topic_base.php b/phpBB/includes/feed/topic_base.php
index 353b9cac15..959ed5c469 100644
--- a/phpBB/includes/feed/topic_base.php
+++ b/phpBB/includes/feed/topic_base.php
@@ -47,7 +47,7 @@ abstract class phpbb_feed_topic_base extends phpbb_feed_base
 	{
 		global $phpEx, $config, $user;
 
-		$item_row['link'] = feed_append_sid('/viewtopic.' . $phpEx, 't=' . $row['topic_id'] . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']);
+		$item_row['link'] = $this->helper->append_sid('/viewtopic.' . $phpEx, 't=' . $row['topic_id'] . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']);
 
 		if ($config['feed_item_statistics'])
 		{
-- 
cgit v1.2.1


From 63334514555acea665186f20046a49a5ed41c334 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 20:32:47 +0200
Subject: [ticket/11481] Remove globals and use dependency injection instead

PHPBB3-11481
---
 phpBB/includes/feed/base.php          | 78 +++++++++++++++++++++--------------
 phpBB/includes/feed/factory.php       |  2 +-
 phpBB/includes/feed/forum.php         | 22 ++++------
 phpBB/includes/feed/forums.php        | 16 +++----
 phpBB/includes/feed/news.php          | 25 +++++------
 phpBB/includes/feed/overall.php       | 14 +++----
 phpBB/includes/feed/post_base.php     | 12 +++---
 phpBB/includes/feed/topic.php         | 16 +++----
 phpBB/includes/feed/topic_base.php    | 16 ++++---
 phpBB/includes/feed/topics.php        | 12 +++---
 phpBB/includes/feed/topics_active.php | 27 ++++++------
 11 files changed, 115 insertions(+), 125 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/base.php b/phpBB/includes/feed/base.php
index 2ffd20d31a..c8015ab916 100644
--- a/phpBB/includes/feed/base.php
+++ b/phpBB/includes/feed/base.php
@@ -28,6 +28,24 @@ abstract class phpbb_feed_base
 	*/
 	protected $helper;
 
+	/** @var phpbb_config */
+	protected $config;
+
+	/** @var phpbb_db_driver */
+	protected $db;
+
+	/** @var phpbb_cache_driver_interface */
+	protected $cache;
+
+	/** @var phpbb_user */
+	protected $user;
+
+	/** @var phpbb_auth */
+	protected $auth;
+
+	/** @var string */
+	protected $phpEx;
+
 	/**
 	* SQL Query to be executed to get feed items
 	*/
@@ -57,18 +75,30 @@ abstract class phpbb_feed_base
 	* Constructor
 	*
 	* @param phpbb_feed_helper $helper Feed helper
+	* @param phpbb_config		$config		Config object
+	* @param phpbb_db_driver	$db			Database connection
+	* @param phpbb_cache_driver_interface	$cache			Cache object
+	* @param phpbb_user			$user		User object
+	* @param phpbb_auth			$auth		Auth object
+	* @param string				$phpEx		php file extension
 	* @return	null
 	*/
-	function __construct(phpbb_feed_helper $helper)
+	function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, $phpEx)
 	{
-		global $config;
+		$this->config = $config;
+		$this->helper = $helper;
+		$this->db = $db;
+		$this->cache = $cache;
+		$this->user = $user;
+		$this->auth = $auth;
+		$this->phpEx = $phpEx;
 
 		$this->set_keys();
 
 		// Allow num_items to be string
 		if (is_string($this->num_items))
 		{
-			$this->num_items = (int) $config[$this->num_items];
+			$this->num_items = (int) $this->config[$this->num_items];
 
 			// A precaution
 			if (!$this->num_items)
@@ -76,8 +106,6 @@ abstract class phpbb_feed_base
 				$this->num_items = 10;
 			}
 		}
-
-		$this->helper = $helper;
 	}
 
 	/**
@@ -99,11 +127,9 @@ abstract class phpbb_feed_base
 	*/
 	function close()
 	{
-		global $db;
-
 		if (!empty($this->result))
 		{
-			$db->sql_freeresult($this->result);
+			$this->db->sql_freeresult($this->result);
 		}
 	}
 
@@ -125,12 +151,11 @@ abstract class phpbb_feed_base
 
 	function get_readable_forums()
 	{
-		global $auth;
 		static $forum_ids;
 
 		if (!isset($forum_ids))
 		{
-			$forum_ids = array_keys($auth->acl_getf('f_read', true));
+			$forum_ids = array_keys($this->auth->acl_getf('f_read', true));
 		}
 
 		return $forum_ids;
@@ -138,12 +163,11 @@ abstract class phpbb_feed_base
 
 	function get_moderator_approve_forums()
 	{
-		global $auth;
 		static $forum_ids;
 
 		if (!isset($forum_ids))
 		{
-			$forum_ids = array_keys($auth->acl_getf('m_approve', true));
+			$forum_ids = array_keys($this->auth->acl_getf('m_approve', true));
 		}
 
 		return $forum_ids;
@@ -163,27 +187,26 @@ abstract class phpbb_feed_base
 
 	function get_excluded_forums()
 	{
-		global $db, $cache;
 		static $forum_ids;
 
 		// Matches acp/acp_board.php
 		$cache_name	= 'feed_excluded_forum_ids';
 
-		if (!isset($forum_ids) && ($forum_ids = $cache->get('_' . $cache_name)) === false)
+		if (!isset($forum_ids) && ($forum_ids = $this->cache->get('_' . $cache_name)) === false)
 		{
 			$sql = 'SELECT forum_id
 				FROM ' . FORUMS_TABLE . '
-				WHERE ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_EXCLUDE, '<> 0');
-			$result = $db->sql_query($sql);
+				WHERE ' . $this->db->sql_bit_and('forum_options', FORUM_OPTION_FEED_EXCLUDE, '<> 0');
+			$result = $this->db->sql_query($sql);
 
 			$forum_ids = array();
-			while ($forum_id = (int) $db->sql_fetchfield('forum_id'))
+			while ($forum_id = (int) $this->db->sql_fetchfield('forum_id'))
 			{
 				$forum_ids[$forum_id] = $forum_id;
 			}
-			$db->sql_freeresult($result);
+			$this->db->sql_freeresult($result);
 
-			$cache->put('_' . $cache_name, $forum_ids);
+			$this->cache->put('_' . $cache_name, $forum_ids);
 		}
 
 		return $forum_ids;
@@ -198,14 +221,11 @@ abstract class phpbb_feed_base
 
 	function get_passworded_forums()
 	{
-		global $user;
-
-		return $user->get_passworded_forums();
+		return $this->user->get_passworded_forums();
 	}
 
 	function get_item()
 	{
-		global $db, $cache;
 		static $result;
 
 		if (!isset($result))
@@ -216,26 +236,24 @@ abstract class phpbb_feed_base
 			}
 
 			// Query database
-			$sql = $db->sql_build_query('SELECT', $this->sql);
-			$result = $db->sql_query_limit($sql, $this->num_items);
+			$sql = $this->db->sql_build_query('SELECT', $this->sql);
+			$result = $this->db->sql_query_limit($sql, $this->num_items);
 		}
 
-		return $db->sql_fetchrow($result);
+		return $this->db->sql_fetchrow($result);
 	}
 
 	function user_viewprofile($row)
 	{
-		global $phpEx, $user;
-
 		$author_id = (int) $row[$this->get('author_id')];
 
 		if ($author_id == ANONYMOUS)
 		{
 			// Since we cannot link to a profile, we just return GUEST
 			// instead of $row['username']
-			return $user->lang['GUEST'];
+			return $this->user->lang['GUEST'];
 		}
 
-		return '<a href="' . $this->helper->append_sid('/memberlist.' . $phpEx, 'mode=viewprofile&amp;u=' . $author_id) . '">' . $row[$this->get('creator')] . '</a>';
+		return '<a href="' . $this->helper->append_sid('/memberlist.' . $this->phpEx, 'mode=viewprofile&amp;u=' . $author_id) . '">' . $row[$this->get('creator')] . '</a>';
 	}
 }
diff --git a/phpBB/includes/feed/factory.php b/phpBB/includes/feed/factory.php
index 346cf9d870..63a1eb8ef0 100644
--- a/phpBB/includes/feed/factory.php
+++ b/phpBB/includes/feed/factory.php
@@ -31,7 +31,7 @@ class phpbb_feed_factory
 	protected $config;
 
 	/** @var phpbb_db_driver */
-	protected $driver;
+	protected $db;
 
 	/**
 	* Constructor
diff --git a/phpBB/includes/feed/forum.php b/phpBB/includes/feed/forum.php
index ec95cabe89..7670fbeaaa 100644
--- a/phpBB/includes/feed/forum.php
+++ b/phpBB/includes/feed/forum.php
@@ -43,15 +43,13 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 
 	function open()
 	{
-		global $db, $auth;
-
 		// Check if forum exists
 		$sql = 'SELECT forum_id, forum_name, forum_password, forum_type, forum_options
 			FROM ' . FORUMS_TABLE . '
 			WHERE forum_id = ' . $this->forum_id;
-		$result = $db->sql_query($sql);
-		$this->forum_data = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$this->forum_data = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($this->forum_data))
 		{
@@ -71,7 +69,7 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 		}
 
 		// Make sure we can read this forum
-		if (!$auth->acl_get('f_read', $this->forum_id))
+		if (!$this->auth->acl_get('f_read', $this->forum_id))
 		{
 			trigger_error('SORRY_AUTH_READ');
 		}
@@ -92,9 +90,7 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 
 	function get_sql()
 	{
-		global $auth, $db;
-
-		$m_approve = ($auth->acl_get('m_approve', $this->forum_id)) ? true : false;
+		$m_approve = ($this->auth->acl_get('m_approve', $this->forum_id)) ? true : false;
 
 		// Determine topics with recent activity
 		$sql = 'SELECT topic_id, topic_last_post_time
@@ -103,17 +99,17 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 				AND topic_moved_id = 0
 				' . ((!$m_approve) ? 'AND topic_approved = 1' : '') . '
 			ORDER BY topic_last_post_time DESC';
-		$result = $db->sql_query_limit($sql, $this->num_items);
+		$result = $this->db->sql_query_limit($sql, $this->num_items);
 
 		$topic_ids = array();
 		$min_post_time = 0;
-		while ($row = $db->sql_fetchrow())
+		while ($row = $this->db->sql_fetchrow())
 		{
 			$topic_ids[] = (int) $row['topic_id'];
 
 			$min_post_time = (int) $row['topic_last_post_time'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($topic_ids))
 		{
@@ -127,7 +123,7 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 				POSTS_TABLE		=> 'p',
 				USERS_TABLE		=> 'u',
 			),
-			'WHERE'		=> $db->sql_in_set('p.topic_id', $topic_ids) . '
+			'WHERE'		=> $this->db->sql_in_set('p.topic_id', $topic_ids) . '
 							' . ((!$m_approve) ? 'AND p.post_approved = 1' : '') . '
 							AND p.post_time >= ' . $min_post_time . '
 							AND p.poster_id = u.user_id',
diff --git a/phpBB/includes/feed/forums.php b/phpBB/includes/feed/forums.php
index 5f56d28d2c..130da1c56a 100644
--- a/phpBB/includes/feed/forums.php
+++ b/phpBB/includes/feed/forums.php
@@ -39,8 +39,6 @@ class phpbb_feed_forums extends phpbb_feed_base
 
 	function get_sql()
 	{
-		global $auth, $db;
-
 		$in_fid_ary = array_diff($this->get_readable_forums(), $this->get_excluded_forums());
 		if (empty($in_fid_ary))
 		{
@@ -54,7 +52,7 @@ class phpbb_feed_forums extends phpbb_feed_base
 							f.forum_topics, f.forum_posts',
 			'FROM'		=> array(FORUMS_TABLE => 'f'),
 			'WHERE'		=> 'f.forum_type = ' . FORUM_POST . '
-							AND ' . $db->sql_in_set('f.forum_id', $in_fid_ary),
+							AND ' . $this->db->sql_in_set('f.forum_id', $in_fid_ary),
 			'ORDER_BY'	=> 'f.left_id ASC',
 		);
 
@@ -63,16 +61,12 @@ class phpbb_feed_forums extends phpbb_feed_base
 
 	function adjust_item(&$item_row, &$row)
 	{
-		global $phpEx, $config;
-
-		$item_row['link'] = $this->helper->append_sid('/viewforum.' . $phpEx, 'f=' . $row['forum_id']);
+		$item_row['link'] = $this->helper->append_sid('/viewforum.' . $this->phpEx, 'f=' . $row['forum_id']);
 
-		if ($config['feed_item_statistics'])
+		if ($this->config['feed_item_statistics'])
 		{
-			global $user;
-
-			$item_row['statistics'] = $user->lang('TOTAL_TOPICS', (int) $row['forum_topics'])
-				. ' ' . $this->separator_stats . ' ' . $user->lang('TOTAL_POSTS_COUNT', (int) $row['forum_posts']);
+			$item_row['statistics'] = $this->user->lang('TOTAL_TOPICS', (int) $row['forum_topics'])
+				. ' ' . $this->separator_stats . ' ' . $this->user->lang('TOTAL_POSTS_COUNT', (int) $row['forum_posts']);
 		}
 	}
 }
diff --git a/phpBB/includes/feed/news.php b/phpBB/includes/feed/news.php
index 12deb69ae4..92cc18a3ab 100644
--- a/phpBB/includes/feed/news.php
+++ b/phpBB/includes/feed/news.php
@@ -27,27 +27,26 @@ class phpbb_feed_news extends phpbb_feed_topic_base
 {
 	function get_news_forums()
 	{
-		global $db, $cache;
 		static $forum_ids;
 
 		// Matches acp/acp_board.php
 		$cache_name	= 'feed_news_forum_ids';
 
-		if (!isset($forum_ids) && ($forum_ids = $cache->get('_' . $cache_name)) === false)
+		if (!isset($forum_ids) && ($forum_ids = $this->cache->get('_' . $cache_name)) === false)
 		{
 			$sql = 'SELECT forum_id
 				FROM ' . FORUMS_TABLE . '
-				WHERE ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_NEWS, '<> 0');
-			$result = $db->sql_query($sql);
+				WHERE ' . $this->db->sql_bit_and('forum_options', FORUM_OPTION_FEED_NEWS, '<> 0');
+			$result = $this->db->sql_query($sql);
 
 			$forum_ids = array();
-			while ($forum_id = (int) $db->sql_fetchfield('forum_id'))
+			while ($forum_id = (int) $this->db->sql_fetchfield('forum_id'))
 			{
 				$forum_ids[$forum_id] = $forum_id;
 			}
-			$db->sql_freeresult($result);
+			$this->db->sql_freeresult($result);
 
-			$cache->put('_' . $cache_name, $forum_ids);
+			$this->cache->put('_' . $cache_name, $forum_ids);
 		}
 
 		return $forum_ids;
@@ -55,8 +54,6 @@ class phpbb_feed_news extends phpbb_feed_topic_base
 
 	function get_sql()
 	{
-		global $auth, $config, $db;
-
 		// Determine forum ids
 		$in_fid_ary = array_intersect($this->get_news_forums(), $this->get_readable_forums());
 		if (empty($in_fid_ary))
@@ -73,18 +70,18 @@ class phpbb_feed_news extends phpbb_feed_topic_base
 		// We really have to get the post ids first!
 		$sql = 'SELECT topic_first_post_id, topic_time
 			FROM ' . TOPICS_TABLE . '
-			WHERE ' . $db->sql_in_set('forum_id', $in_fid_ary) . '
+			WHERE ' . $this->db->sql_in_set('forum_id', $in_fid_ary) . '
 				AND topic_moved_id = 0
 				AND topic_approved = 1
 			ORDER BY topic_time DESC';
-		$result = $db->sql_query_limit($sql, $this->num_items);
+		$result = $this->db->sql_query_limit($sql, $this->num_items);
 
 		$post_ids = array();
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$post_ids[] = (int) $row['topic_first_post_id'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($post_ids))
 		{
@@ -106,7 +103,7 @@ class phpbb_feed_news extends phpbb_feed_topic_base
 				),
 			),
 			'WHERE'		=> 'p.topic_id = t.topic_id
-							AND ' . $db->sql_in_set('p.post_id', $post_ids),
+							AND ' . $this->db->sql_in_set('p.post_id', $post_ids),
 			'ORDER_BY'	=> 'p.post_time DESC',
 		);
 
diff --git a/phpBB/includes/feed/overall.php b/phpBB/includes/feed/overall.php
index 630f67660a..5fb922f6bb 100644
--- a/phpBB/includes/feed/overall.php
+++ b/phpBB/includes/feed/overall.php
@@ -27,8 +27,6 @@ class phpbb_feed_overall extends phpbb_feed_post_base
 {
 	function get_sql()
 	{
-		global $auth, $db;
-
 		$forum_ids = array_diff($this->get_readable_forums(), $this->get_excluded_forums(), $this->get_passworded_forums());
 		if (empty($forum_ids))
 		{
@@ -37,27 +35,27 @@ class phpbb_feed_overall extends phpbb_feed_post_base
 
 		// m_approve forums
 		$fid_m_approve = $this->get_moderator_approve_forums();
-		$sql_m_approve = (!empty($fid_m_approve)) ? 'OR ' . $db->sql_in_set('forum_id', $fid_m_approve) : '';
+		$sql_m_approve = (!empty($fid_m_approve)) ? 'OR ' . $this->db->sql_in_set('forum_id', $fid_m_approve) : '';
 
 		// Determine topics with recent activity
 		$sql = 'SELECT topic_id, topic_last_post_time
 			FROM ' . TOPICS_TABLE . '
-			WHERE ' . $db->sql_in_set('forum_id', $forum_ids) . '
+			WHERE ' . $this->db->sql_in_set('forum_id', $forum_ids) . '
 				AND topic_moved_id = 0
 				AND (topic_approved = 1
 					' . $sql_m_approve . ')
 			ORDER BY topic_last_post_time DESC';
-		$result = $db->sql_query_limit($sql, $this->num_items);
+		$result = $this->db->sql_query_limit($sql, $this->num_items);
 
 		$topic_ids = array();
 		$min_post_time = 0;
-		while ($row = $db->sql_fetchrow())
+		while ($row = $this->db->sql_fetchrow())
 		{
 			$topic_ids[] = (int) $row['topic_id'];
 
 			$min_post_time = (int) $row['topic_last_post_time'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($topic_ids))
 		{
@@ -79,7 +77,7 @@ class phpbb_feed_overall extends phpbb_feed_post_base
 					'ON'	=> 'f.forum_id = p.forum_id',
 				),
 			),
-			'WHERE'		=> $db->sql_in_set('p.topic_id', $topic_ids) . '
+			'WHERE'		=> $this->db->sql_in_set('p.topic_id', $topic_ids) . '
 							AND (p.post_approved = 1
 								' . str_replace('forum_id', 'p.forum_id', $sql_m_approve) . ')
 							AND p.post_time >= ' . $min_post_time . '
diff --git a/phpBB/includes/feed/post_base.php b/phpBB/includes/feed/post_base.php
index b4ce467b9c..bfcb4141ec 100644
--- a/phpBB/includes/feed/post_base.php
+++ b/phpBB/includes/feed/post_base.php
@@ -45,15 +45,13 @@ abstract class phpbb_feed_post_base extends phpbb_feed_base
 
 	function adjust_item(&$item_row, &$row)
 	{
-		global $phpEx, $config, $user;
+		$item_row['link'] = $this->helper->append_sid('/viewtopic.' . $this->phpEx, "t={$row['topic_id']}&amp;p={$row['post_id']}#p{$row['post_id']}");
 
-		$item_row['link'] = $this->helper->append_sid('/viewtopic.' . $phpEx, "t={$row['topic_id']}&amp;p={$row['post_id']}#p{$row['post_id']}");
-
-		if ($config['feed_item_statistics'])
+		if ($this->config['feed_item_statistics'])
 		{
-			$item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
-				. ' ' . $this->separator_stats . ' ' . $user->format_date($row[$this->get('published')])
-				. (($this->is_moderator_approve_forum($row['forum_id']) && !$row['post_approved']) ? ' ' . $this->separator_stats . ' ' . $user->lang['POST_UNAPPROVED'] : '');
+			$item_row['statistics'] = $this->user->lang['POSTED'] . ' ' . $this->user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
+				. ' ' . $this->separator_stats . ' ' . $this->user->format_date($row[$this->get('published')])
+				. (($this->is_moderator_approve_forum($row['forum_id']) && !$row['post_approved']) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_UNAPPROVED'] : '');
 		}
 	}
 }
diff --git a/phpBB/includes/feed/topic.php b/phpBB/includes/feed/topic.php
index e4805e5539..7d9a344982 100644
--- a/phpBB/includes/feed/topic.php
+++ b/phpBB/includes/feed/topic.php
@@ -43,16 +43,14 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 
 	function open()
 	{
-		global $auth, $db, $user;
-
 		$sql = 'SELECT f.forum_options, f.forum_password, t.topic_id, t.forum_id, t.topic_approved, t.topic_title, t.topic_time, t.topic_views, t.topic_replies, t.topic_type
 			FROM ' . TOPICS_TABLE . ' t
 			LEFT JOIN ' . FORUMS_TABLE . ' f
 				ON (f.forum_id = t.forum_id)
 			WHERE t.topic_id = ' . $this->topic_id;
-		$result = $db->sql_query($sql);
-		$this->topic_data = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$this->topic_data = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($this->topic_data))
 		{
@@ -62,7 +60,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 		$this->forum_id = (int) $this->topic_data['forum_id'];
 
 		// Make sure topic is either approved or user authed
-		if (!$this->topic_data['topic_approved'] && !$auth->acl_get('m_approve', $this->forum_id))
+		if (!$this->topic_data['topic_approved'] && !$this->auth->acl_get('m_approve', $this->forum_id))
 		{
 			trigger_error('SORRY_AUTH_READ');
 		}
@@ -74,7 +72,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 		}
 
 		// Make sure we can read this forum
-		if (!$auth->acl_get('f_read', $this->forum_id))
+		if (!$this->auth->acl_get('f_read', $this->forum_id))
 		{
 			trigger_error('SORRY_AUTH_READ');
 		}
@@ -95,8 +93,6 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 
 	function get_sql()
 	{
-		global $auth, $db;
-
 		$this->sql = array(
 			'SELECT'	=>	'p.post_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
 							'u.username, u.user_id',
@@ -105,7 +101,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 				USERS_TABLE		=> 'u',
 			),
 			'WHERE'		=> 'p.topic_id = ' . $this->topic_id . '
-								' . ($this->forum_id && !$auth->acl_get('m_approve', $this->forum_id) ? 'AND p.post_approved = 1' : '') . '
+								' . ($this->forum_id && !$this->auth->acl_get('m_approve', $this->forum_id) ? 'AND p.post_approved = 1' : '') . '
 								AND p.poster_id = u.user_id',
 			'ORDER_BY'	=> 'p.post_time DESC',
 		);
diff --git a/phpBB/includes/feed/topic_base.php b/phpBB/includes/feed/topic_base.php
index 959ed5c469..0c845c30bd 100644
--- a/phpBB/includes/feed/topic_base.php
+++ b/phpBB/includes/feed/topic_base.php
@@ -45,17 +45,15 @@ abstract class phpbb_feed_topic_base extends phpbb_feed_base
 
 	function adjust_item(&$item_row, &$row)
 	{
-		global $phpEx, $config, $user;
+		$item_row['link'] = $this->helper->append_sid('/viewtopic.' . $this->phpEx, 't=' . $row['topic_id'] . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']);
 
-		$item_row['link'] = $this->helper->append_sid('/viewtopic.' . $phpEx, 't=' . $row['topic_id'] . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']);
-
-		if ($config['feed_item_statistics'])
+		if ($this->config['feed_item_statistics'])
 		{
-			$item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
-				. ' ' . $this->separator_stats . ' ' . $user->format_date($row[$this->get('published')])
-				. ' ' . $this->separator_stats . ' ' . $user->lang['REPLIES'] . ' ' . (($this->is_moderator_approve_forum($row['forum_id'])) ? $row['topic_replies_real'] : $row['topic_replies'])
-				. ' ' . $this->separator_stats . ' ' . $user->lang['VIEWS'] . ' ' . $row['topic_views']
-				. (($this->is_moderator_approve_forum($row['forum_id']) && ($row['topic_replies_real'] != $row['topic_replies'])) ? ' ' . $this->separator_stats . ' ' . $user->lang['POSTS_UNAPPROVED'] : '');
+			$item_row['statistics'] = $this->user->lang['POSTED'] . ' ' . $this->user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
+				. ' ' . $this->separator_stats . ' ' . $this->user->format_date($row[$this->get('published')])
+				. ' ' . $this->separator_stats . ' ' . $this->user->lang['REPLIES'] . ' ' . (($this->is_moderator_approve_forum($row['forum_id'])) ? $row['topic_replies_real'] : $row['topic_replies'])
+				. ' ' . $this->separator_stats . ' ' . $this->user->lang['VIEWS'] . ' ' . $row['topic_views']
+				. (($this->is_moderator_approve_forum($row['forum_id']) && ($row['topic_replies_real'] != $row['topic_replies'])) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POSTS_UNAPPROVED'] : '');
 		}
 	}
 }
diff --git a/phpBB/includes/feed/topics.php b/phpBB/includes/feed/topics.php
index 7cd557ffcc..c8761d7176 100644
--- a/phpBB/includes/feed/topics.php
+++ b/phpBB/includes/feed/topics.php
@@ -27,8 +27,6 @@ class phpbb_feed_topics extends phpbb_feed_topic_base
 {
 	function get_sql()
 	{
-		global $db, $config;
-
 		$forum_ids_read = $this->get_readable_forums();
 		if (empty($forum_ids_read))
 		{
@@ -44,18 +42,18 @@ class phpbb_feed_topics extends phpbb_feed_topic_base
 		// We really have to get the post ids first!
 		$sql = 'SELECT topic_first_post_id, topic_time
 			FROM ' . TOPICS_TABLE . '
-			WHERE ' . $db->sql_in_set('forum_id', $in_fid_ary) . '
+			WHERE ' . $this->db->sql_in_set('forum_id', $in_fid_ary) . '
 				AND topic_moved_id = 0
 				AND topic_approved = 1
 			ORDER BY topic_time DESC';
-		$result = $db->sql_query_limit($sql, $this->num_items);
+		$result = $this->db->sql_query_limit($sql, $this->num_items);
 
 		$post_ids = array();
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$post_ids[] = (int) $row['topic_first_post_id'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($post_ids))
 		{
@@ -77,7 +75,7 @@ class phpbb_feed_topics extends phpbb_feed_topic_base
 				),
 			),
 			'WHERE'		=> 'p.topic_id = t.topic_id
-							AND ' . $db->sql_in_set('p.post_id', $post_ids),
+							AND ' . $this->db->sql_in_set('p.post_id', $post_ids),
 			'ORDER_BY'	=> 'p.post_time DESC',
 		);
 
diff --git a/phpBB/includes/feed/topics_active.php b/phpBB/includes/feed/topics_active.php
index 36b6bcb1a2..d1c920c136 100644
--- a/phpBB/includes/feed/topics_active.php
+++ b/phpBB/includes/feed/topics_active.php
@@ -38,8 +38,6 @@ class phpbb_feed_topics_active extends phpbb_feed_topic_base
 
 	function get_sql()
 	{
-		global $db, $config;
-
 		$forum_ids_read = $this->get_readable_forums();
 		if (empty($forum_ids_read))
 		{
@@ -59,19 +57,19 @@ class phpbb_feed_topics_active extends phpbb_feed_topic_base
 		// We really have to get the post ids first!
 		$sql = 'SELECT topic_last_post_id, topic_last_post_time
 			FROM ' . TOPICS_TABLE . '
-			WHERE ' . $db->sql_in_set('forum_id', $in_fid_ary) . '
+			WHERE ' . $this->db->sql_in_set('forum_id', $in_fid_ary) . '
 				AND topic_moved_id = 0
 				AND topic_approved = 1
 				' . $last_post_time_sql . '
 			ORDER BY topic_last_post_time DESC';
-		$result = $db->sql_query_limit($sql, $this->num_items);
+		$result = $this->db->sql_query_limit($sql, $this->num_items);
 
 		$post_ids = array();
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$post_ids[] = (int) $row['topic_last_post_id'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($post_ids))
 		{
@@ -94,7 +92,7 @@ class phpbb_feed_topics_active extends phpbb_feed_topic_base
 				),
 			),
 			'WHERE'		=> 'p.topic_id = t.topic_id
-							AND ' . $db->sql_in_set('p.post_id', $post_ids),
+							AND ' . $this->db->sql_in_set('p.post_id', $post_ids),
 			'ORDER_BY'	=> 'p.post_time DESC',
 		);
 
@@ -103,28 +101,27 @@ class phpbb_feed_topics_active extends phpbb_feed_topic_base
 
 	function get_forum_ids()
 	{
-		global $db, $cache;
 		static $forum_ids;
 
 		$cache_name	= 'feed_topic_active_forum_ids';
 
-		if (!isset($forum_ids) && ($forum_ids = $cache->get('_' . $cache_name)) === false)
+		if (!isset($forum_ids) && ($forum_ids = $this->cache->get('_' . $cache_name)) === false)
 		{
 			$sql = 'SELECT forum_id
 				FROM ' . FORUMS_TABLE . '
 				WHERE forum_type = ' . FORUM_POST . '
-					AND ' . $db->sql_bit_and('forum_options', FORUM_OPTION_FEED_EXCLUDE, '= 0') . '
-					AND ' . $db->sql_bit_and('forum_flags', log(FORUM_FLAG_ACTIVE_TOPICS, 2), '<> 0');
-			$result = $db->sql_query($sql);
+					AND ' . $this->db->sql_bit_and('forum_options', FORUM_OPTION_FEED_EXCLUDE, '= 0') . '
+					AND ' . $this->db->sql_bit_and('forum_flags', log(FORUM_FLAG_ACTIVE_TOPICS, 2), '<> 0');
+			$result = $this->db->sql_query($sql);
 
 			$forum_ids = array();
-			while ($forum_id = (int) $db->sql_fetchfield('forum_id'))
+			while ($forum_id = (int) $this->db->sql_fetchfield('forum_id'))
 			{
 				$forum_ids[$forum_id] = $forum_id;
 			}
-			$db->sql_freeresult($result);
+			$this->db->sql_freeresult($result);
 
-			$cache->put('_' . $cache_name, $forum_ids, 180);
+			$this->cache->put('_' . $cache_name, $forum_ids, 180);
 		}
 
 		return $forum_ids;
-- 
cgit v1.2.1


From e36deed24f62f4fca0a3e82b2d58d97499ff7764 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Jun 2013 20:35:38 +0200
Subject: [ticket/11481] Move prepended slash from calls into function

PHPBB3-11481
---
 phpBB/includes/feed/base.php       | 2 +-
 phpBB/includes/feed/forums.php     | 2 +-
 phpBB/includes/feed/helper.php     | 2 +-
 phpBB/includes/feed/post_base.php  | 2 +-
 phpBB/includes/feed/topic_base.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/base.php b/phpBB/includes/feed/base.php
index c8015ab916..af28ee8dc8 100644
--- a/phpBB/includes/feed/base.php
+++ b/phpBB/includes/feed/base.php
@@ -254,6 +254,6 @@ abstract class phpbb_feed_base
 			return $this->user->lang['GUEST'];
 		}
 
-		return '<a href="' . $this->helper->append_sid('/memberlist.' . $this->phpEx, 'mode=viewprofile&amp;u=' . $author_id) . '">' . $row[$this->get('creator')] . '</a>';
+		return '<a href="' . $this->helper->append_sid('memberlist.' . $this->phpEx, 'mode=viewprofile&amp;u=' . $author_id) . '">' . $row[$this->get('creator')] . '</a>';
 	}
 }
diff --git a/phpBB/includes/feed/forums.php b/phpBB/includes/feed/forums.php
index 130da1c56a..72f786aa6a 100644
--- a/phpBB/includes/feed/forums.php
+++ b/phpBB/includes/feed/forums.php
@@ -61,7 +61,7 @@ class phpbb_feed_forums extends phpbb_feed_base
 
 	function adjust_item(&$item_row, &$row)
 	{
-		$item_row['link'] = $this->helper->append_sid('/viewforum.' . $this->phpEx, 'f=' . $row['forum_id']);
+		$item_row['link'] = $this->helper->append_sid('viewforum.' . $this->phpEx, 'f=' . $row['forum_id']);
 
 		if ($this->config['feed_item_statistics'])
 		{
diff --git a/phpBB/includes/feed/helper.php b/phpBB/includes/feed/helper.php
index 20a399bcd7..93330aa2ad 100644
--- a/phpBB/includes/feed/helper.php
+++ b/phpBB/includes/feed/helper.php
@@ -65,7 +65,7 @@ class phpbb_feed_helper
 	*/
 	public function append_sid($url, $params)
 	{
-		return append_sid($this->get_board_url() . $url, $params, true, '');
+		return append_sid($this->get_board_url() . '/' . $url, $params, true, '');
 	}
 
 	/**
diff --git a/phpBB/includes/feed/post_base.php b/phpBB/includes/feed/post_base.php
index bfcb4141ec..a25ed50263 100644
--- a/phpBB/includes/feed/post_base.php
+++ b/phpBB/includes/feed/post_base.php
@@ -45,7 +45,7 @@ abstract class phpbb_feed_post_base extends phpbb_feed_base
 
 	function adjust_item(&$item_row, &$row)
 	{
-		$item_row['link'] = $this->helper->append_sid('/viewtopic.' . $this->phpEx, "t={$row['topic_id']}&amp;p={$row['post_id']}#p{$row['post_id']}");
+		$item_row['link'] = $this->helper->append_sid('viewtopic.' . $this->phpEx, "t={$row['topic_id']}&amp;p={$row['post_id']}#p{$row['post_id']}");
 
 		if ($this->config['feed_item_statistics'])
 		{
diff --git a/phpBB/includes/feed/topic_base.php b/phpBB/includes/feed/topic_base.php
index 0c845c30bd..e6a47b4c86 100644
--- a/phpBB/includes/feed/topic_base.php
+++ b/phpBB/includes/feed/topic_base.php
@@ -45,7 +45,7 @@ abstract class phpbb_feed_topic_base extends phpbb_feed_base
 
 	function adjust_item(&$item_row, &$row)
 	{
-		$item_row['link'] = $this->helper->append_sid('/viewtopic.' . $this->phpEx, 't=' . $row['topic_id'] . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']);
+		$item_row['link'] = $this->helper->append_sid('viewtopic.' . $this->phpEx, 't=' . $row['topic_id'] . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']);
 
 		if ($this->config['feed_item_statistics'])
 		{
-- 
cgit v1.2.1


From 1da4be04b021af62e24f91bf0f82849c78bd04b9 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Jun 2013 22:09:00 -0500
Subject: [feature/twig] WIP extension/lexer/some tokenparsers/nodes

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php         | 45 +++++++++++
 phpBB/includes/template/twig/lexer.php             | 42 ++++++++++
 phpBB/includes/template/twig/node/begin.php        | 77 ++++++++++++++++++
 phpBB/includes/template/twig/tokenparser/begin.php | 71 ++++++++++++++++
 phpBB/includes/template/twig/tokenparser/event.php | 33 ++++++++
 phpBB/includes/template/twig/tokenparser/if.php    | 94 ++++++++++++++++++++++
 .../includes/template/twig/tokenparser/include.php | 33 ++++++++
 7 files changed, 395 insertions(+)
 create mode 100644 phpBB/includes/template/twig/extension.php
 create mode 100644 phpBB/includes/template/twig/lexer.php
 create mode 100644 phpBB/includes/template/twig/node/begin.php
 create mode 100644 phpBB/includes/template/twig/tokenparser/begin.php
 create mode 100644 phpBB/includes/template/twig/tokenparser/event.php
 create mode 100644 phpBB/includes/template/twig/tokenparser/if.php
 create mode 100644 phpBB/includes/template/twig/tokenparser/include.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
new file mode 100644
index 0000000000..29020fcf8e
--- /dev/null
+++ b/phpBB/includes/template/twig/extension.php
@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_template_twig_extension extends Twig_Extension
+{
+	public function getName()
+	{
+		return 'phpbb';
+	}
+
+	public function getTokenParsers()
+	{
+		return array(
+			new phpbb_template_twig_tokenparser_if,
+			new phpbb_template_twig_tokenparser_include,
+			new phpbb_template_twig_tokenparser_event,
+			new phpbb_template_twig_tokenparser_begin,
+		);
+	}
+
+	public function getOperators()
+	{
+		return array(
+			array(),
+			array(
+				'eq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				'!==' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+			),
+		);
+	}
+}
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
new file mode 100644
index 0000000000..45b97acf8c
--- /dev/null
+++ b/phpBB/includes/template/twig/lexer.php
@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_template_twig_lexer extends Twig_Lexer
+{
+	protected function lexExpression()
+	{
+		/**
+		* This is some compatibility code to continue supporting expressions such as:
+		* <!-- IF .blah -->
+		* 
+		* This does not seem very efficient, but I have not been able to find a better 
+		* 	method which works properly (maybe lexData can do it better, @todo test this)
+		*/
+		$last_element = end($this->tokens);
+		if ($last_element->getValue() === '.')
+		{
+			$last_element2 = prev($this->tokens);
+
+			if ($last_element2->getValue() === 'IF')
+			{
+				array_pop($this->tokens);
+			}
+		}
+        
+		parent::lexExpression();
+	}
+}
diff --git a/phpBB/includes/template/twig/node/begin.php b/phpBB/includes/template/twig/node/begin.php
new file mode 100644
index 0000000000..1d47e35d87
--- /dev/null
+++ b/phpBB/includes/template/twig/node/begin.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2009 Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a for node.
+ *
+ * @package    twig
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ */
+class phpbb_template_twig_node_begin extends Twig_Node
+{
+    public function __construct($beginName, Twig_NodeInterface $body, Twig_NodeInterface $else = null, $lineno, $tag = null)
+    {
+        parent::__construct(array('body' => $body, 'else' => $else), array('beginName' => $beginName), $lineno, $tag);
+    }
+
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     */
+    public function compile(Twig_Compiler $compiler)
+    {
+		$compiler
+			->write("if (!isset(\$blocks)) {\n")
+			->indent()
+			->write("\$blocks = array();")
+			->write("\$nestingLevel = 0;")
+			->outdent()
+			->write("}\n")
+			->write("\$blocks[\$nestingLevel] = array();\n")
+		;
+
+        if (null !== $this->getNode('else')) {
+            $compiler->write("\$blocks[\$nestingLevel]['iterated'] = false;\n");
+        }
+
+        $compiler
+			->write("foreach (\$context['_phpbb_blocks']['")
+			->write($this->getAttribute('beginName'))
+			->write("'] as \$blocks[\$nestingLevel]['i'] => \$blocks[\$nestingLevel]['values']) {")
+			->indent()
+        ;
+
+        $compiler->subcompile($this->getNode('body'));
+
+        if (null !== $this->getNode('else')) {
+            $compiler->write("\$blocks[\$nestingLevel]['iterated'] = true;\n");
+        }
+
+        $compiler
+            ->outdent()
+            ->write("}\n")
+        ;
+
+        if (null !== $this->getNode('else')) {
+            $compiler
+                ->write("if (!\$blocks[\$nestingLevel]['iterated']) {\n")
+                ->indent()
+                ->subcompile($this->getNode('else'))
+                ->outdent()
+                ->write("}\n")
+            ;
+        }
+
+		$compiler->write("\$nestingLevel--;\n");
+    }
+}
\ No newline at end of file
diff --git a/phpBB/includes/template/twig/tokenparser/begin.php b/phpBB/includes/template/twig/tokenparser/begin.php
new file mode 100644
index 0000000000..939f3b8f16
--- /dev/null
+++ b/phpBB/includes/template/twig/tokenparser/begin.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2009 Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Loops over each item of a sequence.
+ *
+ * <pre>
+ * <ul>
+ *  {% for user in users %}
+ *    <li>{{ user.username|e }}</li>
+ *  {% endfor %}
+ * </ul>
+ * </pre>
+ */
+class phpbb_template_twig_tokenparser_begin extends Twig_TokenParser_For
+{
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Twig_Token $token A Twig_Token instance
+     *
+     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     */
+	public function parse(Twig_Token $token)
+	{
+		$lineno = $token->getLine();
+		$beginName = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE)->getValue();
+
+		$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+		$body = $this->parser->subparse(array($this, 'decideBeginFork'));
+		if ($this->parser->getStream()->next()->getValue() == 'ELSE') {
+			$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+			$else = $this->parser->subparse(array($this, 'decideBeginEnd'), true);
+		} else {
+			$else = null;
+		}
+		$this->parser->getStream()->expect(Twig_Token::NAME_TYPE, $beginName);
+		$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+
+		return new phpbb_template_twig_node_begin($beginName, $body, $else, $lineno, $this->getTag());
+	}
+
+    public function decideBeginFork(Twig_Token $token)
+    {
+        return $token->test(array('BEGINELSE', 'END'));
+    }
+
+    public function decideForEnd(Twig_Token $token)
+    {
+        return $token->test('END');
+    }
+
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @return string The tag name
+     */
+    public function getTag()
+    {
+        return 'BEGIN';
+    }
+}
diff --git a/phpBB/includes/template/twig/tokenparser/event.php b/phpBB/includes/template/twig/tokenparser/event.php
new file mode 100644
index 0000000000..cd211098d6
--- /dev/null
+++ b/phpBB/includes/template/twig/tokenparser/event.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2009 Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Includes a template.
+ *
+ * <pre>
+ *   {% include 'header.html' %}
+ *     Body
+ *   {% include 'footer.html' %}
+ * </pre>
+ */
+class phpbb_template_twig_tokenparser_event extends Twig_TokenParser_Include
+{
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @return string The tag name
+     */
+    public function getTag()
+    {
+        return 'EVENT';
+    }
+}
diff --git a/phpBB/includes/template/twig/tokenparser/if.php b/phpBB/includes/template/twig/tokenparser/if.php
new file mode 100644
index 0000000000..e47744093e
--- /dev/null
+++ b/phpBB/includes/template/twig/tokenparser/if.php
@@ -0,0 +1,94 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2009 Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Tests a condition.
+ *
+ * <pre>
+ * {% if users %}
+ *  <ul>
+ *    {% for user in users %}
+ *      <li>{{ user.username|e }}</li>
+ *    {% endfor %}
+ *  </ul>
+ * {% endif %}
+ * </pre>
+ */
+class phpbb_template_twig_tokenparser_if extends Twig_TokenParser_If
+{
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Twig_Token $token A Twig_Token instance
+     *
+     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     */
+    public function parse(Twig_Token $token)
+    {
+        $lineno = $token->getLine();
+        $expr = $this->parser->getExpressionParser()->parseExpression();
+        $stream = $this->parser->getStream();
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+        $body = $this->parser->subparse(array($this, 'decideIfFork'));
+        $tests = array($expr, $body);
+        $else = null;
+
+        $end = false;
+        while (!$end) {
+            switch ($stream->next()->getValue()) {
+                case 'ELSE':
+                    $stream->expect(Twig_Token::BLOCK_END_TYPE);
+                    $else = $this->parser->subparse(array($this, 'decideIfEnd'));
+                    break;
+
+                case 'ELSEIF':
+                    $expr = $this->parser->getExpressionParser()->parseExpression();
+                    $stream->expect(Twig_Token::BLOCK_END_TYPE);
+                    $body = $this->parser->subparse(array($this, 'decideIfFork'));
+                    $tests[] = $expr;
+                    $tests[] = $body;
+                    break;
+
+                case 'ENDIF':
+                    $end = true;
+                    break;
+
+                default:
+                    throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "ELSE", "ELSEIF", or "ENDIF" to close the "IF" block started at line %d)', $lineno), $stream->getCurrent()->getLine(), $stream->getFilename());
+            }
+        }
+
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+        return new Twig_Node_If(new Twig_Node($tests), $else, $lineno, $this->getTag());
+    }
+
+    public function decideIfFork(Twig_Token $token)
+    {
+        return $token->test(array('ELSEIF', 'ELSE', 'ENDIF'));
+    }
+
+    public function decideIfEnd(Twig_Token $token)
+    {
+        return $token->test(array('ENDIF'));
+    }
+
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @return string The tag name
+     */
+    public function getTag()
+    {
+        return 'IF';
+    }
+}
diff --git a/phpBB/includes/template/twig/tokenparser/include.php b/phpBB/includes/template/twig/tokenparser/include.php
new file mode 100644
index 0000000000..d9421095d1
--- /dev/null
+++ b/phpBB/includes/template/twig/tokenparser/include.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2009 Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Includes a template.
+ *
+ * <pre>
+ *   {% include 'header.html' %}
+ *     Body
+ *   {% include 'footer.html' %}
+ * </pre>
+ */
+class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include
+{
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @return string The tag name
+     */
+    public function getTag()
+    {
+        return 'INCLUDE';
+    }
+}
-- 
cgit v1.2.1


From 87cc8af26565dc1547383aa8c969cc5be48f0944 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Jun 2013 23:32:39 -0500
Subject: [feature/twig] Support our old INCLUDE statements (no quotes)

Better code for handling IF .blah

PHPBB3-11598
---
 phpBB/includes/template/twig/lexer.php | 36 ++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 45b97acf8c..70a21307ec 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -19,24 +19,34 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 {
 	protected function lexExpression()
 	{
+		parent::lexExpression();
+
+		// Last element parsed
+		$last_element = end($this->tokens);
+
+		/**
+		* Check for old fashioned INCLUDE statements without enclosed quotes
+		*/
+		if ($last_element->getValue() === 'INCLUDE')
+		{
+	        if (preg_match('#^\s*([a-zA-Z0-9_]+\.[a-zA-Z0-9]+)#', substr($this->code, $this->cursor), $match))
+	        {
+	            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
+	            $this->moveCursor($match[0]);
+	        }
+		}
+
 		/**
 		* This is some compatibility code to continue supporting expressions such as:
 		* <!-- IF .blah -->
-		* 
-		* This does not seem very efficient, but I have not been able to find a better 
-		* 	method which works properly (maybe lexData can do it better, @todo test this)
 		*/
-		$last_element = end($this->tokens);
-		if ($last_element->getValue() === '.')
+		if ($last_element->getValue() === 'IF')
 		{
-			$last_element2 = prev($this->tokens);
-
-			if ($last_element2->getValue() === 'IF')
-			{
-				array_pop($this->tokens);
-			}
+	        if (preg_match('#^\s*\.([a-zA-Z0-9\.]+)#', substr($this->code, $this->cursor), $match))
+	        {
+	            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
+	            $this->moveCursor($match[0]);
+	        }
 		}
-        
-		parent::lexExpression();
 	}
 }
-- 
cgit v1.2.1


From 9f8f500ba33963a28c656af8a28a9a6521af4616 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 10 Jun 2013 00:59:06 -0500
Subject: [feature/twig] Working on DEFINE

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php         |  1 +
 phpBB/includes/template/twig/lexer.php             | 15 +++++++-
 .../includes/template/twig/tokenparser/define.php  | 45 ++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/includes/template/twig/tokenparser/define.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index 29020fcf8e..bf4b0e8c54 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -29,6 +29,7 @@ class phpbb_template_twig_extension extends Twig_Extension
 			new phpbb_template_twig_tokenparser_include,
 			new phpbb_template_twig_tokenparser_event,
 			new phpbb_template_twig_tokenparser_begin,
+			new phpbb_template_twig_tokenparser_define,
 		);
 	}
 
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 70a21307ec..f60c58249c 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -42,11 +42,24 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		*/
 		if ($last_element->getValue() === 'IF')
 		{
-	        if (preg_match('#^\s*\.([a-zA-Z0-9\.]+)#', substr($this->code, $this->cursor), $match))
+	        if (preg_match('#^\s*\.([a-zA-Z0-9_\.]+)#', substr($this->code, $this->cursor), $match))
 	        {
 	            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
 	            $this->moveCursor($match[0]);
 	        }
 		}
+
+		/**
+		* This is some compatibility code to continue supporting expressions such as:
+		* <!-- DEFINE $VAR = 'foo' -->
+		*/
+		if ($last_element->getValue() === 'DEFINE')
+		{
+	        if (preg_match('#^\s*\$([A-Z0-9]+)#', substr($this->code, $this->cursor), $match))
+	        {
+	            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
+	            $this->moveCursor($match[1]);
+	        }
+		}
 	}
 }
diff --git a/phpBB/includes/template/twig/tokenparser/define.php b/phpBB/includes/template/twig/tokenparser/define.php
new file mode 100644
index 0000000000..8eb33c7ff9
--- /dev/null
+++ b/phpBB/includes/template/twig/tokenparser/define.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Defines a variable.
+ *
+ * <pre>
+ *  {% set foo = 'foo' %}
+ *
+ *  {% set foo = [1, 2] %}
+ *
+ *  {% set foo = {'foo': 'bar'} %}
+ *
+ *  {% set foo = 'foo' ~ 'bar' %}
+ *
+ *  {% set foo, bar = 'foo', 'bar' %}
+ *
+ *  {% set foo %}Some content{% endset %}
+ * </pre>
+ */
+class phpbb_template_twig_tokenparser_define extends Twig_TokenParser_Set
+{
+    public function decideBlockEnd(Twig_Token $token)
+    {
+        return $token->test('ENDDEFINE');
+    }
+
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @return string The tag name
+     */
+    public function getTag()
+    {
+        return 'DEFINE';
+    }
+}
-- 
cgit v1.2.1


From b775f67128c1c851a2e3343b230d2861e5431528 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 10 Jun 2013 10:00:22 -0500
Subject: [feature/twig] More work on the lexer

Committing what I have now to save it as I'm trying another method next

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php         |  1 +
 phpBB/includes/template/twig/lexer.php             | 17 +++++++++++++--
 phpBB/includes/template/twig/tokenparser/event.php | 25 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index bf4b0e8c54..a607bac150 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -39,6 +39,7 @@ class phpbb_template_twig_extension extends Twig_Extension
 			array(),
 			array(
 				'eq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				//'and' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 				'!==' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 			),
 		);
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index f60c58249c..21d8fb770e 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -19,11 +19,12 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 {
 	protected function lexExpression()
 	{
+    	var_dump(substr($this->code, $this->cursor, 40), $this->states);
 		parent::lexExpression();
 
 		// Last element parsed
 		$last_element = end($this->tokens);
-
+		
 		/**
 		* Check for old fashioned INCLUDE statements without enclosed quotes
 		*/
@@ -42,7 +43,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		*/
 		if ($last_element->getValue() === 'IF')
 		{
-	        if (preg_match('#^\s*\.([a-zA-Z0-9_\.]+)#', substr($this->code, $this->cursor), $match))
+	        if (preg_match('#^\s*(not\s)?\.([a-zA-Z0-9_\.]+)#', substr($this->code, $this->cursor), $match))
 	        {
 	            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
 	            $this->moveCursor($match[0]);
@@ -61,5 +62,17 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 	            $this->moveCursor($match[1]);
 	        }
 		}
+		
+		/**
+		* Check for old fashioned INCLUDE statements without enclosed quotes
+		*/
+		if ($last_element->getValue() === 'INCLUDE')
+		{
+	        if (preg_match('#^\s*([a-zA-Z0-9_]+\.[a-zA-Z0-9]+)#', substr($this->code, $this->cursor), $match))
+	        {
+	            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
+	            $this->moveCursor($match[0]);
+	        }
+		}
 	}
 }
diff --git a/phpBB/includes/template/twig/tokenparser/event.php b/phpBB/includes/template/twig/tokenparser/event.php
index cd211098d6..27a8350af1 100644
--- a/phpBB/includes/template/twig/tokenparser/event.php
+++ b/phpBB/includes/template/twig/tokenparser/event.php
@@ -21,6 +21,31 @@
  */
 class phpbb_template_twig_tokenparser_event extends Twig_TokenParser_Include
 {
+    protected function parseArguments()
+    {
+        $stream = $this->parser->getStream();
+
+        $ignoreMissing = true;
+
+        $variables = null;
+        if ($stream->test(Twig_Token::NAME_TYPE, 'with')) {
+            $stream->next();
+
+            $variables = $this->parser->getExpressionParser()->parseExpression();
+        }
+
+        $only = false;
+        if ($stream->test(Twig_Token::NAME_TYPE, 'only')) {
+            $stream->next();
+
+            $only = true;
+        }
+
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+        return array($variables, $only, $ignoreMissing);
+    }
+
     /**
      * Gets the tag name associated with this token parser.
      *
-- 
cgit v1.2.1


From 15114067e6c88e4ec8fa9d1ff66fd0de28b1144f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 10 Jun 2013 11:17:11 -0500
Subject: [feature/twig] Replace phpBB template code with Twig syntax, then
 parse w/Twig

Fixing begin token/node, adding includejs token/node

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php         |  6 +-
 phpBB/includes/template/twig/lexer.php             | 85 ++++++++--------------
 phpBB/includes/template/twig/node/begin.php        | 19 ++---
 phpBB/includes/template/twig/node/includejs.php    | 50 +++++++++++++
 phpBB/includes/template/twig/tokenparser/begin.php |  4 +-
 .../template/twig/tokenparser/includejs.php        | 49 +++++++++++++
 6 files changed, 146 insertions(+), 67 deletions(-)
 create mode 100644 phpBB/includes/template/twig/node/includejs.php
 create mode 100644 phpBB/includes/template/twig/tokenparser/includejs.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index a607bac150..c121a21800 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -26,10 +26,11 @@ class phpbb_template_twig_extension extends Twig_Extension
 	{
 		return array(
 			new phpbb_template_twig_tokenparser_if,
-			new phpbb_template_twig_tokenparser_include,
-			new phpbb_template_twig_tokenparser_event,
 			new phpbb_template_twig_tokenparser_begin,
 			new phpbb_template_twig_tokenparser_define,
+			new phpbb_template_twig_tokenparser_include,
+			new phpbb_template_twig_tokenparser_includejs,
+			new phpbb_template_twig_tokenparser_event,
 		);
 	}
 
@@ -39,7 +40,6 @@ class phpbb_template_twig_extension extends Twig_Extension
 			array(),
 			array(
 				'eq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				//'and' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 				'!==' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 			),
 		);
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 21d8fb770e..a880377583 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -17,62 +17,41 @@ if (!defined('IN_PHPBB'))
 
 class phpbb_template_twig_lexer extends Twig_Lexer
 {
-	protected function lexExpression()
+	public function tokenize($code, $filename = null)
 	{
-    	var_dump(substr($this->code, $this->cursor, 40), $this->states);
-		parent::lexExpression();
-
-		// Last element parsed
-		$last_element = end($this->tokens);
+		$valid_starting_tokens = array(
+			'BEGIN',
+			'BEGINELSE',
+			'END',
+			'IF',
+			'ELSE',
+			'ELSEIF',
+			'ENDIF',
+			'DEFINE',
+			'DEFINE',
+			'UNDEFINE',
+			'ENDDEFINE',
+			/*'INCLUDE',
+			'INCLUDEPHP',
+			'INCLUDEJS',*/
+			'PHP',
+			'ENDPHP',
+			'EVENT',
+		);
 		
-		/**
-		* Check for old fashioned INCLUDE statements without enclosed quotes
-		*/
-		if ($last_element->getValue() === 'INCLUDE')
-		{
-	        if (preg_match('#^\s*([a-zA-Z0-9_]+\.[a-zA-Z0-9]+)#', substr($this->code, $this->cursor), $match))
-	        {
-	            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
-	            $this->moveCursor($match[0]);
-	        }
-		}
-
-		/**
-		* This is some compatibility code to continue supporting expressions such as:
-		* <!-- IF .blah -->
-		*/
-		if ($last_element->getValue() === 'IF')
-		{
-	        if (preg_match('#^\s*(not\s)?\.([a-zA-Z0-9_\.]+)#', substr($this->code, $this->cursor), $match))
-	        {
-	            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
-	            $this->moveCursor($match[0]);
-	        }
-		}
+		// Replace <!-- INCLUDE blah.html --> with {% include 'blah.html' %}
+		$code = preg_replace('#<!-- INCLUDE(PHP|JS)? (.*?) -->#', "{% INCLUDE$1 '$2' %}", $code);
 
-		/**
-		* This is some compatibility code to continue supporting expressions such as:
-		* <!-- DEFINE $VAR = 'foo' -->
-		*/
-		if ($last_element->getValue() === 'DEFINE')
-		{
-	        if (preg_match('#^\s*\$([A-Z0-9]+)#', substr($this->code, $this->cursor), $match))
-	        {
-	            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
-	            $this->moveCursor($match[1]);
-	        }
-		}
+		// Replace all of our starting tokens, <!-- TOKEN --> with Twig style, {% TOKEN %}
+		// This also strips the $ inside of a tag directly after the token, which was used in <!-- DEFINE $NAME
+		// This also strips the . inside of a tag directly after the token, which was used in <!-- IF .blah
+		// This also strips outer parenthesis, <!-- IF (blah) --> becomes <!-- IF blah -->
+		$code = preg_replace('#<!-- (' . implode('|', $valid_starting_tokens) . ') (not )?(\$|\.)?(?:(.*?) ?)?-->#', '{% $1 $2$4 %}', $code);
 		
-		/**
-		* Check for old fashioned INCLUDE statements without enclosed quotes
-		*/
-		if ($last_element->getValue() === 'INCLUDE')
-		{
-	        if (preg_match('#^\s*([a-zA-Z0-9_]+\.[a-zA-Z0-9]+)#', substr($this->code, $this->cursor), $match))
-	        {
-	            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
-	            $this->moveCursor($match[0]);
-	        }
-		}
+		// Replace all of our variables, {VARNAME} or {$VARNAME}, with Twig style, {{ VARNAME }}
+		$code = preg_replace('#{\$?([A-Z_][A-Z_0-9]+)}#', '{{ $1 }}', $code);
+//echo $code;
+//exit;
+		return parent::tokenize($code, $filename);
 	}
 }
diff --git a/phpBB/includes/template/twig/node/begin.php b/phpBB/includes/template/twig/node/begin.php
index 1d47e35d87..52e0a96f2a 100644
--- a/phpBB/includes/template/twig/node/begin.php
+++ b/phpBB/includes/template/twig/node/begin.php
@@ -31,40 +31,41 @@ class phpbb_template_twig_node_begin extends Twig_Node
     public function compile(Twig_Compiler $compiler)
     {
 		$compiler
-			->write("if (!isset(\$blocks)) {\n")
+			->write("if (!isset(\$loops)) {\n")
 			->indent()
-			->write("\$blocks = array();")
+			->write("\$loops = array();")
 			->write("\$nestingLevel = 0;")
 			->outdent()
 			->write("}\n")
-			->write("\$blocks[\$nestingLevel] = array();\n")
+			->write("\$loops[\$nestingLevel] = array();\n")
 		;
 
         if (null !== $this->getNode('else')) {
-            $compiler->write("\$blocks[\$nestingLevel]['iterated'] = false;\n");
+            $compiler->write("\$loops[\$nestingLevel]['iterated'] = false;\n");
         }
 
         $compiler
-			->write("foreach (\$context['_phpbb_blocks']['")
+			->write("if (isset(\$context['loop'])) {")
+			->write("foreach (\$context['loop']['")
 			->write($this->getAttribute('beginName'))
-			->write("'] as \$blocks[\$nestingLevel]['i'] => \$blocks[\$nestingLevel]['values']) {")
+			->write("'] as \$loops[\$nestingLevel]['i'] => \$loops[\$nestingLevel]['values']) {")
 			->indent()
         ;
 
         $compiler->subcompile($this->getNode('body'));
 
         if (null !== $this->getNode('else')) {
-            $compiler->write("\$blocks[\$nestingLevel]['iterated'] = true;\n");
+            $compiler->write("\$loops[\$nestingLevel]['iterated'] = true;\n");
         }
 
         $compiler
             ->outdent()
-            ->write("}\n")
+            ->write("}}\n")
         ;
 
         if (null !== $this->getNode('else')) {
             $compiler
-                ->write("if (!\$blocks[\$nestingLevel]['iterated']) {\n")
+                ->write("if (!\$loops[\$nestingLevel]['iterated']) {\n")
                 ->indent()
                 ->subcompile($this->getNode('else'))
                 ->outdent()
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
new file mode 100644
index 0000000000..e30ab75125
--- /dev/null
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2009 Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents an include node.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class phpbb_template_twig_node_includejs extends Twig_Node_Include
+{
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     */
+    public function compile(Twig_Compiler $compiler)
+    {
+        $compiler->addDebugInfo($this);
+
+        $compiler
+            ->write("try {\n")
+            ->indent()
+        ;
+
+        $this->addGetTemplate($compiler);
+
+        $compiler->raw('->display(');
+
+        $this->addTemplateArguments($compiler);
+
+        $compiler->raw(");\n");
+
+        $compiler
+            ->write("} catch (Twig_Error_Loader \$e) {\n")
+            ->indent()
+            ->write("// ignore missing template\n")
+            ->outdent()
+            ->write("}\n\n")
+        ;
+    }
+}
diff --git a/phpBB/includes/template/twig/tokenparser/begin.php b/phpBB/includes/template/twig/tokenparser/begin.php
index 939f3b8f16..4a9933d680 100644
--- a/phpBB/includes/template/twig/tokenparser/begin.php
+++ b/phpBB/includes/template/twig/tokenparser/begin.php
@@ -37,7 +37,7 @@ class phpbb_template_twig_tokenparser_begin extends Twig_TokenParser_For
 
 		$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
 		$body = $this->parser->subparse(array($this, 'decideBeginFork'));
-		if ($this->parser->getStream()->next()->getValue() == 'ELSE') {
+		if ($this->parser->getStream()->next()->getValue() == 'BEGINELSE') {
 			$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
 			$else = $this->parser->subparse(array($this, 'decideBeginEnd'), true);
 		} else {
@@ -54,7 +54,7 @@ class phpbb_template_twig_tokenparser_begin extends Twig_TokenParser_For
         return $token->test(array('BEGINELSE', 'END'));
     }
 
-    public function decideForEnd(Twig_Token $token)
+    public function decideBeginEnd(Twig_Token $token)
     {
         return $token->test('END');
     }
diff --git a/phpBB/includes/template/twig/tokenparser/includejs.php b/phpBB/includes/template/twig/tokenparser/includejs.php
new file mode 100644
index 0000000000..36a1fcb585
--- /dev/null
+++ b/phpBB/includes/template/twig/tokenparser/includejs.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2009 Fabien Potencier
+ * (c) 2009 Armin Ronacher
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Includes a template.
+ *
+ * <pre>
+ *   {% include 'header.html' %}
+ *     Body
+ *   {% include 'footer.html' %}
+ * </pre>
+ */
+class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser_Include
+{
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Twig_Token $token A Twig_Token instance
+     *
+     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     */
+    public function parse(Twig_Token $token)
+    {
+        $expr = $this->parser->getExpressionParser()->parseExpression();
+
+        list($variables, $only, $ignoreMissing) = $this->parseArguments();
+
+        return new phpbb_template_twig_node_includejs($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
+    }
+
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @return string The tag name
+     */
+    public function getTag()
+    {
+        return 'INCLUDEJS';
+    }
+}
-- 
cgit v1.2.1


From eac3c1f75c370e9ddb7319db0b11c7c8fa161709 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 10 Jun 2013 11:57:51 -0500
Subject: [feature/twig] BEGIN loops now work

PHPBB3-11598
---
 phpBB/includes/template/twig/lexer.php      | 2 +-
 phpBB/includes/template/twig/node/begin.php | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index a880377583..4402760a7b 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -49,7 +49,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		$code = preg_replace('#<!-- (' . implode('|', $valid_starting_tokens) . ') (not )?(\$|\.)?(?:(.*?) ?)?-->#', '{% $1 $2$4 %}', $code);
 		
 		// Replace all of our variables, {VARNAME} or {$VARNAME}, with Twig style, {{ VARNAME }}
-		$code = preg_replace('#{\$?([A-Z_][A-Z_0-9]+)}#', '{{ $1 }}', $code);
+		$code = preg_replace('#{\$?([a-zA-Z0-9_\.]+)}#', '{{ $1 }}', $code);
 //echo $code;
 //exit;
 		return parent::tokenize($code, $filename);
diff --git a/phpBB/includes/template/twig/node/begin.php b/phpBB/includes/template/twig/node/begin.php
index 52e0a96f2a..1f4de9deda 100644
--- a/phpBB/includes/template/twig/node/begin.php
+++ b/phpBB/includes/template/twig/node/begin.php
@@ -45,10 +45,9 @@ class phpbb_template_twig_node_begin extends Twig_Node
         }
 
         $compiler
-			->write("if (isset(\$context['loop'])) {")
-			->write("foreach (\$context['loop']['")
-			->write($this->getAttribute('beginName'))
-			->write("'] as \$loops[\$nestingLevel]['i'] => \$loops[\$nestingLevel]['values']) {")
+			->write("if (isset(\$context['loop']['" . $this->getAttribute('beginName') . "'])) {")
+			->write("foreach (\$context['loop']['". $this->getAttribute('beginName'). "'] as \$" . $this->getAttribute('beginName') . ") {")
+			->write("\$context['". $this->getAttribute('beginName'). "'] = \$" . $this->getAttribute('beginName') . ";")
 			->indent()
         ;
 
-- 
cgit v1.2.1


From b035697800a4a208cd4e6be68bfd4033cc85af38 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 10 Jun 2013 12:59:47 -0500
Subject: [feature/twig] Replace phpBB template with Twig

Move phpbb_template class to phpbb_template_phpbb
Changed phpbb_template class to an interface
Switch services.yml to load phpbb_template_twig instead of phpbb_template

PHPBB3-11598
---
 phpBB/includes/template/phpbb.php     | 515 ++++++++++++++++++++++++++++++++++
 phpBB/includes/template/template.php  | 408 +--------------------------
 phpBB/includes/template/twig/twig.php | 369 ++++++++++++++++++++++++
 3 files changed, 897 insertions(+), 395 deletions(-)
 create mode 100644 phpBB/includes/template/phpbb.php
 create mode 100644 phpBB/includes/template/twig/twig.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/phpbb.php b/phpBB/includes/template/phpbb.php
new file mode 100644
index 0000000000..8f4d163f8c
--- /dev/null
+++ b/phpBB/includes/template/phpbb.php
@@ -0,0 +1,515 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2005 phpBB Group, sections (c) 2001 ispi of Lincoln Inc
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* @todo
+* IMG_ for image substitution?
+* {IMG_[key]:[alt]:[type]}
+* {IMG_ICON_CONTACT:CONTACT:full} -> $user->img('icon_contact', 'CONTACT', 'full');
+*
+* More in-depth...
+* yadayada
+*/
+
+/**
+* Base Template class.
+* @package phpBB3
+*/
+class phpbb_template_phpbb implements phpbb_template
+{
+	/**
+	* Template context.
+	* Stores template data used during template rendering.
+	* @var phpbb_template_context
+	*/
+	private $context;
+
+	/**
+	* Path of the cache directory for the template
+	* @var string
+	*/
+	public $cachepath = '';
+
+	/**
+	* phpBB root path
+	* @var string
+	*/
+	private $phpbb_root_path;
+
+	/**
+	* PHP file extension
+	* @var string
+	*/
+	private $php_ext;
+
+	/**
+	* phpBB config instance
+	* @var phpbb_config
+	*/
+	private $config;
+
+	/**
+	* Current user
+	* @var phpbb_user
+	*/
+	private $user;
+
+	/**
+	* Template locator
+	* @var phpbb_template_locator
+	*/
+	private $locator;
+
+	/**
+	* Extension manager.
+	*
+	* @var phpbb_extension_manager
+	*/
+	private $extension_manager;
+
+	/**
+	* Name of the style that the template being compiled and/or rendered
+	* belongs to, and its parents, in inheritance tree order.
+	*
+	* Used to invoke style-specific template events.
+	*
+	* @var array
+	*/
+	private $style_names;
+
+	/**
+	* Constructor.
+	*
+	* @param string $phpbb_root_path phpBB root path
+	* @param user $user current user
+	* @param phpbb_template_locator $locator template locator
+	* @param phpbb_template_context $context template context
+	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
+	*/
+	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_locator $locator, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null)
+	{
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+		$this->config = $config;
+		$this->user = $user;
+		$this->locator = $locator;
+		$this->context = $context;
+		$this->extension_manager = $extension_manager;
+	}
+
+	/**
+	* Sets the template filenames for handles.
+	*
+	* @param array $filename_array Should be a hash of handle => filename pairs.
+	*/
+	public function set_filenames(array $filename_array)
+	{
+		$this->locator->set_filenames($filename_array);
+
+		return true;
+	}
+
+	/**
+	* Sets the style names corresponding to style hierarchy being compiled
+	* and/or rendered.
+	*
+	* @param array $style_names List of style names in inheritance tree order
+	* @return null
+	*/
+	public function set_style_names(array $style_names)
+	{
+		$this->style_names = $style_names;
+	}
+
+	/**
+	* Clears all variables and blocks assigned to this template.
+	*/
+	public function destroy()
+	{
+		$this->context->clear();
+	}
+
+	/**
+	* Reset/empty complete block
+	*
+	* @param string $blockname Name of block to destroy
+	*/
+	public function destroy_block_vars($blockname)
+	{
+		$this->context->destroy_block_vars($blockname);
+	}
+
+	/**
+	* Display a template for provided handle.
+	*
+	* The template will be loaded and compiled, if necessary, first.
+	*
+	* This function calls hooks.
+	*
+	* @param string $handle Handle to display
+	* @return bool True on success, false on failure
+	*/
+	public function display($handle)
+	{
+		$result = $this->call_hook($handle, __FUNCTION__);
+		if ($result !== false)
+		{
+			return $result[0];
+		}
+
+		return $this->load_and_render($handle);
+	}
+
+	/**
+	* Loads a template for $handle, compiling it if necessary, and
+	* renders the template.
+	*
+	* @param string $handle Template handle to render
+	* @return bool True on success, false on failure
+	*/
+	private function load_and_render($handle)
+	{
+		$renderer = $this->_tpl_load($handle);
+
+		if ($renderer)
+		{
+			$renderer->render($this->context, $this->get_lang());
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	* Calls hook if any is defined.
+	*
+	* @param string $handle Template handle being displayed.
+	* @param string $method Method name of the caller.
+	*/
+	private function call_hook($handle, $method)
+	{
+		global $phpbb_hook;
+
+		if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, $method), $handle, $this))
+		{
+			if ($phpbb_hook->hook_return(array(__CLASS__, $method)))
+			{
+				$result = $phpbb_hook->hook_return_result(array(__CLASS__, $method));
+				return array($result);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	* Obtains language array.
+	* This is either lang property of $user property, or if
+	* it is not set an empty array.
+	* @return array language entries
+	*/
+	public function get_lang()
+	{
+		if (isset($this->user->lang))
+		{
+			$lang = $this->user->lang;
+		}
+		else
+		{
+			$lang = array();
+		}
+		return $lang;
+	}
+
+	/**
+	* Display the handle and assign the output to a template variable
+	* or return the compiled result.
+	*
+	* @param string $handle Handle to operate on
+	* @param string $template_var Template variable to assign compiled handle to
+	* @param bool $return_content If true return compiled handle, otherwise assign to $template_var
+	* @return bool|string false on failure, otherwise if $return_content is true return string of the compiled handle, otherwise return true
+	*/
+	public function assign_display($handle, $template_var = '', $return_content = true)
+	{
+		ob_start();
+		$result = $this->display($handle);
+		$contents = ob_get_clean();
+		if ($result === false)
+		{
+			return false;
+		}
+
+		if ($return_content)
+		{
+			return $contents;
+		}
+
+		$this->assign_var($template_var, $contents);
+
+		return true;
+	}
+
+	/**
+	* Obtains a template renderer for a template identified by specified
+	* handle. The template renderer can display the template later.
+	*
+	* Template source will first be compiled into php code.
+	* If template cache is writable the compiled php code will be stored
+	* on filesystem and template will not be subsequently recompiled.
+	* If template cache is not writable template source will be recompiled
+	* every time it is needed. DEBUG define and load_tplcompile
+	* configuration setting may be used to force templates to be always
+	* recompiled.
+	*
+	* Returns an object implementing phpbb_template_renderer, or null
+	* if template loading or compilation failed. Call render() on the
+	* renderer to display the template. This will result in template
+	* contents sent to the output stream (unless, of course, output
+	* buffering is in effect).
+	*
+	* @param string $handle Handle of the template to load
+	* @return phpbb_template_renderer Template renderer object, or null on failure
+	* @uses phpbb_template_compile is used to compile template source
+	*/
+	private function _tpl_load($handle)
+	{
+		$output_file = $this->_compiled_file_for_handle($handle);
+
+		$recompile = defined('DEBUG') ||
+			!file_exists($output_file) ||
+			@filesize($output_file) === 0;
+
+		if ($recompile || $this->config['load_tplcompile'])
+		{
+			// Set only if a recompile or an mtime check are required.
+			$source_file = $this->locator->get_source_file_for_handle($handle);
+
+			if (!$recompile && @filemtime($output_file) < @filemtime($source_file))
+			{
+				$recompile = true;
+			}
+		}
+
+		// Recompile page if the original template is newer, otherwise load the compiled version
+		if (!$recompile)
+		{
+			return new phpbb_template_renderer_include($output_file, $this);
+		}
+
+		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->style_names, $this->locator, $this->phpbb_root_path, $this->extension_manager, $this->user);
+
+		if ($compile->compile_file_to_file($source_file, $output_file) !== false)
+		{
+			$renderer = new phpbb_template_renderer_include($output_file, $this);
+		}
+		else if (($code = $compile->compile_file($source_file)) !== false)
+		{
+			$renderer = new phpbb_template_renderer_eval($code, $this);
+		}
+		else
+		{
+			$renderer = null;
+		}
+
+		return $renderer;
+	}
+
+	/**
+	* Determines compiled file path for handle $handle.
+	*
+	* @param string $handle Template handle (i.e. "friendly" template name)
+	* @return string Compiled file path
+	*/
+	private function _compiled_file_for_handle($handle)
+	{
+		$source_file = $this->locator->get_filename_for_handle($handle);
+		$compiled_file = $this->cachepath . str_replace('/', '.', $source_file) . '.' . $this->php_ext;
+		return $compiled_file;
+	}
+
+	/**
+	* Assign key variable pairs from an array
+	*
+	* @param array $vararray A hash of variable name => value pairs
+	*/
+	public function assign_vars(array $vararray)
+	{
+		foreach ($vararray as $key => $val)
+		{
+			$this->assign_var($key, $val);
+		}
+	}
+
+	/**
+	* Assign a single scalar value to a single key.
+	*
+	* Value can be a string, an integer or a boolean.
+	*
+	* @param string $varname Variable name
+	* @param string $varval Value to assign to variable
+	*/
+	public function assign_var($varname, $varval)
+	{
+		$this->context->assign_var($varname, $varval);
+	}
+
+	/**
+	* Append text to the string value stored in a key.
+	*
+	* Text is appended using the string concatenation operator (.).
+	*
+	* @param string $varname Variable name
+	* @param string $varval Value to append to variable
+	*/
+	public function append_var($varname, $varval)
+	{
+		$this->context->append_var($varname, $varval);
+	}
+
+	// Docstring is copied from phpbb_template_context method with the same name.
+	/**
+	* Assign key variable pairs from an array to a specified block
+	* @param string $blockname Name of block to assign $vararray to
+	* @param array $vararray A hash of variable name => value pairs
+	*/
+	public function assign_block_vars($blockname, array $vararray)
+	{
+		return $this->context->assign_block_vars($blockname, $vararray);
+	}
+
+	// Docstring is copied from phpbb_template_context method with the same name.
+	/**
+	* Change already assigned key variable pair (one-dimensional - single loop entry)
+	*
+	* An example of how to use this function:
+	* {@example alter_block_array.php}
+	*
+	* @param	string	$blockname	the blockname, for example 'loop'
+	* @param	array	$vararray	the var array to insert/add or merge
+	* @param	mixed	$key		Key to search for
+	*
+	* array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
+	*
+	* int: Position [the position to change or insert at directly given]
+	*
+	* If key is false the position is set to 0
+	* If key is true the position is set to the last entry
+	*
+	* @param	string	$mode		Mode to execute (valid modes are 'insert' and 'change')
+	*
+	*	If insert, the vararray is inserted at the given position (position counting from zero).
+	*	If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
+	*
+	* Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
+	* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
+	*
+	* @return bool false on error, true on success
+	*/
+	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
+	{
+		return $this->context->alter_block_array($blockname, $vararray, $key, $mode);
+	}
+
+	/**
+	* Include a separate template.
+	*
+	* This function is marked public due to the way the template
+	* implementation uses it. It is actually an implementation function
+	* and should not be considered part of template class's public API.
+	*
+	* @param string $filename Template filename to include
+	* @param bool $include True to include the file, false to just load it
+	* @uses template_compile is used to compile uncached templates
+	*/
+	public function _tpl_include($filename, $include = true)
+	{
+		$this->locator->set_filenames(array($filename => $filename));
+
+		if (!$this->load_and_render($filename))
+		{
+			// trigger_error cannot be used here, as the output already started
+			echo 'template->_tpl_include(): Failed including ' . htmlspecialchars($handle) . "\n";
+		}
+	}
+
+	/**
+	* Include a PHP file.
+	*
+	* If a relative path is passed in $filename, it is considered to be
+	* relative to board root ($phpbb_root_path). Absolute paths are
+	* also allowed.
+	*
+	* This function is marked public due to the way the template
+	* implementation uses it. It is actually an implementation function
+	* and should not be considered part of template class's public API.
+	*
+	* @param string $filename Path to PHP file to include
+	*/
+	public function _php_include($filename)
+	{
+		if (phpbb_is_absolute($filename))
+		{
+			$file = $filename;
+		}
+		else
+		{
+			$file = $this->phpbb_root_path . $filename;
+		}
+
+		if (!file_exists($file))
+		{
+			// trigger_error cannot be used here, as the output already started
+			echo 'template->_php_include(): File ' . htmlspecialchars($file) . " does not exist\n";
+			return;
+		}
+		include($file);
+	}
+
+	/**
+	* Include JS file
+	*
+	* @param string $file file name
+	* @param bool $locate True if file needs to be located
+	* @param bool $relative True if path is relative to phpBB root directory. Ignored if $locate == true
+	*/
+	public function _js_include($file, $locate = false, $relative = false)
+	{
+		// Locate file
+		if ($locate)
+		{
+			$located = $this->locator->get_first_file_location(array($file), false, true);
+			if ($located)
+			{
+				$file = $located;
+			}
+		}
+		else if ($relative)
+		{
+			$file = $this->phpbb_root_path . $file;
+		}
+
+		$file .= (strpos($file, '?') === false) ? '?' : '&';
+		$file .= 'assets_version=' . $this->config['assets_version'];
+
+		// Add HTML code
+		$code = '<script src="' . htmlspecialchars($file) . '"></script>';
+		$this->context->append_var('SCRIPTS', $code);
+	}
+}
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index bbec768613..5dadd34084 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package phpBB3
-* @copyright (c) 2005 phpBB Group, sections (c) 2001 ispi of Lincoln Inc
+* @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
@@ -15,113 +15,14 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-/**
-* @todo
-* IMG_ for image substitution?
-* {IMG_[key]:[alt]:[type]}
-* {IMG_ICON_CONTACT:CONTACT:full} -> $user->img('icon_contact', 'CONTACT', 'full');
-*
-* More in-depth...
-* yadayada
-*/
-
-/**
-* Base Template class.
-* @package phpBB3
-*/
-class phpbb_template
+interface phpbb_template
 {
-	/**
-	* Template context.
-	* Stores template data used during template rendering.
-	* @var phpbb_template_context
-	*/
-	private $context;
-
-	/**
-	* Path of the cache directory for the template
-	* @var string
-	*/
-	public $cachepath = '';
-
-	/**
-	* phpBB root path
-	* @var string
-	*/
-	private $phpbb_root_path;
-
-	/**
-	* PHP file extension
-	* @var string
-	*/
-	private $php_ext;
-
-	/**
-	* phpBB config instance
-	* @var phpbb_config
-	*/
-	private $config;
-
-	/**
-	* Current user
-	* @var phpbb_user
-	*/
-	private $user;
-
-	/**
-	* Template locator
-	* @var phpbb_template_locator
-	*/
-	private $locator;
-
-	/**
-	* Extension manager.
-	*
-	* @var phpbb_extension_manager
-	*/
-	private $extension_manager;
-
-	/**
-	* Name of the style that the template being compiled and/or rendered
-	* belongs to, and its parents, in inheritance tree order.
-	*
-	* Used to invoke style-specific template events.
-	*
-	* @var array
-	*/
-	private $style_names;
-
-	/**
-	* Constructor.
-	*
-	* @param string $phpbb_root_path phpBB root path
-	* @param user $user current user
-	* @param phpbb_template_locator $locator template locator
-	* @param phpbb_template_context $context template context
-	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
-	*/
-	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_locator $locator, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->config = $config;
-		$this->user = $user;
-		$this->locator = $locator;
-		$this->context = $context;
-		$this->extension_manager = $extension_manager;
-	}
-
 	/**
 	* Sets the template filenames for handles.
 	*
 	* @param array $filename_array Should be a hash of handle => filename pairs.
 	*/
-	public function set_filenames(array $filename_array)
-	{
-		$this->locator->set_filenames($filename_array);
-
-		return true;
-	}
+	public function set_filenames(array $filename_array);
 
 	/**
 	* Sets the style names corresponding to style hierarchy being compiled
@@ -130,28 +31,19 @@ class phpbb_template
 	* @param array $style_names List of style names in inheritance tree order
 	* @return null
 	*/
-	public function set_style_names(array $style_names)
-	{
-		$this->style_names = $style_names;
-	}
+	public function set_style_names(array $style_names);
 
 	/**
 	* Clears all variables and blocks assigned to this template.
 	*/
-	public function destroy()
-	{
-		$this->context->clear();
-	}
+	public function destroy();
 
 	/**
 	* Reset/empty complete block
 	*
 	* @param string $blockname Name of block to destroy
 	*/
-	public function destroy_block_vars($blockname)
-	{
-		$this->context->destroy_block_vars($blockname);
-	}
+	public function destroy_block_vars($blockname);
 
 	/**
 	* Display a template for provided handle.
@@ -163,79 +55,7 @@ class phpbb_template
 	* @param string $handle Handle to display
 	* @return bool True on success, false on failure
 	*/
-	public function display($handle)
-	{
-		$result = $this->call_hook($handle, __FUNCTION__);
-		if ($result !== false)
-		{
-			return $result[0];
-		}
-
-		return $this->load_and_render($handle);
-	}
-
-	/**
-	* Loads a template for $handle, compiling it if necessary, and
-	* renders the template.
-	*
-	* @param string $handle Template handle to render
-	* @return bool True on success, false on failure
-	*/
-	private function load_and_render($handle)
-	{
-		$renderer = $this->_tpl_load($handle);
-
-		if ($renderer)
-		{
-			$renderer->render($this->context, $this->get_lang());
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	* Calls hook if any is defined.
-	*
-	* @param string $handle Template handle being displayed.
-	* @param string $method Method name of the caller.
-	*/
-	private function call_hook($handle, $method)
-	{
-		global $phpbb_hook;
-
-		if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, $method), $handle, $this))
-		{
-			if ($phpbb_hook->hook_return(array(__CLASS__, $method)))
-			{
-				$result = $phpbb_hook->hook_return_result(array(__CLASS__, $method));
-				return array($result);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Obtains language array.
-	* This is either lang property of $user property, or if
-	* it is not set an empty array.
-	* @return array language entries
-	*/
-	public function get_lang()
-	{
-		if (isset($this->user->lang))
-		{
-			$lang = $this->user->lang;
-		}
-		else
-		{
-			$lang = array();
-		}
-		return $lang;
-	}
+	public function display($handle);
 
 	/**
 	* Display the handle and assign the output to a template variable
@@ -246,116 +66,14 @@ class phpbb_template
 	* @param bool $return_content If true return compiled handle, otherwise assign to $template_var
 	* @return bool|string false on failure, otherwise if $return_content is true return string of the compiled handle, otherwise return true
 	*/
-	public function assign_display($handle, $template_var = '', $return_content = true)
-	{
-		ob_start();
-		$result = $this->display($handle);
-		$contents = ob_get_clean();
-		if ($result === false)
-		{
-			return false;
-		}
-
-		if ($return_content)
-		{
-			return $contents;
-		}
-
-		$this->assign_var($template_var, $contents);
-
-		return true;
-	}
-
-	/**
-	* Obtains a template renderer for a template identified by specified
-	* handle. The template renderer can display the template later.
-	*
-	* Template source will first be compiled into php code.
-	* If template cache is writable the compiled php code will be stored
-	* on filesystem and template will not be subsequently recompiled.
-	* If template cache is not writable template source will be recompiled
-	* every time it is needed. DEBUG define and load_tplcompile
-	* configuration setting may be used to force templates to be always
-	* recompiled.
-	*
-	* Returns an object implementing phpbb_template_renderer, or null
-	* if template loading or compilation failed. Call render() on the
-	* renderer to display the template. This will result in template
-	* contents sent to the output stream (unless, of course, output
-	* buffering is in effect).
-	*
-	* @param string $handle Handle of the template to load
-	* @return phpbb_template_renderer Template renderer object, or null on failure
-	* @uses phpbb_template_compile is used to compile template source
-	*/
-	private function _tpl_load($handle)
-	{
-		$output_file = $this->_compiled_file_for_handle($handle);
-
-		$recompile = defined('DEBUG') ||
-			!file_exists($output_file) ||
-			@filesize($output_file) === 0;
-
-		if ($recompile || $this->config['load_tplcompile'])
-		{
-			// Set only if a recompile or an mtime check are required.
-			$source_file = $this->locator->get_source_file_for_handle($handle);
-
-			if (!$recompile && @filemtime($output_file) < @filemtime($source_file))
-			{
-				$recompile = true;
-			}
-		}
-
-		// Recompile page if the original template is newer, otherwise load the compiled version
-		if (!$recompile)
-		{
-			return new phpbb_template_renderer_include($output_file, $this);
-		}
-
-		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->style_names, $this->locator, $this->phpbb_root_path, $this->extension_manager, $this->user);
-
-		if ($compile->compile_file_to_file($source_file, $output_file) !== false)
-		{
-			$renderer = new phpbb_template_renderer_include($output_file, $this);
-		}
-		else if (($code = $compile->compile_file($source_file)) !== false)
-		{
-			$renderer = new phpbb_template_renderer_eval($code, $this);
-		}
-		else
-		{
-			$renderer = null;
-		}
-
-		return $renderer;
-	}
-
-	/**
-	* Determines compiled file path for handle $handle.
-	*
-	* @param string $handle Template handle (i.e. "friendly" template name)
-	* @return string Compiled file path
-	*/
-	private function _compiled_file_for_handle($handle)
-	{
-		$source_file = $this->locator->get_filename_for_handle($handle);
-		$compiled_file = $this->cachepath . str_replace('/', '.', $source_file) . '.' . $this->php_ext;
-		return $compiled_file;
-	}
+	public function assign_display($handle, $template_var = '', $return_content = true);
 
 	/**
 	* Assign key variable pairs from an array
 	*
 	* @param array $vararray A hash of variable name => value pairs
 	*/
-	public function assign_vars(array $vararray)
-	{
-		foreach ($vararray as $key => $val)
-		{
-			$this->assign_var($key, $val);
-		}
-	}
+	public function assign_vars(array $vararray);
 
 	/**
 	* Assign a single scalar value to a single key.
@@ -365,10 +83,7 @@ class phpbb_template
 	* @param string $varname Variable name
 	* @param string $varval Value to assign to variable
 	*/
-	public function assign_var($varname, $varval)
-	{
-		$this->context->assign_var($varname, $varval);
-	}
+	public function assign_var($varname, $varval);
 
 	/**
 	* Append text to the string value stored in a key.
@@ -378,23 +93,15 @@ class phpbb_template
 	* @param string $varname Variable name
 	* @param string $varval Value to append to variable
 	*/
-	public function append_var($varname, $varval)
-	{
-		$this->context->append_var($varname, $varval);
-	}
+	public function append_var($varname, $varval);
 
-	// Docstring is copied from phpbb_template_context method with the same name.
 	/**
 	* Assign key variable pairs from an array to a specified block
 	* @param string $blockname Name of block to assign $vararray to
 	* @param array $vararray A hash of variable name => value pairs
 	*/
-	public function assign_block_vars($blockname, array $vararray)
-	{
-		return $this->context->assign_block_vars($blockname, $vararray);
-	}
+	public function assign_block_vars($blockname, array $vararray);
 
-	// Docstring is copied from phpbb_template_context method with the same name.
 	/**
 	* Change already assigned key variable pair (one-dimensional - single loop entry)
 	*
@@ -422,94 +129,5 @@ class phpbb_template
 	*
 	* @return bool false on error, true on success
 	*/
-	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
-	{
-		return $this->context->alter_block_array($blockname, $vararray, $key, $mode);
-	}
-
-	/**
-	* Include a separate template.
-	*
-	* This function is marked public due to the way the template
-	* implementation uses it. It is actually an implementation function
-	* and should not be considered part of template class's public API.
-	*
-	* @param string $filename Template filename to include
-	* @param bool $include True to include the file, false to just load it
-	* @uses template_compile is used to compile uncached templates
-	*/
-	public function _tpl_include($filename, $include = true)
-	{
-		$this->locator->set_filenames(array($filename => $filename));
-
-		if (!$this->load_and_render($filename))
-		{
-			// trigger_error cannot be used here, as the output already started
-			echo 'template->_tpl_include(): Failed including ' . htmlspecialchars($handle) . "\n";
-		}
-	}
-
-	/**
-	* Include a PHP file.
-	*
-	* If a relative path is passed in $filename, it is considered to be
-	* relative to board root ($phpbb_root_path). Absolute paths are
-	* also allowed.
-	*
-	* This function is marked public due to the way the template
-	* implementation uses it. It is actually an implementation function
-	* and should not be considered part of template class's public API.
-	*
-	* @param string $filename Path to PHP file to include
-	*/
-	public function _php_include($filename)
-	{
-		if (phpbb_is_absolute($filename))
-		{
-			$file = $filename;
-		}
-		else
-		{
-			$file = $this->phpbb_root_path . $filename;
-		}
-
-		if (!file_exists($file))
-		{
-			// trigger_error cannot be used here, as the output already started
-			echo 'template->_php_include(): File ' . htmlspecialchars($file) . " does not exist\n";
-			return;
-		}
-		include($file);
-	}
-
-	/**
-	* Include JS file
-	*
-	* @param string $file file name
-	* @param bool $locate True if file needs to be located
-	* @param bool $relative True if path is relative to phpBB root directory. Ignored if $locate == true
-	*/
-	public function _js_include($file, $locate = false, $relative = false)
-	{
-		// Locate file
-		if ($locate)
-		{
-			$located = $this->locator->get_first_file_location(array($file), false, true);
-			if ($located)
-			{
-				$file = $located;
-			}
-		}
-		else if ($relative)
-		{
-			$file = $this->phpbb_root_path . $file;
-		}
-
-		$file .= (strpos($file, '?') === false) ? '?' : '&';
-		$file .= 'assets_version=' . $this->config['assets_version'];
-
-		// Add HTML code
-		$code = '<script src="' . htmlspecialchars($file) . '"></script>';
-		$this->context->append_var('SCRIPTS', $code);
-	}
+	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert');
 }
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
new file mode 100644
index 0000000000..f48bedcbf2
--- /dev/null
+++ b/phpBB/includes/template/twig/twig.php
@@ -0,0 +1,369 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Twig Template class.
+* @package phpBB3
+*/
+class phpbb_template_twig implements phpbb_template
+{
+	/**
+	* Template context.
+	* Stores template data used during template rendering.
+	* @var array
+	*/
+	protected $context = array();
+
+	/**
+	* Path of the cache directory for the template
+	* @var string
+	*/
+	public $cachepath = '';
+
+	/**
+	* phpBB root path
+	* @var string
+	*/
+	private $phpbb_root_path;
+
+	/**
+	* PHP file extension
+	* @var string
+	*/
+	private $php_ext;
+
+	/**
+	* phpBB config instance
+	* @var phpbb_config
+	*/
+	private $config;
+
+	/**
+	* Current user
+	* @var phpbb_user
+	*/
+	private $user;
+
+	/**
+	* Template locator
+	* @var phpbb_template_locator
+	*/
+	private $locator;
+
+	/**
+	* Extension manager.
+	*
+	* @var phpbb_extension_manager
+	*/
+	private $extension_manager;
+
+	/**
+	* Name of the style that the template being compiled and/or rendered
+	* belongs to, and its parents, in inheritance tree order.
+	*
+	* Used to invoke style-specific template events.
+	*
+	* @var array
+	*/
+	private $style_names;
+
+	/**
+	* Twig Environment
+	*
+	* @var Twig_Environment
+	*/
+	protected $twig;
+
+	/**
+	* Constructor.
+	*
+	* @param string $phpbb_root_path phpBB root path
+	* @param user $user current user
+	* @param phpbb_template_locator $locator template locator
+	* @param phpbb_template_context $context template context
+	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
+	*/
+	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_locator $locator, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null)
+	{
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+		$this->config = $config;
+		$this->user = $user;
+		$this->locator = $locator;
+		$this->extension_manager = $extension_manager;
+
+		$loader = new Twig_Loader_Filesystem($phpbb_root_path . 'styles/prosilver/template/');
+		$this->twig = new Twig_Environment($loader, array(
+		    //'cache'			=> $phpbb_root_path . 'cache/twig/',
+		    'debug'			=> true,
+		    'auto_reload'	=> true,
+    		'autoescape'	=> false,
+		));
+
+		$this->twig->addExtension(new phpbb_template_twig_extension);
+
+		$lexer = new phpbb_template_twig_lexer($this->twig);
+
+		$this->twig->setLexer($lexer);
+	}
+
+	/**
+	* Sets the template filenames for handles.
+	*
+	* @param array $filename_array Should be a hash of handle => filename pairs.
+	*/
+	public function set_filenames(array $filename_array)
+	{
+		$this->locator->set_filenames($filename_array);
+
+		return true;
+	}
+
+	/**
+	* Sets the style names corresponding to style hierarchy being compiled
+	* and/or rendered.
+	*
+	* @param array $style_names List of style names in inheritance tree order
+	* @return null
+	*/
+	public function set_style_names(array $style_names)
+	{
+		$this->style_names = $style_names;
+	}
+
+	/**
+	* Clears all variables and blocks assigned to this template.
+	*/
+	public function destroy()
+	{
+		$this->context = array();
+	}
+
+	/**
+	* Reset/empty complete block
+	*
+	* @param string $blockname Name of block to destroy
+	*/
+	public function destroy_block_vars($blockname)
+	{
+		if (!isset($this->context['loop'][$blockname]))
+		{
+			return;
+		}
+
+		unset($this->context['loop'][$blockname]);
+	}
+
+	/**
+	* Display a template for provided handle.
+	*
+	* The template will be loaded and compiled, if necessary, first.
+	*
+	* This function calls hooks.
+	*
+	* @param string $handle Handle to display
+	* @return bool True on success, false on failure
+	*/
+	public function display($handle)
+	{
+		$result = $this->call_hook($handle, __FUNCTION__);
+		if ($result !== false)
+		{
+			return $result[0];
+		}
+
+		try
+		{
+			echo $this->twig->render($this->locator->get_filename_for_handle($handle), $this->context);
+		}
+		catch (Twig_Error $e)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	* Calls hook if any is defined.
+	*
+	* @param string $handle Template handle being displayed.
+	* @param string $method Method name of the caller.
+	*/
+	protected function call_hook($handle, $method)
+	{
+		global $phpbb_hook;
+
+		if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, $method), $handle, $this))
+		{
+			if ($phpbb_hook->hook_return(array(__CLASS__, $method)))
+			{
+				$result = $phpbb_hook->hook_return_result(array(__CLASS__, $method));
+				return array($result);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	* Obtains language array.
+	* This is either lang property of $user property, or if
+	* it is not set an empty array.
+	* @return array language entries
+	*/
+	public function get_lang()
+	{
+		if (isset($this->user->lang))
+		{
+			$lang = $this->user->lang;
+		}
+		else
+		{
+			$lang = array();
+		}
+		return $lang;
+	}
+
+	/**
+	* Display the handle and assign the output to a template variable
+	* or return the compiled result.
+	*
+	* @param string $handle Handle to operate on
+	* @param string $template_var Template variable to assign compiled handle to
+	* @param bool $return_content If true return compiled handle, otherwise assign to $template_var
+	* @return bool|string false on failure, otherwise if $return_content is true return string of the compiled handle, otherwise return true
+	*/
+	public function assign_display($handle, $template_var = '', $return_content = true)
+	{
+		ob_start();
+		$result = $this->display($handle);
+		$contents = ob_get_clean();
+		if ($result === false)
+		{
+			return false;
+		}
+
+		if ($return_content)
+		{
+			return $contents;
+		}
+
+		$this->assign_var($template_var, $contents);
+
+		return true;
+	}
+
+	/**
+	* Assign key variable pairs from an array
+	*
+	* @param array $vararray A hash of variable name => value pairs
+	*/
+	public function assign_vars(array $vararray)
+	{
+		foreach ($vararray as $key => $val)
+		{
+			$this->assign_var($key, $val);
+		}
+	}
+
+	/**
+	* Assign a single scalar value to a single key.
+	*
+	* Value can be a string, an integer or a boolean.
+	*
+	* @param string $varname Variable name
+	* @param string $varval Value to assign to variable
+	*/
+	public function assign_var($varname, $varval)
+	{
+		$this->context[$varname] = $varval;
+	}
+
+	/**
+	* Append text to the string value stored in a key.
+	*
+	* Text is appended using the string concatenation operator (.).
+	*
+	* @param string $varname Variable name
+	* @param string $varval Value to append to variable
+	*/
+	public function append_var($varname, $varval)
+	{
+		$this->context[$varname] .= $varval;
+	}
+
+	// Docstring is copied from phpbb_template_context method with the same name.
+	/**
+	* Assign key variable pairs from an array to a specified block
+	* @param string $blockname Name of block to assign $vararray to
+	* @param array $vararray A hash of variable name => value pairs
+	*/
+	public function assign_block_vars($blockname, array $vararray)
+	{
+		$this->context['loop'][$blockname][] = $vararray;
+	}
+
+	// Docstring is copied from phpbb_template_context method with the same name.
+	/**
+	* Change already assigned key variable pair (one-dimensional - single loop entry)
+	*
+	* An example of how to use this function:
+	* {@example alter_block_array.php}
+	*
+	* @param	string	$blockname	the blockname, for example 'loop'
+	* @param	array	$vararray	the var array to insert/add or merge
+	* @param	mixed	$key		Key to search for
+	*
+	* array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
+	*
+	* int: Position [the position to change or insert at directly given]
+	*
+	* If key is false the position is set to 0
+	* If key is true the position is set to the last entry
+	*
+	* @param	string	$mode		Mode to execute (valid modes are 'insert' and 'change')
+	*
+	*	If insert, the vararray is inserted at the given position (position counting from zero).
+	*	If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
+	*
+	* Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
+	* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
+	*
+	* @return bool false on error, true on success
+	*/
+	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
+	{
+		switch ($mode)
+		{
+			case 'insert' :
+				$this->context['loop'][$blockname][$key] = $vararray;
+			break;
+
+			case 'change' :
+				if (!isset($this->context['loop'][$blockname][$key]))
+				{
+					return false;
+				}
+
+				$this->context['loop'][$blockname][$key] = array_merge($this->context['loop'][$blockname][$key], $vararray);
+			break;
+		}
+
+		return true;
+	}
+}
-- 
cgit v1.2.1


From 2d934704e23c7ea41f1e94191858eac8fe30833a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 11 Jun 2013 14:10:49 +0200
Subject: [ticket/11602] Do not call localize_errors() if avatars are disabled

The avatar manager's method localize_errors() shouldn't be called if
avatars are disabled in the config.

PHPBB3-11602
---
 phpBB/includes/acp/acp_groups.php | 2 +-
 phpBB/includes/ucp/ucp_groups.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 847ccfb3cc..c79699d465 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -591,7 +591,7 @@ class acp_groups
 
 				$avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
 
-				if (!$update)
+				if (isset($phpbb_avatar_manager) && !$update)
 				{
 					// Merge any avatar errors into the primary error array
 					$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index af08533a7d..aada0525a8 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -691,7 +691,7 @@ class ucp_groups
 							}
 						}
 
-						if (!$update)
+						if (isset($phpbb_avatar_manager) && !$update)
 						{
 							// Merge any avatars errors into the primary error array
 							$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
-- 
cgit v1.2.1


From 9acde23a0562ebd57092ed5701bb6a63e623b891 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 11 Jun 2013 09:41:15 -0500
Subject: [feature/twig] Language output assignments, using context class again

PHPBB3-11598
---
 phpBB/includes/template/context.php   | 20 +++++++++
 phpBB/includes/template/twig/twig.php | 76 ++++++++++++++++++++---------------
 2 files changed, 63 insertions(+), 33 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
index ec09da1cf3..3abab4f31b 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/template/context.php
@@ -82,6 +82,26 @@ class phpbb_template_context
 		return true;
 	}
 
+	/**
+	* Get (non-referenced) rootref
+	*
+	* @return array
+	*/
+	public function get_rootref()
+	{
+		return $this->rootref;
+	}
+
+	/**
+	* Get (non-referenced) tpldata
+	*
+	* @return array
+	*/
+	public function get_tpldata()
+	{
+		return $this->tpldata;
+	}
+
 	/**
 	* Returns a reference to template data array.
 	*
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index f48bedcbf2..81c03b6ef1 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -24,9 +24,9 @@ class phpbb_template_twig implements phpbb_template
 	/**
 	* Template context.
 	* Stores template data used during template rendering.
-	* @var array
+	* @var phpbb_template_context
 	*/
-	protected $context = array();
+	protected $context;
 
 	/**
 	* Path of the cache directory for the template
@@ -38,38 +38,38 @@ class phpbb_template_twig implements phpbb_template
 	* phpBB root path
 	* @var string
 	*/
-	private $phpbb_root_path;
+	protected $phpbb_root_path;
 
 	/**
 	* PHP file extension
 	* @var string
 	*/
-	private $php_ext;
+	protected $php_ext;
 
 	/**
 	* phpBB config instance
 	* @var phpbb_config
 	*/
-	private $config;
+	protected $config;
 
 	/**
 	* Current user
 	* @var phpbb_user
 	*/
-	private $user;
+	protected $user;
 
 	/**
 	* Template locator
 	* @var phpbb_template_locator
 	*/
-	private $locator;
+	protected $locator;
 
 	/**
 	* Extension manager.
 	*
 	* @var phpbb_extension_manager
 	*/
-	private $extension_manager;
+	protected $extension_manager;
 
 	/**
 	* Name of the style that the template being compiled and/or rendered
@@ -79,7 +79,7 @@ class phpbb_template_twig implements phpbb_template
 	*
 	* @var array
 	*/
-	private $style_names;
+	protected $style_names;
 
 	/**
 	* Twig Environment
@@ -104,6 +104,7 @@ class phpbb_template_twig implements phpbb_template
 		$this->config = $config;
 		$this->user = $user;
 		$this->locator = $locator;
+		$this->context = $context;
 		$this->extension_manager = $extension_manager;
 
 		$loader = new Twig_Loader_Filesystem($phpbb_root_path . 'styles/prosilver/template/');
@@ -160,12 +161,7 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	public function destroy_block_vars($blockname)
 	{
-		if (!isset($this->context['loop'][$blockname]))
-		{
-			return;
-		}
-
-		unset($this->context['loop'][$blockname]);
+		return $this->context->destroy_block_vars($blockname);
 	}
 
 	/**
@@ -188,7 +184,7 @@ class phpbb_template_twig implements phpbb_template
 
 		try
 		{
-			echo $this->twig->render($this->locator->get_filename_for_handle($handle), $this->context);
+			echo $this->twig->render($this->locator->get_filename_for_handle($handle), $this->get_template_vars());
 		}
 		catch (Twig_Error $e)
 		{
@@ -291,7 +287,7 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	public function assign_var($varname, $varval)
 	{
-		$this->context[$varname] = $varval;
+		return $this->context->assign_var($varname, $varval);
 	}
 
 	/**
@@ -304,7 +300,7 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	public function append_var($varname, $varval)
 	{
-		$this->context[$varname] .= $varval;
+		return $this->context->append_var($varname, $varval);
 	}
 
 	// Docstring is copied from phpbb_template_context method with the same name.
@@ -315,7 +311,7 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	public function assign_block_vars($blockname, array $vararray)
 	{
-		$this->context['loop'][$blockname][] = $vararray;
+		return $this->context->assign_block_vars($blockname, $vararray);
 	}
 
 	// Docstring is copied from phpbb_template_context method with the same name.
@@ -348,22 +344,36 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
 	{
-		switch ($mode)
+		return $this->context->alter_block_array($blockname, $vararray, $key, $mode);
+	}
+
+	protected function get_template_vars()
+	{
+		$vars = array();
+
+		// Work-around for now
+		foreach ($this->user->lang as $key => $value)
 		{
-			case 'insert' :
-				$this->context['loop'][$blockname][$key] = $vararray;
-			break;
-
-			case 'change' :
-				if (!isset($this->context['loop'][$blockname][$key]))
-				{
-					return false;
-				}
-
-				$this->context['loop'][$blockname][$key] = array_merge($this->context['loop'][$blockname][$key], $vararray);
-			break;
+			if (is_array($value))
+			{
+				continue;
+			}
+
+			$vars['L_' . strtoupper($key)] = $value;
+			$vars['LA_' . strtoupper($key)] = addslashes($value);
 		}
 
-		return true;
+		$vars = array_merge(
+			$vars,
+			$this->context->get_rootref(),
+			array(
+				'loop'	=> $this->context->get_tpldata(),
+			)
+		);
+
+		// cleanup
+		unset($vars['loop']['.']);
+
+		return $vars;
 	}
 }
-- 
cgit v1.2.1


From 612dbad63fa6f85fdaa0298e67f89d7c9010dbe6 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 11 Jun 2013 10:57:00 -0500
Subject: [feature/twig] Fixing IF .blah correctly

PHPBB3-11598
---
 phpBB/includes/template/twig/lexer.php | 29 ++++++++++++++++++++++-------
 phpBB/includes/template/twig/twig.php  |  7 ++++++-
 2 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 4402760a7b..71e3e9c27e 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -38,20 +38,35 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			'ENDPHP',
 			'EVENT',
 		);
-		
+
 		// Replace <!-- INCLUDE blah.html --> with {% include 'blah.html' %}
 		$code = preg_replace('#<!-- INCLUDE(PHP|JS)? (.*?) -->#', "{% INCLUDE$1 '$2' %}", $code);
 
+		// This strips the $ inside of a tag directly after the token, which was used in <!-- DEFINE $NAME
+		$code = preg_replace('#<!-- DEFINE \$(.*)-->#', '<!-- DEFINE $1-->', $code);
+
+		// This strips the . inside of a tag directly before a variable name, which was used in <!-- IF .blah
+		$code = preg_replace_callback('#<!-- IF((.*)[\s][\$|\.]([^\s]+)(.*))-->#', array($this, 'tag_if_cleanup'), $code);
+
 		// Replace all of our starting tokens, <!-- TOKEN --> with Twig style, {% TOKEN %}
-		// This also strips the $ inside of a tag directly after the token, which was used in <!-- DEFINE $NAME
-		// This also strips the . inside of a tag directly after the token, which was used in <!-- IF .blah
 		// This also strips outer parenthesis, <!-- IF (blah) --> becomes <!-- IF blah -->
-		$code = preg_replace('#<!-- (' . implode('|', $valid_starting_tokens) . ') (not )?(\$|\.)?(?:(.*?) ?)?-->#', '{% $1 $2$4 %}', $code);
-		
+		$code = preg_replace('#<!-- (' . implode('|', $valid_starting_tokens) . ')(?: (.*?) ?)?-->#', '{% $1 $2 %}', $code);
+
 		// Replace all of our variables, {VARNAME} or {$VARNAME}, with Twig style, {{ VARNAME }}
 		$code = preg_replace('#{\$?([a-zA-Z0-9_\.]+)}#', '{{ $1 }}', $code);
-//echo $code;
-//exit;
+
 		return parent::tokenize($code, $filename);
 	}
+
+	/**
+	* preg_replace_callback to clean up IF statements
+	*
+	* This strips the . inside of a tag directly before a variable name, which was used in <!-- IF .blah
+	*
+	* @param mixed $matches
+	*/
+	protected function tag_if_cleanup($matches)
+	{
+		return '<!-- IF ' . preg_replace('#\s\.([a-zA-Z_0-9]+)#', ' $1', $matches[1]) . ' -->';
+	}
 }
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 81c03b6ef1..a067827f70 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -347,6 +347,11 @@ class phpbb_template_twig implements phpbb_template
 		return $this->context->alter_block_array($blockname, $vararray, $key, $mode);
 	}
 
+	/**
+	* Get template vars in a format Twig will use (from the context)
+	*
+	* @return array
+	*/
 	protected function get_template_vars()
 	{
 		$vars = array();
@@ -354,7 +359,7 @@ class phpbb_template_twig implements phpbb_template
 		// Work-around for now
 		foreach ($this->user->lang as $key => $value)
 		{
-			if (is_array($value))
+			if (!is_string($value))
 			{
 				continue;
 			}
-- 
cgit v1.2.1


From 95884edf08d962d0f8cf764f4870f910d4d65009 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Jun 2013 12:32:56 -0500
Subject: [feature/twig] Correcting output of INCLUDEJS

PHPBB3-11598
---
 phpBB/includes/template/twig/node/includejs.php    | 51 +++++++---------------
 .../template/twig/tokenparser/includejs.php        | 33 +++++---------
 2 files changed, 27 insertions(+), 57 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
index e30ab75125..6fe8e155b7 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -1,22 +1,19 @@
 <?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 /**
- * Represents an include node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class phpbb_template_twig_node_includejs extends Twig_Node_Include
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_includejs extends Twig_Node
 {
+    public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
+    {
+        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+    }
+
     /**
      * Compiles the node to PHP.
      *
@@ -27,24 +24,8 @@ class phpbb_template_twig_node_includejs extends Twig_Node_Include
         $compiler->addDebugInfo($this);
 
         $compiler
-            ->write("try {\n")
-            ->indent()
-        ;
-
-        $this->addGetTemplate($compiler);
-
-        $compiler->raw('->display(');
-
-        $this->addTemplateArguments($compiler);
-
-        $compiler->raw(");\n");
-
-        $compiler
-            ->write("} catch (Twig_Error_Loader \$e) {\n")
-            ->indent()
-            ->write("// ignore missing template\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
+        	->write("\$context['SCRIPTS'] .= '<script type=\"text/javascript\" src=")
+        	->subcompile($this->getNode('expr'))
+        	->raw(">';\n\n");
     }
 }
diff --git a/phpBB/includes/template/twig/tokenparser/includejs.php b/phpBB/includes/template/twig/tokenparser/includejs.php
index 36a1fcb585..efa8692f4b 100644
--- a/phpBB/includes/template/twig/tokenparser/includejs.php
+++ b/phpBB/includes/template/twig/tokenparser/includejs.php
@@ -1,25 +1,13 @@
 <?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 /**
- * Includes a template.
- *
- * <pre>
- *   {% include 'header.html' %}
- *     Body
- *   {% include 'footer.html' %}
- * </pre>
- */
-class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser_Include
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser
 {
     /**
      * Parses a token and returns a node.
@@ -32,9 +20,10 @@ class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser_Include
     {
         $expr = $this->parser->getExpressionParser()->parseExpression();
 
-        list($variables, $only, $ignoreMissing) = $this->parseArguments();
+        $stream = $this->parser->getStream();
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        return new phpbb_template_twig_node_includejs($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
+        return new phpbb_template_twig_node_includejs($expr, $token->getLine(), $this->getTag());
     }
 
     /**
-- 
cgit v1.2.1


From 74f19830f332bde9c022394f7fba744b5245e535 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Jun 2013 12:48:37 -0500
Subject: [feature/twig] Some additional operators, more stuff for IF

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php               | 14 +++++++++++++-
 phpBB/includes/template/twig/lexer.php                   |  7 ++++---
 .../template/twig/node/expression/binary/equalequal.php  | 16 ++++++++++++++++
 .../twig/node/expression/binary/notequalequal.php        | 16 ++++++++++++++++
 phpBB/includes/template/twig/twig.php                    |  6 +++++-
 5 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 phpBB/includes/template/twig/node/expression/binary/equalequal.php
 create mode 100644 phpBB/includes/template/twig/node/expression/binary/notequalequal.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index c121a21800..718909ee50 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -39,8 +39,20 @@ class phpbb_template_twig_extension extends Twig_Extension
 		return array(
 			array(),
 			array(
+				// @todo check if all these are needed (or others)
 				'eq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				'!==' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+
+				'ne' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				'neq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				'<>' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+
+				'===' => array('precedence' => 20, 'class' => 'phpbb_template_twig_node_expression_binary_equalequal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				'!==' => array('precedence' => 20, 'class' => 'phpbb_template_twig_node_expression_binary_notequalequal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+
+				'gt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				'gte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				'lt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				'lte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 			),
 		);
 	}
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 71e3e9c27e..ea161bf730 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -45,7 +45,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		// This strips the $ inside of a tag directly after the token, which was used in <!-- DEFINE $NAME
 		$code = preg_replace('#<!-- DEFINE \$(.*)-->#', '<!-- DEFINE $1-->', $code);
 
-		// This strips the . inside of a tag directly before a variable name, which was used in <!-- IF .blah
+		// This strips the . or $ inside of a tag directly before a variable name, which was used in <!-- IF .blah
 		$code = preg_replace_callback('#<!-- IF((.*)[\s][\$|\.]([^\s]+)(.*))-->#', array($this, 'tag_if_cleanup'), $code);
 
 		// Replace all of our starting tokens, <!-- TOKEN --> with Twig style, {% TOKEN %}
@@ -61,12 +61,13 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 	/**
 	* preg_replace_callback to clean up IF statements
 	*
-	* This strips the . inside of a tag directly before a variable name, which was used in <!-- IF .blah
+	* This strips the . or $ inside of a tag directly before a variable name.
+	* Was used in <!-- IF .blah or <!-- IF $BLAH
 	*
 	* @param mixed $matches
 	*/
 	protected function tag_if_cleanup($matches)
 	{
-		return '<!-- IF ' . preg_replace('#\s\.([a-zA-Z_0-9]+)#', ' $1', $matches[1]) . ' -->';
+		return '<!-- IF ' . preg_replace('#\s[\.|\$]([a-zA-Z_0-9]+)#', ' $1', $matches[1]) . ' -->';
 	}
 }
diff --git a/phpBB/includes/template/twig/node/expression/binary/equalequal.php b/phpBB/includes/template/twig/node/expression/binary/equalequal.php
new file mode 100644
index 0000000000..3a0c79c839
--- /dev/null
+++ b/phpBB/includes/template/twig/node/expression/binary/equalequal.php
@@ -0,0 +1,16 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_expression_binary_equalequal extends Twig_Node_Expression_Binary
+{
+    public function operator(Twig_Compiler $compiler)
+    {
+        return $compiler->raw('===');
+    }
+}
diff --git a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php b/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
new file mode 100644
index 0000000000..b53bc56b2d
--- /dev/null
+++ b/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
@@ -0,0 +1,16 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_expression_binary_notequalequal extends Twig_Node_Expression_Binary
+{
+    public function operator(Twig_Compiler $compiler)
+    {
+        return $compiler->raw('!==');
+    }
+}
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index a067827f70..e12b62be63 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -108,13 +108,17 @@ class phpbb_template_twig implements phpbb_template
 		$this->extension_manager = $extension_manager;
 
 		$loader = new Twig_Loader_Filesystem($phpbb_root_path . 'styles/prosilver/template/');
+		//$loader = new Twig_Loader_Filesystem($phpbb_root_path . 'adm/style/');
 		$this->twig = new Twig_Environment($loader, array(
-		    //'cache'			=> $phpbb_root_path . 'cache/twig/',
+		    'cache'			=> $phpbb_root_path . 'cache/twig/',
 		    'debug'			=> true,
 		    'auto_reload'	=> true,
     		'autoescape'	=> false,
 		));
 
+		// Clear previous cache files (while WIP)
+		$this->twig->clearCacheFiles();
+
 		$this->twig->addExtension(new phpbb_template_twig_extension);
 
 		$lexer = new phpbb_template_twig_lexer($this->twig);
-- 
cgit v1.2.1


From fa86f45f62b52a9eed63e9be5cde9dedf8ea1d0e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Jun 2013 13:26:20 -0500
Subject: [feature/twig] Use phpBB's resource locator to find templates

PHPBB3-11598
---
 phpBB/includes/template/twig/loader.php | 50 +++++++++++++++++++++++++++++++++
 phpBB/includes/template/twig/twig.php   |  2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/includes/template/twig/loader.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/loader.php b/phpBB/includes/template/twig/loader.php
new file mode 100644
index 0000000000..ec8704e218
--- /dev/null
+++ b/phpBB/includes/template/twig/loader.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_loader extends Twig_Loader_Filesystem
+{
+	protected $phpbb_locator;
+
+    /**
+    * Constructor.
+    *
+    * @param string|array $paths A path or an array of paths where to look for templates
+    * @param phpbb_template_locator
+    */
+    public function __construct($paths = array(), phpbb_template_locator $phpbb_locator)
+    {
+        if ($paths) {
+            $this->setPaths($paths);
+        }
+
+        $this->phpbb_locator = $phpbb_locator;
+    }
+
+    protected function findTemplate($name)
+    {
+        $name = (string) $name;
+
+        if (!$name)
+        {
+        	throw new Twig_Error_Loader(sprintf('Unable to find template "%s".', $name));
+		}
+
+        $this->phpbb_locator->set_filenames(array(
+        	'temp'		=> $name,
+        ));
+        $location = $this->phpbb_locator->get_source_file_for_handle('temp');
+
+        if (!$location)
+        {
+        	throw new Twig_Error_Loader(sprintf('Unable to find template "%s".', $name));
+		}
+
+		return $this->cache[$name] = $location;
+    }
+}
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index e12b62be63..77f96e85d0 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -107,7 +107,7 @@ class phpbb_template_twig implements phpbb_template
 		$this->context = $context;
 		$this->extension_manager = $extension_manager;
 
-		$loader = new Twig_Loader_Filesystem($phpbb_root_path . 'styles/prosilver/template/');
+		$loader = new phpbb_template_twig_loader($phpbb_root_path . 'styles/prosilver/template/', $this->locator);
 		//$loader = new Twig_Loader_Filesystem($phpbb_root_path . 'adm/style/');
 		$this->twig = new Twig_Environment($loader, array(
 		    'cache'			=> $phpbb_root_path . 'cache/twig/',
-- 
cgit v1.2.1


From 38d8025f123bed57bf5b75164fc25707b4dd462d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Jun 2013 13:29:57 -0500
Subject: [feature/twig] Use phpbb_template_twig in tests

Replace all new phpbb_template( with new phpbb_template_twig(

PHPBB3-11598
---
 phpBB/includes/bbcode.php              | 2 +-
 phpBB/includes/functions_messenger.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index c198abeb54..5a4161bb6c 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -134,7 +134,7 @@ class bbcode
 
 			$style_resource_locator = new phpbb_style_resource_locator();
 			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path);
-			$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
+			$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template);
 			$style->set_style();
 			$template->set_filenames(array('bbcode.html' => 'bbcode.html'));
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index a646f35fdd..f0736fbb45 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -55,10 +55,10 @@ class messenger
 		$this->vars = $this->msg = $this->replyto = $this->from = '';
 		$this->mail_priority = MAIL_NORMAL_PRIORITY;
 	}
-	
+
 	/**
 	* Set addresses for to/im as available
-	* 
+	*
 	* @param array $user User row
 	*/
 	function set_addresses($user)
@@ -228,7 +228,7 @@ class messenger
 		{
 			$style_resource_locator = new phpbb_style_resource_locator();
 			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path);
-			$tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
+			$tpl = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
 
 			$this->tpl_msg[$template_lang . $template_file] = $tpl;
-- 
cgit v1.2.1


From 30a1f21735227a72c8d676db3d0c8d695b150007 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Jun 2013 01:00:38 -0500
Subject: [feature/twig] Use twig loader filesystem with namespaces to add
 paths

Twig now handles loading style files on its own

PHPBB3-11598
---
 phpBB/includes/style/style.php          | 18 +++++++++--
 phpBB/includes/template/twig/loader.php |  1 +
 phpBB/includes/template/twig/twig.php   | 57 +++++++++++++++++++++++++++------
 3 files changed, 65 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 4703c3a219..5aeeac40e4 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -135,15 +135,29 @@ class phpbb_style
 		$this->provider->set_styles($paths);
 		$this->locator->set_paths($this->provider);
 
-		$this->template->set_style_names($names);
-
 		if ($template_path !== false)
 		{
 			$this->locator->set_template_path($template_path);
+
+			$appended_paths = array();
+			foreach ($paths as $path)
+			{
+				$appended_paths[] = $path . '/' . $template_path;
+			}
+
+			$this->template->set_style_names($names, $appended_paths);
 		}
 		else
 		{
 			$this->locator->set_default_template_path();
+
+			$appended_paths = array();
+			foreach ($paths as $path)
+			{
+				$appended_paths[] = $path . '/template/';
+			}
+
+			$this->template->set_style_names($names, $appended_paths);
 		}
 
 		$this->template->cachepath = $this->phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $name) . '_';
diff --git a/phpBB/includes/template/twig/loader.php b/phpBB/includes/template/twig/loader.php
index ec8704e218..b153bd81ea 100644
--- a/phpBB/includes/template/twig/loader.php
+++ b/phpBB/includes/template/twig/loader.php
@@ -7,6 +7,7 @@
 *
 */
 
+// @todo remove if not needed
 class phpbb_template_twig_loader extends Twig_Loader_Filesystem
 {
 	protected $phpbb_locator;
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 77f96e85d0..c159a77817 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -91,6 +91,8 @@ class phpbb_template_twig implements phpbb_template
 	/**
 	* Constructor.
 	*
+	* @todo remove unnecessary dependencies
+	*
 	* @param string $phpbb_root_path phpBB root path
 	* @param user $user current user
 	* @param phpbb_template_locator $locator template locator
@@ -107,17 +109,44 @@ class phpbb_template_twig implements phpbb_template
 		$this->context = $context;
 		$this->extension_manager = $extension_manager;
 
-		$loader = new phpbb_template_twig_loader($phpbb_root_path . 'styles/prosilver/template/', $this->locator);
-		//$loader = new Twig_Loader_Filesystem($phpbb_root_path . 'adm/style/');
+		$this->cachepath = $phpbb_root_path . 'cache/twig/';
+
+		// Setup loader with __main__ paths
+		$loader = new Twig_Loader_Filesystem(array(
+			$phpbb_root_path . 'styles/prosilver/template/',
+		), $this->locator);
+
+		// Add core namespace
+		$loader->addPath($this->phpbb_root_path . 'styles/prosilver/template/', 'core');
+
+		// Add admin namespace
+		// @todo use phpbb_admin path
+		$loader->addPath($this->phpbb_root_path . 'adm/style/', 'admin');
+
+		// Add all namespaces for all extensions
+		if ($this->extension_manager instanceof phpbb_extension_manager)
+		{
+			foreach ($this->extension_manager->all_enabled() as $ext_namespace => $ext_path)
+			{
+				// @todo proper style chain
+				$loader->addPath($ext_path . 'styles/prosilver/', $ext_namespace);
+				$loader->addPath($ext_path . 'styles/all/', $ext_namespace);
+			}
+		}
+
 		$this->twig = new Twig_Environment($loader, array(
-		    'cache'			=> $phpbb_root_path . 'cache/twig/',
-		    'debug'			=> true,
-		    'auto_reload'	=> true,
+		    'cache'			=> $this->cachepath,
+		    'debug'			=> true, // @todo
+		    'auto_reload'	=> true, // @todo
     		'autoescape'	=> false,
 		));
 
 		// Clear previous cache files (while WIP)
-		$this->twig->clearCacheFiles();
+		// @todo remove
+		if (is_dir($this->cachepath))
+		{
+			$this->twig->clearCacheFiles();
+		}
 
 		$this->twig->addExtension(new phpbb_template_twig_extension);
 
@@ -130,12 +159,13 @@ class phpbb_template_twig implements phpbb_template
 	* Sets the template filenames for handles.
 	*
 	* @param array $filename_array Should be a hash of handle => filename pairs.
+	* @return phpbb_template $this
 	*/
 	public function set_filenames(array $filename_array)
 	{
 		$this->locator->set_filenames($filename_array);
 
-		return true;
+		return $this;
 	}
 
 	/**
@@ -143,19 +173,27 @@ class phpbb_template_twig implements phpbb_template
 	* and/or rendered.
 	*
 	* @param array $style_names List of style names in inheritance tree order
-	* @return null
+	* @return phpbb_template $this
 	*/
-	public function set_style_names(array $style_names)
+	public function set_style_names(array $style_names, $style_paths = array())
 	{
 		$this->style_names = $style_names;
+
+		$this->twig->getLoader()->setPaths($style_paths);
+
+		return $this;
 	}
 
 	/**
 	* Clears all variables and blocks assigned to this template.
+	*
+	* @return phpbb_template $this
 	*/
 	public function destroy()
 	{
 		$this->context = array();
+
+		return $this;
 	}
 
 	/**
@@ -236,6 +274,7 @@ class phpbb_template_twig implements phpbb_template
 		{
 			$lang = array();
 		}
+
 		return $lang;
 	}
 
-- 
cgit v1.2.1


From 9eb3ad4d90d2462d7fb8dfecd73c7611c4780243 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Jun 2013 09:41:02 -0500
Subject: [feature/twig] Add && and || support

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index 718909ee50..ff37a38c29 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -53,6 +53,9 @@ class phpbb_template_twig_extension extends Twig_Extension
 				'gte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 				'lt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 				'lte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+
+				'||' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				'&&' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 			),
 		);
 	}
-- 
cgit v1.2.1


From 8561e187f0e5949750a61bffbd16ab4f56ae7fc1 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Jun 2013 09:41:29 -0500
Subject: [feature/twig] Throw exceptions (don't catch and ignore)

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index c159a77817..ac383e25b5 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -230,7 +230,7 @@ class phpbb_template_twig implements phpbb_template
 		}
 		catch (Twig_Error $e)
 		{
-			return false;
+			throw $e;
 		}
 
 		return true;
-- 
cgit v1.2.1


From c5db8be580679427a906a9c44d696cd8d9bfc76e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Jun 2013 11:20:10 -0500
Subject: [feature/twig] Fix begin loops & subloops

PHPBB3-11598
---
 phpBB/includes/template/twig/node/begin.php | 89 ++++++++++++++++-------------
 phpBB/includes/template/twig/twig.php       |  6 +-
 2 files changed, 52 insertions(+), 43 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/begin.php b/phpBB/includes/template/twig/node/begin.php
index 1f4de9deda..3adb09f17e 100644
--- a/phpBB/includes/template/twig/node/begin.php
+++ b/phpBB/includes/template/twig/node/begin.php
@@ -30,48 +30,59 @@ class phpbb_template_twig_node_begin extends Twig_Node
      */
     public function compile(Twig_Compiler $compiler)
     {
-		$compiler
-			->write("if (!isset(\$loops)) {\n")
-			->indent()
-			->write("\$loops = array();")
-			->write("\$nestingLevel = 0;")
-			->outdent()
-			->write("}\n")
-			->write("\$loops[\$nestingLevel] = array();\n")
-		;
+        $compiler->addDebugInfo($this);
 
-        if (null !== $this->getNode('else')) {
-            $compiler->write("\$loops[\$nestingLevel]['iterated'] = false;\n");
-        }
-
-        $compiler
-			->write("if (isset(\$context['loop']['" . $this->getAttribute('beginName') . "'])) {")
-			->write("foreach (\$context['loop']['". $this->getAttribute('beginName'). "'] as \$" . $this->getAttribute('beginName') . ") {")
-			->write("\$context['". $this->getAttribute('beginName'). "'] = \$" . $this->getAttribute('beginName') . ";")
+		$compiler
+			// name -> loop name
+			// local context -> parent template variable context
+			// global context -> global template variable context
+			// variable chain -> full chain of variables to output template vars properly in subloops
+			//		e.g. [foo][bar][foobar]
+			// current chain location -> current location in subloop
+			//		e.g. [foobar] of [foo][bar]
+			->write("\$iterator = function (\$name, \$local_context, \$global_context, &\$variable_chain, &\$current_chain_location) {\n")
 			->indent()
-        ;
-
-        $compiler->subcompile($this->getNode('body'));
+				//->write("var_dump(\$name, \$local_context);\n")
+				// Try to find the loop in the
+				// local context (child of local context passed, in case of a child loop)
+				// global context (root template var)
+				->write("if (isset(\$local_context[\$name])) {\n")
+				->indent()
+					->write("\$local_context = \$local_context[\$name];\n")
+				->outdent()
+				->write("}\n")
+				->write("else if (isset(\$global_context[\$name])) {\n")
+				->indent()
+					->write("\$local_context = \$global_context[\$name];\n")
+				->outdent()
+				->write("} else { return; }\n")
 
-        if (null !== $this->getNode('else')) {
-            $compiler->write("\$loops[\$nestingLevel]['iterated'] = true;\n");
-        }
+				->write("if (!is_array(\$local_context) || empty(\$local_context)) { return; }\n")
 
-        $compiler
-            ->outdent()
-            ->write("}}\n")
-        ;
+				->write("foreach (\$local_context as \$for_context) {\n")
+				->indent()
+					// Some hackish stuff for Twig to properly subcompile
+					->write("\$current_chain_location[\$name] = \$for_context;\n")
+					->write("\$context = array_merge(\$global_context, \$variable_chain);\n")
 
-        if (null !== $this->getNode('else')) {
-            $compiler
-                ->write("if (!\$loops[\$nestingLevel]['iterated']) {\n")
-                ->indent()
-                ->subcompile($this->getNode('else'))
-                ->outdent()
-                ->write("}\n")
-            ;
-        }
-
-		$compiler->write("\$nestingLevel--;\n");
+					// Children
+					->subcompile($this->getNode('body'))
+				->outdent()
+				->write("}\n")
+			->outdent()
+			->write("};\n")
+			->write("if (isset(\$global_context)) {\n")
+			->indent()
+				// We are already inside an anonymous function
+				->write("\$iterator('" . $this->getAttribute('beginName') . "', \$for_context, \$global_context, \$variable_chain, \$current_chain_location[\$name]);\n")
+			->outdent()
+			->write("} else {\n")
+			->indent()
+				// We are not inside the anonymous function (first level)
+				->write("\$variable_chain = array();\n")
+				->write("\$current_chain_location = array();\n")
+				->write("\$iterator('" . $this->getAttribute('beginName') . "', array(), \$context, \$variable_chain, \$variable_chain);\n")
+			->outdent()
+			->write("}\n");
     }
-}
\ No newline at end of file
+}
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index ac383e25b5..3db873c9ba 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -414,13 +414,11 @@ class phpbb_template_twig implements phpbb_template
 		$vars = array_merge(
 			$vars,
 			$this->context->get_rootref(),
-			array(
-				'loop'	=> $this->context->get_tpldata(),
-			)
+			$this->context->get_tpldata()
 		);
 
 		// cleanup
-		unset($vars['loop']['.']);
+		unset($vars['.']);
 
 		return $vars;
 	}
-- 
cgit v1.2.1


From e2c049c997c1829f4f71100bdbdbba9bf72b8868 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 17 Jun 2013 16:11:23 -0400
Subject: [feature/auth-refactor] Provider Interface Skeleton

Creates a skeleton of the authentication provider interface.

PHPBB3-9734
---
 phpBB/includes/auth/provider_interface.php | 32 ++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 phpBB/includes/auth/provider_interface.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_interface.php b/phpBB/includes/auth/provider_interface.php
new file mode 100644
index 0000000000..ac7bb311a3
--- /dev/null
+++ b/phpBB/includes/auth/provider_interface.php
@@ -0,0 +1,32 @@
+<?
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+ * The interface authentication provider classes have to implement.
+ *
+ * @package auth
+ */
+class phpbb_auth_provider_interface
+{
+	public function init();
+
+	public function login();
+
+	public function autologin();
+
+	public function acp();
+}
-- 
cgit v1.2.1


From 49a5d99ec575a068c5062344457cdbbd42739d23 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 17 Jun 2013 16:35:06 -0400
Subject: [feature/auth-refactor] Auth Apache Provider Skeleton

Creates a skeleton for Apache based authentication using the
phpbb_auth_provider_interface named phpbb_auth_provider_apache.
This brings over all code in auth_apache.php verbatim complete with
all global variables currently in use.

PHPBB3-9734
---
 phpBB/includes/auth/provider_apache.php | 265 ++++++++++++++++++++++++++++++++
 1 file changed, 265 insertions(+)
 create mode 100644 phpBB/includes/auth/provider_apache.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
new file mode 100644
index 0000000000..ca3bf41560
--- /dev/null
+++ b/phpBB/includes/auth/provider_apache.php
@@ -0,0 +1,265 @@
+<?
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+ * Apache authentication provider for phpBB3
+ *
+ * @package auth
+ */
+class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
+{
+	/**
+	* Checks whether the user is identified to apache
+	* Only allow changing authentication to apache if the user is identified
+	* Called in acp_board while setting authentication plugins
+	*
+	* @return boolean|string false if the user is identified and else an error message
+	*/
+	public function init()
+	{
+		global $user, $request;
+
+		if (!$request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER) || $user->data['username'] !== htmlspecialchars_decode($request->server('PHP_AUTH_USER')))
+		{
+			return $user->lang['APACHE_SETUP_BEFORE_USE'];
+		}
+		return false;
+	}
+
+	/**
+	* Login function
+	*/
+	public function login(&$username, &$password)
+	{
+		global $db, $request;
+
+		// do not allow empty password
+		if (!$password)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_PASSWORD,
+				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		if (!$username)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_USERNAME,
+				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		if (!$request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
+		{
+			return array(
+				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
+				'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
+				'user_row'		=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		$php_auth_user = htmlspecialchars_decode($request->server('PHP_AUTH_USER'));
+		$php_auth_pw = htmlspecialchars_decode($request->server('PHP_AUTH_PW'));
+
+		if (!empty($php_auth_user) && !empty($php_auth_pw))
+		{
+			if ($php_auth_user !== $username)
+			{
+				return array(
+					'status'	=> LOGIN_ERROR_USERNAME,
+					'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+					'user_row'	=> array('user_id' => ANONYMOUS),
+				);
+			}
+
+			$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type
+				FROM ' . USERS_TABLE . "
+				WHERE username = '" . $db->sql_escape($php_auth_user) . "'";
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if ($row)
+			{
+				// User inactive...
+				if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
+				{
+					return array(
+						'status'		=> LOGIN_ERROR_ACTIVE,
+						'error_msg'		=> 'ACTIVE_ERROR',
+						'user_row'		=> $row,
+					);
+				}
+
+				// Successful login...
+				return array(
+					'status'		=> LOGIN_SUCCESS,
+					'error_msg'		=> false,
+					'user_row'		=> $row,
+				);
+			}
+
+			// this is the user's first login so create an empty profile
+			return array(
+				'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
+				'error_msg'		=> false,
+				'user_row'		=> user_row_apache($php_auth_user, $php_auth_pw),
+			);
+		}
+
+		// Not logged into apache
+		return array(
+			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
+			'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
+			'user_row'		=> array('user_id' => ANONYMOUS),
+		);
+	}
+
+	/**
+	* Autologin function
+	*
+	* @return 	array 	containing the user row or empty if no auto login should
+	* 					take place
+	*/
+	public function autologin()
+	{
+		global $db, $request;
+
+		if (!$request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
+		{
+			return array();
+		}
+
+		$php_auth_user = htmlspecialchars_decode($request->server('PHP_AUTH_USER'));
+		$php_auth_pw = htmlspecialchars_decode($request->server('PHP_AUTH_PW'));
+
+		if (!empty($php_auth_user) && !empty($php_auth_pw))
+		{
+			set_var($php_auth_user, $php_auth_user, 'string', true);
+			set_var($php_auth_pw, $php_auth_pw, 'string', true);
+
+			$sql = 'SELECT *
+				FROM ' . USERS_TABLE . "
+				WHERE username = '" . $db->sql_escape($php_auth_user) . "'";
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if ($row)
+			{
+				return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row;
+			}
+
+			if (!function_exists('user_add'))
+			{
+				global $phpbb_root_path, $phpEx;
+
+				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+			}
+
+			// create the user if he does not exist yet
+			user_add(user_row_apache($php_auth_user, $php_auth_pw));
+
+			$sql = 'SELECT *
+				FROM ' . USERS_TABLE . "
+				WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($php_auth_user)) . "'";
+			$result = $db->sql_query($sql);
+			$row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+
+			if ($row)
+			{
+				return $row;
+			}
+		}
+
+		return array();
+	}
+
+	/**
+	* This function generates an array which can be passed to the user_add
+	* function in order to create a user
+	*
+	* @param 	str 	$username 	The username of the new user.
+	* @param 	str 	$password 	The password of the new user.
+	* @return 	array 				Contains data that can be passed directly to
+	*								the user_add function.
+	*/
+	private function user_row($username, $password)
+	{
+		global $db, $config, $user;
+		// first retrieve default group id
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . "
+			WHERE group_name = '" . $db->sql_escape('REGISTERED') . "'
+				AND group_type = " . GROUP_SPECIAL;
+		$result = $db->sql_query($sql);
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		if (!$row)
+		{
+			trigger_error('NO_GROUP');
+		}
+
+		// generate user account data
+		return array(
+			'username'		=> $username,
+			'user_password'	=> phpbb_hash($password),
+			'user_email'	=> '',
+			'group_id'		=> (int) $row['group_id'],
+			'user_type'		=> USER_NORMAL,
+			'user_ip'		=> $user->ip,
+			'user_new'		=> ($config['new_member_post_limit']) ? 1 : 0,
+		);
+	}
+
+	/**
+	* The session validation function checks whether the user is still logged in
+	*
+	* @return 	boolean 	true if the given user is authenticated or false if
+	* 						the session should be closed
+	*/
+	public function validate_session(&$user)
+	{
+		global $request;
+
+		// Check if PHP_AUTH_USER is set and handle this case
+		if ($request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
+		{
+			$php_auth_user = $request->server('PHP_AUTH_USER');
+
+			return ($php_auth_user === $user['username']) ? true : false;
+		}
+
+		// PHP_AUTH_USER is not set. A valid session is now determined by the user type (anonymous/bot or not)
+		if ($user['user_type'] == USER_IGNORE)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	public function acp()
+	{
+		return;
+	}
+}
-- 
cgit v1.2.1


From 4917fd9ca7a372766ea1a2ec7d0726eba09d2fe1 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 17 Jun 2013 16:41:56 -0400
Subject: [feature/auth-refactor] Database Auth Provider Skeleton

Creates a skeleton of the database auth provider from auth_db.php.
The functions are copied verbatim complete with globals and any
existing errors.

PHPBB3-9734
---
 phpBB/includes/auth/provider_db.php | 309 ++++++++++++++++++++++++++++++++++++
 1 file changed, 309 insertions(+)
 create mode 100644 phpBB/includes/auth/provider_db.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
new file mode 100644
index 0000000000..bba74fc2a3
--- /dev/null
+++ b/phpBB/includes/auth/provider_db.php
@@ -0,0 +1,309 @@
+<?
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+ * Database authentication provider for phpBB3
+ *
+ * This is for authentication via the integrated user table
+ *
+ * @package auth
+ */
+class phpbb_auth_provider_db implements phpbb_auth_provider_interface
+{
+	public function init()
+	{
+		return;
+	}
+
+	/**
+	* Login function
+	*
+	* @param string $username
+	* @param string $password
+	* @param string $ip			IP address the login is taking place from. Used to
+	*							limit the number of login attempts per IP address.
+	* @param string $browser	The user agent used to login
+	* @param string $forwarded_for X_FORWARDED_FOR header sent with login request
+	* @return array				A associative array of the format
+	*							array(
+	*								'status' => status constant
+	*								'error_msg' => string
+	*								'user_row' => array
+	*							)
+	*/
+	public function login($username, $password, $ip = '', $browser = '', $forwarded_for = '')
+	{
+		global $db, $config;
+		global $request;
+
+		// Auth plugins get the password untrimmed.
+		// For compatibility we trim() here.
+		$password = trim($password);
+
+		// do not allow empty password
+		if (!$password)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_PASSWORD,
+				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		if (!$username)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_USERNAME,
+				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		$username_clean = utf8_clean_string($username);
+
+		$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
+			FROM ' . USERS_TABLE . "
+			WHERE username_clean = '" . $db->sql_escape($username_clean) . "'";
+		$result = $db->sql_query($sql);
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		if (($ip && !$config['ip_login_limit_use_forwarded']) ||
+			($forwarded_for && $config['ip_login_limit_use_forwarded']))
+		{
+			$sql = 'SELECT COUNT(*) AS attempts
+				FROM ' . LOGIN_ATTEMPT_TABLE . '
+				WHERE attempt_time > ' . (time() - (int) $config['ip_login_limit_time']);
+			if ($config['ip_login_limit_use_forwarded'])
+			{
+				$sql .= " AND attempt_forwarded_for = '" . $db->sql_escape($forwarded_for) . "'";
+			}
+			else
+			{
+				$sql .= " AND attempt_ip = '" . $db->sql_escape($ip) . "' ";
+			}
+
+			$result = $db->sql_query($sql);
+			$attempts = (int) $db->sql_fetchfield('attempts');
+			$db->sql_freeresult($result);
+
+			$attempt_data = array(
+				'attempt_ip'			=> $ip,
+				'attempt_browser'		=> trim(substr($browser, 0, 149)),
+				'attempt_forwarded_for'	=> $forwarded_for,
+				'attempt_time'			=> time(),
+				'user_id'				=> ($row) ? (int) $row['user_id'] : 0,
+				'username'				=> $username,
+				'username_clean'		=> $username_clean,
+			);
+			$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $db->sql_build_array('INSERT', $attempt_data);
+			$result = $db->sql_query($sql);
+		}
+		else
+		{
+			$attempts = 0;
+		}
+
+		if (!$row)
+		{
+			if ($config['ip_login_limit_max'] && $attempts >= $config['ip_login_limit_max'])
+			{
+				return array(
+					'status'		=> LOGIN_ERROR_ATTEMPTS,
+					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
+					'user_row'		=> array('user_id' => ANONYMOUS),
+				);
+			}
+
+			return array(
+				'status'	=> LOGIN_ERROR_USERNAME,
+				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		$show_captcha = ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts']) ||
+			($config['ip_login_limit_max'] && $attempts >= $config['ip_login_limit_max']);
+
+		// If there are too much login attempts, we need to check for an confirm image
+		// Every auth module is able to define what to do by itself...
+		if ($show_captcha)
+		{
+			// Visual Confirmation handling
+			if (!class_exists('phpbb_captcha_factory', false))
+			{
+				global $phpbb_root_path, $phpEx;
+				include ($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
+			}
+
+			$captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']);
+			$captcha->init(CONFIRM_LOGIN);
+			$vc_response = $captcha->validate($row);
+			if ($vc_response)
+			{
+				return array(
+					'status'		=> LOGIN_ERROR_ATTEMPTS,
+					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
+					'user_row'		=> $row,
+				);
+			}
+			else
+			{
+				$captcha->reset();
+			}
+
+		}
+
+		// If the password convert flag is set we need to convert it
+		if ($row['user_pass_convert'])
+		{
+			// enable super globals to get literal value
+			// this is needed to prevent unicode normalization
+			$super_globals_disabled = $request->super_globals_disabled();
+			if ($super_globals_disabled)
+			{
+				$request->enable_super_globals();
+			}
+
+			// in phpBB2 passwords were used exactly as they were sent, with addslashes applied
+			$password_old_format = isset($_REQUEST['password']) ? (string) $_REQUEST['password'] : '';
+			$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format;
+			$password_new_format = $request->variable('password', '', true);
+
+			if ($super_globals_disabled)
+			{
+				$request->disable_super_globals();
+			}
+
+			if ($password == $password_new_format)
+			{
+				if (!function_exists('utf8_to_cp1252'))
+				{
+					global $phpbb_root_path, $phpEx;
+					include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx);
+				}
+
+				// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding
+				// plain md5 support left in for conversions from other systems.
+				if ((strlen($row['user_password']) == 34 && (phpbb_check_hash(md5($password_old_format), $row['user_password']) || phpbb_check_hash(md5(utf8_to_cp1252($password_old_format)), $row['user_password'])))
+					|| (strlen($row['user_password']) == 32  && (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password'])))
+				{
+					$hash = phpbb_hash($password_new_format);
+
+					// Update the password in the users table to the new format and remove user_pass_convert flag
+					$sql = 'UPDATE ' . USERS_TABLE . '
+						SET user_password = \'' . $db->sql_escape($hash) . '\',
+							user_pass_convert = 0
+						WHERE user_id = ' . $row['user_id'];
+					$db->sql_query($sql);
+
+					$row['user_pass_convert'] = 0;
+					$row['user_password'] = $hash;
+				}
+				else
+				{
+					// Although we weren't able to convert this password we have to
+					// increase login attempt count to make sure this cannot be exploited
+					$sql = 'UPDATE ' . USERS_TABLE . '
+						SET user_login_attempts = user_login_attempts + 1
+						WHERE user_id = ' . (int) $row['user_id'] . '
+							AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
+					$db->sql_query($sql);
+
+					return array(
+						'status'		=> LOGIN_ERROR_PASSWORD_CONVERT,
+						'error_msg'		=> 'LOGIN_ERROR_PASSWORD_CONVERT',
+						'user_row'		=> $row,
+					);
+				}
+			}
+		}
+
+		// Check password ...
+		if (!$row['user_pass_convert'] && phpbb_check_hash($password, $row['user_password']))
+		{
+			// Check for old password hash...
+			if (strlen($row['user_password']) == 32)
+			{
+				$hash = phpbb_hash($password);
+
+				// Update the password in the users table to the new format
+				$sql = 'UPDATE ' . USERS_TABLE . "
+					SET user_password = '" . $db->sql_escape($hash) . "',
+						user_pass_convert = 0
+					WHERE user_id = {$row['user_id']}";
+				$db->sql_query($sql);
+
+				$row['user_password'] = $hash;
+			}
+
+			$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
+				WHERE user_id = ' . $row['user_id'];
+			$db->sql_query($sql);
+
+			if ($row['user_login_attempts'] != 0)
+			{
+				// Successful, reset login attempts (the user passed all stages)
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_login_attempts = 0
+					WHERE user_id = ' . $row['user_id'];
+				$db->sql_query($sql);
+			}
+
+			// User inactive...
+			if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
+			{
+				return array(
+					'status'		=> LOGIN_ERROR_ACTIVE,
+					'error_msg'		=> 'ACTIVE_ERROR',
+					'user_row'		=> $row,
+				);
+			}
+
+			// Successful login... set user_login_attempts to zero...
+			return array(
+				'status'		=> LOGIN_SUCCESS,
+				'error_msg'		=> false,
+				'user_row'		=> $row,
+			);
+		}
+
+		// Password incorrect - increase login attempts
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET user_login_attempts = user_login_attempts + 1
+			WHERE user_id = ' . (int) $row['user_id'] . '
+				AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
+		$db->sql_query($sql);
+
+		// Give status about wrong password...
+		return array(
+			'status'		=> ($show_captcha) ? LOGIN_ERROR_ATTEMPTS : LOGIN_ERROR_PASSWORD,
+			'error_msg'		=> ($show_captcha) ? 'LOGIN_ERROR_ATTEMPTS' : 'LOGIN_ERROR_PASSWORD',
+			'user_row'		=> $row,
+		);
+	}
+
+	public function autologin()
+	{
+		return;
+	}
+
+	public function acp()
+	{
+		return;
+	}
+}
-- 
cgit v1.2.1


From 817813034032b8e94079f195db097f2377ae9ac3 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 17 Jun 2013 16:50:01 -0400
Subject: [feature/auth-refactor] LDAP Auth Provider Skeleton

Creates a ldap auth provider using code taken verbatim from
auth_ldap.php.

PHPBB3-9734
---
 phpBB/includes/auth/provider_ldap.php | 358 ++++++++++++++++++++++++++++++++++
 1 file changed, 358 insertions(+)
 create mode 100644 phpBB/includes/auth/provider_ldap.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
new file mode 100644
index 0000000000..fb2be5ae9d
--- /dev/null
+++ b/phpBB/includes/auth/provider_ldap.php
@@ -0,0 +1,358 @@
+<?
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+ * Database authentication provider for phpBB3
+ *
+ * This is for authentication via the integrated user table
+ *
+ * @package auth
+ */
+class phpbb_auth_provider_db implements phpbb_auth_provider_interface
+{
+	/**
+	* Connect to ldap server
+	* Only allow changing authentication to ldap if we can connect to the ldap server
+	* Called in acp_board while setting authentication plugins
+	*/
+	public function init()
+	{
+		global $config, $user;
+
+		if (!@extension_loaded('ldap'))
+		{
+			return $user->lang['LDAP_NO_LDAP_EXTENSION'];
+		}
+
+		$config['ldap_port'] = (int) $config['ldap_port'];
+		if ($config['ldap_port'])
+		{
+			$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']);
+		}
+		else
+		{
+			$ldap = @ldap_connect($config['ldap_server']);
+		}
+
+		if (!$ldap)
+		{
+			return $user->lang['LDAP_NO_SERVER_CONNECTION'];
+		}
+
+		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
+		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
+
+		if ($config['ldap_user'] || $config['ldap_password'])
+		{
+			if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password'])))
+			{
+				return $user->lang['LDAP_INCORRECT_USER_PASSWORD'];
+			}
+		}
+
+		// ldap_connect only checks whether the specified server is valid, so the connection might still fail
+		$search = @ldap_search(
+			$ldap,
+			htmlspecialchars_decode($config['ldap_base_dn']),
+			ldap_user_filter($user->data['username']),
+			(empty($config['ldap_email'])) ?
+				array(htmlspecialchars_decode($config['ldap_uid'])) :
+				array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])),
+			0,
+			1
+		);
+
+		if ($search === false)
+		{
+			return $user->lang['LDAP_SEARCH_FAILED'];
+		}
+
+		$result = @ldap_get_entries($ldap, $search);
+
+		@ldap_close($ldap);
+
+
+		if (!is_array($result) || sizeof($result) < 2)
+		{
+			return sprintf($user->lang['LDAP_NO_IDENTITY'], $user->data['username']);
+		}
+
+		if (!empty($config['ldap_email']) && !isset($result[0][htmlspecialchars_decode($config['ldap_email'])]))
+		{
+			return $user->lang['LDAP_NO_EMAIL'];
+		}
+
+		return false;
+	}
+
+	/**
+	* Login function
+	*/
+	public function login(&$username, &$password)
+	{
+			global $db, $config, $user;
+
+		// do not allow empty password
+		if (!$password)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_PASSWORD,
+				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		if (!$username)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_USERNAME,
+				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		if (!@extension_loaded('ldap'))
+		{
+			return array(
+				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
+				'error_msg'		=> 'LDAP_NO_LDAP_EXTENSION',
+				'user_row'		=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		$config['ldap_port'] = (int) $config['ldap_port'];
+		if ($config['ldap_port'])
+		{
+			$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']);
+		}
+		else
+		{
+			$ldap = @ldap_connect($config['ldap_server']);
+		}
+
+		if (!$ldap)
+		{
+			return array(
+				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
+				'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
+				'user_row'		=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
+		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
+
+		if ($config['ldap_user'] || $config['ldap_password'])
+		{
+			if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password'])))
+			{
+				return array(
+					'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
+					'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
+					'user_row'		=> array('user_id' => ANONYMOUS),
+				);
+			}
+		}
+
+		$search = @ldap_search(
+			$ldap,
+			htmlspecialchars_decode($config['ldap_base_dn']),
+			ldap_user_filter($username),
+			(empty($config['ldap_email'])) ?
+				array(htmlspecialchars_decode($config['ldap_uid'])) :
+				array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])),
+			0,
+			1
+		);
+
+		$ldap_result = @ldap_get_entries($ldap, $search);
+
+		if (is_array($ldap_result) && sizeof($ldap_result) > 1)
+		{
+			if (@ldap_bind($ldap, $ldap_result[0]['dn'], htmlspecialchars_decode($password)))
+			{
+				@ldap_close($ldap);
+
+				$sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type
+					FROM ' . USERS_TABLE . "
+					WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+
+				if ($row)
+				{
+					unset($ldap_result);
+
+					// User inactive...
+					if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
+					{
+						return array(
+							'status'		=> LOGIN_ERROR_ACTIVE,
+							'error_msg'		=> 'ACTIVE_ERROR',
+							'user_row'		=> $row,
+						);
+					}
+
+					// Successful login... set user_login_attempts to zero...
+					return array(
+						'status'		=> LOGIN_SUCCESS,
+						'error_msg'		=> false,
+						'user_row'		=> $row,
+					);
+				}
+				else
+				{
+					// retrieve default group id
+					$sql = 'SELECT group_id
+						FROM ' . GROUPS_TABLE . "
+						WHERE group_name = '" . $db->sql_escape('REGISTERED') . "'
+							AND group_type = " . GROUP_SPECIAL;
+					$result = $db->sql_query($sql);
+					$row = $db->sql_fetchrow($result);
+					$db->sql_freeresult($result);
+
+					if (!$row)
+					{
+						trigger_error('NO_GROUP');
+					}
+
+					// generate user account data
+					$ldap_user_row = array(
+						'username'		=> $username,
+						'user_password'	=> phpbb_hash($password),
+						'user_email'	=> (!empty($config['ldap_email'])) ? utf8_htmlspecialchars($ldap_result[0][htmlspecialchars_decode($config['ldap_email'])][0]) : '',
+						'group_id'		=> (int) $row['group_id'],
+						'user_type'		=> USER_NORMAL,
+						'user_ip'		=> $user->ip,
+						'user_new'		=> ($config['new_member_post_limit']) ? 1 : 0,
+					);
+
+					unset($ldap_result);
+
+					// this is the user's first login so create an empty profile
+					return array(
+						'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
+						'error_msg'		=> false,
+						'user_row'		=> $ldap_user_row,
+					);
+				}
+			}
+			else
+			{
+				unset($ldap_result);
+				@ldap_close($ldap);
+
+				// Give status about wrong password...
+				return array(
+					'status'		=> LOGIN_ERROR_PASSWORD,
+					'error_msg'		=> 'LOGIN_ERROR_PASSWORD',
+					'user_row'		=> array('user_id' => ANONYMOUS),
+				);
+			}
+		}
+
+		@ldap_close($ldap);
+
+		return array(
+			'status'	=> LOGIN_ERROR_USERNAME,
+			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+			'user_row'	=> array('user_id' => ANONYMOUS),
+		);
+	}
+
+	public function autologin();
+
+	/**
+	* This function is used to output any required fields in the authentication
+	* admin panel. It also defines any required configuration table fields.
+	*/
+	public function acp(&$new)
+	{
+		global $user;
+
+		$tpl = '
+
+		<dl>
+			<dt><label for="ldap_server">' . $user->lang['LDAP_SERVER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="' . $new['ldap_server'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_port">' . $user->lang['LDAP_PORT'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="' . $new['ldap_port'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_dn">' . $user->lang['LDAP_DN'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_DN_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_uid">' . $user->lang['LDAP_UID'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_UID_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_user_filter">' . $user->lang['LDAP_USER_FILTER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="' . $new['ldap_user_filter'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_email">' . $user->lang['LDAP_EMAIL'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt>
+			<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_user">' . $user->lang['LDAP_USER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_USER_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="' . $new['ldap_user'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_password">' . $user->lang['LDAP_PASSWORD'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt>
+			<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" autocomplete="off" /></dd>
+		</dl>
+		';
+
+		// These are fields required in the config table
+		return array(
+			'tpl'		=> $tpl,
+			'config'	=> array('ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password')
+		);
+	}
+
+	/**
+	* Generates a filter string for ldap_search to find a user
+	*
+	* @param	$username	string	Username identifying the searched user
+	*
+	* @return				string	A filter string for ldap_search
+	*/
+	public function user_filter($username)
+	{
+		global $config;
+
+		$filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')';
+		if ($config['ldap_user_filter'])
+		{
+			$_filter = ($config['ldap_user_filter'][0] == '(' && substr($config['ldap_user_filter'], -1) == ')') ? $config['ldap_user_filter'] : "({$config['ldap_user_filter']})";
+			$filter = "(&{$filter}{$_filter})";
+		}
+		return $filter;
+	}
+
+	/**
+	* Escapes an LDAP AttributeValue
+	*/
+	public function escape($string)
+	{
+		return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
+	}
+}
-- 
cgit v1.2.1


From 93d94d5cbe5bd8a713fbfca46d8e44fde169cd19 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 18 Jun 2013 10:37:25 -0500
Subject: [feature/twig] Setup the style chain/loader properly

PHPBB3-11598
---
 phpBB/includes/template/twig/twig.php | 44 +++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 18 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 3db873c9ba..a28905ca4e 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -111,29 +111,13 @@ class phpbb_template_twig implements phpbb_template
 
 		$this->cachepath = $phpbb_root_path . 'cache/twig/';
 
-		// Setup loader with __main__ paths
-		$loader = new Twig_Loader_Filesystem(array(
-			$phpbb_root_path . 'styles/prosilver/template/',
-		), $this->locator);
-
-		// Add core namespace
-		$loader->addPath($this->phpbb_root_path . 'styles/prosilver/template/', 'core');
+		// Initiate the loader, __main__ namespace paths will be setup later in set_style_names()
+		$loader = new Twig_Loader_Filesystem('');
 
 		// Add admin namespace
 		// @todo use phpbb_admin path
 		$loader->addPath($this->phpbb_root_path . 'adm/style/', 'admin');
 
-		// Add all namespaces for all extensions
-		if ($this->extension_manager instanceof phpbb_extension_manager)
-		{
-			foreach ($this->extension_manager->all_enabled() as $ext_namespace => $ext_path)
-			{
-				// @todo proper style chain
-				$loader->addPath($ext_path . 'styles/prosilver/', $ext_namespace);
-				$loader->addPath($ext_path . 'styles/all/', $ext_namespace);
-			}
-		}
-
 		$this->twig = new Twig_Environment($loader, array(
 		    'cache'			=> $this->cachepath,
 		    'debug'			=> true, // @todo
@@ -179,8 +163,32 @@ class phpbb_template_twig implements phpbb_template
 	{
 		$this->style_names = $style_names;
 
+		// Set as __main__ namespace
 		$this->twig->getLoader()->setPaths($style_paths);
 
+		// Core style namespace from phpbb_style::set_style()
+		if ($style_names === array($this->user->style['style_path']) || $style_names[0] == $this->user->style['style_path'])
+		{
+			$this->twig->getLoader()->setPaths($style_paths, 'core');
+
+			// Add all namespaces for all extensions
+			if ($this->extension_manager instanceof phpbb_extension_manager)
+			{
+				$style_names[] = 'all';
+
+				foreach ($this->extension_manager->all_enabled() as $ext_namespace => $ext_path)
+				{
+					foreach ($style_names as $style_name)
+					{
+						if (is_dir($ext_path . 'styles/' . $style_name))
+						{
+							$this->twig->getLoader()->addPath($ext_path . 'styles/' . $style_name, $ext_namespace);
+						}
+					}
+				}
+			}
+		}
+
 		return $this;
 	}
 
-- 
cgit v1.2.1


From e64abea999f68b248cfe41ab22ac60abc9e2951f Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 18 Jun 2013 15:17:14 -0400
Subject: [feature/auth-refactor] Document the provider interface

Provides basic documentation of the auth_provideR_interface.
Changes the login method to login($username, $password) for
consistency with the providers.
acp() is not fully documented. It appears that it is meant to
return an array of some sort and take in a variable by reference.

PHPBB3-9734
---
 phpBB/includes/auth/provider_interface.php | 32 +++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_interface.php b/phpBB/includes/auth/provider_interface.php
index ac7bb311a3..8d966d8b3e 100644
--- a/phpBB/includes/auth/provider_interface.php
+++ b/phpBB/includes/auth/provider_interface.php
@@ -22,11 +22,41 @@ if (!defined('IN_PHPBB'))
  */
 class phpbb_auth_provider_interface
 {
+	/**
+	 * Checks whether the user is currently identified to the authentication
+	 * provider.
+	 * Called in acp_board while setting authentication plugins.
+	 *
+	 * @return 	boolean|string 	False if the user is identified, otherwise an
+	 *							error message.
+	 */
 	public function init();
 
-	public function login();
+	/**
+	 * Performs login.
+	 *
+	 * @param 	$username 	string 	The name of the user being authenticated.
+	 * @param 	$password 	string 	The password of the user.
+	 * @return 	array 		An associative array of the format:
+	 *							array(
+	 *								'status' => status constant
+	 *								'error_msg' => string
+	 *								'user_row' => array
+	 *							)
+	 */
+	public function login($username, $password);
 
+	/**
+	 * Autologin function
+	 *
+	 * @return 	array 	containing the user row or empty if no auto login should
+	 * 					take place
+	 */
 	public function autologin();
 
+	/**
+	 * This function is used to output any required fields in the authentication
+	 * admin panel. It also defines any required configuration table fields.
+	 */
 	public function acp();
 }
-- 
cgit v1.2.1


From db27a8c67a9730384a912298a85a7bf38e506d7d Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 18 Jun 2013 15:32:18 -0400
Subject: [feature/auth-refactor] Fix comment block indentation

Comment block indentation was off by one space on the provider_*
files due to being incorrectly copied over from the auth_* files.

PHPBB3-9734
---
 phpBB/includes/auth/provider_apache.php | 52 ++++++++++++++++-----------------
 phpBB/includes/auth/provider_db.php     | 30 +++++++++----------
 phpBB/includes/auth/provider_ldap.php   | 34 ++++++++++-----------
 3 files changed, 58 insertions(+), 58 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
index ca3bf41560..bb25e502a6 100644
--- a/phpBB/includes/auth/provider_apache.php
+++ b/phpBB/includes/auth/provider_apache.php
@@ -23,12 +23,12 @@ if (!defined('IN_PHPBB'))
 class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 {
 	/**
-	* Checks whether the user is identified to apache
-	* Only allow changing authentication to apache if the user is identified
-	* Called in acp_board while setting authentication plugins
-	*
-	* @return boolean|string false if the user is identified and else an error message
-	*/
+	 * Checks whether the user is identified to apache
+	 * Only allow changing authentication to apache if the user is identified
+	 * Called in acp_board while setting authentication plugins
+	 *
+	 * @return boolean|string false if the user is identified and else an error message
+	 */
 	public function init()
 	{
 		global $user, $request;
@@ -41,8 +41,8 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	}
 
 	/**
-	* Login function
-	*/
+	 * Login function
+	 */
 	public function login(&$username, &$password)
 	{
 		global $db, $request;
@@ -133,11 +133,11 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	}
 
 	/**
-	* Autologin function
-	*
-	* @return 	array 	containing the user row or empty if no auto login should
-	* 					take place
-	*/
+	 * Autologin function
+	 *
+	 * @return 	array 	containing the user row or empty if no auto login should
+	 * 					take place
+	 */
 	public function autologin()
 	{
 		global $db, $request;
@@ -194,14 +194,14 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	}
 
 	/**
-	* This function generates an array which can be passed to the user_add
-	* function in order to create a user
-	*
-	* @param 	str 	$username 	The username of the new user.
-	* @param 	str 	$password 	The password of the new user.
-	* @return 	array 				Contains data that can be passed directly to
-	*								the user_add function.
-	*/
+	 * This function generates an array which can be passed to the user_add
+	 * function in order to create a user
+	 *
+	 * @param 	str 	$username 	The username of the new user.
+	 * @param 	str 	$password 	The password of the new user.
+	 * @return 	array 				Contains data that can be passed directly to
+	 *								the user_add function.
+	 */
 	private function user_row($username, $password)
 	{
 		global $db, $config, $user;
@@ -232,11 +232,11 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	}
 
 	/**
-	* The session validation function checks whether the user is still logged in
-	*
-	* @return 	boolean 	true if the given user is authenticated or false if
-	* 						the session should be closed
-	*/
+	 * The session validation function checks whether the user is still logged in
+	 *
+	 * @return 	boolean 	true if the given user is authenticated or false if
+	 * 						the session should be closed
+	 */
 	public function validate_session(&$user)
 	{
 		global $request;
diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
index bba74fc2a3..c55837c685 100644
--- a/phpBB/includes/auth/provider_db.php
+++ b/phpBB/includes/auth/provider_db.php
@@ -30,21 +30,21 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	}
 
 	/**
-	* Login function
-	*
-	* @param string $username
-	* @param string $password
-	* @param string $ip			IP address the login is taking place from. Used to
-	*							limit the number of login attempts per IP address.
-	* @param string $browser	The user agent used to login
-	* @param string $forwarded_for X_FORWARDED_FOR header sent with login request
-	* @return array				A associative array of the format
-	*							array(
-	*								'status' => status constant
-	*								'error_msg' => string
-	*								'user_row' => array
-	*							)
-	*/
+	 * Login function
+	 *
+	 * @param string $username
+	 * @param string $password
+	 * @param string $ip			IP address the login is taking place from. Used to
+	 *							limit the number of login attempts per IP address.
+	 * @param string $browser	The user agent used to login
+	 * @param string $forwarded_for X_FORWARDED_FOR header sent with login request
+	 * @return array				A associative array of the format
+	 *							array(
+	 *								'status' => status constant
+	 *								'error_msg' => string
+	 *								'user_row' => array
+	 *							)
+	 */
 	public function login($username, $password, $ip = '', $browser = '', $forwarded_for = '')
 	{
 		global $db, $config;
diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
index fb2be5ae9d..3c54ba212c 100644
--- a/phpBB/includes/auth/provider_ldap.php
+++ b/phpBB/includes/auth/provider_ldap.php
@@ -25,10 +25,10 @@ if (!defined('IN_PHPBB'))
 class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 {
 	/**
-	* Connect to ldap server
-	* Only allow changing authentication to ldap if we can connect to the ldap server
-	* Called in acp_board while setting authentication plugins
-	*/
+	 * Connect to ldap server
+	 * Only allow changing authentication to ldap if we can connect to the ldap server
+	 * Called in acp_board while setting authentication plugins
+	 */
 	public function init()
 	{
 		global $config, $user;
@@ -100,8 +100,8 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	}
 
 	/**
-	* Login function
-	*/
+	 * Login function
+	 */
 	public function login(&$username, &$password)
 	{
 			global $db, $config, $user;
@@ -278,9 +278,9 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	public function autologin();
 
 	/**
-	* This function is used to output any required fields in the authentication
-	* admin panel. It also defines any required configuration table fields.
-	*/
+	 * This function is used to output any required fields in the authentication
+	 * admin panel. It also defines any required configuration table fields.
+	 */
 	public function acp(&$new)
 	{
 		global $user;
@@ -329,12 +329,12 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	}
 
 	/**
-	* Generates a filter string for ldap_search to find a user
-	*
-	* @param	$username	string	Username identifying the searched user
-	*
-	* @return				string	A filter string for ldap_search
-	*/
+	 * Generates a filter string for ldap_search to find a user
+	 *
+	 * @param	$username	string	Username identifying the searched user
+	 *
+	 * @return				string	A filter string for ldap_search
+	 */
 	public function user_filter($username)
 	{
 		global $config;
@@ -349,8 +349,8 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	}
 
 	/**
-	* Escapes an LDAP AttributeValue
-	*/
+	 * Escapes an LDAP AttributeValue
+	 */
 	public function escape($string)
 	{
 		return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
-- 
cgit v1.2.1


From 57689948e252ef3240b2c20be95923d6a0635ca9 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 18 Jun 2013 15:39:51 -0400
Subject: [feature/auth-refactor] Make Apache consistent with interface

Makes the provider_apache consistent with the provider_interface
by removing the pass-by-reference of $username and $password.

PHPBB3-9734
---
 phpBB/includes/auth/provider_apache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
index bb25e502a6..01aa9400fd 100644
--- a/phpBB/includes/auth/provider_apache.php
+++ b/phpBB/includes/auth/provider_apache.php
@@ -43,7 +43,7 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	/**
 	 * Login function
 	 */
-	public function login(&$username, &$password)
+	public function login($username, $password)
 	{
 		global $db, $request;
 
-- 
cgit v1.2.1


From 204c640c773e707845859d103b74d64596de402d Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 18 Jun 2013 15:57:31 -0400
Subject: [feature/auth-refactor] Make LDAP consistent with interface

Makes the provider_ldap consistent with the provider_interface
except for the acp() method which has not yet been finalized.
Renames phpbb_auth_provider_ldap::user_filter to
phpbb_auth_provider_ldap::ldap_user_filter to maintain the original
name of the function from auth_ldap.

PHPBB3-9734
---
 phpBB/includes/auth/provider_ldap.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
index 3c54ba212c..3636c7ae6d 100644
--- a/phpBB/includes/auth/provider_ldap.php
+++ b/phpBB/includes/auth/provider_ldap.php
@@ -68,7 +68,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 		$search = @ldap_search(
 			$ldap,
 			htmlspecialchars_decode($config['ldap_base_dn']),
-			ldap_user_filter($user->data['username']),
+			$this->ldap_user_filter($user->data['username']),
 			(empty($config['ldap_email'])) ?
 				array(htmlspecialchars_decode($config['ldap_uid'])) :
 				array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])),
@@ -102,7 +102,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	/**
 	 * Login function
 	 */
-	public function login(&$username, &$password)
+	public function login($username, $password)
 	{
 			global $db, $config, $user;
 
@@ -171,7 +171,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 		$search = @ldap_search(
 			$ldap,
 			htmlspecialchars_decode($config['ldap_base_dn']),
-			ldap_user_filter($username),
+			$this->ldap_user_filter($username),
 			(empty($config['ldap_email'])) ?
 				array(htmlspecialchars_decode($config['ldap_uid'])) :
 				array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])),
@@ -275,7 +275,10 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 		);
 	}
 
-	public function autologin();
+	public function autologin()
+	{
+		return;
+	}
 
 	/**
 	 * This function is used to output any required fields in the authentication
@@ -335,7 +338,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	 *
 	 * @return				string	A filter string for ldap_search
 	 */
-	public function user_filter($username)
+	public function ldap_user_filter($username)
 	{
 		global $config;
 
-- 
cgit v1.2.1


From 0432c3273992cf44b711fad92d442c81016a96c1 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 18 Jun 2013 16:07:23 -0400
Subject: [feature/auth-refactor] Make DB auth consistent with interface

Makes provider_db consistent with provider_interface.
Removes $ip, $browser, and $forwarded_for from the arguments of
phpbb_auth_provider_db::login() as these are provided by the global
variable $user.

PHPBB3-9734
---
 phpBB/includes/auth/provider_db.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
index c55837c685..9e865f4b5b 100644
--- a/phpBB/includes/auth/provider_db.php
+++ b/phpBB/includes/auth/provider_db.php
@@ -34,10 +34,6 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	 *
 	 * @param string $username
 	 * @param string $password
-	 * @param string $ip			IP address the login is taking place from. Used to
-	 *							limit the number of login attempts per IP address.
-	 * @param string $browser	The user agent used to login
-	 * @param string $forwarded_for X_FORWARDED_FOR header sent with login request
 	 * @return array				A associative array of the format
 	 *							array(
 	 *								'status' => status constant
@@ -45,10 +41,10 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	 *								'user_row' => array
 	 *							)
 	 */
-	public function login($username, $password, $ip = '', $browser = '', $forwarded_for = '')
+	public function login($username, $password)
 	{
 		global $db, $config;
-		global $request;
+		global $request, $user;
 
 		// Auth plugins get the password untrimmed.
 		// For compatibility we trim() here.
@@ -82,19 +78,19 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
 
-		if (($ip && !$config['ip_login_limit_use_forwarded']) ||
-			($forwarded_for && $config['ip_login_limit_use_forwarded']))
+		if (($user->ip && !$config['ip_login_limit_use_forwarded']) ||
+			($user->forwarded_for && $config['ip_login_limit_use_forwarded']))
 		{
 			$sql = 'SELECT COUNT(*) AS attempts
 				FROM ' . LOGIN_ATTEMPT_TABLE . '
 				WHERE attempt_time > ' . (time() - (int) $config['ip_login_limit_time']);
 			if ($config['ip_login_limit_use_forwarded'])
 			{
-				$sql .= " AND attempt_forwarded_for = '" . $db->sql_escape($forwarded_for) . "'";
+				$sql .= " AND attempt_forwarded_for = '" . $db->sql_escape($user->forwarded_for) . "'";
 			}
 			else
 			{
-				$sql .= " AND attempt_ip = '" . $db->sql_escape($ip) . "' ";
+				$sql .= " AND attempt_ip = '" . $db->sql_escape($user->ip) . "' ";
 			}
 
 			$result = $db->sql_query($sql);
@@ -102,9 +98,9 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 			$db->sql_freeresult($result);
 
 			$attempt_data = array(
-				'attempt_ip'			=> $ip,
-				'attempt_browser'		=> trim(substr($browser, 0, 149)),
-				'attempt_forwarded_for'	=> $forwarded_for,
+				'attempt_ip'			=> $user->ip,
+				'attempt_browser'		=> trim(substr($user->browser, 0, 149)),
+				'attempt_forwarded_for'	=> $user->forwarded_for,
 				'attempt_time'			=> time(),
 				'user_id'				=> ($row) ? (int) $row['user_id'] : 0,
 				'username'				=> $username,
-- 
cgit v1.2.1


From ffed3d109e25756c4de2116b09d34c4c92d9b61c Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 20 Apr 2013 19:26:01 +0530
Subject: [ticket/11437] avoid $start becoming negative when no search results
 are found

When search returns no results there is no need to go inside the if
statement. Since $result_count becomes zero, $start becomes negative
which leads to failed assertion.

PHPBB3-11437
---
 phpBB/includes/search/fulltext_sphinx.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 63e35eb4af..889324bbda 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -611,7 +611,7 @@ class phpbb_search_fulltext_sphinx
 
 		$result_count = $result['total_found'];
 
-		if ($start >= $result_count)
+		if ($result_count && $start >= $result_count)
 		{
 			$start = floor(($result_count - 1) / $per_page) * $per_page;
 
-- 
cgit v1.2.1


From 7bdab205a13380242ef2469d192abc22b48010d8 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 18 Jun 2013 16:55:35 -0400
Subject: [feature/auth-refactor] Refactor login to use new interface

Refactors auth.php to use the provider_interface during login.

PHPBB-9734
---
 phpBB/includes/auth/auth.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/auth.php b/phpBB/includes/auth/auth.php
index 2535247571..009e621e13 100644
--- a/phpBB/includes/auth/auth.php
+++ b/phpBB/includes/auth/auth.php
@@ -932,10 +932,11 @@ class phpbb_auth
 		$method = trim(basename($config['auth_method']));
 		include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx);
 
-		$method = 'login_' . $method;
-		if (function_exists($method))
+		$class = 'phpbb_auth_provider_' . $method;
+		if (class_exists($class))
 		{
-			$login = $method($username, $password, $user->ip, $user->browser, $user->forwarded_for);
+			$provider = new $class();
+			$login = $provider->login($username, $password);
 
 			// If the auth module wants us to create an empty profile do so and then treat the status as LOGIN_SUCCESS
 			if ($login['status'] == LOGIN_SUCCESS_CREATE_PROFILE)
-- 
cgit v1.2.1


From 553c300688818c36acc4d579762b3eb428d27321 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Wed, 19 Jun 2013 14:20:29 -0400
Subject: [feature/auth-refactor] Fix typos causing changes to not work

Replaces short tags with long tags.
Fixes the interface to be an interface and not class in the file.
Removes unnecessary include_once from auth.php.

PHPBB-9734
---
 phpBB/includes/auth/auth.php               | 1 -
 phpBB/includes/auth/provider_apache.php    | 2 +-
 phpBB/includes/auth/provider_db.php        | 2 +-
 phpBB/includes/auth/provider_interface.php | 4 ++--
 phpBB/includes/auth/provider_ldap.php      | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/auth.php b/phpBB/includes/auth/auth.php
index 009e621e13..ab84619977 100644
--- a/phpBB/includes/auth/auth.php
+++ b/phpBB/includes/auth/auth.php
@@ -930,7 +930,6 @@ class phpbb_auth
 		global $config, $db, $user, $phpbb_root_path, $phpEx;
 
 		$method = trim(basename($config['auth_method']));
-		include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx);
 
 		$class = 'phpbb_auth_provider_' . $method;
 		if (class_exists($class))
diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
index 01aa9400fd..a923fb4265 100644
--- a/phpBB/includes/auth/provider_apache.php
+++ b/phpBB/includes/auth/provider_apache.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
 *
 * @package auth
diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
index 9e865f4b5b..60ea105236 100644
--- a/phpBB/includes/auth/provider_db.php
+++ b/phpBB/includes/auth/provider_db.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
 *
 * @package auth
diff --git a/phpBB/includes/auth/provider_interface.php b/phpBB/includes/auth/provider_interface.php
index 8d966d8b3e..3dd1dba9be 100644
--- a/phpBB/includes/auth/provider_interface.php
+++ b/phpBB/includes/auth/provider_interface.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
 *
 * @package auth
@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
  *
  * @package auth
  */
-class phpbb_auth_provider_interface
+interface phpbb_auth_provider_interface
 {
 	/**
 	 * Checks whether the user is currently identified to the authentication
diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
index 3636c7ae6d..4d0e68233b 100644
--- a/phpBB/includes/auth/provider_ldap.php
+++ b/phpBB/includes/auth/provider_ldap.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /**
 *
 * @package auth
-- 
cgit v1.2.1


From 2445766b922d2dd2d52becb6471a83f174eebec6 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Wed, 19 Jun 2013 14:57:11 -0400
Subject: [feature/auth-refactor] Refactor acp_board for new auth interface

Partially refactors acp_board for the new authentication interface.
Leaves some questionable if statements in the file.
Modifies the interface to correctly impletment the acp() method.
Modifies each provider to comply with the above mentioned interface
modification.

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php           | 35 +++++++++++++++---------------
 phpBB/includes/auth/provider_apache.php    |  2 +-
 phpBB/includes/auth/provider_db.php        |  2 +-
 phpBB/includes/auth/provider_interface.php |  2 +-
 phpBB/includes/auth/provider_ldap.php      |  4 ++--
 5 files changed, 22 insertions(+), 23 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 6881e03fdb..9407d81575 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -530,9 +530,9 @@ class acp_board
 			{
 				while (($file = readdir($dp)) !== false)
 				{
-					if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file))
+					if (preg_match('#^provider_(.*?)\.' . $phpEx . '$#', $file) && !preg_match('#^provider_interface\.' . $phpEx . '$#', $file))
 					{
-						$auth_plugins[] = basename(preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file));
+						$auth_plugins[] = basename(preg_replace('#^provider_(.*?)\.' . $phpEx . '$#', '\1', $file));
 					}
 				}
 				closedir($dp);
@@ -544,14 +544,13 @@ class acp_board
 			$old_auth_config = array();
 			foreach ($auth_plugins as $method)
 			{
-				if ($method && file_exists($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx))
+				if ($method)
 				{
-					include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx);
-
-					$method = 'acp_' . $method;
-					if (function_exists($method))
+					$class = 'phpbb_auth_provider_' . $method;
+					if (class_exists($class))
 					{
-						if ($fields = $method($this->new_config))
+						$provider = new $class();
+						if ($fields = $provider->acp($this->new_config))
 						{
 							// Check if we need to create config fields for this plugin and save config when submit was pressed
 							foreach ($fields['config'] as $field)
@@ -585,14 +584,13 @@ class acp_board
 			if ($submit && (($cfg_array['auth_method'] != $this->new_config['auth_method']) || $updated_auth_settings))
 			{
 				$method = basename($cfg_array['auth_method']);
-				if ($method && in_array($method, $auth_plugins))
+				if ($method)
 				{
-					include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx);
-
-					$method = 'init_' . $method;
-					if (function_exists($method))
+					$class = 'phpbb_auth_provider_' . $method;
+					if (class_exists($class))
 					{
-						if ($error = $method())
+						$provider = new $class();
+						if ($error = $provider->init())
 						{
 							foreach ($old_auth_config as $config_name => $config_value)
 							{
@@ -685,12 +683,13 @@ class acp_board
 
 			foreach ($auth_plugins as $method)
 			{
-				if ($method && file_exists($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx))
+				if ($method)
 				{
-					$method = 'acp_' . $method;
-					if (function_exists($method))
+					$class = 'phpbb_auth_provider_' . $method;
+					if (class_exists($class))
 					{
-						$fields = $method($this->new_config);
+						$provider = new $class();
+						$fields = $provider->acp($this->new_config);
 
 						if ($fields['tpl'])
 						{
diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
index a923fb4265..2d26b85877 100644
--- a/phpBB/includes/auth/provider_apache.php
+++ b/phpBB/includes/auth/provider_apache.php
@@ -258,7 +258,7 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 		return false;
 	}
 
-	public function acp()
+	public function acp($new)
 	{
 		return;
 	}
diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
index 60ea105236..df935fcd73 100644
--- a/phpBB/includes/auth/provider_db.php
+++ b/phpBB/includes/auth/provider_db.php
@@ -298,7 +298,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 		return;
 	}
 
-	public function acp()
+	public function acp($new)
 	{
 		return;
 	}
diff --git a/phpBB/includes/auth/provider_interface.php b/phpBB/includes/auth/provider_interface.php
index 3dd1dba9be..a789dccce7 100644
--- a/phpBB/includes/auth/provider_interface.php
+++ b/phpBB/includes/auth/provider_interface.php
@@ -58,5 +58,5 @@ interface phpbb_auth_provider_interface
 	 * This function is used to output any required fields in the authentication
 	 * admin panel. It also defines any required configuration table fields.
 	 */
-	public function acp();
+	public function acp($new);
 }
diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
index 4d0e68233b..c1f5b3e186 100644
--- a/phpBB/includes/auth/provider_ldap.php
+++ b/phpBB/includes/auth/provider_ldap.php
@@ -22,7 +22,7 @@ if (!defined('IN_PHPBB'))
  *
  * @package auth
  */
-class phpbb_auth_provider_db implements phpbb_auth_provider_interface
+class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 {
 	/**
 	 * Connect to ldap server
@@ -284,7 +284,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	 * This function is used to output any required fields in the authentication
 	 * admin panel. It also defines any required configuration table fields.
 	 */
-	public function acp(&$new)
+	public function acp($new)
 	{
 		global $user;
 
-- 
cgit v1.2.1


From f4def220ce00a6be06857d5bd9f164473c0411c4 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Wed, 19 Jun 2013 15:12:00 -0400
Subject: [feature/auth-refactor] Refactor session for new auth interface

Refactors phpbb_session to use the new auth interface.

PHPBB3-9734
---
 phpBB/includes/session.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 6bc71da0c1..85ca8abf3d 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -568,12 +568,12 @@ class phpbb_session
 		}
 
 		$method = basename(trim($config['auth_method']));
-		include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx);
 
-		$method = 'autologin_' . $method;
-		if (function_exists($method))
+		$class = 'phpbb_auth_provider_' . $method;
+		if (class_exists($class))
 		{
-			$this->data = $method();
+			$provider = new $class();
+			$this->data = $class->autologin();
 
 			if (sizeof($this->data))
 			{
-- 
cgit v1.2.1


From 8214e6e8377b0858092e48aba3ba2a01994be47f Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Wed, 19 Jun 2013 15:32:20 -0400
Subject: [feature/auth-refactor] Finish refactoring auth plugins

I believe that this commit should have final minimal changes needed
to replace the old auth plugins with the refactored auth plugins.
Added a few more elements to the interface based on the old auth
plugins. Documentation is not complete and need works on these new
elements.

PHPBB3-9734
---
 phpBB/includes/auth/provider_apache.php    |  7 ++++++-
 phpBB/includes/auth/provider_db.php        | 10 ++++++++++
 phpBB/includes/auth/provider_interface.php | 19 +++++++++++++++++++
 phpBB/includes/auth/provider_ldap.php      | 10 ++++++++++
 phpBB/includes/session.php                 | 19 ++++++++++---------
 5 files changed, 55 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
index 2d26b85877..2ba76e26a9 100644
--- a/phpBB/includes/auth/provider_apache.php
+++ b/phpBB/includes/auth/provider_apache.php
@@ -237,7 +237,7 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	 * @return 	boolean 	true if the given user is authenticated or false if
 	 * 						the session should be closed
 	 */
-	public function validate_session(&$user)
+	public function validate_session($user)
 	{
 		global $request;
 
@@ -262,4 +262,9 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	{
 		return;
 	}
+
+	public function logout($data, $new_session)
+	{
+		return;
+	}
 }
diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
index df935fcd73..e24e701911 100644
--- a/phpBB/includes/auth/provider_db.php
+++ b/phpBB/includes/auth/provider_db.php
@@ -302,4 +302,14 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	{
 		return;
 	}
+
+	public function logout($data, $new_session)
+	{
+		return;
+	}
+
+	public function validate_session($user)
+	{
+		return;
+	}
 }
diff --git a/phpBB/includes/auth/provider_interface.php b/phpBB/includes/auth/provider_interface.php
index a789dccce7..534f198c21 100644
--- a/phpBB/includes/auth/provider_interface.php
+++ b/phpBB/includes/auth/provider_interface.php
@@ -57,6 +57,25 @@ interface phpbb_auth_provider_interface
 	/**
 	 * This function is used to output any required fields in the authentication
 	 * admin panel. It also defines any required configuration table fields.
+	 *
+	 * @param 	type 	$new
 	 */
 	public function acp($new);
+
+	/**
+	 * Special logout function.
+	 *
+	 * @param 	type 	$data
+	 * @param 	type 	$new_session
+	 */
+	public function logout($data, $new_session);
+
+	/**
+	 * The session validation function checks whether the user is still logged in.
+	 *
+	 * @param 	type 	$user
+	 * @return 	boolean	true if the given user is authenticated, false if the 
+	 * 					session should be closed, or null if not implemented.
+	 */
+	public function validate_session($user);
 }
diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
index c1f5b3e186..8270f50440 100644
--- a/phpBB/includes/auth/provider_ldap.php
+++ b/phpBB/includes/auth/provider_ldap.php
@@ -358,4 +358,14 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 	{
 		return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
 	}
+
+	public function logout($data, $new_session)
+	{
+		return;
+	}
+
+	public function validate_session($user)
+	{
+		return;
+	}
 }
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 85ca8abf3d..f12ba1329c 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -402,12 +402,13 @@ class phpbb_session
 
 					// Check whether the session is still valid if we have one
 					$method = basename(trim($config['auth_method']));
-					include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx);
 
-					$method = 'validate_session_' . $method;
-					if (function_exists($method))
+					$class = 'phpbb_auth_provider_' . $method;
+					if (class_exists($class))
 					{
-						if (!$method($this->data))
+						$provider = new $class();
+						$ret = $provider->validate_session($this->data);
+						if ($ret !== null && !$ret)
 						{
 							$session_expired = true;
 						}
@@ -573,7 +574,7 @@ class phpbb_session
 		if (class_exists($class))
 		{
 			$provider = new $class();
-			$this->data = $class->autologin();
+			$this->data = $provider->autologin();
 
 			if (sizeof($this->data))
 			{
@@ -893,12 +894,12 @@ class phpbb_session
 
 		// Allow connecting logout with external auth method logout
 		$method = basename(trim($config['auth_method']));
-		include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx);
 
-		$method = 'logout_' . $method;
-		if (function_exists($method))
+		$class = 'phpbb_auth_provider_' . $method;
+		if (class_exists($class))
 		{
-			$method($this->data, $new_session);
+			$provider = new $class();
+			$provider->logout($this->data, $new_session);
 		}
 
 		if ($this->data['user_id'] != ANONYMOUS)
-- 
cgit v1.2.1


From 3eeeaababd915bb102de523aa4d4378231745f26 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Thu, 20 Jun 2013 19:16:21 +0530
Subject: [ticket/11503] similar implementation for mssql_native and odbc

mssql_native and mssql_odbc db drivers varied at some places
where they should have been similar.

PHPBB3-11503
---
 phpBB/includes/db/driver/mssql_odbc.php  |  2 +-
 phpBB/includes/db/driver/mssqlnative.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/driver/mssql_odbc.php b/phpBB/includes/db/driver/mssql_odbc.php
index cde9d332ba..a1d1a5d5dd 100644
--- a/phpBB/includes/db/driver/mssql_odbc.php
+++ b/phpBB/includes/db/driver/mssql_odbc.php
@@ -253,7 +253,7 @@ class phpbb_db_driver_mssql_odbc extends phpbb_db_driver_mssql_base
 	* Fetch current row
 	* @note number of bytes returned depends on odbc.defaultlrl php.ini setting. If it is limited to 4K for example only 4K of data is returned max.
 	*/
-	function sql_fetchrow($query_id = false, $debug = false)
+	function sql_fetchrow($query_id = false)
 	{
 		global $cache;
 
diff --git a/phpBB/includes/db/driver/mssqlnative.php b/phpBB/includes/db/driver/mssqlnative.php
index 6f433e10cf..28fc88298a 100644
--- a/phpBB/includes/db/driver/mssqlnative.php
+++ b/phpBB/includes/db/driver/mssqlnative.php
@@ -326,7 +326,7 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
 					$this->sql_report('stop', $query);
 				}
 
-				if ($cache_ttl)
+				if ($cache && $cache_ttl)
 				{
 					$this->open_queries[(int) $this->query_result] = $this->query_result;
 					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
@@ -394,7 +394,7 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
 	*/
 	function sql_affectedrows()
 	{
-		return (!empty($this->query_result)) ? @sqlsrv_rows_affected($this->query_result) : false;
+		return ($this->db_connect_id) ? @sqlsrv_rows_affected($this->query_result) : false;
 	}
 
 	/**
@@ -409,7 +409,7 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
 			$query_id = $this->query_result;
 		}
 
-		if ($cache->sql_exists($query_id))
+		if ($cache && $cache->sql_exists($query_id))
 		{
 			return $cache->sql_fetchrow($query_id);
 		}
@@ -474,9 +474,9 @@ class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
 			return $cache->sql_freeresult($query_id);
 		}
 
-		if (isset($this->open_queries[$query_id]))
+		if (isset($this->open_queries[(int) $query_id]))
 		{
-			unset($this->open_queries[$query_id]);
+			unset($this->open_queries[(int) $query_id]);
 			return @sqlsrv_free_stmt($query_id);
 		}
 		return false;
-- 
cgit v1.2.1


From 0633666e2b5e39a7ebf7d2a68dc4c1b4dbbc0db1 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 20 Jun 2013 16:46:25 -0400
Subject: [feature/auth-refactor] Fix LDAP conversion error

I messed up when converting over auth_ldap this commit fixes that
error. I have not been able to extensively test ldap due to not
having ldap set up on this computer yet.
Apache authentication appears to work.

PHPBB3-9734
---
 phpBB/includes/auth/provider_ldap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
index 8270f50440..ee9b8100ee 100644
--- a/phpBB/includes/auth/provider_ldap.php
+++ b/phpBB/includes/auth/provider_ldap.php
@@ -338,11 +338,11 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 	 *
 	 * @return				string	A filter string for ldap_search
 	 */
-	public function ldap_user_filter($username)
+	private function ldap_user_filter($username)
 	{
 		global $config;
 
-		$filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')';
+		$filter = '(' . $config['ldap_uid'] . '=' . $this->ldap_escape(htmlspecialchars_decode($username)) . ')';
 		if ($config['ldap_user_filter'])
 		{
 			$_filter = ($config['ldap_user_filter'][0] == '(' && substr($config['ldap_user_filter'], -1) == ')') ? $config['ldap_user_filter'] : "({$config['ldap_user_filter']})";
@@ -354,7 +354,7 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 	/**
 	 * Escapes an LDAP AttributeValue
 	 */
-	public function escape($string)
+	private function ldap_escape($string)
 	{
 		return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
 	}
-- 
cgit v1.2.1


From 24825b9dc8cd94204da4180a044dbeab563d5563 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 20 Jun 2013 21:55:25 -0400
Subject: [feature/auth-refactor] Turn provider_db into a service

Removes globals from provider_db and turns it into a service.

PHPBB3-9734
---
 phpBB/includes/auth/provider_db.php | 98 +++++++++++++++++++++----------------
 1 file changed, 57 insertions(+), 41 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
index e24e701911..aaf9cda735 100644
--- a/phpBB/includes/auth/provider_db.php
+++ b/phpBB/includes/auth/provider_db.php
@@ -24,6 +24,27 @@ if (!defined('IN_PHPBB'))
  */
 class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 {
+
+	/**
+	 * Database Authentication Constructor
+	 *
+	 * @param 	phpbb_db_driver 	$db
+	 * @param 	phpbb_config 		$config
+	 * @param 	phpbb_request 		$request
+	 * @param 	phpbb_user 			$user
+	 * @param 	string 				$phpbb_root_path
+	 * @param 	string 				$phpEx
+	 */
+	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $phpEx)
+	{
+		$this->db = $db;
+		$this->config = $config;
+		$this->request = $request;
+		$this->user = $user;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->phpEx = $phpEx;
+	}
+
 	public function init()
 	{
 		return;
@@ -43,9 +64,6 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	 */
 	public function login($username, $password)
 	{
-		global $db, $config;
-		global $request, $user;
-
 		// Auth plugins get the password untrimmed.
 		// For compatibility we trim() here.
 		$password = trim($password);
@@ -73,41 +91,41 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 
 		$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
 			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . $db->sql_escape($username_clean) . "'";
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
+			WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'";
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
 
-		if (($user->ip && !$config['ip_login_limit_use_forwarded']) ||
-			($user->forwarded_for && $config['ip_login_limit_use_forwarded']))
+		if (($this->user->ip && !$this->config['ip_login_limit_use_forwarded']) ||
+			($this->user->forwarded_for && $this->config['ip_login_limit_use_forwarded']))
 		{
 			$sql = 'SELECT COUNT(*) AS attempts
 				FROM ' . LOGIN_ATTEMPT_TABLE . '
-				WHERE attempt_time > ' . (time() - (int) $config['ip_login_limit_time']);
-			if ($config['ip_login_limit_use_forwarded'])
+				WHERE attempt_time > ' . (time() - (int) $this->config['ip_login_limit_time']);
+			if ($this->config['ip_login_limit_use_forwarded'])
 			{
-				$sql .= " AND attempt_forwarded_for = '" . $db->sql_escape($user->forwarded_for) . "'";
+				$sql .= " AND attempt_forwarded_for = '" . $this->db->sql_escape($this->user->forwarded_for) . "'";
 			}
 			else
 			{
-				$sql .= " AND attempt_ip = '" . $db->sql_escape($user->ip) . "' ";
+				$sql .= " AND attempt_ip = '" . $this->db->sql_escape($this->user->ip) . "' ";
 			}
 
-			$result = $db->sql_query($sql);
-			$attempts = (int) $db->sql_fetchfield('attempts');
-			$db->sql_freeresult($result);
+			$result = $this->db->sql_query($sql);
+			$attempts = (int) $this->db->sql_fetchfield('attempts');
+			$this->db->sql_freeresult($result);
 
 			$attempt_data = array(
-				'attempt_ip'			=> $user->ip,
-				'attempt_browser'		=> trim(substr($user->browser, 0, 149)),
-				'attempt_forwarded_for'	=> $user->forwarded_for,
+				'attempt_ip'			=> $this->user->ip,
+				'attempt_browser'		=> trim(substr($this->user->browser, 0, 149)),
+				'attempt_forwarded_for'	=> $this->user->forwarded_for,
 				'attempt_time'			=> time(),
 				'user_id'				=> ($row) ? (int) $row['user_id'] : 0,
 				'username'				=> $username,
 				'username_clean'		=> $username_clean,
 			);
-			$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $db->sql_build_array('INSERT', $attempt_data);
-			$result = $db->sql_query($sql);
+			$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $this->db->sql_build_array('INSERT', $attempt_data);
+			$result = $this->db->sql_query($sql);
 		}
 		else
 		{
@@ -116,7 +134,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 
 		if (!$row)
 		{
-			if ($config['ip_login_limit_max'] && $attempts >= $config['ip_login_limit_max'])
+			if ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max'])
 			{
 				return array(
 					'status'		=> LOGIN_ERROR_ATTEMPTS,
@@ -132,8 +150,8 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 			);
 		}
 
-		$show_captcha = ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts']) ||
-			($config['ip_login_limit_max'] && $attempts >= $config['ip_login_limit_max']);
+		$show_captcha = ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) ||
+			($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']);
 
 		// If there are too much login attempts, we need to check for an confirm image
 		// Every auth module is able to define what to do by itself...
@@ -142,11 +160,10 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 			// Visual Confirmation handling
 			if (!class_exists('phpbb_captcha_factory', false))
 			{
-				global $phpbb_root_path, $phpEx;
-				include ($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
+				include ($this->phpbb_root_path . 'includes/captcha/captcha_factory.' . $this->phpEx);
 			}
 
-			$captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']);
+			$captcha = phpbb_captcha_factory::get_instance($this->config['captcha_plugin']);
 			$captcha->init(CONFIRM_LOGIN);
 			$vc_response = $captcha->validate($row);
 			if ($vc_response)
@@ -169,28 +186,27 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 		{
 			// enable super globals to get literal value
 			// this is needed to prevent unicode normalization
-			$super_globals_disabled = $request->super_globals_disabled();
+			$super_globals_disabled = $this->request->super_globals_disabled();
 			if ($super_globals_disabled)
 			{
-				$request->enable_super_globals();
+				$this->request->enable_super_globals();
 			}
 
 			// in phpBB2 passwords were used exactly as they were sent, with addslashes applied
 			$password_old_format = isset($_REQUEST['password']) ? (string) $_REQUEST['password'] : '';
 			$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format;
-			$password_new_format = $request->variable('password', '', true);
+			$password_new_format = $this->request->variable('password', '', true);
 
 			if ($super_globals_disabled)
 			{
-				$request->disable_super_globals();
+				$this->request->disable_super_globals();
 			}
 
 			if ($password == $password_new_format)
 			{
 				if (!function_exists('utf8_to_cp1252'))
 				{
-					global $phpbb_root_path, $phpEx;
-					include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx);
+					include($this->phpbb_root_path . 'includes/utf/data/recode_basic.' . $this->phpEx);
 				}
 
 				// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding
@@ -202,10 +218,10 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 
 					// Update the password in the users table to the new format and remove user_pass_convert flag
 					$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_password = \'' . $db->sql_escape($hash) . '\',
+						SET user_password = \'' . $this->db->sql_escape($hash) . '\',
 							user_pass_convert = 0
 						WHERE user_id = ' . $row['user_id'];
-					$db->sql_query($sql);
+					$this->db->sql_query($sql);
 
 					$row['user_pass_convert'] = 0;
 					$row['user_password'] = $hash;
@@ -218,7 +234,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 						SET user_login_attempts = user_login_attempts + 1
 						WHERE user_id = ' . (int) $row['user_id'] . '
 							AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
-					$db->sql_query($sql);
+					$this->db->sql_query($sql);
 
 					return array(
 						'status'		=> LOGIN_ERROR_PASSWORD_CONVERT,
@@ -239,17 +255,17 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 
 				// Update the password in the users table to the new format
 				$sql = 'UPDATE ' . USERS_TABLE . "
-					SET user_password = '" . $db->sql_escape($hash) . "',
+					SET user_password = '" . $this->db->sql_escape($hash) . "',
 						user_pass_convert = 0
 					WHERE user_id = {$row['user_id']}";
-				$db->sql_query($sql);
+				$this->db->sql_query($sql);
 
 				$row['user_password'] = $hash;
 			}
 
 			$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
 				WHERE user_id = ' . $row['user_id'];
-			$db->sql_query($sql);
+			$this->db->sql_query($sql);
 
 			if ($row['user_login_attempts'] != 0)
 			{
@@ -257,7 +273,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 				$sql = 'UPDATE ' . USERS_TABLE . '
 					SET user_login_attempts = 0
 					WHERE user_id = ' . $row['user_id'];
-				$db->sql_query($sql);
+				$this->db->sql_query($sql);
 			}
 
 			// User inactive...
@@ -283,7 +299,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 			SET user_login_attempts = user_login_attempts + 1
 			WHERE user_id = ' . (int) $row['user_id'] . '
 				AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
-		$db->sql_query($sql);
+		$this->db->sql_query($sql);
 
 		// Give status about wrong password...
 		return array(
-- 
cgit v1.2.1


From c253189e85f780d50aa82c483b432717a967bb1c Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 20 Jun 2013 22:11:24 -0400
Subject: [feature/auth-refactor] Convert provider_ldap to a service

Removes globals from provider_ldap and converts it into a service.

PHPBB3-9734
---
 phpBB/includes/auth/provider_ldap.php | 122 ++++++++++++++++++----------------
 1 file changed, 64 insertions(+), 58 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
index ee9b8100ee..67d8d8335f 100644
--- a/phpBB/includes/auth/provider_ldap.php
+++ b/phpBB/includes/auth/provider_ldap.php
@@ -24,6 +24,20 @@ if (!defined('IN_PHPBB'))
  */
 class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 {
+	/**
+	 * LDAP Authentication Constructor
+	 *
+	 * @param 	phpbb_db_driver 	$db
+	 * @param 	phpbb_config 		$config
+	 * @param 	phpbb_user 			$user
+	 */
+	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_user $user)
+	{
+		$this->db = $db;
+		$this->config = $config;
+		$this->user = $user;
+	}
+
 	/**
 	 * Connect to ldap server
 	 * Only allow changing authentication to ldap if we can connect to the ldap server
@@ -31,54 +45,52 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 	 */
 	public function init()
 	{
-		global $config, $user;
-
 		if (!@extension_loaded('ldap'))
 		{
-			return $user->lang['LDAP_NO_LDAP_EXTENSION'];
+			return $this->user->lang['LDAP_NO_LDAP_EXTENSION'];
 		}
 
-		$config['ldap_port'] = (int) $config['ldap_port'];
-		if ($config['ldap_port'])
+		$this->config['ldap_port'] = (int) $this->config['ldap_port'];
+		if ($this->config['ldap_port'])
 		{
-			$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']);
+			$ldap = @ldap_connect($this->config['ldap_server'], $this->config['ldap_port']);
 		}
 		else
 		{
-			$ldap = @ldap_connect($config['ldap_server']);
+			$ldap = @ldap_connect($this->config['ldap_server']);
 		}
 
 		if (!$ldap)
 		{
-			return $user->lang['LDAP_NO_SERVER_CONNECTION'];
+			return $this->user->lang['LDAP_NO_SERVER_CONNECTION'];
 		}
 
 		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
 		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
 
-		if ($config['ldap_user'] || $config['ldap_password'])
+		if ($this->config['ldap_user'] || $this->config['ldap_password'])
 		{
-			if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password'])))
+			if (!@ldap_bind($ldap, htmlspecialchars_decode($this->config['ldap_user']), htmlspecialchars_decode($this->config['ldap_password'])))
 			{
-				return $user->lang['LDAP_INCORRECT_USER_PASSWORD'];
+				return $this->user->lang['LDAP_INCORRECT_USER_PASSWORD'];
 			}
 		}
 
 		// ldap_connect only checks whether the specified server is valid, so the connection might still fail
 		$search = @ldap_search(
 			$ldap,
-			htmlspecialchars_decode($config['ldap_base_dn']),
-			$this->ldap_user_filter($user->data['username']),
-			(empty($config['ldap_email'])) ?
-				array(htmlspecialchars_decode($config['ldap_uid'])) :
-				array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])),
+			htmlspecialchars_decode($this->config['ldap_base_dn']),
+			$this->ldap_user_filter($this->user->data['username']),
+			(empty($this->config['ldap_email'])) ?
+				array(htmlspecialchars_decode($this->config['ldap_uid'])) :
+				array(htmlspecialchars_decode($this->config['ldap_uid']), htmlspecialchars_decode($this->config['ldap_email'])),
 			0,
 			1
 		);
 
 		if ($search === false)
 		{
-			return $user->lang['LDAP_SEARCH_FAILED'];
+			return $this->user->lang['LDAP_SEARCH_FAILED'];
 		}
 
 		$result = @ldap_get_entries($ldap, $search);
@@ -88,12 +100,12 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 
 		if (!is_array($result) || sizeof($result) < 2)
 		{
-			return sprintf($user->lang['LDAP_NO_IDENTITY'], $user->data['username']);
+			return sprintf($this->user->lang['LDAP_NO_IDENTITY'], $this->user->data['username']);
 		}
 
-		if (!empty($config['ldap_email']) && !isset($result[0][htmlspecialchars_decode($config['ldap_email'])]))
+		if (!empty($this->config['ldap_email']) && !isset($result[0][htmlspecialchars_decode($this->config['ldap_email'])]))
 		{
-			return $user->lang['LDAP_NO_EMAIL'];
+			return $this->user->lang['LDAP_NO_EMAIL'];
 		}
 
 		return false;
@@ -104,8 +116,6 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 	 */
 	public function login($username, $password)
 	{
-			global $db, $config, $user;
-
 		// do not allow empty password
 		if (!$password)
 		{
@@ -134,14 +144,14 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 			);
 		}
 
-		$config['ldap_port'] = (int) $config['ldap_port'];
-		if ($config['ldap_port'])
+		$this->config['ldap_port'] = (int) $this->config['ldap_port'];
+		if ($this->config['ldap_port'])
 		{
-			$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']);
+			$ldap = @ldap_connect($this->config['ldap_server'], $this->config['ldap_port']);
 		}
 		else
 		{
-			$ldap = @ldap_connect($config['ldap_server']);
+			$ldap = @ldap_connect($this->config['ldap_server']);
 		}
 
 		if (!$ldap)
@@ -156,9 +166,9 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
 		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
 
-		if ($config['ldap_user'] || $config['ldap_password'])
+		if ($this->config['ldap_user'] || $this->config['ldap_password'])
 		{
-			if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password'])))
+			if (!@ldap_bind($ldap, htmlspecialchars_decode($this->config['ldap_user']), htmlspecialchars_decode($this->config['ldap_password'])))
 			{
 				return array(
 					'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
@@ -170,11 +180,11 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 
 		$search = @ldap_search(
 			$ldap,
-			htmlspecialchars_decode($config['ldap_base_dn']),
+			htmlspecialchars_decode($this->config['ldap_base_dn']),
 			$this->ldap_user_filter($username),
-			(empty($config['ldap_email'])) ?
-				array(htmlspecialchars_decode($config['ldap_uid'])) :
-				array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])),
+			(empty($this->config['ldap_email'])) ?
+				array(htmlspecialchars_decode($this->config['ldap_uid'])) :
+				array(htmlspecialchars_decode($this->config['ldap_uid']), htmlspecialchars_decode($this->config['ldap_email'])),
 			0,
 			1
 		);
@@ -189,10 +199,10 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 
 				$sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type
 					FROM ' . USERS_TABLE . "
-					WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
-				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
+					WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($username)) . "'";
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
 
 				if ($row)
 				{
@@ -220,11 +230,11 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 					// retrieve default group id
 					$sql = 'SELECT group_id
 						FROM ' . GROUPS_TABLE . "
-						WHERE group_name = '" . $db->sql_escape('REGISTERED') . "'
+						WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "'
 							AND group_type = " . GROUP_SPECIAL;
-					$result = $db->sql_query($sql);
-					$row = $db->sql_fetchrow($result);
-					$db->sql_freeresult($result);
+					$result = $this->db->sql_query($sql);
+					$row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
 
 					if (!$row)
 					{
@@ -235,11 +245,11 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 					$ldap_user_row = array(
 						'username'		=> $username,
 						'user_password'	=> phpbb_hash($password),
-						'user_email'	=> (!empty($config['ldap_email'])) ? utf8_htmlspecialchars($ldap_result[0][htmlspecialchars_decode($config['ldap_email'])][0]) : '',
+						'user_email'	=> (!empty($this->config['ldap_email'])) ? utf8_htmlspecialchars($ldap_result[0][htmlspecialchars_decode($this->config['ldap_email'])][0]) : '',
 						'group_id'		=> (int) $row['group_id'],
 						'user_type'		=> USER_NORMAL,
-						'user_ip'		=> $user->ip,
-						'user_new'		=> ($config['new_member_post_limit']) ? 1 : 0,
+						'user_ip'		=> $this->user->ip,
+						'user_new'		=> ($this->config['new_member_post_limit']) ? 1 : 0,
 					);
 
 					unset($ldap_result);
@@ -286,40 +296,38 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 	 */
 	public function acp($new)
 	{
-		global $user;
-
 		$tpl = '
 
 		<dl>
-			<dt><label for="ldap_server">' . $user->lang['LDAP_SERVER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt>
+			<dt><label for="ldap_server">' . $this->user->lang['LDAP_SERVER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt>
 			<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="' . $new['ldap_server'] . '" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="ldap_port">' . $user->lang['LDAP_PORT'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt>
+			<dt><label for="ldap_port">' . $this->user->lang['LDAP_PORT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt>
 			<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="' . $new['ldap_port'] . '" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="ldap_dn">' . $user->lang['LDAP_DN'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_DN_EXPLAIN'] . '</span></dt>
+			<dt><label for="ldap_dn">' . $this->user->lang['LDAP_DN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_DN_EXPLAIN'] . '</span></dt>
 			<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] . '" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="ldap_uid">' . $user->lang['LDAP_UID'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_UID_EXPLAIN'] . '</span></dt>
+			<dt><label for="ldap_uid">' . $this->user->lang['LDAP_UID'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_UID_EXPLAIN'] . '</span></dt>
 			<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="ldap_user_filter">' . $user->lang['LDAP_USER_FILTER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt>
+			<dt><label for="ldap_user_filter">' . $this->user->lang['LDAP_USER_FILTER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt>
 			<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="' . $new['ldap_user_filter'] . '" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="ldap_email">' . $user->lang['LDAP_EMAIL'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt>
+			<dt><label for="ldap_email">' . $this->user->lang['LDAP_EMAIL'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt>
 			<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="ldap_user">' . $user->lang['LDAP_USER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_USER_EXPLAIN'] . '</span></dt>
+			<dt><label for="ldap_user">' . $this->user->lang['LDAP_USER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_USER_EXPLAIN'] . '</span></dt>
 			<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="' . $new['ldap_user'] . '" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="ldap_password">' . $user->lang['LDAP_PASSWORD'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt>
+			<dt><label for="ldap_password">' . $this->user->lang['LDAP_PASSWORD'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt>
 			<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" autocomplete="off" /></dd>
 		</dl>
 		';
@@ -340,12 +348,10 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 	 */
 	private function ldap_user_filter($username)
 	{
-		global $config;
-
-		$filter = '(' . $config['ldap_uid'] . '=' . $this->ldap_escape(htmlspecialchars_decode($username)) . ')';
-		if ($config['ldap_user_filter'])
+		$filter = '(' . $this->config['ldap_uid'] . '=' . $this->ldap_escape(htmlspecialchars_decode($username)) . ')';
+		if ($this->config['ldap_user_filter'])
 		{
-			$_filter = ($config['ldap_user_filter'][0] == '(' && substr($config['ldap_user_filter'], -1) == ')') ? $config['ldap_user_filter'] : "({$config['ldap_user_filter']})";
+			$_filter = ($this->config['ldap_user_filter'][0] == '(' && substr($this->config['ldap_user_filter'], -1) == ')') ? $this->config['ldap_user_filter'] : "({$this->config['ldap_user_filter']})";
 			$filter = "(&{$filter}{$_filter})";
 		}
 		return $filter;
-- 
cgit v1.2.1


From c9062fc1ee9bade7c2b4d84c99b3b71a78d5570c Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 20 Jun 2013 22:21:22 -0400
Subject: [feature/auth-refactor] Convert provider_apache to a service

Removes globals from provider_apache and turns it into a service.

PHPBB3-9734
---
 phpBB/includes/auth/provider_apache.php | 89 ++++++++++++++++++---------------
 1 file changed, 49 insertions(+), 40 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
index 2ba76e26a9..adb1fb6cea 100644
--- a/phpBB/includes/auth/provider_apache.php
+++ b/phpBB/includes/auth/provider_apache.php
@@ -22,6 +22,26 @@ if (!defined('IN_PHPBB'))
  */
 class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 {
+	/**
+	 * Apache Authentication Constructor
+	 *
+	 * @param 	phpbb_db_driver 	$db
+	 * @param 	phpbb_config 		$config
+	 * @param 	phpbb_request 		$request
+	 * @param 	phpbb_user 			$user
+	 * @param 	string 				$phpbb_root_path
+	 * @param 	string 				$phpEx
+	 */
+	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $phpEx)
+	{
+		$this->db = $db;
+		$this->config = $config;
+		$this->request = $request;
+		$this->user = $user;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->phpEx = $phpEx;
+	}
+
 	/**
 	 * Checks whether the user is identified to apache
 	 * Only allow changing authentication to apache if the user is identified
@@ -31,11 +51,9 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	 */
 	public function init()
 	{
-		global $user, $request;
-
-		if (!$request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER) || $user->data['username'] !== htmlspecialchars_decode($request->server('PHP_AUTH_USER')))
+		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER) || $this->user->data['username'] !== htmlspecialchars_decode($this->request->server('PHP_AUTH_USER')))
 		{
-			return $user->lang['APACHE_SETUP_BEFORE_USE'];
+			return $this->user->lang['APACHE_SETUP_BEFORE_USE'];
 		}
 		return false;
 	}
@@ -45,8 +63,6 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	 */
 	public function login($username, $password)
 	{
-		global $db, $request;
-
 		// do not allow empty password
 		if (!$password)
 		{
@@ -66,7 +82,7 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 			);
 		}
 
-		if (!$request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
+		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
 		{
 			return array(
 				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
@@ -75,8 +91,8 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 			);
 		}
 
-		$php_auth_user = htmlspecialchars_decode($request->server('PHP_AUTH_USER'));
-		$php_auth_pw = htmlspecialchars_decode($request->server('PHP_AUTH_PW'));
+		$php_auth_user = htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'));
+		$php_auth_pw = htmlspecialchars_decode($this->request->server('PHP_AUTH_PW'));
 
 		if (!empty($php_auth_user) && !empty($php_auth_pw))
 		{
@@ -91,10 +107,10 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 
 			$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type
 				FROM ' . USERS_TABLE . "
-				WHERE username = '" . $db->sql_escape($php_auth_user) . "'";
-			$result = $db->sql_query($sql);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
+				WHERE username = '" . $this->db->sql_escape($php_auth_user) . "'";
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
 
 			if ($row)
 			{
@@ -140,15 +156,13 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	 */
 	public function autologin()
 	{
-		global $db, $request;
-
-		if (!$request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
+		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
 		{
 			return array();
 		}
 
-		$php_auth_user = htmlspecialchars_decode($request->server('PHP_AUTH_USER'));
-		$php_auth_pw = htmlspecialchars_decode($request->server('PHP_AUTH_PW'));
+		$php_auth_user = htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'));
+		$php_auth_pw = htmlspecialchars_decode($this->request->server('PHP_AUTH_PW'));
 
 		if (!empty($php_auth_user) && !empty($php_auth_pw))
 		{
@@ -157,10 +171,10 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 
 			$sql = 'SELECT *
 				FROM ' . USERS_TABLE . "
-				WHERE username = '" . $db->sql_escape($php_auth_user) . "'";
-			$result = $db->sql_query($sql);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
+				WHERE username = '" . $this->db->sql_escape($php_auth_user) . "'";
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
 
 			if ($row)
 			{
@@ -169,9 +183,7 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 
 			if (!function_exists('user_add'))
 			{
-				global $phpbb_root_path, $phpEx;
-
-				include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+				include($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
 			}
 
 			// create the user if he does not exist yet
@@ -179,10 +191,10 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 
 			$sql = 'SELECT *
 				FROM ' . USERS_TABLE . "
-				WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($php_auth_user)) . "'";
-			$result = $db->sql_query($sql);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
+				WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($php_auth_user)) . "'";
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
 
 			if ($row)
 			{
@@ -204,15 +216,14 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	 */
 	private function user_row($username, $password)
 	{
-		global $db, $config, $user;
 		// first retrieve default group id
 		$sql = 'SELECT group_id
 			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = '" . $db->sql_escape('REGISTERED') . "'
+			WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "'
 				AND group_type = " . GROUP_SPECIAL;
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
 
 		if (!$row)
 		{
@@ -226,8 +237,8 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 			'user_email'	=> '',
 			'group_id'		=> (int) $row['group_id'],
 			'user_type'		=> USER_NORMAL,
-			'user_ip'		=> $user->ip,
-			'user_new'		=> ($config['new_member_post_limit']) ? 1 : 0,
+			'user_ip'		=> $this->user->ip,
+			'user_new'		=> ($this->config['new_member_post_limit']) ? 1 : 0,
 		);
 	}
 
@@ -239,12 +250,10 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	 */
 	public function validate_session($user)
 	{
-		global $request;
-
 		// Check if PHP_AUTH_USER is set and handle this case
-		if ($request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
+		if ($this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
 		{
-			$php_auth_user = $request->server('PHP_AUTH_USER');
+			$php_auth_user = $this->request->server('PHP_AUTH_USER');
 
 			return ($php_auth_user === $user['username']) ? true : false;
 		}
-- 
cgit v1.2.1


From b8610c4b989fd1e4e9e310de776de38dfe4a09a2 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Fri, 21 Jun 2013 18:04:11 -0400
Subject: [feature/auth-refactor] Refactor code to use services

Refactors all loading of auth providers to use services instead of
directly calling the class.

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 15 ++++++--------
 phpBB/includes/auth/auth.php     |  7 +++----
 phpBB/includes/session.php       | 42 ++++++++++++++--------------------------
 3 files changed, 24 insertions(+), 40 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 9407d81575..383e035817 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -546,10 +546,9 @@ class acp_board
 			{
 				if ($method)
 				{
-					$class = 'phpbb_auth_provider_' . $method;
-					if (class_exists($class))
+					$provider = $phpbb_container->get('auth.provider.' . $method);
+					if ($provider)
 					{
-						$provider = new $class();
 						if ($fields = $provider->acp($this->new_config))
 						{
 							// Check if we need to create config fields for this plugin and save config when submit was pressed
@@ -586,10 +585,9 @@ class acp_board
 				$method = basename($cfg_array['auth_method']);
 				if ($method)
 				{
-					$class = 'phpbb_auth_provider_' . $method;
-					if (class_exists($class))
+					$provider = $phpbb_container->get('auth.provider.' . $method);
+					if ($provider)
 					{
-						$provider = new $class();
 						if ($error = $provider->init())
 						{
 							foreach ($old_auth_config as $config_name => $config_value)
@@ -685,10 +683,9 @@ class acp_board
 			{
 				if ($method)
 				{
-					$class = 'phpbb_auth_provider_' . $method;
-					if (class_exists($class))
+					$provider = $phpbb_container->get('auth.provider.' . $method);
+					if ($provider)
 					{
-						$provider = new $class();
 						$fields = $provider->acp($this->new_config);
 
 						if ($fields['tpl'])
diff --git a/phpBB/includes/auth/auth.php b/phpBB/includes/auth/auth.php
index ab84619977..279959974d 100644
--- a/phpBB/includes/auth/auth.php
+++ b/phpBB/includes/auth/auth.php
@@ -927,14 +927,13 @@ class phpbb_auth
 	*/
 	function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0)
 	{
-		global $config, $db, $user, $phpbb_root_path, $phpEx;
+		global $config, $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
 
 		$method = trim(basename($config['auth_method']));
 
-		$class = 'phpbb_auth_provider_' . $method;
-		if (class_exists($class))
+		$provider = $phpbb_container->get('auth.provider.' . $method);
+		if ($provider)
 		{
-			$provider = new $class();
 			$login = $provider->login($username, $password);
 
 			// If the auth module wants us to create an empty profile do so and then treat the status as LOGIN_SUCCESS
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index f12ba1329c..66bf053f7d 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -207,7 +207,7 @@ class phpbb_session
 	function session_begin($update_session_page = true)
 	{
 		global $phpEx, $SID, $_SID, $_EXTRA_URL, $db, $config, $phpbb_root_path;
-		global $request;
+		global $request, $phpbb_container;
 
 		// Give us some basic information
 		$this->time_now				= time();
@@ -403,15 +403,11 @@ class phpbb_session
 					// Check whether the session is still valid if we have one
 					$method = basename(trim($config['auth_method']));
 
-					$class = 'phpbb_auth_provider_' . $method;
-					if (class_exists($class))
+					$provider = $phpbb_container->get('auth.provider.' . $method);
+					$ret = $provider->validate_session($this->data);
+					if ($ret !== null && !$ret)
 					{
-						$provider = new $class();
-						$ret = $provider->validate_session($this->data);
-						if ($ret !== null && !$ret)
-						{
-							$session_expired = true;
-						}
+						$session_expired = true;
 					}
 
 					if (!$session_expired)
@@ -505,7 +501,7 @@ class phpbb_session
 	*/
 	function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true)
 	{
-		global $SID, $_SID, $db, $config, $cache, $phpbb_root_path, $phpEx;
+		global $SID, $_SID, $db, $config, $cache, $phpbb_root_path, $phpEx, $phpbb_container;
 
 		$this->data = array();
 
@@ -570,17 +566,13 @@ class phpbb_session
 
 		$method = basename(trim($config['auth_method']));
 
-		$class = 'phpbb_auth_provider_' . $method;
-		if (class_exists($class))
-		{
-			$provider = new $class();
-			$this->data = $provider->autologin();
+		$provider = $phpbb_container->get('auth.provider.' . $method);
+		$this->data = $provider->autologin();
 
-			if (sizeof($this->data))
-			{
-				$this->cookie_data['k'] = '';
-				$this->cookie_data['u'] = $this->data['user_id'];
-			}
+		if (sizeof($this->data))
+		{
+			$this->cookie_data['k'] = '';
+			$this->cookie_data['u'] = $this->data['user_id'];
 		}
 
 		// If we're presented with an autologin key we'll join against it.
@@ -885,7 +877,7 @@ class phpbb_session
 	*/
 	function session_kill($new_session = true)
 	{
-		global $SID, $_SID, $db, $config, $phpbb_root_path, $phpEx;
+		global $SID, $_SID, $db, $config, $phpbb_root_path, $phpEx, $phpbb_container;
 
 		$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
 			WHERE session_id = '" . $db->sql_escape($this->session_id) . "'
@@ -895,12 +887,8 @@ class phpbb_session
 		// Allow connecting logout with external auth method logout
 		$method = basename(trim($config['auth_method']));
 
-		$class = 'phpbb_auth_provider_' . $method;
-		if (class_exists($class))
-		{
-			$provider = new $class();
-			$provider->logout($this->data, $new_session);
-		}
+		$provider = $phpbb_container->get('auth.provider.' . $method);
+		$provider->logout($this->data, $new_session);
 
 		if ($this->data['user_id'] != ANONYMOUS)
 		{
-- 
cgit v1.2.1


From 465b515600d7639fcb46fd98810187e0b500ee91 Mon Sep 17 00:00:00 2001
From: sakimahesh <saketm.1991@gmail.com>
Date: Fri, 26 Apr 2013 05:35:21 +0530
Subject: [ticket/9341] Correctly named template vars

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b087e1298b..03a5b36a43 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2345,9 +2345,9 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam
 		$tpl_prefix . 'BASE_URL'		=> $base_url,
 		'A_' . $tpl_prefix . 'BASE_URL'		=> addslashes($base_url),
 		$tpl_prefix . 'PER_PAGE'		=> $per_page,
-		$tpl_prefix . 'PREVIOUS_PAGE'	=> $previous_page,
+		'U_' . $tpl_prefix . 'PREVIOUS_PAGE'	=> $previous_page,
 		$tpl_prefix . 'PREV_PAGE'		=> $previous_page,
-		$tpl_prefix . 'NEXT_PAGE'		=> ($on_page != $total_pages) ? $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page) : '',
+		'U_' . $tpl_prefix . 'NEXT_PAGE'		=> ($on_page != $total_pages) ? $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page) : '',
 		$tpl_prefix . 'TOTAL_PAGES'		=> $total_pages,
 		$tpl_prefix . 'CURRENT_PAGE'	=> $on_page,
 	);
-- 
cgit v1.2.1


From 458d1c496146362b2646a0aaa852e35e7da5a7b1 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 22 Jun 2013 19:59:33 -0400
Subject: [ticket/11253] Add migration to add auth check to UCP signature
 module

PHPBB3-11253
---
 .../migration/data/310/signature_module_auth.php   | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 phpBB/includes/db/migration/data/310/signature_module_auth.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/signature_module_auth.php b/phpBB/includes/db/migration/data/310/signature_module_auth.php
new file mode 100644
index 0000000000..aad2107498
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/signature_module_auth.php
@@ -0,0 +1,52 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		$sql = 'SELECT module_auth
+			FROM ' . MODULES_TABLE . "
+			WHERE module_class = 'ucp'
+				AND module_basename = 'ucp_profile'
+				AND module_mode = 'signature'";
+		$result = $this->db->sql_query($sql);
+		$module_auth = $this->db_sql_fetchfield('module_auth');
+		$this->db->sql_freeresult($result);
+
+		return $module_auth === 'alc_u_sig';
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_31x_dev');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(
+					array(&$this, 'update_signature_module_auth'),
+				),
+			),
+		);
+	}
+
+	public function update_signature_module_auth()
+	{
+		$sql = 'UPDATE ' . MODULES TABLE . "
+			SET module_auth = 'acl_u_sig'
+			WHERE module_class = 'ucp'
+				AND module_basename = 'ucp_profile'
+				AND module_mode = 'signature'";
+		$this->db->sql_query($sql);
+
+		return;
+	}
+}
-- 
cgit v1.2.1


From 158483ecad0becde90152285549624635a244931 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 22 Jun 2013 20:40:08 -0400
Subject: [ticket/11253] Fix typo in constant

PHPBB3-11253
---
 phpBB/includes/db/migration/data/310/signature_module_auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/signature_module_auth.php b/phpBB/includes/db/migration/data/310/signature_module_auth.php
index aad2107498..9beaa686bd 100644
--- a/phpBB/includes/db/migration/data/310/signature_module_auth.php
+++ b/phpBB/includes/db/migration/data/310/signature_module_auth.php
@@ -40,7 +40,7 @@ class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migrati
 
 	public function update_signature_module_auth()
 	{
-		$sql = 'UPDATE ' . MODULES TABLE . "
+		$sql = 'UPDATE ' . MODULES_TABLE . "
 			SET module_auth = 'acl_u_sig'
 			WHERE module_class = 'ucp'
 				AND module_basename = 'ucp_profile'
-- 
cgit v1.2.1


From 8d86f88ac6f7dc5370c043ed3b89659b0c68dd69 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 23 Jun 2013 09:43:32 -0400
Subject: [ticket/11253] Fix a few things brought up in the PR

---
 .../db/migration/data/310/signature_module_auth.php         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/signature_module_auth.php b/phpBB/includes/db/migration/data/310/signature_module_auth.php
index 9beaa686bd..1e6c6cc1dc 100644
--- a/phpBB/includes/db/migration/data/310/signature_module_auth.php
+++ b/phpBB/includes/db/migration/data/310/signature_module_auth.php
@@ -2,8 +2,8 @@
 /**
 *
 * @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License v2
 *
 */
 
@@ -15,12 +15,13 @@ class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migrati
 			FROM ' . MODULES_TABLE . "
 			WHERE module_class = 'ucp'
 				AND module_basename = 'ucp_profile'
-				AND module_mode = 'signature'";
+				AND module_mode = 'signature'
+				AND module_auth = ''";
 		$result = $this->db->sql_query($sql);
 		$module_auth = $this->db_sql_fetchfield('module_auth');
 		$this->db->sql_freeresult($result);
 
-		return $module_auth === 'alc_u_sig';
+		return $module_auth === 'acl_u_sig' || $module_auth === false;
 	}
 
 	static public function depends_on()
@@ -32,7 +33,7 @@ class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migrati
 	{
 		return array(
 			array('custom', array(
-					array(&$this, 'update_signature_module_auth'),
+					array($this, 'update_signature_module_auth'),
 				),
 			),
 		);
@@ -46,7 +47,5 @@ class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migrati
 				AND module_basename = 'ucp_profile'
 				AND module_mode = 'signature'";
 		$this->db->sql_query($sql);
-
-		return;
 	}
 }
-- 
cgit v1.2.1


From fc99c862521c8a01c076bcd062513a33f9a36fa4 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 23 Jun 2013 19:47:13 -0400
Subject: [ticket/11253] Put AND clause in correct SQL query

PHPBB3-11253
---
 phpBB/includes/db/migration/data/310/signature_module_auth.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/signature_module_auth.php b/phpBB/includes/db/migration/data/310/signature_module_auth.php
index 1e6c6cc1dc..e4fbb27bcb 100644
--- a/phpBB/includes/db/migration/data/310/signature_module_auth.php
+++ b/phpBB/includes/db/migration/data/310/signature_module_auth.php
@@ -15,8 +15,7 @@ class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migrati
 			FROM ' . MODULES_TABLE . "
 			WHERE module_class = 'ucp'
 				AND module_basename = 'ucp_profile'
-				AND module_mode = 'signature'
-				AND module_auth = ''";
+				AND module_mode = 'signature'";
 		$result = $this->db->sql_query($sql);
 		$module_auth = $this->db_sql_fetchfield('module_auth');
 		$this->db->sql_freeresult($result);
@@ -45,7 +44,8 @@ class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migrati
 			SET module_auth = 'acl_u_sig'
 			WHERE module_class = 'ucp'
 				AND module_basename = 'ucp_profile'
-				AND module_mode = 'signature'";
+				AND module_mode = 'signature'
+				AND module_auth = ''";
 		$this->db->sql_query($sql);
 	}
 }
-- 
cgit v1.2.1


From 62fda07dd4f0ded73d16e9164b377c5e90fd4fd0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 23 Jun 2013 22:28:39 -0500
Subject: [feature/twig] Changing method for begin node to not use anonymous
 function

The way it was setup would actually require PHP 5.4, which isn't an option
right now. Leaving the old code there, just commented out, for now at least.

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php | 40 +++++++++++++++++++++++++
 phpBB/includes/template/twig/node/begin.php  | 44 ++++++++++++++++++++++++++++
 phpBB/includes/template/twig/twig.php        |  8 +++--
 3 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 phpBB/includes/template/twig/environment.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
new file mode 100644
index 0000000000..1494b3ab28
--- /dev/null
+++ b/phpBB/includes/template/twig/environment.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_template_twig_environment extends Twig_Environment
+{
+	/**
+	* recursive helper to set variables into $context so that Twig can properly fetch them for display
+	*
+	* @param array $data Data to set at the end of the chain
+	* @param array $blocks Array of blocks to loop into still
+	* @param mixed $current_location Current location in $context (recursive!)
+	*/
+	public function context_recursive_loop_builder($data, $blocks, &$current_location)
+	{
+		$block = array_shift($blocks);
+
+		if (empty($blocks))
+		{
+			$current_location[$block] = $data;
+		}
+		else
+		{
+			$this->context_recursive_loop_builder($data, $blocks, $current_location[$block]);
+		}
+	}
+}
diff --git a/phpBB/includes/template/twig/node/begin.php b/phpBB/includes/template/twig/node/begin.php
index 3adb09f17e..34fd16dd73 100644
--- a/phpBB/includes/template/twig/node/begin.php
+++ b/phpBB/includes/template/twig/node/begin.php
@@ -29,6 +29,49 @@ class phpbb_template_twig_node_begin extends Twig_Node
      * @param Twig_Compiler A Twig_Compiler instance
      */
     public function compile(Twig_Compiler $compiler)
+    {
+		$compiler
+			->write("if (!isset(\$phpbb_blocks)) {\n")
+			->indent()
+				->write("\$phpbb_blocks = array();\n")
+				->write("\$parent = \$context['_phpbb_blocks'];\n")
+			->outdent()
+			->write("}\n")
+			->write("\$phpbb_blocks[] = '" . $this->getAttribute('beginName') . "';\n")
+		;
+
+        $compiler
+			->write("foreach (\$parent['" . $this->getAttribute('beginName') . "'] as \$" . $this->getAttribute('beginName') . ") {\n")
+			->indent()
+				// Set up $context correctly so that Twig can get the correct data with $this->getAttribute
+				->write("\$this->getEnvironment()->context_recursive_loop_builder(\$" . $this->getAttribute('beginName') . ", \$phpbb_blocks, \$context);\n")
+
+				// We store the parent so that we can do this recursively
+				->write("\$parent = \$" . $this->getAttribute('beginName') . ";\n")
+        ;
+
+        $compiler->subcompile($this->getNode('body'));
+
+        $compiler
+            ->outdent()
+            ->write("}\n")
+
+            // Remove the last item from the blocks storage as we've completed iterating over them all
+            ->write("array_pop(\$phpbb_blocks);\n")
+
+            // If we've gone through all of the blocks, we're back at the main level and have completed, so unset the var
+            ->write("if (empty(\$phpbb_blocks)) { unset(\$phpbb_blocks); }\n")
+        ;
+    }
+
+    /**
+     * Compiles the node to PHP.
+     *
+     * Uses anonymous functions to compile the loops, which seems nicer to me, but requires PHP 5.4 (since subcompile uses $this, which is not available in 5.3)
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     *
+    public function compile(Twig_Compiler $compiler)
     {
         $compiler->addDebugInfo($this);
 
@@ -85,4 +128,5 @@ class phpbb_template_twig_node_begin extends Twig_Node
 			->outdent()
 			->write("}\n");
     }
+    */
 }
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index a28905ca4e..358467d50d 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -118,7 +118,7 @@ class phpbb_template_twig implements phpbb_template
 		// @todo use phpbb_admin path
 		$loader->addPath($this->phpbb_root_path . 'adm/style/', 'admin');
 
-		$this->twig = new Twig_Environment($loader, array(
+		$this->twig = new phpbb_template_twig_environment($loader, array(
 		    'cache'			=> $this->cachepath,
 		    'debug'			=> true, // @todo
 		    'auto_reload'	=> true, // @todo
@@ -422,11 +422,13 @@ class phpbb_template_twig implements phpbb_template
 		$vars = array_merge(
 			$vars,
 			$this->context->get_rootref(),
-			$this->context->get_tpldata()
+			array(
+				'_phpbb_blocks'	=>  $this->context->get_tpldata(),
+			)
 		);
 
 		// cleanup
-		unset($vars['.']);
+		unset($vars['_phpbb_blocks']['.']);
 
 		return $vars;
 	}
-- 
cgit v1.2.1


From 3bd281fa2784048e29c6004b90bcd203733e4e32 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 24 Jun 2013 11:18:29 -0500
Subject: [feature/twig] Event template tag

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php       | 29 +++++++++++
 phpBB/includes/template/twig/node/event.php        | 44 ++++++++++++++++
 phpBB/includes/template/twig/tokenparser/event.php | 58 +++++++---------------
 phpBB/includes/template/twig/twig.php              |  6 ++-
 4 files changed, 97 insertions(+), 40 deletions(-)
 create mode 100644 phpBB/includes/template/twig/node/event.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index 1494b3ab28..b3e1ed9295 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -17,6 +17,35 @@ if (!defined('IN_PHPBB'))
 
 class phpbb_template_twig_environment extends Twig_Environment
 {
+	/** @var array */
+	protected $phpbbExtensions;
+
+    /**
+     * Gets the cache filename for a given template.
+     *
+     * @param string $name The template name
+     *
+     * @return string The cache file name
+     */
+    public function getCacheFilename($name)
+    {
+        if (false === $this->cache) {
+            return false;
+        }
+
+    	return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '.php';
+    }
+
+    public function set_phpbb_extensions($extensions)
+    {
+    	$this->phpbbExtensions = $extensions;
+	}
+
+	public function get_phpbb_extensions()
+	{
+		return $this->phpbbExtensions;
+	}
+
 	/**
 	* recursive helper to set variables into $context so that Twig can properly fetch them for display
 	*
diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/includes/template/twig/node/event.php
new file mode 100644
index 0000000000..c76c727ba5
--- /dev/null
+++ b/phpBB/includes/template/twig/node/event.php
@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_event extends Twig_Node
+{
+	protected $environment;
+
+    public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+    {
+    	$this->environment = $environment;
+
+        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+    }
+
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     */
+    public function compile(Twig_Compiler $compiler)
+    {
+        $compiler->addDebugInfo($this);
+
+        $compiler->indent();
+
+    	$location = $this->getNode('expr')->getAttribute('name');
+
+    	foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
+    	{
+    		$ext_namespace = str_replace('/', '_', $ext_namespace);
+
+    		if ($this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
+    		{
+    			$compiler->write("\$this->env->loadTemplate('@" . $ext_namespace . "/" . $location . ".html')->display(\$context);\n");
+			}
+		}
+    }
+}
diff --git a/phpBB/includes/template/twig/tokenparser/event.php b/phpBB/includes/template/twig/tokenparser/event.php
index 27a8350af1..03810454ed 100644
--- a/phpBB/includes/template/twig/tokenparser/event.php
+++ b/phpBB/includes/template/twig/tokenparser/event.php
@@ -1,49 +1,29 @@
 <?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 /**
- * Includes a template.
- *
- * <pre>
- *   {% include 'header.html' %}
- *     Body
- *   {% include 'footer.html' %}
- * </pre>
- */
-class phpbb_template_twig_tokenparser_event extends Twig_TokenParser_Include
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_tokenparser_event extends Twig_TokenParser
 {
-    protected function parseArguments()
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Twig_Token $token A Twig_Token instance
+     *
+     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     */
+    public function parse(Twig_Token $token)
     {
-        $stream = $this->parser->getStream();
-
-        $ignoreMissing = true;
-
-        $variables = null;
-        if ($stream->test(Twig_Token::NAME_TYPE, 'with')) {
-            $stream->next();
-
-            $variables = $this->parser->getExpressionParser()->parseExpression();
-        }
-
-        $only = false;
-        if ($stream->test(Twig_Token::NAME_TYPE, 'only')) {
-            $stream->next();
-
-            $only = true;
-        }
+        $expr = $this->parser->getExpressionParser()->parseExpression();
 
+        $stream = $this->parser->getStream();
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        return array($variables, $only, $ignoreMissing);
+        return new phpbb_template_twig_node_event($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
     }
 
     /**
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 358467d50d..d0b8d2eda1 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -125,6 +125,9 @@ class phpbb_template_twig implements phpbb_template
     		'autoescape'	=> false,
 		));
 
+		// Set enabled phpbb extensions
+		$this->twig->set_phpbb_extensions($this->extension_manager->all_enabled());
+
 		// Clear previous cache files (while WIP)
 		// @todo remove
 		if (is_dir($this->cachepath))
@@ -182,7 +185,8 @@ class phpbb_template_twig implements phpbb_template
 					{
 						if (is_dir($ext_path . 'styles/' . $style_name))
 						{
-							$this->twig->getLoader()->addPath($ext_path . 'styles/' . $style_name, $ext_namespace);
+							// namespaces cannot contain /
+							$this->twig->getLoader()->addPath($ext_path . 'styles/' . $style_name . '/template', str_replace('/', '_', $ext_namespace));
 						}
 					}
 				}
-- 
cgit v1.2.1


From 4881085f13f0b10636bf11f846f86562c1e6bfc9 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 24 Jun 2013 11:19:54 -0500
Subject: [feature/twig] Use twig->display rather than echo twig->render

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index d0b8d2eda1..92eeb6d913 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -238,7 +238,7 @@ class phpbb_template_twig implements phpbb_template
 
 		try
 		{
-			echo $this->twig->render($this->locator->get_filename_for_handle($handle), $this->get_template_vars());
+			$this->twig->display($this->locator->get_filename_for_handle($handle), $this->get_template_vars());
 		}
 		catch (Twig_Error $e)
 		{
-- 
cgit v1.2.1


From c958155fb63667e1d54d6d31489bf17c0a180dab Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 24 Jun 2013 12:39:28 -0500
Subject: [feature/twig] Able to set chain of namespaces to search for
 loadTemplate()

This is done so that when event template files are included, if they
include files themselves, that namespace is checked first, then __main__
is checked to include the correct template file.

Also, when template files are included from a particular namespace, this is
done so that the files from that namespace are included first, then the
main namespace is checked.

We may want to change this behavior in the future to allow choosing which
locations have priority, but for now, this is what I am doing to make sure
the behavior is simple and always the same.

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php       | 80 +++++++++++++++++++++-
 phpBB/includes/template/twig/node/event.php        |  9 ++-
 phpBB/includes/template/twig/node/include.php      | 45 ++++++++++++
 .../includes/template/twig/tokenparser/include.php | 16 +++++
 4 files changed, 147 insertions(+), 3 deletions(-)
 create mode 100644 phpBB/includes/template/twig/node/include.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index b3e1ed9295..4c7f0002ba 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -20,6 +20,9 @@ class phpbb_template_twig_environment extends Twig_Environment
 	/** @var array */
 	protected $phpbbExtensions;
 
+	/** @var array **/
+	protected $namespaceLookUpOrder = array('__main__');
+
     /**
      * Gets the cache filename for a given template.
      *
@@ -36,16 +39,89 @@ class phpbb_template_twig_environment extends Twig_Environment
     	return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '.php';
     }
 
+	/**
+	* Get the list of enabled phpBB extensions
+	*
+	* @return array
+	*/
+	public function get_phpbb_extensions()
+	{
+		return $this->phpbbExtensions;
+	}
+
+    /**
+    * Store the list of enabled phpBB extensions
+    *
+    * @param array $extensions
+    * @return Twig_Environment
+    */
     public function set_phpbb_extensions($extensions)
     {
     	$this->phpbbExtensions = $extensions;
+
+		return $this;
 	}
 
-	public function get_phpbb_extensions()
+	/**
+	* Get the namespace look up order
+	*
+	* @return array
+	*/
+	public function getNamespaceLookUpOrder()
 	{
-		return $this->phpbbExtensions;
+		return $this->namespaceLookUpOrder;
+	}
+
+	/**
+	* Set the namespace look up order to load templates from
+	*
+	* @param array $namespace
+    * @return Twig_Environment
+	*/
+	public function setNamespaceLookUpOrder($namespace)
+	{
+		$this->namespaceLookUpOrder = $namespace;
+
+		return $this;
 	}
 
+    /**
+     * Loads a template by name.
+     *
+     * @param string  $name  The template name
+     * @param integer $index The index if it is an embedded template
+     *
+     * @return Twig_TemplateInterface A template instance representing the given template name
+     */
+    public function loadTemplate($name, $index = null)
+    {
+    	if (strpos($name, '@') === false)
+    	{
+    		foreach ($this->namespaceLookUpOrder as $namespace)
+    		{
+        		try
+    			{
+    				if ($namespace === '__main__')
+    				{
+    					return parent::loadTemplate($name, $index);
+					}
+
+    				return parent::loadTemplate('@' . $namespace . '/' . $name, $index);
+				}
+				catch (Twig_Error_Loader $e)
+				{
+				}
+			}
+
+			// We were unable to load any templates
+			throw $e;
+		}
+		else
+		{
+    		return parent::loadTemplate($name, $index);
+		}
+    }
+
 	/**
 	* recursive helper to set variables into $context so that Twig can properly fetch them for display
 	*
diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/includes/template/twig/node/event.php
index c76c727ba5..cedfa870fa 100644
--- a/phpBB/includes/template/twig/node/event.php
+++ b/phpBB/includes/template/twig/node/event.php
@@ -37,7 +37,14 @@ class phpbb_template_twig_node_event extends Twig_Node
 
     		if ($this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
     		{
-    			$compiler->write("\$this->env->loadTemplate('@" . $ext_namespace . "/" . $location . ".html')->display(\$context);\n");
+    			$compiler
+    				->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
+
+    				// We set the namespace lookup order to be this extension first, then the main path
+    				->write("\$this->env->setNamespaceLookUpOrder(array('" . $ext_namespace . "', '__main__'));\n")
+    				->write("\$this->env->loadTemplate('@" . $ext_namespace . "/" . $location . ".html')->display(\$context);\n")
+    				->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
+    			;
 			}
 		}
     }
diff --git a/phpBB/includes/template/twig/node/include.php b/phpBB/includes/template/twig/node/include.php
new file mode 100644
index 0000000000..df7a95af44
--- /dev/null
+++ b/phpBB/includes/template/twig/node/include.php
@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_include extends Twig_Node_Include
+{
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     */
+    public function compile(Twig_Compiler $compiler)
+    {
+        $compiler->addDebugInfo($this);
+
+    	$location = $this->getNode('expr')->getAttribute('value');
+    	$namespace = false;
+
+    	if (strpos($location, '@') === 0)
+    	{
+    		$namespace = substr($location, 1, strpos($location, '/') - 1);
+
+    		$compiler
+    			->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
+
+    			// We set the namespace lookup order to be this namespace first, then the main path
+    			->write("\$this->env->setNamespaceLookUpOrder(array('" . $namespace . "', '__main__'));\n")
+    		;
+		}
+
+        parent::compile($compiler);
+
+    	if ($namespace)
+    	{
+    		$compiler
+    			->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
+    		;
+		}
+    }
+}
diff --git a/phpBB/includes/template/twig/tokenparser/include.php b/phpBB/includes/template/twig/tokenparser/include.php
index d9421095d1..32e1cd331d 100644
--- a/phpBB/includes/template/twig/tokenparser/include.php
+++ b/phpBB/includes/template/twig/tokenparser/include.php
@@ -21,6 +21,22 @@
  */
 class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include
 {
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Twig_Token $token A Twig_Token instance
+     *
+     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     */
+    public function parse(Twig_Token $token)
+    {
+        $expr = $this->parser->getExpressionParser()->parseExpression();
+
+        list($variables, $only, $ignoreMissing) = $this->parseArguments();
+
+        return new phpbb_template_twig_node_include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
+    }
+
     /**
      * Gets the tag name associated with this token parser.
      *
-- 
cgit v1.2.1


From 63143a1a576b9707dfc997038a5aaf804d5f8d8e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 24 Jun 2013 12:52:55 -0500
Subject: [feature/twig] Fix <!-- .blah since the being node was changed

PHPBB3-11598
---
 phpBB/includes/template/twig/node/event.php | 2 --
 phpBB/includes/template/twig/twig.php       | 7 +++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/includes/template/twig/node/event.php
index cedfa870fa..12e6ef1329 100644
--- a/phpBB/includes/template/twig/node/event.php
+++ b/phpBB/includes/template/twig/node/event.php
@@ -27,8 +27,6 @@ class phpbb_template_twig_node_event extends Twig_Node
     {
         $compiler->addDebugInfo($this);
 
-        $compiler->indent();
-
     	$location = $this->getNode('expr')->getAttribute('name');
 
     	foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 92eeb6d913..15e49df200 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -431,6 +431,13 @@ class phpbb_template_twig implements phpbb_template
 			)
 		);
 
+		// Must do this so that <!-- IF .blah --> works correctly
+		// (only for the base loops, the rest are properly handled by the begin node)
+		foreach ($this->context->get_tpldata() as $block_name => $block_values)
+		{
+			$vars[$block_name] = !empty($block_values);
+		}
+
 		// cleanup
 		unset($vars['_phpbb_blocks']['.']);
 
-- 
cgit v1.2.1


From 1a0819bdc40fd6b40b556ba1739ae71214719b43 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 24 Jun 2013 13:32:31 -0500
Subject: [feature/twig] Changing INCLUDEJS behavior

Was:
<!-- INCLUDEJS template/foo.js -->

Now:
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' -->

Reasons for this:
1. INCLUDEJS is 3.1-dev only

2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path
to styles/name/ directory)

3. INCLUDEJS could not include files from outside directories or anywhere
else

4. It was easier to change INCLUDEJS behavior to something more flexible
and useful than hack around it to make it work as it was with Twig.

PHPBB3-11598
---
 phpBB/includes/template/twig/lexer.php          | 6 +++---
 phpBB/includes/template/twig/node/includejs.php | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index ea161bf730..b2828c9e25 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -32,15 +32,15 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			'UNDEFINE',
 			'ENDDEFINE',
 			/*'INCLUDE',
-			'INCLUDEPHP',
-			'INCLUDEJS',*/
+			'INCLUDEPHP',*/
+			'INCLUDEJS',
 			'PHP',
 			'ENDPHP',
 			'EVENT',
 		);
 
 		// Replace <!-- INCLUDE blah.html --> with {% include 'blah.html' %}
-		$code = preg_replace('#<!-- INCLUDE(PHP|JS)? (.*?) -->#', "{% INCLUDE$1 '$2' %}", $code);
+		$code = preg_replace('#<!-- INCLUDE(PHP)? (.*?) -->#', "{% INCLUDE$1 '$2' %}", $code);
 
 		// This strips the $ inside of a tag directly after the token, which was used in <!-- DEFINE $NAME
 		$code = preg_replace('#<!-- DEFINE \$(.*)-->#', '<!-- DEFINE $1-->', $code);
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
index 6fe8e155b7..881636a326 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -24,8 +24,9 @@ class phpbb_template_twig_node_includejs extends Twig_Node
         $compiler->addDebugInfo($this);
 
         $compiler
-        	->write("\$context['SCRIPTS'] .= '<script type=\"text/javascript\" src=")
+        	->write("\$context['SCRIPTS'] .= '<script type=\"text/javascript\" src=\"' . ")
         	->subcompile($this->getNode('expr'))
-        	->raw(">';\n\n");
+        	->raw(" . '\">';\n\n")
+        ;
     }
 }
-- 
cgit v1.2.1


From 309ed5e5c32cb334986b53ca855e26dd483c2919 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 24 Jun 2013 13:37:22 -0500
Subject: [feature/twig] Fixing file header copyrights

PHPBB3-11598
---
 phpBB/includes/template/twig/node/begin.php        | 23 +++++----------
 phpBB/includes/template/twig/tokenparser/begin.php | 28 +++++-------------
 .../includes/template/twig/tokenparser/define.php  | 33 +++++-----------------
 phpBB/includes/template/twig/tokenparser/if.php    | 30 +++++---------------
 .../includes/template/twig/tokenparser/include.php | 26 +++++------------
 5 files changed, 35 insertions(+), 105 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/begin.php b/phpBB/includes/template/twig/node/begin.php
index 34fd16dd73..4222295d26 100644
--- a/phpBB/includes/template/twig/node/begin.php
+++ b/phpBB/includes/template/twig/node/begin.php
@@ -1,21 +1,12 @@
 <?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 /**
- * Represents a for node.
- *
- * @package    twig
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- */
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
 class phpbb_template_twig_node_begin extends Twig_Node
 {
     public function __construct($beginName, Twig_NodeInterface $body, Twig_NodeInterface $else = null, $lineno, $tag = null)
diff --git a/phpBB/includes/template/twig/tokenparser/begin.php b/phpBB/includes/template/twig/tokenparser/begin.php
index 4a9933d680..0a2f2da40d 100644
--- a/phpBB/includes/template/twig/tokenparser/begin.php
+++ b/phpBB/includes/template/twig/tokenparser/begin.php
@@ -1,26 +1,12 @@
 <?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 /**
- * Loops over each item of a sequence.
- *
- * <pre>
- * <ul>
- *  {% for user in users %}
- *    <li>{{ user.username|e }}</li>
- *  {% endfor %}
- * </ul>
- * </pre>
- */
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
 class phpbb_template_twig_tokenparser_begin extends Twig_TokenParser_For
 {
     /**
diff --git a/phpBB/includes/template/twig/tokenparser/define.php b/phpBB/includes/template/twig/tokenparser/define.php
index 8eb33c7ff9..83f537a1ea 100644
--- a/phpBB/includes/template/twig/tokenparser/define.php
+++ b/phpBB/includes/template/twig/tokenparser/define.php
@@ -1,31 +1,12 @@
 <?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 /**
- * Defines a variable.
- *
- * <pre>
- *  {% set foo = 'foo' %}
- *
- *  {% set foo = [1, 2] %}
- *
- *  {% set foo = {'foo': 'bar'} %}
- *
- *  {% set foo = 'foo' ~ 'bar' %}
- *
- *  {% set foo, bar = 'foo', 'bar' %}
- *
- *  {% set foo %}Some content{% endset %}
- * </pre>
- */
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
 class phpbb_template_twig_tokenparser_define extends Twig_TokenParser_Set
 {
     public function decideBlockEnd(Twig_Token $token)
diff --git a/phpBB/includes/template/twig/tokenparser/if.php b/phpBB/includes/template/twig/tokenparser/if.php
index e47744093e..04ee048f94 100644
--- a/phpBB/includes/template/twig/tokenparser/if.php
+++ b/phpBB/includes/template/twig/tokenparser/if.php
@@ -1,28 +1,12 @@
 <?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 /**
- * Tests a condition.
- *
- * <pre>
- * {% if users %}
- *  <ul>
- *    {% for user in users %}
- *      <li>{{ user.username|e }}</li>
- *    {% endfor %}
- *  </ul>
- * {% endif %}
- * </pre>
- */
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
 class phpbb_template_twig_tokenparser_if extends Twig_TokenParser_If
 {
     /**
diff --git a/phpBB/includes/template/twig/tokenparser/include.php b/phpBB/includes/template/twig/tokenparser/include.php
index 32e1cd331d..0f7e4faf8f 100644
--- a/phpBB/includes/template/twig/tokenparser/include.php
+++ b/phpBB/includes/template/twig/tokenparser/include.php
@@ -1,24 +1,12 @@
 <?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 /**
- * Includes a template.
- *
- * <pre>
- *   {% include 'header.html' %}
- *     Body
- *   {% include 'footer.html' %}
- * </pre>
- */
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
 class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include
 {
     /**
-- 
cgit v1.2.1


From 2819a2641b5aa6a006fa6c7a65487de89cb1b25a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 24 Jun 2013 13:45:23 -0500
Subject: [feature/twig] Only set extensions if extension manager is loaded

PHPBB3-11598
---
 phpBB/includes/template/twig/twig.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 15e49df200..c894fb5567 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -126,7 +126,10 @@ class phpbb_template_twig implements phpbb_template
 		));
 
 		// Set enabled phpbb extensions
-		$this->twig->set_phpbb_extensions($this->extension_manager->all_enabled());
+		if ($this->extension_manager)
+		{
+			$this->twig->set_phpbb_extensions($this->extension_manager->all_enabled());
+		}
 
 		// Clear previous cache files (while WIP)
 		// @todo remove
-- 
cgit v1.2.1


From a1f957af84130963ef20855dfee03ba86ab1a9b6 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 24 Jun 2013 15:28:54 -0500
Subject: [feature/twig] Working on fixing tests

PHPBB3-11598
---
 phpBB/includes/style/style.php              |  2 +-
 phpBB/includes/template/template.php        |  7 ++++
 phpBB/includes/template/twig/node/begin.php | 34 ++++++++++++-----
 phpBB/includes/template/twig/twig.php       | 57 ++++++++++++++++++-----------
 4 files changed, 69 insertions(+), 31 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 5aeeac40e4..493c4512a6 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -160,7 +160,7 @@ class phpbb_style
 			$this->template->set_style_names($names, $appended_paths);
 		}
 
-		$this->template->cachepath = $this->phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $name) . '_';
+		//$this->template->cachepath = $this->phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $name) . '_';
 
 		return true;
 	}
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 5dadd34084..15f0b6ee60 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -130,4 +130,11 @@ interface phpbb_template
 	* @return bool false on error, true on success
 	*/
 	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert');
+
+	/**
+	* Clear the cache
+	*
+	* @return phpbb_template
+	*/
+	public function clear_cache();
 }
diff --git a/phpBB/includes/template/twig/node/begin.php b/phpBB/includes/template/twig/node/begin.php
index 4222295d26..3c1ce1b89b 100644
--- a/phpBB/includes/template/twig/node/begin.php
+++ b/phpBB/includes/template/twig/node/begin.php
@@ -32,20 +32,36 @@ class phpbb_template_twig_node_begin extends Twig_Node
 		;
 
         $compiler
-			->write("foreach (\$parent['" . $this->getAttribute('beginName') . "'] as \$" . $this->getAttribute('beginName') . ") {\n")
-			->indent()
-				// Set up $context correctly so that Twig can get the correct data with $this->getAttribute
-				->write("\$this->getEnvironment()->context_recursive_loop_builder(\$" . $this->getAttribute('beginName') . ", \$phpbb_blocks, \$context);\n")
+        	->write("if (!empty(\$parent['" . $this->getAttribute('beginName') . "'])) {\n")
+        	->indent()
+				->write("foreach (\$parent['" . $this->getAttribute('beginName') . "'] as \$" . $this->getAttribute('beginName') . ") {\n")
+				->indent()
+					// Set up $context correctly so that Twig can get the correct data with $this->getAttribute
+					->write("\$this->getEnvironment()->context_recursive_loop_builder(\$" . $this->getAttribute('beginName') . ", \$phpbb_blocks, \$context);\n")
 
-				// We store the parent so that we can do this recursively
-				->write("\$parent = \$" . $this->getAttribute('beginName') . ";\n")
+					// We store the parent so that we can do this recursively
+					->write("\$parent = \$" . $this->getAttribute('beginName') . ";\n")
         ;
 
         $compiler->subcompile($this->getNode('body'));
 
-        $compiler
-            ->outdent()
-            ->write("}\n")
+		$compiler
+				->outdent()
+				->write("}\n")
+		;
+
+		if (null !== $this->getNode('else')) {
+			$compiler
+				->write("} else {\n")
+				->indent()
+					->subcompile($this->getNode('else'))
+				->outdent()
+			;
+		}
+
+		$compiler
+			->outdent()
+			->write("}\n")
 
             // Remove the last item from the blocks storage as we've completed iterating over them all
             ->write("array_pop(\$phpbb_blocks);\n")
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index c894fb5567..e2c9afbc78 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -114,10 +114,6 @@ class phpbb_template_twig implements phpbb_template
 		// Initiate the loader, __main__ namespace paths will be setup later in set_style_names()
 		$loader = new Twig_Loader_Filesystem('');
 
-		// Add admin namespace
-		// @todo use phpbb_admin path
-		$loader->addPath($this->phpbb_root_path . 'adm/style/', 'admin');
-
 		$this->twig = new phpbb_template_twig_environment($loader, array(
 		    'cache'			=> $this->cachepath,
 		    'debug'			=> true, // @todo
@@ -133,10 +129,7 @@ class phpbb_template_twig implements phpbb_template
 
 		// Clear previous cache files (while WIP)
 		// @todo remove
-		if (is_dir($this->cachepath))
-		{
-			$this->twig->clearCacheFiles();
-		}
+		$this->clear_cache();
 
 		$this->twig->addExtension(new phpbb_template_twig_extension);
 
@@ -145,6 +138,21 @@ class phpbb_template_twig implements phpbb_template
 		$this->twig->setLexer($lexer);
 	}
 
+	/**
+	* Clear the cache
+	*
+	* @return phpbb_template
+	*/
+	public function clear_cache()
+	{
+		if (is_dir($this->cachepath))
+		{
+			$this->twig->clearCacheFiles();
+		}
+
+		return $this;
+	}
+
 	/**
 	* Sets the template filenames for handles.
 	*
@@ -177,6 +185,10 @@ class phpbb_template_twig implements phpbb_template
 		{
 			$this->twig->getLoader()->setPaths($style_paths, 'core');
 
+			// Add admin namespace
+			// @todo use phpbb_admin path
+			$loader->addPath($this->phpbb_root_path . 'adm/style/', 'admin');
+
 			// Add all namespaces for all extensions
 			if ($this->extension_manager instanceof phpbb_extension_manager)
 			{
@@ -415,25 +427,28 @@ class phpbb_template_twig implements phpbb_template
 		$vars = array();
 
 		// Work-around for now
-		foreach ($this->user->lang as $key => $value)
+		if (!empty($this->user->lang))
 		{
-			if (!is_string($value))
+			foreach ($this->user->lang as $key => $value)
 			{
-				continue;
+				if (!is_string($value))
+				{
+					continue;
+				}
+
+				$vars['L_' . strtoupper($key)] = $value;
+				$vars['LA_' . strtoupper($key)] = addslashes($value);
 			}
 
-			$vars['L_' . strtoupper($key)] = $value;
-			$vars['LA_' . strtoupper($key)] = addslashes($value);
+			$vars = array_merge(
+				$vars,
+				$this->context->get_rootref(),
+				array(
+					'_phpbb_blocks'	=>  $this->context->get_tpldata(),
+				)
+			);
 		}
 
-		$vars = array_merge(
-			$vars,
-			$this->context->get_rootref(),
-			array(
-				'_phpbb_blocks'	=>  $this->context->get_tpldata(),
-			)
-		);
-
 		// Must do this so that <!-- IF .blah --> works correctly
 		// (only for the base loops, the rest are properly handled by the begin node)
 		foreach ($this->context->get_tpldata() as $block_name => $block_values)
-- 
cgit v1.2.1


From 3ca99f8122c149a66f59dbf3c9884c095db7ad3c Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 24 Jun 2013 22:37:58 -0500
Subject: [feature/twig] Append assets_version to includejs tag

Some fixes for main template parser

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php       | 26 ++++++++++++++++++++++
 phpBB/includes/template/twig/node/event.php        |  1 +
 phpBB/includes/template/twig/node/includejs.php    | 11 +++++++--
 .../template/twig/tokenparser/includejs.php        |  2 +-
 phpBB/includes/template/twig/twig.php              | 21 +++++++++--------
 5 files changed, 49 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index 4c7f0002ba..616321e15a 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -20,6 +20,9 @@ class phpbb_template_twig_environment extends Twig_Environment
 	/** @var array */
 	protected $phpbbExtensions;
 
+	/** @var phpbb_config */
+	protected $phpbbConfig;
+
 	/** @var array **/
 	protected $namespaceLookUpOrder = array('__main__');
 
@@ -62,6 +65,29 @@ class phpbb_template_twig_environment extends Twig_Environment
 		return $this;
 	}
 
+	/**
+	* Get phpBB config
+	*
+	* @return phpbb_config
+	*/
+	public function get_phpbb_config()
+	{
+		return $this->phpbbConfig;
+	}
+
+    /**
+    * Set phpBB config
+    *
+    * @param phpbb_config $config
+    * @return Twig_Environment
+    */
+    public function set_phpbb_config($config)
+    {
+    	$this->phpbbConfig = $config;
+
+		return $this;
+	}
+
 	/**
 	* Get the namespace look up order
 	*
diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/includes/template/twig/node/event.php
index 12e6ef1329..358c68dae5 100644
--- a/phpBB/includes/template/twig/node/event.php
+++ b/phpBB/includes/template/twig/node/event.php
@@ -9,6 +9,7 @@
 
 class phpbb_template_twig_node_event extends Twig_Node
 {
+	/** @var Twig_Environment */
 	protected $environment;
 
     public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
index 881636a326..f4c26affa4 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -9,8 +9,13 @@
 
 class phpbb_template_twig_node_includejs extends Twig_Node
 {
-    public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
+	/** @var Twig_Environment */
+	protected $environment;
+
+    public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
     {
+    	$this->environment = $environment;
+
         parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
     }
 
@@ -23,10 +28,12 @@ class phpbb_template_twig_node_includejs extends Twig_Node
     {
         $compiler->addDebugInfo($this);
 
+		$config = $this->environment->get_phpbb_config();
+
         $compiler
         	->write("\$context['SCRIPTS'] .= '<script type=\"text/javascript\" src=\"' . ")
         	->subcompile($this->getNode('expr'))
-        	->raw(" . '\">';\n\n")
+        	->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>';\n\n")
         ;
     }
 }
diff --git a/phpBB/includes/template/twig/tokenparser/includejs.php b/phpBB/includes/template/twig/tokenparser/includejs.php
index efa8692f4b..0b46f315d2 100644
--- a/phpBB/includes/template/twig/tokenparser/includejs.php
+++ b/phpBB/includes/template/twig/tokenparser/includejs.php
@@ -23,7 +23,7 @@ class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser
         $stream = $this->parser->getStream();
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        return new phpbb_template_twig_node_includejs($expr, $token->getLine(), $this->getTag());
+        return new phpbb_template_twig_node_includejs($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
     }
 
     /**
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index e2c9afbc78..af8ab615e6 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -127,6 +127,9 @@ class phpbb_template_twig implements phpbb_template
 			$this->twig->set_phpbb_extensions($this->extension_manager->all_enabled());
 		}
 
+		// Set config
+		$this->twig->set_phpbb_config($this->config);
+
 		// Clear previous cache files (while WIP)
 		// @todo remove
 		$this->clear_cache();
@@ -187,7 +190,7 @@ class phpbb_template_twig implements phpbb_template
 
 			// Add admin namespace
 			// @todo use phpbb_admin path
-			$loader->addPath($this->phpbb_root_path . 'adm/style/', 'admin');
+			$this->twig->getLoader()->addPath($this->phpbb_root_path . 'adm/style/', 'admin');
 
 			// Add all namespaces for all extensions
 			if ($this->extension_manager instanceof phpbb_extension_manager)
@@ -439,16 +442,16 @@ class phpbb_template_twig implements phpbb_template
 				$vars['L_' . strtoupper($key)] = $value;
 				$vars['LA_' . strtoupper($key)] = addslashes($value);
 			}
-
-			$vars = array_merge(
-				$vars,
-				$this->context->get_rootref(),
-				array(
-					'_phpbb_blocks'	=>  $this->context->get_tpldata(),
-				)
-			);
 		}
 
+		$vars = array_merge(
+			$vars,
+			$this->context->get_rootref(),
+			array(
+				'_phpbb_blocks'	=>  $this->context->get_tpldata(),
+			)
+		);
+
 		// Must do this so that <!-- IF .blah --> works correctly
 		// (only for the base loops, the rest are properly handled by the begin node)
 		foreach ($this->context->get_tpldata() as $block_name => $block_values)
-- 
cgit v1.2.1


From ea785efb30ced6ab399b290df6f202cb97315f80 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Jun 2013 14:22:40 -0500
Subject: [feature/twig] PHP token support

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php     |  2 ++
 phpBB/includes/template/twig/extension.php       |  1 +
 phpBB/includes/template/twig/node/php.php        | 40 +++++++++++++++++++++
 phpBB/includes/template/twig/tokenparser/php.php | 46 ++++++++++++++++++++++++
 4 files changed, 89 insertions(+)
 create mode 100644 phpBB/includes/template/twig/node/php.php
 create mode 100644 phpBB/includes/template/twig/tokenparser/php.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index 616321e15a..d9b56a56f6 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -39,6 +39,8 @@ class phpbb_template_twig_environment extends Twig_Environment
             return false;
         }
 
+		// @todo correct cache file name handling
+
     	return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '.php';
     }
 
diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index ff37a38c29..c9b719546f 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -31,6 +31,7 @@ class phpbb_template_twig_extension extends Twig_Extension
 			new phpbb_template_twig_tokenparser_include,
 			new phpbb_template_twig_tokenparser_includejs,
 			new phpbb_template_twig_tokenparser_event,
+			new phpbb_template_twig_tokenparser_php,
 		);
 	}
 
diff --git a/phpBB/includes/template/twig/node/php.php b/phpBB/includes/template/twig/node/php.php
new file mode 100644
index 0000000000..cf60ef33fc
--- /dev/null
+++ b/phpBB/includes/template/twig/node/php.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_php extends Twig_Node
+{
+	/** @var Twig_Environment */
+	protected $environment;
+
+    public function __construct(Twig_Node_Text $text, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+    {
+    	$this->environment = $environment;
+
+        parent::__construct(array('text' => $text), array(), $lineno, $tag);
+    }
+
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     */
+    public function compile(Twig_Compiler $compiler)
+    {
+        $compiler->addDebugInfo($this);
+
+		$config = $this->environment->get_phpbb_config();
+
+		if ($config['tpl_allow_php'])
+		{
+			$compiler
+				->raw($this->getNode('text')->getAttribute('data'))
+			;
+		}
+    }
+}
diff --git a/phpBB/includes/template/twig/tokenparser/php.php b/phpBB/includes/template/twig/tokenparser/php.php
new file mode 100644
index 0000000000..7db57081e2
--- /dev/null
+++ b/phpBB/includes/template/twig/tokenparser/php.php
@@ -0,0 +1,46 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_tokenparser_php extends Twig_TokenParser
+{
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Twig_Token $token A Twig_Token instance
+     *
+     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     */
+    public function parse(Twig_Token $token)
+    {
+        $stream = $this->parser->getStream();
+
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+		$body = $this->parser->subparse(array($this, 'decideEnd'), true);
+
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+        return new phpbb_template_twig_node_php($body, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
+    }
+
+    public function decideEnd(Twig_Token $token)
+    {
+        return $token->test('ENDPHP');
+    }
+
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @return string The tag name
+     */
+    public function getTag()
+    {
+        return 'PHP';
+    }
+}
-- 
cgit v1.2.1


From 68225d9f298f5f9de5f931b28241329931d16574 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Jun 2013 14:58:55 -0500
Subject: [feature/twig] Pass parameters required to twig env via constructor

Instead of creating set functions

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php | 52 +++++++++++++---------------
 phpBB/includes/template/twig/twig.php        | 27 +++++++--------
 2 files changed, 36 insertions(+), 43 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index d9b56a56f6..5032df9483 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -18,14 +18,26 @@ if (!defined('IN_PHPBB'))
 class phpbb_template_twig_environment extends Twig_Environment
 {
 	/** @var array */
-	protected $phpbbExtensions;
+	protected $phpbb_extensions;
 
 	/** @var phpbb_config */
-	protected $phpbbConfig;
+	protected $phpbb_config;
+
+	/** @var string */
+	protected $phpbb_root_path;
 
 	/** @var array **/
 	protected $namespaceLookUpOrder = array('__main__');
 
+    public function __construct(phpbb_config $phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
+	{
+		$this->phpbb_config = $phpbb_config;
+		$this->phpbb_extensions = $phpbb_extensions;
+		$this->phpbb_root_path = $phpbb_root_path;
+
+		return parent::__construct($loader, $options);
+	}
+
     /**
      * Gets the cache filename for a given template.
      *
@@ -51,20 +63,7 @@ class phpbb_template_twig_environment extends Twig_Environment
 	*/
 	public function get_phpbb_extensions()
 	{
-		return $this->phpbbExtensions;
-	}
-
-    /**
-    * Store the list of enabled phpBB extensions
-    *
-    * @param array $extensions
-    * @return Twig_Environment
-    */
-    public function set_phpbb_extensions($extensions)
-    {
-    	$this->phpbbExtensions = $extensions;
-
-		return $this;
+		return $this->phpbb_extensions;
 	}
 
 	/**
@@ -74,20 +73,17 @@ class phpbb_template_twig_environment extends Twig_Environment
 	*/
 	public function get_phpbb_config()
 	{
-		return $this->phpbbConfig;
+		return $this->phpbb_config;
 	}
 
-    /**
-    * Set phpBB config
-    *
-    * @param phpbb_config $config
-    * @return Twig_Environment
-    */
-    public function set_phpbb_config($config)
-    {
-    	$this->phpbbConfig = $config;
-
-		return $this;
+	/**
+	* Get the phpBB root path
+	*
+	* @return string
+	*/
+	public function get_phpbb_root_path()
+	{
+		return $this->phpbb_root_path;
 	}
 
 	/**
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index af8ab615e6..97bba3f433 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -114,21 +114,18 @@ class phpbb_template_twig implements phpbb_template
 		// Initiate the loader, __main__ namespace paths will be setup later in set_style_names()
 		$loader = new Twig_Loader_Filesystem('');
 
-		$this->twig = new phpbb_template_twig_environment($loader, array(
-		    'cache'			=> $this->cachepath,
-		    'debug'			=> true, // @todo
-		    'auto_reload'	=> true, // @todo
-    		'autoescape'	=> false,
-		));
-
-		// Set enabled phpbb extensions
-		if ($this->extension_manager)
-		{
-			$this->twig->set_phpbb_extensions($this->extension_manager->all_enabled());
-		}
-
-		// Set config
-		$this->twig->set_phpbb_config($this->config);
+		$this->twig = new phpbb_template_twig_environment(
+			$this->config,
+			($this->extension_manager) ? $this->extension_manager->all_enabled() : array(),
+			$this->phpbb_root_path,
+			$loader,
+			array(
+				'cache'			=> $this->cachepath,
+				'debug'			=> true, // @todo
+				'auto_reload'	=> true, // @todo
+				'autoescape'	=> false,
+			)
+		);
 
 		// Clear previous cache files (while WIP)
 		// @todo remove
-- 
cgit v1.2.1


From 99b776a4e56a9144bddc153ea993a96588b1c73b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Jun 2013 14:59:41 -0500
Subject: [feature/twig] Add a comment to tpl output if PHP used, but disabled

PHPBB3-11598
---
 phpBB/includes/template/twig/node/php.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/php.php b/phpBB/includes/template/twig/node/php.php
index cf60ef33fc..83481b1d69 100644
--- a/phpBB/includes/template/twig/node/php.php
+++ b/phpBB/includes/template/twig/node/php.php
@@ -28,13 +28,17 @@ class phpbb_template_twig_node_php extends Twig_Node
     {
         $compiler->addDebugInfo($this);
 
-		$config = $this->environment->get_phpbb_config();
-
-		if ($config['tpl_allow_php'])
+		if (!$config['tpl_allow_php'])
 		{
 			$compiler
-				->raw($this->getNode('text')->getAttribute('data'))
+				->write("// PHP Disabled\n")
 			;
+
+			return;
 		}
+
+		$compiler
+			->raw($this->getNode('text')->getAttribute('data'))
+		;
     }
 }
-- 
cgit v1.2.1


From e227f05e9a79994046a13dccefcd032b3011ab5b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Jun 2013 15:00:15 -0500
Subject: [feature/twig] INCLUDEPHP token support

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php         |  1 +
 phpBB/includes/template/twig/node/includephp.php   | 66 ++++++++++++++++++++++
 .../template/twig/tokenparser/includephp.php       | 47 +++++++++++++++
 3 files changed, 114 insertions(+)
 create mode 100644 phpBB/includes/template/twig/node/includephp.php
 create mode 100644 phpBB/includes/template/twig/tokenparser/includephp.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index c9b719546f..9d465a4db8 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -31,6 +31,7 @@ class phpbb_template_twig_extension extends Twig_Extension
 			new phpbb_template_twig_tokenparser_include,
 			new phpbb_template_twig_tokenparser_includejs,
 			new phpbb_template_twig_tokenparser_event,
+			new phpbb_template_twig_tokenparser_includephp,
 			new phpbb_template_twig_tokenparser_php,
 		);
 	}
diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/includes/template/twig/node/includephp.php
new file mode 100644
index 0000000000..0f964556f0
--- /dev/null
+++ b/phpBB/includes/template/twig/node/includephp.php
@@ -0,0 +1,66 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_includephp extends Twig_Node
+{
+	/** @var Twig_Environment */
+	protected $environment;
+
+    public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $ignoreMissing = false, $lineno, $tag = null)
+    {
+    	$this->environment = $environment;
+
+        parent::__construct(array('expr' => $expr), array('ignore_missing' => (Boolean) $ignoreMissing), $lineno, $tag);
+    }
+
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     */
+    public function compile(Twig_Compiler $compiler)
+    {
+        $compiler->addDebugInfo($this);
+
+		$config = $this->environment->get_phpbb_config();
+
+		if (!$config['tpl_allow_php'])
+		{
+			$compiler
+				->write("// INCLUDEPHP Disabled\n")
+			;
+
+			return;
+		}
+
+        if ($this->getAttribute('ignore_missing')) {
+            $compiler
+                ->write("try {\n")
+                ->indent()
+            ;
+        }
+
+		$compiler
+			->write("include(\$this->getEnvironment()->get_phpbb_root_path() . ")
+			->subcompile($this->getNode('expr'), true)
+			->raw(");\n")
+		;
+
+        if ($this->getAttribute('ignore_missing')) {
+            $compiler
+                ->outdent()
+                ->write("} catch (Twig_Error_Loader \$e) {\n")
+                ->indent()
+                ->write("// ignore missing template\n")
+                ->outdent()
+                ->write("}\n\n")
+            ;
+        }
+    }
+}
diff --git a/phpBB/includes/template/twig/tokenparser/includephp.php b/phpBB/includes/template/twig/tokenparser/includephp.php
new file mode 100644
index 0000000000..a81d663c09
--- /dev/null
+++ b/phpBB/includes/template/twig/tokenparser/includephp.php
@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_tokenparser_includephp extends Twig_TokenParser
+{
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Twig_Token $token A Twig_Token instance
+     *
+     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     */
+    public function parse(Twig_Token $token)
+    {
+        $expr = $this->parser->getExpressionParser()->parseExpression();
+
+        $stream = $this->parser->getStream();
+
+        $ignoreMissing = false;
+        if ($stream->test(Twig_Token::NAME_TYPE, 'ignore')) {
+            $stream->next();
+            $stream->expect(Twig_Token::NAME_TYPE, 'missing');
+
+            $ignoreMissing = true;
+        }
+
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+        return new phpbb_template_twig_node_includephp($expr, $this->parser->getEnvironment(), $ignoreMissing, $token->getLine(), $this->getTag());
+    }
+
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @return string The tag name
+     */
+    public function getTag()
+    {
+        return 'INCLUDEPHP';
+    }
+}
-- 
cgit v1.2.1


From 8bccba1a2fb5479ead0594b09dad95d4d22a5cec Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Jun 2013 16:27:58 -0500
Subject: [feature/twig] INCLUDEPHP token, replace variable usage with $context

I could find no better way to do this...

PHPBB3-11598
---
 phpBB/includes/template/twig/node/includephp.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/includes/template/twig/node/includephp.php
index 0f964556f0..6e77fac55d 100644
--- a/phpBB/includes/template/twig/node/includephp.php
+++ b/phpBB/includes/template/twig/node/includephp.php
@@ -46,10 +46,13 @@ class phpbb_template_twig_node_includephp extends Twig_Node
             ;
         }
 
+		// Replace variables in the expression
+		$expr = preg_replace('#{{ ([a-zA-Z0-9_]+) }}#', '\' . ((isset($context["$1"])) ? $context["$1"] : null) . \'', $this->getNode('expr')->getAttribute('value'));
+
 		$compiler
-			->write("include(\$this->getEnvironment()->get_phpbb_root_path() . ")
-			->subcompile($this->getNode('expr'), true)
-			->raw(");\n")
+			->write("require(\$this->getEnvironment()->get_phpbb_root_path() . '")
+			->raw($expr)
+			->raw("');\n")
 		;
 
         if ($this->getAttribute('ignore_missing')) {
-- 
cgit v1.2.1


From 1c8c03c4dbd74f2f2abf6d2968bc33a234df5a4e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Jun 2013 16:51:50 -0500
Subject: [feature/twig] INCLUDEPHP token abs paths & fix test

PHPBB3-11598
---
 phpBB/includes/template/twig/node/includephp.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/includes/template/twig/node/includephp.php
index 6e77fac55d..5315d136d7 100644
--- a/phpBB/includes/template/twig/node/includephp.php
+++ b/phpBB/includes/template/twig/node/includephp.php
@@ -50,9 +50,17 @@ class phpbb_template_twig_node_includephp extends Twig_Node
 		$expr = preg_replace('#{{ ([a-zA-Z0-9_]+) }}#', '\' . ((isset($context["$1"])) ? $context["$1"] : null) . \'', $this->getNode('expr')->getAttribute('value'));
 
 		$compiler
-			->write("require(\$this->getEnvironment()->get_phpbb_root_path() . '")
-			->raw($expr)
-			->raw("');\n")
+			->write("if (phpbb_is_absolute('$expr')) {\n")
+			->indent()
+				->write("require('$expr');\n")
+			->outdent()
+			->write("} else {\n")
+			->indent()
+				->write("require(\$this->getEnvironment()->get_phpbb_root_path() . '")
+				->raw($expr)
+				->raw("');\n")
+			->outdent()
+			->write("}\n")
 		;
 
         if ($this->getAttribute('ignore_missing')) {
-- 
cgit v1.2.1


From 3766b736da96cfbed3a234235f977f8f56c60632 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Jun 2013 18:06:45 -0500
Subject: [feature/twig] Don't require phpbb_config, some tests pass null

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index 5032df9483..0947a902d0 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -29,7 +29,7 @@ class phpbb_template_twig_environment extends Twig_Environment
 	/** @var array **/
 	protected $namespaceLookUpOrder = array('__main__');
 
-    public function __construct(phpbb_config $phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
+    public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
 	{
 		$this->phpbb_config = $phpbb_config;
 		$this->phpbb_extensions = $phpbb_extensions;
-- 
cgit v1.2.1


From 7a9aec5fda8b5be0aba1918b58b3972f7eed906f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Jun 2013 19:23:42 -0500
Subject: [feature/twig] No longer using the phpbb_template_locator

This functionality is handled by the Twig Filesystem Loader

PHPBB3-11598
---
 phpBB/includes/template/twig/twig.php | 56 +++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 23 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 97bba3f433..e80f42fede 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -58,12 +58,6 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	protected $user;
 
-	/**
-	* Template locator
-	* @var phpbb_template_locator
-	*/
-	protected $locator;
-
 	/**
 	* Extension manager.
 	*
@@ -88,6 +82,13 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	protected $twig;
 
+	/**
+	* Array of filenames assigned to set_filenames
+	*
+	* @var array
+	*/
+	protected $filenames = array();
+
 	/**
 	* Constructor.
 	*
@@ -105,7 +106,6 @@ class phpbb_template_twig implements phpbb_template
 		$this->php_ext = $php_ext;
 		$this->config = $config;
 		$this->user = $user;
-		$this->locator = $locator;
 		$this->context = $context;
 		$this->extension_manager = $extension_manager;
 
@@ -161,7 +161,7 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	public function set_filenames(array $filename_array)
 	{
-		$this->locator->set_filenames($filename_array);
+		$this->filenames = array_merge($filename_array, $this->filenames);
 
 		return $this;
 	}
@@ -181,30 +181,40 @@ class phpbb_template_twig implements phpbb_template
 		$this->twig->getLoader()->setPaths($style_paths);
 
 		// Core style namespace from phpbb_style::set_style()
-		if ($style_names === array($this->user->style['style_path']) || $style_names[0] == $this->user->style['style_path'])
+		if ($this->user && ($style_names === array($this->user->style['style_path']) || $style_names[0] == $this->user->style['style_path']))
 		{
 			$this->twig->getLoader()->setPaths($style_paths, 'core');
+		}
 
-			// Add admin namespace
-			// @todo use phpbb_admin path
-			$this->twig->getLoader()->addPath($this->phpbb_root_path . 'adm/style/', 'admin');
+		// Add admin namespace
+		// @todo use phpbb_admin path
+		if (is_dir($this->phpbb_root_path . 'adm/style/'))
+		{
+			$this->twig->getLoader()->setPaths($this->phpbb_root_path . 'adm/style/', 'admin');
+		}
 
-			// Add all namespaces for all extensions
-			if ($this->extension_manager instanceof phpbb_extension_manager)
+		// Add all namespaces for all extensions
+		if ($this->extension_manager instanceof phpbb_extension_manager)
+		{
+			$style_names[] = 'all';
+
+			foreach ($this->extension_manager->all_enabled() as $ext_namespace => $ext_path)
 			{
-				$style_names[] = 'all';
+				// namespaces cannot contain /
+				$namespace = str_replace('/', '_', $ext_namespace);
+				$paths = array();
 
-				foreach ($this->extension_manager->all_enabled() as $ext_namespace => $ext_path)
+				foreach ($style_names as $style_name)
 				{
-					foreach ($style_names as $style_name)
+					$ext_style_path = $ext_path . 'styles/' . $style_name . '/template';
+
+					if (is_dir($ext_style_path))
 					{
-						if (is_dir($ext_path . 'styles/' . $style_name))
-						{
-							// namespaces cannot contain /
-							$this->twig->getLoader()->addPath($ext_path . 'styles/' . $style_name . '/template', str_replace('/', '_', $ext_namespace));
-						}
+						$paths[] = $ext_style_path;
 					}
 				}
+
+				$this->twig->getLoader()->setPaths($paths, $namespace);
 			}
 		}
 
@@ -253,7 +263,7 @@ class phpbb_template_twig implements phpbb_template
 
 		try
 		{
-			$this->twig->display($this->locator->get_filename_for_handle($handle), $this->get_template_vars());
+			$this->twig->display($this->filenames[$handle], $this->get_template_vars());
 		}
 		catch (Twig_Error $e)
 		{
-- 
cgit v1.2.1


From 6c771a38ded92135b9264e142cc27d7e5770eda1 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Jun 2013 19:24:32 -0500
Subject: [feature/twig] Going back to Twig's handling of cache file names for
 now

My method was not working correctly, will work on it more later.

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index 0947a902d0..d20da965c3 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -45,15 +45,27 @@ class phpbb_template_twig_environment extends Twig_Environment
      *
      * @return string The cache file name
      */
-    public function getCacheFilename($name)
+    public function ignoregetCacheFilename($name)
     {
         if (false === $this->cache) {
             return false;
         }
+// @todo
+		$file_path = $this->getLoader()->getCacheKey($name);
+		foreach ($this->getLoader()->getNamespaces() as $namespace)
+		{
+			foreach ($this->getLoader()->getPaths($namespace) as $path)
+			{
+				if (strpos($file_path, $path) === 0)
+				{
+					//return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $namespace . '/' . $name) . '.php';
+				}
+			}
+		}
 
-		// @todo correct cache file name handling
-
+		// We probably should never get here under normal circumstances
     	return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '.php';
+    	return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '_' . md5($this->getLoader()->getCacheKey($name)) . '.php';
     }
 
 	/**
-- 
cgit v1.2.1


From 040186418aa15d1de4a99b81cf05ee74ef94e042 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Jun 2013 20:52:04 -0500
Subject: [feature/twig] Forgot to set up $config in node/php.php

PHPBB3-11598
---
 phpBB/includes/template/twig/node/php.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/php.php b/phpBB/includes/template/twig/node/php.php
index 83481b1d69..953cd184a7 100644
--- a/phpBB/includes/template/twig/node/php.php
+++ b/phpBB/includes/template/twig/node/php.php
@@ -28,6 +28,8 @@ class phpbb_template_twig_node_php extends Twig_Node
     {
         $compiler->addDebugInfo($this);
 
+		$config = $this->environment->get_phpbb_config();
+
 		if (!$config['tpl_allow_php'])
 		{
 			$compiler
-- 
cgit v1.2.1


From 4f3f0a8791cea806cc63cfe4709605ad63f8cbd4 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 25 Jun 2013 21:56:58 -0400
Subject: [feature/auth-refactor] Remove references to old auth plugins

Removes what is hopefully the last references to the old auth
plugins in the code base.

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 383e035817..1ac6697255 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -523,21 +523,11 @@ class acp_board
 		{
 			// Retrieve a list of auth plugins and check their config values
 			$auth_plugins = array();
+			$auth_providers = $phpbb_container->get('auth.provider_collection');
 
-			$dp = @opendir($phpbb_root_path . 'includes/auth');
-
-			if ($dp)
+			foreach($auth_providers as $key => $value)
 			{
-				while (($file = readdir($dp)) !== false)
-				{
-					if (preg_match('#^provider_(.*?)\.' . $phpEx . '$#', $file) && !preg_match('#^provider_interface\.' . $phpEx . '$#', $file))
-					{
-						$auth_plugins[] = basename(preg_replace('#^provider_(.*?)\.' . $phpEx . '$#', '\1', $file));
-					}
-				}
-				closedir($dp);
-
-				sort($auth_plugins);
+				$auth_plugins[] = str_replace('auth.provider.', '', $key);
 			}
 
 			$updated_auth_settings = false;
@@ -546,7 +536,7 @@ class acp_board
 			{
 				if ($method)
 				{
-					$provider = $phpbb_container->get('auth.provider.' . $method);
+					$provider = $auth_providers['auth.provider.' . $method];
 					if ($provider)
 					{
 						if ($fields = $provider->acp($this->new_config))
@@ -585,7 +575,7 @@ class acp_board
 				$method = basename($cfg_array['auth_method']);
 				if ($method)
 				{
-					$provider = $phpbb_container->get('auth.provider.' . $method);
+					$provider = $auth_providers['auth.provider.' . $method];
 					if ($provider)
 					{
 						if ($error = $provider->init())
@@ -683,7 +673,7 @@ class acp_board
 			{
 				if ($method)
 				{
-					$provider = $phpbb_container->get('auth.provider.' . $method);
+					$provider = $auth_providers['auth.provider.' . $method];
 					if ($provider)
 					{
 						$fields = $provider->acp($this->new_config);
@@ -709,22 +699,12 @@ class acp_board
 		global $phpbb_root_path, $phpEx;
 
 		$auth_plugins = array();
+		$auth_providers = $phpbb_container->get('auth.provider_collection');
 
-		$dp = @opendir($phpbb_root_path . 'includes/auth');
-
-		if (!$dp)
-		{
-			return '';
-		}
-
-		while (($file = readdir($dp)) !== false)
+		foreach($auth_providers as $key => $value)
 		{
-			if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file))
-			{
-				$auth_plugins[] = preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file);
-			}
+			$auth_plugins[] = str_replace('auth.provider.', '', $key);
 		}
-		closedir($dp);
 
 		sort($auth_plugins);
 
-- 
cgit v1.2.1


From 09372d765d5adbca743063a7410b97abf4536015 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 25 Jun 2013 22:01:00 -0400
Subject: [feature/auth-refactor] Remove old auth plugins

PHPBB3-9734
---
 phpBB/includes/auth/auth_apache.php | 247 -------------------------
 phpBB/includes/auth/auth_db.php     | 289 -----------------------------
 phpBB/includes/auth/auth_ldap.php   | 350 ------------------------------------
 3 files changed, 886 deletions(-)
 delete mode 100644 phpBB/includes/auth/auth_apache.php
 delete mode 100644 phpBB/includes/auth/auth_db.php
 delete mode 100644 phpBB/includes/auth/auth_ldap.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/auth_apache.php b/phpBB/includes/auth/auth_apache.php
deleted file mode 100644
index 10b288aa09..0000000000
--- a/phpBB/includes/auth/auth_apache.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
-* Apache auth plug-in for phpBB3
-*
-* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
-*
-* @package login
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Checks whether the user is identified to apache
-* Only allow changing authentication to apache if the user is identified
-* Called in acp_board while setting authentication plugins
-*
-* @return boolean|string false if the user is identified and else an error message
-*/
-function init_apache()
-{
-	global $user, $request;
-
-	if (!$request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER) || $user->data['username'] !== htmlspecialchars_decode($request->server('PHP_AUTH_USER')))
-	{
-		return $user->lang['APACHE_SETUP_BEFORE_USE'];
-	}
-	return false;
-}
-
-/**
-* Login function
-*/
-function login_apache(&$username, &$password)
-{
-	global $db, $request;
-
-	// do not allow empty password
-	if (!$password)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_PASSWORD,
-			'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!$username)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!$request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
-	{
-		return array(
-			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-			'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
-			'user_row'		=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	$php_auth_user = htmlspecialchars_decode($request->server('PHP_AUTH_USER'));
-	$php_auth_pw = htmlspecialchars_decode($request->server('PHP_AUTH_PW'));
-
-	if (!empty($php_auth_user) && !empty($php_auth_pw))
-	{
-		if ($php_auth_user !== $username)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type
-			FROM ' . USERS_TABLE . "
-			WHERE username = '" . $db->sql_escape($php_auth_user) . "'";
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			// User inactive...
-			if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ACTIVE,
-					'error_msg'		=> 'ACTIVE_ERROR',
-					'user_row'		=> $row,
-				);
-			}
-
-			// Successful login...
-			return array(
-				'status'		=> LOGIN_SUCCESS,
-				'error_msg'		=> false,
-				'user_row'		=> $row,
-			);
-		}
-
-		// this is the user's first login so create an empty profile
-		return array(
-			'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
-			'error_msg'		=> false,
-			'user_row'		=> user_row_apache($php_auth_user, $php_auth_pw),
-		);
-	}
-
-	// Not logged into apache
-	return array(
-		'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-		'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
-		'user_row'		=> array('user_id' => ANONYMOUS),
-	);
-}
-
-/**
-* Autologin function
-*
-* @return array containing the user row or empty if no auto login should take place
-*/
-function autologin_apache()
-{
-	global $db, $request;
-
-	if (!$request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
-	{
-		return array();
-	}
-
-	$php_auth_user = htmlspecialchars_decode($request->server('PHP_AUTH_USER'));
-	$php_auth_pw = htmlspecialchars_decode($request->server('PHP_AUTH_PW'));
-
-	if (!empty($php_auth_user) && !empty($php_auth_pw))
-	{
-		set_var($php_auth_user, $php_auth_user, 'string', true);
-		set_var($php_auth_pw, $php_auth_pw, 'string', true);
-
-		$sql = 'SELECT *
-			FROM ' . USERS_TABLE . "
-			WHERE username = '" . $db->sql_escape($php_auth_user) . "'";
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row;
-		}
-
-		if (!function_exists('user_add'))
-		{
-			global $phpbb_root_path, $phpEx;
-
-			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-		}
-
-		// create the user if he does not exist yet
-		user_add(user_row_apache($php_auth_user, $php_auth_pw));
-
-		$sql = 'SELECT *
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($php_auth_user)) . "'";
-		$result = $db->sql_query($sql);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return $row;
-		}
-	}
-
-	return array();
-}
-
-/**
-* This function generates an array which can be passed to the user_add function in order to create a user
-*/
-function user_row_apache($username, $password)
-{
-	global $db, $config, $user;
-	// first retrieve default group id
-	$sql = 'SELECT group_id
-		FROM ' . GROUPS_TABLE . "
-		WHERE group_name = '" . $db->sql_escape('REGISTERED') . "'
-			AND group_type = " . GROUP_SPECIAL;
-	$result = $db->sql_query($sql);
-	$row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
-
-	if (!$row)
-	{
-		trigger_error('NO_GROUP');
-	}
-
-	// generate user account data
-	return array(
-		'username'		=> $username,
-		'user_password'	=> phpbb_hash($password),
-		'user_email'	=> '',
-		'group_id'		=> (int) $row['group_id'],
-		'user_type'		=> USER_NORMAL,
-		'user_ip'		=> $user->ip,
-		'user_new'		=> ($config['new_member_post_limit']) ? 1 : 0,
-	);
-}
-
-/**
-* The session validation function checks whether the user is still logged in
-*
-* @return boolean true if the given user is authenticated or false if the session should be closed
-*/
-function validate_session_apache(&$user)
-{
-	global $request;
-
-	// Check if PHP_AUTH_USER is set and handle this case
-	if ($request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
-	{
-		$php_auth_user = $request->server('PHP_AUTH_USER');
-
-		return ($php_auth_user === $user['username']) ? true : false;
-	}
-
-	// PHP_AUTH_USER is not set. A valid session is now determined by the user type (anonymous/bot or not)
-	if ($user['user_type'] == USER_IGNORE)
-	{
-		return true;
-	}
-
-	return false;
-}
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
deleted file mode 100644
index ac944532a5..0000000000
--- a/phpBB/includes/auth/auth_db.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/**
-* Database auth plug-in for phpBB3
-*
-* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
-*
-* This is for authentication via the integrated user table
-*
-* @package login
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Login function
-*
-* @param string $username
-* @param string $password
-* @param string $ip			IP address the login is taking place from. Used to
-*							limit the number of login attempts per IP address.
-* @param string $browser	The user agent used to login
-* @param string $forwarded_for X_FORWARDED_FOR header sent with login request
-* @return array				A associative array of the format
-*							array(
-*								'status' => status constant
-*								'error_msg' => string
-*								'user_row' => array
-*							)
-*/
-function login_db($username, $password, $ip = '', $browser = '', $forwarded_for = '')
-{
-	global $db, $config;
-	global $request;
-
-	// Auth plugins get the password untrimmed.
-	// For compatibility we trim() here.
-	$password = trim($password);
-
-	// do not allow empty password
-	if (!$password)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_PASSWORD,
-			'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!$username)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	$username_clean = utf8_clean_string($username);
-
-	$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
-		FROM ' . USERS_TABLE . "
-		WHERE username_clean = '" . $db->sql_escape($username_clean) . "'";
-	$result = $db->sql_query($sql);
-	$row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
-
-	if (($ip && !$config['ip_login_limit_use_forwarded']) ||
-		($forwarded_for && $config['ip_login_limit_use_forwarded']))
-	{
-		$sql = 'SELECT COUNT(*) AS attempts
-			FROM ' . LOGIN_ATTEMPT_TABLE . '
-			WHERE attempt_time > ' . (time() - (int) $config['ip_login_limit_time']);
-		if ($config['ip_login_limit_use_forwarded'])
-		{
-			$sql .= " AND attempt_forwarded_for = '" . $db->sql_escape($forwarded_for) . "'";
-		}
-		else
-		{
-			$sql .= " AND attempt_ip = '" . $db->sql_escape($ip) . "' ";
-		}
-
-		$result = $db->sql_query($sql);
-		$attempts = (int) $db->sql_fetchfield('attempts');
-		$db->sql_freeresult($result);
-
-		$attempt_data = array(
-			'attempt_ip'			=> $ip,
-			'attempt_browser'		=> trim(substr($browser, 0, 149)),
-			'attempt_forwarded_for'	=> $forwarded_for,
-			'attempt_time'			=> time(),
-			'user_id'				=> ($row) ? (int) $row['user_id'] : 0,
-			'username'				=> $username,
-			'username_clean'		=> $username_clean,
-		);
-		$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $db->sql_build_array('INSERT', $attempt_data);
-		$result = $db->sql_query($sql);
-	}
-	else
-	{
-		$attempts = 0;
-	}
-
-	if (!$row)
-	{
-		if ($config['ip_login_limit_max'] && $attempts >= $config['ip_login_limit_max'])
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_ATTEMPTS,
-				'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
-				'user_row'		=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		return array(
-			'status'	=> LOGIN_ERROR_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	$show_captcha = ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts']) ||
-		($config['ip_login_limit_max'] && $attempts >= $config['ip_login_limit_max']);
-
-	// If there are too much login attempts, we need to check for an confirm image
-	// Every auth module is able to define what to do by itself...
-	if ($show_captcha)
-	{
-		// Visual Confirmation handling
-		if (!class_exists('phpbb_captcha_factory', false))
-		{
-			global $phpbb_root_path, $phpEx;
-			include ($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
-		}
-
-		$captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']);
-		$captcha->init(CONFIRM_LOGIN);
-		$vc_response = $captcha->validate($row);
-		if ($vc_response)
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_ATTEMPTS,
-				'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
-				'user_row'		=> $row,
-			);
-		}
-		else
-		{
-			$captcha->reset();
-		}
-
-	}
-
-	// If the password convert flag is set we need to convert it
-	if ($row['user_pass_convert'])
-	{
-		// enable super globals to get literal value
-		// this is needed to prevent unicode normalization
-		$super_globals_disabled = $request->super_globals_disabled();
-		if ($super_globals_disabled)
-		{
-			$request->enable_super_globals();
-		}
-
-		// in phpBB2 passwords were used exactly as they were sent, with addslashes applied
-		$password_old_format = isset($_REQUEST['password']) ? (string) $_REQUEST['password'] : '';
-		$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format;
-		$password_new_format = $request->variable('password', '', true);
-
-		if ($super_globals_disabled)
-		{
-			$request->disable_super_globals();
-		}
-
-		if ($password == $password_new_format)
-		{
-			if (!function_exists('utf8_to_cp1252'))
-			{
-				global $phpbb_root_path, $phpEx;
-				include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx);
-			}
-
-			// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding
-			// plain md5 support left in for conversions from other systems.
-			if ((strlen($row['user_password']) == 34 && (phpbb_check_hash(md5($password_old_format), $row['user_password']) || phpbb_check_hash(md5(utf8_to_cp1252($password_old_format)), $row['user_password'])))
-				|| (strlen($row['user_password']) == 32  && (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password'])))
-			{
-				$hash = phpbb_hash($password_new_format);
-
-				// Update the password in the users table to the new format and remove user_pass_convert flag
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_password = \'' . $db->sql_escape($hash) . '\',
-						user_pass_convert = 0
-					WHERE user_id = ' . $row['user_id'];
-				$db->sql_query($sql);
-
-				$row['user_pass_convert'] = 0;
-				$row['user_password'] = $hash;
-			}
-			else
-			{
-				// Although we weren't able to convert this password we have to
-				// increase login attempt count to make sure this cannot be exploited
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_login_attempts = user_login_attempts + 1
-					WHERE user_id = ' . (int) $row['user_id'] . '
-						AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
-				$db->sql_query($sql);
-
-				return array(
-					'status'		=> LOGIN_ERROR_PASSWORD_CONVERT,
-					'error_msg'		=> 'LOGIN_ERROR_PASSWORD_CONVERT',
-					'user_row'		=> $row,
-				);
-			}
-		}
-	}
-
-	// Check password ...
-	if (!$row['user_pass_convert'] && phpbb_check_hash($password, $row['user_password']))
-	{
-		// Check for old password hash...
-		if (strlen($row['user_password']) == 32)
-		{
-			$hash = phpbb_hash($password);
-
-			// Update the password in the users table to the new format
-			$sql = 'UPDATE ' . USERS_TABLE . "
-				SET user_password = '" . $db->sql_escape($hash) . "',
-					user_pass_convert = 0
-				WHERE user_id = {$row['user_id']}";
-			$db->sql_query($sql);
-
-			$row['user_password'] = $hash;
-		}
-
-		$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
-			WHERE user_id = ' . $row['user_id'];
-		$db->sql_query($sql);
-
-		if ($row['user_login_attempts'] != 0)
-		{
-			// Successful, reset login attempts (the user passed all stages)
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_login_attempts = 0
-				WHERE user_id = ' . $row['user_id'];
-			$db->sql_query($sql);
-		}
-
-		// User inactive...
-		if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_ACTIVE,
-				'error_msg'		=> 'ACTIVE_ERROR',
-				'user_row'		=> $row,
-			);
-		}
-
-		// Successful login... set user_login_attempts to zero...
-		return array(
-			'status'		=> LOGIN_SUCCESS,
-			'error_msg'		=> false,
-			'user_row'		=> $row,
-		);
-	}
-
-	// Password incorrect - increase login attempts
-	$sql = 'UPDATE ' . USERS_TABLE . '
-		SET user_login_attempts = user_login_attempts + 1
-		WHERE user_id = ' . (int) $row['user_id'] . '
-			AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
-	$db->sql_query($sql);
-
-	// Give status about wrong password...
-	return array(
-		'status'		=> ($show_captcha) ? LOGIN_ERROR_ATTEMPTS : LOGIN_ERROR_PASSWORD,
-		'error_msg'		=> ($show_captcha) ? 'LOGIN_ERROR_ATTEMPTS' : 'LOGIN_ERROR_PASSWORD',
-		'user_row'		=> $row,
-	);
-}
diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php
deleted file mode 100644
index 98355dd044..0000000000
--- a/phpBB/includes/auth/auth_ldap.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-/**
-*
-* LDAP auth plug-in for phpBB3
-*
-* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
-*
-* @package login
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Connect to ldap server
-* Only allow changing authentication to ldap if we can connect to the ldap server
-* Called in acp_board while setting authentication plugins
-*/
-function init_ldap()
-{
-	global $config, $user;
-
-	if (!@extension_loaded('ldap'))
-	{
-		return $user->lang['LDAP_NO_LDAP_EXTENSION'];
-	}
-
-	$config['ldap_port'] = (int) $config['ldap_port'];
-	if ($config['ldap_port'])
-	{
-		$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']);
-	}
-	else
-	{
-		$ldap = @ldap_connect($config['ldap_server']);
-	}
-
-	if (!$ldap)
-	{
-		return $user->lang['LDAP_NO_SERVER_CONNECTION'];
-	}
-
-	@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
-	@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
-
-	if ($config['ldap_user'] || $config['ldap_password'])
-	{
-		if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password'])))
-		{
-			return $user->lang['LDAP_INCORRECT_USER_PASSWORD'];
-		}
-	}
-
-	// ldap_connect only checks whether the specified server is valid, so the connection might still fail
-	$search = @ldap_search(
-		$ldap,
-		htmlspecialchars_decode($config['ldap_base_dn']),
-		ldap_user_filter($user->data['username']),
-		(empty($config['ldap_email'])) ?
-			array(htmlspecialchars_decode($config['ldap_uid'])) :
-			array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])),
-		0,
-		1
-	);
-
-	if ($search === false)
-	{
-		return $user->lang['LDAP_SEARCH_FAILED'];
-	}
-
-	$result = @ldap_get_entries($ldap, $search);
-
-	@ldap_close($ldap);
-
-
-	if (!is_array($result) || sizeof($result) < 2)
-	{
-		return sprintf($user->lang['LDAP_NO_IDENTITY'], $user->data['username']);
-	}
-
-	if (!empty($config['ldap_email']) && !isset($result[0][htmlspecialchars_decode($config['ldap_email'])]))
-	{
-		return $user->lang['LDAP_NO_EMAIL'];
-	}
-
-	return false;
-}
-
-/**
-* Login function
-*/
-function login_ldap(&$username, &$password)
-{
-	global $db, $config, $user;
-
-	// do not allow empty password
-	if (!$password)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_PASSWORD,
-			'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!$username)
-	{
-		return array(
-			'status'	=> LOGIN_ERROR_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	if (!@extension_loaded('ldap'))
-	{
-		return array(
-			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-			'error_msg'		=> 'LDAP_NO_LDAP_EXTENSION',
-			'user_row'		=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	$config['ldap_port'] = (int) $config['ldap_port'];
-	if ($config['ldap_port'])
-	{
-		$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']);
-	}
-	else
-	{
-		$ldap = @ldap_connect($config['ldap_server']);
-	}
-
-	if (!$ldap)
-	{
-		return array(
-			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-			'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
-			'user_row'		=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
-	@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
-
-	if ($config['ldap_user'] || $config['ldap_password'])
-	{
-		if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password'])))
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-				'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
-				'user_row'		=> array('user_id' => ANONYMOUS),
-			);
-		}
-	}
-
-	$search = @ldap_search(
-		$ldap,
-		htmlspecialchars_decode($config['ldap_base_dn']),
-		ldap_user_filter($username),
-		(empty($config['ldap_email'])) ?
-			array(htmlspecialchars_decode($config['ldap_uid'])) :
-			array(htmlspecialchars_decode($config['ldap_uid']), htmlspecialchars_decode($config['ldap_email'])),
-		0,
-		1
-	);
-
-	$ldap_result = @ldap_get_entries($ldap, $search);
-
-	if (is_array($ldap_result) && sizeof($ldap_result) > 1)
-	{
-		if (@ldap_bind($ldap, $ldap_result[0]['dn'], htmlspecialchars_decode($password)))
-		{
-			@ldap_close($ldap);
-
-			$sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type
-				FROM ' . USERS_TABLE . "
-				WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
-			$result = $db->sql_query($sql);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			if ($row)
-			{
-				unset($ldap_result);
-
-				// User inactive...
-				if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
-				{
-					return array(
-						'status'		=> LOGIN_ERROR_ACTIVE,
-						'error_msg'		=> 'ACTIVE_ERROR',
-						'user_row'		=> $row,
-					);
-				}
-
-				// Successful login... set user_login_attempts to zero...
-				return array(
-					'status'		=> LOGIN_SUCCESS,
-					'error_msg'		=> false,
-					'user_row'		=> $row,
-				);
-			}
-			else
-			{
-				// retrieve default group id
-				$sql = 'SELECT group_id
-					FROM ' . GROUPS_TABLE . "
-					WHERE group_name = '" . $db->sql_escape('REGISTERED') . "'
-						AND group_type = " . GROUP_SPECIAL;
-				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					trigger_error('NO_GROUP');
-				}
-
-				// generate user account data
-				$ldap_user_row = array(
-					'username'		=> $username,
-					'user_password'	=> phpbb_hash($password),
-					'user_email'	=> (!empty($config['ldap_email'])) ? utf8_htmlspecialchars($ldap_result[0][htmlspecialchars_decode($config['ldap_email'])][0]) : '',
-					'group_id'		=> (int) $row['group_id'],
-					'user_type'		=> USER_NORMAL,
-					'user_ip'		=> $user->ip,
-					'user_new'		=> ($config['new_member_post_limit']) ? 1 : 0,
-				);
-
-				unset($ldap_result);
-
-				// this is the user's first login so create an empty profile
-				return array(
-					'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
-					'error_msg'		=> false,
-					'user_row'		=> $ldap_user_row,
-				);
-			}
-		}
-		else
-		{
-			unset($ldap_result);
-			@ldap_close($ldap);
-
-			// Give status about wrong password...
-			return array(
-				'status'		=> LOGIN_ERROR_PASSWORD,
-				'error_msg'		=> 'LOGIN_ERROR_PASSWORD',
-				'user_row'		=> array('user_id' => ANONYMOUS),
-			);
-		}
-	}
-
-	@ldap_close($ldap);
-
-	return array(
-		'status'	=> LOGIN_ERROR_USERNAME,
-		'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-		'user_row'	=> array('user_id' => ANONYMOUS),
-	);
-}
-
-/**
-* Generates a filter string for ldap_search to find a user
-*
-* @param	$username	string	Username identifying the searched user
-*
-* @return				string	A filter string for ldap_search
-*/
-function ldap_user_filter($username)
-{
-	global $config;
-
-	$filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')';
-	if ($config['ldap_user_filter'])
-	{
-		$_filter = ($config['ldap_user_filter'][0] == '(' && substr($config['ldap_user_filter'], -1) == ')') ? $config['ldap_user_filter'] : "({$config['ldap_user_filter']})";
-		$filter = "(&{$filter}{$_filter})";
-	}
-	return $filter;
-}
-
-/**
-* Escapes an LDAP AttributeValue
-*/
-function ldap_escape($string)
-{
-	return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
-}
-
-/**
-* This function is used to output any required fields in the authentication
-* admin panel. It also defines any required configuration table fields.
-*/
-function acp_ldap(&$new)
-{
-	global $user;
-
-	$tpl = '
-
-	<dl>
-		<dt><label for="ldap_server">' . $user->lang['LDAP_SERVER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="' . $new['ldap_server'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_port">' . $user->lang['LDAP_PORT'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="' . $new['ldap_port'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_dn">' . $user->lang['LDAP_DN'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_DN_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_uid">' . $user->lang['LDAP_UID'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_UID_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_user_filter">' . $user->lang['LDAP_USER_FILTER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="' . $new['ldap_user_filter'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_email">' . $user->lang['LDAP_EMAIL'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt>
-		<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_user">' . $user->lang['LDAP_USER'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_USER_EXPLAIN'] . '</span></dt>
-		<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="' . $new['ldap_user'] . '" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_password">' . $user->lang['LDAP_PASSWORD'] . $user->lang['COLON'] . '</label><br /><span>' . $user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt>
-		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" autocomplete="off" /></dd>
-	</dl>
-	';
-
-	// These are fields required in the config table
-	return array(
-		'tpl'		=> $tpl,
-		'config'	=> array('ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password')
-	);
-}
-- 
cgit v1.2.1


From b78b6711c80f2a47f3ab71dde9b733e04d9b523d Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 25 Jun 2013 22:14:39 -0400
Subject: [feature/auth-refactor] Don't truncate name then reattach same thing

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 1ac6697255..bff5a3e64d 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -527,7 +527,7 @@ class acp_board
 
 			foreach($auth_providers as $key => $value)
 			{
-				$auth_plugins[] = str_replace('auth.provider.', '', $key);
+				$auth_plugins[] = $key;
 			}
 
 			$updated_auth_settings = false;
@@ -536,7 +536,7 @@ class acp_board
 			{
 				if ($method)
 				{
-					$provider = $auth_providers['auth.provider.' . $method];
+					$provider = $auth_providers[$method];
 					if ($provider)
 					{
 						if ($fields = $provider->acp($this->new_config))
@@ -575,7 +575,7 @@ class acp_board
 				$method = basename($cfg_array['auth_method']);
 				if ($method)
 				{
-					$provider = $auth_providers['auth.provider.' . $method];
+					$provider = $auth_providers[$method];
 					if ($provider)
 					{
 						if ($error = $provider->init())
@@ -673,7 +673,7 @@ class acp_board
 			{
 				if ($method)
 				{
-					$provider = $auth_providers['auth.provider.' . $method];
+					$provider = $auth_providers[$method];
 					if ($provider)
 					{
 						$fields = $provider->acp($this->new_config);
-- 
cgit v1.2.1


From 3c394aee6208277eb852764ca6b4ef50e2832301 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 25 Jun 2013 22:21:38 -0400
Subject: [feature/auth-refactor] Refactor auth in acp_board

Changes the acp_board code to directly call the auth providers out
of the $auth_providers variable that is populated by the
phpbb_container.

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index bff5a3e64d..d6bf2d637b 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -525,20 +525,10 @@ class acp_board
 			$auth_plugins = array();
 			$auth_providers = $phpbb_container->get('auth.provider_collection');
 
-			foreach($auth_providers as $key => $value)
-			{
-				$auth_plugins[] = $key;
-			}
-
 			$updated_auth_settings = false;
 			$old_auth_config = array();
-			foreach ($auth_plugins as $method)
+			foreach ($auth_providers as $provider)
 			{
-				if ($method)
-				{
-					$provider = $auth_providers[$method];
-					if ($provider)
-					{
 						if ($fields = $provider->acp($this->new_config))
 						{
 							// Check if we need to create config fields for this plugin and save config when submit was pressed
@@ -566,8 +556,6 @@ class acp_board
 							}
 						}
 						unset($fields);
-					}
-				}
 			}
 
 			if ($submit && (($cfg_array['auth_method'] != $this->new_config['auth_method']) || $updated_auth_settings))
@@ -575,7 +563,7 @@ class acp_board
 				$method = basename($cfg_array['auth_method']);
 				if ($method)
 				{
-					$provider = $auth_providers[$method];
+					$provider = $auth_providers['auth.provider.' . $method];
 					if ($provider)
 					{
 						if ($error = $provider->init())
@@ -669,13 +657,8 @@ class acp_board
 		{
 			$template->assign_var('S_AUTH', true);
 
-			foreach ($auth_plugins as $method)
+			foreach ($auth_provider as $provider)
 			{
-				if ($method)
-				{
-					$provider = $auth_providers[$method];
-					if ($provider)
-					{
 						$fields = $provider->acp($this->new_config);
 
 						if ($fields['tpl'])
@@ -685,8 +668,6 @@ class acp_board
 							);
 						}
 						unset($fields);
-					}
-				}
 			}
 		}
 	}
-- 
cgit v1.2.1


From 08614e2b8540766037e13f3eb1e6d4d64eea7b46 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 25 Jun 2013 22:25:40 -0400
Subject: [feature/auth-refactor] Fix indentation on acp_board

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 79 +++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 41 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index d6bf2d637b..5e8efaa60c 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -529,51 +529,48 @@ class acp_board
 			$old_auth_config = array();
 			foreach ($auth_providers as $provider)
 			{
-						if ($fields = $provider->acp($this->new_config))
+				if ($fields = $provider->acp($this->new_config))
+				{
+					// Check if we need to create config fields for this plugin and save config when submit was pressed
+					foreach ($fields['config'] as $field)
+					{
+						if (!isset($config[$field]))
+						{
+							set_config($field, '');
+						}
+
+						if (!isset($cfg_array[$field]) || strpos($field, 'legend') !== false)
 						{
-							// Check if we need to create config fields for this plugin and save config when submit was pressed
-							foreach ($fields['config'] as $field)
-							{
-								if (!isset($config[$field]))
-								{
-									set_config($field, '');
-								}
-
-								if (!isset($cfg_array[$field]) || strpos($field, 'legend') !== false)
-								{
-									continue;
-								}
-
-								$old_auth_config[$field] = $this->new_config[$field];
-								$config_value = $cfg_array[$field];
-								$this->new_config[$field] = $config_value;
-
-								if ($submit)
-								{
-									$updated_auth_settings = true;
-									set_config($field, $config_value);
-								}
-							}
+							continue;
 						}
-						unset($fields);
+
+						$old_auth_config[$field] = $this->new_config[$field];
+						$config_value = $cfg_array[$field];
+						$this->new_config[$field] = $config_value;
+
+						if ($submit)
+						{
+							$updated_auth_settings = true;
+							set_config($field, $config_value);
+						}
+					}
+				}
+				unset($fields);
 			}
 
 			if ($submit && (($cfg_array['auth_method'] != $this->new_config['auth_method']) || $updated_auth_settings))
 			{
 				$method = basename($cfg_array['auth_method']);
-				if ($method)
+				if (array_key_exists('auth.provider.' . $method, $auth_providers))
 				{
 					$provider = $auth_providers['auth.provider.' . $method];
-					if ($provider)
+					if ($error = $provider->init())
 					{
-						if ($error = $provider->init())
+						foreach ($old_auth_config as $config_name => $config_value)
 						{
-							foreach ($old_auth_config as $config_name => $config_value)
-							{
-								set_config($config_name, $config_value);
-							}
-							trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
+							set_config($config_name, $config_value);
 						}
+						trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
 					}
 					set_config('auth_method', basename($cfg_array['auth_method']));
 				}
@@ -659,15 +656,15 @@ class acp_board
 
 			foreach ($auth_provider as $provider)
 			{
-						$fields = $provider->acp($this->new_config);
+				$fields = $provider->acp($this->new_config);
 
-						if ($fields['tpl'])
-						{
-							$template->assign_block_vars('auth_tpl', array(
-								'TPL'	=> $fields['tpl'])
-							);
-						}
-						unset($fields);
+				if ($fields['tpl'])
+				{
+					$template->assign_block_vars('auth_tpl', array(
+						'TPL'	=> $fields['tpl'])
+					);
+				}
+				unset($fields);
 			}
 		}
 	}
-- 
cgit v1.2.1


From 59929669f508f06b2440bf36af463851acbeb711 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 25 Jun 2013 22:26:45 -0400
Subject: [feature/auth-refactor] Fix errors in acp_board

Fixes errors introduced by the last several commits.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 5e8efaa60c..4a758207fd 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -654,7 +654,7 @@ class acp_board
 		{
 			$template->assign_var('S_AUTH', true);
 
-			foreach ($auth_provider as $provider)
+			foreach ($auth_providers as $provider)
 			{
 				$fields = $provider->acp($this->new_config);
 
@@ -674,7 +674,7 @@ class acp_board
 	*/
 	function select_auth_method($selected_method, $key = '')
 	{
-		global $phpbb_root_path, $phpEx;
+		global $phpbb_root_path, $phpEx, $phpbb_container;
 
 		$auth_plugins = array();
 		$auth_providers = $phpbb_container->get('auth.provider_collection');
-- 
cgit v1.2.1


From 4afdd650cdea0a09da14e8dff23cee1b30e5980d Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Wed, 26 Jun 2013 00:02:03 -0400
Subject: [feature/auth-refactor] Removed no longer used variable

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 4a758207fd..4d07f96c6f 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -522,7 +522,6 @@ class acp_board
 		if ($mode == 'auth')
 		{
 			// Retrieve a list of auth plugins and check their config values
-			$auth_plugins = array();
 			$auth_providers = $phpbb_container->get('auth.provider_collection');
 
 			$updated_auth_settings = false;
-- 
cgit v1.2.1


From 15e4b334955cd841fe94cb0d4b6753cc8c9f6967 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Jun 2013 09:09:11 -0500
Subject: [feature/twig] Fix alter_block_array to correctly set S_ROW_COUNT

PHPBB3-11598
---
 phpBB/includes/template/context.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
index 3abab4f31b..98b870adec 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/template/context.php
@@ -322,10 +322,13 @@ class phpbb_template_context
 			for ($i = sizeof($block); $i > $key; $i--)
 			{
 				$block[$i] = $block[$i-1];
+
+				$block[$i]['S_ROW_COUNT'] = $i;
 			}
 
 			// Insert vararray at given position
 			$block[$key] = $vararray;
+			$block[$key]['S_ROW_COUNT'] = $key;
 
 			return true;
 		}
-- 
cgit v1.2.1


From 6d709525c318bcc6fa4a25aeb6a2a9d1256a9917 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Jun 2013 12:27:32 -0500
Subject: [feature/twig] Set S_ROW_NUM in context also (previously was a hack
 in filter)

PHPBB3-11598
---
 phpBB/includes/template/context.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
index 98b870adec..9826f5e5f5 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/template/context.php
@@ -158,7 +158,7 @@ class phpbb_template_context
 			}
 
 			$s_row_count = isset($str[$blocks[$blockcount]]) ? sizeof($str[$blocks[$blockcount]]) : 0;
-			$vararray['S_ROW_COUNT'] = $s_row_count;
+			$vararray['S_ROW_COUNT'] = $vararray['S_ROW_NUM'] = $s_row_count;
 
 			// Assign S_FIRST_ROW
 			if (!$s_row_count)
@@ -183,7 +183,7 @@ class phpbb_template_context
 		{
 			// Top-level block.
 			$s_row_count = (isset($this->tpldata[$blockname])) ? sizeof($this->tpldata[$blockname]) : 0;
-			$vararray['S_ROW_COUNT'] = $s_row_count;
+			$vararray['S_ROW_COUNT'] = $vararray['S_ROW_NUM'] = $s_row_count;
 
 			// Assign S_FIRST_ROW
 			if (!$s_row_count)
@@ -323,12 +323,12 @@ class phpbb_template_context
 			{
 				$block[$i] = $block[$i-1];
 
-				$block[$i]['S_ROW_COUNT'] = $i;
+				$block[$i]['S_ROW_COUNT'] = $block[$i]['S_ROW_NUM'] = $i;
 			}
 
 			// Insert vararray at given position
 			$block[$key] = $vararray;
-			$block[$key]['S_ROW_COUNT'] = $key;
+			$block[$key]['S_ROW_COUNT'] = $block[$key]['S_ROW_NUM'] = $key;
 
 			return true;
 		}
-- 
cgit v1.2.1


From 09ed0dd7bccd1f2674525a7a2b7ec99b6c745832 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 26 Jun 2013 12:30:59 -0500
Subject: [feature/twig] Replace BEGIN with Twig for using Lexer

No longer using the begin tokenparser/node as it did not allow proper
handling of <!-- BEGIN !foo, <!-- BEGIN foo(0,2). Now the lexer will
use regular expressions to handle that correctly and replace it with Twig's
for token

Also fixing <!-- IF .foo as I discovered it evaluates to if sizeof(foo)

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php         |   1 -
 phpBB/includes/template/twig/lexer.php             |  84 ++++++++++++-
 phpBB/includes/template/twig/node/begin.php        | 139 ---------------------
 phpBB/includes/template/twig/tokenparser/begin.php |  57 ---------
 phpBB/includes/template/twig/twig.php              |  15 +--
 5 files changed, 83 insertions(+), 213 deletions(-)
 delete mode 100644 phpBB/includes/template/twig/node/begin.php
 delete mode 100644 phpBB/includes/template/twig/tokenparser/begin.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index 9d465a4db8..44d694ce1a 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -26,7 +26,6 @@ class phpbb_template_twig_extension extends Twig_Extension
 	{
 		return array(
 			new phpbb_template_twig_tokenparser_if,
-			new phpbb_template_twig_tokenparser_begin,
 			new phpbb_template_twig_tokenparser_define,
 			new phpbb_template_twig_tokenparser_include,
 			new phpbb_template_twig_tokenparser_includejs,
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index b2828c9e25..95b9bd4630 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -20,9 +20,9 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 	public function tokenize($code, $filename = null)
 	{
 		$valid_starting_tokens = array(
-			'BEGIN',
+			/*'BEGIN',
 			'BEGINELSE',
-			'END',
+			'END',*/
 			'IF',
 			'ELSE',
 			'ELSEIF',
@@ -39,13 +39,17 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			'EVENT',
 		);
 
+		// Fix our BEGIN statements
+		$code = $this->fix_begin_tokens($code);
+
 		// Replace <!-- INCLUDE blah.html --> with {% include 'blah.html' %}
 		$code = preg_replace('#<!-- INCLUDE(PHP)? (.*?) -->#', "{% INCLUDE$1 '$2' %}", $code);
 
 		// This strips the $ inside of a tag directly after the token, which was used in <!-- DEFINE $NAME
 		$code = preg_replace('#<!-- DEFINE \$(.*)-->#', '<!-- DEFINE $1-->', $code);
 
-		// This strips the . or $ inside of a tag directly before a variable name, which was used in <!-- IF .blah
+		// This strips the . or $ inside of a tag directly before a variable name, which was used in <!-- IF .blah and <!-- IF $BLAH
+		// In case of .varname, it replaces it with varname|length (as this is how it was treated before)
 		$code = preg_replace_callback('#<!-- IF((.*)[\s][\$|\.]([^\s]+)(.*))-->#', array($this, 'tag_if_cleanup'), $code);
 
 		// Replace all of our starting tokens, <!-- TOKEN --> with Twig style, {% TOKEN %}
@@ -58,6 +62,74 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		return parent::tokenize($code, $filename);
 	}
 
+	/**
+	* Fix begin tokens (convert our BEGIN to Twig for)
+	*
+	* Not meant to be used outside of this context, public because the anonymous function calls this
+	*
+	* @param string $code
+	* @param array $parent_nodes
+	* @return string
+	*/
+	public function fix_begin_tokens($code, $parent_nodes = array())
+	{
+		// PHP 5.3 cannot use $this in an anonymous function, so use this as a work-around
+		$parent_class = $this;
+		$callback = function ($matches) use ($parent_class, $parent_nodes)
+		{
+			$name = $matches[1];
+			$slice = $matches[2];
+			$body = $matches[3];
+
+			// Is the designer wanting to call another loop in a loop?
+			// <!-- BEGIN loop -->
+			// <!-- BEGIN !loop2 -->
+			// <!-- END !loop2 -->
+			// <!-- END loop -->
+			// 'loop2' is actually on the same nesting level as 'loop' you assign
+			// variables to it with template->assign_block_vars('loop2', array(...))
+			if (strpos($name, '!') === 0)
+			{
+				// Count the number if ! occurrences
+				$count = substr_count($name, '!');
+				for ($i = 0; $i < $count; $i++)
+				{
+					array_pop($parent_nodes);
+					$name = substr($name, 1);
+				}
+			}
+
+			// Remove all parent nodes, e.g. foo, bar from foo.bar.foobar
+			foreach ($parent_nodes as $node)
+			{
+				$body = preg_replace('#([^a-zA-Z0-9])' . $node . '\.#', '$1', $body);
+			}
+
+			// Add current node to list of parent nodes for child nodes
+			$parent_nodes[] = $name;
+
+			// Recursive...fix any child nodes
+			$body = $parent_class->fix_begin_tokens($body, $parent_nodes);
+
+			// Rename loopname vars (to prevent collisions, loop children are named (loop name)_loop_element)
+			$body = str_replace($name . '.', $name . '_loop_element.', $body);
+
+			// Need the parent variable name
+			array_pop($parent_nodes);
+			$parent = (!empty($parent_nodes)) ? end($parent_nodes) . '_loop_element.' : '';
+
+			$slice = ($slice) ? '|slice(' . $slice . ')' : '';
+
+			// Turn into a Twig for loop, using (loop name)_loop_element for each child
+			return "{% for {$name}_loop_element in {$parent}{$name}{$slice} %}{$body}{% endfor %}";
+		};
+
+		// Replace <!-- BEGINELSE --> correctly, only needs to be done once
+		$code = str_replace('<!-- BEGINELSE -->', '{% else %}', $code);
+
+		return preg_replace_callback('#<!-- BEGIN ([!a-zA-Z0-9_]+)\(?([0-9,]+)?\)? -->(.+?)<!-- END \1 -->#s', $callback, $code);
+	}
+
 	/**
 	* preg_replace_callback to clean up IF statements
 	*
@@ -68,6 +140,10 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 	*/
 	protected function tag_if_cleanup($matches)
 	{
-		return '<!-- IF ' . preg_replace('#\s[\.|\$]([a-zA-Z_0-9]+)#', ' $1', $matches[1]) . ' -->';
+		// Replace $TEST with TEST
+		$matches[1] = preg_replace('#\s\$([a-zA-Z_0-9]+)#', ' $1', $matches[1]);
+		$matches[1] = preg_replace('#\s\.([a-zA-Z_0-9]+)#', ' $1|length', $matches[1]);
+
+		return '<!-- IF ' . $matches[1] . ' -->';
 	}
 }
diff --git a/phpBB/includes/template/twig/node/begin.php b/phpBB/includes/template/twig/node/begin.php
deleted file mode 100644
index 3c1ce1b89b..0000000000
--- a/phpBB/includes/template/twig/node/begin.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-class phpbb_template_twig_node_begin extends Twig_Node
-{
-    public function __construct($beginName, Twig_NodeInterface $body, Twig_NodeInterface $else = null, $lineno, $tag = null)
-    {
-        parent::__construct(array('body' => $body, 'else' => $else), array('beginName' => $beginName), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-		$compiler
-			->write("if (!isset(\$phpbb_blocks)) {\n")
-			->indent()
-				->write("\$phpbb_blocks = array();\n")
-				->write("\$parent = \$context['_phpbb_blocks'];\n")
-			->outdent()
-			->write("}\n")
-			->write("\$phpbb_blocks[] = '" . $this->getAttribute('beginName') . "';\n")
-		;
-
-        $compiler
-        	->write("if (!empty(\$parent['" . $this->getAttribute('beginName') . "'])) {\n")
-        	->indent()
-				->write("foreach (\$parent['" . $this->getAttribute('beginName') . "'] as \$" . $this->getAttribute('beginName') . ") {\n")
-				->indent()
-					// Set up $context correctly so that Twig can get the correct data with $this->getAttribute
-					->write("\$this->getEnvironment()->context_recursive_loop_builder(\$" . $this->getAttribute('beginName') . ", \$phpbb_blocks, \$context);\n")
-
-					// We store the parent so that we can do this recursively
-					->write("\$parent = \$" . $this->getAttribute('beginName') . ";\n")
-        ;
-
-        $compiler->subcompile($this->getNode('body'));
-
-		$compiler
-				->outdent()
-				->write("}\n")
-		;
-
-		if (null !== $this->getNode('else')) {
-			$compiler
-				->write("} else {\n")
-				->indent()
-					->subcompile($this->getNode('else'))
-				->outdent()
-			;
-		}
-
-		$compiler
-			->outdent()
-			->write("}\n")
-
-            // Remove the last item from the blocks storage as we've completed iterating over them all
-            ->write("array_pop(\$phpbb_blocks);\n")
-
-            // If we've gone through all of the blocks, we're back at the main level and have completed, so unset the var
-            ->write("if (empty(\$phpbb_blocks)) { unset(\$phpbb_blocks); }\n")
-        ;
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * Uses anonymous functions to compile the loops, which seems nicer to me, but requires PHP 5.4 (since subcompile uses $this, which is not available in 5.3)
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     *
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-
-		$compiler
-			// name -> loop name
-			// local context -> parent template variable context
-			// global context -> global template variable context
-			// variable chain -> full chain of variables to output template vars properly in subloops
-			//		e.g. [foo][bar][foobar]
-			// current chain location -> current location in subloop
-			//		e.g. [foobar] of [foo][bar]
-			->write("\$iterator = function (\$name, \$local_context, \$global_context, &\$variable_chain, &\$current_chain_location) {\n")
-			->indent()
-				//->write("var_dump(\$name, \$local_context);\n")
-				// Try to find the loop in the
-				// local context (child of local context passed, in case of a child loop)
-				// global context (root template var)
-				->write("if (isset(\$local_context[\$name])) {\n")
-				->indent()
-					->write("\$local_context = \$local_context[\$name];\n")
-				->outdent()
-				->write("}\n")
-				->write("else if (isset(\$global_context[\$name])) {\n")
-				->indent()
-					->write("\$local_context = \$global_context[\$name];\n")
-				->outdent()
-				->write("} else { return; }\n")
-
-				->write("if (!is_array(\$local_context) || empty(\$local_context)) { return; }\n")
-
-				->write("foreach (\$local_context as \$for_context) {\n")
-				->indent()
-					// Some hackish stuff for Twig to properly subcompile
-					->write("\$current_chain_location[\$name] = \$for_context;\n")
-					->write("\$context = array_merge(\$global_context, \$variable_chain);\n")
-
-					// Children
-					->subcompile($this->getNode('body'))
-				->outdent()
-				->write("}\n")
-			->outdent()
-			->write("};\n")
-			->write("if (isset(\$global_context)) {\n")
-			->indent()
-				// We are already inside an anonymous function
-				->write("\$iterator('" . $this->getAttribute('beginName') . "', \$for_context, \$global_context, \$variable_chain, \$current_chain_location[\$name]);\n")
-			->outdent()
-			->write("} else {\n")
-			->indent()
-				// We are not inside the anonymous function (first level)
-				->write("\$variable_chain = array();\n")
-				->write("\$current_chain_location = array();\n")
-				->write("\$iterator('" . $this->getAttribute('beginName') . "', array(), \$context, \$variable_chain, \$variable_chain);\n")
-			->outdent()
-			->write("}\n");
-    }
-    */
-}
diff --git a/phpBB/includes/template/twig/tokenparser/begin.php b/phpBB/includes/template/twig/tokenparser/begin.php
deleted file mode 100644
index 0a2f2da40d..0000000000
--- a/phpBB/includes/template/twig/tokenparser/begin.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-class phpbb_template_twig_tokenparser_begin extends Twig_TokenParser_For
-{
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-	public function parse(Twig_Token $token)
-	{
-		$lineno = $token->getLine();
-		$beginName = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE)->getValue();
-
-		$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-		$body = $this->parser->subparse(array($this, 'decideBeginFork'));
-		if ($this->parser->getStream()->next()->getValue() == 'BEGINELSE') {
-			$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-			$else = $this->parser->subparse(array($this, 'decideBeginEnd'), true);
-		} else {
-			$else = null;
-		}
-		$this->parser->getStream()->expect(Twig_Token::NAME_TYPE, $beginName);
-		$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-		return new phpbb_template_twig_node_begin($beginName, $body, $else, $lineno, $this->getTag());
-	}
-
-    public function decideBeginFork(Twig_Token $token)
-    {
-        return $token->test(array('BEGINELSE', 'END'));
-    }
-
-    public function decideBeginEnd(Twig_Token $token)
-    {
-        return $token->test('END');
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @return string The tag name
-     */
-    public function getTag()
-    {
-        return 'BEGIN';
-    }
-}
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index e80f42fede..cb2899a2fd 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -432,7 +432,7 @@ class phpbb_template_twig implements phpbb_template
 	*
 	* @return array
 	*/
-	protected function get_template_vars()
+	public function get_template_vars()
 	{
 		$vars = array();
 
@@ -454,20 +454,11 @@ class phpbb_template_twig implements phpbb_template
 		$vars = array_merge(
 			$vars,
 			$this->context->get_rootref(),
-			array(
-				'_phpbb_blocks'	=>  $this->context->get_tpldata(),
-			)
+			$this->context->get_tpldata()
 		);
 
-		// Must do this so that <!-- IF .blah --> works correctly
-		// (only for the base loops, the rest are properly handled by the begin node)
-		foreach ($this->context->get_tpldata() as $block_name => $block_values)
-		{
-			$vars[$block_name] = !empty($block_values);
-		}
-
 		// cleanup
-		unset($vars['_phpbb_blocks']['.']);
+		unset($vars['.']);
 
 		return $vars;
 	}
-- 
cgit v1.2.1


From 5af7d2b07f788f6795865225612175b65c596a4b Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Wed, 26 Jun 2013 21:45:16 -0400
Subject: [feature/auth-refactor] Change phpEx to php_ext in new classes

PHPBB3-9734
---
 phpBB/includes/auth/provider_apache.php |  8 ++++----
 phpBB/includes/auth/provider_db.php     | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
index adb1fb6cea..0a6811bbcb 100644
--- a/phpBB/includes/auth/provider_apache.php
+++ b/phpBB/includes/auth/provider_apache.php
@@ -30,16 +30,16 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	 * @param 	phpbb_request 		$request
 	 * @param 	phpbb_user 			$user
 	 * @param 	string 				$phpbb_root_path
-	 * @param 	string 				$phpEx
+	 * @param 	string 				$php_ext
 	 */
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $phpEx)
+	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;
 		$this->config = $config;
 		$this->request = $request;
 		$this->user = $user;
 		$this->phpbb_root_path = $phpbb_root_path;
-		$this->phpEx = $phpEx;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -183,7 +183,7 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 
 			if (!function_exists('user_add'))
 			{
-				include($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
+				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 			}
 
 			// create the user if he does not exist yet
diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
index aaf9cda735..c8b0c44654 100644
--- a/phpBB/includes/auth/provider_db.php
+++ b/phpBB/includes/auth/provider_db.php
@@ -33,16 +33,16 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	 * @param 	phpbb_request 		$request
 	 * @param 	phpbb_user 			$user
 	 * @param 	string 				$phpbb_root_path
-	 * @param 	string 				$phpEx
+	 * @param 	string 				$php_ext
 	 */
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $phpEx)
+	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;
 		$this->config = $config;
 		$this->request = $request;
 		$this->user = $user;
 		$this->phpbb_root_path = $phpbb_root_path;
-		$this->phpEx = $phpEx;
+		$this->php_ext = $php_ext;
 	}
 
 	public function init()
@@ -160,7 +160,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 			// Visual Confirmation handling
 			if (!class_exists('phpbb_captcha_factory', false))
 			{
-				include ($this->phpbb_root_path . 'includes/captcha/captcha_factory.' . $this->phpEx);
+				include ($this->phpbb_root_path . 'includes/captcha/captcha_factory.' . $this->php_ext);
 			}
 
 			$captcha = phpbb_captcha_factory::get_instance($this->config['captcha_plugin']);
@@ -206,7 +206,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 			{
 				if (!function_exists('utf8_to_cp1252'))
 				{
-					include($this->phpbb_root_path . 'includes/utf/data/recode_basic.' . $this->phpEx);
+					include($this->phpbb_root_path . 'includes/utf/data/recode_basic.' . $this->php_ext);
 				}
 
 				// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding
-- 
cgit v1.2.1


From 69001902b98f66c8bf4c21df5920d2b070aa9a71 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Thu, 27 Jun 2013 20:47:03 +0530
Subject: [ticket/9341] remove PREV_PAGE tpl var used for backward
 compatability

PHPBB3-9341
---
 phpBB/includes/functions.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 03a5b36a43..6a1b3fd4f8 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2346,7 +2346,6 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam
 		'A_' . $tpl_prefix . 'BASE_URL'		=> addslashes($base_url),
 		$tpl_prefix . 'PER_PAGE'		=> $per_page,
 		'U_' . $tpl_prefix . 'PREVIOUS_PAGE'	=> $previous_page,
-		$tpl_prefix . 'PREV_PAGE'		=> $previous_page,
 		'U_' . $tpl_prefix . 'NEXT_PAGE'		=> ($on_page != $total_pages) ? $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page) : '',
 		$tpl_prefix . 'TOTAL_PAGES'		=> $total_pages,
 		$tpl_prefix . 'CURRENT_PAGE'	=> $on_page,
-- 
cgit v1.2.1


From 24e323d59353810293dea41d6b9b4114dd627543 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 27 Jun 2013 14:17:29 -0400
Subject: [feature/auth-refactor] Finish and clean up documentation

PHPBB3-9734
---
 phpBB/includes/auth/provider_apache.php    | 26 ++---------------
 phpBB/includes/auth/provider_db.php        | 24 ++++------------
 phpBB/includes/auth/provider_interface.php | 46 +++++++++++++++++++-----------
 phpBB/includes/auth/provider_ldap.php      | 21 ++++----------
 4 files changed, 43 insertions(+), 74 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
index 0a6811bbcb..054316db19 100644
--- a/phpBB/includes/auth/provider_apache.php
+++ b/phpBB/includes/auth/provider_apache.php
@@ -42,13 +42,6 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 		$this->php_ext = $php_ext;
 	}
 
-	/**
-	 * Checks whether the user is identified to apache
-	 * Only allow changing authentication to apache if the user is identified
-	 * Called in acp_board while setting authentication plugins
-	 *
-	 * @return boolean|string false if the user is identified and else an error message
-	 */
 	public function init()
 	{
 		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER) || $this->user->data['username'] !== htmlspecialchars_decode($this->request->server('PHP_AUTH_USER')))
@@ -58,9 +51,6 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 		return false;
 	}
 
-	/**
-	 * Login function
-	 */
 	public function login($username, $password)
 	{
 		// do not allow empty password
@@ -148,12 +138,6 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 		);
 	}
 
-	/**
-	 * Autologin function
-	 *
-	 * @return 	array 	containing the user row or empty if no auto login should
-	 * 					take place
-	 */
 	public function autologin()
 	{
 		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
@@ -209,8 +193,8 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 	 * This function generates an array which can be passed to the user_add
 	 * function in order to create a user
 	 *
-	 * @param 	str 	$username 	The username of the new user.
-	 * @param 	str 	$password 	The password of the new user.
+	 * @param 	string	$username 	The username of the new user.
+	 * @param 	string	$password 	The password of the new user.
 	 * @return 	array 				Contains data that can be passed directly to
 	 *								the user_add function.
 	 */
@@ -242,12 +226,6 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 		);
 	}
 
-	/**
-	 * The session validation function checks whether the user is still logged in
-	 *
-	 * @return 	boolean 	true if the given user is authenticated or false if
-	 * 						the session should be closed
-	 */
 	public function validate_session($user)
 	{
 		// Check if PHP_AUTH_USER is set and handle this case
diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
index c8b0c44654..e8fff26650 100644
--- a/phpBB/includes/auth/provider_db.php
+++ b/phpBB/includes/auth/provider_db.php
@@ -28,12 +28,12 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 	/**
 	 * Database Authentication Constructor
 	 *
-	 * @param 	phpbb_db_driver 	$db
-	 * @param 	phpbb_config 		$config
-	 * @param 	phpbb_request 		$request
-	 * @param 	phpbb_user 			$user
-	 * @param 	string 				$phpbb_root_path
-	 * @param 	string 				$php_ext
+	 * @param	phpbb_db_driver	$db
+	 * @param	phpbb_config 	$config
+	 * @param	phpbb_request	$request
+	 * @param	phpbb_user		$user
+	 * @param	string			$phpbb_root_path
+	 * @param	string			$php_ext
 	 */
 	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext)
 	{
@@ -50,18 +50,6 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 		return;
 	}
 
-	/**
-	 * Login function
-	 *
-	 * @param string $username
-	 * @param string $password
-	 * @return array				A associative array of the format
-	 *							array(
-	 *								'status' => status constant
-	 *								'error_msg' => string
-	 *								'user_row' => array
-	 *							)
-	 */
 	public function login($username, $password)
 	{
 		// Auth plugins get the password untrimmed.
diff --git a/phpBB/includes/auth/provider_interface.php b/phpBB/includes/auth/provider_interface.php
index 534f198c21..2d1935f8f0 100644
--- a/phpBB/includes/auth/provider_interface.php
+++ b/phpBB/includes/auth/provider_interface.php
@@ -26,31 +26,33 @@ interface phpbb_auth_provider_interface
 	 * Checks whether the user is currently identified to the authentication
 	 * provider.
 	 * Called in acp_board while setting authentication plugins.
+	 * Changing to an authentication provider will not be permitted in acp_board
+	 * if there is an error.
 	 *
 	 * @return 	boolean|string 	False if the user is identified, otherwise an
-	 *							error message.
+	 *							error message, or null if not implemented.
 	 */
 	public function init();
 
 	/**
 	 * Performs login.
 	 *
-	 * @param 	$username 	string 	The name of the user being authenticated.
-	 * @param 	$password 	string 	The password of the user.
-	 * @return 	array 		An associative array of the format:
-	 *							array(
-	 *								'status' => status constant
-	 *								'error_msg' => string
-	 *								'user_row' => array
-	 *							)
+	 * @param	string	$username 	The name of the user being authenticated.
+	 * @param	string	$password	The password of the user.
+	 * @return	array	An associative array of the format:
+	 *						array(
+	 *							'status' => status constant
+	 *							'error_msg' => string
+	 *							'user_row' => array
+	 *						)
 	 */
 	public function login($username, $password);
 
 	/**
 	 * Autologin function
 	 *
-	 * @return 	array 	containing the user row or empty if no auto login should
-	 * 					take place
+	 * @return 	array|null	containing the user row, empty if no auto login
+	 * 						should take place, or null if not impletmented.
 	 */
 	public function autologin();
 
@@ -58,22 +60,32 @@ interface phpbb_auth_provider_interface
 	 * This function is used to output any required fields in the authentication
 	 * admin panel. It also defines any required configuration table fields.
 	 *
-	 * @param 	type 	$new
+	 * @param 	array 	$new 	Contains the new configuration values that have
+	 * 							been set in acp_board.
+	 * @return	array|null	Returns null if not implemented or an array of the
+	 *						form:
+	 *							array(
+	 *								'tpl'		=> string
+	 *								'config' 	=> array
+	 *							)
 	 */
 	public function acp($new);
 
 	/**
-	 * Special logout function.
+	 * Performs additional actions during logout.
 	 *
-	 * @param 	type 	$data
-	 * @param 	type 	$new_session
+	 * @param 	array	$data			An array corresponding to
+	 *									phpbb_session::data
+	 * @param 	boolean	$new_session	True for a new session, false for no new
+	 *									session.
 	 */
 	public function logout($data, $new_session);
 
 	/**
-	 * The session validation function checks whether the user is still logged in.
+	 * The session validation function checks whether the user is still logged
+	 * into phpBB.
 	 *
-	 * @param 	type 	$user
+	 * @param 	array 	$user
 	 * @return 	boolean	true if the given user is authenticated, false if the 
 	 * 					session should be closed, or null if not implemented.
 	 */
diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
index 67d8d8335f..2140e7dd63 100644
--- a/phpBB/includes/auth/provider_ldap.php
+++ b/phpBB/includes/auth/provider_ldap.php
@@ -27,9 +27,9 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 	/**
 	 * LDAP Authentication Constructor
 	 *
-	 * @param 	phpbb_db_driver 	$db
-	 * @param 	phpbb_config 		$config
-	 * @param 	phpbb_user 			$user
+	 * @param 	phpbb_db_driver	$db
+	 * @param 	phpbb_config	$config
+	 * @param 	phpbb_user		$user
 	 */
 	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_user $user)
 	{
@@ -38,11 +38,6 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 		$this->user = $user;
 	}
 
-	/**
-	 * Connect to ldap server
-	 * Only allow changing authentication to ldap if we can connect to the ldap server
-	 * Called in acp_board while setting authentication plugins
-	 */
 	public function init()
 	{
 		if (!@extension_loaded('ldap'))
@@ -111,9 +106,6 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 		return false;
 	}
 
-	/**
-	 * Login function
-	 */
 	public function login($username, $password)
 	{
 		// do not allow empty password
@@ -290,10 +282,6 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 		return;
 	}
 
-	/**
-	 * This function is used to output any required fields in the authentication
-	 * admin panel. It also defines any required configuration table fields.
-	 */
 	public function acp($new)
 	{
 		$tpl = '
@@ -359,6 +347,9 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 
 	/**
 	 * Escapes an LDAP AttributeValue
+	 *
+	 * @param	string	$string	The string to be escaped
+	 * @return	string	The escaped string
 	 */
 	private function ldap_escape($string)
 	{
-- 
cgit v1.2.1


From 27f0b9ff4359a60f98533aff2a87c1848d622d4c Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Fri, 28 Jun 2013 13:43:41 -0400
Subject: [feature/auth-refactor] Forgot @inheritdoc on methods

PHPBB3-9734
---
 phpBB/includes/auth/provider_apache.php | 18 ++++++++++++++++++
 phpBB/includes/auth/provider_db.php     | 18 ++++++++++++++++++
 phpBB/includes/auth/provider_ldap.php   | 18 ++++++++++++++++++
 3 files changed, 54 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
index 054316db19..5f6f2862b6 100644
--- a/phpBB/includes/auth/provider_apache.php
+++ b/phpBB/includes/auth/provider_apache.php
@@ -42,6 +42,9 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 		$this->php_ext = $php_ext;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function init()
 	{
 		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER) || $this->user->data['username'] !== htmlspecialchars_decode($this->request->server('PHP_AUTH_USER')))
@@ -51,6 +54,9 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 		return false;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function login($username, $password)
 	{
 		// do not allow empty password
@@ -138,6 +144,9 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 		);
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function autologin()
 	{
 		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
@@ -226,6 +235,9 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 		);
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function validate_session($user)
 	{
 		// Check if PHP_AUTH_USER is set and handle this case
@@ -245,11 +257,17 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 		return false;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function acp($new)
 	{
 		return;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function logout($data, $new_session)
 	{
 		return;
diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
index e8fff26650..a79d031048 100644
--- a/phpBB/includes/auth/provider_db.php
+++ b/phpBB/includes/auth/provider_db.php
@@ -45,11 +45,17 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 		$this->php_ext = $php_ext;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function init()
 	{
 		return;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function login($username, $password)
 	{
 		// Auth plugins get the password untrimmed.
@@ -297,21 +303,33 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 		);
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function autologin()
 	{
 		return;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function acp($new)
 	{
 		return;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function logout($data, $new_session)
 	{
 		return;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function validate_session($user)
 	{
 		return;
diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
index 2140e7dd63..f67c1e9247 100644
--- a/phpBB/includes/auth/provider_ldap.php
+++ b/phpBB/includes/auth/provider_ldap.php
@@ -38,6 +38,9 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 		$this->user = $user;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function init()
 	{
 		if (!@extension_loaded('ldap'))
@@ -106,6 +109,9 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 		return false;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function login($username, $password)
 	{
 		// do not allow empty password
@@ -277,11 +283,17 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 		);
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function autologin()
 	{
 		return;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function acp($new)
 	{
 		$tpl = '
@@ -356,11 +368,17 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 		return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function logout($data, $new_session)
 	{
 		return;
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
 	public function validate_session($user)
 	{
 		return;
-- 
cgit v1.2.1


From abb7901edb61e551b5783254579fef737f6f5c37 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 28 Jun 2013 15:40:30 -0500
Subject: [feature/twig] New Twig filter, subset

This filter grabs a subset of a loop for output (according to past
functionality).

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php | 40 +++++++++++++++++++++++++++++-
 phpBB/includes/template/twig/lexer.php     | 11 +++++---
 2 files changed, 46 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index 44d694ce1a..a952d70076 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -35,12 +35,19 @@ class phpbb_template_twig_extension extends Twig_Extension
 		);
 	}
 
+    public function getFilters()
+    {
+        return array(
+            new Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)),
+		);
+    }
+
 	public function getOperators()
 	{
 		return array(
 			array(),
 			array(
-				// @todo check if all these are needed (or others)
+				// @todo check if all these are needed (or others) and set precedence correctly
 				'eq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 
 				'ne' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
@@ -60,4 +67,35 @@ class phpbb_template_twig_extension extends Twig_Extension
 			),
 		);
 	}
+
+	/**
+	 * Grabs a subset of a loop
+	 *
+	 * @param Twig_Environment $env          A Twig_Environment instance
+	 * @param mixed            $item         A variable
+	 * @param integer          $start        Start of the subset
+	 * @param integer          $end   	     End of the subset
+	 * @param Boolean          $preserveKeys Whether to preserve key or not (when the input is an array)
+	 *
+	 * @return mixed The sliced variable
+	 */
+	function loop_subset(Twig_Environment $env, $item, $start, $end = null, $preserveKeys = false)
+	{
+		// We do almost the same thing as array_slice, except when $end is positive
+		if ($end >= 1)
+		{
+			// When end is > 1, subset will end on the last item in an array with the specified $end
+			// This is different from slice in that it is the number we end on rather than the number
+			//	of items to grab (length)
+
+			// Start must always be the actual starting number for this calculation (not negative)
+			$start = ($start < 0) ? sizeof($item) + $start : $start;
+			$end = $end - $start;
+		}
+
+		// We always include the last element (this was the past design)
+		$end = ($end == -1 || $end === null) ? null : $end + 1;
+
+		return twig_slice($env, $item, $start, $end, $preserveKeys);
+	}
 }
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 95b9bd4630..9d348535a5 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -78,7 +78,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		$callback = function ($matches) use ($parent_class, $parent_nodes)
 		{
 			$name = $matches[1];
-			$slice = $matches[2];
+			$subset = trim(substr($matches[2], 1, -1)); // Remove parenthesis
 			$body = $matches[3];
 
 			// Is the designer wanting to call another loop in a loop?
@@ -118,16 +118,19 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			array_pop($parent_nodes);
 			$parent = (!empty($parent_nodes)) ? end($parent_nodes) . '_loop_element.' : '';
 
-			$slice = ($slice) ? '|slice(' . $slice . ')' : '';
+			if ($subset !== '')
+			{
+				$subset = '|subset(' . $subset . ')';
+			}
 
 			// Turn into a Twig for loop, using (loop name)_loop_element for each child
-			return "{% for {$name}_loop_element in {$parent}{$name}{$slice} %}{$body}{% endfor %}";
+			return "{% for {$name}_loop_element in {$parent}{$name}{$subset} %}{$body}{% endfor %}";
 		};
 
 		// Replace <!-- BEGINELSE --> correctly, only needs to be done once
 		$code = str_replace('<!-- BEGINELSE -->', '{% else %}', $code);
 
-		return preg_replace_callback('#<!-- BEGIN ([!a-zA-Z0-9_]+)\(?([0-9,]+)?\)? -->(.+?)<!-- END \1 -->#s', $callback, $code);
+		return preg_replace_callback('#<!-- BEGIN ([!a-zA-Z0-9_]+)(\([0-9,\-]+\))? -->(.+?)<!-- END \1 -->#s', $callback, $code);
 	}
 
 	/**
-- 
cgit v1.2.1


From 5182ec09a5ad30a40eb21e3a08fc8739e173128c Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 29 Jun 2013 15:26:36 +0530
Subject: [ticket/11593] initialize $is_expr as null before being passed to
 get_varref

PHPBB3-11593
---
 phpBB/includes/template/filter.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index f2bd442010..1c0a56c9f5 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -475,6 +475,7 @@ class phpbb_template_filter extends php_user_filter
 	*/
 	private function compile_var_tags(&$text_blocks)
 	{
+		$is_expr = null;
 		$text_blocks = $this->get_varref($text_blocks, $is_expr);
 		$lang_replaced = $this->compile_language_tags($text_blocks);
 
-- 
cgit v1.2.1


From 64963b5962d9a4bf1888dd1642a32ba3f6037258 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 29 Jun 2013 11:07:10 -0500
Subject: [feature/twig] Fixing DEFINE statements

PHPBB3-11598
---
 phpBB/includes/template/twig/definition.php        | 50 +++++++++++++
 phpBB/includes/template/twig/lexer.php             | 82 ++++++++++++++++------
 phpBB/includes/template/twig/node/define.php       | 49 +++++++++++++
 .../includes/template/twig/tokenparser/define.php  | 33 ++++++++-
 phpBB/includes/template/twig/twig.php              | 15 ++--
 5 files changed, 196 insertions(+), 33 deletions(-)
 create mode 100644 phpBB/includes/template/twig/definition.php
 create mode 100644 phpBB/includes/template/twig/node/define.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/definition.php b/phpBB/includes/template/twig/definition.php
new file mode 100644
index 0000000000..110437eb32
--- /dev/null
+++ b/phpBB/includes/template/twig/definition.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* This class holds all DEFINE variables from the current page load
+*/
+class phpbb_template_twig_definition
+{
+	/** @var array **/
+	protected $definitions = array();
+
+	/**
+	* Get a DEFINE'd variable
+	*
+	* @param string $name
+	* @return mixed Null if not found
+	*/
+	public function __call($name, $arguments)
+	{
+		return (isset($this->definitions[$name])) ? $this->definitions[$name] : null;
+	}
+
+	/**
+	* DEFINE a variable
+	*
+	* @param string $name
+	* @param mixed $value
+	* @return phpbb_template_twig_definition
+	*/
+	public function set($name, $value)
+	{
+		$this->definitions[$name] = $value;
+
+		return $this;
+	}
+}
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 9d348535a5..e8ceef3d13 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -20,6 +20,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 	public function tokenize($code, $filename = null)
 	{
 		$valid_starting_tokens = array(
+			// Commented out tokens are handled separately from the main replace
 			/*'BEGIN',
 			'BEGINELSE',
 			'END',*/
@@ -27,9 +28,8 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			'ELSE',
 			'ELSEIF',
 			'ENDIF',
-			'DEFINE',
-			'DEFINE',
-			'UNDEFINE',
+			/*'DEFINE',
+			'UNDEFINE',*/
 			'ENDDEFINE',
 			/*'INCLUDE',
 			'INCLUDEPHP',*/
@@ -42,22 +42,21 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		// Fix our BEGIN statements
 		$code = $this->fix_begin_tokens($code);
 
-		// Replace <!-- INCLUDE blah.html --> with {% include 'blah.html' %}
-		$code = preg_replace('#<!-- INCLUDE(PHP)? (.*?) -->#', "{% INCLUDE$1 '$2' %}", $code);
+		// Fix our IF tokens
+		$code = $this->fix_if_tokens($code);
 
-		// This strips the $ inside of a tag directly after the token, which was used in <!-- DEFINE $NAME
-		$code = preg_replace('#<!-- DEFINE \$(.*)-->#', '<!-- DEFINE $1-->', $code);
+		// Fix our DEFINE tokens
+		$code = $this->fix_define_tokens($code);
 
-		// This strips the . or $ inside of a tag directly before a variable name, which was used in <!-- IF .blah and <!-- IF $BLAH
-		// In case of .varname, it replaces it with varname|length (as this is how it was treated before)
-		$code = preg_replace_callback('#<!-- IF((.*)[\s][\$|\.]([^\s]+)(.*))-->#', array($this, 'tag_if_cleanup'), $code);
+		// Replace <!-- INCLUDE blah.html --> with {% include 'blah.html' %}
+		$code = preg_replace('#<!-- INCLUDE(PHP)? (.*?) -->#', "{% INCLUDE$1 '$2' %}", $code);
 
 		// Replace all of our starting tokens, <!-- TOKEN --> with Twig style, {% TOKEN %}
 		// This also strips outer parenthesis, <!-- IF (blah) --> becomes <!-- IF blah -->
 		$code = preg_replace('#<!-- (' . implode('|', $valid_starting_tokens) . ')(?: (.*?) ?)?-->#', '{% $1 $2 %}', $code);
 
-		// Replace all of our variables, {VARNAME} or {$VARNAME}, with Twig style, {{ VARNAME }}
-		$code = preg_replace('#{\$?([a-zA-Z0-9_\.]+)}#', '{{ $1 }}', $code);
+		// Replace all of our variables, {VARNAME}, with Twig style, {{ VARNAME }}
+		$code = preg_replace('#{([a-zA-Z0-9_\.]+)}#', '{{ $1 }}', $code);
 
 		return parent::tokenize($code, $filename);
 	}
@@ -68,7 +67,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 	* Not meant to be used outside of this context, public because the anonymous function calls this
 	*
 	* @param string $code
-	* @param array $parent_nodes
+	* @param array $parent_nodes (used in recursion)
 	* @return string
 	*/
 	public function fix_begin_tokens($code, $parent_nodes = array())
@@ -134,19 +133,56 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 	}
 
 	/**
-	* preg_replace_callback to clean up IF statements
-	*
-	* This strips the . or $ inside of a tag directly before a variable name.
-	* Was used in <!-- IF .blah or <!-- IF $BLAH
+	* Fix IF statements
 	*
-	* @param mixed $matches
+	* @param string $code
+	* @return string
 	*/
-	protected function tag_if_cleanup($matches)
+	protected function fix_if_tokens($code)
 	{
-		// Replace $TEST with TEST
-		$matches[1] = preg_replace('#\s\$([a-zA-Z_0-9]+)#', ' $1', $matches[1]);
-		$matches[1] = preg_replace('#\s\.([a-zA-Z_0-9]+)#', ' $1|length', $matches[1]);
+		$callback = function($matches)
+		{
+			// Replace $TEST with definition.TEST
+			$matches[1] = preg_replace('#\s\$([a-zA-Z_0-9]+)#', ' definition.$1', $matches[1]);
 
-		return '<!-- IF ' . $matches[1] . ' -->';
+			// Replace .test with test|length
+			$matches[1] = preg_replace('#\s\.([a-zA-Z_0-9]+)#', ' $1|length', $matches[1]);
+
+			return '<!-- IF ' . $matches[1] . ' -->';
+		};
+
+		return preg_replace_callback('#<!-- IF((.*)[\s][\$|\.]([^\s]+)(.*))-->#', $callback, $code);
+	}
+
+	/**
+	* Fix DEFINE statements and {$VARNAME} variables
+	*
+	* @param string $code
+	* @return string
+	*/
+	protected function fix_define_tokens($code)
+	{
+		/**
+		* Changing $VARNAME to definition.varname because set is only local
+		* context (e.g. DEFINE $TEST will only make $TEST available in current
+		* template and any child templates, but not any parent templates).
+		*
+		* DEFINE handles setting it properly to definition in its node, but the
+		* variables reading FROM it need to be altered to definition.VARNAME
+		*
+		* Setting up definition as a class in the array passed to Twig
+		* ($context) makes set definition.TEST available in the global context
+		*/
+
+		// Replace <!-- DEFINE $NAME with {% DEFINE definition.NAME
+		$code = preg_replace('#<!-- DEFINE \$(.*)-->#', '{% DEFINE $1 %}', $code);
+
+		// Changing UNDEFINE NAME to DEFINE NAME = null to save from creating an extra token parser/node
+		$code = preg_replace('#<!-- UNDEFINE \$(.*)-->#', '{% DEFINE $1= null %}', $code);
+
+		// Replace all of our variables, {$VARNAME}, with Twig style, {{ definition.VARNAME }}
+		$code = preg_replace('#{\$([a-zA-Z0-9_\.]+)}#', '{{ definition.$1 }}', $code);
+
+		return $code;
 	}
 }
diff --git a/phpBB/includes/template/twig/node/define.php b/phpBB/includes/template/twig/node/define.php
new file mode 100644
index 0000000000..ef7565d27d
--- /dev/null
+++ b/phpBB/includes/template/twig/node/define.php
@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_define extends Twig_Node
+{
+    public function __construct($capture, Twig_NodeInterface $name, Twig_NodeInterface $value, $lineno, $tag = null)
+    {
+        parent::__construct(array('name' => $name, 'value' => $value), array('capture' => $capture, 'safe' => false), $lineno, $tag);
+    }
+
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     */
+    public function compile(Twig_Compiler $compiler)
+    {
+        $compiler->addDebugInfo($this);
+
+		if ($this->getAttribute('capture')) {
+			$compiler
+				->write("ob_start();\n")
+				->subcompile($this->getNode('value'))
+			;
+
+			$compiler->raw(" = ('' === \$value = ob_get_clean()) ? '' : new Twig_Markup(\$value, \$this->env->getCharset())");
+		}
+		else
+		{
+			$compiler
+				->write("\$value = '")
+				->raw($this->getNode('value')->getAttribute('value'))
+				->raw("';\n")
+			;
+		}
+
+		$compiler
+			->raw("\$context['definition']->set('")
+			->raw($this->getNode('name')->getAttribute('name'))
+			->raw("', \$value);\n")
+		;
+    }
+}
diff --git a/phpBB/includes/template/twig/tokenparser/define.php b/phpBB/includes/template/twig/tokenparser/define.php
index 83f537a1ea..ebf7cb4c4a 100644
--- a/phpBB/includes/template/twig/tokenparser/define.php
+++ b/phpBB/includes/template/twig/tokenparser/define.php
@@ -7,8 +7,39 @@
 *
 */
 
-class phpbb_template_twig_tokenparser_define extends Twig_TokenParser_Set
+class phpbb_template_twig_tokenparser_define extends Twig_TokenParser
 {
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Twig_Token $token A Twig_Token instance
+     *
+     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     */
+    public function parse(Twig_Token $token)
+    {
+        $lineno = $token->getLine();
+        $stream = $this->parser->getStream();
+        $name = $this->parser->getExpressionParser()->parseExpression();
+
+        $capture = false;
+        if ($stream->test(Twig_Token::OPERATOR_TYPE, '=')) {
+            $stream->next();
+            $value = $this->parser->getExpressionParser()->parseExpression();
+
+            $stream->expect(Twig_Token::BLOCK_END_TYPE);
+        } else {
+            $capture = true;
+
+            $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+            $value = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
+            $stream->expect(Twig_Token::BLOCK_END_TYPE);
+        }
+
+        return new phpbb_template_twig_node_define($capture, $name, $value, $lineno, $this->getTag());
+    }
+
     public function decideBlockEnd(Twig_Token $token)
     {
         return $token->test('ENDDEFINE');
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index cb2899a2fd..65776b7b6e 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -261,14 +261,8 @@ class phpbb_template_twig implements phpbb_template
 			return $result[0];
 		}
 
-		try
-		{
-			$this->twig->display($this->filenames[$handle], $this->get_template_vars());
-		}
-		catch (Twig_Error $e)
-		{
-			throw $e;
-		}
+		$context = &$this->get_template_vars();
+		$this->twig->display($this->filenames[$handle], $context);
 
 		return true;
 	}
@@ -454,7 +448,10 @@ class phpbb_template_twig implements phpbb_template
 		$vars = array_merge(
 			$vars,
 			$this->context->get_rootref(),
-			$this->context->get_tpldata()
+			$this->context->get_tpldata(),
+			array(
+				'definition'	=> new phpbb_template_twig_definition(),
+			)
 		);
 
 		// cleanup
-- 
cgit v1.2.1


From f18cbd50f0c54aa1a97d1b4ece69d5bf70b68734 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 29 Jun 2013 19:19:18 -0500
Subject: [feature/twig] Fixing more stuff for DEFINE/INCLUDE

PHPBB3-11598
---
 phpBB/includes/template/twig/lexer.php       | 49 ++++++++++++++++++++++++----
 phpBB/includes/template/twig/node/define.php |  4 +--
 2 files changed, 44 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index e8ceef3d13..258b913a2c 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -31,14 +31,21 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			/*'DEFINE',
 			'UNDEFINE',*/
 			'ENDDEFINE',
-			/*'INCLUDE',
-			'INCLUDEPHP',*/
+			'INCLUDE',
+			'INCLUDEPHP',
 			'INCLUDEJS',
 			'PHP',
 			'ENDPHP',
 			'EVENT',
 		);
 
+		// Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}')
+		$code = $this->fix_inline_variable_tokens(array(
+			'DEFINE.+=',
+			'INCLUDE',
+			'INCLUDEPHP',
+		), $code);
+
 		// Fix our BEGIN statements
 		$code = $this->fix_begin_tokens($code);
 
@@ -48,9 +55,6 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		// Fix our DEFINE tokens
 		$code = $this->fix_define_tokens($code);
 
-		// Replace <!-- INCLUDE blah.html --> with {% include 'blah.html' %}
-		$code = preg_replace('#<!-- INCLUDE(PHP)? (.*?) -->#', "{% INCLUDE$1 '$2' %}", $code);
-
 		// Replace all of our starting tokens, <!-- TOKEN --> with Twig style, {% TOKEN %}
 		// This also strips outer parenthesis, <!-- IF (blah) --> becomes <!-- IF blah -->
 		$code = preg_replace('#<!-- (' . implode('|', $valid_starting_tokens) . ')(?: (.*?) ?)?-->#', '{% $1 $2 %}', $code);
@@ -61,6 +65,31 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		return parent::tokenize($code, $filename);
 	}
 
+	/**
+	* Fix tokens that may have inline variables
+	*
+	* E.g. <!-- INCLUDE {TEST}.html
+	*
+	* @param array $tokens array of tokens to search for (imploded to a regular expression)
+	* @param string $code
+	* @return string
+	*/
+	protected function fix_inline_variable_tokens($tokens, $code)
+	{
+		$callback = function($matches)
+		{
+			// Remove any quotes that may have been used in different implementations
+			// E.g. DEFINE $TEST = 'blah' vs INCLUDE foo
+			// Replace {} with start/end to parse variables (' ~ TEST ~ '.html)
+			$matches[2] = str_replace(array('"', "'", '{', '}'), array('', '', "' ~ ", " ~ '"), $matches[2]);
+
+			// Surround the matches in single quotes ('' ~ TEST ~ '.html')
+			return "<!-- {$matches[1]} '{$matches[2]}' -->";
+		};
+
+		return preg_replace_callback('#<!-- (' . implode('|', $tokens) . ') (.+?) -->#', $callback, $code);
+	}
+
 	/**
 	* Fix begin tokens (convert our BEGIN to Twig for)
 	*
@@ -148,10 +177,13 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			// Replace .test with test|length
 			$matches[1] = preg_replace('#\s\.([a-zA-Z_0-9]+)#', ' $1|length', $matches[1]);
 
-			return '<!-- IF ' . $matches[1] . ' -->';
+			// Replace our "div by" with Twig's divisibleby (Twig does not like test names with spaces?)
+			$matches[1] = preg_replace('# div by ([0-9]+)#', ' divisibleby($1)', $matches[1]);
+
+			return '<!-- IF' . $matches[1] . '-->';
 		};
 
-		return preg_replace_callback('#<!-- IF((.*)[\s][\$|\.]([^\s]+)(.*))-->#', $callback, $code);
+		return preg_replace_callback('#<!-- IF((.*)[\s][\$|\.|!]([^\s]+)(.*))-->#', $callback, $code);
 	}
 
 	/**
@@ -183,6 +215,9 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		// Replace all of our variables, {$VARNAME}, with Twig style, {{ definition.VARNAME }}
 		$code = preg_replace('#{\$([a-zA-Z0-9_\.]+)}#', '{{ definition.$1 }}', $code);
 
+		// Replace all of our variables, ~ $VARNAME ~, with Twig style, ~ definition.VARNAME ~
+		$code = preg_replace('#~ \$([a-zA-Z0-9_\.]+) ~#', '~ definition.$1 ~', $code);
+
 		return $code;
 	}
 }
diff --git a/phpBB/includes/template/twig/node/define.php b/phpBB/includes/template/twig/node/define.php
index ef7565d27d..87e93be7be 100644
--- a/phpBB/includes/template/twig/node/define.php
+++ b/phpBB/includes/template/twig/node/define.php
@@ -29,13 +29,13 @@ class phpbb_template_twig_node_define extends Twig_Node
 				->subcompile($this->getNode('value'))
 			;
 
-			$compiler->raw(" = ('' === \$value = ob_get_clean()) ? '' : new Twig_Markup(\$value, \$this->env->getCharset())");
+			$compiler->write("\$value = ('' === \$value = ob_get_clean()) ? '' : new Twig_Markup(\$value, \$this->env->getCharset());\n");
 		}
 		else
 		{
 			$compiler
 				->write("\$value = '")
-				->raw($this->getNode('value')->getAttribute('value'))
+				->subcompile($this->getNode('value'))
 				->raw("';\n")
 			;
 		}
-- 
cgit v1.2.1


From 82aa4edeabe1c0f3c01f6c4a23035470a89e3f1f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 29 Jun 2013 19:22:01 -0500
Subject: [feature/twig] Adding some operators to the extension

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index a952d70076..fb9daab500 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -59,14 +59,18 @@ class phpbb_template_twig_extension extends Twig_Extension
 
 				'gt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 				'gte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				'ge' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 				'lt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 				'lte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				'le' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 
 				'||' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 				'&&' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-			),
-		);
-	}
+
+                'mod' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+            ),
+        );
+    }
 
 	/**
 	 * Grabs a subset of a loop
-- 
cgit v1.2.1


From c477f865fbab2ecc1cd13302f44d62b36af14c73 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 29 Jun 2013 19:22:58 -0500
Subject: [feature/twig] Add S_NUM_ROWS to loops in context

PHPBB3-11598
---
 phpBB/includes/template/context.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
index 9826f5e5f5..4689cf2d77 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/template/context.php
@@ -178,6 +178,11 @@ class phpbb_template_context
 			// We're adding a new iteration to this block with the given
 			// variable assignments.
 			$str[$blocks[$blockcount]][] = $vararray;
+
+			foreach ($str[$blocks[$blockcount]] as &$mod_block)
+			{
+				$mod_block['S_NUM_ROWS'] = $blockcount;
+			}
 		}
 		else
 		{
-- 
cgit v1.2.1


From c49d27329d5962f41ee850df2a0937528361151d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 09:18:58 -0500
Subject: [feature/twig] Adding ! operator

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index fb9daab500..d7400fde4b 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -45,9 +45,14 @@ class phpbb_template_twig_extension extends Twig_Extension
 	public function getOperators()
 	{
 		return array(
-			array(),
 			array(
-				// @todo check if all these are needed (or others) and set precedence correctly
+                '!' => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'),
+			),
+			array(
+				// precedence settings are copied from similar operators in Twig core extension
+				'||' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+				'&&' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+
 				'eq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 
 				'ne' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
@@ -64,9 +69,6 @@ class phpbb_template_twig_extension extends Twig_Extension
 				'lte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 				'le' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 
-				'||' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				'&&' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-
                 'mod' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
             ),
         );
-- 
cgit v1.2.1


From 2c55671767e194fb37cae674c0730e4bc50c0356 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 09:19:30 -0500
Subject: [feature/twig] Fixing div by replacement

PHPBB3-11598
---
 phpBB/includes/template/twig/lexer.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 258b913a2c..a2afcf18be 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -177,12 +177,12 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			// Replace .test with test|length
 			$matches[1] = preg_replace('#\s\.([a-zA-Z_0-9]+)#', ' $1|length', $matches[1]);
 
-			// Replace our "div by" with Twig's divisibleby (Twig does not like test names with spaces?)
-			$matches[1] = preg_replace('# div by ([0-9]+)#', ' divisibleby($1)', $matches[1]);
-
 			return '<!-- IF' . $matches[1] . '-->';
 		};
 
+		// Replace our "div by" with Twig's divisibleby (Twig does not like test names with spaces)
+		$code = preg_replace('# div by ([0-9]+)#', ' divisibleby($1)', $code);
+
 		return preg_replace_callback('#<!-- IF((.*)[\s][\$|\.|!]([^\s]+)(.*))-->#', $callback, $code);
 	}
 
-- 
cgit v1.2.1


From ecdc73a81a30e9d48c9e8eccfcdcb13fb52dbb81 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 09:19:54 -0500
Subject: [feature/twig] Fixing define node

PHPBB3-11598
---
 phpBB/includes/template/twig/node/define.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/define.php b/phpBB/includes/template/twig/node/define.php
index 87e93be7be..0c4d400767 100644
--- a/phpBB/includes/template/twig/node/define.php
+++ b/phpBB/includes/template/twig/node/define.php
@@ -34,14 +34,14 @@ class phpbb_template_twig_node_define extends Twig_Node
 		else
 		{
 			$compiler
-				->write("\$value = '")
+				->write("\$value = ")
 				->subcompile($this->getNode('value'))
-				->raw("';\n")
+				->raw(";\n")
 			;
 		}
 
 		$compiler
-			->raw("\$context['definition']->set('")
+			->write("\$context['definition']->set('")
 			->raw($this->getNode('name')->getAttribute('name'))
 			->raw("', \$value);\n")
 		;
-- 
cgit v1.2.1


From 658d1b6afe7816ba92c30e227ebdef0db427ce53 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 09:20:46 -0500
Subject: [feature/twig] Fixing include node

PHPBB3-11598
---
 phpBB/includes/template/twig/node/include.php | 36 ++++++++++++++-------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/include.php b/phpBB/includes/template/twig/node/include.php
index df7a95af44..2a90dc19e4 100644
--- a/phpBB/includes/template/twig/node/include.php
+++ b/phpBB/includes/template/twig/node/include.php
@@ -18,28 +18,30 @@ class phpbb_template_twig_node_include extends Twig_Node_Include
     {
         $compiler->addDebugInfo($this);
 
-    	$location = $this->getNode('expr')->getAttribute('value');
-    	$namespace = false;
-
-    	if (strpos($location, '@') === 0)
-    	{
-    		$namespace = substr($location, 1, strpos($location, '/') - 1);
-
-    		$compiler
+		$compiler
+			->write("\$location = ")
+			->subcompile($this->getNode('expr'))
+			->raw(";\n")
+			->write("\$namespace = false;\n")
+			->write("if (strpos(\$location, '@') === 0) {\n")
+			->indent()
+				->write("\$namespace = substr(\$location, 1, strpos(\$location, '/') - 1);\n")
     			->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
 
     			// We set the namespace lookup order to be this namespace first, then the main path
-    			->write("\$this->env->setNamespaceLookUpOrder(array('" . $namespace . "', '__main__'));\n")
-    		;
-		}
+    			->write("\$this->env->setNamespaceLookUpOrder(array(\$namespace, '__main__'));\n")
+			->outdent()
+			->write("}\n")
+		;
 
         parent::compile($compiler);
 
-    	if ($namespace)
-    	{
-    		$compiler
-    			->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
-    		;
-		}
+		$compiler
+			->write("if (\$namespace) {\n")
+			->indent()
+				->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
+			->outdent()
+			->write("}\n")
+    	;
     }
 }
-- 
cgit v1.2.1


From 97494051290f394f61767358a306c1896d0545f0 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 09:32:21 -0500
Subject: [feature/twig] Transform {L_, {LA_ to use the lang() function

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php | 35 ++++++++++++++++++++++++++++++
 phpBB/includes/template/twig/lexer.php     |  6 +++++
 phpBB/includes/template/twig/twig.php      | 22 +++++--------------
 3 files changed, 47 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index d7400fde4b..a3da61fcdb 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -17,11 +17,24 @@ if (!defined('IN_PHPBB'))
 
 class phpbb_template_twig_extension extends Twig_Extension
 {
+	/** @var phpbb_user */
+	protected $user;
+
+	public function __construct($user)
+	{
+		$this->user = $user;
+	}
+
 	public function getName()
 	{
 		return 'phpbb';
 	}
 
+    /**
+     * Returns the token parser instance to add to the existing list.
+     *
+     * @return array An array of Twig_TokenParser instances
+     */
 	public function getTokenParsers()
 	{
 		return array(
@@ -35,6 +48,11 @@ class phpbb_template_twig_extension extends Twig_Extension
 		);
 	}
 
+    /**
+     * Returns a list of filters to add to the existing list.
+     *
+     * @return array An array of filters
+     */
     public function getFilters()
     {
         return array(
@@ -42,6 +60,23 @@ class phpbb_template_twig_extension extends Twig_Extension
 		);
     }
 
+    /**
+     * Returns a list of global functions to add to the existing list.
+     *
+     * @return array An array of global functions
+     */
+    public function getFunctions()
+    {
+        return array(
+            new Twig_SimpleFunction('lang', array($this->user, 'lang')),
+		);
+	}
+
+    /**
+     * Returns a list of operators to add to the existing list.
+     *
+     * @return array An array of operators
+     */
 	public function getOperators()
 	{
 		return array(
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index a2afcf18be..1daa6c30c9 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -59,6 +59,12 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		// This also strips outer parenthesis, <!-- IF (blah) --> becomes <!-- IF blah -->
 		$code = preg_replace('#<!-- (' . implode('|', $valid_starting_tokens) . ')(?: (.*?) ?)?-->#', '{% $1 $2 %}', $code);
 
+		// Replace all of our language variables, {L_VARNAME}, with Twig style, {{ lang('NAME') }}
+		$code = preg_replace('#{L_([a-zA-Z0-9_\.]+)}#', '{{ lang(\'$1\') }}', $code);
+
+		// Replace all of our JS escaped language variables, {LA_VARNAME}, with Twig style, {{ lang('NAME')|escape('js') }}
+		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)}#', '{{ lang(\'$1\')|escape(\'js\') }}', $code);
+
 		// Replace all of our variables, {VARNAME}, with Twig style, {{ VARNAME }}
 		$code = preg_replace('#{([a-zA-Z0-9_\.]+)}#', '{{ $1 }}', $code);
 
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 65776b7b6e..f5879c6027 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -131,7 +131,11 @@ class phpbb_template_twig implements phpbb_template
 		// @todo remove
 		$this->clear_cache();
 
-		$this->twig->addExtension(new phpbb_template_twig_extension);
+		$this->twig->addExtension(
+			new phpbb_template_twig_extension(
+				$this->user
+			)
+		);
 
 		$lexer = new phpbb_template_twig_lexer($this->twig);
 
@@ -430,27 +434,13 @@ class phpbb_template_twig implements phpbb_template
 	{
 		$vars = array();
 
-		// Work-around for now
-		if (!empty($this->user->lang))
-		{
-			foreach ($this->user->lang as $key => $value)
-			{
-				if (!is_string($value))
-				{
-					continue;
-				}
-
-				$vars['L_' . strtoupper($key)] = $value;
-				$vars['LA_' . strtoupper($key)] = addslashes($value);
-			}
-		}
-
 		$vars = array_merge(
 			$vars,
 			$this->context->get_rootref(),
 			$this->context->get_tpldata(),
 			array(
 				'definition'	=> new phpbb_template_twig_definition(),
+				'user'			=> $this->user,
 			)
 		);
 
-- 
cgit v1.2.1


From 8d3fd1fcdd446bd3838d9d9ed68ce4b0c1f48ac3 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 09:36:03 -0500
Subject: [feature/twig] Remove the get_rootref and get_tpldata functions prev
 added

These are not really necessary

PHPBB3-11598
---
 phpBB/includes/template/context.php   | 20 --------------------
 phpBB/includes/template/twig/twig.php |  7 +++----
 2 files changed, 3 insertions(+), 24 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
index 4689cf2d77..498568e5f4 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/template/context.php
@@ -82,26 +82,6 @@ class phpbb_template_context
 		return true;
 	}
 
-	/**
-	* Get (non-referenced) rootref
-	*
-	* @return array
-	*/
-	public function get_rootref()
-	{
-		return $this->rootref;
-	}
-
-	/**
-	* Get (non-referenced) tpldata
-	*
-	* @return array
-	*/
-	public function get_tpldata()
-	{
-		return $this->tpldata;
-	}
-
 	/**
 	* Returns a reference to template data array.
 	*
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index f5879c6027..717213ea1f 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -432,12 +432,11 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	public function get_template_vars()
 	{
-		$vars = array();
+		$context_vars = $this->context->get_data_ref();
 
 		$vars = array_merge(
-			$vars,
-			$this->context->get_rootref(),
-			$this->context->get_tpldata(),
+			$context_vars['.'][0], // To get normal vars
+			$context_vars, // To get loops
 			array(
 				'definition'	=> new phpbb_template_twig_definition(),
 				'user'			=> $this->user,
-- 
cgit v1.2.1


From 42e3a4bfb9653164db31637e36804945d854e9e7 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 10:17:58 -0500
Subject: [feature/twig] Add addslashes filter (to use on LA_ instead of
 escape)

To match previous parser behavior

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php | 1 +
 phpBB/includes/template/twig/lexer.php     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index a3da61fcdb..1ea5f7b662 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -57,6 +57,7 @@ class phpbb_template_twig_extension extends Twig_Extension
     {
         return array(
             new Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)),
+            new Twig_SimpleFilter('addslashes', 'addslashes'),
 		);
     }
 
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 1daa6c30c9..131cf654ef 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -62,8 +62,8 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		// Replace all of our language variables, {L_VARNAME}, with Twig style, {{ lang('NAME') }}
 		$code = preg_replace('#{L_([a-zA-Z0-9_\.]+)}#', '{{ lang(\'$1\') }}', $code);
 
-		// Replace all of our JS escaped language variables, {LA_VARNAME}, with Twig style, {{ lang('NAME')|escape('js') }}
-		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)}#', '{{ lang(\'$1\')|escape(\'js\') }}', $code);
+		// Replace all of our escaped language variables, {LA_VARNAME}, with Twig style, {{ lang('NAME')|addslashes }}
+		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)}#', '{{ lang(\'$1\')|addslashes }}', $code);
 
 		// Replace all of our variables, {VARNAME}, with Twig style, {{ VARNAME }}
 		$code = preg_replace('#{([a-zA-Z0-9_\.]+)}#', '{{ $1 }}', $code);
-- 
cgit v1.2.1


From 4ee7fb1a9d549ce0b1c687eaddbe0bf3261ab3bf Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 10:57:57 -0500
Subject: [feature/twig] Add S_BLOCK_NAME to context, set S_NUM_ROWS in
 alter_block

PHPBB3-11598
---
 phpBB/includes/template/context.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
index 498568e5f4..8585e7d794 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/template/context.php
@@ -146,6 +146,9 @@ class phpbb_template_context
 				$vararray['S_FIRST_ROW'] = true;
 			}
 
+			// Assign S_BLOCK_NAME
+			$vararray['S_BLOCK_NAME'] = $blocks[$blockcount];
+
 			// Now the tricky part, we always assign S_LAST_ROW and remove the entry before
 			// This is much more clever than going through the complete template data on display (phew)
 			$vararray['S_LAST_ROW'] = true;
@@ -159,6 +162,7 @@ class phpbb_template_context
 			// variable assignments.
 			$str[$blocks[$blockcount]][] = $vararray;
 
+			// Set S_NUM_ROWS
 			foreach ($str[$blocks[$blockcount]] as &$mod_block)
 			{
 				$mod_block['S_NUM_ROWS'] = $blockcount;
@@ -176,6 +180,9 @@ class phpbb_template_context
 				$vararray['S_FIRST_ROW'] = true;
 			}
 
+			// Assign S_BLOCK_NAME
+			$vararray['S_BLOCK_NAME'] = $blocks[$blockcount];
+
 			// We always assign S_LAST_ROW and remove the entry before
 			$vararray['S_LAST_ROW'] = true;
 			if ($s_row_count > 0)
@@ -185,6 +192,12 @@ class phpbb_template_context
 
 			// Add a new iteration to this block with the variable assignments we were given.
 			$this->tpldata[$blockname][] = $vararray;
+
+			// Set S_NUM_ROWS
+			foreach ($this->tpldata[$blockname] as &$mod_block)
+			{
+				$mod_block['S_NUM_ROWS'] = $blockcount;
+			}
 		}
 
 		return true;
@@ -303,6 +316,9 @@ class phpbb_template_context
 				$vararray['S_FIRST_ROW'] = true;
 			}
 
+			// Assign S_BLOCK_NAME
+			$vararray['S_BLOCK_NAME'] = $blockname;
+
 			// Re-position template blocks
 			for ($i = sizeof($block); $i > $key; $i--)
 			{
@@ -315,6 +331,12 @@ class phpbb_template_context
 			$block[$key] = $vararray;
 			$block[$key]['S_ROW_COUNT'] = $block[$key]['S_ROW_NUM'] = $key;
 
+			// Set S_NUM_ROWS
+			foreach ($this->tpldata[$blockname] as &$mod_block)
+			{
+				$mod_block['S_NUM_ROWS'] = sizeof($this->tpldata[$blockname]);
+			}
+
 			return true;
 		}
 
-- 
cgit v1.2.1


From 4ad1d9aa6530ebe1d554909a978b9ee124377625 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Sat, 22 Jun 2013 04:07:21 +0530
Subject: [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init

PHPBB3-11566
---
 phpBB/includes/constants.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 17c25ee3c6..ad5b43bc9a 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -157,6 +157,7 @@ define('PHYSICAL_LINK', 2);
 define('CONFIRM_REG', 1);
 define('CONFIRM_LOGIN', 2);
 define('CONFIRM_POST', 3);
+define('CONFIRM_REPORT', 4);
 
 // Categories - Attachments
 define('ATTACHMENT_CATEGORY_NONE', 0);
-- 
cgit v1.2.1


From ddaccaf63e8ae7ff5bd13b187fa40f3d089f02f0 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 11:52:03 -0500
Subject: [feature/twig] A bit of cleanup in twig.php

PHPBB3-11598
---
 phpBB/includes/template/twig/twig.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 717213ea1f..5fe8ba97f6 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -266,7 +266,7 @@ class phpbb_template_twig implements phpbb_template
 		}
 
 		$context = &$this->get_template_vars();
-		$this->twig->display($this->filenames[$handle], $context);
+		$this->twig->display($this->get_filename_from_handle($handle), $context);
 
 		return true;
 	}
@@ -324,20 +324,12 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	public function assign_display($handle, $template_var = '', $return_content = true)
 	{
-		ob_start();
-		$result = $this->display($handle);
-		$contents = ob_get_clean();
-		if ($result === false)
-		{
-			return false;
-		}
-
 		if ($return_content)
 		{
-			return $contents;
+			return $this->twig->render($this->get_filename_from_handle($handle));
 		}
 
-		$this->assign_var($template_var, $contents);
+		$this->assign_var($template_var, $this->twig->render($this->get_filename_from_handle($handle)));
 
 		return true;
 	}
@@ -448,4 +440,15 @@ class phpbb_template_twig implements phpbb_template
 
 		return $vars;
 	}
+
+	/**
+	* Get a filename from the handle
+	*
+	* @param string $handle
+	* @return string
+	*/
+	protected function get_filename_from_handle($handle)
+	{
+		return (isset($this->filenames[$handle])) ? $this->filenames[$handle] : $handle;
+	}
 }
-- 
cgit v1.2.1


From e9bbeeb1a4c7d1c4b1d35848ff58f31af4483d07 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 12:23:25 -0500
Subject: [feature/twig] Fix includephp node

PHPBB3-11598
---
 phpBB/includes/template/twig/node/includephp.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/includes/template/twig/node/includephp.php
index 5315d136d7..33142bf05a 100644
--- a/phpBB/includes/template/twig/node/includephp.php
+++ b/phpBB/includes/template/twig/node/includephp.php
@@ -46,19 +46,17 @@ class phpbb_template_twig_node_includephp extends Twig_Node
             ;
         }
 
-		// Replace variables in the expression
-		$expr = preg_replace('#{{ ([a-zA-Z0-9_]+) }}#', '\' . ((isset($context["$1"])) ? $context["$1"] : null) . \'', $this->getNode('expr')->getAttribute('value'));
-
 		$compiler
-			->write("if (phpbb_is_absolute('$expr')) {\n")
+			->write("\$location = ")
+			->subcompile($this->getNode('expr'))
+			->raw(";\n")
+			->write("if (phpbb_is_absolute(\$location)) {\n")
 			->indent()
-				->write("require('$expr');\n")
+				->write("require(\$location);\n")
 			->outdent()
 			->write("} else {\n")
 			->indent()
-				->write("require(\$this->getEnvironment()->get_phpbb_root_path() . '")
-				->raw($expr)
-				->raw("');\n")
+				->write("require(\$this->getEnvironment()->get_phpbb_root_path() . \$location);\n")
 			->outdent()
 			->write("}\n")
 		;
-- 
cgit v1.2.1


From 6c30441ad4a20fe4f154d5a859b9df0f28cbc8e0 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 12:26:01 -0500
Subject: [feature/twig] Changing INCLUDEJS behavior slightly

Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP

PHPBB3-11598
---
 phpBB/includes/template/twig/lexer.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 131cf654ef..d9cc6f60ce 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -44,6 +44,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			'DEFINE.+=',
 			'INCLUDE',
 			'INCLUDEPHP',
+			'INCLUDEJS',
 		), $code);
 
 		// Fix our BEGIN statements
-- 
cgit v1.2.1


From 66118ea49e2dc1a54ce1a76fa4856ff158df9511 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 1 Jul 2013 13:32:16 -0400
Subject: [feature/auth-refactor] A possible fix for the functional test
 failures

I don't like this fix as it really shouldn't be needed. But it
makes the functional tests pass.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/request/request.php b/phpBB/includes/request/request.php
index ae3c526d89..c0bb453c7c 100644
--- a/phpBB/includes/request/request.php
+++ b/phpBB/includes/request/request.php
@@ -79,7 +79,7 @@ class phpbb_request implements phpbb_request_interface
 
 		// simulate request_order = GP
 		$this->original_request = $this->input[phpbb_request_interface::REQUEST];
-		$this->input[phpbb_request_interface::REQUEST] = $this->input[phpbb_request_interface::POST] + $this->input[phpbb_request_interface::GET];
+		$this->input[phpbb_request_interface::REQUEST] = (array)$this->input[phpbb_request_interface::POST] + (array)$this->input[phpbb_request_interface::GET];
 
 		if ($disable_super_globals)
 		{
-- 
cgit v1.2.1


From 341bae40eb8e8238510a2cb1678f9594a3efd29e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 12:58:31 -0500
Subject: [feature/twig] Remove the twig loader class that I started (don't use
 it)

PHPBB3-11598
---
 phpBB/includes/template/twig/loader.php | 51 ---------------------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 phpBB/includes/template/twig/loader.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/loader.php b/phpBB/includes/template/twig/loader.php
deleted file mode 100644
index b153bd81ea..0000000000
--- a/phpBB/includes/template/twig/loader.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-// @todo remove if not needed
-class phpbb_template_twig_loader extends Twig_Loader_Filesystem
-{
-	protected $phpbb_locator;
-
-    /**
-    * Constructor.
-    *
-    * @param string|array $paths A path or an array of paths where to look for templates
-    * @param phpbb_template_locator
-    */
-    public function __construct($paths = array(), phpbb_template_locator $phpbb_locator)
-    {
-        if ($paths) {
-            $this->setPaths($paths);
-        }
-
-        $this->phpbb_locator = $phpbb_locator;
-    }
-
-    protected function findTemplate($name)
-    {
-        $name = (string) $name;
-
-        if (!$name)
-        {
-        	throw new Twig_Error_Loader(sprintf('Unable to find template "%s".', $name));
-		}
-
-        $this->phpbb_locator->set_filenames(array(
-        	'temp'		=> $name,
-        ));
-        $location = $this->phpbb_locator->get_source_file_for_handle('temp');
-
-        if (!$location)
-        {
-        	throw new Twig_Error_Loader(sprintf('Unable to find template "%s".', $name));
-		}
-
-		return $this->cache[$name] = $location;
-    }
-}
-- 
cgit v1.2.1


From 2d9bbe0ef218f56565d70a0e197ba91a80ea378b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 13:26:00 -0500
Subject: [feature/twig] Fix template/context.php

PHPBB3-11598
---
 phpBB/includes/template/context.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
index 8585e7d794..e3ad6be46c 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/template/context.php
@@ -181,7 +181,7 @@ class phpbb_template_context
 			}
 
 			// Assign S_BLOCK_NAME
-			$vararray['S_BLOCK_NAME'] = $blocks[$blockcount];
+			$vararray['S_BLOCK_NAME'] = $blockname;
 
 			// We always assign S_LAST_ROW and remove the entry before
 			$vararray['S_LAST_ROW'] = true;
@@ -196,7 +196,7 @@ class phpbb_template_context
 			// Set S_NUM_ROWS
 			foreach ($this->tpldata[$blockname] as &$mod_block)
 			{
-				$mod_block['S_NUM_ROWS'] = $blockcount;
+				$mod_block['S_NUM_ROWS'] = sizeof($this->tpldata[$blockname]);
 			}
 		}
 
-- 
cgit v1.2.1


From bdc05b7dc8ee2363dfe1a7fa70bc4118140ed351 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 13:28:08 -0500
Subject: [feature/twig] Remove resource locator dependency from template

PHPBB3-11598
---
 phpBB/includes/bbcode.php              | 2 +-
 phpBB/includes/functions_messenger.php | 2 +-
 phpBB/includes/template/twig/twig.php  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 5a4161bb6c..ecbb056045 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -134,7 +134,7 @@ class bbcode
 
 			$style_resource_locator = new phpbb_style_resource_locator();
 			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path);
-			$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
+			$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager);
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template);
 			$style->set_style();
 			$template->set_filenames(array('bbcode.html' => 'bbcode.html'));
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index f0736fbb45..b117fda5b4 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -228,7 +228,7 @@ class messenger
 		{
 			$style_resource_locator = new phpbb_style_resource_locator();
 			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path);
-			$tpl = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager);
+			$tpl = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager);
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
 
 			$this->tpl_msg[$template_lang . $template_file] = $tpl;
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 5fe8ba97f6..1d36ceadba 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -96,11 +96,10 @@ class phpbb_template_twig implements phpbb_template
 	*
 	* @param string $phpbb_root_path phpBB root path
 	* @param user $user current user
-	* @param phpbb_template_locator $locator template locator
 	* @param phpbb_template_context $context template context
 	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
 	*/
-	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_locator $locator, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null)
+	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
-- 
cgit v1.2.1


From 793ee3f8d9d1ccc971d7b7118b981463b7de0938 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 13:32:43 -0500
Subject: [feature/twig] Remove debug code, set debug/auto reload correctly

PHPBB3-11598
---
 phpBB/includes/template/twig/twig.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 1d36ceadba..377a0a47a8 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -120,16 +120,12 @@ class phpbb_template_twig implements phpbb_template
 			$loader,
 			array(
 				'cache'			=> $this->cachepath,
-				'debug'			=> true, // @todo
-				'auto_reload'	=> true, // @todo
+				'debug'			=> defined('DEBUG'),
+				'auto_reload'	=> (bool) $this->config['load_tplcompile'],
 				'autoescape'	=> false,
 			)
 		);
 
-		// Clear previous cache files (while WIP)
-		// @todo remove
-		$this->clear_cache();
-
 		$this->twig->addExtension(
 			new phpbb_template_twig_extension(
 				$this->user
-- 
cgit v1.2.1


From 9fbba760fbb79482976ec9107f70889be2a177fd Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 13:34:28 -0500
Subject: [feature/twig] Remove classes related to old template engine

PHPBB3-11598
---
 phpBB/includes/template/compile.php          |  166 ----
 phpBB/includes/template/filter.php           | 1261 --------------------------
 phpBB/includes/template/phpbb.php            |  515 -----------
 phpBB/includes/template/renderer_eval.php    |   60 --
 phpBB/includes/template/renderer_include.php |   60 --
 5 files changed, 2062 deletions(-)
 delete mode 100644 phpBB/includes/template/compile.php
 delete mode 100644 phpBB/includes/template/filter.php
 delete mode 100644 phpBB/includes/template/phpbb.php
 delete mode 100644 phpBB/includes/template/renderer_eval.php
 delete mode 100644 phpBB/includes/template/renderer_include.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/template/compile.php
deleted file mode 100644
index 76cb3011df..0000000000
--- a/phpBB/includes/template/compile.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-stream_filter_register('phpbb_template', 'phpbb_template_filter');
-
-/**
-* Extension of template class - Functions needed for compiling templates only.
-*
-* @package phpBB3
-* @uses template_filter As a PHP stream filter to perform compilation of templates
-*/
-class phpbb_template_compile
-{
-	/**
-	* Array of parameters to forward to template filter
-	*
-	* @var array
-	*/
-	private $filter_params;
-
-	/**
-	* Array of default parameters
-	*
-	* @var array
-	*/
-	private $default_filter_params;
-
-	/**
-	* Constructor.
-	*
-	* @param bool $allow_php Whether PHP code will be allowed in templates (inline PHP code, PHP tag and INCLUDEPHP tag)
-	* @param array $style_names Name of style to which the template being compiled belongs and parents in style tree order
-	* @param phpbb_style_resource_locator $locator Resource locator
-	* @param string $phpbb_root_path Path to phpBB root directory
-	* @param phpbb_extension_manager $extension_manager Extension manager to use for finding template fragments in extensions; if null, template events will not be invoked
-	* @param phpbb_user $user Current user
-	*/
-	public function __construct($allow_php, $style_names, $locator, $phpbb_root_path, $extension_manager = null, $user = null)
-	{
-		$this->filter_params = $this->default_filter_params = array(
-			'allow_php'			=> $allow_php,
-			'style_names'		=> $style_names,
-			'locator'			=> $locator,
-			'phpbb_root_path'	=> $phpbb_root_path,
-			'extension_manager'	=> $extension_manager,
-			'user'          	=> $user,
-			'template_compile'	=> $this,
-			'cleanup'			=> true,
-		);
-	}
-
-	/**
-	* Set filter parameters
-	*
-	* @param array $params Array of parameters (will be merged onto $this->filter_params)
-	*/
-	public function set_filter_params($params)
-	{
-		$this->filter_params = array_merge(
-			$this->filter_params,
-			$params
-		);
-	}
-
-	/**
-	* Reset filter parameters to their default settings
-	*/
-	public function reset_filter_params()
-	{
-		$this->filter_params = $this->default_filter_params;
-	}
-
-	/**
-	* Compiles template in $source_file and writes compiled template to
-	* cache directory
-	*
-	* @param string $handle Template handle to compile
-	* @param string $source_file Source template file
-	* @return bool Return true on success otherwise false
-	*/
-	public function compile_file_to_file($source_file, $compiled_file)
-	{
-		$lock = new phpbb_lock_flock($compiled_file);
-		$lock->acquire();
-
-		$source_handle = @fopen($source_file, 'rb');
-		$destination_handle = @fopen($compiled_file, 'wb');
-
-		if (!$source_handle || !$destination_handle)
-		{
-			return false;
-		}
-
-		$this->compile_stream_to_stream($source_handle, $destination_handle);
-
-		@fclose($source_handle);
-		@fclose($destination_handle);
-
-		phpbb_chmod($compiled_file, CHMOD_READ | CHMOD_WRITE);
-
-		$lock->release();
-
-		clearstatcache();
-
-		return true;
-	}
-
-	/**
-	* Compiles a template located at $source_file.
-	*
-	* Returns PHP source suitable for eval().
-	*
-	* @param string $source_file Source template file
-	* @return string|bool Return compiled code on successful compilation otherwise false
-	*/
-	public function compile_file($source_file)
-	{
-		$source_handle = @fopen($source_file, 'rb');
-		$destination_handle = @fopen('php://temp' ,'r+b');
-
-		if (!$source_handle || !$destination_handle)
-		{
-			return false;
-		}
-
-		$this->compile_stream_to_stream($source_handle, $destination_handle);
-
-		@fclose($source_handle);
-
-		rewind($destination_handle);
-		$contents = stream_get_contents($destination_handle);
-		@fclose($dest_handle);
-
-		return $contents;
-	}
-
-	/**
-	* Compiles contents of $source_stream into $dest_stream.
-	*
-	* A stream filter is appended to $source_stream as part of the
-	* process.
-	*
-	* @param resource $source_stream Source stream
-	* @param resource $dest_stream Destination stream
-	* @return null
-	*/
-	private function compile_stream_to_stream($source_stream, $dest_stream)
-	{
-		stream_filter_append($source_stream, 'phpbb_template', null, $this->filter_params);
-		stream_copy_to_stream($source_stream, $dest_stream);
-	}
-}
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
deleted file mode 100644
index 1c0a56c9f5..0000000000
--- a/phpBB/includes/template/filter.php
+++ /dev/null
@@ -1,1261 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group, sections (c) 2001 ispi of Lincoln Inc
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The template filter that does the actual compilation
-*
-* psoTFX, phpBB Development Team - Completion of file caching, decompilation
-* routines and implementation of conditionals/keywords and associated changes
-*
-* The interface was inspired by PHPLib templates, and the template file (formats are
-* quite similar)
-*
-* The keyword/conditional implementation is currently based on sections of code from
-* the Smarty templating engine (c) 2001 ispi of Lincoln, Inc. which is released
-* (on its own and in whole) under the LGPL. Section 3 of the LGPL states that any code
-* derived from an LGPL application may be relicenced under the GPL, this applies
-* to this source
-*
-* DEFINE directive inspired by a request by Cyberalien
-*
-* @see template_compile
-* @package phpBB3
-*/
-class phpbb_template_filter extends php_user_filter
-{
-	const REGEX_NS = '[a-z_][a-z_0-9]+';
-
-	const REGEX_VAR = '[A-Z_][A-Z_0-9]+';
-	const REGEX_VAR_SUFFIX = '[A-Z_0-9]+';
-
-	const REGEX_TAG = '<!-- ([A-Z][A-Z_0-9]+)(?: (.*?) ?)?-->';
-
-	const REGEX_TOKENS = '~<!-- ([A-Z][A-Z_0-9]+)(?: (.*?) ?)?-->|{((?:[a-z_][a-z_0-9]+\.)*\\$?[A-Z][A-Z_0-9]+)}~';
-
-	/**
-	* @var array
-	*/
-	private $block_names = array();
-
-	/**
-	* @var array
-	*/
-	private $block_else_level = array();
-
-	/**
-	* @var string
-	*/
-	private $chunk;
-
-	/**
-	* @var bool
-	*/
-	private $in_php;
-
-	/**
-	* Whether inline PHP code, <!-- PHP --> and <!-- INCLUDEPHP --> tags
-	* are allowed. If this is false all PHP code will be silently
-	* removed from the template during compilation.
-	*
-	* @var bool
-	*/
-	private $allow_php;
-
-	/**
-	* Whether cleanup will be performed on resulting code, see compile()
-	* (Preserve whitespace)
-	*
-	* @var bool
-	*/
-	private $cleanup = true;
-
-	/**
-	* Resource locator.
-	*
-	* @var phpbb_template_locator
-	*/
-	private $locator;
-
-	/**
-	* @var string phpBB root path
-	*/
-	private $phpbb_root_path;
-
-	/**
-	* Name of the style that the template being compiled and/or rendered
-	* belongs to, and its parents, in inheritance tree order.
-	*
-	* Used to invoke style-specific template events.
-	*
-	* @var array
-	*/
-	private $style_names;
-
-	/**
-	* Extension manager.
-	*
-	* @var phpbb_extension_manager
-	*/
-	private $extension_manager;
-
-	/**
-	* Current user
-	*
-	* @var phpbb_user
-	*/
-	private $user;
-
-	/**
-	* Template compiler.
-	*
-	* @var phpbb_template_compile
-	*/
-	private $template_compile;
-
-	/**
-	* Stream filter
-	*
-	* Is invoked for evey chunk of the stream, allowing us
-	* to work on a chunk at a time, which saves memory.
-	*/
-	public function filter($in, $out, &$consumed, $closing)
-	{
-		$written = false;
-		$first = false;
-
-		while ($bucket = stream_bucket_make_writeable($in))
-		{
-			$consumed += $bucket->datalen;
-
-			$data = $this->chunk . $bucket->data;
-			$last_nl = strrpos($data, "\n");
-			$this->chunk = substr($data, $last_nl);
-			$data = substr($data, 0, $last_nl);
-
-			if (!strlen($data))
-			{
-				continue;
-			}
-
-			$written = true;
-
-			$data = $this->compile($data);
-			if (!$first)
-			{
-				$data = $this->prepend_preamble($data);
-				$first = false;
-			}
-			$bucket->data = $data;
-			$bucket->datalen = strlen($bucket->data);
-			stream_bucket_append($out, $bucket);
-		}
-
-		if ($closing && strlen($this->chunk))
-		{
-			$written = true;
-			$bucket = stream_bucket_new($this->stream, $this->compile($this->chunk));
-			stream_bucket_append($out, $bucket);
-		}
-
-		return $written ? PSFS_PASS_ON : PSFS_FEED_ME;
-	}
-
-	/**
-	* Initializer, called on creation.
-	*
-	* Get the allow_php option, style_names, root directory and locator from params,
-	* which are passed to stream_filter_append.
-	*
-	* @return boolean Returns true
-	*/
-	public function onCreate()
-	{
-		$this->chunk = '';
-		$this->in_php = false;
-		$this->allow_php = $this->params['allow_php'];
-		$this->locator = $this->params['locator'];
-		$this->phpbb_root_path = $this->params['phpbb_root_path'];
-		$this->style_names = $this->params['style_names'];
-		$this->extension_manager = $this->params['extension_manager'];
-		$this->cleanup = $this->params['cleanup'];
-		if (isset($this->params['user']))
-		{
-			$this->user = $this->params['user'];
-		}
-		$this->template_compile = $this->params['template_compile'];
-		return true;
-	}
-
-	/**
-	* Compiles a chunk of template.
-	*
-	* The chunk must comprise of one or more complete lines from the source
-	* template.
-	*
-	* @param string $data Chunk of source template to compile
-	* @return string Compiled PHP/HTML code
-	*/
-	private function compile($data)
-	{
-		$block_start_in_php = $this->in_php;
-
-		$data = preg_replace('#<(?:[\\?%]|script)#s', '<?php echo\'\\0\';?>', $data);
-		$data = preg_replace_callback(self::REGEX_TOKENS, array($this, 'replace'), $data);
-
-		// Remove php
-		if (!$this->allow_php)
-		{
-			if ($block_start_in_php
-				&& $this->in_php
-				&& strpos($data, '<!-- PHP -->') === false
-				&& strpos($data, '<!-- ENDPHP -->') === false)
-			{
-				// This is just php code
-				return '';
-			}
-			$data = preg_replace('~^.*?<!-- ENDPHP -->~', '', $data);
-			$data = preg_replace('~<!-- PHP -->.*?<!-- ENDPHP -->~', '', $data);
-			$data = preg_replace('~<!-- ENDPHP -->.*?$~', '', $data);
-		}
-
-		if ($this->cleanup)
-		{
-			/*
-
-			Preserve whitespace.
-			PHP removes a newline after the closing tag (if it's there).
-			This is by design:
-
-			http://www.php.net/manual/en/language.basic-syntax.phpmode.php
-			http://www.php.net/manual/en/language.basic-syntax.instruction-separation.php
-
-
-			Consider the following template:
-
-				<!-- IF condition -->
-				some content
-				<!-- ENDIF -->
-
-			If we were to simply preserve all whitespace, we could simply
-			replace all "?>" tags with "?>\n".
-			Doing that, would add additional newlines to the compiled
-			template in place of the IF and ENDIF statements. These
-			newlines are unwanted (and one is conditional). The IF and
-			ENDIF are usually on their own line for ease of reading.
-
-			This replacement preserves newlines only for statements that
-			are not the only statement on a line. It will NOT preserve
-			newlines at the end of statements in the above example.
-			It will preserve newlines in situations like:
-
-				<!-- IF condition -->inline content<!-- ENDIF -->
-
-			*/
-
-			$data = preg_replace('~(?<!^)(<\?php.+(?<!/\*\*/)\?>)$~m', "$1\n", $data);
-			$data = str_replace('/**/?>', "?>\n", $data);
-			$data = str_replace('?><?php', '', $data);
-		}
-
-		return $data;
-	}
-
-	/**
-	* Prepends a preamble to compiled template.
-	* Currently preamble checks if IN_PHPBB is defined and calls exit() if it is not.
-	*
-	* @param string $data Compiled template chunk
-	* @return string Compiled template chunk with preamble prepended
-	*/
-	private function prepend_preamble($data)
-	{
-		$data = "<?php if (!defined('IN_PHPBB')) exit;" . ((strncmp($data, '<?php', 5) === 0) ? substr($data, 5) : ' ?>' . $data);
-		return $data;
-	}
-
-	/**
-	* Callback for replacing matched tokens with compiled template code.
-	*
-	* Compiled template code is an HTML stream with embedded PHP.
-	*
-	* @param array $matches Regular expression matches
-	* @return string compiled template code
-	*/
-	private function replace($matches)
-	{
-		if ($this->in_php && $matches[1] != 'ENDPHP')
-		{
-			return '';
-		}
-
-		if (isset($matches[3]))
-		{
-			return $this->compile_var_tags($matches[0]);
-		}
-
-		switch ($matches[1])
-		{
-			case 'BEGIN':
-				$this->block_else_level[] = false;
-				return '<?php ' . $this->compile_tag_block($matches[2]) . ' ?>';
-			break;
-
-			case 'BEGINELSE':
-				$this->block_else_level[sizeof($this->block_else_level) - 1] = true;
-				return '<?php }} else { ?>';
-			break;
-
-			case 'END':
-				array_pop($this->block_names);
-				return '<?php ' . ((array_pop($this->block_else_level)) ? '}' : '}}') . ' ?>';
-			break;
-
-			case 'IF':
-				return '<?php ' . $this->compile_tag_if($matches[2], false) . ' ?>';
-			break;
-
-			case 'ELSE':
-				return '<?php } else { ?>';
-			break;
-
-			case 'ELSEIF':
-				return '<?php ' . $this->compile_tag_if($matches[2], true) . ' ?>';
-			break;
-
-			case 'ENDIF':
-				return '<?php } ?>';
-			break;
-
-			case 'DEFINE':
-				return '<?php ' . $this->compile_tag_define($matches[2], true) . ' ?>';
-			break;
-
-			case 'UNDEFINE':
-				return '<?php ' . $this->compile_tag_define($matches[2], false) . ' ?>';
-			break;
-
-			case 'ENDDEFINE':
-				return '<?php ' . $this->compile_tag_enddefine() . ' ?>';
-			break;
-
-			case 'INCLUDE':
-				return '<?php ' . $this->compile_tag_include($matches[2]) . ' ?>';
-			break;
-
-			case 'INCLUDEPHP':
-				return ($this->allow_php) ? '<?php ' . $this->compile_tag_include_php($matches[2]) . ' ?>' : '';
-			break;
-
-			case 'INCLUDEJS':
-				return '<?php ' . $this->compile_tag_include_js($matches[2]) . ' ?>';
-			break;
-
-			case 'PHP':
-				if ($this->allow_php)
-				{
-					$this->in_php = true;
-					return '<?php ';
-				}
-				return '<!-- PHP -->';
-			break;
-
-			case 'ENDPHP':
-				if ($this->allow_php)
-				{
-					$this->in_php = false;
-					return ' ?>';
-				}
-				return '<!-- ENDPHP -->';
-			break;
-
-			case 'EVENT':
-				return '<?php ' . $this->compile_tag_event($matches[2]) . '?>';
-			break;
-
-			default:
-				return $matches[0];
-			break;
-
-		}
-		return '';
-	}
-
-	/**
-	* Convert template variables into PHP varrefs
-	*
-	* @param string $text_blocks Variable reference in source template
-	* @param bool $is_expr Returns whether the source was an expression type variable (i.e. S_FIRST_ROW)
-	* @return string PHP variable name
-	*/
-	private function get_varref($text_blocks, &$is_expr)
-	{
-		// change template varrefs into PHP varrefs
-		$varrefs = array();
-
-		// This one will handle varrefs WITH namespaces
-		preg_match_all('#\{((?:' . self::REGEX_NS . '\.)+)(\$)?(' . self::REGEX_VAR . ')\}#', $text_blocks, $varrefs, PREG_SET_ORDER);
-
-		foreach ($varrefs as $var_val)
-		{
-			$namespace = $var_val[1];
-			$varname = $var_val[3];
-			$new = $this->generate_block_varref($namespace, $varname, $is_expr, $var_val[2]);
-
-			$text_blocks = str_replace($var_val[0], $new, $text_blocks);
-		}
-
-		// Language variables cannot be reduced to a single varref, so they must be skipped
-		// These two replacements would break language variables, so we can only run them on non-language types
-		if (strpos($text_blocks, '{L_') === false && strpos($text_blocks, '{LA_') === false)
-		{
-			// This will handle the remaining root-level varrefs
-			$text_blocks = preg_replace('#\{(' . self::REGEX_VAR . ')\}#', "\$_rootref['\\1']", $text_blocks);
-			$text_blocks = preg_replace('#\{\$(' . self::REGEX_VAR . ')\}#', "\$_tpldata['DEFINE']['.']['\\1']", $text_blocks);
-		}
-
-		return $text_blocks;
-	}
-
-	/**
-	* Parse paths of the form {FOO}/a/{BAR}/b
-	*
-	* Note: this method assumes at least one variable in the path, this should
-	* be checked before this method is called.
-	*
-	* @param string $path The path to parse
-	* @param string $include_type The type of template function to call
-	* @return string An appropriately formatted string to include in the
-	* 	template or an empty string if an expression like S_FIRST_ROW was
-	* 	incorrectly used
-	*/
-	private function parse_dynamic_path($path, $include_type)
-	{
-		$matches = array();
-		$replace = array();
-		$is_expr = true;
-
-		preg_match_all('#\{((?:' . self::REGEX_NS . '\.)*)(\$)?(' . self::REGEX_VAR . ')\}#', $path, $matches);
-		foreach ($matches[0] as $var_str)
-		{
-			$tmp_is_expr = false;
-			$var = $this->get_varref($var_str, $tmp_is_expr);
-			$is_expr = $is_expr && $tmp_is_expr;
-			$replace[] = "' . $var . '";
-		}
-
-		if (!$is_expr)
-		{
-			return " \$_template->$include_type('" . str_replace($matches[0], $replace, $path) . "', true);";
-		}
-		else
-		{
-			return '';
-		}
-	}
-
-	/**
-	* Compile variables
-	*
-	* @param string $text_blocks Variable reference in source template
-	* @return string compiled template code
-	*/
-	private function compile_var_tags(&$text_blocks)
-	{
-		$is_expr = null;
-		$text_blocks = $this->get_varref($text_blocks, $is_expr);
-		$lang_replaced = $this->compile_language_tags($text_blocks);
-
-		if(!$lang_replaced)
-		{
-			$text_blocks = '<?php echo ' . ($is_expr ? "$text_blocks" : "(isset($text_blocks)) ? $text_blocks : ''") . '; /**/?>';
-		}
-
-		return $text_blocks;
-	}
-
-	/**
-	* Handles special language tags L_ and LA_
-	*
-	* @param string $text_blocks Variable reference in source template
-	* @return bool Whether a replacement occurred or not
-	*/
-	private function compile_language_tags(&$text_blocks)
-	{
-		$replacements = 0;
-
-		// transform vars prefixed by L_ into their language variable pendant if nothing is set within the tpldata array
-		if (strpos($text_blocks, '{L_') !== false)
-		{
-			$text_blocks = preg_replace('#\{L_(' . self::REGEX_VAR_SUFFIX . ')\}#', "<?php echo ((isset(\$_rootref['L_\\1'])) ? \$_rootref['L_\\1'] : ((isset(\$_lang['\\1'])) ? \$_lang['\\1'] : '{ \\1 }')); /**/?>", $text_blocks, -1, $replacements);
-			return (bool) $replacements;
-		}
-
-		// Handle addslashed language variables prefixed with LA_
-		// If a template variable already exist, it will be used in favor of it...
-		if (strpos($text_blocks, '{LA_') !== false)
-		{
-			$text_blocks = preg_replace('#\{LA_(' . self::REGEX_VAR_SUFFIX . '+)\}#', "<?php echo ((isset(\$_rootref['LA_\\1'])) ? \$_rootref['LA_\\1'] : ((isset(\$_rootref['L_\\1'])) ? addslashes(\$_rootref['L_\\1']) : ((isset(\$_lang['\\1'])) ? addslashes(\$_lang['\\1']) : '{ \\1 }'))); /**/?>", $text_blocks, -1, $replacements);
-			return (bool) $replacements;
-		}
-
-		return false;
-	}
-
-	/**
-	* Compile blocks
-	*
-	* @param string $tag_args Block contents in source template
-	* @return string compiled template code
-	*/
-	private function compile_tag_block($tag_args)
-	{
-		$no_nesting = false;
-
-		// Is the designer wanting to call another loop in a loop?
-		// <!-- BEGIN loop -->
-		// <!-- BEGIN !loop2 -->
-		// <!-- END !loop2 -->
-		// <!-- END loop -->
-		// 'loop2' is actually on the same nesting level as 'loop' you assign
-		// variables to it with template->assign_block_vars('loop2', array(...))
-		if (strpos($tag_args, '!') === 0)
-		{
-			// Count the number if ! occurrences (not allowed in vars)
-			$no_nesting = substr_count($tag_args, '!');
-			$tag_args = substr($tag_args, $no_nesting);
-		}
-
-		// Allow for control of looping (indexes start from zero):
-		// foo(2)    : Will start the loop on the 3rd entry
-		// foo(-2)   : Will start the loop two entries from the end
-		// foo(3,4)  : Will start the loop on the fourth entry and end it on the fifth
-		// foo(3,-4) : Will start the loop on the fourth entry and end it four from last
-		$match = array();
-
-		if (preg_match('#^([^()]*)\(([\-\d]+)(?:,([\-\d]+))?\)$#', $tag_args, $match))
-		{
-			$tag_args = $match[1];
-
-			if ($match[2] < 0)
-			{
-				$loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')';
-			}
-			else
-			{
-				$loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')';
-			}
-
-			if (!isset($match[3]) || strlen($match[3]) < 1 || $match[3] == -1)
-			{
-				$loop_end = '$_' . $tag_args . '_count';
-			}
-			else if ($match[3] >= 0)
-			{
-				$loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')';
-			}
-			else //if ($match[3] < -1)
-			{
-				$loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1);
-			}
-		}
-		else
-		{
-			$loop_start = 0;
-			$loop_end = '$_' . $tag_args . '_count';
-		}
-
-		$tag_template_php = '';
-		array_push($this->block_names, $tag_args);
-
-		if ($no_nesting !== false)
-		{
-			// We need to implode $no_nesting times from the end...
-			$block = array_slice($this->block_names, -$no_nesting);
-		}
-		else
-		{
-			$block = $this->block_names;
-		}
-
-		if (sizeof($block) < 2)
-		{
-			// Block is not nested.
-			$tag_template_php = '$_' . $tag_args . "_count = (isset(\$_tpldata['$tag_args'])) ? sizeof(\$_tpldata['$tag_args']) : 0;";
-			$varref = "\$_tpldata['$tag_args']";
-		}
-		else
-		{
-			// This block is nested.
-			// Generate a namespace string for this block.
-			$namespace = implode('.', $block);
-
-			// Get a reference to the data array for this block that depends on the
-			// current indices of all parent blocks.
-			$varref = $this->generate_block_data_ref($namespace, false);
-
-			// Create the for loop code to iterate over this block.
-			$tag_template_php = '$_' . $tag_args . '_count = (isset(' . $varref . ')) ? sizeof(' . $varref . ') : 0;';
-		}
-
-		$tag_template_php .= 'if ($_' . $tag_args . '_count) {';
-
-		/**
-		* The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
-		* <code>
-		*	if (!$offset)
-		*	{
-		*		$tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
-		*	}
-		* </code>
-		*/
-
-		$tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
-		$tag_template_php .= '$_' . $tag_args . '_val = &' . $varref . '[$_' . $tag_args . '_i];';
-
-		return $tag_template_php;
-	}
-
-	/**
-	* Compile a general expression - much of this is from Smarty with
-	* some adaptions for our block level methods
-	*
-	* @param string $tag_args Expression (tag arguments) in source template
-	* @return string compiled template code
-	*/
-	private function compile_expression($tag_args)
-	{
-		$match = array();
-		preg_match_all('/(?:
-			"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"         |
-			\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'     |
-			[(),]                                  |
-			[^\s(),]+)/x', $tag_args, $match);
-
-		$tokens = $match[0];
-		$is_arg_stack = array();
-
-		for ($i = 0, $size = sizeof($tokens); $i < $size; $i++)
-		{
-			$token = &$tokens[$i];
-
-			switch ($token)
-			{
-				case '!==':
-				case '===':
-				case '<<':
-				case '>>':
-				case '|':
-				case '^':
-				case '&':
-				case '~':
-				case ')':
-				case ',':
-				case '+':
-				case '-':
-				case '*':
-				case '/':
-				case '@':
-				break;
-
-				case '==':
-				case 'eq':
-					$token = '==';
-				break;
-
-				case '!=':
-				case '<>':
-				case 'ne':
-				case 'neq':
-					$token = '!=';
-				break;
-
-				case '<':
-				case 'lt':
-					$token = '<';
-				break;
-
-				case '<=':
-				case 'le':
-				case 'lte':
-					$token = '<=';
-				break;
-
-				case '>':
-				case 'gt':
-					$token = '>';
-				break;
-
-				case '>=':
-				case 'ge':
-				case 'gte':
-					$token = '>=';
-				break;
-
-				case '&&':
-				case 'and':
-					$token = '&&';
-				break;
-
-				case '||':
-				case 'or':
-					$token = '||';
-				break;
-
-				case '!':
-				case 'not':
-					$token = '!';
-				break;
-
-				case '%':
-				case 'mod':
-					$token = '%';
-				break;
-
-				case '(':
-					array_push($is_arg_stack, $i);
-				break;
-
-				case 'is':
-					$is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1;
-					$is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
-
-					$new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
-
-					array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens);
-
-					$i = $is_arg_start;
-
-				// no break
-
-				default:
-					$varrefs = array();
-					if (preg_match('#^((?:' . self::REGEX_NS . '\.)+)?(\$)?(?=[A-Z])([A-Z0-9\-_]+)#s', $token, $varrefs))
-					{
-						if (!empty($varrefs[1]))
-						{
-							$namespace = substr($varrefs[1], 0, -1);
-							$dot_pos = strrchr($namespace, '.');
-							if ($dot_pos !== false)
-							{
-								$namespace = substr($dot_pos, 1);
-							}
-
-							// S_ROW_COUNT is deceptive, it returns the current row number not the number of rows
-							// hence S_ROW_COUNT is deprecated in favour of S_ROW_NUM
-							switch ($varrefs[3])
-							{
-								case 'S_ROW_NUM':
-								case 'S_ROW_COUNT':
-									$token = "\$_${namespace}_i";
-								break;
-
-								case 'S_NUM_ROWS':
-									$token = "\$_${namespace}_count";
-								break;
-
-								case 'S_FIRST_ROW':
-									$token = "(\$_${namespace}_i == 0)";
-								break;
-
-								case 'S_LAST_ROW':
-									$token = "(\$_${namespace}_i == \$_${namespace}_count - 1)";
-								break;
-
-								case 'S_BLOCK_NAME':
-									$token = "'$namespace'";
-								break;
-
-								default:
-									$token = $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']';
-									$token = '(isset(' . $token . ') ? ' . $token . ' : null)';
-								break;
-							}
-						}
-						else
-						{
-							$token = ($varrefs[2]) ? '$_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$_rootref[\'' . $varrefs[3] . '\']';
-							$token = '(isset(' . $token . ') ? ' . $token . ' : null)';
-						}
-
-					}
-					else if (preg_match('#^\.((?:' . self::REGEX_NS . '\.?)+)$#s', $token, $varrefs))
-					{
-						// Allow checking if loops are set with .loopname
-						// It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example
-						$blocks = explode('.', $varrefs[1]);
-
-						// If the block is nested, we have a reference that we can grab.
-						// If the block is not nested, we just go and grab the block from _tpldata
-						if (sizeof($blocks) > 1)
-						{
-							$block = array_pop($blocks);
-							$namespace = implode('.', $blocks);
-							$varref = $this->generate_block_data_ref($namespace, true);
-
-							// Add the block reference for the last child.
-							$varref .= "['" . $block . "']";
-						}
-						else
-						{
-							$varref = '$_tpldata';
-
-							// Add the block reference for the last child.
-							$varref .= "['" . $blocks[0] . "']";
-						}
-						$token = "(isset($varref) ? sizeof($varref) : 0)";
-					}
-
-				break;
-			}
-		}
-
-		return $tokens;
-	}
-
-	/**
-	* Compile IF tags
-	*
-	* @param string $tag_args Expression given with IF in source template
-	* @param bool $elseif True if compiling an IF tag, false if compiling an ELSEIF tag
-	* @return string compiled template code
-	*/
-	private function compile_tag_if($tag_args, $elseif)
-	{
-		$tokens = $this->compile_expression($tag_args);
-
-		$tpl = ($elseif) ? '} else if (' : 'if (';
-
-		$tpl .= implode(' ', $tokens);
-		$tpl .= ') { ';
-
-		return $tpl;
-	}
-
-	/**
-	* Compile DEFINE tags
-	*
-	* @param string $tag_args Expression given with DEFINE in source template
-	* @param bool $op True if compiling a DEFINE tag, false if compiling an UNDEFINE tag
-	* @return string compiled template code
-	*/
-	private function compile_tag_define($tag_args, $op)
-	{
-		$match = array();
-		preg_match('#^((?:' . self::REGEX_NS . '\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (.*?))?$#', $tag_args, $match);
-
-		if (!empty($match[2]) && !isset($match[3]) && $op)
-		{
-			// DEFINE tag with ENDDEFINE
-			$array = "\$_tpldata['DEFINE']['.vars']";
-			$code = 'ob_start(); ';
-			$code .= "if (!isset($array)) { $array = array(); } ";
-			$code .= "{$array}[] = '{$match[2]}'";
-			return $code;
-		}
-
-		if (empty($match[2]) || (!isset($match[3]) && $op))
-		{
-			return '';
-		}
-
-		if (!$op)
-		{
-			return 'unset(' . (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ');';
-		}
-
-		/*
-		* Define tags that contain template variables (enclosed in curly brackets)
-		* need to be treated differently.
-		*/
-		if (substr($match[3], 1, 1) == '{' && substr($match[3], -2, 1) == '}')
-		{
-			$parsed_statement = implode(' ', $this->compile_expression(substr($match[3], 2, -2)));
-		}
-		else
-		{
-			$parsed_statement = implode(' ', $this->compile_expression($match[3]));
-		}
-
-		return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $parsed_statement . ';';
-	}
-
-	/**
-	* Compile ENDDEFINE tag
-	*
-	* @return string compiled template code
-	*/
-	private function compile_tag_enddefine()
-	{
-		$array = "\$_tpldata['DEFINE']['.vars']";
-		$code = "if (!isset($array) || !sizeof($array)) { trigger_error('ENDDEFINE tag without DEFINE in ' . basename(__FILE__), E_USER_ERROR); }";
-		$code .= "\$define_var = array_pop($array); ";
-		$code .= "\$_tpldata['DEFINE']['.'][\$define_var] = ob_get_clean();";
-		return $code;
-	}
-
-	/**
-	* Compile INCLUDE tag
-	*
-	* @param string $tag_args Expression given with INCLUDE in source template
-	* @return string compiled template code
-	*/
-	private function compile_tag_include($tag_args)
-	{
-		// Process dynamic includes
-		if (strpos($tag_args, '{') !== false)
-		{
-			return $this->parse_dynamic_path($tag_args, '_tpl_include');
-		}
-
-		return "\$_template->_tpl_include('$tag_args');";
-	}
-
-	/**
-	* Compile INCLUDE_PHP tag
-	*
-	* @param string $tag_args Expression given with INCLUDEPHP in source template
-	* @return string compiled template code
-	*/
-	private function compile_tag_include_php($tag_args)
-	{
-		if (strpos($tag_args, '{') !== false)
-		{
-			return $this->parse_dynamic_path($tag_args, '_php_include');
-		}
-
-		return "\$_template->_php_include('$tag_args');";
-	}
-
-	/**
-	* Compile EVENT tag.
-	*
-	* $tag_args should be a single string identifying the event.
-	* The event name can contain letters, numbers and underscores only.
-	* If an invalid event name is specified, an E_USER_ERROR will be
-	* triggered.
-	*
-	* Event tags are only functional when the template engine has
-	* an instance of the extension manager. Extension manager would
-	* be called upon to find all extensions listening for the specified
-	* event, and to obtain additional template fragments. All such
-	* template fragments will be compiled and included in the generated
-	* compiled template code for the current template being compiled.
-	*
-	* The above means that whenever an extension is enabled or disabled,
-	* template cache should be cleared in order to update the compiled
-	* template code for the active set of template event listeners.
-	*
-	* This also means that extensions cannot return different template
-	* fragments at different times. Once templates are compiled, changing
-	* such template fragments would have no effect.
-	*
-	* @param string $tag_args EVENT tag arguments, as a string - for EVENT this is the event name
-	* @return string compiled template code
-	*/
-	private function compile_tag_event($tag_args)
-	{
-		if (!preg_match('/^\w+$/', $tag_args))
-		{
-			// The event location is improperly formatted,
-			if ($this->user)
-			{
-				trigger_error($this->user->lang('ERR_TEMPLATE_EVENT_LOCATION', $tag_args), E_USER_ERROR);
-			}
-			else
-			{
-				trigger_error(sprintf('The specified template event location <em>[%s]</em> is improperly formatted.', $tag_args), E_USER_ERROR);
-			}
-		}
-		$location = $tag_args;
-
-		if ($this->extension_manager)
-		{
-			$finder = $this->extension_manager->get_finder();
-
-			$files = $finder
-				->extension_prefix($location)
-				->extension_suffix('.html')
-				->extension_directory("/styles/all/template")
-				->get_files();
-
-			foreach ($this->style_names as $style_name)
-			{
-				$more_files = $finder
-					->extension_prefix($location)
-					->extension_suffix('.html')
-					->extension_directory("/styles/" . $style_name . "/template")
-					->get_files();
-				if (!empty($more_files))
-				{
-					$files = array_merge($files, $more_files);
-					break;
-				}
-			}
-
-			$all_compiled = '';
-			foreach ($files as $file)
-			{
-				$this->template_compile->set_filter_params(array(
-					'cleanup'	=> false,
-				));
-
-				$compiled = $this->template_compile->compile_file($file);
-
-				$this->template_compile->reset_filter_params();
-
-				if ($compiled === false)
-				{
-					if ($this->user)
-					{
-						trigger_error($this->user->lang('ERR_TEMPLATE_COMPILATION', phpbb_filter_root_path($file)), E_USER_ERROR);
-					}
-					else
-					{
-						trigger_error(sprintf('The file could not be compiled: %s', phpbb_filter_root_path($file)), E_USER_ERROR);
-					}
-				}
-
-				$all_compiled .= $compiled;
-			}
-			// Need spaces inside php tags as php cannot grok
-			// < ?php? > sans the spaces
-			return ' ?' . '>' . $all_compiled . '<?php ';
-		}
-	}
-
-	/**
-	* parse expression
-	* This is from Smarty
-	*/
-	private function _parse_is_expr($is_arg, $tokens)
-	{
-		$expr_end = 0;
-		$negate_expr = false;
-
-		if (($first_token = array_shift($tokens)) == 'not')
-		{
-			$negate_expr = true;
-			$expr_type = array_shift($tokens);
-		}
-		else
-		{
-			$expr_type = $first_token;
-		}
-
-		switch ($expr_type)
-		{
-			case 'even':
-				if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by')
-				{
-					$expr_end++;
-					$expr_arg = $tokens[$expr_end++];
-					$expr = "!(($is_arg / $expr_arg) & 1)";
-				}
-				else
-				{
-					$expr = "!($is_arg & 1)";
-				}
-			break;
-
-			case 'odd':
-				if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by')
-				{
-					$expr_end++;
-					$expr_arg = $tokens[$expr_end++];
-					$expr = "(($is_arg / $expr_arg) & 1)";
-				}
-				else
-				{
-					$expr = "($is_arg & 1)";
-				}
-			break;
-
-			case 'div':
-				if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by')
-				{
-					$expr_end++;
-					$expr_arg = $tokens[$expr_end++];
-					$expr = "!($is_arg % $expr_arg)";
-				}
-			break;
-		}
-
-		if ($negate_expr)
-		{
-			if ($expr[0] == '!')
-			{
-				// Negated expression, de-negate it.
-				$expr = substr($expr, 1);
-			}
-			else
-			{
-				$expr = "!($expr)";
-			}
-		}
-
-		array_splice($tokens, 0, $expr_end, $expr);
-
-		return $tokens;
-	}
-
-	/**
-	* Compile INCLUDEJS tag
-	*
-	* @param string $tag_args Expression given with INCLUDEJS in source template
-	* @return string compiled template code
-	*/
-	private function compile_tag_include_js($tag_args)
-	{
-		// Process dynamic includes
-		if (strpos($tag_args, '{') !== false)
-		{
-			return $this->parse_dynamic_path($tag_args, '_js_include');
-		}
-
-		// Locate file
-		$filename = $this->locator->get_first_file_location(array($tag_args), false, true);
-
-		if ($filename === false)
-		{
-			// File does not exist, find it during run time
-			return ' $_template->_js_include(\'' . addslashes($tag_args) . '\', true); ';
-		}
-
-		if (substr($filename, 0, strlen($this->phpbb_root_path)) != $this->phpbb_root_path)
-		{
-			// Absolute path, include as is
-			return ' $_template->_js_include(\'' . addslashes($filename) . '\', false, false); ';
-		}
-
-		// Relative path, remove root path from it
-		$filename = substr($filename, strlen($this->phpbb_root_path));
-		return ' $_template->_js_include(\'' . addslashes($filename) . '\', false, true); ';
-	}
-
-	/**
-	* Generates a reference to the given variable inside the given (possibly nested)
-	* block namespace. This is a string of the form:
-	* ' . $_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['varname'] . '
-	* It's ready to be inserted into an "echo" line in one of the templates.
-	*
-	* @param string $namespace Namespace to access (expects a trailing "." on the namespace)
-	* @param string $varname Variable name to use
-	* @param bool $expr Returns whether the source was an expression type
-	* @param bool $defop If true this is a variable created with the DEFINE construct, otherwise template variable
-	* @return string Code to access variable or echo it if $echo is true
-	*/
-	private function generate_block_varref($namespace, $varname, &$expr, $defop = false)
-	{
-		// Strip the trailing period.
-		$namespace = substr($namespace, 0, -1);
-
-		if (($pos = strrpos($namespace, '.')) !== false)
-		{
-			$local_namespace = substr($namespace, $pos + 1);
-		}
-		else
-		{
-			$local_namespace = $namespace;
-		}
-
-		$expr = true;
-
-		// S_ROW_COUNT is deceptive, it returns the current row number now the number of rows
-		// hence S_ROW_COUNT is deprecated in favour of S_ROW_NUM
-		switch ($varname)
-		{
-			case 'S_ROW_NUM':
-			case 'S_ROW_COUNT':
-				$varref = "\$_${local_namespace}_i";
-			break;
-
-			case 'S_NUM_ROWS':
-				$varref = "\$_${local_namespace}_count";
-			break;
-
-			case 'S_FIRST_ROW':
-				$varref = "(\$_${local_namespace}_i == 0)";
-			break;
-
-			case 'S_LAST_ROW':
-				$varref = "(\$_${local_namespace}_i == \$_${local_namespace}_count - 1)";
-			break;
-
-			case 'S_BLOCK_NAME':
-				$varref = "'$local_namespace'";
-			break;
-
-			default:
-				// Get a reference to the data block for this namespace.
-				$varref = $this->generate_block_data_ref($namespace, true, $defop);
-				// Prepend the necessary code to stick this in an echo line.
-
-				// Append the variable reference.
-				$varref .= "['$varname']";
-
-				$expr = false;
-			break;
-		}
-		// @todo Test the !$expr more
-
-		return $varref;
-	}
-
-	/**
-	* Generates a reference to the array of data values for the given
-	* (possibly nested) block namespace. This is a string of the form:
-	* $_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
-	*
-	* @param string $blockname Block to access (does not expect a trailing "." on the blockname)
-	* @param bool $include_last_iterator If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
-	* @param bool $defop If true this is a variable created with the DEFINE construct, otherwise template variable
-	* @return string Code to access variable
-	*/
-	private function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
-	{
-		// Get an array of the blocks involved.
-		$blocks = explode('.', $blockname);
-		$blockcount = sizeof($blocks) - 1;
-
-		// DEFINE is not an element of any referenced variable, we must use _tpldata to access it
-		if ($defop)
-		{
-			$varref = '$_tpldata[\'DEFINE\']';
-			// Build up the string with everything but the last child.
-			for ($i = 0; $i < $blockcount; $i++)
-			{
-				$varref .= "['" . $blocks[$i] . "'][\$_" . $blocks[$i] . '_i]';
-			}
-			// Add the block reference for the last child.
-			$varref .= "['" . $blocks[$blockcount] . "']";
-			// Add the iterator for the last child if requried.
-			if ($include_last_iterator)
-			{
-				$varref .= '[$_' . $blocks[$blockcount] . '_i]';
-			}
-			return $varref;
-		}
-		else if ($include_last_iterator)
-		{
-			return '$_'. $blocks[$blockcount] . '_val';
-		}
-		else
-		{
-			return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
-		}
-	}
-}
diff --git a/phpBB/includes/template/phpbb.php b/phpBB/includes/template/phpbb.php
deleted file mode 100644
index 8f4d163f8c..0000000000
--- a/phpBB/includes/template/phpbb.php
+++ /dev/null
@@ -1,515 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group, sections (c) 2001 ispi of Lincoln Inc
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @todo
-* IMG_ for image substitution?
-* {IMG_[key]:[alt]:[type]}
-* {IMG_ICON_CONTACT:CONTACT:full} -> $user->img('icon_contact', 'CONTACT', 'full');
-*
-* More in-depth...
-* yadayada
-*/
-
-/**
-* Base Template class.
-* @package phpBB3
-*/
-class phpbb_template_phpbb implements phpbb_template
-{
-	/**
-	* Template context.
-	* Stores template data used during template rendering.
-	* @var phpbb_template_context
-	*/
-	private $context;
-
-	/**
-	* Path of the cache directory for the template
-	* @var string
-	*/
-	public $cachepath = '';
-
-	/**
-	* phpBB root path
-	* @var string
-	*/
-	private $phpbb_root_path;
-
-	/**
-	* PHP file extension
-	* @var string
-	*/
-	private $php_ext;
-
-	/**
-	* phpBB config instance
-	* @var phpbb_config
-	*/
-	private $config;
-
-	/**
-	* Current user
-	* @var phpbb_user
-	*/
-	private $user;
-
-	/**
-	* Template locator
-	* @var phpbb_template_locator
-	*/
-	private $locator;
-
-	/**
-	* Extension manager.
-	*
-	* @var phpbb_extension_manager
-	*/
-	private $extension_manager;
-
-	/**
-	* Name of the style that the template being compiled and/or rendered
-	* belongs to, and its parents, in inheritance tree order.
-	*
-	* Used to invoke style-specific template events.
-	*
-	* @var array
-	*/
-	private $style_names;
-
-	/**
-	* Constructor.
-	*
-	* @param string $phpbb_root_path phpBB root path
-	* @param user $user current user
-	* @param phpbb_template_locator $locator template locator
-	* @param phpbb_template_context $context template context
-	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
-	*/
-	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_locator $locator, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->config = $config;
-		$this->user = $user;
-		$this->locator = $locator;
-		$this->context = $context;
-		$this->extension_manager = $extension_manager;
-	}
-
-	/**
-	* Sets the template filenames for handles.
-	*
-	* @param array $filename_array Should be a hash of handle => filename pairs.
-	*/
-	public function set_filenames(array $filename_array)
-	{
-		$this->locator->set_filenames($filename_array);
-
-		return true;
-	}
-
-	/**
-	* Sets the style names corresponding to style hierarchy being compiled
-	* and/or rendered.
-	*
-	* @param array $style_names List of style names in inheritance tree order
-	* @return null
-	*/
-	public function set_style_names(array $style_names)
-	{
-		$this->style_names = $style_names;
-	}
-
-	/**
-	* Clears all variables and blocks assigned to this template.
-	*/
-	public function destroy()
-	{
-		$this->context->clear();
-	}
-
-	/**
-	* Reset/empty complete block
-	*
-	* @param string $blockname Name of block to destroy
-	*/
-	public function destroy_block_vars($blockname)
-	{
-		$this->context->destroy_block_vars($blockname);
-	}
-
-	/**
-	* Display a template for provided handle.
-	*
-	* The template will be loaded and compiled, if necessary, first.
-	*
-	* This function calls hooks.
-	*
-	* @param string $handle Handle to display
-	* @return bool True on success, false on failure
-	*/
-	public function display($handle)
-	{
-		$result = $this->call_hook($handle, __FUNCTION__);
-		if ($result !== false)
-		{
-			return $result[0];
-		}
-
-		return $this->load_and_render($handle);
-	}
-
-	/**
-	* Loads a template for $handle, compiling it if necessary, and
-	* renders the template.
-	*
-	* @param string $handle Template handle to render
-	* @return bool True on success, false on failure
-	*/
-	private function load_and_render($handle)
-	{
-		$renderer = $this->_tpl_load($handle);
-
-		if ($renderer)
-		{
-			$renderer->render($this->context, $this->get_lang());
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	* Calls hook if any is defined.
-	*
-	* @param string $handle Template handle being displayed.
-	* @param string $method Method name of the caller.
-	*/
-	private function call_hook($handle, $method)
-	{
-		global $phpbb_hook;
-
-		if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, $method), $handle, $this))
-		{
-			if ($phpbb_hook->hook_return(array(__CLASS__, $method)))
-			{
-				$result = $phpbb_hook->hook_return_result(array(__CLASS__, $method));
-				return array($result);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Obtains language array.
-	* This is either lang property of $user property, or if
-	* it is not set an empty array.
-	* @return array language entries
-	*/
-	public function get_lang()
-	{
-		if (isset($this->user->lang))
-		{
-			$lang = $this->user->lang;
-		}
-		else
-		{
-			$lang = array();
-		}
-		return $lang;
-	}
-
-	/**
-	* Display the handle and assign the output to a template variable
-	* or return the compiled result.
-	*
-	* @param string $handle Handle to operate on
-	* @param string $template_var Template variable to assign compiled handle to
-	* @param bool $return_content If true return compiled handle, otherwise assign to $template_var
-	* @return bool|string false on failure, otherwise if $return_content is true return string of the compiled handle, otherwise return true
-	*/
-	public function assign_display($handle, $template_var = '', $return_content = true)
-	{
-		ob_start();
-		$result = $this->display($handle);
-		$contents = ob_get_clean();
-		if ($result === false)
-		{
-			return false;
-		}
-
-		if ($return_content)
-		{
-			return $contents;
-		}
-
-		$this->assign_var($template_var, $contents);
-
-		return true;
-	}
-
-	/**
-	* Obtains a template renderer for a template identified by specified
-	* handle. The template renderer can display the template later.
-	*
-	* Template source will first be compiled into php code.
-	* If template cache is writable the compiled php code will be stored
-	* on filesystem and template will not be subsequently recompiled.
-	* If template cache is not writable template source will be recompiled
-	* every time it is needed. DEBUG define and load_tplcompile
-	* configuration setting may be used to force templates to be always
-	* recompiled.
-	*
-	* Returns an object implementing phpbb_template_renderer, or null
-	* if template loading or compilation failed. Call render() on the
-	* renderer to display the template. This will result in template
-	* contents sent to the output stream (unless, of course, output
-	* buffering is in effect).
-	*
-	* @param string $handle Handle of the template to load
-	* @return phpbb_template_renderer Template renderer object, or null on failure
-	* @uses phpbb_template_compile is used to compile template source
-	*/
-	private function _tpl_load($handle)
-	{
-		$output_file = $this->_compiled_file_for_handle($handle);
-
-		$recompile = defined('DEBUG') ||
-			!file_exists($output_file) ||
-			@filesize($output_file) === 0;
-
-		if ($recompile || $this->config['load_tplcompile'])
-		{
-			// Set only if a recompile or an mtime check are required.
-			$source_file = $this->locator->get_source_file_for_handle($handle);
-
-			if (!$recompile && @filemtime($output_file) < @filemtime($source_file))
-			{
-				$recompile = true;
-			}
-		}
-
-		// Recompile page if the original template is newer, otherwise load the compiled version
-		if (!$recompile)
-		{
-			return new phpbb_template_renderer_include($output_file, $this);
-		}
-
-		$compile = new phpbb_template_compile($this->config['tpl_allow_php'], $this->style_names, $this->locator, $this->phpbb_root_path, $this->extension_manager, $this->user);
-
-		if ($compile->compile_file_to_file($source_file, $output_file) !== false)
-		{
-			$renderer = new phpbb_template_renderer_include($output_file, $this);
-		}
-		else if (($code = $compile->compile_file($source_file)) !== false)
-		{
-			$renderer = new phpbb_template_renderer_eval($code, $this);
-		}
-		else
-		{
-			$renderer = null;
-		}
-
-		return $renderer;
-	}
-
-	/**
-	* Determines compiled file path for handle $handle.
-	*
-	* @param string $handle Template handle (i.e. "friendly" template name)
-	* @return string Compiled file path
-	*/
-	private function _compiled_file_for_handle($handle)
-	{
-		$source_file = $this->locator->get_filename_for_handle($handle);
-		$compiled_file = $this->cachepath . str_replace('/', '.', $source_file) . '.' . $this->php_ext;
-		return $compiled_file;
-	}
-
-	/**
-	* Assign key variable pairs from an array
-	*
-	* @param array $vararray A hash of variable name => value pairs
-	*/
-	public function assign_vars(array $vararray)
-	{
-		foreach ($vararray as $key => $val)
-		{
-			$this->assign_var($key, $val);
-		}
-	}
-
-	/**
-	* Assign a single scalar value to a single key.
-	*
-	* Value can be a string, an integer or a boolean.
-	*
-	* @param string $varname Variable name
-	* @param string $varval Value to assign to variable
-	*/
-	public function assign_var($varname, $varval)
-	{
-		$this->context->assign_var($varname, $varval);
-	}
-
-	/**
-	* Append text to the string value stored in a key.
-	*
-	* Text is appended using the string concatenation operator (.).
-	*
-	* @param string $varname Variable name
-	* @param string $varval Value to append to variable
-	*/
-	public function append_var($varname, $varval)
-	{
-		$this->context->append_var($varname, $varval);
-	}
-
-	// Docstring is copied from phpbb_template_context method with the same name.
-	/**
-	* Assign key variable pairs from an array to a specified block
-	* @param string $blockname Name of block to assign $vararray to
-	* @param array $vararray A hash of variable name => value pairs
-	*/
-	public function assign_block_vars($blockname, array $vararray)
-	{
-		return $this->context->assign_block_vars($blockname, $vararray);
-	}
-
-	// Docstring is copied from phpbb_template_context method with the same name.
-	/**
-	* Change already assigned key variable pair (one-dimensional - single loop entry)
-	*
-	* An example of how to use this function:
-	* {@example alter_block_array.php}
-	*
-	* @param	string	$blockname	the blockname, for example 'loop'
-	* @param	array	$vararray	the var array to insert/add or merge
-	* @param	mixed	$key		Key to search for
-	*
-	* array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
-	*
-	* int: Position [the position to change or insert at directly given]
-	*
-	* If key is false the position is set to 0
-	* If key is true the position is set to the last entry
-	*
-	* @param	string	$mode		Mode to execute (valid modes are 'insert' and 'change')
-	*
-	*	If insert, the vararray is inserted at the given position (position counting from zero).
-	*	If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
-	*
-	* Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
-	* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
-	*
-	* @return bool false on error, true on success
-	*/
-	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
-	{
-		return $this->context->alter_block_array($blockname, $vararray, $key, $mode);
-	}
-
-	/**
-	* Include a separate template.
-	*
-	* This function is marked public due to the way the template
-	* implementation uses it. It is actually an implementation function
-	* and should not be considered part of template class's public API.
-	*
-	* @param string $filename Template filename to include
-	* @param bool $include True to include the file, false to just load it
-	* @uses template_compile is used to compile uncached templates
-	*/
-	public function _tpl_include($filename, $include = true)
-	{
-		$this->locator->set_filenames(array($filename => $filename));
-
-		if (!$this->load_and_render($filename))
-		{
-			// trigger_error cannot be used here, as the output already started
-			echo 'template->_tpl_include(): Failed including ' . htmlspecialchars($handle) . "\n";
-		}
-	}
-
-	/**
-	* Include a PHP file.
-	*
-	* If a relative path is passed in $filename, it is considered to be
-	* relative to board root ($phpbb_root_path). Absolute paths are
-	* also allowed.
-	*
-	* This function is marked public due to the way the template
-	* implementation uses it. It is actually an implementation function
-	* and should not be considered part of template class's public API.
-	*
-	* @param string $filename Path to PHP file to include
-	*/
-	public function _php_include($filename)
-	{
-		if (phpbb_is_absolute($filename))
-		{
-			$file = $filename;
-		}
-		else
-		{
-			$file = $this->phpbb_root_path . $filename;
-		}
-
-		if (!file_exists($file))
-		{
-			// trigger_error cannot be used here, as the output already started
-			echo 'template->_php_include(): File ' . htmlspecialchars($file) . " does not exist\n";
-			return;
-		}
-		include($file);
-	}
-
-	/**
-	* Include JS file
-	*
-	* @param string $file file name
-	* @param bool $locate True if file needs to be located
-	* @param bool $relative True if path is relative to phpBB root directory. Ignored if $locate == true
-	*/
-	public function _js_include($file, $locate = false, $relative = false)
-	{
-		// Locate file
-		if ($locate)
-		{
-			$located = $this->locator->get_first_file_location(array($file), false, true);
-			if ($located)
-			{
-				$file = $located;
-			}
-		}
-		else if ($relative)
-		{
-			$file = $this->phpbb_root_path . $file;
-		}
-
-		$file .= (strpos($file, '?') === false) ? '?' : '&';
-		$file .= 'assets_version=' . $this->config['assets_version'];
-
-		// Add HTML code
-		$code = '<script src="' . htmlspecialchars($file) . '"></script>';
-		$this->context->append_var('SCRIPTS', $code);
-	}
-}
diff --git a/phpBB/includes/template/renderer_eval.php b/phpBB/includes/template/renderer_eval.php
deleted file mode 100644
index f8e4cb7b10..0000000000
--- a/phpBB/includes/template/renderer_eval.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Template renderer that stores compiled template's php code and
-* displays it via eval.
-*
-* @package phpBB3
-*/
-class phpbb_template_renderer_eval implements phpbb_template_renderer
-{
-	/**
-	* Template code to be eval'ed.
-	*/
-	private $code;
-
-	/**
-	* Constructor. Stores provided code for future evaluation.
-	* Template includes are delegated to template object $template.
-	*
-	* @param string $code php code of the template
-	* @param phpbb_template $template template object
-	*/
-	public function __construct($code, $template)
-	{
-		$this->code = $code;
-		$this->template = $template;
-	}
-
-	/**
-	* Displays the template managed by this renderer by eval'ing php code
-	* of the template.
-	*
-	* @param phpbb_template_context $context Template context to use
-	* @param array $lang Language entries to use
-	*/
-	public function render($context, $lang)
-	{
-		$_template = $this->template;
-		$_tpldata = &$context->get_data_ref();
-		$_rootref = &$context->get_root_ref();
-		$_lang = $lang;
-
-		eval(' ?>' . $this->code . '<?php ');
-	}
-}
diff --git a/phpBB/includes/template/renderer_include.php b/phpBB/includes/template/renderer_include.php
deleted file mode 100644
index f5c9026abf..0000000000
--- a/phpBB/includes/template/renderer_include.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-/**
-* Template renderer that stores path to php file with template code
-* and displays it by including the file.
-*
-* @package phpBB3
-*/
-class phpbb_template_renderer_include implements phpbb_template_renderer
-{
-	/**
-	* Template path to be included.
-	*/
-	private $path;
-
-	/**
-	* Constructor. Stores path to the template for future inclusion.
-	* Template includes are delegated to template object $template.
-	*
-	* @param string $path path to the template
-	*/
-	public function __construct($path, $template)
-	{
-		$this->path = $path;
-		$this->template = $template;
-	}
-
-	/**
-	* Displays the template managed by this renderer by including
-	* the php file containing the template.
-	*
-	* @param phpbb_template_context $context Template context to use
-	* @param array $lang Language entries to use
-	*/
-	public function render($context, $lang)
-	{
-		$_template = $this->template;
-		$_tpldata = &$context->get_data_ref();
-		$_rootref = &$context->get_root_ref();
-		$_lang = $lang;
-
-		include($this->path);
-	}
-}
-- 
cgit v1.2.1


From d7cff78443465a06d6aab519c3285a9b20b6cd50 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 13:39:51 -0500
Subject: [feature/twig] Use adm_relative_path to build admin namespace

PHPBB3-11598
---
 phpBB/includes/template/twig/twig.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 377a0a47a8..b5fb8eb860 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -40,6 +40,12 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	protected $phpbb_root_path;
 
+	/**
+	* adm relative path
+	* @var string
+	*/
+	protected $adm_relative_path;
+
 	/**
 	* PHP file extension
 	* @var string
@@ -92,16 +98,16 @@ class phpbb_template_twig implements phpbb_template
 	/**
 	* Constructor.
 	*
-	* @todo remove unnecessary dependencies
-	*
 	* @param string $phpbb_root_path phpBB root path
 	* @param user $user current user
 	* @param phpbb_template_context $context template context
 	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
+	* @param string $adm_relative_path relative path to adm directory
 	*/
-	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null)
+	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null, $adm_relative_path = null)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
+		$this->adm_relative_path = $adm_relative_path;
 		$this->php_ext = $php_ext;
 		$this->config = $config;
 		$this->user = $user;
@@ -186,10 +192,9 @@ class phpbb_template_twig implements phpbb_template
 		}
 
 		// Add admin namespace
-		// @todo use phpbb_admin path
-		if (is_dir($this->phpbb_root_path . 'adm/style/'))
+		if (is_dir($this->phpbb_root_path . $this->adm_relative_path . 'style/'))
 		{
-			$this->twig->getLoader()->setPaths($this->phpbb_root_path . 'adm/style/', 'admin');
+			$this->twig->getLoader()->setPaths($this->phpbb_root_path . $this->adm_relative_path . 'style/', 'admin');
 		}
 
 		// Add all namespaces for all extensions
-- 
cgit v1.2.1


From 9e3d5420adeb93fd2d51ce6d8e5f5c91ae8f6382 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Tue, 2 Jul 2013 00:10:30 +0530
Subject: [ticket/11585] Make $auth_admin class property

$auth_admin is class property and used via $this reference in all
methods

PHPBB3-11585
---
 phpBB/includes/acp/acp_permission_roles.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php
index 004187af84..e830479389 100644
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -21,6 +21,7 @@ if (!defined('IN_PHPBB'))
 class acp_permission_roles
 {
 	var $u_action;
+	protected $auth_admin;
 
 	function main($id, $mode)
 	{
@@ -30,7 +31,7 @@ class acp_permission_roles
 		include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 		include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
 
-		$auth_admin = new auth_admin();
+		$this->auth_admin = new auth_admin();
 
 		$user->add_lang('acp/permissions');
 		add_permission_language();
@@ -210,7 +211,7 @@ class acp_permission_roles
 					}
 
 					// Now add the auth settings
-					$auth_admin->acl_set_role($role_id, $auth_settings);
+					$this->auth_admin->acl_set_role($role_id, $auth_settings);
 
 					$role_name = (!empty($user->lang[$role_name])) ? $user->lang[$role_name] : $role_name;
 					add_log('admin', 'LOG_' . strtoupper($permission_type) . 'ROLE_' . strtoupper($action), $role_name);
@@ -343,7 +344,7 @@ class acp_permission_roles
 				// Get users/groups/forums using this preset...
 				if ($action == 'edit')
 				{
-					$hold_ary = $auth_admin->get_role_mask($role_id);
+					$hold_ary = $this->auth_admin->get_role_mask($role_id);
 
 					if (sizeof($hold_ary))
 					{
@@ -354,7 +355,7 @@ class acp_permission_roles
 							'L_ROLE_ASSIGNED_TO'	=> sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_name))
 						);
 
-						$auth_admin->display_role_mask($hold_ary);
+						$this->auth_admin->display_role_mask($hold_ary);
 					}
 				}
 
@@ -445,8 +446,8 @@ class acp_permission_roles
 				'S_DISPLAY_ROLE_MASK'	=> true)
 			);
 
-			$hold_ary = $auth_admin->get_role_mask($display_item);
-			$auth_admin->display_role_mask($hold_ary);
+			$hold_ary = $this->auth_admin->get_role_mask($display_item);
+			$this->auth_admin->display_role_mask($hold_ary);
 		}
 	}
 
@@ -462,7 +463,7 @@ class acp_permission_roles
 		$auth_options = array(0 => $auth_options);
 
 		// Making use of auth_admin method here (we do not really want to change two similar code fragments)
-		auth_admin::build_permission_array($auth_options, $content_array, $categories, $key_sort_array);
+		$this->auth_admin->build_permission_array($auth_options, $content_array, $categories, $key_sort_array);
 
 		$content_array = $content_array[0];
 
@@ -500,8 +501,6 @@ class acp_permission_roles
 	{
 		global $db;
 
-		$auth_admin = new auth_admin();
-
 		// Get complete auth array
 		$sql = 'SELECT auth_option, auth_option_id
 			FROM ' . ACL_OPTIONS_TABLE . "
@@ -529,19 +528,19 @@ class acp_permission_roles
 		$db->sql_freeresult($result);
 
 		// Get role assignments
-		$hold_ary = $auth_admin->get_role_mask($role_id);
+		$hold_ary = $this->auth_admin->get_role_mask($role_id);
 
 		// Re-assign permissions
 		foreach ($hold_ary as $forum_id => $forum_ary)
 		{
 			if (isset($forum_ary['users']))
 			{
-				$auth_admin->acl_set('user', $forum_id, $forum_ary['users'], $auth_settings, 0, false);
+				$this->auth_admin->acl_set('user', $forum_id, $forum_ary['users'], $auth_settings, 0, false);
 			}
 
 			if (isset($forum_ary['groups']))
 			{
-				$auth_admin->acl_set('group', $forum_id, $forum_ary['groups'], $auth_settings, 0, false);
+				$this->auth_admin->acl_set('group', $forum_id, $forum_ary['groups'], $auth_settings, 0, false);
 			}
 		}
 
@@ -563,6 +562,6 @@ class acp_permission_roles
 			WHERE role_id = ' . $role_id;
 		$db->sql_query($sql);
 
-		$auth_admin->acl_clear_prefetch();
+		$this->auth_admin->acl_clear_prefetch();
 	}
 }
-- 
cgit v1.2.1


From 1a58d188aab0c22965732621c8d93a00ea7a747e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 14:42:05 -0500
Subject: [feature/twig] Prevent errors from empty user->style

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index b5fb8eb860..3cd37e04e9 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -186,7 +186,7 @@ class phpbb_template_twig implements phpbb_template
 		$this->twig->getLoader()->setPaths($style_paths);
 
 		// Core style namespace from phpbb_style::set_style()
-		if ($this->user && ($style_names === array($this->user->style['style_path']) || $style_names[0] == $this->user->style['style_path']))
+		if (isset($this->user->style['style_path']) && ($style_names === array($this->user->style['style_path']) || $style_names[0] == $this->user->style['style_path']))
 		{
 			$this->twig->getLoader()->setPaths($style_paths, 'core');
 		}
-- 
cgit v1.2.1


From 943728d3eff5b14b8936ccacf00dd729c9ac1d40 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 14:58:20 -0500
Subject: [feature/twig] Fix length replace in lexer

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index d9cc6f60ce..b32a9e4ffa 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -182,7 +182,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			$matches[1] = preg_replace('#\s\$([a-zA-Z_0-9]+)#', ' definition.$1', $matches[1]);
 
 			// Replace .test with test|length
-			$matches[1] = preg_replace('#\s\.([a-zA-Z_0-9]+)#', ' $1|length', $matches[1]);
+			$matches[1] = preg_replace('#\s\.([a-zA-Z_0-9\.]+)#', ' $1|length', $matches[1]);
 
 			return '<!-- IF' . $matches[1] . '-->';
 		};
-- 
cgit v1.2.1


From 46d6899b466ce57e605ee6cf708204a1dd92004f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 20:41:36 -0500
Subject: [feature/twig] Do not assign var by reference

PHPBB3-11598
---
 phpBB/includes/template/twig/twig.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 3cd37e04e9..89f6189f41 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -265,8 +265,7 @@ class phpbb_template_twig implements phpbb_template
 			return $result[0];
 		}
 
-		$context = &$this->get_template_vars();
-		$this->twig->display($this->get_filename_from_handle($handle), $context);
+		$this->twig->display($this->get_filename_from_handle($handle), $this->get_template_vars());
 
 		return true;
 	}
@@ -329,7 +328,7 @@ class phpbb_template_twig implements phpbb_template
 			return $this->twig->render($this->get_filename_from_handle($handle));
 		}
 
-		$this->assign_var($template_var, $this->twig->render($this->get_filename_from_handle($handle)));
+		$this->assign_var($template_var, $this->twig->render($this->get_filename_from_handle($handle, $this->get_template_vars())));
 
 		return true;
 	}
-- 
cgit v1.2.1


From 1c7e077fea245448315068bc724d852d2c9b087e Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 21:11:24 -0500
Subject: [feature/twig] Remove get_lang function (it's not used anywhere)

PHPBB3-11598
---
 phpBB/includes/template/twig/twig.php | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 89f6189f41..496c0b21a8 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -178,7 +178,7 @@ class phpbb_template_twig implements phpbb_template
 	* @param array $style_names List of style names in inheritance tree order
 	* @return phpbb_template $this
 	*/
-	public function set_style_names(array $style_names, $style_paths = array())
+	public function set_style_names(array $style_names, array $style_paths = array())
 	{
 		$this->style_names = $style_names;
 
@@ -292,26 +292,6 @@ class phpbb_template_twig implements phpbb_template
 		return false;
 	}
 
-	/**
-	* Obtains language array.
-	* This is either lang property of $user property, or if
-	* it is not set an empty array.
-	* @return array language entries
-	*/
-	public function get_lang()
-	{
-		if (isset($this->user->lang))
-		{
-			$lang = $this->user->lang;
-		}
-		else
-		{
-			$lang = array();
-		}
-
-		return $lang;
-	}
-
 	/**
 	* Display the handle and assign the output to a template variable
 	* or return the compiled result.
-- 
cgit v1.2.1


From 8f303b376b5677bb0203c6ffae9c8c456cf1e075 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 21:16:36 -0500
Subject: [feature/twig] Don't forget to set the context when rendering!

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 496c0b21a8..6b0771f77b 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -305,7 +305,7 @@ class phpbb_template_twig implements phpbb_template
 	{
 		if ($return_content)
 		{
-			return $this->twig->render($this->get_filename_from_handle($handle));
+			return $this->twig->render($this->get_filename_from_handle($handle), $this->get_template_vars());
 		}
 
 		$this->assign_var($template_var, $this->twig->render($this->get_filename_from_handle($handle, $this->get_template_vars())));
-- 
cgit v1.2.1


From 16ebf14653c98cd842ee94a66d69b871a3ec0d25 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 21:18:09 -0500
Subject: [feature/twig] Clean up the messenger a little bit

This should fix at least one bug, noticed we were using:
$this->vars = &$this->tpl_obj->_rootref;

Which hasn't been valid for a long+ time

PHPBB3-11598
---
 phpBB/includes/functions_messenger.php | 101 ++++++++++++++++++++-------------
 1 file changed, 60 insertions(+), 41 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index b117fda5b4..5f1251c34e 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -27,8 +27,9 @@ class messenger
 	var $mail_priority = MAIL_NORMAL_PRIORITY;
 	var $use_queue = true;
 
-	var $tpl_obj = NULL;
-	var $tpl_msg = array();
+	/** @var phpbb_template */
+	protected $template;
+
 	var $eol = "\n";
 
 	/**
@@ -210,6 +211,8 @@ class messenger
 	{
 		global $config, $phpbb_root_path, $phpEx, $user, $phpbb_extension_manager;
 
+		$this->setup_template();
+
 		if (!trim($template_file))
 		{
 			trigger_error('No template file for emailing set.', E_USER_ERROR);
@@ -219,46 +222,43 @@ class messenger
 		{
 			// fall back to board default language if the user's language is
 			// missing $template_file.  If this does not exist either,
-			// $tpl->set_filenames will do a trigger_error
+			// $this->template->set_filenames will do a trigger_error
 			$template_lang = basename($config['default_lang']);
 		}
 
-		// tpl_msg now holds a template object we can use to parse the template file
-		if (!isset($this->tpl_msg[$template_lang . $template_file]))
+		if ($template_path)
 		{
-			$style_resource_locator = new phpbb_style_resource_locator();
-			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path);
-			$tpl = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager);
-			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl);
-
-			$this->tpl_msg[$template_lang . $template_file] = $tpl;
+			$template_paths = array(
+				$template_path,
+			);
+		}
+		if (!$template_path)
+		{
+			$template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
+			$template_path .= $template_lang . '/email';
 
-			$fallback_template_path = false;
+			$template_paths = array(
+				$template_path,
+			);
 
-			if (!$template_path)
+			// we can only specify default language fallback when the path is not a custom one for which we
+			// do not know the default language alternative
+			if ($template_lang !== basename($config['default_lang']))
 			{
-				$template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
-				$template_path .= $template_lang . '/email';
+				$fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
+				$fallback_template_path .= basename($config['default_lang']) . '/email';
 
-				// we can only specify default language fallback when the path is not a custom one for which we
-				// do not know the default language alternative
-				if ($template_lang !== basename($config['default_lang']))
-				{
-					$fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
-					$fallback_template_path .= basename($config['default_lang']) . '/email';
-				}
+				$template_paths[] = $fallback_template_path;
 			}
+		}
 
-			$style->set_custom_style($template_lang . '_email', array($template_path, $fallback_template_path), array(), '');
+		$this->set_template_paths($template_lang . '_email', $template_paths);
 
-			$tpl->set_filenames(array(
-				'body'		=> $template_file . '.txt',
-			));
-		}
+		$this->template->set_filenames(array(
+			'body'		=> $template_file . '.txt',
+		));
 
-		$this->tpl_obj = &$this->tpl_msg[$template_lang . $template_file];
-		$this->vars = &$this->tpl_obj->_rootref;
-		$this->tpl_msg = '';
+		$this->vars = $this->template->get_template_vars();
 
 		return true;
 	}
@@ -268,22 +268,16 @@ class messenger
 	*/
 	function assign_vars($vars)
 	{
-		if (!is_object($this->tpl_obj))
-		{
-			return;
-		}
+		$this->setup_template();
 
-		$this->tpl_obj->assign_vars($vars);
+		$this->template->assign_vars($vars);
 	}
 
 	function assign_block_vars($blockname, $vars)
 	{
-		if (!is_object($this->tpl_obj))
-		{
-			return;
-		}
+		$this->setup_template();
 
-		$this->tpl_obj->assign_block_vars($blockname, $vars);
+		$this->template->assign_block_vars($blockname, $vars);
 	}
 
 	/**
@@ -316,7 +310,7 @@ class messenger
 		}
 
 		// Parse message through template
-		$this->msg = trim($this->tpl_obj->assign_display('body'));
+		$this->msg = trim($this->template->assign_display('body'));
 
 		// Because we use \n for newlines in the body message we need to fix line encoding errors for those admins who uploaded email template files in the wrong encoding
 		$this->msg = str_replace("\r\n", "\n", $this->msg);
@@ -643,6 +637,31 @@ class messenger
 		unset($addresses);
 		return true;
 	}
+
+	/**
+	* Setup template engine
+	*/
+	protected function setup_template()
+	{
+		global $config, $phpbb_root_path, $phpEx, $user, $phpbb_extension_manager;
+
+		if ($this->template instanceof phpbb_template)
+		{
+			return;
+		}
+
+		$this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager);
+	}
+
+	/**
+	* Set template paths to load
+	*/
+	protected function set_template_paths($path_name, $paths)
+	{
+		$this->setup_template();
+
+		$this->template->set_style_names(array($path_name), $paths);
+	}
 }
 
 /**
-- 
cgit v1.2.1


From e0f5e23032ce080c163439c1089a7b4994276da6 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 21:21:37 -0500
Subject: [feature/twig] Fixed tabs in environment.php

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php | 81 ++++++++++++++--------------
 1 file changed, 41 insertions(+), 40 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index d20da965c3..34e6f09981 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -29,7 +29,7 @@ class phpbb_template_twig_environment extends Twig_Environment
 	/** @var array **/
 	protected $namespaceLookUpOrder = array('__main__');
 
-    public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
+	public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
 	{
 		$this->phpbb_config = $phpbb_config;
 		$this->phpbb_extensions = $phpbb_extensions;
@@ -38,19 +38,20 @@ class phpbb_template_twig_environment extends Twig_Environment
 		return parent::__construct($loader, $options);
 	}
 
-    /**
-     * Gets the cache filename for a given template.
-     *
-     * @param string $name The template name
-     *
-     * @return string The cache file name
-     */
-    public function ignoregetCacheFilename($name)
-    {
-        if (false === $this->cache) {
-            return false;
-        }
-// @todo
+	/**
+	 * Gets the cache filename for a given template.
+	 *
+	 * @param string $name The template name
+	 *
+	 * @return string The cache file name
+	 */
+	public function ignoregetCacheFilename($name)
+	{
+		if (false === $this->cache)
+		{
+			return false;
+		}
+		// @todo
 		$file_path = $this->getLoader()->getCacheKey($name);
 		foreach ($this->getLoader()->getNamespaces() as $namespace)
 		{
@@ -64,9 +65,9 @@ class phpbb_template_twig_environment extends Twig_Environment
 		}
 
 		// We probably should never get here under normal circumstances
-    	return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '.php';
-    	return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '_' . md5($this->getLoader()->getCacheKey($name)) . '.php';
-    }
+		return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '.php';
+		return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '_' . md5($this->getLoader()->getCacheKey($name)) . '.php';
+	}
 
 	/**
 	* Get the list of enabled phpBB extensions
@@ -112,7 +113,7 @@ class phpbb_template_twig_environment extends Twig_Environment
 	* Set the namespace look up order to load templates from
 	*
 	* @param array $namespace
-    * @return Twig_Environment
+	* @return Twig_Environment
 	*/
 	public function setNamespaceLookUpOrder($namespace)
 	{
@@ -121,28 +122,28 @@ class phpbb_template_twig_environment extends Twig_Environment
 		return $this;
 	}
 
-    /**
-     * Loads a template by name.
-     *
-     * @param string  $name  The template name
-     * @param integer $index The index if it is an embedded template
-     *
-     * @return Twig_TemplateInterface A template instance representing the given template name
-     */
-    public function loadTemplate($name, $index = null)
-    {
-    	if (strpos($name, '@') === false)
-    	{
-    		foreach ($this->namespaceLookUpOrder as $namespace)
-    		{
-        		try
-    			{
-    				if ($namespace === '__main__')
-    				{
-    					return parent::loadTemplate($name, $index);
+	/**
+	 * Loads a template by name.
+	 *
+	 * @param string  $name  The template name
+	 * @param integer $index The index if it is an embedded template
+	 *
+	 * @return Twig_TemplateInterface A template instance representing the given template name
+	 */
+	public function loadTemplate($name, $index = null)
+	{
+		if (strpos($name, '@') === false)
+		{
+			foreach ($this->namespaceLookUpOrder as $namespace)
+			{
+				try
+				{
+					if ($namespace === '__main__')
+					{
+						return parent::loadTemplate($name, $index);
 					}
 
-    				return parent::loadTemplate('@' . $namespace . '/' . $name, $index);
+					return parent::loadTemplate('@' . $namespace . '/' . $name, $index);
 				}
 				catch (Twig_Error_Loader $e)
 				{
@@ -154,9 +155,9 @@ class phpbb_template_twig_environment extends Twig_Environment
 		}
 		else
 		{
-    		return parent::loadTemplate($name, $index);
+			return parent::loadTemplate($name, $index);
 		}
-    }
+	}
 
 	/**
 	* recursive helper to set variables into $context so that Twig can properly fetch them for display
-- 
cgit v1.2.1


From 3dc40ad8443671081adc6f975a155f6f30cf3159 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 21:22:50 -0500
Subject: [feature/twig] Use correct case for variable name

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index 34e6f09981..a71958998a 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -27,7 +27,7 @@ class phpbb_template_twig_environment extends Twig_Environment
 	protected $phpbb_root_path;
 
 	/** @var array **/
-	protected $namespaceLookUpOrder = array('__main__');
+	protected $namespace_look_up_order = array('__main__');
 
 	public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
 	{
@@ -106,7 +106,7 @@ class phpbb_template_twig_environment extends Twig_Environment
 	*/
 	public function getNamespaceLookUpOrder()
 	{
-		return $this->namespaceLookUpOrder;
+		return $this->namespace_look_up_order;
 	}
 
 	/**
@@ -117,7 +117,7 @@ class phpbb_template_twig_environment extends Twig_Environment
 	*/
 	public function setNamespaceLookUpOrder($namespace)
 	{
-		$this->namespaceLookUpOrder = $namespace;
+		$this->namespace_look_up_order = $namespace;
 
 		return $this;
 	}
-- 
cgit v1.2.1


From f90252395697aa4f1d0e606e4d92665b2293eb8d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 21:24:27 -0500
Subject: [feature/twig] Comments

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index a71958998a..f1ce6da38b 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -39,12 +39,11 @@ class phpbb_template_twig_environment extends Twig_Environment
 	}
 
 	/**
-	 * Gets the cache filename for a given template.
-	 *
-	 * @param string $name The template name
-	 *
-	 * @return string The cache file name
-	 */
+	* Gets the cache filename for a given template.
+	*
+	* @param string $name The template name
+	* @return string The cache file name
+	*/
 	public function ignoregetCacheFilename($name)
 	{
 		if (false === $this->cache)
@@ -127,7 +126,6 @@ class phpbb_template_twig_environment extends Twig_Environment
 	 *
 	 * @param string  $name  The template name
 	 * @param integer $index The index if it is an embedded template
-	 *
 	 * @return Twig_TemplateInterface A template instance representing the given template name
 	 */
 	public function loadTemplate($name, $index = null)
@@ -160,11 +158,12 @@ class phpbb_template_twig_environment extends Twig_Environment
 	}
 
 	/**
-	* recursive helper to set variables into $context so that Twig can properly fetch them for display
+	* Recursive helper to set variables into $context so that Twig can properly fetch them for display
 	*
 	* @param array $data Data to set at the end of the chain
 	* @param array $blocks Array of blocks to loop into still
 	* @param mixed $current_location Current location in $context (recursive!)
+	* @return null
 	*/
 	public function context_recursive_loop_builder($data, $blocks, &$current_location)
 	{
-- 
cgit v1.2.1


From 3b9cb7faa7390ce244a69841de3618f4273cf3e0 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 21:29:15 -0500
Subject: [feature/twig] Fix call for previous change to var name case

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index f1ce6da38b..73375444da 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -132,7 +132,7 @@ class phpbb_template_twig_environment extends Twig_Environment
 	{
 		if (strpos($name, '@') === false)
 		{
-			foreach ($this->namespaceLookUpOrder as $namespace)
+			foreach ($this->getNamespaceLookUpOrder() as $namespace)
 			{
 				try
 				{
-- 
cgit v1.2.1


From f249a527e5b3b07063e2203928677f40d6ba8646 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 21:32:10 -0500
Subject: [feature/twig] Should have been else

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 5f1251c34e..0222a57bcc 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -232,7 +232,7 @@ class messenger
 				$template_path,
 			);
 		}
-		if (!$template_path)
+		else
 		{
 			$template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
 			$template_path .= $template_lang . '/email';
-- 
cgit v1.2.1


From f48effb00197a9ace8de82f3a961992215113257 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 1 Jul 2013 22:37:55 -0400
Subject: [feature/auth-refactor] Fix the actual cause of test failures

Enables super globals before the new container is instantiated in
the final step of installation to prevent issues caused by trying
to create a phpbb_request object when super globals are disabled.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/request/request.php b/phpBB/includes/request/request.php
index c0bb453c7c..ae3c526d89 100644
--- a/phpBB/includes/request/request.php
+++ b/phpBB/includes/request/request.php
@@ -79,7 +79,7 @@ class phpbb_request implements phpbb_request_interface
 
 		// simulate request_order = GP
 		$this->original_request = $this->input[phpbb_request_interface::REQUEST];
-		$this->input[phpbb_request_interface::REQUEST] = (array)$this->input[phpbb_request_interface::POST] + (array)$this->input[phpbb_request_interface::GET];
+		$this->input[phpbb_request_interface::REQUEST] = $this->input[phpbb_request_interface::POST] + $this->input[phpbb_request_interface::GET];
 
 		if ($disable_super_globals)
 		{
-- 
cgit v1.2.1


From 883b0a9f8c3e102db8965069899dc2b97d1eb1ff Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 1 Jul 2013 21:44:00 -0500
Subject: [feature/twig] Update phpbb_template interface

Return $this wherever possible

PHPBB3-11598
---
 phpBB/includes/template/template.php  | 34 +++++++++++++++++++++------------
 phpBB/includes/template/twig/twig.php | 36 ++++++++++++++++++++++++-----------
 2 files changed, 47 insertions(+), 23 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 15f0b6ee60..e506c2c278 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -17,24 +17,36 @@ if (!defined('IN_PHPBB'))
 
 interface phpbb_template
 {
+
+	/**
+	* Clear the cache
+	*
+	* @return phpbb_template
+	*/
+	public function clear_cache();
+
 	/**
 	* Sets the template filenames for handles.
 	*
 	* @param array $filename_array Should be a hash of handle => filename pairs.
+	* @return phpbb_template $this
 	*/
 	public function set_filenames(array $filename_array);
 
 	/**
-	* Sets the style names corresponding to style hierarchy being compiled
+	* Sets the style names/paths corresponding to style hierarchy being compiled
 	* and/or rendered.
 	*
 	* @param array $style_names List of style names in inheritance tree order
-	* @return null
+	* @param array $style_paths List of style paths in inheritance tree order
+	* @return phpbb_template $this
 	*/
-	public function set_style_names(array $style_names);
+	public function set_style_names(array $style_names, array $style_paths = array());
 
 	/**
 	* Clears all variables and blocks assigned to this template.
+	*
+	* @return phpbb_template $this
 	*/
 	public function destroy();
 
@@ -42,6 +54,7 @@ interface phpbb_template
 	* Reset/empty complete block
 	*
 	* @param string $blockname Name of block to destroy
+	* @return phpbb_template $this
 	*/
 	public function destroy_block_vars($blockname);
 
@@ -53,7 +66,7 @@ interface phpbb_template
 	* This function calls hooks.
 	*
 	* @param string $handle Handle to display
-	* @return bool True on success, false on failure
+	* @return phpbb_template $this
 	*/
 	public function display($handle);
 
@@ -64,7 +77,7 @@ interface phpbb_template
 	* @param string $handle Handle to operate on
 	* @param string $template_var Template variable to assign compiled handle to
 	* @param bool $return_content If true return compiled handle, otherwise assign to $template_var
-	* @return bool|string false on failure, otherwise if $return_content is true return string of the compiled handle, otherwise return true
+	* @return phpbb_template|string if $return_content is true return string of the compiled handle, otherwise return $this
 	*/
 	public function assign_display($handle, $template_var = '', $return_content = true);
 
@@ -72,6 +85,7 @@ interface phpbb_template
 	* Assign key variable pairs from an array
 	*
 	* @param array $vararray A hash of variable name => value pairs
+	* @return phpbb_template $this
 	*/
 	public function assign_vars(array $vararray);
 
@@ -82,6 +96,7 @@ interface phpbb_template
 	*
 	* @param string $varname Variable name
 	* @param string $varval Value to assign to variable
+	* @return phpbb_template $this
 	*/
 	public function assign_var($varname, $varval);
 
@@ -92,6 +107,7 @@ interface phpbb_template
 	*
 	* @param string $varname Variable name
 	* @param string $varval Value to append to variable
+	* @return phpbb_template $this
 	*/
 	public function append_var($varname, $varval);
 
@@ -99,6 +115,7 @@ interface phpbb_template
 	* Assign key variable pairs from an array to a specified block
 	* @param string $blockname Name of block to assign $vararray to
 	* @param array $vararray A hash of variable name => value pairs
+	* @return phpbb_template $this
 	*/
 	public function assign_block_vars($blockname, array $vararray);
 
@@ -130,11 +147,4 @@ interface phpbb_template
 	* @return bool false on error, true on success
 	*/
 	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert');
-
-	/**
-	* Clear the cache
-	*
-	* @return phpbb_template
-	*/
-	public function clear_cache();
 }
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 6b0771f77b..dbc36ecddf 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -172,10 +172,11 @@ class phpbb_template_twig implements phpbb_template
 	}
 
 	/**
-	* Sets the style names corresponding to style hierarchy being compiled
+	* Sets the style names/paths corresponding to style hierarchy being compiled
 	* and/or rendered.
 	*
 	* @param array $style_names List of style names in inheritance tree order
+	* @param array $style_paths List of style paths in inheritance tree order
 	* @return phpbb_template $this
 	*/
 	public function set_style_names(array $style_names, array $style_paths = array())
@@ -241,10 +242,13 @@ class phpbb_template_twig implements phpbb_template
 	* Reset/empty complete block
 	*
 	* @param string $blockname Name of block to destroy
+	* @return phpbb_template $this
 	*/
 	public function destroy_block_vars($blockname)
 	{
-		return $this->context->destroy_block_vars($blockname);
+		$this->context->destroy_block_vars($blockname);
+
+		return $this;
 	}
 
 	/**
@@ -255,7 +259,7 @@ class phpbb_template_twig implements phpbb_template
 	* This function calls hooks.
 	*
 	* @param string $handle Handle to display
-	* @return bool True on success, false on failure
+	* @return phpbb_template $this
 	*/
 	public function display($handle)
 	{
@@ -267,7 +271,7 @@ class phpbb_template_twig implements phpbb_template
 
 		$this->twig->display($this->get_filename_from_handle($handle), $this->get_template_vars());
 
-		return true;
+		return $this;
 	}
 
 	/**
@@ -299,7 +303,7 @@ class phpbb_template_twig implements phpbb_template
 	* @param string $handle Handle to operate on
 	* @param string $template_var Template variable to assign compiled handle to
 	* @param bool $return_content If true return compiled handle, otherwise assign to $template_var
-	* @return bool|string false on failure, otherwise if $return_content is true return string of the compiled handle, otherwise return true
+	* @return phpbb_template|string if $return_content is true return string of the compiled handle, otherwise return $this
 	*/
 	public function assign_display($handle, $template_var = '', $return_content = true)
 	{
@@ -310,13 +314,14 @@ class phpbb_template_twig implements phpbb_template
 
 		$this->assign_var($template_var, $this->twig->render($this->get_filename_from_handle($handle, $this->get_template_vars())));
 
-		return true;
+		return $this;
 	}
 
 	/**
 	* Assign key variable pairs from an array
 	*
 	* @param array $vararray A hash of variable name => value pairs
+	* @return phpbb_template $this
 	*/
 	public function assign_vars(array $vararray)
 	{
@@ -324,6 +329,8 @@ class phpbb_template_twig implements phpbb_template
 		{
 			$this->assign_var($key, $val);
 		}
+
+		return $this;
 	}
 
 	/**
@@ -333,10 +340,13 @@ class phpbb_template_twig implements phpbb_template
 	*
 	* @param string $varname Variable name
 	* @param string $varval Value to assign to variable
+	* @return phpbb_template $this
 	*/
 	public function assign_var($varname, $varval)
 	{
-		return $this->context->assign_var($varname, $varval);
+		$this->context->assign_var($varname, $varval);
+
+		return $this;
 	}
 
 	/**
@@ -346,24 +356,28 @@ class phpbb_template_twig implements phpbb_template
 	*
 	* @param string $varname Variable name
 	* @param string $varval Value to append to variable
+	* @return phpbb_template $this
 	*/
 	public function append_var($varname, $varval)
 	{
-		return $this->context->append_var($varname, $varval);
+		$this->context->append_var($varname, $varval);
+
+		return $this;
 	}
 
-	// Docstring is copied from phpbb_template_context method with the same name.
 	/**
 	* Assign key variable pairs from an array to a specified block
 	* @param string $blockname Name of block to assign $vararray to
 	* @param array $vararray A hash of variable name => value pairs
+	* @return phpbb_template $this
 	*/
 	public function assign_block_vars($blockname, array $vararray)
 	{
-		return $this->context->assign_block_vars($blockname, $vararray);
+		$this->context->assign_block_vars($blockname, $vararray);
+
+		return $this;
 	}
 
-	// Docstring is copied from phpbb_template_context method with the same name.
 	/**
 	* Change already assigned key variable pair (one-dimensional - single loop entry)
 	*
-- 
cgit v1.2.1


From 274308148991a498eab875826d6c7615acdef108 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 2 Jul 2013 00:04:17 -0400
Subject: [feature/auth-refactor] Fix comment grammar

PHPBB3-9734
---
 phpBB/includes/auth/provider_db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
index a79d031048..894041c9cf 100644
--- a/phpBB/includes/auth/provider_db.php
+++ b/phpBB/includes/auth/provider_db.php
@@ -147,7 +147,7 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 		$show_captcha = ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) ||
 			($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']);
 
-		// If there are too much login attempts, we need to check for an confirm image
+		// If there are too many login attempts, we need to check for a confirm image
 		// Every auth module is able to define what to do by itself...
 		if ($show_captcha)
 		{
-- 
cgit v1.2.1


From 156d5c671fb9db28fbbdcacb974093c2c52b0f5b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 10:13:16 -0500
Subject: [feature/twig] INCLUDEJS now uses the definition class

This had to be done because, like DEFINE, setting variables to $context
only affected the local file and any children, not parent templates.

PHPBB3-11598
---
 phpBB/includes/template/twig/definition.php     | 19 +++++++++++++++++++
 phpBB/includes/template/twig/node/includejs.php |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/definition.php b/phpBB/includes/template/twig/definition.php
index 110437eb32..6557b209eb 100644
--- a/phpBB/includes/template/twig/definition.php
+++ b/phpBB/includes/template/twig/definition.php
@@ -47,4 +47,23 @@ class phpbb_template_twig_definition
 
 		return $this;
 	}
+
+	/**
+	* Append to a variable
+	*
+	* @param string $name
+	* @param string $value
+	* @return phpbb_template_twig_definition
+	*/
+	public function append($name, $value)
+	{
+		if (!isset($this->definitions[$name]))
+		{
+			$this->definitions[$name] = '';
+		}
+
+		$this->definitions[$name] .= $value;
+
+		return $this;
+	}
 }
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
index f4c26affa4..bba5d4ef91 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -31,9 +31,9 @@ class phpbb_template_twig_node_includejs extends Twig_Node
 		$config = $this->environment->get_phpbb_config();
 
         $compiler
-        	->write("\$context['SCRIPTS'] .= '<script type=\"text/javascript\" src=\"' . ")
+			->write("\$context['definition']->append('SCRIPTS', '<script type=\"text/javascript\" src=\"' . ")
         	->subcompile($this->getNode('expr'))
-        	->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>';\n\n")
+        	->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>');\n")
         ;
     }
 }
-- 
cgit v1.2.1


From 59d13d0535ab3687725d36f2dbe2ee64de294df8 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 11:02:55 -0500
Subject: [feature/twig] INCLUDEJS behavior now supports local relative paths

This was done because T_TEMPLATE_PATH is not always correct for js files
(e.g. the inheriting style does not include these). Now we use the Twig
Loader to find the correct file to link to (most specific file first, then
parent styles). Also allows using @namespace convention

PHPBB3-11598
---
 phpBB/includes/template/twig/node/includejs.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
index bba5d4ef91..91b24e8068 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -31,9 +31,17 @@ class phpbb_template_twig_node_includejs extends Twig_Node
 		$config = $this->environment->get_phpbb_config();
 
         $compiler
-			->write("\$context['definition']->append('SCRIPTS', '<script type=\"text/javascript\" src=\"' . ")
+			->write("\$js_file = ")
         	->subcompile($this->getNode('expr'))
-        	->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>');\n")
+			->raw(";\n")
+			->write("if (!file_exists(\$js_file)) {\n")
+			->indent()
+				->write("\$js_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$js_file);\n")
+			->outdent()
+			->write("}\n")
+			->write("\$context['definition']->append('SCRIPTS', '<script type=\"text/javascript\" src=\"' . ")
+			->raw("\$js_file")
+        	->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>\n');\n")
         ;
     }
 }
-- 
cgit v1.2.1


From 02a8150bb615b6319bcdfd170e3febe34117f16c Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 11:08:52 -0500
Subject: [feature/twig] INCLUDEPHP behavior now supports local relative paths

As a last resort, now we use the Twig Loader to find the correct file to
include to (most specific file first, then parent styles). Also allows
using @namespace convention. This is ONLY done if the specified path is not
an absolute path AND the file does not exist relative to the phpBB root path.

PHPBB3-11598
---
 phpBB/includes/template/twig/node/includephp.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/includes/template/twig/node/includephp.php
index 33142bf05a..a19ce43653 100644
--- a/phpBB/includes/template/twig/node/includephp.php
+++ b/phpBB/includes/template/twig/node/includephp.php
@@ -52,12 +52,19 @@ class phpbb_template_twig_node_includephp extends Twig_Node
 			->raw(";\n")
 			->write("if (phpbb_is_absolute(\$location)) {\n")
 			->indent()
+				// Absolute path specified
 				->write("require(\$location);\n")
 			->outdent()
-			->write("} else {\n")
+			->write("} else if (file_exists(\$this->getEnvironment()->get_phpbb_root_path() . \$location)) {\n")
 			->indent()
+				// PHP file relative to phpbb_root_path
 				->write("require(\$this->getEnvironment()->get_phpbb_root_path() . \$location);\n")
 			->outdent()
+			->write("} else {\n")
+			->indent()
+				// Local path (behaves like INCLUDE)
+				->write("require(\$this->getEnvironment()->getLoader()->getCacheKey(\$location));\n")
+			->outdent()
 			->write("}\n")
 		;
 
-- 
cgit v1.2.1


From 709b3e98034e537fb3cbe5cbcb1511002c2d372d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 11:29:32 -0500
Subject: [feature/twig] Fix BBCode parser

PHPBB3-11598
---
 phpBB/includes/bbcode.php             |  2 +-
 phpBB/includes/template/template.php  |  7 +++++++
 phpBB/includes/template/twig/twig.php | 10 ++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index ecbb056045..fd00728510 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -138,7 +138,7 @@ class bbcode
 			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template);
 			$style->set_style();
 			$template->set_filenames(array('bbcode.html' => 'bbcode.html'));
-			$this->template_filename = $style_resource_locator->get_source_file_for_handle('bbcode.html');
+			$this->template_filename = $template->get_source_file_for_handle('bbcode.html');
 		}
 
 		$bbcode_ids = $rowset = $sql = array();
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index e506c2c278..2b7c36ea7d 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -147,4 +147,11 @@ interface phpbb_template
 	* @return bool false on error, true on success
 	*/
 	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert');
+
+	/**
+	* Get path to template for handle (required for BBCode parser)
+	*
+	* @return string
+	*/
+	public function get_source_file_for_handle($handle);
 }
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index dbc36ecddf..9d69136e0c 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -444,4 +444,14 @@ class phpbb_template_twig implements phpbb_template
 	{
 		return (isset($this->filenames[$handle])) ? $this->filenames[$handle] : $handle;
 	}
+
+	/**
+	* Get path to template for handle (required for BBCode parser)
+	*
+	* @return string
+	*/
+	public function get_source_file_for_handle($handle)
+	{
+		return $this->twig->getLoader()->getCacheKey($this->get_filename_from_handle($handle));
+	}
 }
-- 
cgit v1.2.1


From f39edcea3fb12c4f3ce9606772887c93d629f2d4 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 12:17:56 -0500
Subject: [feature/twig] Check the template context for language vars

We output some language vars to the context (e.g. L_TITLE in the ACP). These
do not exist in user->lang, so we must check the context vars first, if not
in context, we output the result of user->lang.

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php | 37 ++++++++++++++++++++++++++++--
 phpBB/includes/template/twig/twig.php      |  1 +
 2 files changed, 36 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index 1ea5f7b662..a54c2b2509 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -17,11 +17,15 @@ if (!defined('IN_PHPBB'))
 
 class phpbb_template_twig_extension extends Twig_Extension
 {
+	/** @var phpbb_template_context */
+	protected $context;
+
 	/** @var phpbb_user */
 	protected $user;
 
-	public function __construct($user)
+	public function __construct(phpbb_template_context $context, $user)
 	{
+		$this->context = $context;
 		$this->user = $user;
 	}
 
@@ -69,7 +73,7 @@ class phpbb_template_twig_extension extends Twig_Extension
     public function getFunctions()
     {
         return array(
-            new Twig_SimpleFunction('lang', array($this->user, 'lang')),
+            new Twig_SimpleFunction('lang', array($this, 'lang')),
 		);
 	}
 
@@ -140,4 +144,33 @@ class phpbb_template_twig_extension extends Twig_Extension
 
 		return twig_slice($env, $item, $start, $end, $preserveKeys);
 	}
+
+	/**
+	* Get output for a language variable (L_FOO, LA_FOO)
+	*
+	* This function checks to see if the language var was outputted to $context
+	* (e.g. in the ACP, L_TITLE)
+	* If not, we return the result of $user->lang()
+	*
+	* @param string $lang name
+	* @return string
+	*/
+	function lang()
+	{
+		$args = func_get_args();
+		$key = $args[0];
+
+		$context = $this->context->get_data_ref();
+		$context_vars = $context['.'][0];
+
+		if (isset($context_vars['L_' . $key]))
+		{
+			return $context_vars['L_' . $key];
+		}
+
+		// LA_ is transformed into lang(\'$1\')|addslashes, so we should not
+		// need to check for it
+
+		return call_user_func_array(array($this->user, 'lang'), $args);
+	}
 }
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 9d69136e0c..347db0b94c 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -134,6 +134,7 @@ class phpbb_template_twig implements phpbb_template
 
 		$this->twig->addExtension(
 			new phpbb_template_twig_extension(
+				$this->context,
 				$this->user
 			)
 		);
-- 
cgit v1.2.1


From 985a233a78af7350387dfb9b8a924d09df767f05 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 12:22:42 -0500
Subject: [feature/twig] Remove reference to cachepath, it is not used publicly
 anymore

PHPBB3-11598
---
 phpBB/includes/style/style.php        | 2 --
 phpBB/includes/template/twig/twig.php | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 493c4512a6..29cdcf0f7f 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -160,8 +160,6 @@ class phpbb_style
 			$this->template->set_style_names($names, $appended_paths);
 		}
 
-		//$this->template->cachepath = $this->phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $name) . '_';
-
 		return true;
 	}
 
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 347db0b94c..98bd1ab89c 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -30,9 +30,12 @@ class phpbb_template_twig implements phpbb_template
 
 	/**
 	* Path of the cache directory for the template
+	*
+	* Cannot be changed during runtime.
+	*
 	* @var string
 	*/
-	public $cachepath = '';
+	private $cachepath = '';
 
 	/**
 	* phpBB root path
-- 
cgit v1.2.1


From f102f609f5f0e424374aab55b8141c4e4a48b0fc Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 12:23:42 -0500
Subject: [feature/twig] Remove getCacheFilename function I was working on

This can be addressed later if we decide we want to have more nicely named
cache files. It does not need to be addressed now

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php | 30 ----------------------------
 1 file changed, 30 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index 73375444da..190d43f513 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -38,36 +38,6 @@ class phpbb_template_twig_environment extends Twig_Environment
 		return parent::__construct($loader, $options);
 	}
 
-	/**
-	* Gets the cache filename for a given template.
-	*
-	* @param string $name The template name
-	* @return string The cache file name
-	*/
-	public function ignoregetCacheFilename($name)
-	{
-		if (false === $this->cache)
-		{
-			return false;
-		}
-		// @todo
-		$file_path = $this->getLoader()->getCacheKey($name);
-		foreach ($this->getLoader()->getNamespaces() as $namespace)
-		{
-			foreach ($this->getLoader()->getPaths($namespace) as $path)
-			{
-				if (strpos($file_path, $path) === 0)
-				{
-					//return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $namespace . '/' . $name) . '.php';
-				}
-			}
-		}
-
-		// We probably should never get here under normal circumstances
-		return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '.php';
-		return $this->getCache() . '/' . preg_replace('#[^a-zA-Z0-9_/]#', '_', $name) . '_' . md5($this->getLoader()->getCacheKey($name)) . '.php';
-	}
-
 	/**
 	* Get the list of enabled phpBB extensions
 	*
-- 
cgit v1.2.1


From 57c2d99e65ce107208db10721cff5b815ee3403c Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 12:34:16 -0500
Subject: [feature/twig] Fix indentation

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php       |  11 ++
 phpBB/includes/template/twig/node/define.php       |  26 ++---
 phpBB/includes/template/twig/node/event.php        |  66 ++++++------
 .../twig/node/expression/binary/equalequal.php     |   8 +-
 .../twig/node/expression/binary/notequalequal.php  |   8 +-
 phpBB/includes/template/twig/node/include.php      |  28 ++---
 phpBB/includes/template/twig/node/includejs.php    |  36 +++----
 phpBB/includes/template/twig/node/includephp.php   |  60 +++++------
 phpBB/includes/template/twig/node/php.php          |  32 +++---
 .../includes/template/twig/tokenparser/define.php  |  90 ++++++++--------
 phpBB/includes/template/twig/tokenparser/event.php |  46 ++++-----
 phpBB/includes/template/twig/tokenparser/if.php    | 114 ++++++++++-----------
 .../includes/template/twig/tokenparser/include.php |  44 ++++----
 .../template/twig/tokenparser/includejs.php        |  46 ++++-----
 .../template/twig/tokenparser/includephp.php       |  58 +++++------
 phpBB/includes/template/twig/tokenparser/php.php   |  52 +++++-----
 16 files changed, 368 insertions(+), 357 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index 190d43f513..acb97cfad2 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -29,6 +29,15 @@ class phpbb_template_twig_environment extends Twig_Environment
 	/** @var array **/
 	protected $namespace_look_up_order = array('__main__');
 
+	/**
+	* Constructor
+	*
+	* @param phpbb_config $phpbb_config
+	* @param array $phpbb_extensions Array of enabled extensions (name => path)
+	* @param string $phpbb_root_path
+	* @param Twig_LoaderInterface $loader
+	* @param array $options Array of options to pass to Twig
+	*/
 	public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
 	{
 		$this->phpbb_config = $phpbb_config;
@@ -41,6 +50,8 @@ class phpbb_template_twig_environment extends Twig_Environment
 	/**
 	* Get the list of enabled phpBB extensions
 	*
+	* Used in EVENT node
+	*
 	* @return array
 	*/
 	public function get_phpbb_extensions()
diff --git a/phpBB/includes/template/twig/node/define.php b/phpBB/includes/template/twig/node/define.php
index 0c4d400767..499bbdc518 100644
--- a/phpBB/includes/template/twig/node/define.php
+++ b/phpBB/includes/template/twig/node/define.php
@@ -9,19 +9,19 @@
 
 class phpbb_template_twig_node_define extends Twig_Node
 {
-    public function __construct($capture, Twig_NodeInterface $name, Twig_NodeInterface $value, $lineno, $tag = null)
-    {
-        parent::__construct(array('name' => $name, 'value' => $value), array('capture' => $capture, 'safe' => false), $lineno, $tag);
-    }
+	public function __construct($capture, Twig_NodeInterface $name, Twig_NodeInterface $value, $lineno, $tag = null)
+	{
+		parent::__construct(array('name' => $name, 'value' => $value), array('capture' => $capture, 'safe' => false), $lineno, $tag);
+	}
 
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function compile(Twig_Compiler $compiler)
+	{
+		$compiler->addDebugInfo($this);
 
 		if ($this->getAttribute('capture')) {
 			$compiler
@@ -45,5 +45,5 @@ class phpbb_template_twig_node_define extends Twig_Node
 			->raw($this->getNode('name')->getAttribute('name'))
 			->raw("', \$value);\n")
 		;
-    }
+	}
 }
diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/includes/template/twig/node/event.php
index 358c68dae5..6de270e19c 100644
--- a/phpBB/includes/template/twig/node/event.php
+++ b/phpBB/includes/template/twig/node/event.php
@@ -12,39 +12,39 @@ class phpbb_template_twig_node_event extends Twig_Node
 	/** @var Twig_Environment */
 	protected $environment;
 
-    public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
-    {
-    	$this->environment = $environment;
-
-        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-
-    	$location = $this->getNode('expr')->getAttribute('name');
-
-    	foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
-    	{
-    		$ext_namespace = str_replace('/', '_', $ext_namespace);
-
-    		if ($this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
-    		{
-    			$compiler
-    				->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
-
-    				// We set the namespace lookup order to be this extension first, then the main path
-    				->write("\$this->env->setNamespaceLookUpOrder(array('" . $ext_namespace . "', '__main__'));\n")
-    				->write("\$this->env->loadTemplate('@" . $ext_namespace . "/" . $location . ".html')->display(\$context);\n")
-    				->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
-    			;
+	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+	{
+		$this->environment = $environment;
+
+		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+	}
+
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function compile(Twig_Compiler $compiler)
+	{
+		$compiler->addDebugInfo($this);
+
+		$location = $this->getNode('expr')->getAttribute('name');
+
+		foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
+		{
+			$ext_namespace = str_replace('/', '_', $ext_namespace);
+
+			if ($this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
+			{
+				$compiler
+					->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
+
+					// We set the namespace lookup order to be this extension first, then the main path
+					->write("\$this->env->setNamespaceLookUpOrder(array('" . $ext_namespace . "', '__main__'));\n")
+					->write("\$this->env->loadTemplate('@" . $ext_namespace . "/" . $location . ".html')->display(\$context);\n")
+					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
+				;
 			}
 		}
-    }
+	}
 }
diff --git a/phpBB/includes/template/twig/node/expression/binary/equalequal.php b/phpBB/includes/template/twig/node/expression/binary/equalequal.php
index 3a0c79c839..054f63ecf9 100644
--- a/phpBB/includes/template/twig/node/expression/binary/equalequal.php
+++ b/phpBB/includes/template/twig/node/expression/binary/equalequal.php
@@ -9,8 +9,8 @@
 
 class phpbb_template_twig_node_expression_binary_equalequal extends Twig_Node_Expression_Binary
 {
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('===');
-    }
+	public function operator(Twig_Compiler $compiler)
+	{
+		return $compiler->raw('===');
+	}
 }
diff --git a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php b/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
index b53bc56b2d..d8a1c411cf 100644
--- a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
+++ b/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
@@ -9,8 +9,8 @@
 
 class phpbb_template_twig_node_expression_binary_notequalequal extends Twig_Node_Expression_Binary
 {
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('!==');
-    }
+	public function operator(Twig_Compiler $compiler)
+	{
+		return $compiler->raw('!==');
+	}
 }
diff --git a/phpBB/includes/template/twig/node/include.php b/phpBB/includes/template/twig/node/include.php
index 2a90dc19e4..a614cbe20f 100644
--- a/phpBB/includes/template/twig/node/include.php
+++ b/phpBB/includes/template/twig/node/include.php
@@ -9,14 +9,14 @@
 
 class phpbb_template_twig_node_include extends Twig_Node_Include
 {
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function compile(Twig_Compiler $compiler)
+	{
+		$compiler->addDebugInfo($this);
 
 		$compiler
 			->write("\$location = ")
@@ -26,15 +26,15 @@ class phpbb_template_twig_node_include extends Twig_Node_Include
 			->write("if (strpos(\$location, '@') === 0) {\n")
 			->indent()
 				->write("\$namespace = substr(\$location, 1, strpos(\$location, '/') - 1);\n")
-    			->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
+				->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
 
-    			// We set the namespace lookup order to be this namespace first, then the main path
-    			->write("\$this->env->setNamespaceLookUpOrder(array(\$namespace, '__main__'));\n")
+				// We set the namespace lookup order to be this namespace first, then the main path
+				->write("\$this->env->setNamespaceLookUpOrder(array(\$namespace, '__main__'));\n")
 			->outdent()
 			->write("}\n")
 		;
 
-        parent::compile($compiler);
+		parent::compile($compiler);
 
 		$compiler
 			->write("if (\$namespace) {\n")
@@ -42,6 +42,6 @@ class phpbb_template_twig_node_include extends Twig_Node_Include
 				->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
 			->outdent()
 			->write("}\n")
-    	;
-    }
+		;
+	}
 }
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
index 91b24e8068..6d0d67c6c9 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -12,27 +12,27 @@ class phpbb_template_twig_node_includejs extends Twig_Node
 	/** @var Twig_Environment */
 	protected $environment;
 
-    public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
-    {
-    	$this->environment = $environment;
+	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+	{
+		$this->environment = $environment;
 
-        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
-    }
+		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+	}
 
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function compile(Twig_Compiler $compiler)
+	{
+		$compiler->addDebugInfo($this);
 
 		$config = $this->environment->get_phpbb_config();
 
-        $compiler
+		$compiler
 			->write("\$js_file = ")
-        	->subcompile($this->getNode('expr'))
+			->subcompile($this->getNode('expr'))
 			->raw(";\n")
 			->write("if (!file_exists(\$js_file)) {\n")
 			->indent()
@@ -41,7 +41,7 @@ class phpbb_template_twig_node_includejs extends Twig_Node
 			->write("}\n")
 			->write("\$context['definition']->append('SCRIPTS', '<script type=\"text/javascript\" src=\"' . ")
 			->raw("\$js_file")
-        	->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>\n');\n")
-        ;
-    }
+			->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>\n');\n")
+		;
+	}
 }
diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/includes/template/twig/node/includephp.php
index a19ce43653..b5bb2ee9c9 100644
--- a/phpBB/includes/template/twig/node/includephp.php
+++ b/phpBB/includes/template/twig/node/includephp.php
@@ -12,21 +12,21 @@ class phpbb_template_twig_node_includephp extends Twig_Node
 	/** @var Twig_Environment */
 	protected $environment;
 
-    public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $ignoreMissing = false, $lineno, $tag = null)
-    {
-    	$this->environment = $environment;
+	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $ignoreMissing = false, $lineno, $tag = null)
+	{
+		$this->environment = $environment;
 
-        parent::__construct(array('expr' => $expr), array('ignore_missing' => (Boolean) $ignoreMissing), $lineno, $tag);
-    }
+		parent::__construct(array('expr' => $expr), array('ignore_missing' => (Boolean) $ignoreMissing), $lineno, $tag);
+	}
 
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function compile(Twig_Compiler $compiler)
+	{
+		$compiler->addDebugInfo($this);
 
 		$config = $this->environment->get_phpbb_config();
 
@@ -39,12 +39,12 @@ class phpbb_template_twig_node_includephp extends Twig_Node
 			return;
 		}
 
-        if ($this->getAttribute('ignore_missing')) {
-            $compiler
-                ->write("try {\n")
-                ->indent()
-            ;
-        }
+		if ($this->getAttribute('ignore_missing')) {
+			$compiler
+				->write("try {\n")
+				->indent()
+			;
+		}
 
 		$compiler
 			->write("\$location = ")
@@ -68,15 +68,15 @@ class phpbb_template_twig_node_includephp extends Twig_Node
 			->write("}\n")
 		;
 
-        if ($this->getAttribute('ignore_missing')) {
-            $compiler
-                ->outdent()
-                ->write("} catch (Twig_Error_Loader \$e) {\n")
-                ->indent()
-                ->write("// ignore missing template\n")
-                ->outdent()
-                ->write("}\n\n")
-            ;
-        }
-    }
+		if ($this->getAttribute('ignore_missing')) {
+			$compiler
+				->outdent()
+				->write("} catch (Twig_Error_Loader \$e) {\n")
+				->indent()
+				->write("// ignore missing template\n")
+				->outdent()
+				->write("}\n\n")
+			;
+		}
+	}
 }
diff --git a/phpBB/includes/template/twig/node/php.php b/phpBB/includes/template/twig/node/php.php
index 953cd184a7..ebf4947e48 100644
--- a/phpBB/includes/template/twig/node/php.php
+++ b/phpBB/includes/template/twig/node/php.php
@@ -12,21 +12,21 @@ class phpbb_template_twig_node_php extends Twig_Node
 	/** @var Twig_Environment */
 	protected $environment;
 
-    public function __construct(Twig_Node_Text $text, phpbb_template_twig_environment $environment, $lineno, $tag = null)
-    {
-    	$this->environment = $environment;
-
-        parent::__construct(array('text' => $text), array(), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
+	public function __construct(Twig_Node_Text $text, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+	{
+		$this->environment = $environment;
+
+		parent::__construct(array('text' => $text), array(), $lineno, $tag);
+	}
+
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function compile(Twig_Compiler $compiler)
+	{
+		$compiler->addDebugInfo($this);
 
 		$config = $this->environment->get_phpbb_config();
 
@@ -42,5 +42,5 @@ class phpbb_template_twig_node_php extends Twig_Node
 		$compiler
 			->raw($this->getNode('text')->getAttribute('data'))
 		;
-    }
+	}
 }
diff --git a/phpBB/includes/template/twig/tokenparser/define.php b/phpBB/includes/template/twig/tokenparser/define.php
index ebf7cb4c4a..ed77699b77 100644
--- a/phpBB/includes/template/twig/tokenparser/define.php
+++ b/phpBB/includes/template/twig/tokenparser/define.php
@@ -9,49 +9,49 @@
 
 class phpbb_template_twig_tokenparser_define extends Twig_TokenParser
 {
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $name = $this->parser->getExpressionParser()->parseExpression();
-
-        $capture = false;
-        if ($stream->test(Twig_Token::OPERATOR_TYPE, '=')) {
-            $stream->next();
-            $value = $this->parser->getExpressionParser()->parseExpression();
-
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        } else {
-            $capture = true;
-
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-            $value = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        }
-
-        return new phpbb_template_twig_node_define($capture, $name, $value, $lineno, $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('ENDDEFINE');
-    }
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @return string The tag name
-     */
-    public function getTag()
-    {
-        return 'DEFINE';
-    }
+	/**
+	 * Parses a token and returns a node.
+	 *
+	 * @param Twig_Token $token A Twig_Token instance
+	 *
+	 * @return Twig_NodeInterface A Twig_NodeInterface instance
+	 */
+	public function parse(Twig_Token $token)
+	{
+		$lineno = $token->getLine();
+		$stream = $this->parser->getStream();
+		$name = $this->parser->getExpressionParser()->parseExpression();
+
+		$capture = false;
+		if ($stream->test(Twig_Token::OPERATOR_TYPE, '=')) {
+			$stream->next();
+			$value = $this->parser->getExpressionParser()->parseExpression();
+
+			$stream->expect(Twig_Token::BLOCK_END_TYPE);
+		} else {
+			$capture = true;
+
+			$stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+			$value = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
+			$stream->expect(Twig_Token::BLOCK_END_TYPE);
+		}
+
+		return new phpbb_template_twig_node_define($capture, $name, $value, $lineno, $this->getTag());
+	}
+
+	public function decideBlockEnd(Twig_Token $token)
+	{
+		return $token->test('ENDDEFINE');
+	}
+
+	/**
+	 * Gets the tag name associated with this token parser.
+	 *
+	 * @return string The tag name
+	 */
+	public function getTag()
+	{
+		return 'DEFINE';
+	}
 }
diff --git a/phpBB/includes/template/twig/tokenparser/event.php b/phpBB/includes/template/twig/tokenparser/event.php
index 03810454ed..2a6d6b6457 100644
--- a/phpBB/includes/template/twig/tokenparser/event.php
+++ b/phpBB/includes/template/twig/tokenparser/event.php
@@ -9,30 +9,30 @@
 
 class phpbb_template_twig_tokenparser_event extends Twig_TokenParser
 {
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $expr = $this->parser->getExpressionParser()->parseExpression();
+	/**
+	 * Parses a token and returns a node.
+	 *
+	 * @param Twig_Token $token A Twig_Token instance
+	 *
+	 * @return Twig_NodeInterface A Twig_NodeInterface instance
+	 */
+	public function parse(Twig_Token $token)
+	{
+		$expr = $this->parser->getExpressionParser()->parseExpression();
 
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+		$stream = $this->parser->getStream();
+		$stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        return new phpbb_template_twig_node_event($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
-    }
+		return new phpbb_template_twig_node_event($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
+	}
 
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @return string The tag name
-     */
-    public function getTag()
-    {
-        return 'EVENT';
-    }
+	/**
+	 * Gets the tag name associated with this token parser.
+	 *
+	 * @return string The tag name
+	 */
+	public function getTag()
+	{
+		return 'EVENT';
+	}
 }
diff --git a/phpBB/includes/template/twig/tokenparser/if.php b/phpBB/includes/template/twig/tokenparser/if.php
index 04ee048f94..939d679030 100644
--- a/phpBB/includes/template/twig/tokenparser/if.php
+++ b/phpBB/includes/template/twig/tokenparser/if.php
@@ -9,70 +9,70 @@
 
 class phpbb_template_twig_tokenparser_if extends Twig_TokenParser_If
 {
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $expr = $this->parser->getExpressionParser()->parseExpression();
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideIfFork'));
-        $tests = array($expr, $body);
-        $else = null;
+	/**
+	 * Parses a token and returns a node.
+	 *
+	 * @param Twig_Token $token A Twig_Token instance
+	 *
+	 * @return Twig_NodeInterface A Twig_NodeInterface instance
+	 */
+	public function parse(Twig_Token $token)
+	{
+		$lineno = $token->getLine();
+		$expr = $this->parser->getExpressionParser()->parseExpression();
+		$stream = $this->parser->getStream();
+		$stream->expect(Twig_Token::BLOCK_END_TYPE);
+		$body = $this->parser->subparse(array($this, 'decideIfFork'));
+		$tests = array($expr, $body);
+		$else = null;
 
-        $end = false;
-        while (!$end) {
-            switch ($stream->next()->getValue()) {
-                case 'ELSE':
-                    $stream->expect(Twig_Token::BLOCK_END_TYPE);
-                    $else = $this->parser->subparse(array($this, 'decideIfEnd'));
-                    break;
+		$end = false;
+		while (!$end) {
+			switch ($stream->next()->getValue()) {
+				case 'ELSE':
+					$stream->expect(Twig_Token::BLOCK_END_TYPE);
+					$else = $this->parser->subparse(array($this, 'decideIfEnd'));
+					break;
 
-                case 'ELSEIF':
-                    $expr = $this->parser->getExpressionParser()->parseExpression();
-                    $stream->expect(Twig_Token::BLOCK_END_TYPE);
-                    $body = $this->parser->subparse(array($this, 'decideIfFork'));
-                    $tests[] = $expr;
-                    $tests[] = $body;
-                    break;
+				case 'ELSEIF':
+					$expr = $this->parser->getExpressionParser()->parseExpression();
+					$stream->expect(Twig_Token::BLOCK_END_TYPE);
+					$body = $this->parser->subparse(array($this, 'decideIfFork'));
+					$tests[] = $expr;
+					$tests[] = $body;
+					break;
 
-                case 'ENDIF':
-                    $end = true;
-                    break;
+				case 'ENDIF':
+					$end = true;
+					break;
 
-                default:
-                    throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "ELSE", "ELSEIF", or "ENDIF" to close the "IF" block started at line %d)', $lineno), $stream->getCurrent()->getLine(), $stream->getFilename());
-            }
-        }
+				default:
+					throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "ELSE", "ELSEIF", or "ENDIF" to close the "IF" block started at line %d)', $lineno), $stream->getCurrent()->getLine(), $stream->getFilename());
+			}
+		}
 
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+		$stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        return new Twig_Node_If(new Twig_Node($tests), $else, $lineno, $this->getTag());
-    }
+		return new Twig_Node_If(new Twig_Node($tests), $else, $lineno, $this->getTag());
+	}
 
-    public function decideIfFork(Twig_Token $token)
-    {
-        return $token->test(array('ELSEIF', 'ELSE', 'ENDIF'));
-    }
+	public function decideIfFork(Twig_Token $token)
+	{
+		return $token->test(array('ELSEIF', 'ELSE', 'ENDIF'));
+	}
 
-    public function decideIfEnd(Twig_Token $token)
-    {
-        return $token->test(array('ENDIF'));
-    }
+	public function decideIfEnd(Twig_Token $token)
+	{
+		return $token->test(array('ENDIF'));
+	}
 
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @return string The tag name
-     */
-    public function getTag()
-    {
-        return 'IF';
-    }
+	/**
+	 * Gets the tag name associated with this token parser.
+	 *
+	 * @return string The tag name
+	 */
+	public function getTag()
+	{
+		return 'IF';
+	}
 }
diff --git a/phpBB/includes/template/twig/tokenparser/include.php b/phpBB/includes/template/twig/tokenparser/include.php
index 0f7e4faf8f..5b5105d23e 100644
--- a/phpBB/includes/template/twig/tokenparser/include.php
+++ b/phpBB/includes/template/twig/tokenparser/include.php
@@ -9,29 +9,29 @@
 
 class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include
 {
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $expr = $this->parser->getExpressionParser()->parseExpression();
+	/**
+	 * Parses a token and returns a node.
+	 *
+	 * @param Twig_Token $token A Twig_Token instance
+	 *
+	 * @return Twig_NodeInterface A Twig_NodeInterface instance
+	 */
+	public function parse(Twig_Token $token)
+	{
+		$expr = $this->parser->getExpressionParser()->parseExpression();
 
-        list($variables, $only, $ignoreMissing) = $this->parseArguments();
+		list($variables, $only, $ignoreMissing) = $this->parseArguments();
 
-        return new phpbb_template_twig_node_include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
-    }
+		return new phpbb_template_twig_node_include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
+	}
 
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @return string The tag name
-     */
-    public function getTag()
-    {
-        return 'INCLUDE';
-    }
+	/**
+	 * Gets the tag name associated with this token parser.
+	 *
+	 * @return string The tag name
+	 */
+	public function getTag()
+	{
+		return 'INCLUDE';
+	}
 }
diff --git a/phpBB/includes/template/twig/tokenparser/includejs.php b/phpBB/includes/template/twig/tokenparser/includejs.php
index 0b46f315d2..962d01ac45 100644
--- a/phpBB/includes/template/twig/tokenparser/includejs.php
+++ b/phpBB/includes/template/twig/tokenparser/includejs.php
@@ -9,30 +9,30 @@
 
 class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser
 {
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $expr = $this->parser->getExpressionParser()->parseExpression();
+	/**
+	 * Parses a token and returns a node.
+	 *
+	 * @param Twig_Token $token A Twig_Token instance
+	 *
+	 * @return Twig_NodeInterface A Twig_NodeInterface instance
+	 */
+	public function parse(Twig_Token $token)
+	{
+		$expr = $this->parser->getExpressionParser()->parseExpression();
 
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+		$stream = $this->parser->getStream();
+		$stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        return new phpbb_template_twig_node_includejs($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
-    }
+		return new phpbb_template_twig_node_includejs($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
+	}
 
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @return string The tag name
-     */
-    public function getTag()
-    {
-        return 'INCLUDEJS';
-    }
+	/**
+	 * Gets the tag name associated with this token parser.
+	 *
+	 * @return string The tag name
+	 */
+	public function getTag()
+	{
+		return 'INCLUDEJS';
+	}
 }
diff --git a/phpBB/includes/template/twig/tokenparser/includephp.php b/phpBB/includes/template/twig/tokenparser/includephp.php
index a81d663c09..57d804183b 100644
--- a/phpBB/includes/template/twig/tokenparser/includephp.php
+++ b/phpBB/includes/template/twig/tokenparser/includephp.php
@@ -9,39 +9,39 @@
 
 class phpbb_template_twig_tokenparser_includephp extends Twig_TokenParser
 {
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $expr = $this->parser->getExpressionParser()->parseExpression();
+	/**
+	 * Parses a token and returns a node.
+	 *
+	 * @param Twig_Token $token A Twig_Token instance
+	 *
+	 * @return Twig_NodeInterface A Twig_NodeInterface instance
+	 */
+	public function parse(Twig_Token $token)
+	{
+		$expr = $this->parser->getExpressionParser()->parseExpression();
 
-        $stream = $this->parser->getStream();
+		$stream = $this->parser->getStream();
 
-        $ignoreMissing = false;
-        if ($stream->test(Twig_Token::NAME_TYPE, 'ignore')) {
-            $stream->next();
-            $stream->expect(Twig_Token::NAME_TYPE, 'missing');
+		$ignoreMissing = false;
+		if ($stream->test(Twig_Token::NAME_TYPE, 'ignore')) {
+			$stream->next();
+			$stream->expect(Twig_Token::NAME_TYPE, 'missing');
 
-            $ignoreMissing = true;
-        }
+			$ignoreMissing = true;
+		}
 
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+		$stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        return new phpbb_template_twig_node_includephp($expr, $this->parser->getEnvironment(), $ignoreMissing, $token->getLine(), $this->getTag());
-    }
+		return new phpbb_template_twig_node_includephp($expr, $this->parser->getEnvironment(), $ignoreMissing, $token->getLine(), $this->getTag());
+	}
 
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @return string The tag name
-     */
-    public function getTag()
-    {
-        return 'INCLUDEPHP';
-    }
+	/**
+	 * Gets the tag name associated with this token parser.
+	 *
+	 * @return string The tag name
+	 */
+	public function getTag()
+	{
+		return 'INCLUDEPHP';
+	}
 }
diff --git a/phpBB/includes/template/twig/tokenparser/php.php b/phpBB/includes/template/twig/tokenparser/php.php
index 7db57081e2..62e1c4fdcd 100644
--- a/phpBB/includes/template/twig/tokenparser/php.php
+++ b/phpBB/includes/template/twig/tokenparser/php.php
@@ -9,38 +9,38 @@
 
 class phpbb_template_twig_tokenparser_php extends Twig_TokenParser
 {
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     */
-    public function parse(Twig_Token $token)
-    {
-        $stream = $this->parser->getStream();
+	/**
+	 * Parses a token and returns a node.
+	 *
+	 * @param Twig_Token $token A Twig_Token instance
+	 *
+	 * @return Twig_NodeInterface A Twig_NodeInterface instance
+	 */
+	public function parse(Twig_Token $token)
+	{
+		$stream = $this->parser->getStream();
 
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+		$stream->expect(Twig_Token::BLOCK_END_TYPE);
 
 		$body = $this->parser->subparse(array($this, 'decideEnd'), true);
 
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+		$stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        return new phpbb_template_twig_node_php($body, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
-    }
+		return new phpbb_template_twig_node_php($body, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
+	}
 
-    public function decideEnd(Twig_Token $token)
-    {
-        return $token->test('ENDPHP');
-    }
+	public function decideEnd(Twig_Token $token)
+	{
+		return $token->test('ENDPHP');
+	}
 
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @return string The tag name
-     */
-    public function getTag()
-    {
-        return 'PHP';
+	/**
+	 * Gets the tag name associated with this token parser.
+	 *
+	 * @return string The tag name
+	 */
+	public function getTag()
+	{
+		return 'PHP';
     }
 }
-- 
cgit v1.2.1


From f9672e9b45a0f0d26702ca0f55a884a24e21bf77 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 2 Jul 2013 14:03:22 -0400
Subject: [feature/auth-refactor] Fix code style issue

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 4d07f96c6f..24b913260b 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -660,8 +660,8 @@ class acp_board
 				if ($fields['tpl'])
 				{
 					$template->assign_block_vars('auth_tpl', array(
-						'TPL'	=> $fields['tpl'])
-					);
+						'TPL'	=> $fields['tpl'],
+					));
 				}
 				unset($fields);
 			}
-- 
cgit v1.2.1


From 9652483ef49295379b28bdd842c846c0160fa1a1 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 2 Jul 2013 14:24:48 -0500
Subject: [feature/twig] Fix begin loop var regex

PHPBB3-11598
---
 phpBB/includes/template/twig/lexer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index b32a9e4ffa..c7ab1590f5 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -134,10 +134,10 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 				}
 			}
 
-			// Remove all parent nodes, e.g. foo, bar from foo.bar.foobar
+			// Remove all parent nodes, e.g. foo, bar from foo.bar.foobar.VAR
 			foreach ($parent_nodes as $node)
 			{
-				$body = preg_replace('#([^a-zA-Z0-9])' . $node . '\.#', '$1', $body);
+				$body = preg_replace('#([^a-zA-Z0-9_])' . $node . '\.([a-zA-Z0-9_]+)\.#', '$1$2.', $body);
 			}
 
 			// Add current node to list of parent nodes for child nodes
-- 
cgit v1.2.1


From fba3a9d600e9b79c8530b026fa781c99ea9ba833 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 2 Jul 2013 16:52:15 -0700
Subject: [ticket/11617] Missing U_ACTION in acp_captcha.php

http://tracker.phpbb.com/browse/PHPBB3-11617

PHPBB3-11617
---
 phpBB/includes/acp/acp_captcha.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php
index 469a367bba..5b553d6a0d 100644
--- a/phpBB/includes/acp/acp_captcha.php
+++ b/phpBB/includes/acp/acp_captcha.php
@@ -124,6 +124,8 @@ class acp_captcha
 					'CAPTCHA_PREVIEW_TPL'	=> $demo_captcha->get_demo_template($id),
 					'S_CAPTCHA_HAS_CONFIG'	=> $demo_captcha->has_config(),
 					'CAPTCHA_SELECT'		=> $captcha_select,
+					
+					'U_ACTION'				=> $this->u_action,
 				));
 			}
 		}
-- 
cgit v1.2.1


From 5ef4987ffe15fe1fbafc9d9eae005f29a028dd3e Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Tue, 2 Jul 2013 18:47:56 -0700
Subject: [ticket/11617] Remove spaces and tabs from empty lines

PHPBB3-11617
---
 phpBB/includes/acp/acp_captcha.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php
index 5b553d6a0d..bfec7c27d8 100644
--- a/phpBB/includes/acp/acp_captcha.php
+++ b/phpBB/includes/acp/acp_captcha.php
@@ -124,7 +124,7 @@ class acp_captcha
 					'CAPTCHA_PREVIEW_TPL'	=> $demo_captcha->get_demo_template($id),
 					'S_CAPTCHA_HAS_CONFIG'	=> $demo_captcha->has_config(),
 					'CAPTCHA_SELECT'		=> $captcha_select,
-					
+
 					'U_ACTION'				=> $this->u_action,
 				));
 			}
-- 
cgit v1.2.1


From 9e845d4641aa7f71ab713434a7a2e1edfd2876b4 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 3 Jul 2013 15:31:40 +0200
Subject: [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding
 handling.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index a9d1db24a5..2f73858ea2 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -3121,7 +3121,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
 
 	if ($fsock = @fsockopen($host, $port, $errno, $errstr, $timeout))
 	{
-		@fputs($fsock, "GET $directory/$filename HTTP/1.1\r\n");
+		@fputs($fsock, "GET $directory/$filename HTTP/1.0\r\n");
 		@fputs($fsock, "HOST: $host\r\n");
 		@fputs($fsock, "Connection: close\r\n\r\n");
 
-- 
cgit v1.2.1


From 36f25ea09bd42de7bc705332edc5ce3c402bd844 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 10:12:09 -0500
Subject: [feature/twig] Change style->set_style to accept a list of base
 directories

set_style now accepts an array containing a list of paths, e.g. array(
'ext/foo/bar/styles', 'styles'). Default: array('styles')

Using this option allows us to set the style based on the user's preferred
style (including the full tree), but use one or more base directories to
add the paths from.

The main use for this ability is so that extensions can call set_style,
including their path and the phpBB styles path (or any others) and have
their template files loaded from those directories (in the order given).

PHPBB3-11598
---
 phpBB/includes/style/style.php        | 83 +++++++++++++++++++++--------------
 phpBB/includes/template/template.php  |  2 +-
 phpBB/includes/template/twig/twig.php |  6 ++-
 3 files changed, 56 insertions(+), 35 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 29cdcf0f7f..b0bf3c1019 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -84,29 +84,57 @@ class phpbb_style
 		$this->template = $template;
 	}
 
+	/**
+	* Get the style tree of the style preferred by the current user
+	*
+	* @return array Style tree, most specific first
+	*/
+	public function get_user_style()
+	{
+		return array_merge(array(
+				$this->user->style['style_path'],
+			),
+			($this->user->style['style_parent_id']) ? array_reverse(explode('/', $this->user->style['style_parent_tree'])) : array()
+		);
+	}
+
 	/**
 	* Set style location based on (current) user's chosen style.
+	*
+	* @param array $style_directories The directories to add style paths for
+	* 	E.g. array('ext/foo/bar/styles', 'styles')
+	* 	Default: array('styles') (phpBB's style directory)
+	* @return bool true
 	*/
-	public function set_style()
+	public function set_style($style_directories = array('styles'))
 	{
-		$style_path = $this->user->style['style_path'];
-		$style_dirs = ($this->user->style['style_parent_id']) ? array_reverse(explode('/', $this->user->style['style_parent_tree'])) : array();
+		$this->names = $this->get_user_style();
 
-		$names = array($style_path);
-		foreach ($style_dirs as $dir)
+		$paths = array();
+		foreach ($style_directories as $directory)
 		{
-			$names[] = $dir;
+			foreach ($this->names as $name)
+			{
+				$path = $this->get_style_path($name, $directory);
+
+				if (is_dir($path))
+				{
+					$paths[] = $path;
+				}
+			}
 		}
-		// Add 'all' path, used as last fallback path by events and extensions
-		//$names[] = 'all';
 
-		$paths = array();
-		foreach ($names as $name)
+		$this->provider->set_styles($paths);
+		$this->locator->set_paths($this->provider);
+
+		foreach ($paths as &$path)
 		{
-			$paths[] = $this->get_style_path($name);
+			$path .= '/template/';
 		}
 
-		return $this->set_custom_style($style_path, $paths, $names);
+		$this->template->set_style_names($this->names, $paths, ($style_directories === array('styles')));
+
+		return true;
 	}
 
 	/**
@@ -118,6 +146,7 @@ class phpbb_style
 	* @param array or string $paths Array of style paths, relative to current root directory
 	* @param array $names Array of names of templates in inheritance tree order, used by extensions. If empty, $name will be used.
 	* @param string $template_path Path to templates, relative to style directory. False if path should be set to default (templates/).
+	* @return bool true
 	*/
 	public function set_custom_style($name, $paths, $names = array(), $template_path = false)
 	{
@@ -138,28 +167,15 @@ class phpbb_style
 		if ($template_path !== false)
 		{
 			$this->locator->set_template_path($template_path);
-
-			$appended_paths = array();
-			foreach ($paths as $path)
-			{
-				$appended_paths[] = $path . '/' . $template_path;
-			}
-
-			$this->template->set_style_names($names, $appended_paths);
 		}
-		else
-		{
-			$this->locator->set_default_template_path();
-
-			$appended_paths = array();
-			foreach ($paths as $path)
-			{
-				$appended_paths[] = $path . '/template/';
-			}
 
-			$this->template->set_style_names($names, $appended_paths);
+		foreach ($paths as &$path)
+		{
+			$path .= '/' . (($template_path !== false) ? $template_path : 'template/');
 		}
 
+		$this->template->set_style_names($names, $paths);
+
 		return true;
 	}
 
@@ -167,11 +183,14 @@ class phpbb_style
 	* Get location of style directory for specific style_path
 	*
 	* @param string $path Style path, such as "prosilver"
+	* @param string $style_base_directory The base directory the style is in
+	* 	E.g. 'styles', 'ext/foo/bar/styles'
+	* 	Default: 'styles'
 	* @return string Path to style directory, relative to current path
 	*/
-	public function get_style_path($path)
+	public function get_style_path($path, $style_base_directory = 'styles')
 	{
-		return $this->phpbb_root_path . 'styles/' . $path;
+		return $this->phpbb_root_path . trim($style_base_directory, '/') . '/' . $path;
 	}
 
 	/**
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 2b7c36ea7d..89a01e924d 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -41,7 +41,7 @@ interface phpbb_template
 	* @param array $style_paths List of style paths in inheritance tree order
 	* @return phpbb_template $this
 	*/
-	public function set_style_names(array $style_names, array $style_paths = array());
+	public function set_style_names(array $style_names, array $style_paths);
 
 	/**
 	* Clears all variables and blocks assigned to this template.
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 98bd1ab89c..dd2c1a4023 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -181,9 +181,11 @@ class phpbb_template_twig implements phpbb_template
 	*
 	* @param array $style_names List of style names in inheritance tree order
 	* @param array $style_paths List of style paths in inheritance tree order
+	* @param bool $is_core True if the style names are the "core" styles for this page load
+	* 	Core means the main phpBB template files
 	* @return phpbb_template $this
 	*/
-	public function set_style_names(array $style_names, array $style_paths = array())
+	public function set_style_names(array $style_names, array $style_paths, $is_core = false)
 	{
 		$this->style_names = $style_names;
 
@@ -191,7 +193,7 @@ class phpbb_template_twig implements phpbb_template
 		$this->twig->getLoader()->setPaths($style_paths);
 
 		// Core style namespace from phpbb_style::set_style()
-		if (isset($this->user->style['style_path']) && ($style_names === array($this->user->style['style_path']) || $style_names[0] == $this->user->style['style_path']))
+		if ($is_core)
 		{
 			$this->twig->getLoader()->setPaths($style_paths, 'core');
 		}
-- 
cgit v1.2.1


From 884a5b06fa2e300285a67885d0652d201c7a330a Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 10:13:05 -0500
Subject: [feature/twig] Add set_style function to controller helper

PHPBB3-11598
---
 phpBB/includes/controller/helper.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index 74410ddfd1..ec09757a5d 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -23,6 +23,12 @@ use Symfony\Component\HttpFoundation\Response;
 */
 class phpbb_controller_helper
 {
+	/**
+	* Style object
+	* @var phpbb_style
+	*/
+	protected $style;
+
 	/**
 	* Template object
 	* @var phpbb_template
@@ -50,19 +56,36 @@ class phpbb_controller_helper
 	/**
 	* Constructor
 	*
+	* @param phpbb_style $style Style object
 	* @param phpbb_template $template Template object
 	* @param phpbb_user $user User object
 	* @param string $phpbb_root_path phpBB root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_style $style, phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext)
 	{
+		$this->style = $style;
 		$this->template = $template;
 		$this->user = $user;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 	}
 
+	/**
+	* Set style location based on (current) user's chosen style.
+	*
+	* @param array $style_directories The directories to add style paths for
+	* 	E.g. array('ext/foo/bar/styles', 'styles')
+	* 	Default: array('styles') (phpBB's style directory)
+	* @return phpbb_controller_helper $this
+	*/
+	public function set_style($style_base_directory = array('styles'))
+	{
+		$this->style->set_style($style_base_directory);
+
+		return $this;
+	}
+
 	/**
 	* Automate setting up the page and creating the response object.
 	*
-- 
cgit v1.2.1


From 84e0943c7bee5061bc53aed2a14f82751d238bf8 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 10:22:12 -0500
Subject: [feature/twig] Indentation and comments

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php | 18 +++++++++---------
 phpBB/includes/template/twig/twig.php      |  4 +++-
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index a54c2b2509..f73b99a4c1 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -59,9 +59,9 @@ class phpbb_template_twig_extension extends Twig_Extension
      */
     public function getFilters()
     {
-        return array(
-            new Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)),
-            new Twig_SimpleFilter('addslashes', 'addslashes'),
+		return array(
+			new Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)),
+			new Twig_SimpleFilter('addslashes', 'addslashes'),
 		);
     }
 
@@ -72,8 +72,8 @@ class phpbb_template_twig_extension extends Twig_Extension
      */
     public function getFunctions()
     {
-        return array(
-            new Twig_SimpleFunction('lang', array($this, 'lang')),
+		return array(
+			new Twig_SimpleFunction('lang', array($this, 'lang')),
 		);
 	}
 
@@ -86,7 +86,7 @@ class phpbb_template_twig_extension extends Twig_Extension
 	{
 		return array(
 			array(
-                '!' => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'),
+				'!' => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'),
 			),
 			array(
 				// precedence settings are copied from similar operators in Twig core extension
@@ -109,9 +109,9 @@ class phpbb_template_twig_extension extends Twig_Extension
 				'lte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 				'le' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
 
-                'mod' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-            ),
-        );
+				'mod' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+			),
+		);
     }
 
 	/**
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index dd2c1a4023..621bfe0f4f 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -102,7 +102,9 @@ class phpbb_template_twig implements phpbb_template
 	* Constructor.
 	*
 	* @param string $phpbb_root_path phpBB root path
-	* @param user $user current user
+	* @param string $php_ext php extension (typically 'php')
+	* @param phpbb_config $config
+	* @param phpbb_user $user
 	* @param phpbb_template_context $context template context
 	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
 	* @param string $adm_relative_path relative path to adm directory
-- 
cgit v1.2.1


From 2fb48d60f1b8ea111c766d6d9e7a3dde2b8a4e74 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 11:08:36 -0500
Subject: [feature/twig] Attempt to automatically set style dir for ext
 controllers

Extension authors can change it themselves if necessary

PHPBB3-11598
---
 phpBB/includes/controller/resolver.php | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/resolver.php b/phpBB/includes/controller/resolver.php
index ee469aa9c8..2c7d112748 100644
--- a/phpBB/includes/controller/resolver.php
+++ b/phpBB/includes/controller/resolver.php
@@ -37,16 +37,24 @@ class phpbb_controller_resolver implements ControllerResolverInterface
 	*/
 	protected $container;
 
+	/**
+	* phpbb_style object
+	* @var phpbb_style
+	*/
+	protected $style;
+
 	/**
 	* Construct method
 	*
 	* @param phpbb_user $user User Object
 	* @param ContainerInterface $container ContainerInterface object
+	* @param phpbb_style $style
 	*/
-	public function __construct(phpbb_user $user, ContainerInterface $container)
+	public function __construct(phpbb_user $user, ContainerInterface $container, phpbb_style $style)
 	{
 		$this->user = $user;
 		$this->container = $container;
+		$this->style = $style;
 	}
 
 	/**
@@ -80,6 +88,24 @@ class phpbb_controller_resolver implements ControllerResolverInterface
 
 		$controller_object = $this->container->get($service);
 
+		/*
+		* If this is an extension controller, we'll try to automatically set
+		* the style paths for the extension (the ext author can change them
+		* if necessary).
+		*/
+		$controller_dir = explode('_', get_class($controller_object));
+
+		// 0 phpbb, 1 ext, 2 vendor, 3 extension name, ...
+		if ($controller_dir[1] === 'ext')
+		{
+			$controller_style_dir = 'ext/' . $controller_dir[2] . '/' . $controller_dir[3] . '/styles';
+
+			if (is_dir($controller_style_dir))
+			{
+				$this->style->set_style(array($controller_style_dir, 'styles'));
+			}
+		}
+
 		return array($controller_object, $method);
 	}
 
-- 
cgit v1.2.1


From 1ce33c1ff62426d030731cca100c4119bcd5265d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 11:12:26 -0500
Subject: [feature/twig] Safety check for 2fb48d6

PHPBB3-11598
---
 phpBB/includes/controller/resolver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/resolver.php b/phpBB/includes/controller/resolver.php
index 2c7d112748..e44aa14b55 100644
--- a/phpBB/includes/controller/resolver.php
+++ b/phpBB/includes/controller/resolver.php
@@ -96,7 +96,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface
 		$controller_dir = explode('_', get_class($controller_object));
 
 		// 0 phpbb, 1 ext, 2 vendor, 3 extension name, ...
-		if ($controller_dir[1] === 'ext')
+		if (isset($controller_dir[3]) && $controller_dir[1] === 'ext')
 		{
 			$controller_style_dir = 'ext/' . $controller_dir[2] . '/' . $controller_dir[3] . '/styles';
 
-- 
cgit v1.2.1


From b7ede06835ba784b81365946f057adf75ae7592b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 11:16:44 -0500
Subject: [feature/twig] Make style dependency optional for resolver

PHPBB3-11598
---
 phpBB/includes/controller/resolver.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/resolver.php b/phpBB/includes/controller/resolver.php
index e44aa14b55..95dfc8da8e 100644
--- a/phpBB/includes/controller/resolver.php
+++ b/phpBB/includes/controller/resolver.php
@@ -50,7 +50,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface
 	* @param ContainerInterface $container ContainerInterface object
 	* @param phpbb_style $style
 	*/
-	public function __construct(phpbb_user $user, ContainerInterface $container, phpbb_style $style)
+	public function __construct(phpbb_user $user, ContainerInterface $container, phpbb_style $style = null)
 	{
 		$this->user = $user;
 		$this->container = $container;
@@ -96,7 +96,7 @@ class phpbb_controller_resolver implements ControllerResolverInterface
 		$controller_dir = explode('_', get_class($controller_object));
 
 		// 0 phpbb, 1 ext, 2 vendor, 3 extension name, ...
-		if (isset($controller_dir[3]) && $controller_dir[1] === 'ext')
+		if (!is_null($this->style) && isset($controller_dir[3]) && $controller_dir[1] === 'ext')
 		{
 			$controller_style_dir = 'ext/' . $controller_dir[2] . '/' . $controller_dir[3] . '/styles';
 
-- 
cgit v1.2.1


From 5f03321fac6ce888cb870e158c685bf839c25f07 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 12:44:12 -0500
Subject: [feature/twig] Support using Twig filters on {VAR}, add masks for
 Twig tags

Now we can do {L_TITLE|upper}, {SITENAME|lower}, etc

We can also use all the Twig tags in our own syntax. E.g. <!-- BLOCK foo -->
= {% block foo %]. All tags are the same as the Twig tag names, but are
in uppercase.

PHPBB3-11598
---
 phpBB/includes/template/twig/lexer.php | 76 +++++++++++++++++++++++++++++++---
 phpBB/includes/template/twig/twig.php  |  2 +-
 2 files changed, 71 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index c7ab1590f5..50ef403231 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -19,8 +19,9 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 {
 	public function tokenize($code, $filename = null)
 	{
-		$valid_starting_tokens = array(
-			// Commented out tokens are handled separately from the main replace
+		// Our phpBB tags
+		// Commented out tokens are handled separately from the main replace
+		$phpbb_tags = array(
 			/*'BEGIN',
 			'BEGINELSE',
 			'END',*/
@@ -39,6 +40,34 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			'EVENT',
 		);
 
+		// Twig tag masks
+		$twig_tags = array(
+			'autoescape',
+			'endautoescape',
+			'block',
+			'endblock',
+			'use',
+			'extends',
+			'embed',
+			'filter',
+			'endfilter',
+			'flush',
+			'for',
+			'endfor',
+			'macro',
+			'endmacro',
+			'import',
+			'from',
+			'sandbox',
+			'endsandbox',
+			'set',
+			'endset',
+			'spaceless',
+			'endspaceless',
+			'verbatim',
+			'endverbatim',
+		);
+
 		// Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}')
 		$code = $this->fix_inline_variable_tokens(array(
 			'DEFINE.+=',
@@ -58,16 +87,22 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 
 		// Replace all of our starting tokens, <!-- TOKEN --> with Twig style, {% TOKEN %}
 		// This also strips outer parenthesis, <!-- IF (blah) --> becomes <!-- IF blah -->
-		$code = preg_replace('#<!-- (' . implode('|', $valid_starting_tokens) . ')(?: (.*?) ?)?-->#', '{% $1 $2 %}', $code);
+		$code = preg_replace('#<!-- (' . implode('|', $phpbb_tags) . ')(?: (.*?) ?)?-->#', '{% $1 $2 %}', $code);
+
+		// Replace all of our twig masks with Twig code (e.g. <!-- BLOCK .+ --> with {% block $1 %})
+		$code = $this->replace_twig_tag_masks($code, $twig_tags);
 
 		// Replace all of our language variables, {L_VARNAME}, with Twig style, {{ lang('NAME') }}
-		$code = preg_replace('#{L_([a-zA-Z0-9_\.]+)}#', '{{ lang(\'$1\') }}', $code);
+		// Appends any filters after lang()
+		$code = preg_replace('#{L_([a-zA-Z0-9_\.]+)(\|[^}]+)?}#', '{{ lang(\'$1\')$2 }}', $code);
 
 		// Replace all of our escaped language variables, {LA_VARNAME}, with Twig style, {{ lang('NAME')|addslashes }}
-		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)}#', '{{ lang(\'$1\')|addslashes }}', $code);
+		// Appends any filters after lang(), but before addslashes
+		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)(\|[^}]+)?}}#', '{{ lang(\'$1\')$2|addslashes }}', $code);
 
 		// Replace all of our variables, {VARNAME}, with Twig style, {{ VARNAME }}
-		$code = preg_replace('#{([a-zA-Z0-9_\.]+)}#', '{{ $1 }}', $code);
+		// Appends any filters
+		$code = preg_replace('#{([a-zA-Z0-9_\.]+)(\|[^}]+)?}#', '{{ $1$2 }}', $code);
 
 		return parent::tokenize($code, $filename);
 	}
@@ -227,4 +262,33 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 
 		return $code;
 	}
+
+	/**
+	* Replace Twig tag masks with Twig tag calls
+	*
+	* E.g. <!-- BLOCK foo --> with {% block foo %}
+	*
+	* @param string $code
+	* @param array $twig_tags All tags we want to create a mask for
+	* @return string
+	*/
+	protected function replace_twig_tag_masks($code, $twig_tags)
+	{
+		$callback = function ($matches)
+		{
+			$matches[1] = strtolower($matches[1]);
+
+			return "{% {$matches[1]}{$matches[2]}%}";
+		};
+
+		foreach ($twig_tags as &$tag)
+		{
+			$tag = strtoupper($tag);
+		}
+
+		// twig_tags is an array of the twig tags, which are all lowercase, but we use all uppercase tags
+		$code = preg_replace_callback('#<!-- (' . implode('|', $twig_tags) . ')(.*?)-->#',$callback, $code);
+
+		return $code;
+	}
 }
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 621bfe0f4f..47e346ad1e 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -132,7 +132,7 @@ class phpbb_template_twig implements phpbb_template
 			array(
 				'cache'			=> $this->cachepath,
 				'debug'			=> defined('DEBUG'),
-				'auto_reload'	=> (bool) $this->config['load_tplcompile'],
+				'auto_reload'	=> true,//(bool) $this->config['load_tplcompile'],
 				'autoescape'	=> false,
 			)
 		);
-- 
cgit v1.2.1


From 864465761f45fec2732381849ee9959d7ad9b45d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 13:19:03 -0500
Subject: [feature/twig] Fix debug code

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 47e346ad1e..621bfe0f4f 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -132,7 +132,7 @@ class phpbb_template_twig implements phpbb_template
 			array(
 				'cache'			=> $this->cachepath,
 				'debug'			=> defined('DEBUG'),
-				'auto_reload'	=> true,//(bool) $this->config['load_tplcompile'],
+				'auto_reload'	=> (bool) $this->config['load_tplcompile'],
 				'autoescape'	=> false,
 			)
 		);
-- 
cgit v1.2.1


From fdbdd8bfd92795098b4f9a704a677972e611f455 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 13:22:41 -0500
Subject: [feature/twig] Fix a regular expression

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 50ef403231..394c3077a6 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -98,7 +98,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 
 		// Replace all of our escaped language variables, {LA_VARNAME}, with Twig style, {{ lang('NAME')|addslashes }}
 		// Appends any filters after lang(), but before addslashes
-		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)(\|[^}]+)?}}#', '{{ lang(\'$1\')$2|addslashes }}', $code);
+		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)(\|[^}]+)?}#', '{{ lang(\'$1\')$2|addslashes }}', $code);
 
 		// Replace all of our variables, {VARNAME}, with Twig style, {{ VARNAME }}
 		// Appends any filters
-- 
cgit v1.2.1


From 24be21636656bf636738449488da3810e489b4a7 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 13:49:56 -0500
Subject: [feature/twig] Attempt to automatically set style dir for ext modules

Extension authors can change it themselves if necessary

PHPBB3-11598
---
 phpBB/includes/functions_module.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 0d387ace6d..5a8ac276cd 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -455,7 +455,7 @@ class p_master
 	*/
 	function load_active($mode = false, $module_url = false, $execute_module = true)
 	{
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $style;
 
 		$module_path = $this->include_path . $this->p_class;
 		$icat = request_var('icat', '');
@@ -491,6 +491,24 @@ class p_master
 
 		$this->module = new $class_name($this);
 
+		/*
+		* If this is an extension module, we'll try to automatically set
+		* the style paths for the extension (the ext author can change them
+		* if necessary).
+		*/
+		$module_dir = explode('_', get_class($this->module));
+
+		// 0 phpbb, 1 ext, 2 vendor, 3 extension name, ...
+		if (!is_null($this->style) && isset($module_dir[3]) && $module_dir[1] === 'ext')
+		{
+			$module_style_dir = 'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/styles';
+
+			if (is_dir($module_style_dir))
+			{
+				$style->set_style(array($module_style_dir, 'styles'));
+			}
+		}
+
 		// We pre-define the action parameter we are using all over the place
 		if (defined('IN_ADMIN'))
 		{
-- 
cgit v1.2.1


From 38700a80f805ae32632d88254e714699b8435f61 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 14:09:50 -0500
Subject: [feature/twig] Fix copy/pasted code

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 5a8ac276cd..85ff41500f 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -499,7 +499,7 @@ class p_master
 		$module_dir = explode('_', get_class($this->module));
 
 		// 0 phpbb, 1 ext, 2 vendor, 3 extension name, ...
-		if (!is_null($this->style) && isset($module_dir[3]) && $module_dir[1] === 'ext')
+		if (isset($module_dir[3]) && $module_dir[1] === 'ext')
 		{
 			$module_style_dir = 'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/styles';
 
-- 
cgit v1.2.1


From 53496e6a473f1e5563f733365cbeaf275c2fd0af Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 15:21:57 -0500
Subject: [feature/twig] acp module tpls are in ext/adm, ucp/mcp in styles/

PHPBB3-11598
---
 phpBB/includes/functions_module.php | 52 +++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 85ff41500f..df0327db0f 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -455,7 +455,7 @@ class p_master
 	*/
 	function load_active($mode = false, $module_url = false, $execute_module = true)
 	{
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $style;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $phpbb_style;
 
 		$module_path = $this->include_path . $this->p_class;
 		$icat = request_var('icat', '');
@@ -491,27 +491,27 @@ class p_master
 
 		$this->module = new $class_name($this);
 
-		/*
-		* If this is an extension module, we'll try to automatically set
-		* the style paths for the extension (the ext author can change them
-		* if necessary).
-		*/
-		$module_dir = explode('_', get_class($this->module));
-
-		// 0 phpbb, 1 ext, 2 vendor, 3 extension name, ...
-		if (isset($module_dir[3]) && $module_dir[1] === 'ext')
+		// We pre-define the action parameter we are using all over the place
+		if (defined('IN_ADMIN'))
 		{
-			$module_style_dir = 'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/styles';
+			/*
+			* If this is an extension module, we'll try to automatically set
+			* the style paths for the extension (the ext author can change them
+			* if necessary).
+			*/
+			$module_dir = explode('_', get_class($this->module));
 
-			if (is_dir($module_style_dir))
+			// 0 phpbb, 1 ext, 2 vendor, 3 extension name, ...
+			if (isset($module_dir[3]) && $module_dir[1] === 'ext')
 			{
-				$style->set_style(array($module_style_dir, 'styles'));
+				$module_style_dir = $phpbb_root_path .'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/adm/style';
+
+				if (is_dir($module_style_dir))
+				{
+					$phpbb_style->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'), array(), '');
+				}
 			}
-		}
 
-		// We pre-define the action parameter we are using all over the place
-		if (defined('IN_ADMIN'))
-		{
 			// Is first module automatically enabled a duplicate and the category not passed yet?
 			if (!$icat && $this->module_ary[$this->active_module_row_id]['is_duplicate'])
 			{
@@ -523,6 +523,24 @@ class p_master
 		}
 		else
 		{
+			/*
+			* If this is an extension module, we'll try to automatically set
+			* the style paths for the extension (the ext author can change them
+			* if necessary).
+			*/
+			$module_dir = explode('_', get_class($this->module));
+
+			// 0 phpbb, 1 ext, 2 vendor, 3 extension name, ...
+			if (isset($module_dir[3]) && $module_dir[1] === 'ext')
+			{
+				$module_style_dir = 'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/styles';
+
+				if (is_dir($phpbb_root_path . $module_style_dir))
+				{
+					$phpbb_style->set_style(array($module_style_dir, 'styles'));
+				}
+			}
+
 			// If user specified the module url we will use it...
 			if ($module_url !== false)
 			{
-- 
cgit v1.2.1


From 0f3086a54bf2a9c83876a135738bdf130e0f0844 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Jul 2013 15:24:42 -0500
Subject: [feature/twig] Spacing

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index df0327db0f..99c24fcb19 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -504,7 +504,7 @@ class p_master
 			// 0 phpbb, 1 ext, 2 vendor, 3 extension name, ...
 			if (isset($module_dir[3]) && $module_dir[1] === 'ext')
 			{
-				$module_style_dir = $phpbb_root_path .'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/adm/style';
+				$module_style_dir = $phpbb_root_path . 'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/adm/style';
 
 				if (is_dir($module_style_dir))
 				{
-- 
cgit v1.2.1


From 5746c8d96ff50b7c520e3070270311992685fcce Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 4 Jul 2013 17:12:55 -0400
Subject: [feature/auth-refactor] Move auth providers to separate directory

Moves the provider files to their own directory per bantu's
suggestion.

PHPBB3-9734
---
 phpBB/includes/auth/provider/apache.php    | 275 ++++++++++++++++++++
 phpBB/includes/auth/provider/db.php        | 337 +++++++++++++++++++++++++
 phpBB/includes/auth/provider/index.htm     |  10 +
 phpBB/includes/auth/provider/interface.php |  93 +++++++
 phpBB/includes/auth/provider/ldap.php      | 386 +++++++++++++++++++++++++++++
 phpBB/includes/auth/provider_apache.php    | 275 --------------------
 phpBB/includes/auth/provider_db.php        | 337 -------------------------
 phpBB/includes/auth/provider_interface.php |  93 -------
 phpBB/includes/auth/provider_ldap.php      | 386 -----------------------------
 9 files changed, 1101 insertions(+), 1091 deletions(-)
 create mode 100644 phpBB/includes/auth/provider/apache.php
 create mode 100644 phpBB/includes/auth/provider/db.php
 create mode 100644 phpBB/includes/auth/provider/index.htm
 create mode 100644 phpBB/includes/auth/provider/interface.php
 create mode 100644 phpBB/includes/auth/provider/ldap.php
 delete mode 100644 phpBB/includes/auth/provider_apache.php
 delete mode 100644 phpBB/includes/auth/provider_db.php
 delete mode 100644 phpBB/includes/auth/provider_interface.php
 delete mode 100644 phpBB/includes/auth/provider_ldap.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider/apache.php b/phpBB/includes/auth/provider/apache.php
new file mode 100644
index 0000000000..5f6f2862b6
--- /dev/null
+++ b/phpBB/includes/auth/provider/apache.php
@@ -0,0 +1,275 @@
+<?php
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+ * Apache authentication provider for phpBB3
+ *
+ * @package auth
+ */
+class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
+{
+	/**
+	 * Apache Authentication Constructor
+	 *
+	 * @param 	phpbb_db_driver 	$db
+	 * @param 	phpbb_config 		$config
+	 * @param 	phpbb_request 		$request
+	 * @param 	phpbb_user 			$user
+	 * @param 	string 				$phpbb_root_path
+	 * @param 	string 				$php_ext
+	 */
+	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext)
+	{
+		$this->db = $db;
+		$this->config = $config;
+		$this->request = $request;
+		$this->user = $user;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function init()
+	{
+		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER) || $this->user->data['username'] !== htmlspecialchars_decode($this->request->server('PHP_AUTH_USER')))
+		{
+			return $this->user->lang['APACHE_SETUP_BEFORE_USE'];
+		}
+		return false;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function login($username, $password)
+	{
+		// do not allow empty password
+		if (!$password)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_PASSWORD,
+				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		if (!$username)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_USERNAME,
+				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
+		{
+			return array(
+				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
+				'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
+				'user_row'		=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		$php_auth_user = htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'));
+		$php_auth_pw = htmlspecialchars_decode($this->request->server('PHP_AUTH_PW'));
+
+		if (!empty($php_auth_user) && !empty($php_auth_pw))
+		{
+			if ($php_auth_user !== $username)
+			{
+				return array(
+					'status'	=> LOGIN_ERROR_USERNAME,
+					'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+					'user_row'	=> array('user_id' => ANONYMOUS),
+				);
+			}
+
+			$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type
+				FROM ' . USERS_TABLE . "
+				WHERE username = '" . $this->db->sql_escape($php_auth_user) . "'";
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if ($row)
+			{
+				// User inactive...
+				if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
+				{
+					return array(
+						'status'		=> LOGIN_ERROR_ACTIVE,
+						'error_msg'		=> 'ACTIVE_ERROR',
+						'user_row'		=> $row,
+					);
+				}
+
+				// Successful login...
+				return array(
+					'status'		=> LOGIN_SUCCESS,
+					'error_msg'		=> false,
+					'user_row'		=> $row,
+				);
+			}
+
+			// this is the user's first login so create an empty profile
+			return array(
+				'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
+				'error_msg'		=> false,
+				'user_row'		=> user_row_apache($php_auth_user, $php_auth_pw),
+			);
+		}
+
+		// Not logged into apache
+		return array(
+			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
+			'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
+			'user_row'		=> array('user_id' => ANONYMOUS),
+		);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function autologin()
+	{
+		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
+		{
+			return array();
+		}
+
+		$php_auth_user = htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'));
+		$php_auth_pw = htmlspecialchars_decode($this->request->server('PHP_AUTH_PW'));
+
+		if (!empty($php_auth_user) && !empty($php_auth_pw))
+		{
+			set_var($php_auth_user, $php_auth_user, 'string', true);
+			set_var($php_auth_pw, $php_auth_pw, 'string', true);
+
+			$sql = 'SELECT *
+				FROM ' . USERS_TABLE . "
+				WHERE username = '" . $this->db->sql_escape($php_auth_user) . "'";
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if ($row)
+			{
+				return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row;
+			}
+
+			if (!function_exists('user_add'))
+			{
+				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+			}
+
+			// create the user if he does not exist yet
+			user_add(user_row_apache($php_auth_user, $php_auth_pw));
+
+			$sql = 'SELECT *
+				FROM ' . USERS_TABLE . "
+				WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($php_auth_user)) . "'";
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if ($row)
+			{
+				return $row;
+			}
+		}
+
+		return array();
+	}
+
+	/**
+	 * This function generates an array which can be passed to the user_add
+	 * function in order to create a user
+	 *
+	 * @param 	string	$username 	The username of the new user.
+	 * @param 	string	$password 	The password of the new user.
+	 * @return 	array 				Contains data that can be passed directly to
+	 *								the user_add function.
+	 */
+	private function user_row($username, $password)
+	{
+		// first retrieve default group id
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . "
+			WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "'
+				AND group_type = " . GROUP_SPECIAL;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$row)
+		{
+			trigger_error('NO_GROUP');
+		}
+
+		// generate user account data
+		return array(
+			'username'		=> $username,
+			'user_password'	=> phpbb_hash($password),
+			'user_email'	=> '',
+			'group_id'		=> (int) $row['group_id'],
+			'user_type'		=> USER_NORMAL,
+			'user_ip'		=> $this->user->ip,
+			'user_new'		=> ($this->config['new_member_post_limit']) ? 1 : 0,
+		);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function validate_session($user)
+	{
+		// Check if PHP_AUTH_USER is set and handle this case
+		if ($this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
+		{
+			$php_auth_user = $this->request->server('PHP_AUTH_USER');
+
+			return ($php_auth_user === $user['username']) ? true : false;
+		}
+
+		// PHP_AUTH_USER is not set. A valid session is now determined by the user type (anonymous/bot or not)
+		if ($user['user_type'] == USER_IGNORE)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function acp($new)
+	{
+		return;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function logout($data, $new_session)
+	{
+		return;
+	}
+}
diff --git a/phpBB/includes/auth/provider/db.php b/phpBB/includes/auth/provider/db.php
new file mode 100644
index 0000000000..894041c9cf
--- /dev/null
+++ b/phpBB/includes/auth/provider/db.php
@@ -0,0 +1,337 @@
+<?php
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+ * Database authentication provider for phpBB3
+ *
+ * This is for authentication via the integrated user table
+ *
+ * @package auth
+ */
+class phpbb_auth_provider_db implements phpbb_auth_provider_interface
+{
+
+	/**
+	 * Database Authentication Constructor
+	 *
+	 * @param	phpbb_db_driver	$db
+	 * @param	phpbb_config 	$config
+	 * @param	phpbb_request	$request
+	 * @param	phpbb_user		$user
+	 * @param	string			$phpbb_root_path
+	 * @param	string			$php_ext
+	 */
+	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext)
+	{
+		$this->db = $db;
+		$this->config = $config;
+		$this->request = $request;
+		$this->user = $user;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function init()
+	{
+		return;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function login($username, $password)
+	{
+		// Auth plugins get the password untrimmed.
+		// For compatibility we trim() here.
+		$password = trim($password);
+
+		// do not allow empty password
+		if (!$password)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_PASSWORD,
+				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		if (!$username)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_USERNAME,
+				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		$username_clean = utf8_clean_string($username);
+
+		$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
+			FROM ' . USERS_TABLE . "
+			WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'";
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (($this->user->ip && !$this->config['ip_login_limit_use_forwarded']) ||
+			($this->user->forwarded_for && $this->config['ip_login_limit_use_forwarded']))
+		{
+			$sql = 'SELECT COUNT(*) AS attempts
+				FROM ' . LOGIN_ATTEMPT_TABLE . '
+				WHERE attempt_time > ' . (time() - (int) $this->config['ip_login_limit_time']);
+			if ($this->config['ip_login_limit_use_forwarded'])
+			{
+				$sql .= " AND attempt_forwarded_for = '" . $this->db->sql_escape($this->user->forwarded_for) . "'";
+			}
+			else
+			{
+				$sql .= " AND attempt_ip = '" . $this->db->sql_escape($this->user->ip) . "' ";
+			}
+
+			$result = $this->db->sql_query($sql);
+			$attempts = (int) $this->db->sql_fetchfield('attempts');
+			$this->db->sql_freeresult($result);
+
+			$attempt_data = array(
+				'attempt_ip'			=> $this->user->ip,
+				'attempt_browser'		=> trim(substr($this->user->browser, 0, 149)),
+				'attempt_forwarded_for'	=> $this->user->forwarded_for,
+				'attempt_time'			=> time(),
+				'user_id'				=> ($row) ? (int) $row['user_id'] : 0,
+				'username'				=> $username,
+				'username_clean'		=> $username_clean,
+			);
+			$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $this->db->sql_build_array('INSERT', $attempt_data);
+			$result = $this->db->sql_query($sql);
+		}
+		else
+		{
+			$attempts = 0;
+		}
+
+		if (!$row)
+		{
+			if ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max'])
+			{
+				return array(
+					'status'		=> LOGIN_ERROR_ATTEMPTS,
+					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
+					'user_row'		=> array('user_id' => ANONYMOUS),
+				);
+			}
+
+			return array(
+				'status'	=> LOGIN_ERROR_USERNAME,
+				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		$show_captcha = ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) ||
+			($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']);
+
+		// If there are too many login attempts, we need to check for a confirm image
+		// Every auth module is able to define what to do by itself...
+		if ($show_captcha)
+		{
+			// Visual Confirmation handling
+			if (!class_exists('phpbb_captcha_factory', false))
+			{
+				include ($this->phpbb_root_path . 'includes/captcha/captcha_factory.' . $this->php_ext);
+			}
+
+			$captcha = phpbb_captcha_factory::get_instance($this->config['captcha_plugin']);
+			$captcha->init(CONFIRM_LOGIN);
+			$vc_response = $captcha->validate($row);
+			if ($vc_response)
+			{
+				return array(
+					'status'		=> LOGIN_ERROR_ATTEMPTS,
+					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
+					'user_row'		=> $row,
+				);
+			}
+			else
+			{
+				$captcha->reset();
+			}
+
+		}
+
+		// If the password convert flag is set we need to convert it
+		if ($row['user_pass_convert'])
+		{
+			// enable super globals to get literal value
+			// this is needed to prevent unicode normalization
+			$super_globals_disabled = $this->request->super_globals_disabled();
+			if ($super_globals_disabled)
+			{
+				$this->request->enable_super_globals();
+			}
+
+			// in phpBB2 passwords were used exactly as they were sent, with addslashes applied
+			$password_old_format = isset($_REQUEST['password']) ? (string) $_REQUEST['password'] : '';
+			$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format;
+			$password_new_format = $this->request->variable('password', '', true);
+
+			if ($super_globals_disabled)
+			{
+				$this->request->disable_super_globals();
+			}
+
+			if ($password == $password_new_format)
+			{
+				if (!function_exists('utf8_to_cp1252'))
+				{
+					include($this->phpbb_root_path . 'includes/utf/data/recode_basic.' . $this->php_ext);
+				}
+
+				// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding
+				// plain md5 support left in for conversions from other systems.
+				if ((strlen($row['user_password']) == 34 && (phpbb_check_hash(md5($password_old_format), $row['user_password']) || phpbb_check_hash(md5(utf8_to_cp1252($password_old_format)), $row['user_password'])))
+					|| (strlen($row['user_password']) == 32  && (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password'])))
+				{
+					$hash = phpbb_hash($password_new_format);
+
+					// Update the password in the users table to the new format and remove user_pass_convert flag
+					$sql = 'UPDATE ' . USERS_TABLE . '
+						SET user_password = \'' . $this->db->sql_escape($hash) . '\',
+							user_pass_convert = 0
+						WHERE user_id = ' . $row['user_id'];
+					$this->db->sql_query($sql);
+
+					$row['user_pass_convert'] = 0;
+					$row['user_password'] = $hash;
+				}
+				else
+				{
+					// Although we weren't able to convert this password we have to
+					// increase login attempt count to make sure this cannot be exploited
+					$sql = 'UPDATE ' . USERS_TABLE . '
+						SET user_login_attempts = user_login_attempts + 1
+						WHERE user_id = ' . (int) $row['user_id'] . '
+							AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
+					$this->db->sql_query($sql);
+
+					return array(
+						'status'		=> LOGIN_ERROR_PASSWORD_CONVERT,
+						'error_msg'		=> 'LOGIN_ERROR_PASSWORD_CONVERT',
+						'user_row'		=> $row,
+					);
+				}
+			}
+		}
+
+		// Check password ...
+		if (!$row['user_pass_convert'] && phpbb_check_hash($password, $row['user_password']))
+		{
+			// Check for old password hash...
+			if (strlen($row['user_password']) == 32)
+			{
+				$hash = phpbb_hash($password);
+
+				// Update the password in the users table to the new format
+				$sql = 'UPDATE ' . USERS_TABLE . "
+					SET user_password = '" . $this->db->sql_escape($hash) . "',
+						user_pass_convert = 0
+					WHERE user_id = {$row['user_id']}";
+				$this->db->sql_query($sql);
+
+				$row['user_password'] = $hash;
+			}
+
+			$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
+				WHERE user_id = ' . $row['user_id'];
+			$this->db->sql_query($sql);
+
+			if ($row['user_login_attempts'] != 0)
+			{
+				// Successful, reset login attempts (the user passed all stages)
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET user_login_attempts = 0
+					WHERE user_id = ' . $row['user_id'];
+				$this->db->sql_query($sql);
+			}
+
+			// User inactive...
+			if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
+			{
+				return array(
+					'status'		=> LOGIN_ERROR_ACTIVE,
+					'error_msg'		=> 'ACTIVE_ERROR',
+					'user_row'		=> $row,
+				);
+			}
+
+			// Successful login... set user_login_attempts to zero...
+			return array(
+				'status'		=> LOGIN_SUCCESS,
+				'error_msg'		=> false,
+				'user_row'		=> $row,
+			);
+		}
+
+		// Password incorrect - increase login attempts
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET user_login_attempts = user_login_attempts + 1
+			WHERE user_id = ' . (int) $row['user_id'] . '
+				AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
+		$this->db->sql_query($sql);
+
+		// Give status about wrong password...
+		return array(
+			'status'		=> ($show_captcha) ? LOGIN_ERROR_ATTEMPTS : LOGIN_ERROR_PASSWORD,
+			'error_msg'		=> ($show_captcha) ? 'LOGIN_ERROR_ATTEMPTS' : 'LOGIN_ERROR_PASSWORD',
+			'user_row'		=> $row,
+		);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function autologin()
+	{
+		return;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function acp($new)
+	{
+		return;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function logout($data, $new_session)
+	{
+		return;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function validate_session($user)
+	{
+		return;
+	}
+}
diff --git a/phpBB/includes/auth/provider/index.htm b/phpBB/includes/auth/provider/index.htm
new file mode 100644
index 0000000000..ee1f723a7d
--- /dev/null
+++ b/phpBB/includes/auth/provider/index.htm
@@ -0,0 +1,10 @@
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+
+</body>
+</html>
diff --git a/phpBB/includes/auth/provider/interface.php b/phpBB/includes/auth/provider/interface.php
new file mode 100644
index 0000000000..2d1935f8f0
--- /dev/null
+++ b/phpBB/includes/auth/provider/interface.php
@@ -0,0 +1,93 @@
+<?php
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+ * The interface authentication provider classes have to implement.
+ *
+ * @package auth
+ */
+interface phpbb_auth_provider_interface
+{
+	/**
+	 * Checks whether the user is currently identified to the authentication
+	 * provider.
+	 * Called in acp_board while setting authentication plugins.
+	 * Changing to an authentication provider will not be permitted in acp_board
+	 * if there is an error.
+	 *
+	 * @return 	boolean|string 	False if the user is identified, otherwise an
+	 *							error message, or null if not implemented.
+	 */
+	public function init();
+
+	/**
+	 * Performs login.
+	 *
+	 * @param	string	$username 	The name of the user being authenticated.
+	 * @param	string	$password	The password of the user.
+	 * @return	array	An associative array of the format:
+	 *						array(
+	 *							'status' => status constant
+	 *							'error_msg' => string
+	 *							'user_row' => array
+	 *						)
+	 */
+	public function login($username, $password);
+
+	/**
+	 * Autologin function
+	 *
+	 * @return 	array|null	containing the user row, empty if no auto login
+	 * 						should take place, or null if not impletmented.
+	 */
+	public function autologin();
+
+	/**
+	 * This function is used to output any required fields in the authentication
+	 * admin panel. It also defines any required configuration table fields.
+	 *
+	 * @param 	array 	$new 	Contains the new configuration values that have
+	 * 							been set in acp_board.
+	 * @return	array|null	Returns null if not implemented or an array of the
+	 *						form:
+	 *							array(
+	 *								'tpl'		=> string
+	 *								'config' 	=> array
+	 *							)
+	 */
+	public function acp($new);
+
+	/**
+	 * Performs additional actions during logout.
+	 *
+	 * @param 	array	$data			An array corresponding to
+	 *									phpbb_session::data
+	 * @param 	boolean	$new_session	True for a new session, false for no new
+	 *									session.
+	 */
+	public function logout($data, $new_session);
+
+	/**
+	 * The session validation function checks whether the user is still logged
+	 * into phpBB.
+	 *
+	 * @param 	array 	$user
+	 * @return 	boolean	true if the given user is authenticated, false if the 
+	 * 					session should be closed, or null if not implemented.
+	 */
+	public function validate_session($user);
+}
diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
new file mode 100644
index 0000000000..f67c1e9247
--- /dev/null
+++ b/phpBB/includes/auth/provider/ldap.php
@@ -0,0 +1,386 @@
+<?php
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+ * Database authentication provider for phpBB3
+ *
+ * This is for authentication via the integrated user table
+ *
+ * @package auth
+ */
+class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
+{
+	/**
+	 * LDAP Authentication Constructor
+	 *
+	 * @param 	phpbb_db_driver	$db
+	 * @param 	phpbb_config	$config
+	 * @param 	phpbb_user		$user
+	 */
+	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_user $user)
+	{
+		$this->db = $db;
+		$this->config = $config;
+		$this->user = $user;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function init()
+	{
+		if (!@extension_loaded('ldap'))
+		{
+			return $this->user->lang['LDAP_NO_LDAP_EXTENSION'];
+		}
+
+		$this->config['ldap_port'] = (int) $this->config['ldap_port'];
+		if ($this->config['ldap_port'])
+		{
+			$ldap = @ldap_connect($this->config['ldap_server'], $this->config['ldap_port']);
+		}
+		else
+		{
+			$ldap = @ldap_connect($this->config['ldap_server']);
+		}
+
+		if (!$ldap)
+		{
+			return $this->user->lang['LDAP_NO_SERVER_CONNECTION'];
+		}
+
+		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
+		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
+
+		if ($this->config['ldap_user'] || $this->config['ldap_password'])
+		{
+			if (!@ldap_bind($ldap, htmlspecialchars_decode($this->config['ldap_user']), htmlspecialchars_decode($this->config['ldap_password'])))
+			{
+				return $this->user->lang['LDAP_INCORRECT_USER_PASSWORD'];
+			}
+		}
+
+		// ldap_connect only checks whether the specified server is valid, so the connection might still fail
+		$search = @ldap_search(
+			$ldap,
+			htmlspecialchars_decode($this->config['ldap_base_dn']),
+			$this->ldap_user_filter($this->user->data['username']),
+			(empty($this->config['ldap_email'])) ?
+				array(htmlspecialchars_decode($this->config['ldap_uid'])) :
+				array(htmlspecialchars_decode($this->config['ldap_uid']), htmlspecialchars_decode($this->config['ldap_email'])),
+			0,
+			1
+		);
+
+		if ($search === false)
+		{
+			return $this->user->lang['LDAP_SEARCH_FAILED'];
+		}
+
+		$result = @ldap_get_entries($ldap, $search);
+
+		@ldap_close($ldap);
+
+
+		if (!is_array($result) || sizeof($result) < 2)
+		{
+			return sprintf($this->user->lang['LDAP_NO_IDENTITY'], $this->user->data['username']);
+		}
+
+		if (!empty($this->config['ldap_email']) && !isset($result[0][htmlspecialchars_decode($this->config['ldap_email'])]))
+		{
+			return $this->user->lang['LDAP_NO_EMAIL'];
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function login($username, $password)
+	{
+		// do not allow empty password
+		if (!$password)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_PASSWORD,
+				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		if (!$username)
+		{
+			return array(
+				'status'	=> LOGIN_ERROR_USERNAME,
+				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+				'user_row'	=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		if (!@extension_loaded('ldap'))
+		{
+			return array(
+				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
+				'error_msg'		=> 'LDAP_NO_LDAP_EXTENSION',
+				'user_row'		=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		$this->config['ldap_port'] = (int) $this->config['ldap_port'];
+		if ($this->config['ldap_port'])
+		{
+			$ldap = @ldap_connect($this->config['ldap_server'], $this->config['ldap_port']);
+		}
+		else
+		{
+			$ldap = @ldap_connect($this->config['ldap_server']);
+		}
+
+		if (!$ldap)
+		{
+			return array(
+				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
+				'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
+				'user_row'		=> array('user_id' => ANONYMOUS),
+			);
+		}
+
+		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
+		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
+
+		if ($this->config['ldap_user'] || $this->config['ldap_password'])
+		{
+			if (!@ldap_bind($ldap, htmlspecialchars_decode($this->config['ldap_user']), htmlspecialchars_decode($this->config['ldap_password'])))
+			{
+				return array(
+					'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
+					'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
+					'user_row'		=> array('user_id' => ANONYMOUS),
+				);
+			}
+		}
+
+		$search = @ldap_search(
+			$ldap,
+			htmlspecialchars_decode($this->config['ldap_base_dn']),
+			$this->ldap_user_filter($username),
+			(empty($this->config['ldap_email'])) ?
+				array(htmlspecialchars_decode($this->config['ldap_uid'])) :
+				array(htmlspecialchars_decode($this->config['ldap_uid']), htmlspecialchars_decode($this->config['ldap_email'])),
+			0,
+			1
+		);
+
+		$ldap_result = @ldap_get_entries($ldap, $search);
+
+		if (is_array($ldap_result) && sizeof($ldap_result) > 1)
+		{
+			if (@ldap_bind($ldap, $ldap_result[0]['dn'], htmlspecialchars_decode($password)))
+			{
+				@ldap_close($ldap);
+
+				$sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type
+					FROM ' . USERS_TABLE . "
+					WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($username)) . "'";
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				if ($row)
+				{
+					unset($ldap_result);
+
+					// User inactive...
+					if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
+					{
+						return array(
+							'status'		=> LOGIN_ERROR_ACTIVE,
+							'error_msg'		=> 'ACTIVE_ERROR',
+							'user_row'		=> $row,
+						);
+					}
+
+					// Successful login... set user_login_attempts to zero...
+					return array(
+						'status'		=> LOGIN_SUCCESS,
+						'error_msg'		=> false,
+						'user_row'		=> $row,
+					);
+				}
+				else
+				{
+					// retrieve default group id
+					$sql = 'SELECT group_id
+						FROM ' . GROUPS_TABLE . "
+						WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "'
+							AND group_type = " . GROUP_SPECIAL;
+					$result = $this->db->sql_query($sql);
+					$row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					if (!$row)
+					{
+						trigger_error('NO_GROUP');
+					}
+
+					// generate user account data
+					$ldap_user_row = array(
+						'username'		=> $username,
+						'user_password'	=> phpbb_hash($password),
+						'user_email'	=> (!empty($this->config['ldap_email'])) ? utf8_htmlspecialchars($ldap_result[0][htmlspecialchars_decode($this->config['ldap_email'])][0]) : '',
+						'group_id'		=> (int) $row['group_id'],
+						'user_type'		=> USER_NORMAL,
+						'user_ip'		=> $this->user->ip,
+						'user_new'		=> ($this->config['new_member_post_limit']) ? 1 : 0,
+					);
+
+					unset($ldap_result);
+
+					// this is the user's first login so create an empty profile
+					return array(
+						'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
+						'error_msg'		=> false,
+						'user_row'		=> $ldap_user_row,
+					);
+				}
+			}
+			else
+			{
+				unset($ldap_result);
+				@ldap_close($ldap);
+
+				// Give status about wrong password...
+				return array(
+					'status'		=> LOGIN_ERROR_PASSWORD,
+					'error_msg'		=> 'LOGIN_ERROR_PASSWORD',
+					'user_row'		=> array('user_id' => ANONYMOUS),
+				);
+			}
+		}
+
+		@ldap_close($ldap);
+
+		return array(
+			'status'	=> LOGIN_ERROR_USERNAME,
+			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
+			'user_row'	=> array('user_id' => ANONYMOUS),
+		);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function autologin()
+	{
+		return;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function acp($new)
+	{
+		$tpl = '
+
+		<dl>
+			<dt><label for="ldap_server">' . $this->user->lang['LDAP_SERVER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="' . $new['ldap_server'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_port">' . $this->user->lang['LDAP_PORT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="' . $new['ldap_port'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_dn">' . $this->user->lang['LDAP_DN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_DN_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_uid">' . $this->user->lang['LDAP_UID'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_UID_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_user_filter">' . $this->user->lang['LDAP_USER_FILTER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="' . $new['ldap_user_filter'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_email">' . $this->user->lang['LDAP_EMAIL'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt>
+			<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_user">' . $this->user->lang['LDAP_USER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_USER_EXPLAIN'] . '</span></dt>
+			<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="' . $new['ldap_user'] . '" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="ldap_password">' . $this->user->lang['LDAP_PASSWORD'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt>
+			<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" autocomplete="off" /></dd>
+		</dl>
+		';
+
+		// These are fields required in the config table
+		return array(
+			'tpl'		=> $tpl,
+			'config'	=> array('ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password')
+		);
+	}
+
+	/**
+	 * Generates a filter string for ldap_search to find a user
+	 *
+	 * @param	$username	string	Username identifying the searched user
+	 *
+	 * @return				string	A filter string for ldap_search
+	 */
+	private function ldap_user_filter($username)
+	{
+		$filter = '(' . $this->config['ldap_uid'] . '=' . $this->ldap_escape(htmlspecialchars_decode($username)) . ')';
+		if ($this->config['ldap_user_filter'])
+		{
+			$_filter = ($this->config['ldap_user_filter'][0] == '(' && substr($this->config['ldap_user_filter'], -1) == ')') ? $this->config['ldap_user_filter'] : "({$this->config['ldap_user_filter']})";
+			$filter = "(&{$filter}{$_filter})";
+		}
+		return $filter;
+	}
+
+	/**
+	 * Escapes an LDAP AttributeValue
+	 *
+	 * @param	string	$string	The string to be escaped
+	 * @return	string	The escaped string
+	 */
+	private function ldap_escape($string)
+	{
+		return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function logout($data, $new_session)
+	{
+		return;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function validate_session($user)
+	{
+		return;
+	}
+}
diff --git a/phpBB/includes/auth/provider_apache.php b/phpBB/includes/auth/provider_apache.php
deleted file mode 100644
index 5f6f2862b6..0000000000
--- a/phpBB/includes/auth/provider_apache.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-/**
-*
-* @package auth
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * Apache authentication provider for phpBB3
- *
- * @package auth
- */
-class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
-{
-	/**
-	 * Apache Authentication Constructor
-	 *
-	 * @param 	phpbb_db_driver 	$db
-	 * @param 	phpbb_config 		$config
-	 * @param 	phpbb_request 		$request
-	 * @param 	phpbb_user 			$user
-	 * @param 	string 				$phpbb_root_path
-	 * @param 	string 				$php_ext
-	 */
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext)
-	{
-		$this->db = $db;
-		$this->config = $config;
-		$this->request = $request;
-		$this->user = $user;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function init()
-	{
-		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER) || $this->user->data['username'] !== htmlspecialchars_decode($this->request->server('PHP_AUTH_USER')))
-		{
-			return $this->user->lang['APACHE_SETUP_BEFORE_USE'];
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function login($username, $password)
-	{
-		// do not allow empty password
-		if (!$password)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_PASSWORD,
-				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		if (!$username)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-				'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
-				'user_row'		=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$php_auth_user = htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'));
-		$php_auth_pw = htmlspecialchars_decode($this->request->server('PHP_AUTH_PW'));
-
-		if (!empty($php_auth_user) && !empty($php_auth_pw))
-		{
-			if ($php_auth_user !== $username)
-			{
-				return array(
-					'status'	=> LOGIN_ERROR_USERNAME,
-					'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-					'user_row'	=> array('user_id' => ANONYMOUS),
-				);
-			}
-
-			$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type
-				FROM ' . USERS_TABLE . "
-				WHERE username = '" . $this->db->sql_escape($php_auth_user) . "'";
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if ($row)
-			{
-				// User inactive...
-				if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
-				{
-					return array(
-						'status'		=> LOGIN_ERROR_ACTIVE,
-						'error_msg'		=> 'ACTIVE_ERROR',
-						'user_row'		=> $row,
-					);
-				}
-
-				// Successful login...
-				return array(
-					'status'		=> LOGIN_SUCCESS,
-					'error_msg'		=> false,
-					'user_row'		=> $row,
-				);
-			}
-
-			// this is the user's first login so create an empty profile
-			return array(
-				'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
-				'error_msg'		=> false,
-				'user_row'		=> user_row_apache($php_auth_user, $php_auth_pw),
-			);
-		}
-
-		// Not logged into apache
-		return array(
-			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-			'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
-			'user_row'		=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function autologin()
-	{
-		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
-		{
-			return array();
-		}
-
-		$php_auth_user = htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'));
-		$php_auth_pw = htmlspecialchars_decode($this->request->server('PHP_AUTH_PW'));
-
-		if (!empty($php_auth_user) && !empty($php_auth_pw))
-		{
-			set_var($php_auth_user, $php_auth_user, 'string', true);
-			set_var($php_auth_pw, $php_auth_pw, 'string', true);
-
-			$sql = 'SELECT *
-				FROM ' . USERS_TABLE . "
-				WHERE username = '" . $this->db->sql_escape($php_auth_user) . "'";
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if ($row)
-			{
-				return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row;
-			}
-
-			if (!function_exists('user_add'))
-			{
-				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-			}
-
-			// create the user if he does not exist yet
-			user_add(user_row_apache($php_auth_user, $php_auth_pw));
-
-			$sql = 'SELECT *
-				FROM ' . USERS_TABLE . "
-				WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($php_auth_user)) . "'";
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if ($row)
-			{
-				return $row;
-			}
-		}
-
-		return array();
-	}
-
-	/**
-	 * This function generates an array which can be passed to the user_add
-	 * function in order to create a user
-	 *
-	 * @param 	string	$username 	The username of the new user.
-	 * @param 	string	$password 	The password of the new user.
-	 * @return 	array 				Contains data that can be passed directly to
-	 *								the user_add function.
-	 */
-	private function user_row($username, $password)
-	{
-		// first retrieve default group id
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "'
-				AND group_type = " . GROUP_SPECIAL;
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			trigger_error('NO_GROUP');
-		}
-
-		// generate user account data
-		return array(
-			'username'		=> $username,
-			'user_password'	=> phpbb_hash($password),
-			'user_email'	=> '',
-			'group_id'		=> (int) $row['group_id'],
-			'user_type'		=> USER_NORMAL,
-			'user_ip'		=> $this->user->ip,
-			'user_new'		=> ($this->config['new_member_post_limit']) ? 1 : 0,
-		);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function validate_session($user)
-	{
-		// Check if PHP_AUTH_USER is set and handle this case
-		if ($this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
-		{
-			$php_auth_user = $this->request->server('PHP_AUTH_USER');
-
-			return ($php_auth_user === $user['username']) ? true : false;
-		}
-
-		// PHP_AUTH_USER is not set. A valid session is now determined by the user type (anonymous/bot or not)
-		if ($user['user_type'] == USER_IGNORE)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function acp($new)
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function logout($data, $new_session)
-	{
-		return;
-	}
-}
diff --git a/phpBB/includes/auth/provider_db.php b/phpBB/includes/auth/provider_db.php
deleted file mode 100644
index 894041c9cf..0000000000
--- a/phpBB/includes/auth/provider_db.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/**
-*
-* @package auth
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * Database authentication provider for phpBB3
- *
- * This is for authentication via the integrated user table
- *
- * @package auth
- */
-class phpbb_auth_provider_db implements phpbb_auth_provider_interface
-{
-
-	/**
-	 * Database Authentication Constructor
-	 *
-	 * @param	phpbb_db_driver	$db
-	 * @param	phpbb_config 	$config
-	 * @param	phpbb_request	$request
-	 * @param	phpbb_user		$user
-	 * @param	string			$phpbb_root_path
-	 * @param	string			$php_ext
-	 */
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext)
-	{
-		$this->db = $db;
-		$this->config = $config;
-		$this->request = $request;
-		$this->user = $user;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function init()
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function login($username, $password)
-	{
-		// Auth plugins get the password untrimmed.
-		// For compatibility we trim() here.
-		$password = trim($password);
-
-		// do not allow empty password
-		if (!$password)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_PASSWORD,
-				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		if (!$username)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$username_clean = utf8_clean_string($username);
-
-		$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'";
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (($this->user->ip && !$this->config['ip_login_limit_use_forwarded']) ||
-			($this->user->forwarded_for && $this->config['ip_login_limit_use_forwarded']))
-		{
-			$sql = 'SELECT COUNT(*) AS attempts
-				FROM ' . LOGIN_ATTEMPT_TABLE . '
-				WHERE attempt_time > ' . (time() - (int) $this->config['ip_login_limit_time']);
-			if ($this->config['ip_login_limit_use_forwarded'])
-			{
-				$sql .= " AND attempt_forwarded_for = '" . $this->db->sql_escape($this->user->forwarded_for) . "'";
-			}
-			else
-			{
-				$sql .= " AND attempt_ip = '" . $this->db->sql_escape($this->user->ip) . "' ";
-			}
-
-			$result = $this->db->sql_query($sql);
-			$attempts = (int) $this->db->sql_fetchfield('attempts');
-			$this->db->sql_freeresult($result);
-
-			$attempt_data = array(
-				'attempt_ip'			=> $this->user->ip,
-				'attempt_browser'		=> trim(substr($this->user->browser, 0, 149)),
-				'attempt_forwarded_for'	=> $this->user->forwarded_for,
-				'attempt_time'			=> time(),
-				'user_id'				=> ($row) ? (int) $row['user_id'] : 0,
-				'username'				=> $username,
-				'username_clean'		=> $username_clean,
-			);
-			$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $this->db->sql_build_array('INSERT', $attempt_data);
-			$result = $this->db->sql_query($sql);
-		}
-		else
-		{
-			$attempts = 0;
-		}
-
-		if (!$row)
-		{
-			if ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max'])
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ATTEMPTS,
-					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
-					'user_row'		=> array('user_id' => ANONYMOUS),
-				);
-			}
-
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$show_captcha = ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) ||
-			($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']);
-
-		// If there are too many login attempts, we need to check for a confirm image
-		// Every auth module is able to define what to do by itself...
-		if ($show_captcha)
-		{
-			// Visual Confirmation handling
-			if (!class_exists('phpbb_captcha_factory', false))
-			{
-				include ($this->phpbb_root_path . 'includes/captcha/captcha_factory.' . $this->php_ext);
-			}
-
-			$captcha = phpbb_captcha_factory::get_instance($this->config['captcha_plugin']);
-			$captcha->init(CONFIRM_LOGIN);
-			$vc_response = $captcha->validate($row);
-			if ($vc_response)
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ATTEMPTS,
-					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
-					'user_row'		=> $row,
-				);
-			}
-			else
-			{
-				$captcha->reset();
-			}
-
-		}
-
-		// If the password convert flag is set we need to convert it
-		if ($row['user_pass_convert'])
-		{
-			// enable super globals to get literal value
-			// this is needed to prevent unicode normalization
-			$super_globals_disabled = $this->request->super_globals_disabled();
-			if ($super_globals_disabled)
-			{
-				$this->request->enable_super_globals();
-			}
-
-			// in phpBB2 passwords were used exactly as they were sent, with addslashes applied
-			$password_old_format = isset($_REQUEST['password']) ? (string) $_REQUEST['password'] : '';
-			$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format;
-			$password_new_format = $this->request->variable('password', '', true);
-
-			if ($super_globals_disabled)
-			{
-				$this->request->disable_super_globals();
-			}
-
-			if ($password == $password_new_format)
-			{
-				if (!function_exists('utf8_to_cp1252'))
-				{
-					include($this->phpbb_root_path . 'includes/utf/data/recode_basic.' . $this->php_ext);
-				}
-
-				// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding
-				// plain md5 support left in for conversions from other systems.
-				if ((strlen($row['user_password']) == 34 && (phpbb_check_hash(md5($password_old_format), $row['user_password']) || phpbb_check_hash(md5(utf8_to_cp1252($password_old_format)), $row['user_password'])))
-					|| (strlen($row['user_password']) == 32  && (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password'])))
-				{
-					$hash = phpbb_hash($password_new_format);
-
-					// Update the password in the users table to the new format and remove user_pass_convert flag
-					$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_password = \'' . $this->db->sql_escape($hash) . '\',
-							user_pass_convert = 0
-						WHERE user_id = ' . $row['user_id'];
-					$this->db->sql_query($sql);
-
-					$row['user_pass_convert'] = 0;
-					$row['user_password'] = $hash;
-				}
-				else
-				{
-					// Although we weren't able to convert this password we have to
-					// increase login attempt count to make sure this cannot be exploited
-					$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_login_attempts = user_login_attempts + 1
-						WHERE user_id = ' . (int) $row['user_id'] . '
-							AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
-					$this->db->sql_query($sql);
-
-					return array(
-						'status'		=> LOGIN_ERROR_PASSWORD_CONVERT,
-						'error_msg'		=> 'LOGIN_ERROR_PASSWORD_CONVERT',
-						'user_row'		=> $row,
-					);
-				}
-			}
-		}
-
-		// Check password ...
-		if (!$row['user_pass_convert'] && phpbb_check_hash($password, $row['user_password']))
-		{
-			// Check for old password hash...
-			if (strlen($row['user_password']) == 32)
-			{
-				$hash = phpbb_hash($password);
-
-				// Update the password in the users table to the new format
-				$sql = 'UPDATE ' . USERS_TABLE . "
-					SET user_password = '" . $this->db->sql_escape($hash) . "',
-						user_pass_convert = 0
-					WHERE user_id = {$row['user_id']}";
-				$this->db->sql_query($sql);
-
-				$row['user_password'] = $hash;
-			}
-
-			$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
-				WHERE user_id = ' . $row['user_id'];
-			$this->db->sql_query($sql);
-
-			if ($row['user_login_attempts'] != 0)
-			{
-				// Successful, reset login attempts (the user passed all stages)
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_login_attempts = 0
-					WHERE user_id = ' . $row['user_id'];
-				$this->db->sql_query($sql);
-			}
-
-			// User inactive...
-			if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ACTIVE,
-					'error_msg'		=> 'ACTIVE_ERROR',
-					'user_row'		=> $row,
-				);
-			}
-
-			// Successful login... set user_login_attempts to zero...
-			return array(
-				'status'		=> LOGIN_SUCCESS,
-				'error_msg'		=> false,
-				'user_row'		=> $row,
-			);
-		}
-
-		// Password incorrect - increase login attempts
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_login_attempts = user_login_attempts + 1
-			WHERE user_id = ' . (int) $row['user_id'] . '
-				AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
-		$this->db->sql_query($sql);
-
-		// Give status about wrong password...
-		return array(
-			'status'		=> ($show_captcha) ? LOGIN_ERROR_ATTEMPTS : LOGIN_ERROR_PASSWORD,
-			'error_msg'		=> ($show_captcha) ? 'LOGIN_ERROR_ATTEMPTS' : 'LOGIN_ERROR_PASSWORD',
-			'user_row'		=> $row,
-		);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function autologin()
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function acp($new)
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function logout($data, $new_session)
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function validate_session($user)
-	{
-		return;
-	}
-}
diff --git a/phpBB/includes/auth/provider_interface.php b/phpBB/includes/auth/provider_interface.php
deleted file mode 100644
index 2d1935f8f0..0000000000
--- a/phpBB/includes/auth/provider_interface.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
-*
-* @package auth
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * The interface authentication provider classes have to implement.
- *
- * @package auth
- */
-interface phpbb_auth_provider_interface
-{
-	/**
-	 * Checks whether the user is currently identified to the authentication
-	 * provider.
-	 * Called in acp_board while setting authentication plugins.
-	 * Changing to an authentication provider will not be permitted in acp_board
-	 * if there is an error.
-	 *
-	 * @return 	boolean|string 	False if the user is identified, otherwise an
-	 *							error message, or null if not implemented.
-	 */
-	public function init();
-
-	/**
-	 * Performs login.
-	 *
-	 * @param	string	$username 	The name of the user being authenticated.
-	 * @param	string	$password	The password of the user.
-	 * @return	array	An associative array of the format:
-	 *						array(
-	 *							'status' => status constant
-	 *							'error_msg' => string
-	 *							'user_row' => array
-	 *						)
-	 */
-	public function login($username, $password);
-
-	/**
-	 * Autologin function
-	 *
-	 * @return 	array|null	containing the user row, empty if no auto login
-	 * 						should take place, or null if not impletmented.
-	 */
-	public function autologin();
-
-	/**
-	 * This function is used to output any required fields in the authentication
-	 * admin panel. It also defines any required configuration table fields.
-	 *
-	 * @param 	array 	$new 	Contains the new configuration values that have
-	 * 							been set in acp_board.
-	 * @return	array|null	Returns null if not implemented or an array of the
-	 *						form:
-	 *							array(
-	 *								'tpl'		=> string
-	 *								'config' 	=> array
-	 *							)
-	 */
-	public function acp($new);
-
-	/**
-	 * Performs additional actions during logout.
-	 *
-	 * @param 	array	$data			An array corresponding to
-	 *									phpbb_session::data
-	 * @param 	boolean	$new_session	True for a new session, false for no new
-	 *									session.
-	 */
-	public function logout($data, $new_session);
-
-	/**
-	 * The session validation function checks whether the user is still logged
-	 * into phpBB.
-	 *
-	 * @param 	array 	$user
-	 * @return 	boolean	true if the given user is authenticated, false if the 
-	 * 					session should be closed, or null if not implemented.
-	 */
-	public function validate_session($user);
-}
diff --git a/phpBB/includes/auth/provider_ldap.php b/phpBB/includes/auth/provider_ldap.php
deleted file mode 100644
index f67c1e9247..0000000000
--- a/phpBB/includes/auth/provider_ldap.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-/**
-*
-* @package auth
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * Database authentication provider for phpBB3
- *
- * This is for authentication via the integrated user table
- *
- * @package auth
- */
-class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
-{
-	/**
-	 * LDAP Authentication Constructor
-	 *
-	 * @param 	phpbb_db_driver	$db
-	 * @param 	phpbb_config	$config
-	 * @param 	phpbb_user		$user
-	 */
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_user $user)
-	{
-		$this->db = $db;
-		$this->config = $config;
-		$this->user = $user;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function init()
-	{
-		if (!@extension_loaded('ldap'))
-		{
-			return $this->user->lang['LDAP_NO_LDAP_EXTENSION'];
-		}
-
-		$this->config['ldap_port'] = (int) $this->config['ldap_port'];
-		if ($this->config['ldap_port'])
-		{
-			$ldap = @ldap_connect($this->config['ldap_server'], $this->config['ldap_port']);
-		}
-		else
-		{
-			$ldap = @ldap_connect($this->config['ldap_server']);
-		}
-
-		if (!$ldap)
-		{
-			return $this->user->lang['LDAP_NO_SERVER_CONNECTION'];
-		}
-
-		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
-		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
-
-		if ($this->config['ldap_user'] || $this->config['ldap_password'])
-		{
-			if (!@ldap_bind($ldap, htmlspecialchars_decode($this->config['ldap_user']), htmlspecialchars_decode($this->config['ldap_password'])))
-			{
-				return $this->user->lang['LDAP_INCORRECT_USER_PASSWORD'];
-			}
-		}
-
-		// ldap_connect only checks whether the specified server is valid, so the connection might still fail
-		$search = @ldap_search(
-			$ldap,
-			htmlspecialchars_decode($this->config['ldap_base_dn']),
-			$this->ldap_user_filter($this->user->data['username']),
-			(empty($this->config['ldap_email'])) ?
-				array(htmlspecialchars_decode($this->config['ldap_uid'])) :
-				array(htmlspecialchars_decode($this->config['ldap_uid']), htmlspecialchars_decode($this->config['ldap_email'])),
-			0,
-			1
-		);
-
-		if ($search === false)
-		{
-			return $this->user->lang['LDAP_SEARCH_FAILED'];
-		}
-
-		$result = @ldap_get_entries($ldap, $search);
-
-		@ldap_close($ldap);
-
-
-		if (!is_array($result) || sizeof($result) < 2)
-		{
-			return sprintf($this->user->lang['LDAP_NO_IDENTITY'], $this->user->data['username']);
-		}
-
-		if (!empty($this->config['ldap_email']) && !isset($result[0][htmlspecialchars_decode($this->config['ldap_email'])]))
-		{
-			return $this->user->lang['LDAP_NO_EMAIL'];
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function login($username, $password)
-	{
-		// do not allow empty password
-		if (!$password)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_PASSWORD,
-				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		if (!$username)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		if (!@extension_loaded('ldap'))
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-				'error_msg'		=> 'LDAP_NO_LDAP_EXTENSION',
-				'user_row'		=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$this->config['ldap_port'] = (int) $this->config['ldap_port'];
-		if ($this->config['ldap_port'])
-		{
-			$ldap = @ldap_connect($this->config['ldap_server'], $this->config['ldap_port']);
-		}
-		else
-		{
-			$ldap = @ldap_connect($this->config['ldap_server']);
-		}
-
-		if (!$ldap)
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-				'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
-				'user_row'		=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
-		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
-
-		if ($this->config['ldap_user'] || $this->config['ldap_password'])
-		{
-			if (!@ldap_bind($ldap, htmlspecialchars_decode($this->config['ldap_user']), htmlspecialchars_decode($this->config['ldap_password'])))
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-					'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
-					'user_row'		=> array('user_id' => ANONYMOUS),
-				);
-			}
-		}
-
-		$search = @ldap_search(
-			$ldap,
-			htmlspecialchars_decode($this->config['ldap_base_dn']),
-			$this->ldap_user_filter($username),
-			(empty($this->config['ldap_email'])) ?
-				array(htmlspecialchars_decode($this->config['ldap_uid'])) :
-				array(htmlspecialchars_decode($this->config['ldap_uid']), htmlspecialchars_decode($this->config['ldap_email'])),
-			0,
-			1
-		);
-
-		$ldap_result = @ldap_get_entries($ldap, $search);
-
-		if (is_array($ldap_result) && sizeof($ldap_result) > 1)
-		{
-			if (@ldap_bind($ldap, $ldap_result[0]['dn'], htmlspecialchars_decode($password)))
-			{
-				@ldap_close($ldap);
-
-				$sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type
-					FROM ' . USERS_TABLE . "
-					WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($username)) . "'";
-				$result = $this->db->sql_query($sql);
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				if ($row)
-				{
-					unset($ldap_result);
-
-					// User inactive...
-					if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
-					{
-						return array(
-							'status'		=> LOGIN_ERROR_ACTIVE,
-							'error_msg'		=> 'ACTIVE_ERROR',
-							'user_row'		=> $row,
-						);
-					}
-
-					// Successful login... set user_login_attempts to zero...
-					return array(
-						'status'		=> LOGIN_SUCCESS,
-						'error_msg'		=> false,
-						'user_row'		=> $row,
-					);
-				}
-				else
-				{
-					// retrieve default group id
-					$sql = 'SELECT group_id
-						FROM ' . GROUPS_TABLE . "
-						WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "'
-							AND group_type = " . GROUP_SPECIAL;
-					$result = $this->db->sql_query($sql);
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					if (!$row)
-					{
-						trigger_error('NO_GROUP');
-					}
-
-					// generate user account data
-					$ldap_user_row = array(
-						'username'		=> $username,
-						'user_password'	=> phpbb_hash($password),
-						'user_email'	=> (!empty($this->config['ldap_email'])) ? utf8_htmlspecialchars($ldap_result[0][htmlspecialchars_decode($this->config['ldap_email'])][0]) : '',
-						'group_id'		=> (int) $row['group_id'],
-						'user_type'		=> USER_NORMAL,
-						'user_ip'		=> $this->user->ip,
-						'user_new'		=> ($this->config['new_member_post_limit']) ? 1 : 0,
-					);
-
-					unset($ldap_result);
-
-					// this is the user's first login so create an empty profile
-					return array(
-						'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
-						'error_msg'		=> false,
-						'user_row'		=> $ldap_user_row,
-					);
-				}
-			}
-			else
-			{
-				unset($ldap_result);
-				@ldap_close($ldap);
-
-				// Give status about wrong password...
-				return array(
-					'status'		=> LOGIN_ERROR_PASSWORD,
-					'error_msg'		=> 'LOGIN_ERROR_PASSWORD',
-					'user_row'		=> array('user_id' => ANONYMOUS),
-				);
-			}
-		}
-
-		@ldap_close($ldap);
-
-		return array(
-			'status'	=> LOGIN_ERROR_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function autologin()
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function acp($new)
-	{
-		$tpl = '
-
-		<dl>
-			<dt><label for="ldap_server">' . $this->user->lang['LDAP_SERVER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="' . $new['ldap_server'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_port">' . $this->user->lang['LDAP_PORT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="' . $new['ldap_port'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_dn">' . $this->user->lang['LDAP_DN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_DN_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_uid">' . $this->user->lang['LDAP_UID'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_UID_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_user_filter">' . $this->user->lang['LDAP_USER_FILTER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="' . $new['ldap_user_filter'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_email">' . $this->user->lang['LDAP_EMAIL'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt>
-			<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_user">' . $this->user->lang['LDAP_USER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_USER_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="' . $new['ldap_user'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_password">' . $this->user->lang['LDAP_PASSWORD'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt>
-			<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" autocomplete="off" /></dd>
-		</dl>
-		';
-
-		// These are fields required in the config table
-		return array(
-			'tpl'		=> $tpl,
-			'config'	=> array('ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password')
-		);
-	}
-
-	/**
-	 * Generates a filter string for ldap_search to find a user
-	 *
-	 * @param	$username	string	Username identifying the searched user
-	 *
-	 * @return				string	A filter string for ldap_search
-	 */
-	private function ldap_user_filter($username)
-	{
-		$filter = '(' . $this->config['ldap_uid'] . '=' . $this->ldap_escape(htmlspecialchars_decode($username)) . ')';
-		if ($this->config['ldap_user_filter'])
-		{
-			$_filter = ($this->config['ldap_user_filter'][0] == '(' && substr($this->config['ldap_user_filter'], -1) == ')') ? $this->config['ldap_user_filter'] : "({$this->config['ldap_user_filter']})";
-			$filter = "(&{$filter}{$_filter})";
-		}
-		return $filter;
-	}
-
-	/**
-	 * Escapes an LDAP AttributeValue
-	 *
-	 * @param	string	$string	The string to be escaped
-	 * @return	string	The escaped string
-	 */
-	private function ldap_escape($string)
-	{
-		return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function logout($data, $new_session)
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function validate_session($user)
-	{
-		return;
-	}
-}
-- 
cgit v1.2.1


From 192c9d8f867a0c7d1a81d23bc4fb11c63fe1ec40 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 09:37:40 -0500
Subject: [feature/twig] Removing template/renderer.php (no longer used)

PHPBB3-11598
---
 phpBB/includes/template/renderer.php | 35 -----------------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 phpBB/includes/template/renderer.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/renderer.php b/phpBB/includes/template/renderer.php
deleted file mode 100644
index 30e234a733..0000000000
--- a/phpBB/includes/template/renderer.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Template renderer interface.
-*
-* Objects implementing this interface encapsulate a means of displaying
-* a template.
-*
-* @package phpBB3
-*/
-interface phpbb_template_renderer
-{
-	/**
-	* Displays the template managed by this renderer.
-	*
-	* @param phpbb_template_context $context Template context to use
-	* @param array $lang Language entries to use
-	*/
-	public function render($context, $lang);
-}
-- 
cgit v1.2.1


From 576d8d70721f3f6c718339b069e93c33f3a38673 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 09:56:25 -0500
Subject: [feature/twig] Docs/typehinting for Twig extension

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index f73b99a4c1..5704468013 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -23,12 +23,24 @@ class phpbb_template_twig_extension extends Twig_Extension
 	/** @var phpbb_user */
 	protected $user;
 
-	public function __construct(phpbb_template_context $context, $user)
+	/**
+	* Constructor
+	*
+	* @param phpbb_template_context $context
+	* @param phpbb_user $user
+	* @return phpbb_template_twig_extension
+	*/
+	public function __construct(phpbb_template_context $context, phpbb_user $user)
 	{
 		$this->context = $context;
 		$this->user = $user;
 	}
 
+	/**
+	* Get the name of this extension
+	*
+	* @return string
+	*/
 	public function getName()
 	{
 		return 'phpbb';
-- 
cgit v1.2.1


From c1a600277d07c2dbb3ebd410f87acb22627a9d60 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 09:57:55 -0500
Subject: [feature/twig] Nicer code for get_user_style.php()

PHPBB3-11598
---
 phpBB/includes/style/style.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index b0bf3c1019..06c16fdef4 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -91,11 +91,16 @@ class phpbb_style
 	*/
 	public function get_user_style()
 	{
-		return array_merge(array(
-				$this->user->style['style_path'],
-			),
-			($this->user->style['style_parent_id']) ? array_reverse(explode('/', $this->user->style['style_parent_tree'])) : array()
+		$style_list = array(
+			$this->user->style['style_path'],
 		);
+
+		if ($this->user->style['style_parent_id'])
+		{
+			$style_list = array_merge($style_list, array_reverse(explode('/', $this->user->style['style_parent_tree'])));
+		}
+
+		return $style_list;
 	}
 
 	/**
-- 
cgit v1.2.1


From 2674740573a226dae36dc81faf8eb5453e01a31d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 10:03:48 -0500
Subject: [feature/twig] Spacing

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index 5704468013..e23dd4f119 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -144,7 +144,7 @@ class phpbb_template_twig_extension extends Twig_Extension
 		{
 			// When end is > 1, subset will end on the last item in an array with the specified $end
 			// This is different from slice in that it is the number we end on rather than the number
-			//	of items to grab (length)
+			//  of items to grab (length)
 
 			// Start must always be the actual starting number for this calculation (not negative)
 			$start = ($start < 0) ? sizeof($item) + $start : $start;
-- 
cgit v1.2.1


From 81f0715b8ef89e3a03a285a0c0f4639351449e9a Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 10:05:20 -0500
Subject: [feature/twig] Clarify comment

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index e23dd4f119..6b066f1bd3 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -139,7 +139,7 @@ class phpbb_template_twig_extension extends Twig_Extension
 	 */
 	function loop_subset(Twig_Environment $env, $item, $start, $end = null, $preserveKeys = false)
 	{
-		// We do almost the same thing as array_slice, except when $end is positive
+		// We do almost the same thing as Twig's slice (array_slice), except when $end is positive
 		if ($end >= 1)
 		{
 			// When end is > 1, subset will end on the last item in an array with the specified $end
-- 
cgit v1.2.1


From 13c356545465a457b8c55dd9638f89165bab6271 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 12:11:59 -0500
Subject: [feature/twig] Remove style dependency for controller helper

If a controller wants to use set_style, it can just use phpbb_style

PHPBB3-11598
---
 phpBB/includes/controller/helper.php | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
index ec09757a5d..74410ddfd1 100644
--- a/phpBB/includes/controller/helper.php
+++ b/phpBB/includes/controller/helper.php
@@ -23,12 +23,6 @@ use Symfony\Component\HttpFoundation\Response;
 */
 class phpbb_controller_helper
 {
-	/**
-	* Style object
-	* @var phpbb_style
-	*/
-	protected $style;
-
 	/**
 	* Template object
 	* @var phpbb_template
@@ -56,36 +50,19 @@ class phpbb_controller_helper
 	/**
 	* Constructor
 	*
-	* @param phpbb_style $style Style object
 	* @param phpbb_template $template Template object
 	* @param phpbb_user $user User object
 	* @param string $phpbb_root_path phpBB root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(phpbb_style $style, phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext)
 	{
-		$this->style = $style;
 		$this->template = $template;
 		$this->user = $user;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 	}
 
-	/**
-	* Set style location based on (current) user's chosen style.
-	*
-	* @param array $style_directories The directories to add style paths for
-	* 	E.g. array('ext/foo/bar/styles', 'styles')
-	* 	Default: array('styles') (phpBB's style directory)
-	* @return phpbb_controller_helper $this
-	*/
-	public function set_style($style_base_directory = array('styles'))
-	{
-		$this->style->set_style($style_base_directory);
-
-		return $this;
-	}
-
 	/**
 	* Automate setting up the page and creating the response object.
 	*
-- 
cgit v1.2.1


From 05984be2c002133d1dd7f546e4238749b275f9f6 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 12:47:50 -0500
Subject: [feature/twig] Fix S_NUM_ROWS assignment

PHPBB3-11598
---
 phpBB/includes/template/context.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
index e3ad6be46c..c5ce7422b9 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/template/context.php
@@ -165,7 +165,7 @@ class phpbb_template_context
 			// Set S_NUM_ROWS
 			foreach ($str[$blocks[$blockcount]] as &$mod_block)
 			{
-				$mod_block['S_NUM_ROWS'] = $blockcount;
+				$mod_block['S_NUM_ROWS'] = sizeof($str[$blocks[$blockcount]]);
 			}
 		}
 		else
-- 
cgit v1.2.1


From 99ddbe1adc8dad125fa996f1f568bdcfa2b80d95 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 12:55:32 -0500
Subject: [feature/twig] Can't use typehint here, causes tests to fail

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index 6b066f1bd3..c4d36050f9 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -30,7 +30,7 @@ class phpbb_template_twig_extension extends Twig_Extension
 	* @param phpbb_user $user
 	* @return phpbb_template_twig_extension
 	*/
-	public function __construct(phpbb_template_context $context, phpbb_user $user)
+	public function __construct(phpbb_template_context $context, $user)
 	{
 		$this->context = $context;
 		$this->user = $user;
-- 
cgit v1.2.1


From c5c34ff831faf96368d34012dc65bdb9451227aa Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 13:10:35 -0500
Subject: [feature/twig] Add check for defined IN_PHPBB in all new Twig related
 files

PHPBB3-11598
---
 phpBB/includes/template/twig/node/define.php                     | 9 +++++++++
 phpBB/includes/template/twig/node/event.php                      | 9 +++++++++
 .../includes/template/twig/node/expression/binary/equalequal.php | 9 +++++++++
 .../template/twig/node/expression/binary/notequalequal.php       | 9 +++++++++
 phpBB/includes/template/twig/node/include.php                    | 9 +++++++++
 phpBB/includes/template/twig/node/includejs.php                  | 9 +++++++++
 phpBB/includes/template/twig/node/includephp.php                 | 9 +++++++++
 phpBB/includes/template/twig/node/php.php                        | 9 +++++++++
 phpBB/includes/template/twig/tokenparser/define.php              | 9 +++++++++
 phpBB/includes/template/twig/tokenparser/event.php               | 9 +++++++++
 phpBB/includes/template/twig/tokenparser/if.php                  | 9 +++++++++
 phpBB/includes/template/twig/tokenparser/include.php             | 9 +++++++++
 phpBB/includes/template/twig/tokenparser/includejs.php           | 9 +++++++++
 phpBB/includes/template/twig/tokenparser/includephp.php          | 9 +++++++++
 phpBB/includes/template/twig/tokenparser/php.php                 | 9 +++++++++
 15 files changed, 135 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/define.php b/phpBB/includes/template/twig/node/define.php
index 499bbdc518..fcb19cc773 100644
--- a/phpBB/includes/template/twig/node/define.php
+++ b/phpBB/includes/template/twig/node/define.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_node_define extends Twig_Node
 {
 	public function __construct($capture, Twig_NodeInterface $name, Twig_NodeInterface $value, $lineno, $tag = null)
diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/includes/template/twig/node/event.php
index 6de270e19c..984ba35244 100644
--- a/phpBB/includes/template/twig/node/event.php
+++ b/phpBB/includes/template/twig/node/event.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_node_event extends Twig_Node
 {
 	/** @var Twig_Environment */
diff --git a/phpBB/includes/template/twig/node/expression/binary/equalequal.php b/phpBB/includes/template/twig/node/expression/binary/equalequal.php
index 054f63ecf9..8ec2069114 100644
--- a/phpBB/includes/template/twig/node/expression/binary/equalequal.php
+++ b/phpBB/includes/template/twig/node/expression/binary/equalequal.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_node_expression_binary_equalequal extends Twig_Node_Expression_Binary
 {
 	public function operator(Twig_Compiler $compiler)
diff --git a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php b/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
index d8a1c411cf..96f32c502e 100644
--- a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
+++ b/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_node_expression_binary_notequalequal extends Twig_Node_Expression_Binary
 {
 	public function operator(Twig_Compiler $compiler)
diff --git a/phpBB/includes/template/twig/node/include.php b/phpBB/includes/template/twig/node/include.php
index a614cbe20f..5c6ae1bbcf 100644
--- a/phpBB/includes/template/twig/node/include.php
+++ b/phpBB/includes/template/twig/node/include.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_node_include extends Twig_Node_Include
 {
 	/**
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
index 6d0d67c6c9..943eb89ace 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_node_includejs extends Twig_Node
 {
 	/** @var Twig_Environment */
diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/includes/template/twig/node/includephp.php
index b5bb2ee9c9..dbe54f0e1a 100644
--- a/phpBB/includes/template/twig/node/includephp.php
+++ b/phpBB/includes/template/twig/node/includephp.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_node_includephp extends Twig_Node
 {
 	/** @var Twig_Environment */
diff --git a/phpBB/includes/template/twig/node/php.php b/phpBB/includes/template/twig/node/php.php
index ebf4947e48..c11539ea7f 100644
--- a/phpBB/includes/template/twig/node/php.php
+++ b/phpBB/includes/template/twig/node/php.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_node_php extends Twig_Node
 {
 	/** @var Twig_Environment */
diff --git a/phpBB/includes/template/twig/tokenparser/define.php b/phpBB/includes/template/twig/tokenparser/define.php
index ed77699b77..4ea15388c4 100644
--- a/phpBB/includes/template/twig/tokenparser/define.php
+++ b/phpBB/includes/template/twig/tokenparser/define.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_tokenparser_define extends Twig_TokenParser
 {
 	/**
diff --git a/phpBB/includes/template/twig/tokenparser/event.php b/phpBB/includes/template/twig/tokenparser/event.php
index 2a6d6b6457..e4dddd6dcc 100644
--- a/phpBB/includes/template/twig/tokenparser/event.php
+++ b/phpBB/includes/template/twig/tokenparser/event.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_tokenparser_event extends Twig_TokenParser
 {
 	/**
diff --git a/phpBB/includes/template/twig/tokenparser/if.php b/phpBB/includes/template/twig/tokenparser/if.php
index 939d679030..77881ad5f0 100644
--- a/phpBB/includes/template/twig/tokenparser/if.php
+++ b/phpBB/includes/template/twig/tokenparser/if.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_tokenparser_if extends Twig_TokenParser_If
 {
 	/**
diff --git a/phpBB/includes/template/twig/tokenparser/include.php b/phpBB/includes/template/twig/tokenparser/include.php
index 5b5105d23e..520f9fd1a0 100644
--- a/phpBB/includes/template/twig/tokenparser/include.php
+++ b/phpBB/includes/template/twig/tokenparser/include.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include
 {
 	/**
diff --git a/phpBB/includes/template/twig/tokenparser/includejs.php b/phpBB/includes/template/twig/tokenparser/includejs.php
index 962d01ac45..b02b2f89ba 100644
--- a/phpBB/includes/template/twig/tokenparser/includejs.php
+++ b/phpBB/includes/template/twig/tokenparser/includejs.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser
 {
 	/**
diff --git a/phpBB/includes/template/twig/tokenparser/includephp.php b/phpBB/includes/template/twig/tokenparser/includephp.php
index 57d804183b..13fe6de8a6 100644
--- a/phpBB/includes/template/twig/tokenparser/includephp.php
+++ b/phpBB/includes/template/twig/tokenparser/includephp.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_tokenparser_includephp extends Twig_TokenParser
 {
 	/**
diff --git a/phpBB/includes/template/twig/tokenparser/php.php b/phpBB/includes/template/twig/tokenparser/php.php
index 62e1c4fdcd..197980a59a 100644
--- a/phpBB/includes/template/twig/tokenparser/php.php
+++ b/phpBB/includes/template/twig/tokenparser/php.php
@@ -7,6 +7,15 @@
 *
 */
 
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+
 class phpbb_template_twig_tokenparser_php extends Twig_TokenParser
 {
 	/**
-- 
cgit v1.2.1


From 0ffbdc80d1eafdcbdc6e2aa4c82fa7e081c0a502 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 13:15:10 -0500
Subject: [feature/twig] context_recursive_loop_builder isn't used anymore,
 removing it

PHPBB3-11598
---
 phpBB/includes/template/twig/environment.php | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index acb97cfad2..b60cd72325 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -137,26 +137,4 @@ class phpbb_template_twig_environment extends Twig_Environment
 			return parent::loadTemplate($name, $index);
 		}
 	}
-
-	/**
-	* Recursive helper to set variables into $context so that Twig can properly fetch them for display
-	*
-	* @param array $data Data to set at the end of the chain
-	* @param array $blocks Array of blocks to loop into still
-	* @param mixed $current_location Current location in $context (recursive!)
-	* @return null
-	*/
-	public function context_recursive_loop_builder($data, $blocks, &$current_location)
-	{
-		$block = array_shift($blocks);
-
-		if (empty($blocks))
-		{
-			$current_location[$block] = $data;
-		}
-		else
-		{
-			$this->context_recursive_loop_builder($data, $blocks, $current_location[$block]);
-		}
-	}
 }
-- 
cgit v1.2.1


From 8d11a147f5ab05443b243559f248e7e52e2e9faf Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 5 Jul 2013 14:10:57 -0500
Subject: [feature/twig] Use Twig mask for IF statements instead of our own
 tokenparser

PHPBB3-11598
---
 phpBB/includes/template/twig/extension.php      |  1 -
 phpBB/includes/template/twig/lexer.php          |  8 ++-
 phpBB/includes/template/twig/tokenparser/if.php | 87 -------------------------
 3 files changed, 6 insertions(+), 90 deletions(-)
 delete mode 100644 phpBB/includes/template/twig/tokenparser/if.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index c4d36050f9..5ffc45e75a 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -54,7 +54,6 @@ class phpbb_template_twig_extension extends Twig_Extension
 	public function getTokenParsers()
 	{
 		return array(
-			new phpbb_template_twig_tokenparser_if,
 			new phpbb_template_twig_tokenparser_define,
 			new phpbb_template_twig_tokenparser_include,
 			new phpbb_template_twig_tokenparser_includejs,
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 394c3077a6..5f76c44481 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -24,12 +24,12 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		$phpbb_tags = array(
 			/*'BEGIN',
 			'BEGINELSE',
-			'END',*/
+			'END',
 			'IF',
 			'ELSE',
 			'ELSEIF',
 			'ENDIF',
-			/*'DEFINE',
+			'DEFINE',
 			'UNDEFINE',*/
 			'ENDDEFINE',
 			'INCLUDE',
@@ -44,6 +44,10 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 		$twig_tags = array(
 			'autoescape',
 			'endautoescape',
+			'if',
+			'elseif',
+			'else',
+			'endif',
 			'block',
 			'endblock',
 			'use',
diff --git a/phpBB/includes/template/twig/tokenparser/if.php b/phpBB/includes/template/twig/tokenparser/if.php
deleted file mode 100644
index 77881ad5f0..0000000000
--- a/phpBB/includes/template/twig/tokenparser/if.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_tokenparser_if extends Twig_TokenParser_If
-{
-	/**
-	 * Parses a token and returns a node.
-	 *
-	 * @param Twig_Token $token A Twig_Token instance
-	 *
-	 * @return Twig_NodeInterface A Twig_NodeInterface instance
-	 */
-	public function parse(Twig_Token $token)
-	{
-		$lineno = $token->getLine();
-		$expr = $this->parser->getExpressionParser()->parseExpression();
-		$stream = $this->parser->getStream();
-		$stream->expect(Twig_Token::BLOCK_END_TYPE);
-		$body = $this->parser->subparse(array($this, 'decideIfFork'));
-		$tests = array($expr, $body);
-		$else = null;
-
-		$end = false;
-		while (!$end) {
-			switch ($stream->next()->getValue()) {
-				case 'ELSE':
-					$stream->expect(Twig_Token::BLOCK_END_TYPE);
-					$else = $this->parser->subparse(array($this, 'decideIfEnd'));
-					break;
-
-				case 'ELSEIF':
-					$expr = $this->parser->getExpressionParser()->parseExpression();
-					$stream->expect(Twig_Token::BLOCK_END_TYPE);
-					$body = $this->parser->subparse(array($this, 'decideIfFork'));
-					$tests[] = $expr;
-					$tests[] = $body;
-					break;
-
-				case 'ENDIF':
-					$end = true;
-					break;
-
-				default:
-					throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "ELSE", "ELSEIF", or "ENDIF" to close the "IF" block started at line %d)', $lineno), $stream->getCurrent()->getLine(), $stream->getFilename());
-			}
-		}
-
-		$stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-		return new Twig_Node_If(new Twig_Node($tests), $else, $lineno, $this->getTag());
-	}
-
-	public function decideIfFork(Twig_Token $token)
-	{
-		return $token->test(array('ELSEIF', 'ELSE', 'ENDIF'));
-	}
-
-	public function decideIfEnd(Twig_Token $token)
-	{
-		return $token->test(array('ENDIF'));
-	}
-
-	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
-	public function getTag()
-	{
-		return 'IF';
-	}
-}
-- 
cgit v1.2.1


From bdaa40bb550c18f9c7feb4e2448a31a53e2a5bd2 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 6 Jul 2013 12:58:52 -0500
Subject: [ticket/11420] Fix comments, license link

PHPBB3-11420
---
 .../data/310/notification_options_reconvert.php        | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/notification_options_reconvert.php b/phpBB/includes/db/migration/data/310/notification_options_reconvert.php
index 9f2d4b2d75..d994d7ec5f 100644
--- a/phpBB/includes/db/migration/data/310/notification_options_reconvert.php
+++ b/phpBB/includes/db/migration/data/310/notification_options_reconvert.php
@@ -3,7 +3,7 @@
 *
 * @package migration
 * @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -31,8 +31,11 @@ class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_d
 
 	/**
 	* Perform the conversion (separate for testability)
+	*
+	* @param phpbb_db_sql_insert_buffer $insert_buffer
+	* @param string $insert_table
 	*/
-	public function perform_conversion($insert_buffer, $insert_table)
+	public function perform_conversion(phpbb_db_sql_insert_buffer $insert_buffer, $insert_table)
 	{
 		$sql = 'DELETE FROM ' . $insert_table;
 		$this->db->sql_query($sql);
@@ -58,7 +61,7 @@ class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_d
 				$notification_methods[] = 'jabber';
 			}
 
-			// Notifications for  posts
+			// Notifications for posts
 			foreach (array('post', 'topic') as $item_type)
 			{
 				$this->add_method_rows(
@@ -88,6 +91,15 @@ class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_d
 		$insert_buffer->flush();
 	}
 
+	/**
+	* Insert method rows to DB
+	*
+	* @param phpbb_db_sql_insert_buffer $insert_buffer
+	* @param string $item_type
+	* @param int $item_id
+	* @param int $user_id
+	* @param string $methods
+	*/
 	protected function add_method_rows(phpbb_db_sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods)
 	{
 		$row_base = array(
-- 
cgit v1.2.1


From 0894a1377013965657f29a42202a630ba83daf95 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 6 Jul 2013 16:26:56 -0500
Subject: [feature/twig] If DEBUG, EVENT will always look for new/missing tpl
 event files

If debug mode is enabled, lets check for new/removed EVENT templates on
page load rather than at compile. This is slower, but makes developing
extensions easier (no need to purge the cache when a new event template
file is added)

PHPBB3-11598
---
 phpBB/includes/template/twig/node/event.php | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/includes/template/twig/node/event.php
index 984ba35244..971dea14fa 100644
--- a/phpBB/includes/template/twig/node/event.php
+++ b/phpBB/includes/template/twig/node/event.php
@@ -43,17 +43,37 @@ class phpbb_template_twig_node_event extends Twig_Node
 		{
 			$ext_namespace = str_replace('/', '_', $ext_namespace);
 
-			if ($this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
+			if (defined('DEBUG'))
+			{
+				// If debug mode is enabled, lets check for new/removed EVENT
+				//  templates on page load rather than at compile. This is
+				//  slower, but makes developing extensions easier (no need to
+				//  purge the cache when a new event template file is added)
+		        $compiler
+		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
+		            ->indent()
+		        ;
+			}
+
+			if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
 			{
 				$compiler
 					->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
 
 					// We set the namespace lookup order to be this extension first, then the main path
-					->write("\$this->env->setNamespaceLookUpOrder(array('" . $ext_namespace . "', '__main__'));\n")
-					->write("\$this->env->loadTemplate('@" . $ext_namespace . "/" . $location . ".html')->display(\$context);\n")
+					->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
+					->write("\$this->env->loadTemplate('@{$ext_namespace}/{$location}.html')->display(\$context);\n")
 					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
 				;
 			}
+
+			if (defined('DEBUG'))
+			{
+				$compiler
+					->outdent()
+		            ->write("}\n\n")
+				;
+			}
 		}
 	}
 }
-- 
cgit v1.2.1


From c20f92ba1eb089222bfbe7d7acd5992682a9c936 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 19 Nov 2012 18:15:59 -0500
Subject: [ticket/11215] Correct paths when path info is used for controller
 access

PHPBB3-11215
---
 phpBB/includes/functions.php | 62 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 6a1b3fd4f8..60181c488e 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2413,6 +2413,7 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 {
 	global $_SID, $_EXTRA_URL, $phpbb_hook;
 	global $phpbb_dispatcher;
+	global $request;
 
 	if ($params === '' || (is_array($params) && empty($params)))
 	{
@@ -2420,6 +2421,12 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 		$params = false;
 	}
 
+	$corrected_root = phpbb_get_web_root_path(phpbb_create_symfony_request($request));
+	if ($corrected_root)
+	{
+		$url = $corrected_root . substr($url, strlen($phpbb_root_path));
+	}
+
 	$append_sid_overwrite = false;
 
 	/**
@@ -5209,7 +5216,11 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 
 	// Determine board url - we may need it later
 	$board_url = generate_board_url() . '/';
-	$web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $phpbb_root_path;
+	// This path is sent with the base template paths in the assign_vars()
+	// call below. We need to correct it in case we are accessing from a
+	// controller because the web paths will be incorrect otherwise.
+	$corrected_path = phpbb_get_web_root_path(phpbb_create_symfony_request($request));
+	$web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;
 
 	// Send a proper content-language to the output
 	$user_lang = $user->lang['USER_LANG'];
@@ -5685,6 +5696,16 @@ function phpbb_convert_30_dbms_to_31($dbms)
 */
 function phpbb_create_symfony_request(phpbb_request $request)
 {
+	// If we have already gotten it, don't go back through all the trouble of
+	// creating it again; instead, just return it. This allows multiple calls
+	// of this method so we don't have to globalize $symfony_request in other
+	// functions.
+	static $symfony_request;
+	if (null !== $symfony_request)
+	{
+		return $symfony_request;
+	}
+
 	// This function is meant to sanitize the global input arrays
 	$sanitizer = function(&$value, $key) {
 		$type_cast_helper = new phpbb_request_type_cast_helper();
@@ -5704,21 +5725,36 @@ function phpbb_create_symfony_request(phpbb_request $request)
 	array_walk_recursive($get_parameters, $sanitizer);
 	array_walk_recursive($post_parameters, $sanitizer);
 
-	// Until we fix the issue with relative paths, we have to fake path info
-	// to allow urls like app.php?controller=foo/bar
-	$controller = $request->variable('controller', '');
-	$path_info = '/' . $controller;
-	$request_uri = $server_parameters['REQUEST_URI'];
+	$symfony_request = new Request($get_parameters, $post_parameters, array(), $cookie_parameters, $files_parameters, $server_parameters);
+	return $symfony_request;
+}
 
-	// Remove the query string from REQUEST_URI
-	if ($pos = strpos($request_uri, '?'))
+/**
+* Get a relative root path from the current URL
+*
+* @param Request $symfony_request Symfony Request object
+*/
+function phpbb_get_web_root_path(Request $symfony_request)
+{
+	static $path;
+	if (null !== $path)
 	{
-		$request_uri = substr($request_uri, 0, $pos);
+		return $path;
 	}
 
-	// Add the path info (i.e. controller route) to the REQUEST_URI
-	$server_parameters['REQUEST_URI'] = $request_uri . $path_info;
-	$server_parameters['SCRIPT_NAME'] = '';
+	$path_info = $symfony_request->getPathInfo();
+	if ($path_info == '/')
+	{
+		return '';
+	}
+
+	$corrections = substr_count($symfony_request->getPathInfo(), '/');
+
+	$path = '';
+	for ($i = 0; $i < $corrections; $i++)
+	{
+		$path .= '../';
+	}
 
-	return new Request($get_parameters, $post_parameters, array(), $cookie_parameters, $files_parameters, $server_parameters);
+	return $path;
 }
-- 
cgit v1.2.1


From 0f522ddf5fb6e7d268f9d9cf428b8e3985f374ea Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 19 Nov 2012 19:36:07 -0500
Subject: [ticket/11215] A few minor optimizations for
 phpbb_get_web_root_path()

PHPBB3-11215
---
 phpBB/includes/functions.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 60181c488e..213f178694 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5745,16 +5745,12 @@ function phpbb_get_web_root_path(Request $symfony_request)
 	$path_info = $symfony_request->getPathInfo();
 	if ($path_info == '/')
 	{
-		return '';
+		$path = '';
+		return $path;
 	}
 
-	$corrections = substr_count($symfony_request->getPathInfo(), '/');
-
-	$path = '';
-	for ($i = 0; $i < $corrections; $i++)
-	{
-		$path .= '../';
-	}
+	$corrections = substr_count($path_info, '/');
+	$path = str_repeat('../', $corrections);
 
 	return $path;
 }
-- 
cgit v1.2.1


From b9c290b5480a958eabeef66d5e9af799f77e4566 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 20 Nov 2012 16:13:29 -0500
Subject: [ticket/11215] Correct for different URL but same path info

When Symfony Request calculates path info, both of the following URLs give "/"
as the path info: ./app.php and ./app.php/
This commit ensures that the proper correction is made.

PHPBB3-11215
---
 phpBB/includes/functions.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 213f178694..331eaf742e 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5743,7 +5743,16 @@ function phpbb_get_web_root_path(Request $symfony_request)
 	}
 
 	$path_info = $symfony_request->getPathInfo();
-	if ($path_info == '/')
+
+	// When no path is given (i.e. REQUEST_URI = "./app.php") path info from
+	// the Symfony Request object is "/". However, that is the same as when
+	// the REQUEST_URI is "./app.php/". So we want to correct the path when
+	// we have a trailing slash in the REQUEST_URI, but not when we don't.
+	$request_uri = $symfony_request->server->get('REQUEST_URI');
+	$trailing_slash = substr($request_uri, -1) === '/';
+
+	// If pathinfo is / and we do not have a trailing slash in the REQUEST_URI
+	if (!$trailing_slash && '/' === $path_info)
 	{
 		$path = '';
 		return $path;
-- 
cgit v1.2.1


From 70a553e0b5471c32469961be40e408bd544b670f Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 8 Jul 2013 15:16:37 -0500
Subject: [feature/twig] Variable regular expressions should be lazy

PHPBB3-11598
---
 phpBB/includes/template/twig/lexer.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index 5f76c44481..d0a84a8b7f 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -98,15 +98,15 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 
 		// Replace all of our language variables, {L_VARNAME}, with Twig style, {{ lang('NAME') }}
 		// Appends any filters after lang()
-		$code = preg_replace('#{L_([a-zA-Z0-9_\.]+)(\|[^}]+)?}#', '{{ lang(\'$1\')$2 }}', $code);
+		$code = preg_replace('#{L_([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ lang(\'$1\')$2 }}', $code);
 
 		// Replace all of our escaped language variables, {LA_VARNAME}, with Twig style, {{ lang('NAME')|addslashes }}
 		// Appends any filters after lang(), but before addslashes
-		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)(\|[^}]+)?}#', '{{ lang(\'$1\')$2|addslashes }}', $code);
+		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ lang(\'$1\')$2|addslashes }}', $code);
 
 		// Replace all of our variables, {VARNAME}, with Twig style, {{ VARNAME }}
 		// Appends any filters
-		$code = preg_replace('#{([a-zA-Z0-9_\.]+)(\|[^}]+)?}#', '{{ $1$2 }}', $code);
+		$code = preg_replace('#{([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ $1$2 }}', $code);
 
 		return parent::tokenize($code, $filename);
 	}
-- 
cgit v1.2.1


From 9210d735a53e3c4a4de042b49dae361c436268e1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Jul 2013 19:40:25 +0200
Subject: [ticket/8319] Do not repeat the replacement

PHPBB3-8319
---
 phpBB/includes/acp/acp_bbcodes.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index ead716b300..31166a56dc 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -431,15 +431,11 @@ class acp_bbcodes
 				$fp_replace = str_replace($token, $replace, $fp_replace);
 
 				$sp_match = str_replace(preg_quote($token, '!'), $sp_tokens[$token_type], $sp_match);
-				if ($token_type === 'LOCAL_URL')
-				{
-					// Prepend the board url to local relative links
-					$sp_replace = str_replace($token, generate_board_url() . '/' . '${' . ($n + 1) . '}', $sp_replace);
-				}
-				else
-				{
-					$sp_replace = str_replace($token, '${' . ($n + 1) . '}', $sp_replace);
-				}
+
+				// Prepend the board url to local relative links
+				$replace_prepend = ($token_type === 'LOCAL_URL') ? generate_board_url() . '/' : '';
+
+				$sp_replace = str_replace($token, $replace_prepend . '${' . ($n + 1) . '}', $sp_replace);
 			}
 
 			$fp_match = '!' . $fp_match . '!' . $modifiers;
-- 
cgit v1.2.1


From 19f7d12328fe1f100cd723fa808a291e634d8737 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Jul 2013 19:56:41 +0200
Subject: [ticket/8319] Add migration file for update change

PHPBB3-8319
---
 .../db/migration/data/30x/local_url_bbcode.php     | 57 ++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 phpBB/includes/db/migration/data/30x/local_url_bbcode.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/30x/local_url_bbcode.php b/phpBB/includes/db/migration/data/30x/local_url_bbcode.php
new file mode 100644
index 0000000000..f324b8880d
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/local_url_bbcode.php
@@ -0,0 +1,57 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_local_url_bbcode extends phpbb_db_migration
+{
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_12_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_local_url_bbcode'))),
+		);
+	}
+
+	/**
+	* Update BBCodes that currently use the LOCAL_URL tag
+	*
+	* To fix http://tracker.phpbb.com/browse/PHPBB3-8319 we changed
+	* the second_pass_replace value, so that needs updating for existing ones
+	*/
+	public function update_local_url_bbcode()
+	{
+		$sql = 'SELECT *
+			FROM ' . BBCODES_TABLE . '
+			WHERE bbcode_match ' . $this->db->sql_like_expression($this->db->any_char . 'LOCAL_URL' . $this->db->any_char);
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (!class_exists('acp_bbcodes'))
+			{
+				global $phpEx;
+				phpbb_require_updated('includes/acp/acp_bbcodes.' . $phpEx);
+			}
+			$bbcode_match = $row['bbcode_match'];
+			$bbcode_tpl = $row['bbcode_tpl'];
+
+			$acp_bbcodes = new acp_bbcodes();
+			$sql_ary = $acp_bbcodes->build_regexp($bbcode_match, $bbcode_tpl);
+
+			$sql = 'UPDATE ' . BBCODES_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+				WHERE bbcode_id = ' . (int) $row['bbcode_id'];
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
+}
-- 
cgit v1.2.1


From ab5a79a823de50667798d4e49fc7758a3fd9f132 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 10 Jul 2013 13:19:34 -0500
Subject: [ticket/11388] includejs inherit from includeasset

Copied from the INCLUDECSS PR, since this needed to be modified.

Added checks for argument strings/anchors/http/https paths in asset files
to load files properly

PHPBB3-11388
---
 phpBB/includes/template/twig/node/includeasset.php | 66 ++++++++++++++++++++++
 phpBB/includes/template/twig/node/includejs.php    | 38 +++----------
 2 files changed, 73 insertions(+), 31 deletions(-)
 create mode 100644 phpBB/includes/template/twig/node/includeasset.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php
new file mode 100644
index 0000000000..181e3b5aa5
--- /dev/null
+++ b/phpBB/includes/template/twig/node/includeasset.php
@@ -0,0 +1,66 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_includeasset extends Twig_Node
+{
+	/** @var Twig_Environment */
+	protected $environment;
+
+	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+	{
+		$this->environment = $environment;
+
+		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+	}
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function compile(Twig_Compiler $compiler)
+	{
+		$compiler->addDebugInfo($this);
+
+		$config = $this->environment->get_phpbb_config();
+
+		$compiler
+			->write("\$asset_file = ")
+			->subcompile($this->getNode('expr'))
+			->raw(";\n")
+			->write("\$argument_string = '?assets_version={$config['assets_version']}';\n")
+			->write("\$anchor_string = '';\n")
+			->write("if ((\$argument_string_start = strpos(\$asset_file, '?')) !== false) {\n")
+			->indent()
+				->write("\$argument_string = substr(\$asset_file, \$argument_string_start);\n")
+				->write("\$asset_file = substr(\$asset_file, 0, \$argument_string_start);\n")
+				->write("if ((\$anchor_string_start = strpos(\$argument_string, '#')) !== false) {\n")
+				->indent()
+					->write("\$anchor_string = substr(\$argument_string, \$anchor_string_start);\n")
+					->write("\$argument_string = substr(\$argument_string, 0, \$anchor_string_start);\n")
+				->outdent()
+				->write("}\n")
+				->write("\$argument_string .= '&assets_version=" . $config['assets_version'] . "';\n")
+			->outdent()
+			->write("}\n")
+			->write("if (strpos(\$asset_file, 'http://') !== 0 && strpos(\$asset_file, 'https://') !== 0 && !file_exists(\$asset_file)) {\n")
+			->indent()
+				->write("\$asset_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_file);\n")
+			->outdent()
+			->write("}\n")
+			->write("\$asset_file .= \$argument_string . \$anchor_string;\n")
+			->write("\$context['definition']->append('{$this->get_definition_name()}', '")
+		;
+
+		$this->append_asset($compiler);
+
+		$compiler
+			->raw("\n');\n")
+		;
+	}
+}
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
index 943eb89ace..fdf2bea3ed 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -7,25 +7,11 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
+class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
 {
-	exit;
-}
-
-
-class phpbb_template_twig_node_includejs extends Twig_Node
-{
-	/** @var Twig_Environment */
-	protected $environment;
-
-	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
+	public function get_definition_name()
 	{
-		$this->environment = $environment;
-
-		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
+		return 'SCRIPTS';
 	}
 
 	/**
@@ -33,24 +19,14 @@ class phpbb_template_twig_node_includejs extends Twig_Node
 	 *
 	 * @param Twig_Compiler A Twig_Compiler instance
 	 */
-	public function compile(Twig_Compiler $compiler)
+	protected function append_asset(Twig_Compiler $compiler)
 	{
-		$compiler->addDebugInfo($this);
-
 		$config = $this->environment->get_phpbb_config();
 
 		$compiler
-			->write("\$js_file = ")
-			->subcompile($this->getNode('expr'))
-			->raw(";\n")
-			->write("if (!file_exists(\$js_file)) {\n")
-			->indent()
-				->write("\$js_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$js_file);\n")
-			->outdent()
-			->write("}\n")
-			->write("\$context['definition']->append('SCRIPTS', '<script type=\"text/javascript\" src=\"' . ")
-			->raw("\$js_file")
-			->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>\n');\n")
+			->raw("<script type=\"text/javascript\" src=\"' . ")
+			->raw("\$asset_file")
+			->raw(". '\"></script>\n")
 		;
 	}
 }
-- 
cgit v1.2.1


From cdb13fc7be4771bc89da624fe0b5f38b0cc3ccd1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 11:52:12 +0200
Subject: [ticket/9657] Correctly use " vs ' and variables in queries

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index ac827bd822..88f57a0020 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -126,11 +126,11 @@ class phpbb_content_visibility
 		else
 		{
 			// The user is just a normal user
-			return "$table_alias{$mode}_visibility = " . ITEM_APPROVED . '
+			return $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . '
 				AND ' . $db->sql_in_set($table_alias . 'forum_id', $forum_ids, false, true);
 		}
 
-		$where_sql .= "($table_alias{$mode}_visibility = " . ITEM_APPROVED . '
+		$where_sql .= '(' . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . '
 			AND ' . $db->sql_in_set($table_alias . 'forum_id', $forum_ids) . '))';
 
 		return $where_sql;
@@ -157,12 +157,12 @@ class phpbb_content_visibility
 
 		if (sizeof($exclude_forum_ids))
 		{
-			$where_sqls[] = '(' . $db->sql_in_set($table_alias . 'forum_id', $exclude_forum_ids, true) . "
-				AND $table_alias{$mode}_visibility = " . ITEM_APPROVED . ')';
+			$where_sqls[] = '(' . $db->sql_in_set($table_alias . 'forum_id', $exclude_forum_ids, true) . '
+				AND ' . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . ')';
 		}
 		else
 		{
-			$where_sqls[] = "$table_alias{$mode}_visibility = " . ITEM_APPROVED;
+			$where_sqls[] = $table_alias . $mode . '_visibility = ' . ITEM_APPROVED;
 		}
 
 		if (sizeof($approve_forums))
-- 
cgit v1.2.1


From dc2f13d55d181c1a927b6daa8652f68ee87b4a90 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 11:56:05 +0200
Subject: [ticket/9657] Cast topic_id to integer

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 88f57a0020..f4126d0fff 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -565,7 +565,7 @@ class phpbb_content_visibility
 		{
 			$sql = 'SELECT topic_type, topic_posts_approved, topic_posts_unapproved, topic_posts_softdeleted, topic_visibility
 				FROM ' . TOPICS_TABLE . '
-				WHERE topic_id = ' . $topic_id;
+				WHERE topic_id = ' . (int) $topic_id;
 			$result = $db->sql_query($sql);
 			$topic_row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
@@ -583,7 +583,7 @@ class phpbb_content_visibility
 		// Get user post count information
 		$sql = 'SELECT poster_id, COUNT(post_id) AS num_posts
 			FROM ' . POSTS_TABLE . '
-			WHERE topic_id = ' . $topic_id . '
+			WHERE topic_id = ' . (int) $topic_id . '
 				AND post_postcount = 1
 				AND post_visibility = ' . ITEM_APPROVED . '
 			GROUP BY poster_id';
-- 
cgit v1.2.1


From 5b47d731470ddc1b5723ed13b63cc3f90f3e6671 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 12:08:09 +0200
Subject: [ticket/9657] DO not use \" inside of double quotes

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 29c0375e6c..a253a43136 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -305,7 +305,7 @@ class mcp_queue
 					'MINI_POST_IMG'			=> ($post_unread) ? $user->img('icon_post_target_unread', 'UNREAD_POST') : $user->img('icon_post_target', 'POST'),
 
 
-					'RETURN_QUEUE'			=> sprintf($user->lang['RETURN_QUEUE'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue' . (($topic_id) ? '&amp;mode=unapproved_topics' : '&amp;mode=unapproved_posts')) . "&amp;start=$start\">", '</a>'),
+					'RETURN_QUEUE'			=> sprintf($user->lang['RETURN_QUEUE'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue' . (($topic_id) ? '&amp;mode=unapproved_topics' : '&amp;mode=unapproved_posts')) . '&amp;start=' . $start . '">', '</a>'),
 					'RETURN_POST'			=> sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>'),
 					'RETURN_TOPIC_SIMPLE'	=> sprintf($user->lang['RETURN_TOPIC_SIMPLE'], '<a href="' . $topic_url . '">', '</a>'),
 					'REPORTED_IMG'			=> $user->img('icon_topic_reported', $user->lang['POST_REPORTED']),
@@ -730,7 +730,7 @@ class mcp_queue
 				$add_message = '<br /><br />' . sprintf($user->lang['RETURN_POST'], '<a href="' . $post_url . '">', '</a>');
 			}
 
-			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message;
+			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>') . $add_message;
 
 			if ($request->is_ajax())
 			{
@@ -877,7 +877,7 @@ class mcp_queue
 				$add_message = '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $topic_url . '">', '</a>');
 			}
 
-			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>') . $add_message;
+			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>') . $add_message;
 
 			if ($request->is_ajax())
 			{
@@ -1209,7 +1209,7 @@ class mcp_queue
 		}
 		else
 		{
-			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>');
+			$message = $user->lang[$success_msg] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>');
 
 			if ($request->is_ajax())
 			{
-- 
cgit v1.2.1


From ed151cd6aaa5ec875d56d33e8908771a1244f98a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 12:12:18 +0200
Subject: [ticket/9657] Add , to last element of an array

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index a253a43136..a42ae6c48c 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -182,8 +182,8 @@ class mcp_queue
 					$template->assign_vars(array(
 						'S_TOPIC_REVIEW'	=> true,
 						'S_BBCODE_ALLOWED'	=> $post_info['enable_bbcode'],
-						'TOPIC_TITLE'		=> $post_info['topic_title'])
-					);
+						'TOPIC_TITLE'		=> $post_info['topic_title'],
+					));
 				}
 
 				$extensions = $attachments = $topic_tracking_info = array();
@@ -246,8 +246,8 @@ class mcp_queue
 						foreach ($attachments as $attachment)
 						{
 							$template->assign_block_vars('attachment', array(
-								'DISPLAY_ATTACHMENT'	=> $attachment)
-							);
+								'DISPLAY_ATTACHMENT'	=> $attachment,
+							));
 						}
 					}
 				}
@@ -922,8 +922,8 @@ class mcp_queue
 			'mode'			=> $mode,
 			'post_id_list'	=> $post_id_list,
 			'action'		=> 'disapprove',
-			'redirect'		=> $redirect)
-		);
+			'redirect'		=> $redirect,
+		));
 
 		$notify_poster = $request->is_set('notify_poster');
 		$disapprove_reason = '';
-- 
cgit v1.2.1


From 9f89cb4cfbbd46ad45a9c7942fc2233b489bb076 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 13:31:39 +0200
Subject: [ticket/9657] Make content visibility a service and inject everything

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 224 ++++++++++++++++++++--------------
 1 file changed, 130 insertions(+), 94 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index f4126d0fff..edf6aa3b31 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -22,6 +22,59 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_content_visibility
 {
+	/**
+	* Database object
+	* @var phpbb_db_driver
+	*/
+	protected $this->db;
+
+	/**
+	* User object
+	* @var phpbb_user
+	*/
+	protected $this->user;
+
+	/**
+	* Auth object
+	* @var phpbb_auth
+	*/
+	protected $this->auth;
+
+	/**
+	* phpBB root path
+	* @var string
+	*/
+	protected $phpbb_root_path;
+
+	/**
+	* PHP Extension
+	* @var string
+	*/
+	protected $php_ext;
+
+	/**
+	* Constructor
+	*
+	* @param	phpbb_auth		$this->auth	Auth object
+	* @param	phpbb_db_driver	$this->db		Database object
+	* @param	phpbb_user		$this->user	User object
+	* @param	string		$phpbb_root_path	Root path
+	* @param	string		$php_ext			PHP Extension
+	* @return	null
+	*/
+	public function __construct($this->auth, phpbb_db_driver $this->db, $this->user, $phpbb_root_path, $phpEx, $forums_table, $posts_table, $topics_table, $users_table)
+	{
+		$this->auth = $this->auth;
+		$this->db = $this->db;
+		$this->user = $this->user;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+		$this->forums_table = $forums_table;
+		$this->posts_table = $posts_table;
+		$this->topics_table = $topics_table;
+		$this->users_table = $users_table;
+	}
+
 	/**
 	* Can the current logged-in user soft-delete posts?
 	*
@@ -30,15 +83,13 @@ class phpbb_content_visibility
 	* @param $post_locked	bool	Is the post locked?
 	* @return bool
 	*/
-	static function can_soft_delete($forum_id, $poster_id, $post_locked)
+	public function can_soft_delete($forum_id, $poster_id, $post_locked)
 	{
-		global $auth, $user;
-
-		if ($auth->acl_get('m_softdelete', $forum_id))
+		if ($this->auth->acl_get('m_softdelete', $forum_id))
 		{
 			return true;
 		}
-		else if ($auth->acl_get('f_softdelete', $forum_id) && $poster_id == $user->data['user_id'] && !$post_locked)
+		else if ($this->auth->acl_get('f_softdelete', $forum_id) && $poster_id == $this->user->data['user_id'] && !$post_locked)
 		{
 			return true;
 		}
@@ -54,11 +105,9 @@ class phpbb_content_visibility
 	* @param $forum_id		int		The forum id is used for permission checks
 	* @return int	Number of posts/topics the user can see in the topic/forum
 	*/
-	static public function get_count($mode, $data, $forum_id)
+	public function get_count($mode, $data, $forum_id)
 	{
-		global $auth;
-
-		if (!$auth->acl_get('m_approve', $forum_id))
+		if (!$this->auth->acl_get('m_approve', $forum_id))
 		{
 			return (int) $data[$mode . '_approved'];
 		}
@@ -76,11 +125,9 @@ class phpbb_content_visibility
 	* @param $table_alias	string	Table alias to prefix in SQL queries
 	* @return string	The appropriate combination SQL logic for topic/post_visibility
 	*/
-	static public function get_visibility_sql($mode, $forum_id, $table_alias = '')
+	public function get_visibility_sql($mode, $forum_id, $table_alias = '')
 	{
-		global $auth;
-
-		if ($auth->acl_get('m_approve', $forum_id))
+		if ($this->auth->acl_get('m_approve', $forum_id))
 		{
 			return '1 = 1';
 		}
@@ -99,13 +146,11 @@ class phpbb_content_visibility
 	* @param $table_alias	string	Table alias to prefix in SQL queries
 	* @return string	The appropriate combination SQL logic for topic/post_visibility
 	*/
-	static public function get_forums_visibility_sql($mode, $forum_ids = array(), $table_alias = '')
+	public function get_forums_visibility_sql($mode, $forum_ids = array(), $table_alias = '')
 	{
-		global $auth, $db;
-
 		$where_sql = '(';
 
-		$approve_forums = array_intersect($forum_ids, array_keys($auth->acl_getf('m_approve', true)));
+		$approve_forums = array_intersect($forum_ids, array_keys($this->auth->acl_getf('m_approve', true)));
 
 		if (sizeof($approve_forums))
 		{
@@ -115,23 +160,23 @@ class phpbb_content_visibility
 			if (!sizeof($forum_ids))
 			{
 				// The user can see all posts/topics in all specified forums
-				return $db->sql_in_set($table_alias . 'forum_id', $approve_forums);
+				return $this->db->sql_in_set($table_alias . 'forum_id', $approve_forums);
 			}
 			else
 			{
 				// Moderator can view all posts/topics in some forums
-				$where_sql .= $db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ' OR ';
+				$where_sql .= $this->db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ' OR ';
 			}
 		}
 		else
 		{
 			// The user is just a normal user
 			return $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . '
-				AND ' . $db->sql_in_set($table_alias . 'forum_id', $forum_ids, false, true);
+				AND ' . $this->db->sql_in_set($table_alias . 'forum_id', $forum_ids, false, true);
 		}
 
 		$where_sql .= '(' . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . '
-			AND ' . $db->sql_in_set($table_alias . 'forum_id', $forum_ids) . '))';
+			AND ' . $this->db->sql_in_set($table_alias . 'forum_id', $forum_ids) . '))';
 
 		return $where_sql;
 	}
@@ -147,17 +192,15 @@ class phpbb_content_visibility
 	* @param $table_alias		string	Table alias to prefix in SQL queries
 	* @return string	The appropriate combination SQL logic for topic/post_visibility
 	*/
-	static public function get_global_visibility_sql($mode, $exclude_forum_ids = array(), $table_alias = '')
+	public function get_global_visibility_sql($mode, $exclude_forum_ids = array(), $table_alias = '')
 	{
-		global $auth, $db;
-
 		$where_sqls = array();
 
-		$approve_forums = array_diff(array_keys($auth->acl_getf('m_approve', true)), $exclude_forum_ids);
+		$approve_forums = array_diff(array_keys($this->auth->acl_getf('m_approve', true)), $exclude_forum_ids);
 
 		if (sizeof($exclude_forum_ids))
 		{
-			$where_sqls[] = '(' . $db->sql_in_set($table_alias . 'forum_id', $exclude_forum_ids, true) . '
+			$where_sqls[] = '(' . $this->db->sql_in_set($table_alias . 'forum_id', $exclude_forum_ids, true) . '
 				AND ' . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . ')';
 		}
 		else
@@ -167,7 +210,7 @@ class phpbb_content_visibility
 
 		if (sizeof($approve_forums))
 		{
-			$where_sqls[] = $db->sql_in_set($table_alias . 'forum_id', $approve_forums);
+			$where_sqls[] = $this->db->sql_in_set($table_alias . 'forum_id', $approve_forums);
 			return '(' . implode(' OR ', $where_sqls) . ')';
 		}
 
@@ -192,10 +235,8 @@ class phpbb_content_visibility
 	* @param $limit_delete_time	mixed	Limit updating per topic_id to a certain deletion time
 	* @return array		Changed post data, empty array if an error occured.
 	*/
-	static public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $user_id, $time, $reason, $is_starter, $is_latest, $limit_visibility = false, $limit_delete_time = false)
+	public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $user_id, $time, $reason, $is_starter, $is_latest, $limit_visibility = false, $limit_delete_time = false)
 	{
-		global $db;
-
 		if (!in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
 		{
 			return array();
@@ -205,7 +246,7 @@ class phpbb_content_visibility
 		{
 			if (is_array($post_id))
 			{
-				$where_sql = $db->sql_in_set('post_id', array_map('intval', $post_id));
+				$where_sql = $this->db->sql_in_set('post_id', array_map('intval', $post_id));
 			}
 			else
 			{
@@ -233,12 +274,12 @@ class phpbb_content_visibility
 		}
 
 		$sql = 'SELECT poster_id, post_id, post_postcount, post_visibility
-			FROM ' . POSTS_TABLE . '
+			FROM ' . $this->posts_table . '
 			WHERE ' . $where_sql;
-		$result = $db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
 		$post_ids = $poster_postcounts = $postcounts = $postcount_visibility = array();
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$post_ids[] = (int) $row['post_id'];
 
@@ -263,7 +304,7 @@ class phpbb_content_visibility
 				}
 			}
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		if (empty($post_ids))
 		{
@@ -277,10 +318,10 @@ class phpbb_content_visibility
 			'post_delete_reason'	=> truncate_string($reason, 255, 255, false),
 		);
 
-		$sql = 'UPDATE ' . POSTS_TABLE . '
-			SET ' . $db->sql_build_array('UPDATE', $data) . '
-			WHERE ' . $db->sql_in_set('post_id', $post_ids);
-		$db->sql_query($sql);
+		$sql = 'UPDATE ' . $this->posts_table . '
+			SET ' . $this->db->sql_build_array('UPDATE', $data) . '
+			WHERE ' . $this->db->sql_in_set('post_id', $post_ids);
+		$this->db->sql_query($sql);
 
 		// Group the authors by post count, to reduce the number of queries
 		foreach ($poster_postcounts as $poster_id => $num_posts)
@@ -293,24 +334,24 @@ class phpbb_content_visibility
 		{
 			if ($visibility == ITEM_DELETED)
 			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
+				$sql = 'UPDATE ' . $this->users_table . '
 					SET user_posts = 0
-					WHERE ' . $db->sql_in_set('user_id', $poster_ids) . '
+					WHERE ' . $this->db->sql_in_set('user_id', $poster_ids) . '
 						AND user_posts < ' . $num_posts;
-				$db->sql_query($sql);
+				$this->db->sql_query($sql);
 
-				$sql = 'UPDATE ' . USERS_TABLE . '
+				$sql = 'UPDATE ' . $this->users_table . '
 					SET user_posts = user_posts - ' . $num_posts . '
-					WHERE ' . $db->sql_in_set('user_id', $poster_ids) . '
+					WHERE ' . $this->db->sql_in_set('user_id', $poster_ids) . '
 						AND user_posts >= ' . $num_posts;
-				$db->sql_query($sql);
+				$this->db->sql_query($sql);
 			}
 			else
 			{
-				$sql = 'UPDATE ' . USERS_TABLE . '
+				$sql = 'UPDATE ' . $this->users_table . '
 					SET user_posts = user_posts + ' . $num_posts . '
-					WHERE ' . $db->sql_in_set('user_id', $poster_ids);
-				$db->sql_query($sql);
+					WHERE ' . $this->db->sql_in_set('user_id', $poster_ids);
+				$this->db->sql_query($sql);
 			}
 		}
 
@@ -333,8 +374,7 @@ class phpbb_content_visibility
 		{
 			if (!function_exists('sync'))
 			{
-				global $phpEx, $phpbb_root_path;
-				include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+				include($this->phpbb_root_path . 'includes/functions_admin.' . $this->php_ext);
 			}
 
 			// ... so we need to use sync, if the first post is changed.
@@ -409,15 +449,15 @@ class phpbb_content_visibility
 				}
 
 				// Update the number for replies and posts
-				$sql = 'UPDATE ' . TOPICS_TABLE . '
+				$sql = 'UPDATE ' . $this->topics_table . '
 					SET ' . implode(', ', $topic_sql) . '
 					WHERE topic_id = ' . (int) $topic_id;
-				$db->sql_query($sql);
+				$this->db->sql_query($sql);
 
-				$sql = 'UPDATE ' . FORUMS_TABLE . '
+				$sql = 'UPDATE ' . $this->forums_table . '
 					SET ' . implode(', ', $forum_sql) . '
 					WHERE forum_id = ' . (int) $forum_id;
-				$db->sql_query($sql);
+				$this->db->sql_query($sql);
 			}
 		}
 
@@ -445,10 +485,8 @@ class phpbb_content_visibility
 	* @param $force_update_all	bool	Force to update all posts within the topic
 	* @return array		Changed topic data, empty array if an error occured.
 	*/
-	static public function set_topic_visibility($visibility, $topic_id, $forum_id, $user_id, $time, $reason, $force_update_all = false)
+	public function set_topic_visibility($visibility, $topic_id, $forum_id, $user_id, $time, $reason, $force_update_all = false)
 	{
-		global $db;
-
 		if (!in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
 		{
 			return array();
@@ -457,11 +495,11 @@ class phpbb_content_visibility
 		if (!$force_update_all)
 		{
 			$sql = 'SELECT topic_visibility, topic_delete_time
-				FROM ' . TOPICS_TABLE . '
+				FROM ' . $this->topics_table . '
 				WHERE topic_id = ' . (int) $topic_id;
-			$result = $db->sql_query($sql);
-			$original_topic_data = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
+			$result = $this->db->sql_query($sql);
+			$original_topic_data = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
 
 			if (!$original_topic_data)
 			{
@@ -478,12 +516,12 @@ class phpbb_content_visibility
 			'topic_delete_reason'	=> truncate_string($reason, 255, 255, false),
 		);
 
-		$sql = 'UPDATE ' . TOPICS_TABLE . '
-			SET ' . $db->sql_build_array('UPDATE', $data) . '
+		$sql = 'UPDATE ' . $this->topics_table . '
+			SET ' . $this->db->sql_build_array('UPDATE', $data) . '
 			WHERE topic_id = ' . (int) $topic_id;
-		$db->sql_query($sql);
+		$this->db->sql_query($sql);
 
-		if (!$db->sql_affectedrows())
+		if (!$this->db->sql_affectedrows())
 		{
 			return array();
 		}
@@ -513,15 +551,15 @@ class phpbb_content_visibility
 	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
 	* @return void
 	*/
-	static public function add_post_to_statistic($data, &$sql_data)
+	public function add_post_to_statistic($data, &$sql_data)
 	{
-		$sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts_approved = topic_posts_approved + 1';
+		$sql_data[$this->topics_table] = (($sql_data[$this->topics_table]) ? $sql_data[$this->topics_table] . ', ' : '') . 'topic_posts_approved = topic_posts_approved + 1';
 
-		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts_approved = forum_posts_approved + 1';
+		$sql_data[$this->forums_table] = (($sql_data[$this->forums_table]) ? $sql_data[$this->forums_table] . ', ' : '') . 'forum_posts_approved = forum_posts_approved + 1';
 
 		if ($data['post_postcount'])
 		{
-			$sql_data[USERS_TABLE] = (($sql_data[USERS_TABLE]) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts + 1';
+			$sql_data[$this->users_table] = (($sql_data[$this->users_table]) ? $sql_data[$this->users_table] . ', ' : '') . 'user_posts = user_posts + 1';
 		}
 
 		set_config_count('num_posts', 1, true);
@@ -534,14 +572,14 @@ class phpbb_content_visibility
 	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
 	* @return void
 	*/
-	static public function remove_post_from_statistic($data, &$sql_data)
+	public function remove_post_from_statistic($data, &$sql_data)
 	{
-		$sql_data[TOPICS_TABLE] = ((!empty($sql_data[TOPICS_TABLE])) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_posts_approved = topic_posts_approved - 1';
-		$sql_data[FORUMS_TABLE] = ((!empty($sql_data[FORUMS_TABLE])) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts_approved = forum_posts_approved - 1';
+		$sql_data[$this->topics_table] = ((!empty($sql_data[$this->topics_table])) ? $sql_data[$this->topics_table] . ', ' : '') . 'topic_posts_approved = topic_posts_approved - 1';
+		$sql_data[$this->forums_table] = ((!empty($sql_data[$this->forums_table])) ? $sql_data[$this->forums_table] . ', ' : '') . 'forum_posts_approved = forum_posts_approved - 1';
 
 		if ($data['post_postcount'])
 		{
-			$sql_data[USERS_TABLE] = ((!empty($sql_data[USERS_TABLE])) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts - 1';
+			$sql_data[$this->users_table] = ((!empty($sql_data[$this->users_table])) ? $sql_data[$this->users_table] . ', ' : '') . 'user_posts = user_posts - 1';
 		}
 
 		set_config_count('num_posts', -1, true);
@@ -556,60 +594,58 @@ class phpbb_content_visibility
 	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
 	* @return void
 	*/
-	static public function remove_topic_from_statistic($topic_id, $forum_id, &$topic_row, &$sql_data)
+	public function remove_topic_from_statistic($topic_id, $forum_id, &$topic_row, &$sql_data)
 	{
-		global $db;
-
 		// Do we need to grab some topic informations?
 		if (!sizeof($topic_row))
 		{
 			$sql = 'SELECT topic_type, topic_posts_approved, topic_posts_unapproved, topic_posts_softdeleted, topic_visibility
-				FROM ' . TOPICS_TABLE . '
+				FROM ' . $this->topics_table . '
 				WHERE topic_id = ' . (int) $topic_id;
-			$result = $db->sql_query($sql);
-			$topic_row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
+			$result = $this->db->sql_query($sql);
+			$topic_row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
 		}
 
 		// If this is an edited topic or the first post the topic gets completely disapproved later on...
-		$sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_topics_approved = forum_topics_approved - 1';
-		$sql_data[FORUMS_TABLE] .= ', forum_posts_approved = forum_posts_approved - ' . $topic_row['topic_posts_approved'];
-		$sql_data[FORUMS_TABLE] .= ', forum_posts_unapproved = forum_posts_unapproved - ' . $topic_row['topic_posts_unapproved'];
-		$sql_data[FORUMS_TABLE] .= ', forum_posts_softdeleted = forum_posts_softdeleted - ' . $topic_row['topic_posts_softdeleted'];
+		$sql_data[$this->forums_table] = (($sql_data[$this->forums_table]) ? $sql_data[$this->forums_table] . ', ' : '') . 'forum_topics_approved = forum_topics_approved - 1';
+		$sql_data[$this->forums_table] .= ', forum_posts_approved = forum_posts_approved - ' . $topic_row['topic_posts_approved'];
+		$sql_data[$this->forums_table] .= ', forum_posts_unapproved = forum_posts_unapproved - ' . $topic_row['topic_posts_unapproved'];
+		$sql_data[$this->forums_table] .= ', forum_posts_softdeleted = forum_posts_softdeleted - ' . $topic_row['topic_posts_softdeleted'];
 
 		set_config_count('num_topics', -1, true);
 		set_config_count('num_posts', $topic_row['topic_posts_approved'] * (-1), true);
 
 		// Get user post count information
 		$sql = 'SELECT poster_id, COUNT(post_id) AS num_posts
-			FROM ' . POSTS_TABLE . '
+			FROM ' . $this->posts_table . '
 			WHERE topic_id = ' . (int) $topic_id . '
 				AND post_postcount = 1
 				AND post_visibility = ' . ITEM_APPROVED . '
 			GROUP BY poster_id';
-		$result = $db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
 		$postcounts = array();
-		while ($row = $db->sql_fetchrow($result))
+		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$postcounts[(int) $row['num_posts']][] = (int) $row['poster_id'];
 		}
-		$db->sql_freeresult($result);
+		$this->db->sql_freeresult($result);
 
 		// Decrement users post count
 		foreach ($postcounts as $num_posts => $poster_ids)
 		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
+			$sql = 'UPDATE ' . $this->users_table . '
 				SET user_posts = 0
 				WHERE user_posts < ' . $num_posts . '
-					AND ' . $db->sql_in_set('user_id', $poster_ids);
-			$db->sql_query($sql);
+					AND ' . $this->db->sql_in_set('user_id', $poster_ids);
+			$this->db->sql_query($sql);
 
-			$sql = 'UPDATE ' . USERS_TABLE . '
+			$sql = 'UPDATE ' . $this->users_table . '
 				SET user_posts = user_posts - ' . $num_posts . '
 				WHERE user_posts >= ' . $num_posts . '
-					AND ' . $db->sql_in_set('user_id', $poster_ids);
-			$db->sql_query($sql);
+					AND ' . $this->db->sql_in_set('user_id', $poster_ids);
+			$this->db->sql_query($sql);
 		}
 	}
 }
-- 
cgit v1.2.1


From 9aed758c1397c31b979f4aca51249c73d21bd6f5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 14:24:07 +0200
Subject: [ticket/9657] Use the service instead of the static class

PHPBB3-9657
---
 phpBB/includes/feed/base.php         |  4 +++-
 phpBB/includes/feed/forum.php        |  4 ++--
 phpBB/includes/feed/overall.php      |  4 ++--
 phpBB/includes/feed/topic.php        |  2 +-
 phpBB/includes/feed/topic_base.php   |  2 +-
 phpBB/includes/functions.php         |  5 +++--
 phpBB/includes/functions_display.php | 16 ++++++++++------
 phpBB/includes/functions_posting.php | 23 ++++++++++++++---------
 phpBB/includes/mcp/mcp_forum.php     | 10 ++++++----
 phpBB/includes/mcp/mcp_main.php      | 15 +++++++++------
 phpBB/includes/mcp/mcp_queue.php     |  8 +++++---
 phpBB/includes/mcp/mcp_topic.php     |  7 ++++---
 phpBB/includes/ucp/ucp_main.php      |  6 ++++--
 13 files changed, 64 insertions(+), 42 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/base.php b/phpBB/includes/feed/base.php
index af28ee8dc8..84fdbe415a 100644
--- a/phpBB/includes/feed/base.php
+++ b/phpBB/includes/feed/base.php
@@ -80,10 +80,11 @@ abstract class phpbb_feed_base
 	* @param phpbb_cache_driver_interface	$cache			Cache object
 	* @param phpbb_user			$user		User object
 	* @param phpbb_auth			$auth		Auth object
+	* @param phpbb_content_visibility	$content_visibility		Auth object
 	* @param string				$phpEx		php file extension
 	* @return	null
 	*/
-	function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, $phpEx)
+	function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, $content_visibility, $phpEx)
 	{
 		$this->config = $config;
 		$this->helper = $helper;
@@ -91,6 +92,7 @@ abstract class phpbb_feed_base
 		$this->cache = $cache;
 		$this->user = $user;
 		$this->auth = $auth;
+		$this->content_visibility = $content_visibility;
 		$this->phpEx = $phpEx;
 
 		$this->set_keys();
diff --git a/phpBB/includes/feed/forum.php b/phpBB/includes/feed/forum.php
index 83b836b81d..fc217c203c 100644
--- a/phpBB/includes/feed/forum.php
+++ b/phpBB/includes/feed/forum.php
@@ -90,7 +90,7 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 
 	function get_sql()
 	{
-		$sql_visibility = phpbb_content_visibility::get_visibility_sql('topic', $this->forum_id);
+		$sql_visibility = $this->content_visibility->get_visibility_sql('topic', $this->forum_id);
 
 		// Determine topics with recent activity
 		$sql = 'SELECT topic_id, topic_last_post_time
@@ -116,7 +116,7 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 			return false;
 		}
 
-		$sql_visibility = phpbb_content_visibility::get_visibility_sql('post', $this->forum_id, 'p.'); 
+		$sql_visibility = $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.'); 
 
 		$this->sql = array(
 			'SELECT'	=>	'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
diff --git a/phpBB/includes/feed/overall.php b/phpBB/includes/feed/overall.php
index 7e48120b97..af45840d69 100644
--- a/phpBB/includes/feed/overall.php
+++ b/phpBB/includes/feed/overall.php
@@ -37,7 +37,7 @@ class phpbb_feed_overall extends phpbb_feed_post_base
 		$sql = 'SELECT topic_id, topic_last_post_time
 			FROM ' . TOPICS_TABLE . '
 			WHERE topic_moved_id = 0
-				AND ' . phpbb_content_visibility::get_forums_visibility_sql('topic', $forum_ids) . '
+				AND ' . $this->content_visibility->get_forums_visibility_sql('topic', $forum_ids) . '
 			ORDER BY topic_last_post_time DESC';
 		$result = $this->db->sql_query_limit($sql, $this->num_items);
 
@@ -56,7 +56,7 @@ class phpbb_feed_overall extends phpbb_feed_post_base
 			return false;
 		}
 
-		$sql_visibility = phpbb_content_visibility::get_visibility_sql('post', array(), 'p.');
+		$sql_visibility = $this->content_visibility->get_visibility_sql('post', array(), 'p.');
 
 		// Get the actual data
 		$this->sql = array(
diff --git a/phpBB/includes/feed/topic.php b/phpBB/includes/feed/topic.php
index 42bd291343..10f86486c6 100644
--- a/phpBB/includes/feed/topic.php
+++ b/phpBB/includes/feed/topic.php
@@ -93,7 +93,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 
 	function get_sql()
 	{
-		$sql_visibility = phpbb_content_visibility::get_visibility_sql('post', $this->forum_id, 'p.'); 
+		$sql_visibility = $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.'); 
 
 		$this->sql = array(
 			'SELECT'	=>	'p.post_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
diff --git a/phpBB/includes/feed/topic_base.php b/phpBB/includes/feed/topic_base.php
index a2f5a56f1d..b104a46631 100644
--- a/phpBB/includes/feed/topic_base.php
+++ b/phpBB/includes/feed/topic_base.php
@@ -51,7 +51,7 @@ abstract class phpbb_feed_topic_base extends phpbb_feed_base
 		{
 			$item_row['statistics'] = $this->user->lang['POSTED'] . ' ' . $this->user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
 				. ' ' . $this->separator_stats . ' ' . $this->user->format_date($row[$this->get('published')])
-				. ' ' . $this->separator_stats . ' ' . $this->user->lang['REPLIES'] . ' ' . phpbb_content_visibility::get_count('topic_posts', $row, $row['forum_id']) - 1
+				. ' ' . $this->separator_stats . ' ' . $this->user->lang['REPLIES'] . ' ' . $this->content_visibility->get_count('topic_posts', $row, $row['forum_id']) - 1
 				. ' ' . $this->separator_stats . ' ' . $this->user->lang['VIEWS'] . ' ' . $row['topic_views']
 				. (($this->is_moderator_approve_forum($row['forum_id']) && $row['topic_posts_unapproved']) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POSTS_UNAPPROVED'] : '');
 		}
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e884a2f94c..9664b5663c 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1974,7 +1974,7 @@ function get_unread_topics($user_id = false, $sql_extra = '', $sql_sort = '', $s
 */
 function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_time = false, $mark_time_forum = false)
 {
-	global $db, $tracking_topics, $user, $config, $auth, $request;
+	global $db, $tracking_topics, $user, $config, $auth, $request, $phpbb_container;
 
 	// Determine the users last forum mark time if not given.
 	if ($mark_time_forum === false)
@@ -1999,7 +1999,8 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 
 	// Handle update of unapproved topics info.
 	// Only update for moderators having m_approve permission for the forum.
-	$sql_update_unapproved = phpbb_content_visibility::get_visibility_sql('topic', $forum_id, 't.');
+	$phpbb_content_visibility = $phpbb_container->get('content.visibility');
+	$sql_update_unapproved = $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.');
 	$sql_update_unapproved = ($sql_update_unapproved) ? ' AND ' . $sql_update_unapproved : '';
 
 	// Check the forum for any left unread topics.
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 797ca718d8..143813e4ed 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -22,7 +22,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 {
 	global $db, $auth, $user, $template;
 	global $phpbb_root_path, $phpEx, $config;
-	global $request, $phpbb_dispatcher;
+	global $request, $phpbb_dispatcher, $phpbb_container;
 
 	$forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array();
 	$parent_id = $visible_forums = 0;
@@ -149,6 +149,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 	$forum_tracking_info = array();
 	$branch_root_id = $root_data['forum_id'];
 
+	$phpbb_content_visibility = $phpbb_container->get('content.visibility');
+
 	while ($row = $db->sql_fetchrow($result))
 	{
 		/**
@@ -215,8 +217,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 
 		// Count the difference of real to public topics, so we can display an information to moderators
 		$row['forum_id_unapproved_topics'] = ($auth->acl_get('m_approve', $forum_id) && $row['forum_topics_unapproved']) ? $forum_id : 0;
-		$row['forum_posts'] = phpbb_content_visibility::get_count('forum_posts', $row, $forum_id);
-		$row['forum_topics'] = phpbb_content_visibility::get_count('forum_topics', $row, $forum_id);
+		$row['forum_posts'] = $phpbb_content_visibility->get_count('forum_posts', $row, $forum_id);
+		$row['forum_topics'] = $phpbb_content_visibility->get_count('forum_topics', $row, $forum_id);
 
 		// Display active topics from this forum?
 		if ($show_active && $row['forum_type'] == FORUM_POST && $auth->acl_get('f_read', $forum_id) && ($row['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS))
@@ -1006,7 +1008,7 @@ function display_reasons($reason_id = 0)
 function display_user_activity(&$userdata)
 {
 	global $auth, $template, $db, $user;
-	global $phpbb_root_path, $phpEx;
+	global $phpbb_root_path, $phpEx, $phpbb_container;
 
 	// Do not display user activity for users having more than 5000 posts...
 	if ($userdata['user_posts'] > 5000)
@@ -1030,12 +1032,14 @@ function display_user_activity(&$userdata)
 	$active_f_row = $active_t_row = array();
 	if (!empty($forum_ary))
 	{
+		$phpbb_content_visibility = $phpbb_container->get('content.visibility');
+
 		// Obtain active forum
 		$sql = 'SELECT forum_id, COUNT(post_id) AS num_posts
 			FROM ' . POSTS_TABLE . '
 			WHERE poster_id = ' . $userdata['user_id'] . '
 				AND post_postcount = 1
-				AND ' . phpbb_content_visibility::get_forums_visibility_sql('post', $forum_ary) . '
+				AND ' . $phpbb_content_visibility->get_forums_visibility_sql('post', $forum_ary) . '
 			GROUP BY forum_id
 			ORDER BY num_posts DESC';
 		$result = $db->sql_query_limit($sql, 1);
@@ -1057,7 +1061,7 @@ function display_user_activity(&$userdata)
 			FROM ' . POSTS_TABLE . '
 			WHERE poster_id = ' . $userdata['user_id'] . '
 				AND post_postcount = 1
-				AND ' . phpbb_content_visibility::get_forums_visibility_sql('post', $forum_ary) . '
+				AND ' . $phpbb_content_visibility->get_forums_visibility_sql('post', $forum_ary) . '
 			GROUP BY topic_id
 			ORDER BY num_posts DESC';
 		$result = $db->sql_query_limit($sql, 1);
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index de88f7cc98..03565c27bb 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -982,13 +982,15 @@ function load_drafts($topic_id = 0, $forum_id = 0, $id = 0, $pm_action = '', $ms
 function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true)
 {
 	global $user, $auth, $db, $template, $bbcode, $cache;
-	global $config, $phpbb_root_path, $phpEx;
+	global $config, $phpbb_root_path, $phpEx, $phpbb_container;
+
+	$phpbb_content_visibility = $phpbb_container->get('content.visibility');
 
 	// Go ahead and pull all data for this topic
 	$sql = 'SELECT p.post_id
 		FROM ' . POSTS_TABLE . ' p' . "
 		WHERE p.topic_id = $topic_id
-			AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id, 'p.') . '
+			AND " . $phpbb_content_visibility->get_visibility_sql('post', $forum_id, 'p.') . '
 			' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . '
 			' . (($mode == 'post_review_edit') ? " AND p.post_id = $cur_post_id" : '') . '
 		ORDER BY p.post_time ';
@@ -1177,7 +1179,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 */
 function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $softdelete_reason = '')
 {
-	global $db, $user, $auth;
+	global $db, $user, $auth, $phpbb_container;
 	global $config, $phpEx, $phpbb_root_path;
 
 	// Specify our post mode
@@ -1224,10 +1226,12 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 		$db->sql_freeresult($result);
 	}
 
+	$phpbb_content_visibility = $phpbb_container->get('content.visibility');
+
 	// (Soft) delete the post
 	if ($is_soft && ($post_mode != 'delete_topic'))
 	{
-		phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
+		$phpbb_content_visibility->set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
 	}
 	else if (!$is_soft)
 	{
@@ -1264,7 +1268,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 			if ($is_soft)
 			{
 				$topic_row = array();
-				phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason);
+				$phpbb_content_visibility->set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason);
 			}
 			else
 			{
@@ -1353,7 +1357,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 				$sql = 'SELECT MAX(post_id) as last_post_id
 					FROM ' . POSTS_TABLE . "
 					WHERE topic_id = $topic_id
-						AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id);
+						AND " . $phpbb_content_visibility->get_visibility_sql('post', $forum_id);
 				$result = $db->sql_query($sql);
 				$next_post_id = (int) $db->sql_fetchfield('last_post_id');
 				$db->sql_freeresult($result);
@@ -1364,7 +1368,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 			$sql = 'SELECT post_id
 				FROM ' . POSTS_TABLE . "
 				WHERE topic_id = $topic_id
-					AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id) . '
+					AND " . $phpbb_content_visibility->get_visibility_sql('post', $forum_id) . '
 					AND post_time > ' . $data['post_time'] . '
 				ORDER BY post_time ASC';
 			$result = $db->sql_query_limit($sql, 1);
@@ -1379,7 +1383,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
 		{
 			if ($data['post_visibility'] == ITEM_APPROVED)
 			{
-				phpbb_content_visibility::remove_post_from_statistic($data, $sql_data);
+				$phpbb_content_visibility->remove_post_from_statistic($data, $sql_data);
 			}
 			else if ($data['post_visibility'] == ITEM_UNAPPROVED)
 			{
@@ -2000,7 +2004,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		$is_starter = ($post_mode == 'edit_first_post' || $data['post_visibility'] != ITEM_APPROVED);
 		$is_latest = ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || $data['post_visibility'] != ITEM_APPROVED);
 
-		phpbb_content_visibility::set_post_visibility($post_visibility, $data['post_id'], $data['topic_id'], $data['forum_id'], $user->data['user_id'], time(), '', $is_starter, $is_latest);
+		$phpbb_content_visibility = $phpbb_container->get('content.visibility');
+		$phpbb_content_visibility->set_post_visibility($post_visibility, $data['post_id'], $data['topic_id'], $data['forum_id'], $user->data['user_id'], time(), '', $is_starter, $is_latest);
 	}
 	else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies']))
 	{
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index a7302ce912..841a0afddb 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -22,7 +22,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 {
 	global $template, $db, $user, $auth, $cache, $module;
 	global $phpEx, $phpbb_root_path, $config;
-	global $request, $phpbb_dispatcher;
+	global $request, $phpbb_dispatcher, $phpbb_container;
 
 	$user->add_lang(array('viewtopic', 'viewforum'));
 
@@ -152,10 +152,12 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 		$read_tracking_join = $read_tracking_select = '';
 	}
 
+	$phpbb_content_visibility = $phpbb_container->get('content.visibility');
+
 	$sql = 'SELECT t.topic_id
 		FROM ' . TOPICS_TABLE . ' t
 		WHERE t.forum_id = ' . $forum_id . '
-			AND ' . phpbb_content_visibility::get_visibility_sql('topic', $forum_id, 't.') . "
+			AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.') . "
 			$limit_time_sql
 		ORDER BY t.topic_type DESC, $sort_order_sql";
 	$result = $db->sql_query_limit($sql, $topics_per_page, $start);
@@ -204,7 +206,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 		$row = &$topic_rows[$topic_id];
 
-		$replies = phpbb_content_visibility::get_count('topic_posts', $row, $forum_id) - 1;
+		$replies = $phpbb_content_visibility->get_count('topic_posts', $row, $forum_id) - 1;
 
 		if ($row['topic_status'] == ITEM_MOVED)
 		{
@@ -249,7 +251,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 			'TOPIC_TYPE'		=> $topic_type,
 			'TOPIC_TITLE'		=> $topic_title,
-			'REPLIES'			=> phpbb_content_visibility::get_count('topic_posts', $row, $row['forum_id']) - 1,
+			'REPLIES'			=> $phpbb_content_visibility->get_count('topic_posts', $row, $row['forum_id']) - 1,
 			'LAST_POST_TIME'	=> $user->format_date($row['topic_last_post_time']),
 			'FIRST_POST_TIME'	=> $user->format_date($row['topic_time']),
 			'LAST_POST_SUBJECT'	=> $row['topic_last_post_subject'],
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index c044e5c871..62c3eda447 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -654,7 +654,7 @@ function mcp_move_topic($topic_ids)
 */
 function mcp_restore_topic($topic_ids)
 {
-	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container;
 
 	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_approve')))
 	{
@@ -678,9 +678,10 @@ function mcp_restore_topic($topic_ids)
 
 		$data = get_topic_data($topic_ids);
 
+		$phpbb_content_visibility = $phpbb_container->get('content.visibility');
 		foreach ($data as $topic_id => $row)
 		{
-			$return = phpbb_content_visibility::set_topic_visibility(ITEM_APPROVED, $topic_id, $row['forum_id'], $user->data['user_id'], time(), '');
+			$return = $phpbb_content_visibility->set_topic_visibility(ITEM_APPROVED, $topic_id, $row['forum_id'], $user->data['user_id'], time(), '');
 			if (!empty($return))
 			{
 				add_log('mod', $row['forum_id'], $topic_id, 'LOG_RESTORE_TOPIC', $row['topic_title'], $row['topic_first_poster_name']);
@@ -726,7 +727,7 @@ function mcp_restore_topic($topic_ids)
 */
 function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = '', $action = 'delete_topic')
 {
-	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container;
 
 	if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_delete')))
 	{
@@ -761,7 +762,8 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 				// Only soft delete non-shadow topics
 				if ($is_soft)
 				{
-					$return = phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $row['forum_id'], $user->data['user_id'], time(), $soft_delete_reason);
+					$phpbb_content_visibility = $phpbb_container->get('content.visibility');
+					$return = $phpbb_content_visibility->set_topic_visibility(ITEM_DELETED, $topic_id, $row['forum_id'], $user->data['user_id'], time(), $soft_delete_reason);
 					if (!empty($return))
 					{
 						add_log('mod', $row['forum_id'], $topic_id, 'LOG_SOFTDELETE_TOPIC', $row['topic_title'], $row['topic_first_poster_name']);
@@ -854,7 +856,7 @@ function mcp_delete_topic($topic_ids, $is_soft = false, $soft_delete_reason = ''
 */
 function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '', $action = 'delete_post')
 {
-	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request;
+	global $auth, $user, $db, $phpEx, $phpbb_root_path, $request, $phpbb_container;
 
 	if (!check_ids($post_ids, POSTS_TABLE, 'post_id', array('m_softdelete')))
 	{
@@ -910,9 +912,10 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '',
 			);
 		}
 
+		$phpbb_content_visibility = $phpbb_container->get('content.visibility');
 		foreach ($topic_info as $topic_id => $topic_data)
 		{
-			phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), $soft_delete_reason, isset($topic_data['first_post']), isset($topic_data['last_post']));
+			$phpbb_content_visibility->set_post_visibility(ITEM_DELETED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), $soft_delete_reason, isset($topic_data['first_post']), isset($topic_data['last_post']));
 		}
 		$affected_topics = sizeof($topic_info);
 		// None of the topics is really deleted, so a redirect won't hurt much.
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index a42ae6c48c..514d7bc4ee 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -634,9 +634,10 @@ class mcp_queue
 				);
 			}
 
+			$phpbb_content_visibility = $phpbb_container->get('content.visibility');
 			foreach ($topic_info as $topic_id => $topic_data)
 			{
-				phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));
+				$phpbb_content_visibility->set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));
 			}
 
 			if (sizeof($post_info) >= 1)
@@ -759,7 +760,7 @@ class mcp_queue
 	static public function approve_topics($action, $topic_id_list, $id, $mode)
 	{
 		global $db, $template, $user, $config;
-		global $phpEx, $phpbb_root_path, $request;
+		global $phpEx, $phpbb_root_path, $request, $phpbb_container;
 
 		if (!check_ids($topic_id_list, TOPICS_TABLE, 'topic_id', array('m_approve')))
 		{
@@ -784,9 +785,10 @@ class mcp_queue
 		{
 			$notify_poster = ($action == 'approve' && isset($_REQUEST['notify_poster'])) ? true : false;
 
+			$phpbb_content_visibility = $phpbb_container->get('content.visibility');
 			foreach ($topic_info as $topic_id => $topic_data)
 			{
-				phpbb_content_visibility::set_topic_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
+				$phpbb_content_visibility->set_topic_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
 
 				$topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$topic_data['forum_id']}&amp;t={$topic_id}");
 
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 1d2030edb1..d0e4a2e057 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 function mcp_topic_view($id, $mode, $action)
 {
 	global $phpEx, $phpbb_root_path, $config;
-	global $template, $db, $user, $auth, $cache;
+	global $template, $db, $user, $auth, $cache, $phpbb_container;
 
 	$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . extra_url());
 
@@ -112,10 +112,11 @@ function mcp_topic_view($id, $mode, $action)
 	mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $topic_info['forum_id'], $topic_id, $where_sql);
 
 	$limit_time_sql = ($sort_days) ? 'AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
+	$phpbb_content_visibility = $phpbb_container->get('content.visibility');
 
 	if ($total == -1)
 	{
-		$total = phpbb_content_visibility::get_count('topic_posts', $topic_info, $topic_info['forum_id']);
+		$total = $phpbb_content_visibility->get_count('topic_posts', $topic_info, $topic_info['forum_id']);
 	}
 
 	$posts_per_page = max(0, request_var('posts_per_page', intval($config['posts_per_page'])));
@@ -139,7 +140,7 @@ function mcp_topic_view($id, $mode, $action)
 		FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
 		WHERE ' . (($action == 'reports') ? 'p.post_reported = 1 AND ' : '') . '
 			p.topic_id = ' . $topic_id . '
-			AND ' .	phpbb_content_visibility::get_visibility_sql('post', $topic_info['forum_id'], 'p.') . '
+			AND ' .	$phpbb_content_visibility->get_visibility_sql('post', $topic_info['forum_id'], 'p.') . '
 			AND p.poster_id = u.user_id ' .
 			$limit_time_sql . '
 		ORDER BY ' . $sort_order_sql;
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 7aa06464b7..615b567134 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -642,7 +642,7 @@ class ucp_main
 	*/
 	function assign_topiclist($mode = 'subscribed', $forbidden_forum_ary = array())
 	{
-		global $user, $db, $template, $config, $cache, $auth, $phpbb_root_path, $phpEx;
+		global $user, $db, $template, $config, $cache, $auth, $phpbb_root_path, $phpEx, $phpbb_container;
 
 		$table = ($mode == 'subscribed') ? TOPICS_WATCH_TABLE : BOOKMARKS_TABLE;
 		$start = request_var('start', 0);
@@ -768,6 +768,8 @@ class ucp_main
 			}
 		}
 
+		$phpbb_content_visibility = $phpbb_container->get('content.visibility');
+
 		foreach ($topic_list as $topic_id)
 		{
 			$row = &$rowset[$topic_id];
@@ -778,7 +780,7 @@ class ucp_main
 			$unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
 
 			// Replies
-			$replies = phpbb_content_visibility::get_count('topic_posts', $row, $forum_id) - 1;
+			$replies = $phpbb_content_visibility->get_count('topic_posts', $row, $forum_id) - 1;
 
 			if ($row['topic_status'] == ITEM_MOVED && !empty($row['topic_moved_id']))
 			{
-- 
cgit v1.2.1


From 753dc62267118e44b16653113521fe6d0a360720 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 15:02:07 +0200
Subject: [ticket/9657] Fix unit tests

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index edf6aa3b31..43efef5d7f 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -26,19 +26,19 @@ class phpbb_content_visibility
 	* Database object
 	* @var phpbb_db_driver
 	*/
-	protected $this->db;
+	protected $db;
 
 	/**
 	* User object
 	* @var phpbb_user
 	*/
-	protected $this->user;
+	protected $user;
 
 	/**
 	* Auth object
 	* @var phpbb_auth
 	*/
-	protected $this->auth;
+	protected $auth;
 
 	/**
 	* phpBB root path
@@ -55,18 +55,18 @@ class phpbb_content_visibility
 	/**
 	* Constructor
 	*
-	* @param	phpbb_auth		$this->auth	Auth object
-	* @param	phpbb_db_driver	$this->db		Database object
-	* @param	phpbb_user		$this->user	User object
+	* @param	phpbb_auth		$auth	Auth object
+	* @param	phpbb_db_driver	$db		Database object
+	* @param	phpbb_user		$user	User object
 	* @param	string		$phpbb_root_path	Root path
 	* @param	string		$php_ext			PHP Extension
 	* @return	null
 	*/
-	public function __construct($this->auth, phpbb_db_driver $this->db, $this->user, $phpbb_root_path, $phpEx, $forums_table, $posts_table, $topics_table, $users_table)
+	public function __construct($auth, phpbb_db_driver $db, $user, $phpbb_root_path, $phpEx, $forums_table, $posts_table, $topics_table, $users_table)
 	{
-		$this->auth = $this->auth;
-		$this->db = $this->db;
-		$this->user = $this->user;
+		$this->auth = $auth;
+		$this->db = $db;
+		$this->user = $user;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 		$this->forums_table = $forums_table;
-- 
cgit v1.2.1


From 99c7483ade84e492f7bffb72cc2463fce2f65b94 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Jul 2013 08:36:16 -0500
Subject: [ticket/11388] INCLUDEJS supports //(url)

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php
index 181e3b5aa5..647ae22d81 100644
--- a/phpBB/includes/template/twig/node/includeasset.php
+++ b/phpBB/includes/template/twig/node/includeasset.php
@@ -48,7 +48,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
 				->write("\$argument_string .= '&assets_version=" . $config['assets_version'] . "';\n")
 			->outdent()
 			->write("}\n")
-			->write("if (strpos(\$asset_file, 'http://') !== 0 && strpos(\$asset_file, 'https://') !== 0 && !file_exists(\$asset_file)) {\n")
+			->write("if (strpos(\$asset_file, '//') !== 0 && strpos(\$asset_file, 'http://') !== 0 && strpos(\$asset_file, 'https://') !== 0 && !file_exists(\$asset_file)) {\n")
 			->indent()
 				->write("\$asset_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_file);\n")
 			->outdent()
-- 
cgit v1.2.1


From 3c11052fb3896b43685f596dc6e52f9cc07d6807 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 10:54:55 -0400
Subject: [feature/auth-refactor] Have a base auth class

PHPBB3-9734
---
 phpBB/includes/auth/provider/apache.php | 19 +--------
 phpBB/includes/auth/provider/base.php   | 69 +++++++++++++++++++++++++++++++++
 phpBB/includes/auth/provider/db.php     | 43 +-------------------
 phpBB/includes/auth/provider/ldap.php   | 27 +------------
 4 files changed, 75 insertions(+), 83 deletions(-)
 create mode 100644 phpBB/includes/auth/provider/base.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider/apache.php b/phpBB/includes/auth/provider/apache.php
index 5f6f2862b6..e0217725d6 100644
--- a/phpBB/includes/auth/provider/apache.php
+++ b/phpBB/includes/auth/provider/apache.php
@@ -20,7 +20,8 @@ if (!defined('IN_PHPBB'))
  *
  * @package auth
  */
-class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
+class phpbb_auth_provider_apache extends phpbb_auth_provider_base
+	implements phpbb_auth_provider_interface
 {
 	/**
 	 * Apache Authentication Constructor
@@ -256,20 +257,4 @@ class phpbb_auth_provider_apache implements phpbb_auth_provider_interface
 
 		return false;
 	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function acp($new)
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function logout($data, $new_session)
-	{
-		return;
-	}
 }
diff --git a/phpBB/includes/auth/provider/base.php b/phpBB/includes/auth/provider/base.php
new file mode 100644
index 0000000000..e053a1829b
--- /dev/null
+++ b/phpBB/includes/auth/provider/base.php
@@ -0,0 +1,69 @@
+<?php
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+ * Base authentication provider class that all other providers must implement.
+ *
+ * @package auth
+ */
+abstract class phpbb_auth_provider_base implements phpbb_auth_provider_interface
+{
+	/**
+	 * {@inheritdoc}
+	 */
+	public function init()
+	{
+		return;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	abstract public function login($username, $password);
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function autologin()
+	{
+		return;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function acp($new)
+	{
+		return;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function logout($data, $new_session)
+	{
+		return;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function validate_session($user)
+	{
+		return;
+	}
+}
diff --git a/phpBB/includes/auth/provider/db.php b/phpBB/includes/auth/provider/db.php
index 894041c9cf..b9b808cb5d 100644
--- a/phpBB/includes/auth/provider/db.php
+++ b/phpBB/includes/auth/provider/db.php
@@ -22,7 +22,8 @@ if (!defined('IN_PHPBB'))
  *
  * @package auth
  */
-class phpbb_auth_provider_db implements phpbb_auth_provider_interface
+class phpbb_auth_provider_db extends phpbb_auth_provider_base 
+	implements phpbb_auth_provider_interface
 {
 
 	/**
@@ -45,14 +46,6 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 		$this->php_ext = $php_ext;
 	}
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function init()
-	{
-		return;
-	}
-
 	/**
 	 * {@inheritdoc}
 	 */
@@ -302,36 +295,4 @@ class phpbb_auth_provider_db implements phpbb_auth_provider_interface
 			'user_row'		=> $row,
 		);
 	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function autologin()
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function acp($new)
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function logout($data, $new_session)
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function validate_session($user)
-	{
-		return;
-	}
 }
diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
index f67c1e9247..dbb569f466 100644
--- a/phpBB/includes/auth/provider/ldap.php
+++ b/phpBB/includes/auth/provider/ldap.php
@@ -22,7 +22,8 @@ if (!defined('IN_PHPBB'))
  *
  * @package auth
  */
-class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
+class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
+	implements phpbb_auth_provider_interface
 {
 	/**
 	 * LDAP Authentication Constructor
@@ -283,14 +284,6 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 		);
 	}
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function autologin()
-	{
-		return;
-	}
-
 	/**
 	 * {@inheritdoc}
 	 */
@@ -367,20 +360,4 @@ class phpbb_auth_provider_ldap implements phpbb_auth_provider_interface
 	{
 		return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
 	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function logout($data, $new_session)
-	{
-		return;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function validate_session($user)
-	{
-		return;
-	}
 }
-- 
cgit v1.2.1


From 69c1b1aea89f3c705c19d69aab70c35a7d09747a Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 11:06:34 -0400
Subject: [feature/auth-refactor] Prevent fatal error in php < 5.3.23

PHPBB3-9734
---
 phpBB/includes/auth/provider/base.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider/base.php b/phpBB/includes/auth/provider/base.php
index e053a1829b..7961bf4dde 100644
--- a/phpBB/includes/auth/provider/base.php
+++ b/phpBB/includes/auth/provider/base.php
@@ -30,11 +30,6 @@ abstract class phpbb_auth_provider_base implements phpbb_auth_provider_interface
 		return;
 	}
 
-	/**
-	 * {@inheritdoc}
-	 */
-	abstract public function login($username, $password);
-
 	/**
 	 * {@inheritdoc}
 	 */
-- 
cgit v1.2.1


From 021eb083abc1fe11d18d756adf12f72b903b13ed Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 11:09:25 -0400
Subject: [feature/auth-refactor] Remove implements on classes extending base

PHPBB3-9734
---
 phpBB/includes/auth/provider/apache.php | 1 -
 phpBB/includes/auth/provider/db.php     | 3 +--
 phpBB/includes/auth/provider/ldap.php   | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider/apache.php b/phpBB/includes/auth/provider/apache.php
index e0217725d6..2e80436f78 100644
--- a/phpBB/includes/auth/provider/apache.php
+++ b/phpBB/includes/auth/provider/apache.php
@@ -21,7 +21,6 @@ if (!defined('IN_PHPBB'))
  * @package auth
  */
 class phpbb_auth_provider_apache extends phpbb_auth_provider_base
-	implements phpbb_auth_provider_interface
 {
 	/**
 	 * Apache Authentication Constructor
diff --git a/phpBB/includes/auth/provider/db.php b/phpBB/includes/auth/provider/db.php
index b9b808cb5d..0934c56d9b 100644
--- a/phpBB/includes/auth/provider/db.php
+++ b/phpBB/includes/auth/provider/db.php
@@ -22,8 +22,7 @@ if (!defined('IN_PHPBB'))
  *
  * @package auth
  */
-class phpbb_auth_provider_db extends phpbb_auth_provider_base 
-	implements phpbb_auth_provider_interface
+class phpbb_auth_provider_db extends phpbb_auth_provider_base
 {
 
 	/**
diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
index dbb569f466..e10986abf0 100644
--- a/phpBB/includes/auth/provider/ldap.php
+++ b/phpBB/includes/auth/provider/ldap.php
@@ -23,7 +23,6 @@ if (!defined('IN_PHPBB'))
  * @package auth
  */
 class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
-	implements phpbb_auth_provider_interface
 {
 	/**
 	 * LDAP Authentication Constructor
-- 
cgit v1.2.1


From ccef1ae5ab406f6e6c4110467e1077ab58135e30 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 11:26:59 -0400
Subject: [feature/auth-refactor] Change 'must' to 'should'

PHPBB3-9734
---
 phpBB/includes/auth/provider/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider/base.php b/phpBB/includes/auth/provider/base.php
index 7961bf4dde..307988f00a 100644
--- a/phpBB/includes/auth/provider/base.php
+++ b/phpBB/includes/auth/provider/base.php
@@ -16,7 +16,7 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
- * Base authentication provider class that all other providers must implement.
+ * Base authentication provider class that all other providers should implement.
  *
  * @package auth
  */
-- 
cgit v1.2.1


From 177e340764ccb929d3ebfe978ce05ceba271f479 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 11:31:50 -0400
Subject: [feature/auth-refactor] Code style fix for doc blocks

PHPBB3-9734
---
 phpBB/includes/auth/provider/base.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider/base.php b/phpBB/includes/auth/provider/base.php
index 307988f00a..046674e55e 100644
--- a/phpBB/includes/auth/provider/base.php
+++ b/phpBB/includes/auth/provider/base.php
@@ -16,47 +16,47 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
- * Base authentication provider class that all other providers should implement.
- *
- * @package auth
- */
+* Base authentication provider class that all other providers should implement.
+*
+* @package auth
+*/
 abstract class phpbb_auth_provider_base implements phpbb_auth_provider_interface
 {
 	/**
-	 * {@inheritdoc}
-	 */
+	* {@inheritdoc}
+	*/
 	public function init()
 	{
 		return;
 	}
 
 	/**
-	 * {@inheritdoc}
-	 */
+	* {@inheritdoc}
+	*/
 	public function autologin()
 	{
 		return;
 	}
 
 	/**
-	 * {@inheritdoc}
-	 */
+	* {@inheritdoc}
+	*/
 	public function acp($new)
 	{
 		return;
 	}
 
 	/**
-	 * {@inheritdoc}
-	 */
+	* {@inheritdoc}
+	*/
 	public function logout($data, $new_session)
 	{
 		return;
 	}
 
 	/**
-	 * {@inheritdoc}
-	 */
+	* {@inheritdoc}
+	*/
 	public function validate_session($user)
 	{
 		return;
-- 
cgit v1.2.1


From ac6b4319b3e59b1766e8e9278567a90cd3758882 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Jul 2013 10:32:13 -0500
Subject: [ticket/11388] typehits

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 621bfe0f4f..ae50124f5c 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -109,7 +109,7 @@ class phpbb_template_twig implements phpbb_template
 	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
 	* @param string $adm_relative_path relative path to adm directory
 	*/
-	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null, $adm_relative_path = null)
+	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_user $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null, $adm_relative_path = null)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->adm_relative_path = $adm_relative_path;
-- 
cgit v1.2.1


From bc4b5c87a9e899968a0f7af115fa1844348ddaac Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Jul 2013 10:45:23 -0500
Subject: [ticket/11388] Do not modify by reference

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 06c16fdef4..7001d10f21 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -132,12 +132,13 @@ class phpbb_style
 		$this->provider->set_styles($paths);
 		$this->locator->set_paths($this->provider);
 
-		foreach ($paths as &$path)
+		$new_paths = array();
+		foreach ($paths as $path)
 		{
-			$path .= '/template/';
+			$new_paths = $path . '/template/';
 		}
 
-		$this->template->set_style_names($this->names, $paths, ($style_directories === array('styles')));
+		$this->template->set_style_names($this->names, $new_paths1, ($style_directories === array('styles')));
 
 		return true;
 	}
@@ -174,12 +175,13 @@ class phpbb_style
 			$this->locator->set_template_path($template_path);
 		}
 
-		foreach ($paths as &$path)
+		$new_paths = array();
+		foreach ($paths as $path)
 		{
-			$path .= '/' . (($template_path !== false) ? $template_path : 'template/');
+			$new_paths = $path . '/' . (($template_path !== false) ? $template_path : 'template/');
 		}
 
-		$this->template->set_style_names($names, $paths);
+		$this->template->set_style_names($names, $new_paths);
 
 		return true;
 	}
-- 
cgit v1.2.1


From a846048918a0e54a01cfd8ea72bf383c354aac47 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Jul 2013 11:03:28 -0500
Subject: [ticket/11388] Disable cache if IN_INSTALL defined

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index ae50124f5c..d5c12dc713 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -130,7 +130,7 @@ class phpbb_template_twig implements phpbb_template
 			$this->phpbb_root_path,
 			$loader,
 			array(
-				'cache'			=> $this->cachepath,
+				'cache'			=> (defined('IN_INSTALL')) ? false : $this->cachepath,
 				'debug'			=> defined('DEBUG'),
 				'auto_reload'	=> (bool) $this->config['load_tplcompile'],
 				'autoescape'	=> false,
-- 
cgit v1.2.1


From e674838d6951adb4df76195863df918f3b5852fd Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 12:06:48 -0400
Subject: [feature/auth-refactor] Remove full stop

PHPBB3-9734
---
 phpBB/includes/auth/provider/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider/base.php b/phpBB/includes/auth/provider/base.php
index 046674e55e..f28f352e2c 100644
--- a/phpBB/includes/auth/provider/base.php
+++ b/phpBB/includes/auth/provider/base.php
@@ -16,7 +16,7 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Base authentication provider class that all other providers should implement.
+* Base authentication provider class that all other providers should implement
 *
 * @package auth
 */
-- 
cgit v1.2.1


From dd7f9f08d5b62f5060c89af92989451ca27de43b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Jul 2013 11:24:45 -0500
Subject: [ticket/11388] Remove typehints (causing tests to fail)

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index d5c12dc713..f5638972a3 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -109,7 +109,7 @@ class phpbb_template_twig implements phpbb_template
 	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
 	* @param string $adm_relative_path relative path to adm directory
 	*/
-	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_user $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null, $adm_relative_path = null)
+	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null, $adm_relative_path = null)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->adm_relative_path = $adm_relative_path;
-- 
cgit v1.2.1


From abd4159f87db8db5030afc439f072d6aa7b715e3 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Jul 2013 11:26:38 -0500
Subject: [ticket/11388] Fix typo

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 7001d10f21..034f518091 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -135,10 +135,10 @@ class phpbb_style
 		$new_paths = array();
 		foreach ($paths as $path)
 		{
-			$new_paths = $path . '/template/';
+			$new_paths[] = $path . '/template/';
 		}
 
-		$this->template->set_style_names($this->names, $new_paths1, ($style_directories === array('styles')));
+		$this->template->set_style_names($this->names, $new_paths, ($style_directories === array('styles')));
 
 		return true;
 	}
@@ -178,7 +178,7 @@ class phpbb_style
 		$new_paths = array();
 		foreach ($paths as $path)
 		{
-			$new_paths = $path . '/' . (($template_path !== false) ? $template_path : 'template/');
+			$new_paths[] = $path . '/' . (($template_path !== false) ? $template_path : 'template/');
 		}
 
 		$this->template->set_style_names($names, $new_paths);
-- 
cgit v1.2.1


From 947b907efef43704c620507db17aff4fe115f219 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Jul 2013 11:28:35 -0500
Subject: [ticket/11388] Do not append assets_version if using remote path
 (e.g. http)

PHPBB3-11388
---
 phpBB/includes/template/twig/node/includeasset.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php
index 647ae22d81..5abff10e3f 100644
--- a/phpBB/includes/template/twig/node/includeasset.php
+++ b/phpBB/includes/template/twig/node/includeasset.php
@@ -33,8 +33,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
 			->write("\$asset_file = ")
 			->subcompile($this->getNode('expr'))
 			->raw(";\n")
-			->write("\$argument_string = '?assets_version={$config['assets_version']}';\n")
-			->write("\$anchor_string = '';\n")
+			->write("\$argument_string = \$anchor_string = '';\n")
 			->write("if ((\$argument_string_start = strpos(\$asset_file, '?')) !== false) {\n")
 			->indent()
 				->write("\$argument_string = substr(\$asset_file, \$argument_string_start);\n")
@@ -45,12 +44,12 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
 					->write("\$argument_string = substr(\$argument_string, 0, \$anchor_string_start);\n")
 				->outdent()
 				->write("}\n")
-				->write("\$argument_string .= '&assets_version=" . $config['assets_version'] . "';\n")
 			->outdent()
 			->write("}\n")
 			->write("if (strpos(\$asset_file, '//') !== 0 && strpos(\$asset_file, 'http://') !== 0 && strpos(\$asset_file, 'https://') !== 0 && !file_exists(\$asset_file)) {\n")
 			->indent()
 				->write("\$asset_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_file);\n")
+				->write("\$argument_string .= ((\$argument_string) ? '&' : '?') . 'assets_version={$config['assets_version']}';\n")
 			->outdent()
 			->write("}\n")
 			->write("\$asset_file .= \$argument_string . \$anchor_string;\n")
-- 
cgit v1.2.1


From e2435f25d90913455e0b8ffd92fb0918cf6f376f Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 14:54:00 -0400
Subject: [feature/auth-refactor] Check that providers implement auth interface

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 6 ++++++
 phpBB/includes/session.php       | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 24b913260b..19219f6323 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -563,6 +563,12 @@ class acp_board
 				if (array_key_exists('auth.provider.' . $method, $auth_providers))
 				{
 					$provider = $auth_providers['auth.provider.' . $method];
+
+					if (!($provider instanceof phpbb_auth_provider_interface))
+					{
+						throw new \RuntimeException($provider . ' must implement phpbb_auth_provider_interface');
+					}
+
 					if ($error = $provider->init())
 					{
 						foreach ($old_auth_config as $config_name => $config_value)
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 66bf053f7d..e0585b1523 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -404,6 +404,12 @@ class phpbb_session
 					$method = basename(trim($config['auth_method']));
 
 					$provider = $phpbb_container->get('auth.provider.' . $method);
+
+					if (!($provider instanceof phpbb_auth_provider_interface))
+					{
+						throw new \RuntimeException($provider . ' must implement phpbb_auth_provider_interface');
+					}
+
 					$ret = $provider->validate_session($this->data);
 					if ($ret !== null && !$ret)
 					{
-- 
cgit v1.2.1


From 4f3ce669f64156d666fee75800648f04fb8e4300 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 11 Jul 2013 15:41:27 -0400
Subject: [ticket/11647] New assets handling

PHPBB-11647
---
 phpBB/includes/template/asset.php                  | 188 +++++++++++++++++++++
 phpBB/includes/template/twig/node/includeasset.php |  23 +--
 2 files changed, 197 insertions(+), 14 deletions(-)
 create mode 100644 phpBB/includes/template/asset.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/asset.php b/phpBB/includes/template/asset.php
new file mode 100644
index 0000000000..eae62f4db0
--- /dev/null
+++ b/phpBB/includes/template/asset.php
@@ -0,0 +1,188 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_template_asset
+{
+	protected $components = array();
+
+	/**
+	* Constructor
+	*
+	* @param string $url URL
+	*/
+	public function __construct($url)
+	{
+		$this->set_url($url);
+	}
+
+	/**
+	* Set URL
+	*
+	* @param string $url URL
+	*/
+	public function set_url($url)
+	{
+		if (version_compare(PHP_VERSION, '5.4.7') < 0 && substr($url, 0, 2) === '//')
+		{
+			// Workaround for PHP 5.4.6 and older bug #62844 - add fake scheme and then remove it
+			$this->components = parse_url('http:' . $url);
+			if (isset($result['port']))
+			{
+				return;
+			}
+			unset($result['scheme']);
+			$this->components = $result;
+			return;
+		}
+		$this->components = parse_url($url);
+	}
+
+	/**
+	* Convert URL components into string
+	*
+	* @param array $components URL components
+	* @return string URL
+	*/
+	protected function join_url($components)
+	{
+		$path = '';
+		if (isset($components['scheme']))
+		{
+			$path = $components['scheme'] === '' ? '//' : $components['scheme'] . '://';
+		}
+
+		if (isset($components['user']) || isset($components['pass']))
+		{
+			if ($path === '' && !isset($components['port']))
+			{
+				$path = '//';
+			}
+			$path .= $components['user'];
+			if (isset($components['pass']))
+			{
+				$path .= ':' . $components['pass'];
+			}
+			$path .= '@';
+		}
+
+		if (isset($components['host']))
+		{
+			if ($path === '' && !isset($components['port']))
+			{
+				$path = '//';
+			}
+			$path .= $components['host'];
+			if (isset($components['port']))
+			{
+				$path .= ':' . $components['port'];
+			}
+		}
+
+		if (isset($components['path']))
+		{
+			$path .= $components['path'];
+		}
+
+		if (isset($components['query']))
+		{
+			$path .= '?' . $components['query'];
+		}
+
+		if (isset($components['fragment']))
+		{
+			$path .= '#' . $components['fragment'];
+		}
+
+		return $path;
+	}
+
+	/**
+	* Get URL
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return $this->join_url($this->components);
+	}
+
+	/**
+	* Checks if URL is local and relative
+	*
+	* @return boolean True if URL is local and relative
+	*/
+	public function is_relative()
+	{
+		if (empty($this->components) || !isset($this->components['path']))
+		{
+			// Invalid URL
+			return false;
+		}
+		return !isset($this->components['scheme']) && !isset($this->components['host']) && substr($this->components['path'], 0, 1) !== '/';
+	}
+
+	/**
+	* Get path component of current URL
+	*
+	* @return string Path
+	*/
+	public function get_path()
+	{
+		return isset($this->components['path']) ? $this->components['path'] : '';
+	}
+
+	/**
+	* Set path component
+	*
+	* @param string $path Path component
+	* @param boolean $urlencode If true, parts of path should be encoded with rawurlencode()
+	*/
+	public function set_path($path, $urlencode = false)
+	{
+		if ($urlencode)
+		{
+			$paths = explode('/', $path);
+			foreach ($paths as &$dir)
+			{
+				$dir = rawurlencode($dir);
+			}
+			$path = implode('/', $paths);
+		}
+		$this->components['path'] = $path;
+	}
+
+	/**
+	* Add assets_version parameter to URL.
+	* Parameter will not be added if assets_version already exists in URL
+	*
+	* @param string $version Version
+	*/
+	public function add_assets_version($version)
+	{
+		if (!isset($this->components['query']))
+		{
+			$this->components['query'] = 'assets_version=' . $version;
+			return;
+		}
+		$query = $this->components['query'];
+		if (!preg_match('/(^|[&;])assets_version=/', $query))
+		{
+			$separator = (strpos($query, '&') === false) && (strpos($query, ';') !== false) && preg_match('/^.*=.*;.*=.*$/', $query) ? ';' : '&amp;';
+			$this->components['query'] = $query . $separator . 'assets_version=' . $version;
+		}
+	}
+}
diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php
index 5abff10e3f..1159b63827 100644
--- a/phpBB/includes/template/twig/node/includeasset.php
+++ b/phpBB/includes/template/twig/node/includeasset.php
@@ -33,26 +33,21 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
 			->write("\$asset_file = ")
 			->subcompile($this->getNode('expr'))
 			->raw(";\n")
-			->write("\$argument_string = \$anchor_string = '';\n")
-			->write("if ((\$argument_string_start = strpos(\$asset_file, '?')) !== false) {\n")
+			->write("\$asset = new phpbb_template_asset(\$asset_file);\n")
+			->write("if (\$asset->is_relative()) {\n")
 			->indent()
-				->write("\$argument_string = substr(\$asset_file, \$argument_string_start);\n")
-				->write("\$asset_file = substr(\$asset_file, 0, \$argument_string_start);\n")
-				->write("if ((\$anchor_string_start = strpos(\$argument_string, '#')) !== false) {\n")
+				->write("\$asset_path = \$asset->get_path();")
+				->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n")
+				->write("if (!file_exists(\$local_file)) {\n")
 				->indent()
-					->write("\$anchor_string = substr(\$argument_string, \$anchor_string_start);\n")
-					->write("\$argument_string = substr(\$argument_string, 0, \$anchor_string_start);\n")
+					->write("\$local_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_path);\n")
+					->write("\$asset->set_path(\$local_file, true);\n")
 				->outdent()
+				->write("\$asset->add_assets_version(\$this->getEnvironment()->get_phpbb_config()['assets_version']);\n")
+				->write("\$asset_file = \$asset->get_url();\n")
 				->write("}\n")
 			->outdent()
 			->write("}\n")
-			->write("if (strpos(\$asset_file, '//') !== 0 && strpos(\$asset_file, 'http://') !== 0 && strpos(\$asset_file, 'https://') !== 0 && !file_exists(\$asset_file)) {\n")
-			->indent()
-				->write("\$asset_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_file);\n")
-				->write("\$argument_string .= ((\$argument_string) ? '&' : '?') . 'assets_version={$config['assets_version']}';\n")
-			->outdent()
-			->write("}\n")
-			->write("\$asset_file .= \$argument_string . \$anchor_string;\n")
 			->write("\$context['definition']->append('{$this->get_definition_name()}', '")
 		;
 
-- 
cgit v1.2.1


From 9c0495664d8d89c5ee8e6187e40afbe353acf033 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 15:45:44 -0400
Subject: [feature/auth-refactor] Remove invalid providers from acp select

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 19219f6323..f142801b72 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -563,12 +563,6 @@ class acp_board
 				if (array_key_exists('auth.provider.' . $method, $auth_providers))
 				{
 					$provider = $auth_providers['auth.provider.' . $method];
-
-					if (!($provider instanceof phpbb_auth_provider_interface))
-					{
-						throw new \RuntimeException($provider . ' must implement phpbb_auth_provider_interface');
-					}
-
 					if ($error = $provider->init())
 					{
 						foreach ($old_auth_config as $config_name => $config_value)
@@ -686,6 +680,10 @@ class acp_board
 
 		foreach($auth_providers as $key => $value)
 		{
+			if (!($provider instanceof phpbb_auth_provider_interface))
+			{
+				continue;
+			}
 			$auth_plugins[] = str_replace('auth.provider.', '', $key);
 		}
 
-- 
cgit v1.2.1


From b0e6b1dd98a6458d9a6d1c40369dfd8402411077 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Fri, 5 Jul 2013 13:31:05 -0400
Subject: [ticket/11626] Create get_acp_template method for auth providers

PHPBB3-11626
---
 phpBB/includes/auth/provider/base.php      |  8 ++++++++
 phpBB/includes/auth/provider/interface.php | 13 +++++++++++++
 phpBB/includes/auth/provider/ldap.php      | 20 +++++++++++++++++++-
 3 files changed, 40 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider/base.php b/phpBB/includes/auth/provider/base.php
index f28f352e2c..d1de9647df 100644
--- a/phpBB/includes/auth/provider/base.php
+++ b/phpBB/includes/auth/provider/base.php
@@ -46,6 +46,14 @@ abstract class phpbb_auth_provider_base implements phpbb_auth_provider_interface
 		return;
 	}
 
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_acp_template($new_config)
+	{
+		return;
+	}
+
 	/**
 	* {@inheritdoc}
 	*/
diff --git a/phpBB/includes/auth/provider/interface.php b/phpBB/includes/auth/provider/interface.php
index 2d1935f8f0..fe2415ee25 100644
--- a/phpBB/includes/auth/provider/interface.php
+++ b/phpBB/includes/auth/provider/interface.php
@@ -71,6 +71,19 @@ interface phpbb_auth_provider_interface
 	 */
 	public function acp($new);
 
+	/**
+	 * This function updates the template with variables related to the acp
+	 * options with whatever configuraton values are passed to it as an array.
+	 * It then returns the name of the acp file related to this authentication
+	 * provider.
+	 * @param	array	$new_config Contains the new configuration values that
+	 *								have been set in acp_board.
+	 * @return	string|null		Returns null if not implemented or a string
+	 *							containing the name of the acp tempalte file for
+	 *							the authentication provider.
+	 */
+	public function get_acp_template($new_config);
+
 	/**
 	 * Performs additional actions during logout.
 	 *
diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
index e10986abf0..9fc064a847 100644
--- a/phpBB/includes/auth/provider/ldap.php
+++ b/phpBB/includes/auth/provider/ldap.php
@@ -30,8 +30,9 @@ class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
 	 * @param 	phpbb_db_driver	$db
 	 * @param 	phpbb_config	$config
 	 * @param 	phpbb_user		$user
+	 * @param 	phpbb_template 	$template
 	 */
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_user $user)
+	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_user $user, phpbb_template $template)
 	{
 		$this->db = $db;
 		$this->config = $config;
@@ -331,6 +332,23 @@ class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
 		);
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get_acp_template($new_config)
+	{
+		$this->template->assign_vars(array(
+			'AUTH_LDAP_DN'			=> $new_config['ldap_base_dn'],
+			'AUTH_LDAP_EMAIL'		=> $new_config['ldap_email'],
+			'AUTH_LDAP_PASSORD'		=> $new_config['ldap_password'],
+			'AUTH_LDAP_PORT'		=> $new_config['ldap_port'],
+			'AUTH_LDAP_SERVER'		=> $new_config['ldap_server'],
+			'AUTH_LDAP_UID'			=> $new_config['ldap_uid'],
+			'AUTH_LDAP_USER'		=> $new_config['ldap_user'],
+			'AUTH_LDAP_USER_FILTER'	=> $new_config['ldap_user_filter'],
+		));
+	}
+
 	/**
 	 * Generates a filter string for ldap_search to find a user
 	 *
-- 
cgit v1.2.1


From 80eb95bbb7685995ccc2cfa46280aef6e8ef024a Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 8 Jul 2013 13:51:00 -0400
Subject: [ticket/11626] LDAP Auth ACP Template File

PHPBB3-11626
---
 phpBB/includes/auth/provider/ldap.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
index 9fc064a847..b063f6d682 100644
--- a/phpBB/includes/auth/provider/ldap.php
+++ b/phpBB/includes/auth/provider/ldap.php
@@ -347,6 +347,8 @@ class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
 			'AUTH_LDAP_USER'		=> $new_config['ldap_user'],
 			'AUTH_LDAP_USER_FILTER'	=> $new_config['ldap_user_filter'],
 		));
+
+		return 'auth_provider_ldap.html';
 	}
 
 	/**
-- 
cgit v1.2.1


From 29b472c2e5c8a878b592c53733cc57961d60a0af Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 8 Jul 2013 13:59:24 -0400
Subject: [ticket/11626] Include the template file in acp_board

PHPBB3-11626
---
 phpBB/includes/acp/acp_board.php      | 8 +++-----
 phpBB/includes/auth/provider/ldap.php | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index f142801b72..4c5f951bdc 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -655,15 +655,13 @@ class acp_board
 
 			foreach ($auth_providers as $provider)
 			{
-				$fields = $provider->acp($this->new_config);
-
-				if ($fields['tpl'])
+				$auth_tpl = $provider->get_acp_template($this->new_config);
+				if ($auth_tpl)
 				{
 					$template->assign_block_vars('auth_tpl', array(
-						'TPL'	=> $fields['tpl'],
+						'TPL'	=> $provider->get_acp_template($this->new_config),
 					));
 				}
-				unset($fields);
 			}
 		}
 	}
diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
index b063f6d682..0164a60f2e 100644
--- a/phpBB/includes/auth/provider/ldap.php
+++ b/phpBB/includes/auth/provider/ldap.php
@@ -37,6 +37,7 @@ class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
 		$this->db = $db;
 		$this->config = $config;
 		$this->user = $user;
+		$this->template = $template;
 	}
 
 	/**
-- 
cgit v1.2.1


From 60100b62f35cde7f5beafefbe9ff1a10ee81faa4 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 8 Jul 2013 14:02:53 -0400
Subject: [ticket/11626] Change interface to match functionality

Changes the interface so that it matches the new functionality of
phpbb_provider_auth_interface::acp().

PHPBB3-11626
---
 phpBB/includes/acp/acp_board.php           |  4 +--
 phpBB/includes/auth/provider/base.php      |  2 +-
 phpBB/includes/auth/provider/interface.php | 10 ++-----
 phpBB/includes/auth/provider/ldap.php      | 42 +++---------------------------
 4 files changed, 8 insertions(+), 50 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 4c5f951bdc..f01963c2ce 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -528,10 +528,10 @@ class acp_board
 			$old_auth_config = array();
 			foreach ($auth_providers as $provider)
 			{
-				if ($fields = $provider->acp($this->new_config))
+				if ($fields = $provider->acp())
 				{
 					// Check if we need to create config fields for this plugin and save config when submit was pressed
-					foreach ($fields['config'] as $field)
+					foreach ($fields as $field)
 					{
 						if (!isset($config[$field]))
 						{
diff --git a/phpBB/includes/auth/provider/base.php b/phpBB/includes/auth/provider/base.php
index d1de9647df..7eaf8bb2d3 100644
--- a/phpBB/includes/auth/provider/base.php
+++ b/phpBB/includes/auth/provider/base.php
@@ -41,7 +41,7 @@ abstract class phpbb_auth_provider_base implements phpbb_auth_provider_interface
 	/**
 	* {@inheritdoc}
 	*/
-	public function acp($new)
+	public function acp()
 	{
 		return;
 	}
diff --git a/phpBB/includes/auth/provider/interface.php b/phpBB/includes/auth/provider/interface.php
index fe2415ee25..40c48026cf 100644
--- a/phpBB/includes/auth/provider/interface.php
+++ b/phpBB/includes/auth/provider/interface.php
@@ -60,16 +60,10 @@ interface phpbb_auth_provider_interface
 	 * This function is used to output any required fields in the authentication
 	 * admin panel. It also defines any required configuration table fields.
 	 *
-	 * @param 	array 	$new 	Contains the new configuration values that have
-	 * 							been set in acp_board.
 	 * @return	array|null	Returns null if not implemented or an array of the
-	 *						form:
-	 *							array(
-	 *								'tpl'		=> string
-	 *								'config' 	=> array
-	 *							)
+	 *						configuration fields of the provider.
 	 */
-	public function acp($new);
+	public function acp();
 
 	/**
 	 * This function updates the template with variables related to the acp
diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
index 0164a60f2e..288fb617f5 100644
--- a/phpBB/includes/auth/provider/ldap.php
+++ b/phpBB/includes/auth/provider/ldap.php
@@ -288,48 +288,12 @@ class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
 	/**
 	 * {@inheritdoc}
 	 */
-	public function acp($new)
-	{
-		$tpl = '
-
-		<dl>
-			<dt><label for="ldap_server">' . $this->user->lang['LDAP_SERVER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_SERVER_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="' . $new['ldap_server'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_port">' . $this->user->lang['LDAP_PORT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_PORT_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="' . $new['ldap_port'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_dn">' . $this->user->lang['LDAP_DN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_DN_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="' . $new['ldap_base_dn'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_uid">' . $this->user->lang['LDAP_UID'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_UID_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="' . $new['ldap_uid'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_user_filter">' . $this->user->lang['LDAP_USER_FILTER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_USER_FILTER_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="' . $new['ldap_user_filter'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_email">' . $this->user->lang['LDAP_EMAIL'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_EMAIL_EXPLAIN'] . '</span></dt>
-			<dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="' . $new['ldap_email'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_user">' . $this->user->lang['LDAP_USER'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_USER_EXPLAIN'] . '</span></dt>
-			<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="' . $new['ldap_user'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="ldap_password">' . $this->user->lang['LDAP_PASSWORD'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['LDAP_PASSWORD_EXPLAIN'] . '</span></dt>
-			<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="' . $new['ldap_password'] . '" autocomplete="off" /></dd>
-		</dl>
-		';
 
+	public function acp()
+	{
 		// These are fields required in the config table
 		return array(
-			'tpl'		=> $tpl,
-			'config'	=> array('ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password')
+			'ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password',
 		);
 	}
 
-- 
cgit v1.2.1


From 3431cb8ed7dae3e340d1763cde103c31e85496a6 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 8 Jul 2013 14:08:28 -0400
Subject: [ticket/11626] Call method only one time per provider

PHPBB3-11626
---
 phpBB/includes/acp/acp_board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index f01963c2ce..b5f145a598 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -659,7 +659,7 @@ class acp_board
 				if ($auth_tpl)
 				{
 					$template->assign_block_vars('auth_tpl', array(
-						'TPL'	=> $provider->get_acp_template($this->new_config),
+						'TPL'	=> $auth_tpl,
 					));
 				}
 			}
-- 
cgit v1.2.1


From 3465867a4eee21b62707e9a28ad7831f8677363f Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 8 Jul 2013 14:57:25 -0400
Subject: [ticket/11626] Change the identifier template file in the template

PHPBB3-11626
---
 phpBB/includes/acp/acp_board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index b5f145a598..5d824dea9e 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -659,7 +659,7 @@ class acp_board
 				if ($auth_tpl)
 				{
 					$template->assign_block_vars('auth_tpl', array(
-						'TPL'	=> $auth_tpl,
+						'template_file'	=> $auth_tpl,
 					));
 				}
 			}
-- 
cgit v1.2.1


From f24a8e5b8150bcd892585531585ef46f49db0ef7 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 8 Jul 2013 15:24:23 -0400
Subject: [ticket/11626] Make identifier uppercase per style requirements

PHPBB3-11626
---
 phpBB/includes/acp/acp_board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 5d824dea9e..9285608ae2 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -659,7 +659,7 @@ class acp_board
 				if ($auth_tpl)
 				{
 					$template->assign_block_vars('auth_tpl', array(
-						'template_file'	=> $auth_tpl,
+						'TEMPLATE_FILE'	=> $auth_tpl,
 					));
 				}
 			}
-- 
cgit v1.2.1


From 599f83395f90c9a899b0e639ba5acacfb8ae372b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 11 Jul 2013 16:08:15 -0400
Subject: [ticket/11548] Run array_map on complete error array and not just
 colour_error

Up to now the array_map() that turns error messages into the localized output
was only ran if the group's color was set. With this patch it'll run the
array_map() on the complete error array if it's not empty.

PHPBB3-11548
---
 phpBB/includes/ucp/ucp_groups.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 9365913541..663b5bc931 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -599,7 +599,7 @@ class ucp_groups
 							if ($colour_error = validate_data($submit_ary, array('colour'	=> array('hex_colour', true))))
 							{
 								// Replace "error" string with its real, localised form
-								$error = array_merge($error, array_map(array(&$user, 'lang'), $colour_error));
+								$error = array_merge($error, $colour_error);
 							}
 
 							if (!sizeof($error))
@@ -642,6 +642,7 @@ class ucp_groups
 
 							if (sizeof($error))
 							{
+								$error = array_map(array(&$user, 'lang'), $error);
 								$group_rank = $submit_ary['rank'];
 
 								$group_desc_data = array(
-- 
cgit v1.2.1


From 159f018056659fa3eccae744ec513efbd2221f77 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 11 Jul 2013 15:22:05 -0500
Subject: [ticket/11388] INCLUDECSS

PHPBB3-11388
---
 phpBB/includes/template/twig/extension.php         |  1 +
 phpBB/includes/template/twig/lexer.php             |  2 ++
 phpBB/includes/template/twig/node/includecss.php   | 30 +++++++++++++++++
 .../template/twig/tokenparser/includecss.php       | 38 ++++++++++++++++++++++
 4 files changed, 71 insertions(+)
 create mode 100644 phpBB/includes/template/twig/node/includecss.php
 create mode 100644 phpBB/includes/template/twig/tokenparser/includecss.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index 5ffc45e75a..c279726434 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -57,6 +57,7 @@ class phpbb_template_twig_extension extends Twig_Extension
 			new phpbb_template_twig_tokenparser_define,
 			new phpbb_template_twig_tokenparser_include,
 			new phpbb_template_twig_tokenparser_includejs,
+			new phpbb_template_twig_tokenparser_includecss,
 			new phpbb_template_twig_tokenparser_event,
 			new phpbb_template_twig_tokenparser_includephp,
 			new phpbb_template_twig_tokenparser_php,
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index d0a84a8b7f..46412ad048 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -35,6 +35,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			'INCLUDE',
 			'INCLUDEPHP',
 			'INCLUDEJS',
+			'INCLUDECSS',
 			'PHP',
 			'ENDPHP',
 			'EVENT',
@@ -78,6 +79,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			'INCLUDE',
 			'INCLUDEPHP',
 			'INCLUDEJS',
+			'INCLUDECSS',
 		), $code);
 
 		// Fix our BEGIN statements
diff --git a/phpBB/includes/template/twig/node/includecss.php b/phpBB/includes/template/twig/node/includecss.php
new file mode 100644
index 0000000000..01fda44aad
--- /dev/null
+++ b/phpBB/includes/template/twig/node/includecss.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset
+{
+	public function get_definition_name()
+	{
+		return 'STYLESHEETS';
+	}
+
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function append_asset(Twig_Compiler $compiler)
+	{
+		$compiler
+			->raw("<link href=\"' . ")
+			->raw("\$asset_file . '\"")
+			->raw(' rel="stylesheet" type="text/css" media="screen, projection" />')
+		;
+	}
+}
diff --git a/phpBB/includes/template/twig/tokenparser/includecss.php b/phpBB/includes/template/twig/tokenparser/includecss.php
new file mode 100644
index 0000000000..6c24dda647
--- /dev/null
+++ b/phpBB/includes/template/twig/tokenparser/includecss.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_tokenparser_includecss extends Twig_TokenParser
+{
+	/**
+	 * Parses a token and returns a node.
+	 *
+	 * @param Twig_Token $token A Twig_Token instance
+	 *
+	 * @return Twig_NodeInterface A Twig_NodeInterface instance
+	 */
+	public function parse(Twig_Token $token)
+	{
+		$expr = $this->parser->getExpressionParser()->parseExpression();
+
+		$stream = $this->parser->getStream();
+		$stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+		return new phpbb_template_twig_node_includecss($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
+	}
+
+	/**
+	 * Gets the tag name associated with this token parser.
+	 *
+	 * @return string The tag name
+	 */
+	public function getTag()
+	{
+		return 'INCLUDECSS';
+	}
+}
-- 
cgit v1.2.1


From 63f1d99cc8971100fed9a74b5ca3e0850c4edcb8 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 11 Jul 2013 16:33:08 -0400
Subject: [ticket/11647] Fix invalid variable name

PHPBB3-11647
---
 phpBB/includes/template/asset.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/asset.php b/phpBB/includes/template/asset.php
index eae62f4db0..f3b18a102a 100644
--- a/phpBB/includes/template/asset.php
+++ b/phpBB/includes/template/asset.php
@@ -40,12 +40,11 @@ class phpbb_template_asset
 		{
 			// Workaround for PHP 5.4.6 and older bug #62844 - add fake scheme and then remove it
 			$this->components = parse_url('http:' . $url);
-			if (isset($result['port']))
+			if (isset($this->components['port']))
 			{
 				return;
 			}
-			unset($result['scheme']);
-			$this->components = $result;
+			unset($this->components['scheme']);
 			return;
 		}
 		$this->components = parse_url($url);
-- 
cgit v1.2.1


From 4fbdac0b9e8089574cd3617c6c8294a54dac1abc Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 11 Jul 2013 16:38:52 -0400
Subject: [ticket/11647] Use $config for assets_version

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php
index 1159b63827..ae113cadc8 100644
--- a/phpBB/includes/template/twig/node/includeasset.php
+++ b/phpBB/includes/template/twig/node/includeasset.php
@@ -43,7 +43,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
 					->write("\$local_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_path);\n")
 					->write("\$asset->set_path(\$local_file, true);\n")
 				->outdent()
-				->write("\$asset->add_assets_version(\$this->getEnvironment()->get_phpbb_config()['assets_version']);\n")
+				->write("\$asset->add_assets_version({$config['assets_version']});\n")
 				->write("\$asset_file = \$asset->get_url();\n")
 				->write("}\n")
 			->outdent()
-- 
cgit v1.2.1


From 94fc0cccdc49962e3111e291de8800a0d2d50837 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 11 Jul 2013 16:56:10 -0400
Subject: [ticket/11647] Allow custom ports

Allow custom port number in schema-relative URLs

PHPBB3-11647
---
 phpBB/includes/template/asset.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/asset.php b/phpBB/includes/template/asset.php
index f3b18a102a..99ac1f0ca7 100644
--- a/phpBB/includes/template/asset.php
+++ b/phpBB/includes/template/asset.php
@@ -40,10 +40,6 @@ class phpbb_template_asset
 		{
 			// Workaround for PHP 5.4.6 and older bug #62844 - add fake scheme and then remove it
 			$this->components = parse_url('http:' . $url);
-			if (isset($this->components['port']))
-			{
-				return;
-			}
 			unset($this->components['scheme']);
 			return;
 		}
-- 
cgit v1.2.1


From a64a042830d3b0189e35ff0abe0649bff7105a1b Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 17:39:34 -0400
Subject: [feature/auth-refactor] Fix typo

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index f142801b72..7a3c4990d5 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -680,7 +680,7 @@ class acp_board
 
 		foreach($auth_providers as $key => $value)
 		{
-			if (!($provider instanceof phpbb_auth_provider_interface))
+			if (!($value instanceof phpbb_auth_provider_interface))
 			{
 				continue;
 			}
-- 
cgit v1.2.1


From f4f29a1c0ae04c3a3d41aee822d7c858f39f5295 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 17:43:20 -0400
Subject: [feature/auth-refactor] Fix style issue

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 7a3c4990d5..7627ff0b56 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -678,7 +678,7 @@ class acp_board
 		$auth_plugins = array();
 		$auth_providers = $phpbb_container->get('auth.provider_collection');
 
-		foreach($auth_providers as $key => $value)
+		foreach ($auth_providers as $key => $value)
 		{
 			if (!($value instanceof phpbb_auth_provider_interface))
 			{
-- 
cgit v1.2.1


From 0e5e128174f862f16069b56ef6f5b9803fe5cb9b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 18:02:45 -0400
Subject: [ticket/9657] Fix variable naming of phpEx to php_ext

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 43efef5d7f..01e688d106 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -62,7 +62,7 @@ class phpbb_content_visibility
 	* @param	string		$php_ext			PHP Extension
 	* @return	null
 	*/
-	public function __construct($auth, phpbb_db_driver $db, $user, $phpbb_root_path, $phpEx, $forums_table, $posts_table, $topics_table, $users_table)
+	public function __construct($auth, phpbb_db_driver $db, $user, $phpbb_root_path, $php_ext, $forums_table, $posts_table, $topics_table, $users_table)
 	{
 		$this->auth = $auth;
 		$this->db = $db;
-- 
cgit v1.2.1


From 1a5d685f45e5fd4450750227ef2eefe34a9b482a Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 11 Jul 2013 17:54:03 -0400
Subject: [feature/bootstrap-dic] Bootstrap container from config.php

PHPBB3-11651
---
 phpBB/includes/functions_container.php | 80 +++++++++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 106b7d75cc..0575f00a0b 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -20,6 +20,67 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
+/**
+* Get DB connection from config.php.
+*
+* Used to bootstrap the container.
+*
+* @param string $config_file
+* @return phpbb_db_driver
+*/
+function phpbb_bootstrap_db_connection($config_file)
+{
+	require($config_file);
+	$dbal_driver_class = phpbb_convert_30_dbms_to_31($dbms);
+
+	return new $dbal_driver_class($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, defined('PHPBB_DB_NEW_LINK'));
+}
+
+/**
+* Get table prefix from config.php.
+*
+* Used to bootstrap the container.
+*
+* @param string $config_file
+* @return string table prefix
+*/
+function phpbb_bootstrap_table_prefix($config_file)
+{
+	require($config_file);
+	return $table_prefix;
+}
+
+/**
+* Get enabled extensions.
+*
+* Used to bootstrap the container.
+*
+* @param string $config_file
+* @return array enabled extensions
+*/
+function phpbb_bootstrap_enabled_exts($config_file)
+{
+	$db = phpbb_bootstrap_db_connection($config_file);
+	$table_prefix = phpbb_bootstrap_table_prefix($config_file);
+	$extension_table = $table_prefix.'ext';
+
+	$sql = 'SELECT *
+			FROM ' . $extension_table . '
+			WHERE ext_active = 1';
+
+	$result = $db->sql_query($sql);
+	$rows = $db->sql_fetchrowset($result);
+	$db->sql_freeresult($result);
+
+	$exts = array();
+	foreach ($rows as $row)
+	{
+		$exts[$row['ext_name']] = $phpbb_root_path . 'ext/' . $row['ext_name'] . '/';
+	}
+
+	return $exts;
+}
+
 /**
 * Create the ContainerBuilder object
 *
@@ -79,16 +140,9 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext)
 * @param string $php_ext PHP Extension
 * @return ContainerBuilder object (compiled)
 */
-function phpbb_create_compiled_container(array $extensions, array $passes, $phpbb_root_path, $php_ext)
+function phpbb_create_compiled_container($config_file, array $extensions, array $passes, $phpbb_root_path, $php_ext)
 {
-	// Create a temporary container for access to the ext.manager service
-	$tmp_container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext);
-	$tmp_container->compile();
-
-	// XXX stop writing to global $cache when
-	// http://tracker.phpbb.com/browse/PHPBB3-11203 is fixed
-	$GLOBALS['cache'] = $tmp_container->get('cache');
-	$installed_exts = $tmp_container->get('ext.manager')->all_enabled();
+	$installed_exts = phpbb_bootstrap_enabled_exts($config_file);
 
 	// Now pass the enabled extension paths into the ext compiler extension
 	$extensions[] = new phpbb_di_extension_ext($installed_exts);
@@ -115,7 +169,7 @@ function phpbb_create_compiled_container(array $extensions, array $passes, $phpb
 * @param string $php_ext PHP Extension
 * @return ContainerBuilder object (compiled)
 */
-function phpbb_create_dumped_container(array $extensions, array $passes, $phpbb_root_path, $php_ext)
+function phpbb_create_dumped_container($config_file, array $extensions, array $passes, $phpbb_root_path, $php_ext)
 {
 	// Check for our cached container; if it exists, use it
 	$container_filename = phpbb_container_filename($phpbb_root_path, $php_ext);
@@ -155,7 +209,7 @@ function phpbb_create_dumped_container(array $extensions, array $passes, $phpbb_
 * @param string $php_ext PHP Extension
 * @return ContainerBuilder object (compiled)
 */
-function phpbb_create_dumped_container_unless_debug(array $extensions, array $passes, $phpbb_root_path, $php_ext)
+function phpbb_create_dumped_container_unless_debug($config_file, array $extensions, array $passes, $phpbb_root_path, $php_ext)
 {
 	$container_factory = defined('DEBUG') ? 'phpbb_create_compiled_container' : 'phpbb_create_dumped_container';
 	return $container_factory($extensions, $passes, $phpbb_root_path, $php_ext);
@@ -172,9 +226,11 @@ function phpbb_create_dumped_container_unless_debug(array $extensions, array $pa
 */
 function phpbb_create_default_container($phpbb_root_path, $php_ext)
 {
+	$config_file = $phpbb_root_path . 'config.' . $php_ext;
 	return phpbb_create_dumped_container_unless_debug(
+		$config_file,
 		array(
-			new phpbb_di_extension_config($phpbb_root_path . 'config.' . $php_ext),
+			new phpbb_di_extension_config($config_file),
 			new phpbb_di_extension_core($phpbb_root_path),
 		),
 		array(
-- 
cgit v1.2.1


From 54012dfb2f11e275e65078689a554f865562041e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 18:04:56 -0400
Subject: [ticket/9657] Initialise variable outside of the loop

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_main.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 62c3eda447..b80532a4a0 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -513,6 +513,7 @@ function mcp_move_topic($topic_ids)
 			$db->sql_query($sql);
 		}
 
+		$shadow_topics = 0;
 		$forum_ids = array($to_forum_id);
 		foreach ($topic_data as $topic_id => $row)
 		{
-- 
cgit v1.2.1


From f5c2119e7cd0359614300be9a2bd116965a1ec7c Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 11 Jul 2013 18:13:48 -0400
Subject: [ticket/11647] Always use &amp; for URLs

Remove code for URLs separated with ;
Add test case for mix of & and &amp; in URLs

PHPBB3-11647
---
 phpBB/includes/template/asset.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/asset.php b/phpBB/includes/template/asset.php
index 99ac1f0ca7..7c322cd971 100644
--- a/phpBB/includes/template/asset.php
+++ b/phpBB/includes/template/asset.php
@@ -40,7 +40,7 @@ class phpbb_template_asset
 		{
 			// Workaround for PHP 5.4.6 and older bug #62844 - add fake scheme and then remove it
 			$this->components = parse_url('http:' . $url);
-			unset($this->components['scheme']);
+			$this->components['scheme'] = '';
 			return;
 		}
 		$this->components = parse_url($url);
@@ -176,8 +176,7 @@ class phpbb_template_asset
 		$query = $this->components['query'];
 		if (!preg_match('/(^|[&;])assets_version=/', $query))
 		{
-			$separator = (strpos($query, '&') === false) && (strpos($query, ';') !== false) && preg_match('/^.*=.*;.*=.*$/', $query) ? ';' : '&amp;';
-			$this->components['query'] = $query . $separator . 'assets_version=' . $version;
+			$this->components['query'] = $query . '&amp;assets_version=' . $version;
 		}
 	}
 }
-- 
cgit v1.2.1


From 3a87a6b7007c015cf722b7a4e49f2880ba38f533 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 11 Jul 2013 20:46:18 -0400
Subject: [ticket/11215] use  global PHPBB3-11215

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 331eaf742e..420a13c200 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2413,7 +2413,7 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 {
 	global $_SID, $_EXTRA_URL, $phpbb_hook;
 	global $phpbb_dispatcher;
-	global $request;
+	global $symfony_request;
 
 	if ($params === '' || (is_array($params) && empty($params)))
 	{
@@ -2421,7 +2421,7 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 		$params = false;
 	}
 
-	$corrected_root = phpbb_get_web_root_path(phpbb_create_symfony_request($request));
+	$corrected_root = phpbb_get_web_root_path($symfony_request);
 	if ($corrected_root)
 	{
 		$url = $corrected_root . substr($url, strlen($phpbb_root_path));
-- 
cgit v1.2.1


From 53c0647aed4a4995d3ae00ed775ff563eaa61b9a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 22:16:45 -0400
Subject: [ticket/9657] Use include instead of include_once

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 514d7bc4ee..ac3391c294 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -108,7 +108,10 @@ class mcp_queue
 					return;
 				}
 
-				include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+				if (!class_exists('messenger'))
+				{
+					include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
+				}
 
 				if (!empty($topic_id_list))
 				{
@@ -1042,7 +1045,7 @@ class mcp_queue
 			{
 				if (!function_exists('delete_posts'))
 				{
-					include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
+					include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 				}
 
 				// We do not check for permissions here, because the moderator allowed approval/disapproval should be allowed to delete the disapproved posts
@@ -1160,7 +1163,10 @@ class mcp_queue
 		}
 		else
 		{
-			include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+			if (!function_exists('display_reasons'))
+			{
+				include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+			}
 
 			$show_notify = false;
 
-- 
cgit v1.2.1


From 5ab0090e6c9fa1b497938a932cdf28ba55a17e7c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 22:35:55 -0400
Subject: [ticket/9657] Remove sql_visibility as it is always non-empty

PHPBB3-9657
---
 phpBB/includes/feed/forum.php   |  7 ++-----
 phpBB/includes/feed/overall.php |  4 +---
 phpBB/includes/feed/topic.php   |  4 +---
 phpBB/includes/functions.php    | 10 ++++------
 4 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/forum.php b/phpBB/includes/feed/forum.php
index fc217c203c..4a159ff3d4 100644
--- a/phpBB/includes/feed/forum.php
+++ b/phpBB/includes/feed/forum.php
@@ -90,14 +90,12 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 
 	function get_sql()
 	{
-		$sql_visibility = $this->content_visibility->get_visibility_sql('topic', $this->forum_id);
-
 		// Determine topics with recent activity
 		$sql = 'SELECT topic_id, topic_last_post_time
 			FROM ' . TOPICS_TABLE . '
 			WHERE forum_id = ' . $this->forum_id . '
 				AND topic_moved_id = 0
-				' . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . '
+				AND ' . $this->content_visibility->get_visibility_sql('topic', $this->forum_id) . '
 			ORDER BY topic_last_post_time DESC';
 		$result = $this->db->sql_query_limit($sql, $this->num_items);
 
@@ -116,8 +114,6 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 			return false;
 		}
 
-		$sql_visibility = $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.'); 
-
 		$this->sql = array(
 			'SELECT'	=>	'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
 							'u.username, u.user_id',
@@ -127,6 +123,7 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 			),
 			'WHERE'		=> $this->db->sql_in_set('p.topic_id', $topic_ids) . '
 							' . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . '
+							AND ' . $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.') . '
 							AND p.post_time >= ' . $min_post_time . '
 							AND p.poster_id = u.user_id',
 			'ORDER_BY'	=> 'p.post_time DESC',
diff --git a/phpBB/includes/feed/overall.php b/phpBB/includes/feed/overall.php
index af45840d69..869df7cde0 100644
--- a/phpBB/includes/feed/overall.php
+++ b/phpBB/includes/feed/overall.php
@@ -56,8 +56,6 @@ class phpbb_feed_overall extends phpbb_feed_post_base
 			return false;
 		}
 
-		$sql_visibility = $this->content_visibility->get_visibility_sql('post', array(), 'p.');
-
 		// Get the actual data
 		$this->sql = array(
 			'SELECT'	=>	'f.forum_id, f.forum_name, ' .
@@ -74,7 +72,7 @@ class phpbb_feed_overall extends phpbb_feed_post_base
 				),
 			),
 			'WHERE'		=> $this->db->sql_in_set('p.topic_id', $topic_ids) . '
-							' . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . '
+							AND ' . $this->content_visibility->get_visibility_sql('post', array(), 'p.') . '
 							AND p.post_time >= ' . $min_post_time . '
 							AND u.user_id = p.poster_id',
 			'ORDER_BY'	=> 'p.post_time DESC',
diff --git a/phpBB/includes/feed/topic.php b/phpBB/includes/feed/topic.php
index 10f86486c6..36f958ac60 100644
--- a/phpBB/includes/feed/topic.php
+++ b/phpBB/includes/feed/topic.php
@@ -93,8 +93,6 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 
 	function get_sql()
 	{
-		$sql_visibility = $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.'); 
-
 		$this->sql = array(
 			'SELECT'	=>	'p.post_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
 							'u.username, u.user_id',
@@ -103,7 +101,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 				USERS_TABLE		=> 'u',
 			),
 			'WHERE'		=> 'p.topic_id = ' . $this->topic_id . '
-								' . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . '
+								AND ' . $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.') . '
 								AND p.poster_id = u.user_id',
 			'ORDER_BY'	=> 'p.post_time DESC',
 		);
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9664b5663c..93ad723eda 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2000,8 +2000,6 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 	// Handle update of unapproved topics info.
 	// Only update for moderators having m_approve permission for the forum.
 	$phpbb_content_visibility = $phpbb_container->get('content.visibility');
-	$sql_update_unapproved = $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.');
-	$sql_update_unapproved = ($sql_update_unapproved) ? ' AND ' . $sql_update_unapproved : '';
 
 	// Check the forum for any left unread topics.
 	// If there are none, we mark the forum as read.
@@ -2021,8 +2019,8 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 						AND tt.user_id = ' . $user->data['user_id'] . ')
 				WHERE t.forum_id = ' . $forum_id . '
 					AND t.topic_last_post_time > ' . $mark_time_forum . '
-					AND t.topic_moved_id = 0 ' .
-					$sql_update_unapproved . '
+					AND t.topic_moved_id = 0
+					AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.') . '
 					AND (tt.topic_id IS NULL
 						OR tt.mark_time < t.topic_last_post_time)';
 			$result = $db->sql_query_limit($sql, 1);
@@ -2046,8 +2044,8 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti
 				FROM ' . TOPICS_TABLE . ' t
 				WHERE t.forum_id = ' . $forum_id . '
 					AND t.topic_last_post_time > ' . $mark_time_forum . '
-					AND t.topic_moved_id = 0 ' .
-					$sql_update_unapproved;
+					AND t.topic_moved_id = 0
+					AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.');
 			$result = $db->sql_query($sql);
 
 			$check_forum = $tracking_topics['tf'][$forum_id];
-- 
cgit v1.2.1


From 003a104f931201704998f5c00c5cf982896b470b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 22:41:24 -0400
Subject: [ticket/9657] Add type hints for classes

PHPBB3-9657
---
 phpBB/includes/content_visibility.php | 2 +-
 phpBB/includes/feed/base.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
index 01e688d106..4ad5f6793e 100644
--- a/phpBB/includes/content_visibility.php
+++ b/phpBB/includes/content_visibility.php
@@ -62,7 +62,7 @@ class phpbb_content_visibility
 	* @param	string		$php_ext			PHP Extension
 	* @return	null
 	*/
-	public function __construct($auth, phpbb_db_driver $db, $user, $phpbb_root_path, $php_ext, $forums_table, $posts_table, $topics_table, $users_table)
+	public function __construct(phpbb_auth $auth, phpbb_db_driver $db, phpbb_user $user, $phpbb_root_path, $php_ext, $forums_table, $posts_table, $topics_table, $users_table)
 	{
 		$this->auth = $auth;
 		$this->db = $db;
diff --git a/phpBB/includes/feed/base.php b/phpBB/includes/feed/base.php
index 84fdbe415a..296d830932 100644
--- a/phpBB/includes/feed/base.php
+++ b/phpBB/includes/feed/base.php
@@ -84,7 +84,7 @@ abstract class phpbb_feed_base
 	* @param string				$phpEx		php file extension
 	* @return	null
 	*/
-	function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, $content_visibility, $phpEx)
+	function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, phpbb_content_visibility $content_visibility, $phpEx)
 	{
 		$this->config = $config;
 		$this->helper = $helper;
-- 
cgit v1.2.1


From 1911285b77fa791ca202f810e4ba40c822aa5ae9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 11 Jul 2013 22:44:06 -0400
Subject: [ticket/9657] Notifications do not require emails or jabber anymore

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_queue.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index ac3391c294..8a9390212f 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -692,7 +692,7 @@ class mcp_queue
 		{
 			$show_notify = false;
 
-			if ($action == 'approve' && ($config['email_enable'] || $config['jab_enable']))
+			if ($action == 'approve')
 			{
 				foreach ($post_info as $post_data)
 				{
@@ -840,7 +840,7 @@ class mcp_queue
 		{
 			$show_notify = false;
 
-			if ($action == 'approve' && ($config['email_enable'] || $config['jab_enable']))
+			if ($action == 'approve')
 			{
 				foreach ($topic_info as $topic_data)
 				{
-- 
cgit v1.2.1


From 068d35065278bf52e85fcc96b629d25712f19c26 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 12 Jul 2013 00:03:06 -0400
Subject: [ticket/11215] Don't try to correct paths during tests PHPBB3-11215

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 420a13c200..40583dee54 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2421,7 +2421,7 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 		$params = false;
 	}
 
-	$corrected_root = phpbb_get_web_root_path($symfony_request);
+	$corrected_root = $symfony_request !== null ? phpbb_get_web_root_path($symfony_request) : '';
 	if ($corrected_root)
 	{
 		$url = $corrected_root . substr($url, strlen($phpbb_root_path));
-- 
cgit v1.2.1


From be020646f4f9bd6d7ed44f048718b9de9959f89f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 12 Jul 2013 09:37:24 -0500
Subject: [ticket/11660] Fix bugs from bugs in #11651 (missing vars,
 db->sql_connect)

PHPBB3-11660
---
 phpBB/includes/functions_container.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 0575f00a0b..f63dde0614 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -33,7 +33,10 @@ function phpbb_bootstrap_db_connection($config_file)
 	require($config_file);
 	$dbal_driver_class = phpbb_convert_30_dbms_to_31($dbms);
 
-	return new $dbal_driver_class($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, defined('PHPBB_DB_NEW_LINK'));
+	$db = new $dbal_driver_class();
+	$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, defined('PHPBB_DB_NEW_LINK'));
+
+	return $db;
 }
 
 /**
@@ -56,9 +59,10 @@ function phpbb_bootstrap_table_prefix($config_file)
 * Used to bootstrap the container.
 *
 * @param string $config_file
+* @param string $phpbb_root_path
 * @return array enabled extensions
 */
-function phpbb_bootstrap_enabled_exts($config_file)
+function phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path)
 {
 	$db = phpbb_bootstrap_db_connection($config_file);
 	$table_prefix = phpbb_bootstrap_table_prefix($config_file);
@@ -142,7 +146,7 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext)
 */
 function phpbb_create_compiled_container($config_file, array $extensions, array $passes, $phpbb_root_path, $php_ext)
 {
-	$installed_exts = phpbb_bootstrap_enabled_exts($config_file);
+	$installed_exts = phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path);
 
 	// Now pass the enabled extension paths into the ext compiler extension
 	$extensions[] = new phpbb_di_extension_ext($installed_exts);
@@ -179,7 +183,7 @@ function phpbb_create_dumped_container($config_file, array $extensions, array $p
 		return new phpbb_cache_container();
 	}
 
-	$container = phpbb_create_compiled_container($extensions, $passes, $phpbb_root_path, $php_ext);
+	$container = phpbb_create_compiled_container($config_file, $extensions, $passes, $phpbb_root_path, $php_ext);
 
 	// Lastly, we create our cached container class
 	$dumper = new PhpDumper($container);
@@ -212,7 +216,7 @@ function phpbb_create_dumped_container($config_file, array $extensions, array $p
 function phpbb_create_dumped_container_unless_debug($config_file, array $extensions, array $passes, $phpbb_root_path, $php_ext)
 {
 	$container_factory = defined('DEBUG') ? 'phpbb_create_compiled_container' : 'phpbb_create_dumped_container';
-	return $container_factory($extensions, $passes, $phpbb_root_path, $php_ext);
+	return $container_factory($config_file, $extensions, $passes, $phpbb_root_path, $php_ext);
 }
 
 /**
-- 
cgit v1.2.1


From f4b7cbd9766fff3e4232c5514da18c8fc3ff102b Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 12 Jul 2013 17:10:18 +0200
Subject: [ticket/11662] Typos: occured -> occurred

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
index 16dce16a72..2054124a4e 100644
--- a/phpBB/includes/functions_jabber.php
+++ b/phpBB/includes/functions_jabber.php
@@ -250,7 +250,7 @@ class jabber
 			return true;
 		}
 
-		// Apparently an error occured...
+		// Apparently an error occurred...
 		$this->add_to_log('Error: open_socket() - ' . $errorstr);
 		return false;
 	}
-- 
cgit v1.2.1


From 658b378b6375aec3df9a4f4a576428ba817cdda8 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 12 Jul 2013 17:51:29 +0200
Subject: [ticket/11662] Typos: occured -> occurred

PHPBB3-11662
---
 phpBB/includes/db/migration/migration.php   | 2 +-
 phpBB/includes/search/fulltext_mysql.php    | 2 +-
 phpBB/includes/search/fulltext_postgres.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/migration.php b/phpBB/includes/db/migration/migration.php
index 5f14a6953c..0ffa96fd14 100644
--- a/phpBB/includes/db/migration/migration.php
+++ b/phpBB/includes/db/migration/migration.php
@@ -44,7 +44,7 @@ abstract class phpbb_db_migration
 	/** @var string */
 	protected $php_ext;
 
-	/** @var array Errors, if any occured */
+	/** @var array Errors, if any occurred */
 	protected $errors;
 
 	/** @var array List of queries executed through $this->sql_query() */
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index aa493c3281..b16a7df606 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -140,7 +140,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	/**
 	* Checks for correct MySQL version and stores min/max word length in the config
 	*
-	* @return string|bool Language key of the error/incompatiblity occured
+	* @return string|bool Language key of the error/incompatiblity occurred
 	*/
 	public function init()
 	{
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index 496a29f5a3..758c3ba061 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -185,7 +185,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	/**
 	* Checks for correct PostgreSQL version and stores min/max word length in the config
 	*
-	* @return string|bool Language key of the error/incompatiblity occured
+	* @return string|bool Language key of the error/incompatiblity occurred
 	*/
 	public function init()
 	{
-- 
cgit v1.2.1


From 7e20b711806abf247209ea0211a45a8083f6ad3b Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 12 Jul 2013 11:47:34 -0500
Subject: [ticket/11665] Can't change file names already sent to set_filenames

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index f5638972a3..92a37d1634 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -172,7 +172,7 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	public function set_filenames(array $filename_array)
 	{
-		$this->filenames = array_merge($filename_array, $this->filenames);
+		$this->filenames = array_merge($this->filenames, $filename_array);
 
 		return $this;
 	}
-- 
cgit v1.2.1


From da8e35ac77c5d78f327d08fa1a9d0ff21ed38e83 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 12 Jul 2013 13:40:30 -0400
Subject: [ticket/11548] Fix incorrect usage of array_map on acp groups page

The array_map was only ran on small parts of the actual error array instead
of the whole one. This resulted in the output of the language variables' names
rather than their actual value.

PHPBB3-11548
---
 phpBB/includes/acp/acp_groups.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 9b9ea38e07..c9d476b8ae 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -437,7 +437,7 @@ class acp_groups
 					if ($validation_error = validate_data($submit_ary, $validation_checks))
 					{
 						// Replace "error" string with its real, localised form
-						$error = array_merge($error, array_map(array(&$user, 'lang'), $validation_error));
+						$error = array_merge($error, $validation_error);
 					}
 
 					if (!sizeof($error))
@@ -530,6 +530,7 @@ class acp_groups
 
 					if (sizeof($error))
 					{
+						$error = array_map(array(&$user, 'lang'), $error);
 						$group_rank = $submit_ary['rank'];
 
 						$group_desc_data = array(
-- 
cgit v1.2.1


From adff2fb254285e54f899f3a8604e1116cb11573c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 12 Jul 2013 14:35:17 -0400
Subject: [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0

The upload avatar URL was checked for its length in phpBB 3.0. Additionally,
starting with the new avatar system in phpBB 3.1, the URL was checked to
prevent improper URLs being submitted. This minor change is needed for proper
testing of the ucp and acp groups pages.

PHPBB3-11548
---
 phpBB/includes/avatar/driver/upload.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index baf51f61c1..685ac4f349 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -77,6 +77,32 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 		}
 		elseif (!empty($this->config['allow_avatar_remote_upload']) && !empty($url))
 		{
+			if (!preg_match('#^(http|https|ftp)://#i', $url))
+			{
+				$url = 'http://' . $url;
+			}
+
+			if (!function_exists('validate_data'))
+			{
+				require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+			}
+
+			$validate_array = validate_data(
+				array(
+					'url' => $url,
+				),
+				array(
+					'url' => array('string', true, 5, 255),
+				)
+			);
+
+			$error = array_merge($error, $validate_array);
+
+			if (!empty($error))
+			{
+				return false;
+			}
+
 			$file = $upload->remote_upload($url);
 		}
 		else
-- 
cgit v1.2.1


From f1dd35387c3e98cd4b623de5d0c9ffde470dd4c3 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 12 Jul 2013 00:43:52 +0200
Subject: [develop-olympus] Bump version numbers for 3.0.12-RC1 release.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index ad5b43bc9a..0a853adb9b 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.0.12-dev');
+define('PHPBB_VERSION', '3.0.12-RC1');
 
 // QA-related
 // define('PHPBB_QA', 1);
-- 
cgit v1.2.1


From b93636d42d63bd396a31ff7cf699f8add006d765 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 12 Jul 2013 20:56:55 +0200
Subject: [develop-olympus] Increment version number to 3.0.13-dev.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 0a853adb9b..8d09fe4d9b 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.0.12-RC1');
+define('PHPBB_VERSION', '3.0.13-dev');
 
 // QA-related
 // define('PHPBB_QA', 1);
-- 
cgit v1.2.1


From 8c5ff0775a4563f2a4ad1e7f30379576e1c5ca21 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 12 Jul 2013 15:42:28 -0400
Subject: [ticket/9657] Fix a little error when moving softdeleted topics

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_main.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index b80532a4a0..eddfdc3759 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -498,7 +498,6 @@ function mcp_move_topic($topic_ids)
 			$posts_moved_unapproved += $topic_info['topic_posts_unapproved'];
 			$posts_moved_softdeleted += $topic_info['topic_posts_softdeleted'];
 		}
-		$topics_moved = sizeof($topic_data);
 
 		$db->sql_transaction('begin');
 
-- 
cgit v1.2.1


From 631ce22f2c33999229bf05af35e025fb8d399417 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Fri, 12 Jul 2013 15:53:36 -0400
Subject: [ticket/11626] Remove LDAP dependency on template

Returns template vars rather than requiring the template.

PHPBB3-11626
---
 phpBB/includes/acp/acp_board.php           |  3 ++-
 phpBB/includes/auth/provider/interface.php | 11 ++++++++---
 phpBB/includes/auth/provider/ldap.php      | 31 +++++++++++++++---------------
 3 files changed, 26 insertions(+), 19 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 9285608ae2..ad95ad3da3 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -658,8 +658,9 @@ class acp_board
 				$auth_tpl = $provider->get_acp_template($this->new_config);
 				if ($auth_tpl)
 				{
+					$template->assign_vars($auth_tpl['TEMPLATE_VARS']);
 					$template->assign_block_vars('auth_tpl', array(
-						'TEMPLATE_FILE'	=> $auth_tpl,
+						'TEMPLATE_FILE'	=> $auth_tpl['TEMPLATE_FILE'],
 					));
 				}
 			}
diff --git a/phpBB/includes/auth/provider/interface.php b/phpBB/includes/auth/provider/interface.php
index 40c48026cf..47043bc107 100644
--- a/phpBB/includes/auth/provider/interface.php
+++ b/phpBB/includes/auth/provider/interface.php
@@ -72,9 +72,14 @@ interface phpbb_auth_provider_interface
 	 * provider.
 	 * @param	array	$new_config Contains the new configuration values that
 	 *								have been set in acp_board.
-	 * @return	string|null		Returns null if not implemented or a string
-	 *							containing the name of the acp tempalte file for
-	 *							the authentication provider.
+	 * @return	array|null		Returns null if not implemented or an array with
+	 *							the template file name and an array of the vars
+	 *							that the template needs that must conform to the
+	 *							following example:
+	 *							array(
+	 *								'TEMPLATE_FILE'	=> string,
+	 *								'TEMPLATE_VARS'	=> array(...),
+	 *							)
 	 */
 	public function get_acp_template($new_config);
 
diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
index 288fb617f5..56f9c23d55 100644
--- a/phpBB/includes/auth/provider/ldap.php
+++ b/phpBB/includes/auth/provider/ldap.php
@@ -30,14 +30,12 @@ class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
 	 * @param 	phpbb_db_driver	$db
 	 * @param 	phpbb_config	$config
 	 * @param 	phpbb_user		$user
-	 * @param 	phpbb_template 	$template
 	 */
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_user $user, phpbb_template $template)
+	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_user $user)
 	{
 		$this->db = $db;
 		$this->config = $config;
 		$this->user = $user;
-		$this->template = $template;
 	}
 
 	/**
@@ -302,18 +300,21 @@ class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
 	 */
 	public function get_acp_template($new_config)
 	{
-		$this->template->assign_vars(array(
-			'AUTH_LDAP_DN'			=> $new_config['ldap_base_dn'],
-			'AUTH_LDAP_EMAIL'		=> $new_config['ldap_email'],
-			'AUTH_LDAP_PASSORD'		=> $new_config['ldap_password'],
-			'AUTH_LDAP_PORT'		=> $new_config['ldap_port'],
-			'AUTH_LDAP_SERVER'		=> $new_config['ldap_server'],
-			'AUTH_LDAP_UID'			=> $new_config['ldap_uid'],
-			'AUTH_LDAP_USER'		=> $new_config['ldap_user'],
-			'AUTH_LDAP_USER_FILTER'	=> $new_config['ldap_user_filter'],
-		));
-
-		return 'auth_provider_ldap.html';
+		$this->template->assign_vars();
+
+		return array(
+			'TEMPLATE_FILE'	=> 'auth_provider_ldap.html',
+			'TEMPLATE_VARS'	=> array(
+				'AUTH_LDAP_DN'			=> $new_config['ldap_base_dn'],
+				'AUTH_LDAP_EMAIL'		=> $new_config['ldap_email'],
+				'AUTH_LDAP_PASSORD'		=> $new_config['ldap_password'],
+				'AUTH_LDAP_PORT'		=> $new_config['ldap_port'],
+				'AUTH_LDAP_SERVER'		=> $new_config['ldap_server'],
+				'AUTH_LDAP_UID'			=> $new_config['ldap_uid'],
+				'AUTH_LDAP_USER'		=> $new_config['ldap_user'],
+				'AUTH_LDAP_USER_FILTER'	=> $new_config['ldap_user_filter'],
+			),
+		);
 	}
 
 	/**
-- 
cgit v1.2.1


From 64308f41b054d11ae267a58e04821b7b1e31af91 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Fri, 12 Jul 2013 15:57:35 -0400
Subject: [ticket/11626] Remove last reference to template in ldap

PHPBB3-11626
---
 phpBB/includes/auth/provider/ldap.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
index 56f9c23d55..0196529408 100644
--- a/phpBB/includes/auth/provider/ldap.php
+++ b/phpBB/includes/auth/provider/ldap.php
@@ -300,8 +300,6 @@ class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
 	 */
 	public function get_acp_template($new_config)
 	{
-		$this->template->assign_vars();
-
 		return array(
 			'TEMPLATE_FILE'	=> 'auth_provider_ldap.html',
 			'TEMPLATE_VARS'	=> array(
-- 
cgit v1.2.1


From 07eadac2f6a57075450c5b543770904839e3764a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 12 Jul 2013 16:24:27 -0400
Subject: [ticket/11112] Use https for user-visible links to phpbb.com

PHPBB3-11112
---
 phpBB/includes/acp/acp_main.php            | 2 +-
 phpBB/includes/acp/acp_send_statistics.php | 2 +-
 phpBB/includes/db/dbal.php                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index ee7bd4dc45..d80b0d1532 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -402,7 +402,7 @@ class acp_main
 		{
 			$template->assign_vars(array(
 				'S_PHP_VERSION_OLD'	=> true,
-				'L_PHP_VERSION_OLD'	=> sprintf($user->lang['PHP_VERSION_OLD'], '<a href="http://www.phpbb.com/community/viewtopic.php?f=14&amp;t=2152375">', '</a>'),
+				'L_PHP_VERSION_OLD'	=> sprintf($user->lang['PHP_VERSION_OLD'], '<a href="https://www.phpbb.com/community/viewtopic.php?f=14&amp;t=2152375">', '</a>'),
 			));
 		}
 
diff --git a/phpBB/includes/acp/acp_send_statistics.php b/phpBB/includes/acp/acp_send_statistics.php
index b3baf54983..b8fc2d2c45 100644
--- a/phpBB/includes/acp/acp_send_statistics.php
+++ b/phpBB/includes/acp/acp_send_statistics.php
@@ -29,7 +29,7 @@ class acp_send_statistics
 	{
 		global $config, $template, $phpbb_admin_path, $phpEx;
 
-		$collect_url = "http://www.phpbb.com/stats/receive_stats.php";
+		$collect_url = "https://www.phpbb.com/stats/receive_stats.php";
 
 		$this->tpl_name = 'acp_send_statistics';
 		$this->page_title = 'ACP_SEND_STATISTICS';
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 9cc337955b..30d2870938 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -827,7 +827,7 @@ class dbal
 							</div>
 						</div>
 						<div id="page-footer">
-							Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+							Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
 						</div>
 					</div>
 					</body>
-- 
cgit v1.2.1


From 28e3341fcde976754f122a9c540b20aa705658fc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 13 Jul 2013 00:54:39 -0400
Subject: [ticket/9657] Keep approval state of posts/topics when copying them

PHPBB3-9657
---
 phpBB/includes/mcp/mcp_main.php | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index eddfdc3759..275edbe55a 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -1144,10 +1144,10 @@ function mcp_fork_topic($topic_ids)
 	{
 		$topic_data = get_topic_data($topic_ids, 'f_post');
 
-		$total_posts = 0;
+		$total_topics = $total_topics_unapproved = $total_topics_softdeleted = 0;
+		$total_posts = $total_posts_unapproved = $total_posts_softdeleted = 0;
 		$new_topic_id_list = array();
 
-
 		foreach ($topic_data as $topic_id => $topic_row)
 		{
 			if (!isset($search_type) && $topic_row['enable_indexing'])
@@ -1178,7 +1178,7 @@ function mcp_fork_topic($topic_ids)
 				'forum_id'					=> (int) $to_forum_id,
 				'icon_id'					=> (int) $topic_row['icon_id'],
 				'topic_attachment'			=> (int) $topic_row['topic_attachment'],
-				'topic_visibility'			=> ITEM_APPROVED,
+				'topic_visibility'			=> (int) $topic_row['topic_visibility'],
 				'topic_reported'			=> 0,
 				'topic_title'				=> (string) $topic_row['topic_title'],
 				'topic_poster'				=> (int) $topic_row['topic_poster'],
@@ -1206,6 +1206,19 @@ function mcp_fork_topic($topic_ids)
 			$new_topic_id = $db->sql_nextid();
 			$new_topic_id_list[$topic_id] = $new_topic_id;
 
+			switch ($topic_row['topic_visibility'])
+			{
+				case ITEM_APPROVED:
+					$total_topics++;
+				break;
+				case ITEM_UNAPPROVED:
+					$total_topics_unapproved++;
+				break;
+				case ITEM_DELETED:
+					$total_topics_softdeleted++;
+				break;
+			}
+
 			if ($topic_row['poll_start'])
 			{
 				$poll_rows = array();
@@ -1246,7 +1259,6 @@ function mcp_fork_topic($topic_ids)
 				continue;
 			}
 
-			$total_posts += sizeof($post_rows);
 			foreach ($post_rows as $row)
 			{
 				$sql_ary = array(
@@ -1256,7 +1268,7 @@ function mcp_fork_topic($topic_ids)
 					'icon_id'			=> (int) $row['icon_id'],
 					'poster_ip'			=> (string) $row['poster_ip'],
 					'post_time'			=> (int) $row['post_time'],
-					'post_visibility'	=> ITEM_APPROVED,
+					'post_visibility'	=> (int) $row['post_visibility'],
 					'post_reported'		=> 0,
 					'enable_bbcode'		=> (int) $row['enable_bbcode'],
 					'enable_smilies'	=> (int) $row['enable_smilies'],
@@ -1280,6 +1292,19 @@ function mcp_fork_topic($topic_ids)
 				$db->sql_query('INSERT INTO ' . POSTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
 				$new_post_id = $db->sql_nextid();
 
+				switch ($row['post_visibility'])
+				{
+					case ITEM_APPROVED:
+						$total_posts++;
+					break;
+					case ITEM_UNAPPROVED:
+						$total_posts_unapproved++;
+					break;
+					case ITEM_DELETED:
+						$total_posts_softdeleted++;
+					break;
+				}
+
 				// Copy whether the topic is dotted
 				markread('post', $to_forum_id, $new_topic_id, 0, $row['poster_id']);
 
@@ -1374,7 +1399,11 @@ function mcp_fork_topic($topic_ids)
 		// Sync new topics, parent forums and board stats
 		$sql = 'UPDATE ' . FORUMS_TABLE . '
 			SET forum_posts_approved = forum_posts_approved + ' . $total_posts . ',
-				forum_topics_approved = forum_topics_approved + ' . sizeof($new_topic_id_list) . '
+				forum_posts_unapproved = forum_posts_unapproved + ' . $total_posts_unapproved . ',
+				forum_posts_softdeleted = forum_posts_softdeleted + ' . $total_posts_softdeleted . ',
+				forum_topics_approved = forum_topics_approved + ' . $total_topics . ',
+				forum_topics_unapproved = forum_topics_unapproved + ' . $total_topics_unapproved . ',
+				forum_topics_softdeleted = forum_topics_softdeleted + ' . $total_topics_softdeleted . '
 			WHERE forum_id = ' . $to_forum_id;
 		$db->sql_query($sql);
 
-- 
cgit v1.2.1


From 06caac044479c3ff41f48157f40e8cb00e3d5e84 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 10 Jun 2013 13:48:21 +0200
Subject: [ticket/11574] Try to load updated service.yml before the default one

PHPBB3-11574
---
 phpBB/includes/di/extension/core.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/di/extension/core.php b/phpBB/includes/di/extension/core.php
index 9c36ba2fc4..d0a3ebdf99 100644
--- a/phpBB/includes/di/extension/core.php
+++ b/phpBB/includes/di/extension/core.php
@@ -51,8 +51,16 @@ class phpbb_di_extension_core extends Extension
 	*/
 	public function load(array $config, ContainerBuilder $container)
 	{
-		$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'config')));
-		$loader->load('services.yml');
+		if (file_exists($this->root_path . 'install/update/new/config/services.yml'))
+		{
+			$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'install/update/new/config')));
+			$loader->load('services.yml');
+		}
+		else if (file_exists($this->root_path . 'config/services.yml'))
+		{
+			$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'config')));
+			$loader->load('services.yml');
+		}
 	}
 
 	/**
-- 
cgit v1.2.1


From 8aca9635f57630b89615d888cc8b92f5ac9b327c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 10 Jun 2013 13:50:15 +0200
Subject: [ticket/11574] Find language files in update/new before throwing an
 error

PHPBB3-11574
---
 phpBB/includes/user.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php
index 5530fe3f03..f823e85148 100644
--- a/phpBB/includes/user.php
+++ b/phpBB/includes/user.php
@@ -590,6 +590,18 @@ class phpbb_user extends phpbb_session
 				$language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx;
 			}
 
+			if (!file_exists($language_filename))
+			{
+				// File was not found, try to find it in update directory
+				$orig_language_filename = $language_filename;
+				$language_filename = str_replace('language/', 'install/update/new/language/', $language_filename);
+				if (!file_exists($language_filename))
+				{
+					// Not found either, go back to the original file name
+					$language_filename = $orig_language_filename;
+				}
+			}
+
 			if (!file_exists($language_filename))
 			{
 				global $config;
-- 
cgit v1.2.1


From 3bccd10ccd509ae622cfd23f075fce1d1289888a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Jul 2013 19:35:42 +0200
Subject: [ticket/11574] Only fall back to install/update versions, when
 IN_INSTALL ;)

PHPBB3-11574
---
 phpBB/includes/di/extension/core.php | 3 ++-
 phpBB/includes/user.php              | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/di/extension/core.php b/phpBB/includes/di/extension/core.php
index d0a3ebdf99..4e1159e6fd 100644
--- a/phpBB/includes/di/extension/core.php
+++ b/phpBB/includes/di/extension/core.php
@@ -51,7 +51,8 @@ class phpbb_di_extension_core extends Extension
 	*/
 	public function load(array $config, ContainerBuilder $container)
 	{
-		if (file_exists($this->root_path . 'install/update/new/config/services.yml'))
+		// If we are in install, try to use the updated version, when available
+		if (defined('IN_INSTALL') && file_exists($this->root_path . 'install/update/new/config/services.yml'))
 		{
 			$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'install/update/new/config')));
 			$loader->load('services.yml');
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php
index f823e85148..f8ff3b8b13 100644
--- a/phpBB/includes/user.php
+++ b/phpBB/includes/user.php
@@ -590,14 +590,15 @@ class phpbb_user extends phpbb_session
 				$language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx;
 			}
 
-			if (!file_exists($language_filename))
+			if (defined('IN_INSTALL'))
 			{
-				// File was not found, try to find it in update directory
+				// If we are in install, try to use the updated version, when available
 				$orig_language_filename = $language_filename;
 				$language_filename = str_replace('language/', 'install/update/new/language/', $language_filename);
+
 				if (!file_exists($language_filename))
 				{
-					// Not found either, go back to the original file name
+					// Not found, go back to the original file name
 					$language_filename = $orig_language_filename;
 				}
 			}
-- 
cgit v1.2.1


From 1dea0286a48b4bac6702aad673e13e281690adfb Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 12 Jul 2013 15:40:49 -0400
Subject: [ticket/11574] Use alternate DI config file for updater

PHPBB3-11574
---
 phpBB/includes/di/extension/core.php   | 23 +++++++----------------
 phpBB/includes/functions_container.php |  7 +++++--
 2 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/di/extension/core.php b/phpBB/includes/di/extension/core.php
index 4e1159e6fd..9d59a24b7e 100644
--- a/phpBB/includes/di/extension/core.php
+++ b/phpBB/includes/di/extension/core.php
@@ -26,19 +26,19 @@ use Symfony\Component\Config\FileLocator;
 class phpbb_di_extension_core extends Extension
 {
 	/**
-	* phpBB Root path
+	* Config path
 	* @var string
 	*/
-	protected $root_path;
+	protected $config_path;
 
 	/**
 	* Constructor
 	*
-	* @param string $root_path Root path
+	* @param string $config_path Config path
 	*/
-	public function __construct($root_path)
+	public function __construct($config_path)
 	{
-		$this->root_path = $root_path;
+		$this->config_path = $config_path;
 	}
 
 	/**
@@ -51,17 +51,8 @@ class phpbb_di_extension_core extends Extension
 	*/
 	public function load(array $config, ContainerBuilder $container)
 	{
-		// If we are in install, try to use the updated version, when available
-		if (defined('IN_INSTALL') && file_exists($this->root_path . 'install/update/new/config/services.yml'))
-		{
-			$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'install/update/new/config')));
-			$loader->load('services.yml');
-		}
-		else if (file_exists($this->root_path . 'config/services.yml'))
-		{
-			$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'config')));
-			$loader->load('services.yml');
-		}
+		$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->config_path)));
+		$loader->load('services.yml');
 	}
 
 	/**
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 106b7d75cc..d302b75350 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -53,7 +53,10 @@ function phpbb_create_container(array $extensions, $phpbb_root_path, $php_ext)
 */
 function phpbb_create_install_container($phpbb_root_path, $php_ext)
 {
-	$core = new phpbb_di_extension_core($phpbb_root_path);
+	$other_config_path = $phpbb_root_path . 'install/update/new/config';
+	$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config';
+
+	$core = new phpbb_di_extension_core($config_path);
 	$container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext);
 
 	$container->setParameter('core.root_path', $phpbb_root_path);
@@ -175,7 +178,7 @@ function phpbb_create_default_container($phpbb_root_path, $php_ext)
 	return phpbb_create_dumped_container_unless_debug(
 		array(
 			new phpbb_di_extension_config($phpbb_root_path . 'config.' . $php_ext),
-			new phpbb_di_extension_core($phpbb_root_path),
+			new phpbb_di_extension_core($phpbb_root_path . 'config'),
 		),
 		array(
 			new phpbb_di_pass_collection_pass(),
-- 
cgit v1.2.1


From 51ab2c710e91d98bb182dded1e9d5462451151e8 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 12 Jul 2013 16:40:20 -0400
Subject: [ticket/11574] Make install language filename less crazy

PHPBB3-11574
---
 phpBB/includes/user.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php
index f8ff3b8b13..b39438e315 100644
--- a/phpBB/includes/user.php
+++ b/phpBB/includes/user.php
@@ -590,17 +590,11 @@ class phpbb_user extends phpbb_session
 				$language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx;
 			}
 
-			if (defined('IN_INSTALL'))
+			// If we are in install, try to use the updated version, when available
+			$install_language_filename = str_replace('language/', 'install/update/new/language/', $language_filename);
+			if (defined('IN_INSTALL') && file_exists($install_language_filename))
 			{
-				// If we are in install, try to use the updated version, when available
-				$orig_language_filename = $language_filename;
-				$language_filename = str_replace('language/', 'install/update/new/language/', $language_filename);
-
-				if (!file_exists($language_filename))
-				{
-					// Not found, go back to the original file name
-					$language_filename = $orig_language_filename;
-				}
+				$language_filename = $install_language_filename;
 			}
 
 			if (!file_exists($language_filename))
-- 
cgit v1.2.1


From 6cde302ffaf9d238e279704955a5c00ee0bdfd36 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 13 Jul 2013 10:47:42 -0400
Subject: [ticket/9657] Remove old code

PHPBB3-9657
---
 phpBB/includes/feed/forum.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/feed/forum.php b/phpBB/includes/feed/forum.php
index 4a159ff3d4..b5f0dd0f8f 100644
--- a/phpBB/includes/feed/forum.php
+++ b/phpBB/includes/feed/forum.php
@@ -122,7 +122,6 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 				USERS_TABLE		=> 'u',
 			),
 			'WHERE'		=> $this->db->sql_in_set('p.topic_id', $topic_ids) . '
-							' . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . '
 							AND ' . $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.') . '
 							AND p.post_time >= ' . $min_post_time . '
 							AND p.poster_id = u.user_id',
-- 
cgit v1.2.1


From fab7f5fdfd2fd8ec50dae52dfde80a706015dd74 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 13 Jul 2013 11:43:38 -0400
Subject: [ticket/11215] Don't try to use  when it isn't there PHPBB3-112515

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 40583dee54..f637ab2232 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5059,7 +5059,7 @@ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null)
 function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum')
 {
 	global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path;
-	global $phpbb_dispatcher, $request, $phpbb_container;
+	global $phpbb_dispatcher, $request, $phpbb_container, $symfony_request;
 
 	if (defined('HEADER_INC'))
 	{
@@ -5219,7 +5219,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 	// This path is sent with the base template paths in the assign_vars()
 	// call below. We need to correct it in case we are accessing from a
 	// controller because the web paths will be incorrect otherwise.
-	$corrected_path = phpbb_get_web_root_path(phpbb_create_symfony_request($request));
+	$corrected_path = $symfony_request !== null ? phpbb_get_web_root_path($symfony_request) : '';
 	$web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;
 
 	// Send a proper content-language to the output
-- 
cgit v1.2.1


From 7d0c1d02ca428305f3cd4b57249c90d0d86bc3ae Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 13 Jul 2013 12:02:49 -0400
Subject: [ticket/11684] Remove useless confirmation page after login and admin
 login

PHPBB3-11684
---
 phpBB/includes/functions.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 6a1b3fd4f8..200614252a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3301,8 +3301,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
 				return;
 			}
 
-			$redirect = meta_refresh(3, $redirect);
-			trigger_error($message . '<br /><br />' . sprintf($l_redirect, '<a href="' . $redirect . '">', '</a>'));
+			redirect($redirect);
 		}
 
 		// Something failed, determine what...
-- 
cgit v1.2.1


From 8f95ef55a65cbf58e74840957cf9acfaf9e16d31 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 13 Jul 2013 12:27:00 -0400
Subject: [ticket/11685] Remove logout confirmation page

PHPBB3-11685
---
 phpBB/includes/acp/acp_main.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index c44bc1b8a6..2eaea392bf 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -63,9 +63,7 @@ class acp_main
 			if ($action === 'admlogout')
 			{
 				$user->unset_admin();
-				$redirect_url = append_sid("{$phpbb_root_path}index.$phpEx");
-				meta_refresh(3, $redirect_url);
-				trigger_error($user->lang['ADM_LOGGED_OUT'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect_url . '">', '</a>'));
+				redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
 			}
 
 			if (!confirm_box(true))
-- 
cgit v1.2.1


From c1bb179914e4f47876d87aba21ab65e01f79d69c Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 13 Jul 2013 13:30:33 -0400
Subject: [ticket/10999] Fix assets_version in ACP

PHPBB3-10999
---
 phpBB/includes/functions_acp.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index ff0e2a1ac1..60c44e90e1 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -82,6 +82,8 @@ function adm_page_header($page_title)
 		'T_RANKS_PATH'			=> "{$phpbb_root_path}{$config['ranks_path']}/",
 		'T_UPLOAD_PATH'			=> "{$phpbb_root_path}{$config['upload_path']}/",
 
+		'T_ASSETS_VERSION'		=> $config['assets_version'],
+
 		'ICON_MOVE_UP'				=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
 		'ICON_MOVE_UP_DISABLED'		=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
 		'ICON_MOVE_DOWN'			=> '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
-- 
cgit v1.2.1


From 081350678dcfd88104d885385674b8f4a382aa91 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 13 Jul 2013 14:57:31 -0400
Subject: [ticket/9649] Display information on index for moderators on
 unapproved posts

PHPBB3-9649
---
 phpBB/includes/functions_display.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 143813e4ed..b1dac64bec 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -215,8 +215,9 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			$forum_tracking_info[$forum_id] = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate']) : $user->data['user_lastmark'];
 		}
 
-		// Count the difference of real to public topics, so we can display an information to moderators
+		// Lets check whether there are unapproved topics/posts, so we can display an information to moderators
 		$row['forum_id_unapproved_topics'] = ($auth->acl_get('m_approve', $forum_id) && $row['forum_topics_unapproved']) ? $forum_id : 0;
+		$row['forum_id_unapproved_posts'] = ($auth->acl_get('m_approve', $forum_id) && $row['forum_posts_unapproved']) ? $forum_id : 0;
 		$row['forum_posts'] = $phpbb_content_visibility->get_count('forum_posts', $row, $forum_id);
 		$row['forum_topics'] = $phpbb_content_visibility->get_count('forum_topics', $row, $forum_id);
 
@@ -281,6 +282,11 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 				$forum_rows[$parent_id]['forum_id_unapproved_topics'] = $forum_id;
 			}
 
+			if (!$forum_rows[$parent_id]['forum_id_unapproved_posts'] && $row['forum_id_unapproved_posts'])
+			{
+				$forum_rows[$parent_id]['forum_id_unapproved_posts'] = $forum_id;
+			}
+
 			$forum_rows[$parent_id]['forum_topics'] += $row['forum_topics'];
 
 			// Do not list redirects in LINK Forums as Posts.
@@ -548,6 +554,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			'L_MODERATOR_STR'		=> $l_moderator,
 
 			'U_UNAPPROVED_TOPICS'	=> ($row['forum_id_unapproved_topics']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=unapproved_topics&amp;f=' . $row['forum_id_unapproved_topics']) : '',
+			'U_UNAPPROVED_POSTS'	=> ($row['forum_id_unapproved_posts']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=unapproved_posts&amp;f=' . $row['forum_id_unapproved_posts']) : '',
 			'U_VIEWFORUM'		=> $u_viewforum,
 			'U_LAST_POSTER'		=> get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
 			'U_LAST_POST'		=> $last_post_url,
@@ -587,6 +594,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		'L_SUBFORUM'		=> ($visible_forums == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS'],
 		'LAST_POST_IMG'		=> $user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
 		'UNAPPROVED_IMG'	=> $user->img('icon_topic_unapproved', 'TOPICS_UNAPPROVED'),
+		'UNAPPROVED_POST_IMG'	=> $user->img('icon_topic_unapproved', 'POSTS_UNAPPROVED'),
 	));
 
 	if ($return_moderators)
-- 
cgit v1.2.1


From 9f5ee08bae0bd13352dd7a5e59ec959bc17702d4 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 13 Jul 2013 16:44:38 -0400
Subject: [ticket/11690] Old module class names may get autoloaded by
 class_exists

PHPBB3-11690
---
 phpBB/includes/acp/acp_modules.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index ab416fb406..a1e681b29c 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -575,13 +575,20 @@ class acp_modules
 			// format. phpbb_acp_info_acp_foo needs to be turned into
 			// acp_foo_info and the respective file has to be included
 			// manually because it does not support auto loading
-			if (!class_exists($info_class))
+			$old_info_class_file = str_replace("phpbb_{$module_class}_info_", '', $cur_module);
+			$old_info_class = $old_info_class_file . '_info';
+
+			if (class_exists($old_info_class))
+			{
+				$info_class = $old_info_class;
+			}
+			else if (!class_exists($info_class))
 			{
-				$info_class_file = str_replace("phpbb_{$module_class}_info_", '', $cur_module);
-				$info_class = $info_class_file . '_info';
-				if (!class_exists($info_class) && file_exists($directory . $info_class_file . '.' . $phpEx))
+				$info_class = $old_info_class;
+				// need to check class exists again because previous checks triggered autoloading
+				if (!class_exists($info_class) && file_exists($directory . $old_info_class_file . '.' . $phpEx))
 				{
-					include($directory . $info_class_file . '.' . $phpEx);
+					include($directory . $old_info_class_file . '.' . $phpEx);
 				}
 			}
 
-- 
cgit v1.2.1


From 176729ab001300c295695537803f389e175049cf Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Jul 2013 17:50:35 -0500
Subject: [ticket/11692] Don't update search_type in dev migration if already
 appended

PHPBB3-11692
---
 phpBB/includes/db/migration/data/310/dev.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 13b36bbf30..0fc2950987 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -82,7 +82,10 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 	public function update_data()
 	{
 		return array(
-			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
+			array('if', array(
+				(strpos('phpbb_search_', $this->config['search_type']) !== 0),
+				array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
+			)),
 
 			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
 			array('config.add', array('fulltext_postgres_min_word_len', 4)),
-- 
cgit v1.2.1


From 8d303226351f358b24389fb2fd2d9b6bab7aa565 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 13 Jul 2013 23:15:26 -0400
Subject: [ticket/11694] Do not locate assets with root path

Do not locate assets that start with ./

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php
index ae113cadc8..990b1c984f 100644
--- a/phpBB/includes/template/twig/node/includeasset.php
+++ b/phpBB/includes/template/twig/node/includeasset.php
@@ -34,7 +34,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
 			->subcompile($this->getNode('expr'))
 			->raw(";\n")
 			->write("\$asset = new phpbb_template_asset(\$asset_file);\n")
-			->write("if (\$asset->is_relative()) {\n")
+			->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
 			->indent()
 				->write("\$asset_path = \$asset->get_path();")
 				->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n")
-- 
cgit v1.2.1


From d6de892ee40579c45259f8c68ba7eef26accc08b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 13 Jul 2013 16:47:15 -0400
Subject: [ticket/11574] Fix various path issues in the updater

PHPBB3-11574
---
 phpBB/includes/functions_container.php | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index d302b75350..923a8f370b 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -53,7 +53,7 @@ function phpbb_create_container(array $extensions, $phpbb_root_path, $php_ext)
 */
 function phpbb_create_install_container($phpbb_root_path, $php_ext)
 {
-	$other_config_path = $phpbb_root_path . 'install/update/new/config';
+	$other_config_path = $phpbb_root_path . 'install/update/new/config/';
 	$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config';
 
 	$core = new phpbb_di_extension_core($config_path);
@@ -73,6 +73,30 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext)
 	return $container;
 }
 
+/**
+* Create updater container
+*
+* @param string $phpbb_root_path Root path
+* @param string $php_ext PHP Extension
+* @param array $config_path Path to config directory
+* @return ContainerBuilder object (compiled)
+*/
+function phpbb_create_update_container($phpbb_root_path, $php_ext, $config_path)
+{
+	return phpbb_create_compiled_container(
+		array(
+			new phpbb_di_extension_config($phpbb_root_path . 'config.' . $php_ext),
+			new phpbb_di_extension_core($config_path),
+		),
+		array(
+			new phpbb_di_pass_collection_pass(),
+			new phpbb_di_pass_kernel_pass(),
+		),
+		$phpbb_root_path,
+		$php_ext
+	);
+}
+
 /**
 * Create a compiled ContainerBuilder object
 *
-- 
cgit v1.2.1


From e6e2a50062eca8b640822b8f616ea4bb23b23566 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 14 Jul 2013 01:28:49 -0400
Subject: [ticket/11574] Add trailing slash for consistency

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 923a8f370b..e22fa9919a 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -54,7 +54,7 @@ function phpbb_create_container(array $extensions, $phpbb_root_path, $php_ext)
 function phpbb_create_install_container($phpbb_root_path, $php_ext)
 {
 	$other_config_path = $phpbb_root_path . 'install/update/new/config/';
-	$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config';
+	$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config/';
 
 	$core = new phpbb_di_extension_core($config_path);
 	$container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext);
-- 
cgit v1.2.1


From 7030578bbe9e11c18b5becaf8b06e670e3c2e3cd Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 14 Jul 2013 01:32:34 -0400
Subject: [ticket/11698] Moving all autoloadable files to phpbb/

PHPBB3-11698
---
 phpBB/includes/acp/acp_search.php                  |    2 +-
 phpBB/includes/auth/auth.php                       | 1080 ------------
 phpBB/includes/auth/index.htm                      |   10 -
 phpBB/includes/auth/provider/apache.php            |  259 ---
 phpBB/includes/auth/provider/base.php              |   72 -
 phpBB/includes/auth/provider/db.php                |  297 ----
 phpBB/includes/auth/provider/index.htm             |   10 -
 phpBB/includes/auth/provider/interface.php         |  105 --
 phpBB/includes/auth/provider/ldap.php              |  346 ----
 phpBB/includes/avatar/driver/driver.php            |  138 --
 phpBB/includes/avatar/driver/gravatar.php          |  172 --
 phpBB/includes/avatar/driver/interface.php         |  116 --
 phpBB/includes/avatar/driver/local.php             |  197 ---
 phpBB/includes/avatar/driver/remote.php            |  164 --
 phpBB/includes/avatar/driver/upload.php            |  185 --
 phpBB/includes/avatar/manager.php                  |  309 ----
 phpBB/includes/cache/driver/apc.php                |   75 -
 phpBB/includes/cache/driver/base.php               |   23 -
 phpBB/includes/cache/driver/eaccelerator.php       |  112 --
 phpBB/includes/cache/driver/file.php               |  740 --------
 phpBB/includes/cache/driver/interface.php          |  144 --
 phpBB/includes/cache/driver/memcache.php           |  129 --
 phpBB/includes/cache/driver/memory.php             |  439 -----
 phpBB/includes/cache/driver/null.php               |  154 --
 phpBB/includes/cache/driver/redis.php              |  166 --
 phpBB/includes/cache/driver/wincache.php           |   78 -
 phpBB/includes/cache/driver/xcache.php             |  112 --
 phpBB/includes/cache/service.php                   |  406 -----
 phpBB/includes/class_loader.php                    |  170 --
 phpBB/includes/config/config.php                   |  170 --
 phpBB/includes/config/db.php                       |  207 ---
 phpBB/includes/config/db_text.php                  |  163 --
 phpBB/includes/content_visibility.php              |  651 -------
 phpBB/includes/controller/exception.php            |   24 -
 phpBB/includes/controller/helper.php               |  139 --
 phpBB/includes/controller/provider.php             |   82 -
 phpBB/includes/controller/resolver.php             |  154 --
 phpBB/includes/cron/manager.php                    |  138 --
 phpBB/includes/cron/task/base.php                  |   76 -
 phpBB/includes/cron/task/core/prune_all_forums.php |   93 -
 phpBB/includes/cron/task/core/prune_forum.php      |  163 --
 phpBB/includes/cron/task/core/queue.php            |   82 -
 phpBB/includes/cron/task/core/tidy_cache.php       |   76 -
 phpBB/includes/cron/task/core/tidy_database.php    |   70 -
 phpBB/includes/cron/task/core/tidy_search.php      |  109 --
 phpBB/includes/cron/task/core/tidy_sessions.php    |   63 -
 phpBB/includes/cron/task/core/tidy_warnings.php    |   84 -
 phpBB/includes/cron/task/parametrized.php          |   52 -
 phpBB/includes/cron/task/task.php                  |   55 -
 phpBB/includes/cron/task/wrapper.php               |  108 --
 phpBB/includes/datetime.php                        |  158 --
 phpBB/includes/db/driver/driver.php                | 1044 -----------
 phpBB/includes/db/driver/firebird.php              |  538 ------
 phpBB/includes/db/driver/mssql.php                 |  472 -----
 phpBB/includes/db/driver/mssql_base.php            |   65 -
 phpBB/includes/db/driver/mssql_odbc.php            |  383 ----
 phpBB/includes/db/driver/mssqlnative.php           |  613 -------
 phpBB/includes/db/driver/mysql.php                 |  472 -----
 phpBB/includes/db/driver/mysql_base.php            |  145 --
 phpBB/includes/db/driver/mysqli.php                |  463 -----
 phpBB/includes/db/driver/oracle.php                |  803 ---------
 phpBB/includes/db/driver/postgres.php              |  491 ------
 phpBB/includes/db/driver/sqlite.php                |  365 ----
 phpBB/includes/db/migration/data/30x/3_0_1.php     |   28 -
 phpBB/includes/db/migration/data/30x/3_0_10.php    |   28 -
 .../includes/db/migration/data/30x/3_0_10_rc1.php  |   30 -
 .../includes/db/migration/data/30x/3_0_10_rc2.php  |   28 -
 .../includes/db/migration/data/30x/3_0_10_rc3.php  |   28 -
 phpBB/includes/db/migration/data/30x/3_0_11.php    |   28 -
 .../includes/db/migration/data/30x/3_0_11_rc1.php  |   95 -
 .../includes/db/migration/data/30x/3_0_11_rc2.php  |   50 -
 .../includes/db/migration/data/30x/3_0_12_rc1.php  |  123 --
 phpBB/includes/db/migration/data/30x/3_0_1_rc1.php |  108 --
 phpBB/includes/db/migration/data/30x/3_0_2.php     |   28 -
 phpBB/includes/db/migration/data/30x/3_0_2_rc1.php |   32 -
 phpBB/includes/db/migration/data/30x/3_0_2_rc2.php |   80 -
 phpBB/includes/db/migration/data/30x/3_0_3.php     |   28 -
 phpBB/includes/db/migration/data/30x/3_0_3_rc1.php |   83 -
 phpBB/includes/db/migration/data/30x/3_0_4.php     |   49 -
 phpBB/includes/db/migration/data/30x/3_0_4_rc1.php |  123 --
 phpBB/includes/db/migration/data/30x/3_0_5.php     |   28 -
 phpBB/includes/db/migration/data/30x/3_0_5_rc1.php |  124 --
 .../db/migration/data/30x/3_0_5_rc1part2.php       |   42 -
 phpBB/includes/db/migration/data/30x/3_0_6.php     |   28 -
 phpBB/includes/db/migration/data/30x/3_0_6_rc1.php |  324 ----
 phpBB/includes/db/migration/data/30x/3_0_6_rc2.php |   28 -
 phpBB/includes/db/migration/data/30x/3_0_6_rc3.php |   40 -
 phpBB/includes/db/migration/data/30x/3_0_6_rc4.php |   28 -
 phpBB/includes/db/migration/data/30x/3_0_7.php     |   28 -
 phpBB/includes/db/migration/data/30x/3_0_7_pl1.php |   28 -
 phpBB/includes/db/migration/data/30x/3_0_7_rc1.php |   76 -
 phpBB/includes/db/migration/data/30x/3_0_7_rc2.php |   73 -
 phpBB/includes/db/migration/data/30x/3_0_8.php     |   28 -
 phpBB/includes/db/migration/data/30x/3_0_8_rc1.php |  221 ---
 phpBB/includes/db/migration/data/30x/3_0_9.php     |   28 -
 phpBB/includes/db/migration/data/30x/3_0_9_rc1.php |  124 --
 phpBB/includes/db/migration/data/30x/3_0_9_rc2.php |   28 -
 phpBB/includes/db/migration/data/30x/3_0_9_rc3.php |   28 -
 phpBB/includes/db/migration/data/30x/3_0_9_rc4.php |   28 -
 .../db/migration/data/30x/local_url_bbcode.php     |   57 -
 phpBB/includes/db/migration/data/310/avatars.php   |   67 -
 .../includes/db/migration/data/310/boardindex.php  |   23 -
 .../db/migration/data/310/config_db_text.php       |   45 -
 phpBB/includes/db/migration/data/310/dev.php       |  408 -----
 .../includes/db/migration/data/310/extensions.php  |   69 -
 .../db/migration/data/310/forgot_password.php      |   28 -
 .../db/migration/data/310/jquery_update.php        |   31 -
 .../data/310/notification_options_reconvert.php    |  118 --
 .../db/migration/data/310/notifications.php        |   96 --
 .../data/310/notifications_schema_fix.php          |   92 -
 .../migration/data/310/reported_posts_display.php  |   47 -
 .../migration/data/310/signature_module_auth.php   |   51 -
 .../db/migration/data/310/softdelete_p1.php        |  171 --
 .../db/migration/data/310/softdelete_p2.php        |   68 -
 .../db/migration/data/310/style_update_p1.php      |  185 --
 .../db/migration/data/310/style_update_p2.php      |  129 --
 phpBB/includes/db/migration/data/310/teampage.php  |  104 --
 phpBB/includes/db/migration/data/310/timezone.php  |  163 --
 .../includes/db/migration/data/310/timezone_p2.php |   43 -
 phpBB/includes/db/migration/exception.php          |   79 -
 phpBB/includes/db/migration/migration.php          |  190 --
 phpBB/includes/db/migration/tool/config.php        |  150 --
 phpBB/includes/db/migration/tool/interface.php     |   33 -
 phpBB/includes/db/migration/tool/module.php        |  501 ------
 phpBB/includes/db/migration/tool/permission.php    |  622 -------
 phpBB/includes/db/migrator.php                     |  746 --------
 phpBB/includes/db/sql_insert_buffer.php            |  150 --
 phpBB/includes/di/extension/config.php             |   84 -
 phpBB/includes/di/extension/core.php               |   69 -
 phpBB/includes/di/extension/ext.php                |   69 -
 phpBB/includes/di/pass/collection_pass.php         |   46 -
 phpBB/includes/di/pass/kernel_pass.php             |   68 -
 phpBB/includes/di/service_collection.php           |   49 -
 phpBB/includes/error_collector.php                 |   62 -
 phpBB/includes/event/data.php                      |   68 -
 phpBB/includes/event/dispatcher.php                |   42 -
 .../includes/event/extension_subscriber_loader.php |   46 -
 .../includes/event/kernel_exception_subscriber.php |   85 -
 phpBB/includes/event/kernel_request_subscriber.php |   83 -
 .../includes/event/kernel_terminate_subscriber.php |   43 -
 phpBB/includes/extension/base.php                  |  135 --
 phpBB/includes/extension/exception.php             |   27 -
 phpBB/includes/extension/finder.php                |  523 ------
 phpBB/includes/extension/interface.php             |   67 -
 phpBB/includes/extension/manager.php               |  513 ------
 phpBB/includes/extension/metadata_manager.php      |  371 ----
 phpBB/includes/extension/provider.php              |   76 -
 phpBB/includes/feed/base.php                       |  261 ---
 phpBB/includes/feed/factory.php                    |  129 --
 phpBB/includes/feed/forum.php                      |  145 --
 phpBB/includes/feed/forums.php                     |   72 -
 phpBB/includes/feed/helper.php                     |  159 --
 phpBB/includes/feed/news.php                       |  112 --
 phpBB/includes/feed/overall.php                    |   90 -
 phpBB/includes/feed/post_base.php                  |   57 -
 phpBB/includes/feed/topic.php                      |  116 --
 phpBB/includes/feed/topic_base.php                 |   59 -
 phpBB/includes/feed/topics.php                     |   91 -
 phpBB/includes/feed/topics_active.php              |  136 --
 phpBB/includes/filesystem.php                      |   52 -
 phpBB/includes/groupposition/exception.php         |   23 -
 phpBB/includes/groupposition/interface.php         |   84 -
 phpBB/includes/groupposition/legend.php            |  251 ---
 phpBB/includes/groupposition/teampage.php          |  604 -------
 phpBB/includes/hook/finder.php                     |   84 -
 phpBB/includes/json_response.php                   |   41 -
 phpBB/includes/lock/db.php                         |  149 --
 phpBB/includes/lock/flock.php                      |  144 --
 phpBB/includes/log/interface.php                   |  106 --
 phpBB/includes/log/log.php                         |  739 --------
 phpBB/includes/notification/exception.php          |   29 -
 phpBB/includes/notification/manager.php            |  910 ----------
 phpBB/includes/notification/method/base.php        |  116 --
 phpBB/includes/notification/method/email.php       |   52 -
 phpBB/includes/notification/method/interface.php   |   48 -
 phpBB/includes/notification/method/jabber.php      |   69 -
 .../notification/method/messenger_base.php         |  100 --
 phpBB/includes/notification/type/approve_post.php  |  140 --
 phpBB/includes/notification/type/approve_topic.php |  138 --
 phpBB/includes/notification/type/base.php          |  489 ------
 phpBB/includes/notification/type/bookmark.php      |  138 --
 .../includes/notification/type/disapprove_post.php |  120 --
 .../notification/type/disapprove_topic.php         |  120 --
 phpBB/includes/notification/type/interface.php     |  189 --
 phpBB/includes/notification/type/pm.php            |  184 --
 phpBB/includes/notification/type/post.php          |  385 -----
 phpBB/includes/notification/type/post_in_queue.php |  154 --
 phpBB/includes/notification/type/quote.php         |  222 ---
 phpBB/includes/notification/type/report_pm.php     |  229 ---
 .../notification/type/report_pm_closed.php         |  155 --
 phpBB/includes/notification/type/report_post.php   |  196 ---
 .../notification/type/report_post_closed.php       |  155 --
 phpBB/includes/notification/type/topic.php         |  277 ---
 .../includes/notification/type/topic_in_queue.php  |  154 --
 phpBB/includes/php/ini.php                         |  175 --
 .../includes/request/deactivated_super_global.php  |  121 --
 phpBB/includes/request/interface.php               |  139 --
 phpBB/includes/request/request.php                 |  415 -----
 phpBB/includes/request/type_cast_helper.php        |  194 ---
 .../request/type_cast_helper_interface.php         |   63 -
 phpBB/includes/search/base.php                     |  330 ----
 phpBB/includes/search/fulltext_mysql.php           |  948 ----------
 phpBB/includes/search/fulltext_native.php          | 1821 --------------------
 phpBB/includes/search/fulltext_postgres.php        |  963 -----------
 phpBB/includes/search/fulltext_sphinx.php          |  917 ----------
 phpBB/includes/search/index.htm                    |   10 -
 phpBB/includes/search/sphinx/config.php            |  288 ----
 phpBB/includes/search/sphinx/config_comment.php    |   49 -
 phpBB/includes/search/sphinx/config_section.php    |  162 --
 phpBB/includes/search/sphinx/config_variable.php   |   80 -
 phpBB/includes/session.php                         | 1516 ----------------
 phpBB/includes/style/extension_path_provider.php   |  137 --
 phpBB/includes/style/path_provider.php             |   62 -
 phpBB/includes/style/path_provider_interface.php   |   42 -
 phpBB/includes/style/resource_locator.php          |  348 ----
 phpBB/includes/style/style.php                     |  241 ---
 phpBB/includes/template/asset.php                  |  182 --
 phpBB/includes/template/context.php                |  389 -----
 phpBB/includes/template/locator.php                |  163 --
 phpBB/includes/template/template.php               |  157 --
 phpBB/includes/template/twig/definition.php        |   69 -
 phpBB/includes/template/twig/environment.php       |  140 --
 phpBB/includes/template/twig/extension.php         |  188 --
 phpBB/includes/template/twig/lexer.php             |  300 ----
 phpBB/includes/template/twig/node/define.php       |   58 -
 phpBB/includes/template/twig/node/event.php        |   79 -
 .../twig/node/expression/binary/equalequal.php     |   25 -
 .../twig/node/expression/binary/notequalequal.php  |   25 -
 phpBB/includes/template/twig/node/include.php      |   56 -
 phpBB/includes/template/twig/node/includeasset.php |   60 -
 phpBB/includes/template/twig/node/includecss.php   |   30 -
 phpBB/includes/template/twig/node/includejs.php    |   32 -
 phpBB/includes/template/twig/node/includephp.php   |   91 -
 phpBB/includes/template/twig/node/php.php          |   55 -
 .../includes/template/twig/tokenparser/define.php  |   66 -
 phpBB/includes/template/twig/tokenparser/event.php |   47 -
 .../includes/template/twig/tokenparser/include.php |   46 -
 .../template/twig/tokenparser/includecss.php       |   38 -
 .../template/twig/tokenparser/includejs.php        |   47 -
 .../template/twig/tokenparser/includephp.php       |   56 -
 phpBB/includes/template/twig/tokenparser/php.php   |   55 -
 phpBB/includes/template/twig/twig.php              |  465 -----
 phpBB/includes/tree/interface.php                  |  122 --
 phpBB/includes/tree/nestedset.php                  |  850 ---------
 phpBB/includes/tree/nestedset_forum.php            |   46 -
 phpBB/includes/user.php                            |  857 ---------
 phpBB/includes/user_loader.php                     |  231 ---
 247 files changed, 1 insertion(+), 46792 deletions(-)
 delete mode 100644 phpBB/includes/auth/auth.php
 delete mode 100644 phpBB/includes/auth/index.htm
 delete mode 100644 phpBB/includes/auth/provider/apache.php
 delete mode 100644 phpBB/includes/auth/provider/base.php
 delete mode 100644 phpBB/includes/auth/provider/db.php
 delete mode 100644 phpBB/includes/auth/provider/index.htm
 delete mode 100644 phpBB/includes/auth/provider/interface.php
 delete mode 100644 phpBB/includes/auth/provider/ldap.php
 delete mode 100644 phpBB/includes/avatar/driver/driver.php
 delete mode 100644 phpBB/includes/avatar/driver/gravatar.php
 delete mode 100644 phpBB/includes/avatar/driver/interface.php
 delete mode 100644 phpBB/includes/avatar/driver/local.php
 delete mode 100644 phpBB/includes/avatar/driver/remote.php
 delete mode 100644 phpBB/includes/avatar/driver/upload.php
 delete mode 100644 phpBB/includes/avatar/manager.php
 delete mode 100644 phpBB/includes/cache/driver/apc.php
 delete mode 100644 phpBB/includes/cache/driver/base.php
 delete mode 100644 phpBB/includes/cache/driver/eaccelerator.php
 delete mode 100644 phpBB/includes/cache/driver/file.php
 delete mode 100644 phpBB/includes/cache/driver/interface.php
 delete mode 100644 phpBB/includes/cache/driver/memcache.php
 delete mode 100644 phpBB/includes/cache/driver/memory.php
 delete mode 100644 phpBB/includes/cache/driver/null.php
 delete mode 100644 phpBB/includes/cache/driver/redis.php
 delete mode 100644 phpBB/includes/cache/driver/wincache.php
 delete mode 100644 phpBB/includes/cache/driver/xcache.php
 delete mode 100644 phpBB/includes/cache/service.php
 delete mode 100644 phpBB/includes/class_loader.php
 delete mode 100644 phpBB/includes/config/config.php
 delete mode 100644 phpBB/includes/config/db.php
 delete mode 100644 phpBB/includes/config/db_text.php
 delete mode 100644 phpBB/includes/content_visibility.php
 delete mode 100644 phpBB/includes/controller/exception.php
 delete mode 100644 phpBB/includes/controller/helper.php
 delete mode 100644 phpBB/includes/controller/provider.php
 delete mode 100644 phpBB/includes/controller/resolver.php
 delete mode 100644 phpBB/includes/cron/manager.php
 delete mode 100644 phpBB/includes/cron/task/base.php
 delete mode 100644 phpBB/includes/cron/task/core/prune_all_forums.php
 delete mode 100644 phpBB/includes/cron/task/core/prune_forum.php
 delete mode 100644 phpBB/includes/cron/task/core/queue.php
 delete mode 100644 phpBB/includes/cron/task/core/tidy_cache.php
 delete mode 100644 phpBB/includes/cron/task/core/tidy_database.php
 delete mode 100644 phpBB/includes/cron/task/core/tidy_search.php
 delete mode 100644 phpBB/includes/cron/task/core/tidy_sessions.php
 delete mode 100644 phpBB/includes/cron/task/core/tidy_warnings.php
 delete mode 100644 phpBB/includes/cron/task/parametrized.php
 delete mode 100644 phpBB/includes/cron/task/task.php
 delete mode 100644 phpBB/includes/cron/task/wrapper.php
 delete mode 100644 phpBB/includes/datetime.php
 delete mode 100644 phpBB/includes/db/driver/driver.php
 delete mode 100644 phpBB/includes/db/driver/firebird.php
 delete mode 100644 phpBB/includes/db/driver/mssql.php
 delete mode 100644 phpBB/includes/db/driver/mssql_base.php
 delete mode 100644 phpBB/includes/db/driver/mssql_odbc.php
 delete mode 100644 phpBB/includes/db/driver/mssqlnative.php
 delete mode 100644 phpBB/includes/db/driver/mysql.php
 delete mode 100644 phpBB/includes/db/driver/mysql_base.php
 delete mode 100644 phpBB/includes/db/driver/mysqli.php
 delete mode 100644 phpBB/includes/db/driver/oracle.php
 delete mode 100644 phpBB/includes/db/driver/postgres.php
 delete mode 100644 phpBB/includes/db/driver/sqlite.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_10.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_10_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_10_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_10_rc3.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_11.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_11_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_11_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_12_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_1_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_2.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_2_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_2_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_3.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_3_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_4.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_4_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_5.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_5_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_6.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_6_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_6_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_6_rc3.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_6_rc4.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_7.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_7_pl1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_7_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_7_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_8.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_8_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_9.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_9_rc1.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_9_rc2.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_9_rc3.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/3_0_9_rc4.php
 delete mode 100644 phpBB/includes/db/migration/data/30x/local_url_bbcode.php
 delete mode 100644 phpBB/includes/db/migration/data/310/avatars.php
 delete mode 100644 phpBB/includes/db/migration/data/310/boardindex.php
 delete mode 100644 phpBB/includes/db/migration/data/310/config_db_text.php
 delete mode 100644 phpBB/includes/db/migration/data/310/dev.php
 delete mode 100644 phpBB/includes/db/migration/data/310/extensions.php
 delete mode 100644 phpBB/includes/db/migration/data/310/forgot_password.php
 delete mode 100644 phpBB/includes/db/migration/data/310/jquery_update.php
 delete mode 100644 phpBB/includes/db/migration/data/310/notification_options_reconvert.php
 delete mode 100644 phpBB/includes/db/migration/data/310/notifications.php
 delete mode 100644 phpBB/includes/db/migration/data/310/notifications_schema_fix.php
 delete mode 100644 phpBB/includes/db/migration/data/310/reported_posts_display.php
 delete mode 100644 phpBB/includes/db/migration/data/310/signature_module_auth.php
 delete mode 100644 phpBB/includes/db/migration/data/310/softdelete_p1.php
 delete mode 100644 phpBB/includes/db/migration/data/310/softdelete_p2.php
 delete mode 100644 phpBB/includes/db/migration/data/310/style_update_p1.php
 delete mode 100644 phpBB/includes/db/migration/data/310/style_update_p2.php
 delete mode 100644 phpBB/includes/db/migration/data/310/teampage.php
 delete mode 100644 phpBB/includes/db/migration/data/310/timezone.php
 delete mode 100644 phpBB/includes/db/migration/data/310/timezone_p2.php
 delete mode 100644 phpBB/includes/db/migration/exception.php
 delete mode 100644 phpBB/includes/db/migration/migration.php
 delete mode 100644 phpBB/includes/db/migration/tool/config.php
 delete mode 100644 phpBB/includes/db/migration/tool/interface.php
 delete mode 100644 phpBB/includes/db/migration/tool/module.php
 delete mode 100644 phpBB/includes/db/migration/tool/permission.php
 delete mode 100644 phpBB/includes/db/migrator.php
 delete mode 100644 phpBB/includes/db/sql_insert_buffer.php
 delete mode 100644 phpBB/includes/di/extension/config.php
 delete mode 100644 phpBB/includes/di/extension/core.php
 delete mode 100644 phpBB/includes/di/extension/ext.php
 delete mode 100644 phpBB/includes/di/pass/collection_pass.php
 delete mode 100644 phpBB/includes/di/pass/kernel_pass.php
 delete mode 100644 phpBB/includes/di/service_collection.php
 delete mode 100644 phpBB/includes/error_collector.php
 delete mode 100644 phpBB/includes/event/data.php
 delete mode 100644 phpBB/includes/event/dispatcher.php
 delete mode 100644 phpBB/includes/event/extension_subscriber_loader.php
 delete mode 100644 phpBB/includes/event/kernel_exception_subscriber.php
 delete mode 100644 phpBB/includes/event/kernel_request_subscriber.php
 delete mode 100644 phpBB/includes/event/kernel_terminate_subscriber.php
 delete mode 100644 phpBB/includes/extension/base.php
 delete mode 100644 phpBB/includes/extension/exception.php
 delete mode 100644 phpBB/includes/extension/finder.php
 delete mode 100644 phpBB/includes/extension/interface.php
 delete mode 100644 phpBB/includes/extension/manager.php
 delete mode 100644 phpBB/includes/extension/metadata_manager.php
 delete mode 100644 phpBB/includes/extension/provider.php
 delete mode 100644 phpBB/includes/feed/base.php
 delete mode 100644 phpBB/includes/feed/factory.php
 delete mode 100644 phpBB/includes/feed/forum.php
 delete mode 100644 phpBB/includes/feed/forums.php
 delete mode 100644 phpBB/includes/feed/helper.php
 delete mode 100644 phpBB/includes/feed/news.php
 delete mode 100644 phpBB/includes/feed/overall.php
 delete mode 100644 phpBB/includes/feed/post_base.php
 delete mode 100644 phpBB/includes/feed/topic.php
 delete mode 100644 phpBB/includes/feed/topic_base.php
 delete mode 100644 phpBB/includes/feed/topics.php
 delete mode 100644 phpBB/includes/feed/topics_active.php
 delete mode 100644 phpBB/includes/filesystem.php
 delete mode 100644 phpBB/includes/groupposition/exception.php
 delete mode 100644 phpBB/includes/groupposition/interface.php
 delete mode 100644 phpBB/includes/groupposition/legend.php
 delete mode 100644 phpBB/includes/groupposition/teampage.php
 delete mode 100644 phpBB/includes/hook/finder.php
 delete mode 100644 phpBB/includes/json_response.php
 delete mode 100644 phpBB/includes/lock/db.php
 delete mode 100644 phpBB/includes/lock/flock.php
 delete mode 100644 phpBB/includes/log/interface.php
 delete mode 100644 phpBB/includes/log/log.php
 delete mode 100644 phpBB/includes/notification/exception.php
 delete mode 100644 phpBB/includes/notification/manager.php
 delete mode 100644 phpBB/includes/notification/method/base.php
 delete mode 100644 phpBB/includes/notification/method/email.php
 delete mode 100644 phpBB/includes/notification/method/interface.php
 delete mode 100644 phpBB/includes/notification/method/jabber.php
 delete mode 100644 phpBB/includes/notification/method/messenger_base.php
 delete mode 100644 phpBB/includes/notification/type/approve_post.php
 delete mode 100644 phpBB/includes/notification/type/approve_topic.php
 delete mode 100644 phpBB/includes/notification/type/base.php
 delete mode 100644 phpBB/includes/notification/type/bookmark.php
 delete mode 100644 phpBB/includes/notification/type/disapprove_post.php
 delete mode 100644 phpBB/includes/notification/type/disapprove_topic.php
 delete mode 100644 phpBB/includes/notification/type/interface.php
 delete mode 100644 phpBB/includes/notification/type/pm.php
 delete mode 100644 phpBB/includes/notification/type/post.php
 delete mode 100644 phpBB/includes/notification/type/post_in_queue.php
 delete mode 100644 phpBB/includes/notification/type/quote.php
 delete mode 100644 phpBB/includes/notification/type/report_pm.php
 delete mode 100644 phpBB/includes/notification/type/report_pm_closed.php
 delete mode 100644 phpBB/includes/notification/type/report_post.php
 delete mode 100644 phpBB/includes/notification/type/report_post_closed.php
 delete mode 100644 phpBB/includes/notification/type/topic.php
 delete mode 100644 phpBB/includes/notification/type/topic_in_queue.php
 delete mode 100644 phpBB/includes/php/ini.php
 delete mode 100644 phpBB/includes/request/deactivated_super_global.php
 delete mode 100644 phpBB/includes/request/interface.php
 delete mode 100644 phpBB/includes/request/request.php
 delete mode 100644 phpBB/includes/request/type_cast_helper.php
 delete mode 100644 phpBB/includes/request/type_cast_helper_interface.php
 delete mode 100644 phpBB/includes/search/base.php
 delete mode 100644 phpBB/includes/search/fulltext_mysql.php
 delete mode 100644 phpBB/includes/search/fulltext_native.php
 delete mode 100644 phpBB/includes/search/fulltext_postgres.php
 delete mode 100644 phpBB/includes/search/fulltext_sphinx.php
 delete mode 100644 phpBB/includes/search/index.htm
 delete mode 100644 phpBB/includes/search/sphinx/config.php
 delete mode 100644 phpBB/includes/search/sphinx/config_comment.php
 delete mode 100644 phpBB/includes/search/sphinx/config_section.php
 delete mode 100644 phpBB/includes/search/sphinx/config_variable.php
 delete mode 100644 phpBB/includes/session.php
 delete mode 100644 phpBB/includes/style/extension_path_provider.php
 delete mode 100644 phpBB/includes/style/path_provider.php
 delete mode 100644 phpBB/includes/style/path_provider_interface.php
 delete mode 100644 phpBB/includes/style/resource_locator.php
 delete mode 100644 phpBB/includes/style/style.php
 delete mode 100644 phpBB/includes/template/asset.php
 delete mode 100644 phpBB/includes/template/context.php
 delete mode 100644 phpBB/includes/template/locator.php
 delete mode 100644 phpBB/includes/template/template.php
 delete mode 100644 phpBB/includes/template/twig/definition.php
 delete mode 100644 phpBB/includes/template/twig/environment.php
 delete mode 100644 phpBB/includes/template/twig/extension.php
 delete mode 100644 phpBB/includes/template/twig/lexer.php
 delete mode 100644 phpBB/includes/template/twig/node/define.php
 delete mode 100644 phpBB/includes/template/twig/node/event.php
 delete mode 100644 phpBB/includes/template/twig/node/expression/binary/equalequal.php
 delete mode 100644 phpBB/includes/template/twig/node/expression/binary/notequalequal.php
 delete mode 100644 phpBB/includes/template/twig/node/include.php
 delete mode 100644 phpBB/includes/template/twig/node/includeasset.php
 delete mode 100644 phpBB/includes/template/twig/node/includecss.php
 delete mode 100644 phpBB/includes/template/twig/node/includejs.php
 delete mode 100644 phpBB/includes/template/twig/node/includephp.php
 delete mode 100644 phpBB/includes/template/twig/node/php.php
 delete mode 100644 phpBB/includes/template/twig/tokenparser/define.php
 delete mode 100644 phpBB/includes/template/twig/tokenparser/event.php
 delete mode 100644 phpBB/includes/template/twig/tokenparser/include.php
 delete mode 100644 phpBB/includes/template/twig/tokenparser/includecss.php
 delete mode 100644 phpBB/includes/template/twig/tokenparser/includejs.php
 delete mode 100644 phpBB/includes/template/twig/tokenparser/includephp.php
 delete mode 100644 phpBB/includes/template/twig/tokenparser/php.php
 delete mode 100644 phpBB/includes/template/twig/twig.php
 delete mode 100644 phpBB/includes/tree/interface.php
 delete mode 100644 phpBB/includes/tree/nestedset.php
 delete mode 100644 phpBB/includes/tree/nestedset_forum.php
 delete mode 100644 phpBB/includes/user.php
 delete mode 100644 phpBB/includes/user_loader.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index 6618e2c3f9..11a2511aee 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -560,7 +560,7 @@ class acp_search
 		return $finder
 			->extension_suffix('_backend')
 			->extension_directory('/search')
-			->core_path('includes/search/')
+			->core_path('phpbb/search/')
 			->get_classes();
 	}
 
diff --git a/phpBB/includes/auth/auth.php b/phpBB/includes/auth/auth.php
deleted file mode 100644
index 279959974d..0000000000
--- a/phpBB/includes/auth/auth.php
+++ /dev/null
@@ -1,1080 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Permission/Auth class
-* @package phpBB3
-*/
-class phpbb_auth
-{
-	var $acl = array();
-	var $cache = array();
-	var $acl_options = array();
-	var $acl_forum_ids = false;
-
-	/**
-	* Init permissions
-	*/
-	function acl(&$userdata)
-	{
-		global $db, $cache;
-
-		$this->acl = $this->cache = $this->acl_options = array();
-		$this->acl_forum_ids = false;
-
-		if (($this->acl_options = $cache->get('_acl_options')) === false)
-		{
-			$sql = 'SELECT auth_option_id, auth_option, is_global, is_local
-				FROM ' . ACL_OPTIONS_TABLE . '
-				ORDER BY auth_option_id';
-			$result = $db->sql_query($sql);
-
-			$global = $local = 0;
-			$this->acl_options = array();
-			while ($row = $db->sql_fetchrow($result))
-			{
-				if ($row['is_global'])
-				{
-					$this->acl_options['global'][$row['auth_option']] = $global++;
-				}
-
-				if ($row['is_local'])
-				{
-					$this->acl_options['local'][$row['auth_option']] = $local++;
-				}
-
-				$this->acl_options['id'][$row['auth_option']] = (int) $row['auth_option_id'];
-				$this->acl_options['option'][(int) $row['auth_option_id']] = $row['auth_option'];
-			}
-			$db->sql_freeresult($result);
-
-			$cache->put('_acl_options', $this->acl_options);
-		}
-
-		if (!trim($userdata['user_permissions']))
-		{
-			$this->acl_cache($userdata);
-		}
-
-		// Fill ACL array
-		$this->_fill_acl($userdata['user_permissions']);
-
-		// Verify bitstring length with options provided...
-		$renew = false;
-		$global_length = sizeof($this->acl_options['global']);
-		$local_length = sizeof($this->acl_options['local']);
-
-		// Specify comparing length (bitstring is padded to 31 bits)
-		$global_length = ($global_length % 31) ? ($global_length - ($global_length % 31) + 31) : $global_length;
-		$local_length = ($local_length % 31) ? ($local_length - ($local_length % 31) + 31) : $local_length;
-
-		// You thought we are finished now? Noooo... now compare them.
-		foreach ($this->acl as $forum_id => $bitstring)
-		{
-			if (($forum_id && strlen($bitstring) != $local_length) || (!$forum_id && strlen($bitstring) != $global_length))
-			{
-				$renew = true;
-				break;
-			}
-		}
-
-		// If a bitstring within the list does not match the options, we have a user with incorrect permissions set and need to renew them
-		if ($renew)
-		{
-			$this->acl_cache($userdata);
-			$this->_fill_acl($userdata['user_permissions']);
-		}
-
-		return;
-	}
-
-	/**
-	* Retrieves data wanted by acl function from the database for the
-	* specified user.
-	*
-	* @param int $user_id User ID
-	* @return array User attributes
-	*/
-	public function obtain_user_data($user_id)
-	{
-		global $db;
-
-		$sql = 'SELECT user_id, username, user_permissions, user_type
-			FROM ' . USERS_TABLE . '
-			WHERE user_id = ' . $user_id;
-		$result = $db->sql_query($sql);
-		$user_data = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-		return $user_data;
-	}
-
-	/**
-	* Fill ACL array with relevant bitstrings from user_permissions column
-	* @access private
-	*/
-	function _fill_acl($user_permissions)
-	{
-		$seq_cache = array();
-		$this->acl = array();
-		$user_permissions = explode("\n", $user_permissions);
-
-		foreach ($user_permissions as $f => $seq)
-		{
-			if ($seq)
-			{
-				$i = 0;
-
-				if (!isset($this->acl[$f]))
-				{
-					$this->acl[$f] = '';
-				}
-
-				while ($subseq = substr($seq, $i, 6))
-				{
-					if (isset($seq_cache[$subseq]))
-					{
-						$converted = $seq_cache[$subseq];
-					}
-					else
-					{
-						$converted = $seq_cache[$subseq] = str_pad(base_convert($subseq, 36, 2), 31, 0, STR_PAD_LEFT);
-					}
-
-					// We put the original bitstring into the acl array
-					$this->acl[$f] .= $converted;
-					$i += 6;
-				}
-			}
-		}
-	}
-
-	/**
-	* Look up an option
-	* if the option is prefixed with !, then the result becomes negated
-	*
-	* If a forum id is specified the local option will be combined with a global option if one exist.
-	* If a forum id is not specified, only the global option will be checked.
-	*/
-	function acl_get($opt, $f = 0)
-	{
-		$negate = false;
-
-		if (strpos($opt, '!') === 0)
-		{
-			$negate = true;
-			$opt = substr($opt, 1);
-		}
-
-		if (!isset($this->cache[$f][$opt]))
-		{
-			// We combine the global/local option with an OR because some options are global and local.
-			// If the user has the global permission the local one is true too and vice versa
-			$this->cache[$f][$opt] = false;
-
-			// Is this option a global permission setting?
-			if (isset($this->acl_options['global'][$opt]))
-			{
-				if (isset($this->acl[0]))
-				{
-					$this->cache[$f][$opt] = $this->acl[0][$this->acl_options['global'][$opt]];
-				}
-			}
-
-			// Is this option a local permission setting?
-			// But if we check for a global option only, we won't combine the options...
-			if ($f != 0 && isset($this->acl_options['local'][$opt]))
-			{
-				if (isset($this->acl[$f]) && isset($this->acl[$f][$this->acl_options['local'][$opt]]))
-				{
-					$this->cache[$f][$opt] |= $this->acl[$f][$this->acl_options['local'][$opt]];
-				}
-			}
-		}
-
-		// Founder always has all global options set to true...
-		return ($negate) ? !$this->cache[$f][$opt] : $this->cache[$f][$opt];
-	}
-
-	/**
-	* Get forums with the specified permission setting
-	* if the option is prefixed with !, then the result becomes negated
-	*
-	* @param bool $clean set to true if only values needs to be returned which are set/unset
-	*/
-	function acl_getf($opt, $clean = false)
-	{
-		$acl_f = array();
-		$negate = false;
-
-		if (strpos($opt, '!') === 0)
-		{
-			$negate = true;
-			$opt = substr($opt, 1);
-		}
-
-		// If we retrieve a list of forums not having permissions in, we need to get every forum_id
-		if ($negate)
-		{
-			if ($this->acl_forum_ids === false)
-			{
-				global $db;
-
-				$sql = 'SELECT forum_id
-					FROM ' . FORUMS_TABLE;
-
-				if (sizeof($this->acl))
-				{
-					$sql .= ' WHERE ' . $db->sql_in_set('forum_id', array_keys($this->acl), true);
-				}
-				$result = $db->sql_query($sql);
-
-				$this->acl_forum_ids = array();
-				while ($row = $db->sql_fetchrow($result))
-				{
-					$this->acl_forum_ids[] = $row['forum_id'];
-				}
-				$db->sql_freeresult($result);
-			}
-		}
-
-		if (isset($this->acl_options['local'][$opt]))
-		{
-			foreach ($this->acl as $f => $bitstring)
-			{
-				// Skip global settings
-				if (!$f)
-				{
-					continue;
-				}
-
-				$allowed = (!isset($this->cache[$f][$opt])) ? $this->acl_get($opt, $f) : $this->cache[$f][$opt];
-
-				if (!$clean)
-				{
-					$acl_f[$f][$opt] = ($negate) ? !$allowed : $allowed;
-				}
-				else
-				{
-					if (($negate && !$allowed) || (!$negate && $allowed))
-					{
-						$acl_f[$f][$opt] = 1;
-					}
-				}
-			}
-		}
-
-		// If we get forum_ids not having this permission, we need to fill the remaining parts
-		if ($negate && sizeof($this->acl_forum_ids))
-		{
-			foreach ($this->acl_forum_ids as $f)
-			{
-				$acl_f[$f][$opt] = 1;
-			}
-		}
-
-		return $acl_f;
-	}
-
-	/**
-	* Get local permission state for any forum.
-	*
-	* Returns true if user has the permission in one or more forums, false if in no forum.
-	* If global option is checked it returns the global state (same as acl_get($opt))
-	* Local option has precedence...
-	*/
-	function acl_getf_global($opt)
-	{
-		if (is_array($opt))
-		{
-			// evaluates to true as soon as acl_getf_global is true for one option
-			foreach ($opt as $check_option)
-			{
-				if ($this->acl_getf_global($check_option))
-				{
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		if (isset($this->acl_options['local'][$opt]))
-		{
-			foreach ($this->acl as $f => $bitstring)
-			{
-				// Skip global settings
-				if (!$f)
-				{
-					continue;
-				}
-
-				// as soon as the user has any permission we're done so return true
-				if ((!isset($this->cache[$f][$opt])) ? $this->acl_get($opt, $f) : $this->cache[$f][$opt])
-				{
-					return true;
-				}
-			}
-		}
-		else if (isset($this->acl_options['global'][$opt]))
-		{
-			return $this->acl_get($opt);
-		}
-
-		return false;
-	}
-
-	/**
-	* Get permission settings (more than one)
-	*/
-	function acl_gets()
-	{
-		$args = func_get_args();
-		$f = array_pop($args);
-
-		if (!is_numeric($f))
-		{
-			$args[] = $f;
-			$f = 0;
-		}
-
-		// alternate syntax: acl_gets(array('m_', 'a_'), $forum_id)
-		if (is_array($args[0]))
-		{
-			$args = $args[0];
-		}
-
-		$acl = 0;
-		foreach ($args as $opt)
-		{
-			$acl |= $this->acl_get($opt, $f);
-		}
-
-		return $acl;
-	}
-
-	/**
-	* Get permission listing based on user_id/options/forum_ids
-	*
-	* Be careful when using this function with permissions a_, m_, u_ and f_ !
-	* It may not work correctly. When a user group grants an a_* permission,
-	* e.g. a_foo, but the user's a_foo permission is set to "Never", then
-	* the user does not in fact have the a_ permission.
-	* But the user will still be listed as having the a_ permission.
-	*
-	* For more information see: http://tracker.phpbb.com/browse/PHPBB3-10252
-	*/
-	function acl_get_list($user_id = false, $opts = false, $forum_id = false)
-	{
-		if ($user_id !== false && !is_array($user_id) && $opts === false && $forum_id === false)
-		{
-			$hold_ary = array($user_id => $this->acl_raw_data_single_user($user_id));
-		}
-		else
-		{
-			$hold_ary = $this->acl_raw_data($user_id, $opts, $forum_id);
-		}
-
-		$auth_ary = array();
-		foreach ($hold_ary as $user_id => $forum_ary)
-		{
-			foreach ($forum_ary as $forum_id => $auth_option_ary)
-			{
-				foreach ($auth_option_ary as $auth_option => $auth_setting)
-				{
-					if ($auth_setting)
-					{
-						$auth_ary[$forum_id][$auth_option][] = $user_id;
-					}
-				}
-			}
-		}
-
-		return $auth_ary;
-	}
-
-	/**
-	* Cache data to user_permissions row
-	*/
-	function acl_cache(&$userdata)
-	{
-		global $db;
-
-		// Empty user_permissions
-		$userdata['user_permissions'] = '';
-
-		$hold_ary = $this->acl_raw_data_single_user($userdata['user_id']);
-
-		// Key 0 in $hold_ary are global options, all others are forum_ids
-
-		// If this user is founder we're going to force fill the admin options ...
-		if ($userdata['user_type'] == USER_FOUNDER)
-		{
-			foreach ($this->acl_options['global'] as $opt => $id)
-			{
-				if (strpos($opt, 'a_') === 0)
-				{
-					$hold_ary[0][$this->acl_options['id'][$opt]] = ACL_YES;
-				}
-			}
-		}
-
-		$hold_str = $this->build_bitstring($hold_ary);
-
-		if ($hold_str)
-		{
-			$userdata['user_permissions'] = $hold_str;
-
-			$sql = 'UPDATE ' . USERS_TABLE . "
-				SET user_permissions = '" . $db->sql_escape($userdata['user_permissions']) . "',
-					user_perm_from = 0
-				WHERE user_id = " . $userdata['user_id'];
-			$db->sql_query($sql);
-		}
-
-		return;
-	}
-
-	/**
-	* Build bitstring from permission set
-	*/
-	function build_bitstring(&$hold_ary)
-	{
-		$hold_str = '';
-
-		if (sizeof($hold_ary))
-		{
-			ksort($hold_ary);
-
-			$last_f = 0;
-
-			foreach ($hold_ary as $f => $auth_ary)
-			{
-				$ary_key = (!$f) ? 'global' : 'local';
-
-				$bitstring = array();
-				foreach ($this->acl_options[$ary_key] as $opt => $id)
-				{
-					if (isset($auth_ary[$this->acl_options['id'][$opt]]))
-					{
-						$bitstring[$id] = $auth_ary[$this->acl_options['id'][$opt]];
-
-						$option_key = substr($opt, 0, strpos($opt, '_') + 1);
-
-						// If one option is allowed, the global permission for this option has to be allowed too
-						// example: if the user has the a_ permission this means he has one or more a_* permissions
-						if ($auth_ary[$this->acl_options['id'][$opt]] == ACL_YES && (!isset($bitstring[$this->acl_options[$ary_key][$option_key]]) || $bitstring[$this->acl_options[$ary_key][$option_key]] == ACL_NEVER))
-						{
-							$bitstring[$this->acl_options[$ary_key][$option_key]] = ACL_YES;
-						}
-					}
-					else
-					{
-						$bitstring[$id] = ACL_NEVER;
-					}
-				}
-
-				// Now this bitstring defines the permission setting for the current forum $f (or global setting)
-				$bitstring = implode('', $bitstring);
-
-				// The line number indicates the id, therefore we have to add empty lines for those ids not present
-				$hold_str .= str_repeat("\n", $f - $last_f);
-
-				// Convert bitstring for storage - we do not use binary/bytes because PHP's string functions are not fully binary safe
-				for ($i = 0, $bit_length = strlen($bitstring); $i < $bit_length; $i += 31)
-				{
-					$hold_str .= str_pad(base_convert(str_pad(substr($bitstring, $i, 31), 31, 0, STR_PAD_RIGHT), 2, 36), 6, 0, STR_PAD_LEFT);
-				}
-
-				$last_f = $f;
-			}
-			unset($bitstring);
-
-			$hold_str = rtrim($hold_str);
-		}
-
-		return $hold_str;
-	}
-
-	/**
-	* Clear one or all users cached permission settings
-	*/
-	function acl_clear_prefetch($user_id = false)
-	{
-		global $db, $cache;
-
-		// Rebuild options cache
-		$cache->destroy('_role_cache');
-
-		$sql = 'SELECT *
-			FROM ' . ACL_ROLES_DATA_TABLE . '
-			ORDER BY role_id ASC';
-		$result = $db->sql_query($sql);
-
-		$this->role_cache = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$this->role_cache[$row['role_id']][$row['auth_option_id']] = (int) $row['auth_setting'];
-		}
-		$db->sql_freeresult($result);
-
-		foreach ($this->role_cache as $role_id => $role_options)
-		{
-			$this->role_cache[$role_id] = serialize($role_options);
-		}
-
-		$cache->put('_role_cache', $this->role_cache);
-
-		// Now empty user permissions
-		$where_sql = '';
-
-		if ($user_id !== false)
-		{
-			$user_id = (!is_array($user_id)) ? $user_id = array((int) $user_id) : array_map('intval', $user_id);
-			$where_sql = ' WHERE ' . $db->sql_in_set('user_id', $user_id);
-		}
-
-		$sql = 'UPDATE ' . USERS_TABLE . "
-			SET user_permissions = '',
-				user_perm_from = 0
-			$where_sql";
-		$db->sql_query($sql);
-
-		return;
-	}
-
-	/**
-	* Get assigned roles
-	*/
-	function acl_role_data($user_type, $role_type, $ug_id = false, $forum_id = false)
-	{
-		global $db;
-
-		$roles = array();
-
-		$sql_id = ($user_type == 'user') ? 'user_id' : 'group_id';
-
-		$sql_ug = ($ug_id !== false) ? ((!is_array($ug_id)) ? "AND a.$sql_id = $ug_id" : 'AND ' . $db->sql_in_set("a.$sql_id", $ug_id)) : '';
-		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? "AND a.forum_id = $forum_id" : 'AND ' . $db->sql_in_set('a.forum_id', $forum_id)) : '';
-
-		// Grab assigned roles...
-		$sql = 'SELECT a.auth_role_id, a.' . $sql_id . ', a.forum_id
-			FROM ' . (($user_type == 'user') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE) . ' a, ' . ACL_ROLES_TABLE . " r
-			WHERE a.auth_role_id = r.role_id
-				AND r.role_type = '" . $db->sql_escape($role_type) . "'
-				$sql_ug
-				$sql_forum
-			ORDER BY r.role_order ASC";
-		$result = $db->sql_query($sql);
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$roles[$row[$sql_id]][$row['forum_id']] = $row['auth_role_id'];
-		}
-		$db->sql_freeresult($result);
-
-		return $roles;
-	}
-
-	/**
-	* Get raw acl data based on user/option/forum
-	*/
-	function acl_raw_data($user_id = false, $opts = false, $forum_id = false)
-	{
-		global $db;
-
-		$sql_user = ($user_id !== false) ? ((!is_array($user_id)) ? 'user_id = ' . (int) $user_id : $db->sql_in_set('user_id', array_map('intval', $user_id))) : '';
-		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : '';
-
-		$sql_opts = $sql_opts_select = $sql_opts_from = '';
-		$hold_ary = array();
-
-		if ($opts !== false)
-		{
-			$sql_opts_select = ', ao.auth_option';
-			$sql_opts_from = ', ' . ACL_OPTIONS_TABLE . ' ao';
-			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts);
-		}
-
-		$sql_ary = array();
-
-		// Grab non-role settings - user-specific
-		$sql_ary[] = 'SELECT a.user_id, a.forum_id, a.auth_setting, a.auth_option_id' . $sql_opts_select . '
-			FROM ' . ACL_USERS_TABLE . ' a' . $sql_opts_from . '
-			WHERE a.auth_role_id = 0 ' .
-				(($sql_opts_from) ? 'AND a.auth_option_id = ao.auth_option_id ' : '') .
-				(($sql_user) ? 'AND a.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts";
-
-		// Now the role settings - user-specific
-		$sql_ary[] = 'SELECT a.user_id, a.forum_id, r.auth_option_id, r.auth_setting, r.auth_option_id' . $sql_opts_select . '
-			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r' . $sql_opts_from . '
-			WHERE a.auth_role_id = r.role_id ' .
-				(($sql_opts_from) ? 'AND r.auth_option_id = ao.auth_option_id ' : '') .
-				(($sql_user) ? 'AND a.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts";
-
-		foreach ($sql_ary as $sql)
-		{
-			$result = $db->sql_query($sql);
-
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$option = ($sql_opts_select) ? $row['auth_option'] : $this->acl_options['option'][$row['auth_option_id']];
-				$hold_ary[$row['user_id']][$row['forum_id']][$option] = $row['auth_setting'];
-			}
-			$db->sql_freeresult($result);
-		}
-
-		$sql_ary = array();
-
-		// Now grab group settings - non-role specific...
-		$sql_ary[] = 'SELECT ug.user_id, a.forum_id, a.auth_setting, a.auth_option_id' . $sql_opts_select . '
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug, ' . GROUPS_TABLE . ' g' . $sql_opts_from . '
-			WHERE a.auth_role_id = 0 ' .
-				(($sql_opts_from) ? 'AND a.auth_option_id = ao.auth_option_id ' : '') . '
-				AND a.group_id = ug.group_id
-				AND g.group_id = ug.group_id
-				AND ug.user_pending = 0
-				AND NOT (ug.group_leader = 1 AND g.group_skip_auth = 1)
-				' . (($sql_user) ? 'AND ug.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts";
-
-		// Now grab group settings - role specific...
-		$sql_ary[] = 'SELECT ug.user_id, a.forum_id, r.auth_setting, r.auth_option_id' . $sql_opts_select . '
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug, ' . GROUPS_TABLE . ' g, ' . ACL_ROLES_DATA_TABLE . ' r' . $sql_opts_from . '
-			WHERE a.auth_role_id = r.role_id ' .
-				(($sql_opts_from) ? 'AND r.auth_option_id = ao.auth_option_id ' : '') . '
-				AND a.group_id = ug.group_id
-				AND g.group_id = ug.group_id
-				AND ug.user_pending = 0
-				AND NOT (ug.group_leader = 1 AND g.group_skip_auth = 1)
-				' . (($sql_user) ? 'AND ug.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts";
-
-		foreach ($sql_ary as $sql)
-		{
-			$result = $db->sql_query($sql);
-
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$option = ($sql_opts_select) ? $row['auth_option'] : $this->acl_options['option'][$row['auth_option_id']];
-
-				if (!isset($hold_ary[$row['user_id']][$row['forum_id']][$option]) || (isset($hold_ary[$row['user_id']][$row['forum_id']][$option]) && $hold_ary[$row['user_id']][$row['forum_id']][$option] != ACL_NEVER))
-				{
-					$hold_ary[$row['user_id']][$row['forum_id']][$option] = $row['auth_setting'];
-
-					// If we detect ACL_NEVER, we will unset the flag option (within building the bitstring it is correctly set again)
-					if ($row['auth_setting'] == ACL_NEVER)
-					{
-						$flag = substr($option, 0, strpos($option, '_') + 1);
-
-						if (isset($hold_ary[$row['user_id']][$row['forum_id']][$flag]) && $hold_ary[$row['user_id']][$row['forum_id']][$flag] == ACL_YES)
-						{
-							unset($hold_ary[$row['user_id']][$row['forum_id']][$flag]);
-
-/*							if (in_array(ACL_YES, $hold_ary[$row['user_id']][$row['forum_id']]))
-							{
-								$hold_ary[$row['user_id']][$row['forum_id']][$flag] = ACL_YES;
-							}
-*/
-						}
-					}
-				}
-			}
-			$db->sql_freeresult($result);
-		}
-
-		return $hold_ary;
-	}
-
-	/**
-	* Get raw user based permission settings
-	*/
-	function acl_user_raw_data($user_id = false, $opts = false, $forum_id = false)
-	{
-		global $db;
-
-		$sql_user = ($user_id !== false) ? ((!is_array($user_id)) ? 'user_id = ' . (int) $user_id : $db->sql_in_set('user_id', array_map('intval', $user_id))) : '';
-		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : '';
-
-		$sql_opts = '';
-		$hold_ary = $sql_ary = array();
-
-		if ($opts !== false)
-		{
-			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts);
-		}
-
-		// Grab user settings - non-role specific...
-		$sql_ary[] = 'SELECT a.user_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option
-			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao
-			WHERE a.auth_role_id = 0
-				AND a.auth_option_id = ao.auth_option_id ' .
-				(($sql_user) ? 'AND a.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts
-			ORDER BY a.forum_id, ao.auth_option";
-
-		// Now the role settings - user-specific
-		$sql_ary[] = 'SELECT a.user_id, a.forum_id, r.auth_option_id, r.auth_setting, r.auth_option_id, ao.auth_option
-			FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao
-			WHERE a.auth_role_id = r.role_id
-				AND r.auth_option_id = ao.auth_option_id ' .
-				(($sql_user) ? 'AND a.' . $sql_user : '') . "
-				$sql_forum
-				$sql_opts
-			ORDER BY a.forum_id, ao.auth_option";
-
-		foreach ($sql_ary as $sql)
-		{
-			$result = $db->sql_query($sql);
-
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$hold_ary[$row['user_id']][$row['forum_id']][$row['auth_option']] = $row['auth_setting'];
-			}
-			$db->sql_freeresult($result);
-		}
-
-		return $hold_ary;
-	}
-
-	/**
-	* Get raw group based permission settings
-	*/
-	function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false)
-	{
-		global $db;
-
-		$sql_group = ($group_id !== false) ? ((!is_array($group_id)) ? 'group_id = ' . (int) $group_id : $db->sql_in_set('group_id', array_map('intval', $group_id))) : '';
-		$sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : '';
-
-		$sql_opts = '';
-		$hold_ary = $sql_ary = array();
-
-		if ($opts !== false)
-		{
-			$this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts);
-		}
-
-		// Grab group settings - non-role specific...
-		$sql_ary[] = 'SELECT a.group_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao
-			WHERE a.auth_role_id = 0
-				AND a.auth_option_id = ao.auth_option_id ' .
-				(($sql_group) ? 'AND a.' . $sql_group : '') . "
-				$sql_forum
-				$sql_opts
-			ORDER BY a.forum_id, ao.auth_option";
-
-		// Now grab group settings - role specific...
-		$sql_ary[] = 'SELECT a.group_id, a.forum_id, r.auth_setting, r.auth_option_id, ao.auth_option
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao
-			WHERE a.auth_role_id = r.role_id
-				AND r.auth_option_id = ao.auth_option_id ' .
-				(($sql_group) ? 'AND a.' . $sql_group : '') . "
-				$sql_forum
-				$sql_opts
-			ORDER BY a.forum_id, ao.auth_option";
-
-		foreach ($sql_ary as $sql)
-		{
-			$result = $db->sql_query($sql);
-
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$hold_ary[$row['group_id']][$row['forum_id']][$row['auth_option']] = $row['auth_setting'];
-			}
-			$db->sql_freeresult($result);
-		}
-
-		return $hold_ary;
-	}
-
-	/**
-	* Get raw acl data based on user for caching user_permissions
-	* This function returns the same data as acl_raw_data(), but without the user id as the first key within the array.
-	*/
-	function acl_raw_data_single_user($user_id)
-	{
-		global $db, $cache;
-
-		// Check if the role-cache is there
-		if (($this->role_cache = $cache->get('_role_cache')) === false)
-		{
-			$this->role_cache = array();
-
-			// We pre-fetch roles
-			$sql = 'SELECT *
-				FROM ' . ACL_ROLES_DATA_TABLE . '
-				ORDER BY role_id ASC';
-			$result = $db->sql_query($sql);
-
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$this->role_cache[$row['role_id']][$row['auth_option_id']] = (int) $row['auth_setting'];
-			}
-			$db->sql_freeresult($result);
-
-			foreach ($this->role_cache as $role_id => $role_options)
-			{
-				$this->role_cache[$role_id] = serialize($role_options);
-			}
-
-			$cache->put('_role_cache', $this->role_cache);
-		}
-
-		$hold_ary = array();
-
-		// Grab user-specific permission settings
-		$sql = 'SELECT forum_id, auth_option_id, auth_role_id, auth_setting
-			FROM ' . ACL_USERS_TABLE . '
-			WHERE user_id = ' . $user_id;
-		$result = $db->sql_query($sql);
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			// If a role is assigned, assign all options included within this role. Else, only set this one option.
-			if ($row['auth_role_id'])
-			{
-				$hold_ary[$row['forum_id']] = (empty($hold_ary[$row['forum_id']])) ? unserialize($this->role_cache[$row['auth_role_id']]) : $hold_ary[$row['forum_id']] + unserialize($this->role_cache[$row['auth_role_id']]);
-			}
-			else
-			{
-				$hold_ary[$row['forum_id']][$row['auth_option_id']] = $row['auth_setting'];
-			}
-		}
-		$db->sql_freeresult($result);
-
-		// Now grab group-specific permission settings
-		$sql = 'SELECT a.forum_id, a.auth_option_id, a.auth_role_id, a.auth_setting
-			FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug, ' . GROUPS_TABLE . ' g
-			WHERE a.group_id = ug.group_id
-				AND g.group_id = ug.group_id
-				AND ug.user_pending = 0
-				AND NOT (ug.group_leader = 1 AND g.group_skip_auth = 1)
-				AND ug.user_id = ' . $user_id;
-		$result = $db->sql_query($sql);
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if (!$row['auth_role_id'])
-			{
-				$this->_set_group_hold_ary($hold_ary[$row['forum_id']], $row['auth_option_id'], $row['auth_setting']);
-			}
-			else if (!empty($this->role_cache[$row['auth_role_id']]))
-			{
-				foreach (unserialize($this->role_cache[$row['auth_role_id']]) as $option_id => $setting)
-				{
-					$this->_set_group_hold_ary($hold_ary[$row['forum_id']], $option_id, $setting);
-				}
-			}
-		}
-		$db->sql_freeresult($result);
-
-		return $hold_ary;
-	}
-
-	/**
-	* Private function snippet for setting a specific piece of the hold_ary
-	*/
-	function _set_group_hold_ary(&$hold_ary, $option_id, $setting)
-	{
-		if (!isset($hold_ary[$option_id]) || (isset($hold_ary[$option_id]) && $hold_ary[$option_id] != ACL_NEVER))
-		{
-			$hold_ary[$option_id] = $setting;
-
-			// If we detect ACL_NEVER, we will unset the flag option (within building the bitstring it is correctly set again)
-			if ($setting == ACL_NEVER)
-			{
-				$flag = substr($this->acl_options['option'][$option_id], 0, strpos($this->acl_options['option'][$option_id], '_') + 1);
-				$flag = (int) $this->acl_options['id'][$flag];
-
-				if (isset($hold_ary[$flag]) && $hold_ary[$flag] == ACL_YES)
-				{
-					unset($hold_ary[$flag]);
-
-/*					This is uncommented, because i suspect this being slightly wrong due to mixed permission classes being possible
-					if (in_array(ACL_YES, $hold_ary))
-					{
-						$hold_ary[$flag] = ACL_YES;
-					}*/
-				}
-			}
-		}
-	}
-
-	/**
-	* Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
-	*/
-	function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0)
-	{
-		global $config, $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
-
-		$method = trim(basename($config['auth_method']));
-
-		$provider = $phpbb_container->get('auth.provider.' . $method);
-		if ($provider)
-		{
-			$login = $provider->login($username, $password);
-
-			// If the auth module wants us to create an empty profile do so and then treat the status as LOGIN_SUCCESS
-			if ($login['status'] == LOGIN_SUCCESS_CREATE_PROFILE)
-			{
-				// we are going to use the user_add function so include functions_user.php if it wasn't defined yet
-				if (!function_exists('user_add'))
-				{
-					include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-				}
-
-				user_add($login['user_row'], (isset($login['cp_data'])) ? $login['cp_data'] : false);
-
-				$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type
-					FROM ' . USERS_TABLE . "
-					WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
-				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
-
-				if (!$row)
-				{
-					return array(
-						'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-						'error_msg'		=> 'AUTH_NO_PROFILE_CREATED',
-						'user_row'		=> array('user_id' => ANONYMOUS),
-					);
-				}
-
-				$login = array(
-					'status'	=> LOGIN_SUCCESS,
-					'error_msg'	=> false,
-					'user_row'	=> $row,
-				);
-			}
-
-			// If login succeeded, we will log the user in... else we pass the login array through...
-			if ($login['status'] == LOGIN_SUCCESS)
-			{
-				$old_session_id = $user->session_id;
-
-				if ($admin)
-				{
-					global $SID, $_SID;
-
-					$cookie_expire = time() - 31536000;
-					$user->set_cookie('u', '', $cookie_expire);
-					$user->set_cookie('sid', '', $cookie_expire);
-					unset($cookie_expire);
-
-					$SID = '?sid=';
-					$user->session_id = $_SID = '';
-				}
-
-				$result = $user->session_create($login['user_row']['user_id'], $admin, $autologin, $viewonline);
-
-				// Successful session creation
-				if ($result === true)
-				{
-					// If admin re-authentication we remove the old session entry because a new one has been created...
-					if ($admin)
-					{
-						// the login array is used because the user ids do not differ for re-authentication
-						$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
-							WHERE session_id = '" . $db->sql_escape($old_session_id) . "'
-							AND session_user_id = {$login['user_row']['user_id']}";
-						$db->sql_query($sql);
-					}
-
-					return array(
-						'status'		=> LOGIN_SUCCESS,
-						'error_msg'		=> false,
-						'user_row'		=> $login['user_row'],
-					);
-				}
-
-				return array(
-					'status'		=> LOGIN_BREAK,
-					'error_msg'		=> $result,
-					'user_row'		=> $login['user_row'],
-				);
-			}
-
-			return $login;
-		}
-
-		trigger_error('Authentication method not found', E_USER_ERROR);
-	}
-
-	/**
-	* Fill auth_option statement for later querying based on the supplied options
-	*/
-	function build_auth_option_statement($key, $auth_options, &$sql_opts)
-	{
-		global $db;
-
-		if (!is_array($auth_options))
-		{
-			if (strpos($auth_options, '%') !== false)
-			{
-				$sql_opts = "AND $key " . $db->sql_like_expression(str_replace('%', $db->any_char, $auth_options));
-			}
-			else
-			{
-				$sql_opts = "AND $key = '" . $db->sql_escape($auth_options) . "'";
-			}
-		}
-		else
-		{
-			$is_like_expression = false;
-
-			foreach ($auth_options as $option)
-			{
-				if (strpos($option, '%') !== false)
-				{
-					$is_like_expression = true;
-				}
-			}
-
-			if (!$is_like_expression)
-			{
-				$sql_opts = 'AND ' . $db->sql_in_set($key, $auth_options);
-			}
-			else
-			{
-				$sql = array();
-
-				foreach ($auth_options as $option)
-				{
-					if (strpos($option, '%') !== false)
-					{
-						$sql[] = $key . ' ' . $db->sql_like_expression(str_replace('%', $db->any_char, $option));
-					}
-					else
-					{
-						$sql[] = $key . " = '" . $db->sql_escape($option) . "'";
-					}
-				}
-
-				$sql_opts = 'AND (' . implode(' OR ', $sql) . ')';
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/auth/index.htm b/phpBB/includes/auth/index.htm
deleted file mode 100644
index ee1f723a7d..0000000000
--- a/phpBB/includes/auth/index.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-</body>
-</html>
diff --git a/phpBB/includes/auth/provider/apache.php b/phpBB/includes/auth/provider/apache.php
deleted file mode 100644
index 2e80436f78..0000000000
--- a/phpBB/includes/auth/provider/apache.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-/**
-*
-* @package auth
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * Apache authentication provider for phpBB3
- *
- * @package auth
- */
-class phpbb_auth_provider_apache extends phpbb_auth_provider_base
-{
-	/**
-	 * Apache Authentication Constructor
-	 *
-	 * @param 	phpbb_db_driver 	$db
-	 * @param 	phpbb_config 		$config
-	 * @param 	phpbb_request 		$request
-	 * @param 	phpbb_user 			$user
-	 * @param 	string 				$phpbb_root_path
-	 * @param 	string 				$php_ext
-	 */
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext)
-	{
-		$this->db = $db;
-		$this->config = $config;
-		$this->request = $request;
-		$this->user = $user;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function init()
-	{
-		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER) || $this->user->data['username'] !== htmlspecialchars_decode($this->request->server('PHP_AUTH_USER')))
-		{
-			return $this->user->lang['APACHE_SETUP_BEFORE_USE'];
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function login($username, $password)
-	{
-		// do not allow empty password
-		if (!$password)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_PASSWORD,
-				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		if (!$username)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-				'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
-				'user_row'		=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$php_auth_user = htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'));
-		$php_auth_pw = htmlspecialchars_decode($this->request->server('PHP_AUTH_PW'));
-
-		if (!empty($php_auth_user) && !empty($php_auth_pw))
-		{
-			if ($php_auth_user !== $username)
-			{
-				return array(
-					'status'	=> LOGIN_ERROR_USERNAME,
-					'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-					'user_row'	=> array('user_id' => ANONYMOUS),
-				);
-			}
-
-			$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type
-				FROM ' . USERS_TABLE . "
-				WHERE username = '" . $this->db->sql_escape($php_auth_user) . "'";
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if ($row)
-			{
-				// User inactive...
-				if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
-				{
-					return array(
-						'status'		=> LOGIN_ERROR_ACTIVE,
-						'error_msg'		=> 'ACTIVE_ERROR',
-						'user_row'		=> $row,
-					);
-				}
-
-				// Successful login...
-				return array(
-					'status'		=> LOGIN_SUCCESS,
-					'error_msg'		=> false,
-					'user_row'		=> $row,
-				);
-			}
-
-			// this is the user's first login so create an empty profile
-			return array(
-				'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
-				'error_msg'		=> false,
-				'user_row'		=> user_row_apache($php_auth_user, $php_auth_pw),
-			);
-		}
-
-		// Not logged into apache
-		return array(
-			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-			'error_msg'		=> 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
-			'user_row'		=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function autologin()
-	{
-		if (!$this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
-		{
-			return array();
-		}
-
-		$php_auth_user = htmlspecialchars_decode($this->request->server('PHP_AUTH_USER'));
-		$php_auth_pw = htmlspecialchars_decode($this->request->server('PHP_AUTH_PW'));
-
-		if (!empty($php_auth_user) && !empty($php_auth_pw))
-		{
-			set_var($php_auth_user, $php_auth_user, 'string', true);
-			set_var($php_auth_pw, $php_auth_pw, 'string', true);
-
-			$sql = 'SELECT *
-				FROM ' . USERS_TABLE . "
-				WHERE username = '" . $this->db->sql_escape($php_auth_user) . "'";
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if ($row)
-			{
-				return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row;
-			}
-
-			if (!function_exists('user_add'))
-			{
-				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-			}
-
-			// create the user if he does not exist yet
-			user_add(user_row_apache($php_auth_user, $php_auth_pw));
-
-			$sql = 'SELECT *
-				FROM ' . USERS_TABLE . "
-				WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($php_auth_user)) . "'";
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if ($row)
-			{
-				return $row;
-			}
-		}
-
-		return array();
-	}
-
-	/**
-	 * This function generates an array which can be passed to the user_add
-	 * function in order to create a user
-	 *
-	 * @param 	string	$username 	The username of the new user.
-	 * @param 	string	$password 	The password of the new user.
-	 * @return 	array 				Contains data that can be passed directly to
-	 *								the user_add function.
-	 */
-	private function user_row($username, $password)
-	{
-		// first retrieve default group id
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "'
-				AND group_type = " . GROUP_SPECIAL;
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			trigger_error('NO_GROUP');
-		}
-
-		// generate user account data
-		return array(
-			'username'		=> $username,
-			'user_password'	=> phpbb_hash($password),
-			'user_email'	=> '',
-			'group_id'		=> (int) $row['group_id'],
-			'user_type'		=> USER_NORMAL,
-			'user_ip'		=> $this->user->ip,
-			'user_new'		=> ($this->config['new_member_post_limit']) ? 1 : 0,
-		);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function validate_session($user)
-	{
-		// Check if PHP_AUTH_USER is set and handle this case
-		if ($this->request->is_set('PHP_AUTH_USER', phpbb_request_interface::SERVER))
-		{
-			$php_auth_user = $this->request->server('PHP_AUTH_USER');
-
-			return ($php_auth_user === $user['username']) ? true : false;
-		}
-
-		// PHP_AUTH_USER is not set. A valid session is now determined by the user type (anonymous/bot or not)
-		if ($user['user_type'] == USER_IGNORE)
-		{
-			return true;
-		}
-
-		return false;
-	}
-}
diff --git a/phpBB/includes/auth/provider/base.php b/phpBB/includes/auth/provider/base.php
deleted file mode 100644
index 7eaf8bb2d3..0000000000
--- a/phpBB/includes/auth/provider/base.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
-*
-* @package auth
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base authentication provider class that all other providers should implement
-*
-* @package auth
-*/
-abstract class phpbb_auth_provider_base implements phpbb_auth_provider_interface
-{
-	/**
-	* {@inheritdoc}
-	*/
-	public function init()
-	{
-		return;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function autologin()
-	{
-		return;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function acp()
-	{
-		return;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function get_acp_template($new_config)
-	{
-		return;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function logout($data, $new_session)
-	{
-		return;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function validate_session($user)
-	{
-		return;
-	}
-}
diff --git a/phpBB/includes/auth/provider/db.php b/phpBB/includes/auth/provider/db.php
deleted file mode 100644
index 0934c56d9b..0000000000
--- a/phpBB/includes/auth/provider/db.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/**
-*
-* @package auth
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * Database authentication provider for phpBB3
- *
- * This is for authentication via the integrated user table
- *
- * @package auth
- */
-class phpbb_auth_provider_db extends phpbb_auth_provider_base
-{
-
-	/**
-	 * Database Authentication Constructor
-	 *
-	 * @param	phpbb_db_driver	$db
-	 * @param	phpbb_config 	$config
-	 * @param	phpbb_request	$request
-	 * @param	phpbb_user		$user
-	 * @param	string			$phpbb_root_path
-	 * @param	string			$php_ext
-	 */
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $phpbb_root_path, $php_ext)
-	{
-		$this->db = $db;
-		$this->config = $config;
-		$this->request = $request;
-		$this->user = $user;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function login($username, $password)
-	{
-		// Auth plugins get the password untrimmed.
-		// For compatibility we trim() here.
-		$password = trim($password);
-
-		// do not allow empty password
-		if (!$password)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_PASSWORD,
-				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		if (!$username)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$username_clean = utf8_clean_string($username);
-
-		$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'";
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (($this->user->ip && !$this->config['ip_login_limit_use_forwarded']) ||
-			($this->user->forwarded_for && $this->config['ip_login_limit_use_forwarded']))
-		{
-			$sql = 'SELECT COUNT(*) AS attempts
-				FROM ' . LOGIN_ATTEMPT_TABLE . '
-				WHERE attempt_time > ' . (time() - (int) $this->config['ip_login_limit_time']);
-			if ($this->config['ip_login_limit_use_forwarded'])
-			{
-				$sql .= " AND attempt_forwarded_for = '" . $this->db->sql_escape($this->user->forwarded_for) . "'";
-			}
-			else
-			{
-				$sql .= " AND attempt_ip = '" . $this->db->sql_escape($this->user->ip) . "' ";
-			}
-
-			$result = $this->db->sql_query($sql);
-			$attempts = (int) $this->db->sql_fetchfield('attempts');
-			$this->db->sql_freeresult($result);
-
-			$attempt_data = array(
-				'attempt_ip'			=> $this->user->ip,
-				'attempt_browser'		=> trim(substr($this->user->browser, 0, 149)),
-				'attempt_forwarded_for'	=> $this->user->forwarded_for,
-				'attempt_time'			=> time(),
-				'user_id'				=> ($row) ? (int) $row['user_id'] : 0,
-				'username'				=> $username,
-				'username_clean'		=> $username_clean,
-			);
-			$sql = 'INSERT INTO ' . LOGIN_ATTEMPT_TABLE . $this->db->sql_build_array('INSERT', $attempt_data);
-			$result = $this->db->sql_query($sql);
-		}
-		else
-		{
-			$attempts = 0;
-		}
-
-		if (!$row)
-		{
-			if ($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max'])
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ATTEMPTS,
-					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
-					'user_row'		=> array('user_id' => ANONYMOUS),
-				);
-			}
-
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$show_captcha = ($this->config['max_login_attempts'] && $row['user_login_attempts'] >= $this->config['max_login_attempts']) ||
-			($this->config['ip_login_limit_max'] && $attempts >= $this->config['ip_login_limit_max']);
-
-		// If there are too many login attempts, we need to check for a confirm image
-		// Every auth module is able to define what to do by itself...
-		if ($show_captcha)
-		{
-			// Visual Confirmation handling
-			if (!class_exists('phpbb_captcha_factory', false))
-			{
-				include ($this->phpbb_root_path . 'includes/captcha/captcha_factory.' . $this->php_ext);
-			}
-
-			$captcha = phpbb_captcha_factory::get_instance($this->config['captcha_plugin']);
-			$captcha->init(CONFIRM_LOGIN);
-			$vc_response = $captcha->validate($row);
-			if ($vc_response)
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ATTEMPTS,
-					'error_msg'		=> 'LOGIN_ERROR_ATTEMPTS',
-					'user_row'		=> $row,
-				);
-			}
-			else
-			{
-				$captcha->reset();
-			}
-
-		}
-
-		// If the password convert flag is set we need to convert it
-		if ($row['user_pass_convert'])
-		{
-			// enable super globals to get literal value
-			// this is needed to prevent unicode normalization
-			$super_globals_disabled = $this->request->super_globals_disabled();
-			if ($super_globals_disabled)
-			{
-				$this->request->enable_super_globals();
-			}
-
-			// in phpBB2 passwords were used exactly as they were sent, with addslashes applied
-			$password_old_format = isset($_REQUEST['password']) ? (string) $_REQUEST['password'] : '';
-			$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format;
-			$password_new_format = $this->request->variable('password', '', true);
-
-			if ($super_globals_disabled)
-			{
-				$this->request->disable_super_globals();
-			}
-
-			if ($password == $password_new_format)
-			{
-				if (!function_exists('utf8_to_cp1252'))
-				{
-					include($this->phpbb_root_path . 'includes/utf/data/recode_basic.' . $this->php_ext);
-				}
-
-				// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding
-				// plain md5 support left in for conversions from other systems.
-				if ((strlen($row['user_password']) == 34 && (phpbb_check_hash(md5($password_old_format), $row['user_password']) || phpbb_check_hash(md5(utf8_to_cp1252($password_old_format)), $row['user_password'])))
-					|| (strlen($row['user_password']) == 32  && (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password'])))
-				{
-					$hash = phpbb_hash($password_new_format);
-
-					// Update the password in the users table to the new format and remove user_pass_convert flag
-					$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_password = \'' . $this->db->sql_escape($hash) . '\',
-							user_pass_convert = 0
-						WHERE user_id = ' . $row['user_id'];
-					$this->db->sql_query($sql);
-
-					$row['user_pass_convert'] = 0;
-					$row['user_password'] = $hash;
-				}
-				else
-				{
-					// Although we weren't able to convert this password we have to
-					// increase login attempt count to make sure this cannot be exploited
-					$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_login_attempts = user_login_attempts + 1
-						WHERE user_id = ' . (int) $row['user_id'] . '
-							AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
-					$this->db->sql_query($sql);
-
-					return array(
-						'status'		=> LOGIN_ERROR_PASSWORD_CONVERT,
-						'error_msg'		=> 'LOGIN_ERROR_PASSWORD_CONVERT',
-						'user_row'		=> $row,
-					);
-				}
-			}
-		}
-
-		// Check password ...
-		if (!$row['user_pass_convert'] && phpbb_check_hash($password, $row['user_password']))
-		{
-			// Check for old password hash...
-			if (strlen($row['user_password']) == 32)
-			{
-				$hash = phpbb_hash($password);
-
-				// Update the password in the users table to the new format
-				$sql = 'UPDATE ' . USERS_TABLE . "
-					SET user_password = '" . $this->db->sql_escape($hash) . "',
-						user_pass_convert = 0
-					WHERE user_id = {$row['user_id']}";
-				$this->db->sql_query($sql);
-
-				$row['user_password'] = $hash;
-			}
-
-			$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
-				WHERE user_id = ' . $row['user_id'];
-			$this->db->sql_query($sql);
-
-			if ($row['user_login_attempts'] != 0)
-			{
-				// Successful, reset login attempts (the user passed all stages)
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_login_attempts = 0
-					WHERE user_id = ' . $row['user_id'];
-				$this->db->sql_query($sql);
-			}
-
-			// User inactive...
-			if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_ACTIVE,
-					'error_msg'		=> 'ACTIVE_ERROR',
-					'user_row'		=> $row,
-				);
-			}
-
-			// Successful login... set user_login_attempts to zero...
-			return array(
-				'status'		=> LOGIN_SUCCESS,
-				'error_msg'		=> false,
-				'user_row'		=> $row,
-			);
-		}
-
-		// Password incorrect - increase login attempts
-		$sql = 'UPDATE ' . USERS_TABLE . '
-			SET user_login_attempts = user_login_attempts + 1
-			WHERE user_id = ' . (int) $row['user_id'] . '
-				AND user_login_attempts < ' . LOGIN_ATTEMPTS_MAX;
-		$this->db->sql_query($sql);
-
-		// Give status about wrong password...
-		return array(
-			'status'		=> ($show_captcha) ? LOGIN_ERROR_ATTEMPTS : LOGIN_ERROR_PASSWORD,
-			'error_msg'		=> ($show_captcha) ? 'LOGIN_ERROR_ATTEMPTS' : 'LOGIN_ERROR_PASSWORD',
-			'user_row'		=> $row,
-		);
-	}
-}
diff --git a/phpBB/includes/auth/provider/index.htm b/phpBB/includes/auth/provider/index.htm
deleted file mode 100644
index ee1f723a7d..0000000000
--- a/phpBB/includes/auth/provider/index.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-</body>
-</html>
diff --git a/phpBB/includes/auth/provider/interface.php b/phpBB/includes/auth/provider/interface.php
deleted file mode 100644
index 47043bc107..0000000000
--- a/phpBB/includes/auth/provider/interface.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
-*
-* @package auth
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * The interface authentication provider classes have to implement.
- *
- * @package auth
- */
-interface phpbb_auth_provider_interface
-{
-	/**
-	 * Checks whether the user is currently identified to the authentication
-	 * provider.
-	 * Called in acp_board while setting authentication plugins.
-	 * Changing to an authentication provider will not be permitted in acp_board
-	 * if there is an error.
-	 *
-	 * @return 	boolean|string 	False if the user is identified, otherwise an
-	 *							error message, or null if not implemented.
-	 */
-	public function init();
-
-	/**
-	 * Performs login.
-	 *
-	 * @param	string	$username 	The name of the user being authenticated.
-	 * @param	string	$password	The password of the user.
-	 * @return	array	An associative array of the format:
-	 *						array(
-	 *							'status' => status constant
-	 *							'error_msg' => string
-	 *							'user_row' => array
-	 *						)
-	 */
-	public function login($username, $password);
-
-	/**
-	 * Autologin function
-	 *
-	 * @return 	array|null	containing the user row, empty if no auto login
-	 * 						should take place, or null if not impletmented.
-	 */
-	public function autologin();
-
-	/**
-	 * This function is used to output any required fields in the authentication
-	 * admin panel. It also defines any required configuration table fields.
-	 *
-	 * @return	array|null	Returns null if not implemented or an array of the
-	 *						configuration fields of the provider.
-	 */
-	public function acp();
-
-	/**
-	 * This function updates the template with variables related to the acp
-	 * options with whatever configuraton values are passed to it as an array.
-	 * It then returns the name of the acp file related to this authentication
-	 * provider.
-	 * @param	array	$new_config Contains the new configuration values that
-	 *								have been set in acp_board.
-	 * @return	array|null		Returns null if not implemented or an array with
-	 *							the template file name and an array of the vars
-	 *							that the template needs that must conform to the
-	 *							following example:
-	 *							array(
-	 *								'TEMPLATE_FILE'	=> string,
-	 *								'TEMPLATE_VARS'	=> array(...),
-	 *							)
-	 */
-	public function get_acp_template($new_config);
-
-	/**
-	 * Performs additional actions during logout.
-	 *
-	 * @param 	array	$data			An array corresponding to
-	 *									phpbb_session::data
-	 * @param 	boolean	$new_session	True for a new session, false for no new
-	 *									session.
-	 */
-	public function logout($data, $new_session);
-
-	/**
-	 * The session validation function checks whether the user is still logged
-	 * into phpBB.
-	 *
-	 * @param 	array 	$user
-	 * @return 	boolean	true if the given user is authenticated, false if the 
-	 * 					session should be closed, or null if not implemented.
-	 */
-	public function validate_session($user);
-}
diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
deleted file mode 100644
index 0196529408..0000000000
--- a/phpBB/includes/auth/provider/ldap.php
+++ /dev/null
@@ -1,346 +0,0 @@
-<?php
-/**
-*
-* @package auth
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * Database authentication provider for phpBB3
- *
- * This is for authentication via the integrated user table
- *
- * @package auth
- */
-class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
-{
-	/**
-	 * LDAP Authentication Constructor
-	 *
-	 * @param 	phpbb_db_driver	$db
-	 * @param 	phpbb_config	$config
-	 * @param 	phpbb_user		$user
-	 */
-	public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_user $user)
-	{
-		$this->db = $db;
-		$this->config = $config;
-		$this->user = $user;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function init()
-	{
-		if (!@extension_loaded('ldap'))
-		{
-			return $this->user->lang['LDAP_NO_LDAP_EXTENSION'];
-		}
-
-		$this->config['ldap_port'] = (int) $this->config['ldap_port'];
-		if ($this->config['ldap_port'])
-		{
-			$ldap = @ldap_connect($this->config['ldap_server'], $this->config['ldap_port']);
-		}
-		else
-		{
-			$ldap = @ldap_connect($this->config['ldap_server']);
-		}
-
-		if (!$ldap)
-		{
-			return $this->user->lang['LDAP_NO_SERVER_CONNECTION'];
-		}
-
-		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
-		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
-
-		if ($this->config['ldap_user'] || $this->config['ldap_password'])
-		{
-			if (!@ldap_bind($ldap, htmlspecialchars_decode($this->config['ldap_user']), htmlspecialchars_decode($this->config['ldap_password'])))
-			{
-				return $this->user->lang['LDAP_INCORRECT_USER_PASSWORD'];
-			}
-		}
-
-		// ldap_connect only checks whether the specified server is valid, so the connection might still fail
-		$search = @ldap_search(
-			$ldap,
-			htmlspecialchars_decode($this->config['ldap_base_dn']),
-			$this->ldap_user_filter($this->user->data['username']),
-			(empty($this->config['ldap_email'])) ?
-				array(htmlspecialchars_decode($this->config['ldap_uid'])) :
-				array(htmlspecialchars_decode($this->config['ldap_uid']), htmlspecialchars_decode($this->config['ldap_email'])),
-			0,
-			1
-		);
-
-		if ($search === false)
-		{
-			return $this->user->lang['LDAP_SEARCH_FAILED'];
-		}
-
-		$result = @ldap_get_entries($ldap, $search);
-
-		@ldap_close($ldap);
-
-
-		if (!is_array($result) || sizeof($result) < 2)
-		{
-			return sprintf($this->user->lang['LDAP_NO_IDENTITY'], $this->user->data['username']);
-		}
-
-		if (!empty($this->config['ldap_email']) && !isset($result[0][htmlspecialchars_decode($this->config['ldap_email'])]))
-		{
-			return $this->user->lang['LDAP_NO_EMAIL'];
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function login($username, $password)
-	{
-		// do not allow empty password
-		if (!$password)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_PASSWORD,
-				'error_msg'	=> 'NO_PASSWORD_SUPPLIED',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		if (!$username)
-		{
-			return array(
-				'status'	=> LOGIN_ERROR_USERNAME,
-				'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-				'user_row'	=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		if (!@extension_loaded('ldap'))
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-				'error_msg'		=> 'LDAP_NO_LDAP_EXTENSION',
-				'user_row'		=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		$this->config['ldap_port'] = (int) $this->config['ldap_port'];
-		if ($this->config['ldap_port'])
-		{
-			$ldap = @ldap_connect($this->config['ldap_server'], $this->config['ldap_port']);
-		}
-		else
-		{
-			$ldap = @ldap_connect($this->config['ldap_server']);
-		}
-
-		if (!$ldap)
-		{
-			return array(
-				'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-				'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
-				'user_row'		=> array('user_id' => ANONYMOUS),
-			);
-		}
-
-		@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
-		@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
-
-		if ($this->config['ldap_user'] || $this->config['ldap_password'])
-		{
-			if (!@ldap_bind($ldap, htmlspecialchars_decode($this->config['ldap_user']), htmlspecialchars_decode($this->config['ldap_password'])))
-			{
-				return array(
-					'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
-					'error_msg'		=> 'LDAP_NO_SERVER_CONNECTION',
-					'user_row'		=> array('user_id' => ANONYMOUS),
-				);
-			}
-		}
-
-		$search = @ldap_search(
-			$ldap,
-			htmlspecialchars_decode($this->config['ldap_base_dn']),
-			$this->ldap_user_filter($username),
-			(empty($this->config['ldap_email'])) ?
-				array(htmlspecialchars_decode($this->config['ldap_uid'])) :
-				array(htmlspecialchars_decode($this->config['ldap_uid']), htmlspecialchars_decode($this->config['ldap_email'])),
-			0,
-			1
-		);
-
-		$ldap_result = @ldap_get_entries($ldap, $search);
-
-		if (is_array($ldap_result) && sizeof($ldap_result) > 1)
-		{
-			if (@ldap_bind($ldap, $ldap_result[0]['dn'], htmlspecialchars_decode($password)))
-			{
-				@ldap_close($ldap);
-
-				$sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type
-					FROM ' . USERS_TABLE . "
-					WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($username)) . "'";
-				$result = $this->db->sql_query($sql);
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				if ($row)
-				{
-					unset($ldap_result);
-
-					// User inactive...
-					if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
-					{
-						return array(
-							'status'		=> LOGIN_ERROR_ACTIVE,
-							'error_msg'		=> 'ACTIVE_ERROR',
-							'user_row'		=> $row,
-						);
-					}
-
-					// Successful login... set user_login_attempts to zero...
-					return array(
-						'status'		=> LOGIN_SUCCESS,
-						'error_msg'		=> false,
-						'user_row'		=> $row,
-					);
-				}
-				else
-				{
-					// retrieve default group id
-					$sql = 'SELECT group_id
-						FROM ' . GROUPS_TABLE . "
-						WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "'
-							AND group_type = " . GROUP_SPECIAL;
-					$result = $this->db->sql_query($sql);
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					if (!$row)
-					{
-						trigger_error('NO_GROUP');
-					}
-
-					// generate user account data
-					$ldap_user_row = array(
-						'username'		=> $username,
-						'user_password'	=> phpbb_hash($password),
-						'user_email'	=> (!empty($this->config['ldap_email'])) ? utf8_htmlspecialchars($ldap_result[0][htmlspecialchars_decode($this->config['ldap_email'])][0]) : '',
-						'group_id'		=> (int) $row['group_id'],
-						'user_type'		=> USER_NORMAL,
-						'user_ip'		=> $this->user->ip,
-						'user_new'		=> ($this->config['new_member_post_limit']) ? 1 : 0,
-					);
-
-					unset($ldap_result);
-
-					// this is the user's first login so create an empty profile
-					return array(
-						'status'		=> LOGIN_SUCCESS_CREATE_PROFILE,
-						'error_msg'		=> false,
-						'user_row'		=> $ldap_user_row,
-					);
-				}
-			}
-			else
-			{
-				unset($ldap_result);
-				@ldap_close($ldap);
-
-				// Give status about wrong password...
-				return array(
-					'status'		=> LOGIN_ERROR_PASSWORD,
-					'error_msg'		=> 'LOGIN_ERROR_PASSWORD',
-					'user_row'		=> array('user_id' => ANONYMOUS),
-				);
-			}
-		}
-
-		@ldap_close($ldap);
-
-		return array(
-			'status'	=> LOGIN_ERROR_USERNAME,
-			'error_msg'	=> 'LOGIN_ERROR_USERNAME',
-			'user_row'	=> array('user_id' => ANONYMOUS),
-		);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-
-	public function acp()
-	{
-		// These are fields required in the config table
-		return array(
-			'ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password',
-		);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function get_acp_template($new_config)
-	{
-		return array(
-			'TEMPLATE_FILE'	=> 'auth_provider_ldap.html',
-			'TEMPLATE_VARS'	=> array(
-				'AUTH_LDAP_DN'			=> $new_config['ldap_base_dn'],
-				'AUTH_LDAP_EMAIL'		=> $new_config['ldap_email'],
-				'AUTH_LDAP_PASSORD'		=> $new_config['ldap_password'],
-				'AUTH_LDAP_PORT'		=> $new_config['ldap_port'],
-				'AUTH_LDAP_SERVER'		=> $new_config['ldap_server'],
-				'AUTH_LDAP_UID'			=> $new_config['ldap_uid'],
-				'AUTH_LDAP_USER'		=> $new_config['ldap_user'],
-				'AUTH_LDAP_USER_FILTER'	=> $new_config['ldap_user_filter'],
-			),
-		);
-	}
-
-	/**
-	 * Generates a filter string for ldap_search to find a user
-	 *
-	 * @param	$username	string	Username identifying the searched user
-	 *
-	 * @return				string	A filter string for ldap_search
-	 */
-	private function ldap_user_filter($username)
-	{
-		$filter = '(' . $this->config['ldap_uid'] . '=' . $this->ldap_escape(htmlspecialchars_decode($username)) . ')';
-		if ($this->config['ldap_user_filter'])
-		{
-			$_filter = ($this->config['ldap_user_filter'][0] == '(' && substr($this->config['ldap_user_filter'], -1) == ')') ? $this->config['ldap_user_filter'] : "({$this->config['ldap_user_filter']})";
-			$filter = "(&{$filter}{$_filter})";
-		}
-		return $filter;
-	}
-
-	/**
-	 * Escapes an LDAP AttributeValue
-	 *
-	 * @param	string	$string	The string to be escaped
-	 * @return	string	The escaped string
-	 */
-	private function ldap_escape($string)
-	{
-		return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string);
-	}
-}
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
deleted file mode 100644
index 29c58d4e62..0000000000
--- a/phpBB/includes/avatar/driver/driver.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base class for avatar drivers
-* @package phpBB3
-*/
-abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
-{
-	/**
-	* Avatar driver name
-	* @var string
-	*/
-	protected $name;
-
-	/**
-	* Current board configuration
-	* @var phpbb_config
-	*/
-	protected $config;
-
-	/**
-	* Current $phpbb_root_path
-	* @var string
-	*/
-	protected $phpbb_root_path;
-
-	/**
-	* Current $php_ext
-	* @var string
-	*/
-	protected $php_ext;
-
-	/**
-	* Cache driver
-	* @var phpbb_cache_driver_interface
-	*/
-	protected $cache;
-
-	/**
-	* Array of allowed avatar image extensions
-	* Array is used for setting the allowed extensions in the fileupload class
-	* and as a base for a regex of allowed extensions, which will be formed by
-	* imploding the array with a "|".
-	*
-	* @var array
-	*/
-	protected $allowed_extensions = array(
-		'gif',
-		'jpg',
-		'jpeg',
-		'png',
-	);
-
-	/**
-	* Construct a driver object
-	*
-	* @param phpbb_config $config phpBB configuration
-	* @param phpbb_request $request Request object
-	* @param string $phpbb_root_path Path to the phpBB root
-	* @param string $php_ext PHP file extension
-	* @param phpbb_cache_driver_interface $cache Cache driver
-	*/
-	public function __construct(phpbb_config $config, $phpbb_root_path, $php_ext, phpbb_cache_driver_interface $cache = null)
-	{
-		$this->config = $config;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->cache = $cache;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_custom_html($user, $row, $alt = '')
-	{
-		return '';
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form_acp($user)
-	{
-		return array();
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function delete($row)
-	{
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_template_name()
-	{
-		$driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this));
-		$template = "ucp_avatar_options_$driver.html";
-
-		return $template;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_name()
-	{
-		return $this->name;
-	}
-
-	/**
-	* Sets the name of the driver.
-	*
-	* @param string	$name Driver name
-	*/
-	public function set_name($name)
-	{
-		$this->name = $name;
-	}
-}
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
deleted file mode 100644
index d559da1c0d..0000000000
--- a/phpBB/includes/avatar/driver/gravatar.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars hosted at gravatar.com
-* @package phpBB3
-*/
-class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
-{
-	/**
-	* The URL for the gravatar service
-	*/
-	const GRAVATAR_URL = '//secure.gravatar.com/avatar/';
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row)
-	{
-		return array(
-			'src' => $row['avatar'],
-			'width' => $row['avatar_width'],
-			'height' => $row['avatar_height'],
-		);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_custom_html($user, $row, $alt = '')
-	{
-		return '<img src="' . $this->get_gravatar_url($row) . '" ' .
-			($row['avatar_width'] ? ('width="' . $row['avatar_width'] . '" ') : '') .
-			($row['avatar_height'] ? ('height="' . $row['avatar_height'] . '" ') : '') .
-			'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($request, $template, $user, $row, &$error)
-	{
-		$template->assign_vars(array(
-			'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_gravatar_width', 0),
-			'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_gravatar_width', 0),
-			'AVATAR_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
-		));
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($request, $template, $user, $row, &$error)
-	{
-		$row['avatar'] = $request->variable('avatar_gravatar_email', '');
-		$row['avatar_width'] = $request->variable('avatar_gravatar_width', 0);
-		$row['avatar_height'] = $request->variable('avatar_gravatar_height', 0);
-
-		if (!function_exists('validate_data'))
-		{
-			require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-		}
-
-		$validate_array = validate_data(
-			array(
-				'email' => $row['avatar'],
-			),
-			array(
-				'email' => array(
-					array('string', false, 6, 60),
-					array('email'))
-			)
-		);
-
-		$error = array_merge($error, $validate_array);
-
-		if (!empty($error))
-		{
-			return false;
-		}
-
-		// Make sure getimagesize works...
-		if (function_exists('getimagesize') && ($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0))
-		{
-			/**
-			* default to the minimum of the maximum allowed avatar size if the size
-			* is not or only partially entered
-			*/
-			$row['avatar_width'] = $row['avatar_height'] = min($this->config['avatar_max_width'], $this->config['avatar_max_height']);
-			$url = $this->get_gravatar_url($row);
-
-			if (($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0) && (($image_data = getimagesize($url)) === false))
-			{
-				$error[] = 'UNABLE_GET_IMAGE_SIZE';
-				return false;
-			}
-
-			if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
-			{
-				$error[] = 'AVATAR_NO_SIZE';
-				return false;
-			}
-
-			$row['avatar_width'] = ($row['avatar_width'] && $row['avatar_height']) ? $row['avatar_width'] : $image_data[0];
-			$row['avatar_height'] = ($row['avatar_width'] && $row['avatar_height']) ? $row['avatar_height'] : $image_data[1];
-		}
-
-		if ($row['avatar_width'] <= 0 || $row['avatar_height'] <= 0)
-		{
-			$error[] = 'AVATAR_NO_SIZE';
-			return false;
-		}
-
-		if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
-		{
-			if ($row['avatar_width'] > $this->config['avatar_max_width'] || $row['avatar_height'] > $this->config['avatar_max_height'])
-			{
-				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $row['avatar_width'], $row['avatar_height']);
-				return false;
-			}
-		}
-
-		if ($this->config['avatar_min_width'] || $this->config['avatar_min_height'])
-		{
-			if ($row['avatar_width'] < $this->config['avatar_min_width'] || $row['avatar_height'] < $this->config['avatar_min_height'])
-			{
-				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $row['avatar_width'], $row['avatar_height']);
-				return false;
-			}
-		}
-
-		return array(
-			'avatar' => $row['avatar'],
-			'avatar_width' => $row['avatar_width'],
-			'avatar_height' => $row['avatar_height'],
-		);
-	}
-
-	/**
-	* Build gravatar URL for output on page
-	*
-	* @return string Gravatar URL
-	*/
-	protected function get_gravatar_url($row)
-	{
-		$url = self::GRAVATAR_URL;
-		$url .=  md5(strtolower(trim($row['avatar'])));
-
-		if ($row['avatar_width'] || $row['avatar_height'])
-		{
-			$url .= '?s=' . max($row['avatar_width'], $row['avatar_height']);
-		}
-
-		return $url;
-	}
-}
diff --git a/phpBB/includes/avatar/driver/interface.php b/phpBB/includes/avatar/driver/interface.php
deleted file mode 100644
index 3d62969aef..0000000000
--- a/phpBB/includes/avatar/driver/interface.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Interface for avatar drivers
-* @package phpBB3
-*/
-interface phpbb_avatar_driver_interface
-{
-	/**
-	* Returns the name of the driver.
-	*
-	* @return string	Name of driver.
-	*/
-	public function get_name();
-
-	/**
-	* Get the avatar url and dimensions
-	*
-	* @param array	$row User data or group data that has been cleaned with
-	*        phpbb_avatar_manager::clean_row
-	* @return array Avatar data, must have keys src, width and height, e.g.
-	*        ['src' => '', 'width' => 0, 'height' => 0]
-	*/
-	public function get_data($row);
-
-	/**
-	* Returns custom html if it is needed for displaying this avatar
-	*
-	* @param phpbb_user $user phpBB user object
-	* @param array	$row User data or group data that has been cleaned with
-	*        phpbb_avatar_manager::clean_row
-	* @param string $alt Alternate text for avatar image
-	*
-	* @return string HTML
-	*/
-	public function get_custom_html($user, $row, $alt = '');
-
-	/**
-	* Prepare form for changing the settings of this avatar
-	*
-	* @param phpbb_request $request Request object
-	* @param phpbb_template	$template Template object
-	* @param phpbb_user $user User object
-	* @param array	$row User data or group data that has been cleaned with
-	*        phpbb_avatar_manager::clean_row
-	* @param array	&$error Reference to an error array that is filled by this
-	*        function. Key values can either be a string with a language key or
-	*        an array that will be passed to vsprintf() with the language key in
-	*        the first array key.
-	*
-	* @return bool True if form has been successfully prepared
-	*/
-	public function prepare_form($request, $template, $user, $row, &$error);
-
-	/**
-	* Prepare form for changing the acp settings of this avatar
-	*
-	* @param phpbb_user $user phpBB user object
-	*
-	* @return array Array of configuration options as consumed by acp_board.
-	*        The setting for enabling/disabling the avatar will be handled by
-	*        the avatar manager.
-	*/
-	public function prepare_form_acp($user);
-
-	/**
-	* Process form data
-	*
-	* @param phpbb_request $request Request object
-	* @param phpbb_template	$template Template object
-	* @param phpbb_user $user User object
-	* @param array	$row User data or group data that has been cleaned with
-	*        phpbb_avatar_manager::clean_row
-	* @param array	&$error Reference to an error array that is filled by this
-	*        function. Key values can either be a string with a language key or
-	*        an array that will be passed to vsprintf() with the language key in
-	*        the first array key.
-	*
-	* @return array Array containing the avatar data as follows:
-	*        ['avatar'], ['avatar_width'], ['avatar_height']
-	*/
-	public function process_form($request, $template, $user, $row, &$error);
-
-	/**
-	* Delete avatar
-	*
-	* @param array $row User data or group data that has been cleaned with
-	*        phpbb_avatar_manager::clean_row
-	*
-	* @return bool True if avatar has been deleted or there is no need to delete,
-	*        i.e. when the avatar is not hosted locally.
-	*/
-	public function delete($row);
-
-	/**
-	* Get the avatar driver's template name
-	*
-	* @return string Avatar driver's template name
-	*/
-	public function get_template_name();
-}
diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php
deleted file mode 100644
index f4bcd4ce74..0000000000
--- a/phpBB/includes/avatar/driver/local.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars selected from the board gallery
-* @package phpBB3
-*/
-class phpbb_avatar_driver_local extends phpbb_avatar_driver
-{
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row)
-	{
-		return array(
-			'src' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],
-			'width' => $row['avatar_width'],
-			'height' => $row['avatar_height'],
-		);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($request, $template, $user, $row, &$error)
-	{
-		$avatar_list = $this->get_avatar_list($user);
-		$category = $request->variable('avatar_local_cat', '');
-
-		foreach ($avatar_list as $cat => $null)
-		{
-			if (!empty($avatar_list[$cat]))
-			{
-				$template->assign_block_vars('avatar_local_cats', array(
-					'NAME' => $cat,
-					'SELECTED' => ($cat == $category),
-				));
-			}
-
-			if ($cat != $category)
-			{
-				unset($avatar_list[$cat]);
-			}
-		}
-
-		if (!empty($avatar_list[$category]))
-		{
-			$template->assign_vars(array(
-				'AVATAR_LOCAL_SHOW' => true,
-			));
-
-			$table_cols = isset($row['avatar_gallery_cols']) ? $row['avatar_gallery_cols'] : 4;
-			$row_count = $col_count = $avatar_pos = 0;
-			$avatar_count = sizeof($avatar_list[$category]);
-
-			reset($avatar_list[$category]);
-
-			while ($avatar_pos < $avatar_count)
-			{
-				$img = current($avatar_list[$category]);
-				next($avatar_list[$category]);
-
-				if ($col_count == 0)
-				{
-					++$row_count;
-					$template->assign_block_vars('avatar_local_row', array(
-					));
-				}
-
-				$template->assign_block_vars('avatar_local_row.avatar_local_col', array(
-					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
-					'AVATAR_NAME' 	=> $img['name'],
-					'AVATAR_FILE' 	=> $img['filename'],
-				));
-
-				$template->assign_block_vars('avatar_local_row.avatar_local_option', array(
-					'AVATAR_FILE' 		=> $img['filename'],
-					'S_OPTIONS_AVATAR'	=> $img['filename']
-				));
-
-				$col_count = ($col_count + 1) % $table_cols;
-
-				++$avatar_pos;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form_acp($user)
-	{
-		return array(
-			'avatar_gallery_path'	=> array('lang' => 'AVATAR_GALLERY_PATH',	'validate' => 'rpath',	'type' => 'text:20:255', 'explain' => true),
-		);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($request, $template, $user, $row, &$error)
-	{
-		$avatar_list = $this->get_avatar_list($user);
-		$category = $request->variable('avatar_local_cat', '');
-
-		$file = $request->variable('avatar_local_file', '');
-
-		if (empty($category) || empty($file))
-		{
-			$error[] = 'NO_AVATAR_SELECTED';
-			return false;
-		}
-
-		if (!isset($avatar_list[$category][urldecode($file)]))
-		{
-			$error[] = 'AVATAR_URL_NOT_FOUND';
-			return false;
-		}
-
-		return array(
-			'avatar' => ($category != $user->lang['MAIN']) ? $category . '/' . $file : $file,
-			'avatar_width' => $avatar_list[$category][urldecode($file)]['width'],
-			'avatar_height' => $avatar_list[$category][urldecode($file)]['height'],
-		);
-	}
-
-	/**
-	* Get a list of avatars that are locally available
-	* Results get cached for 24 hours (86400 seconds)
-	*
-	* @param phpbb_user $user User object
-	*
-	* @return array Array containing the locally available avatars
-	*/
-	protected function get_avatar_list($user)
-	{
-		$avatar_list = ($this->cache == null) ? false : $this->cache->get('avatar_local_list');
-
-		if ($avatar_list === false)
-		{
-			$avatar_list = array();
-			$path = $this->phpbb_root_path . $this->config['avatar_gallery_path'];
-
-			$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS | FilesystemIterator::UNIX_PATHS), RecursiveIteratorIterator::SELF_FIRST);
-			foreach ($iterator as $file_info)
-			{
-				$file_path = $file_info->getPath();
-				$image = $file_info->getFilename();
-
-				// Match all images in the gallery folder
-				if (preg_match('#^[^&\'"<>]+\.(?:' . implode('|', $this->allowed_extensions) . ')$#i', $image) && is_file($file_path . '/' . $image))
-				{
-					if (function_exists('getimagesize'))
-					{
-						$dims = getimagesize($file_path . '/' . $image);
-					}
-					else
-					{
-						$dims = array(0, 0);
-					}
-					$cat = ($path == $file_path) ? $user->lang['MAIN'] : str_replace("$path/", '', $file_path);
-					$avatar_list[$cat][$image] = array(
-						'file'      => ($cat != $user->lang['MAIN']) ? rawurlencode($cat) . '/' . rawurlencode($image) : rawurlencode($image),
-						'filename'  => rawurlencode($image),
-						'name'      => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
-						'width'     => $dims[0],
-						'height'    => $dims[1],
-					);
-				}
-			}
-			ksort($avatar_list);
-
-			if ($this->cache != null)
-			{
-				$this->cache->put('avatar_local_list', $avatar_list, 86400);
-			}
-		}
-
-		return $avatar_list;
-	}
-}
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
deleted file mode 100644
index 7da58107a1..0000000000
--- a/phpBB/includes/avatar/driver/remote.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars hosted remotely
-* @package phpBB3
-*/
-class phpbb_avatar_driver_remote extends phpbb_avatar_driver
-{
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row)
-	{
-		return array(
-			'src' => $row['avatar'],
-			'width' => $row['avatar_width'],
-			'height' => $row['avatar_height'],
-		);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($request, $template, $user, $row, &$error)
-	{
-		$template->assign_vars(array(
-			'AVATAR_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_remote_width', 0),
-			'AVATAR_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_remote_width', 0),
-			'AVATAR_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '',
-		));
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($request, $template, $user, $row, &$error)
-	{
-		$url = $request->variable('avatar_remote_url', '');
-		$width = $request->variable('avatar_remote_width', 0);
-		$height = $request->variable('avatar_remote_height', 0);
-
-		if (!preg_match('#^(http|https|ftp)://#i', $url))
-		{
-			$url = 'http://' . $url;
-		}
-
-		if (!function_exists('validate_data'))
-		{
-			require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-		}
-
-		$validate_array = validate_data(
-			array(
-				'url' => $url,
-			),
-			array(
-				'url' => array('string', true, 5, 255),
-			)
-		);
-
-		$error = array_merge($error, $validate_array);
-
-		if (!empty($error))
-		{
-			return false;
-		}
-
-		// Check if this url looks alright
-		// This isn't perfect, but it's what phpBB 3.0 did, and might as well make sure everything is compatible
-		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.('. implode('|', $this->allowed_extensions) . ')$#i', $url))
-		{
-			$error[] = 'AVATAR_URL_INVALID';
-			return false;
-		}
-
-		// Make sure getimagesize works...
-		if (function_exists('getimagesize'))
-		{
-			if (($width <= 0 || $height <= 0) && (($image_data = getimagesize($url)) === false))
-			{
-				$error[] = 'UNABLE_GET_IMAGE_SIZE';
-				return false;
-			}
-
-			if (!empty($image_data) && ($image_data[0] <= 0 || $image_data[1] <= 0))
-			{
-				$error[] = 'AVATAR_NO_SIZE';
-				return false;
-			}
-
-			$width = ($width && $height) ? $width : $image_data[0];
-			$height = ($width && $height) ? $height : $image_data[1];
-		}
-
-		if ($width <= 0 || $height <= 0)
-		{
-			$error[] = 'AVATAR_NO_SIZE';
-			return false;
-		}
-
-		if (!class_exists('fileupload'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_upload.' . $this->php_ext);
-		}
-
-		$types = fileupload::image_types();
-		$extension = strtolower(filespec::get_extension($url));
-
-		if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
-		{
-			if (!isset($types[$image_data[2]]))
-			{
-				$error[] = 'UNABLE_GET_IMAGE_SIZE';
-			}
-			else
-			{
-				$error[] = array('IMAGE_FILETYPE_MISMATCH', $types[$image_data[2]][0], $extension);
-			}
-
-			return false;
-		}
-
-		if ($this->config['avatar_max_width'] || $this->config['avatar_max_height'])
-		{
-			if ($width > $this->config['avatar_max_width'] || $height > $this->config['avatar_max_height'])
-			{
-				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
-				return false;
-			}
-		}
-
-		if ($this->config['avatar_min_width'] || $this->config['avatar_min_height'])
-		{
-			if ($width < $this->config['avatar_min_width'] || $height < $this->config['avatar_min_height'])
-			{
-				$error[] = array('AVATAR_WRONG_SIZE', $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], $width, $height);
-				return false;
-			}
-		}
-
-		return array(
-			'avatar' => $url,
-			'avatar_width' => $width,
-			'avatar_height' => $height,
-		);
-	}
-}
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
deleted file mode 100644
index 685ac4f349..0000000000
--- a/phpBB/includes/avatar/driver/upload.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Handles avatars uploaded to the board
-* @package phpBB3
-*/
-class phpbb_avatar_driver_upload extends phpbb_avatar_driver
-{
-	/**
-	* @inheritdoc
-	*/
-	public function get_data($row, $ignore_config = false)
-	{
-		return array(
-			'src' => $this->phpbb_root_path . 'download/file.' . $this->php_ext . '?avatar=' . $row['avatar'],
-			'width' => $row['avatar_width'],
-			'height' => $row['avatar_height'],
-		);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form($request, $template, $user, $row, &$error)
-	{
-		if (!$this->can_upload())
-		{
-			return false;
-		}
-
-		$template->assign_vars(array(
-			'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
-			'AVATAR_UPLOAD_SIZE' => $this->config['avatar_filesize'],
-		));
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function process_form($request, $template, $user, $row, &$error)
-	{
-		if (!$this->can_upload())
-		{
-			return false;
-		}
-
-		if (!class_exists('fileupload'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_upload.' . $this->php_ext);
-		}
-
-		$upload = new fileupload('AVATAR_', $this->allowed_extensions, $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
-
-		$url = $request->variable('avatar_upload_url', '');
-		$upload_file = $request->file('avatar_upload_file');
-
-		if (!empty($upload_file['name']))
-		{
-			$file = $upload->form_upload('avatar_upload_file');
-		}
-		elseif (!empty($this->config['allow_avatar_remote_upload']) && !empty($url))
-		{
-			if (!preg_match('#^(http|https|ftp)://#i', $url))
-			{
-				$url = 'http://' . $url;
-			}
-
-			if (!function_exists('validate_data'))
-			{
-				require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-			}
-
-			$validate_array = validate_data(
-				array(
-					'url' => $url,
-				),
-				array(
-					'url' => array('string', true, 5, 255),
-				)
-			);
-
-			$error = array_merge($error, $validate_array);
-
-			if (!empty($error))
-			{
-				return false;
-			}
-
-			$file = $upload->remote_upload($url);
-		}
-		else
-		{
-			$error[] = 'NO_AVATAR_SELECTED';
-			return false;
-		}
-
-		$prefix = $this->config['avatar_salt'] . '_';
-		$file->clean_filename('avatar', $prefix, $row['id']);
-
-		$destination = $this->config['avatar_path'];
-
-		// Adjust destination path (no trailing slash)
-		if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
-		{
-			$destination = substr($destination, 0, -1);
-		}
-
-		$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
-		if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
-		{
-			$destination = '';
-		}
-
-		// Move file and overwrite any existing image
-		$file->move_file($destination, true);
-
-		if (sizeof($file->error))
-		{
-			$file->remove();
-			$error = array_merge($error, $file->error);
-			return false;
-		}
-
-		return array(
-			'avatar' => $row['id'] . '_' . time() . '.' . $file->get('extension'),
-			'avatar_width' => $file->get('width'),
-			'avatar_height' => $file->get('height'),
-		);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function prepare_form_acp($user)
-	{
-		return array(
-			'allow_avatar_remote_upload'=> array('lang' => 'ALLOW_REMOTE_UPLOAD', 'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-			'avatar_filesize'		=> array('lang' => 'MAX_FILESIZE',			'validate' => 'int:0',	'type' => 'number:0', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
-			'avatar_path'			=> array('lang' => 'AVATAR_STORAGE_PATH',	'validate' => 'rwpath',	'type' => 'text:20:255', 'explain' => true),
-		);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function delete($row)
-	{
-		$ext = substr(strrchr($row['avatar'], '.'), 1);
-		$filename = $this->phpbb_root_path . $this->config['avatar_path'] . '/' . $this->config['avatar_salt'] . '_' . $row['id'] . '.' . $ext;
-
-		if (file_exists($filename))
-		{
-			@unlink($filename);
-		}
-
-		return true;
-	}
-
-	/**
-	* Check if user is able to upload an avatar
-	*
-	* @return bool True if user can upload, false if not
-	*/
-	protected function can_upload()
-	{
-		return (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && phpbb_is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on'));
-	}
-}
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
deleted file mode 100644
index 58d994c3c0..0000000000
--- a/phpBB/includes/avatar/manager.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package avatar
-*/
-class phpbb_avatar_manager
-{
-	/**
-	* phpBB configuration
-	* @var phpbb_config
-	*/
-	protected $config;
-
-	/**
-	* Array that contains a list of enabled drivers
-	* @var array
-	*/
-	static protected $enabled_drivers = false;
-
-	/**
-	* Array that contains all available avatar drivers which are passed via the
-	* service container
-	* @var array
-	*/
-	protected $avatar_drivers;
-
-	/**
-	* Service container object
-	* @var object
-	*/
-	protected $container;
-
-	/**
-	* Default avatar data row
-	* @var array
-	*/
-	static protected $default_row = array(
-		'avatar'		=> '',
-		'avatar_type'	=> '',
-		'avatar_width'	=> '',
-		'avatar_height'	=> '',
-	);
-
-	/**
-	* Construct an avatar manager object
-	*
-	* @param phpbb_config $config phpBB configuration
-	* @param array $avatar_drivers Avatar drivers passed via the service container
-	* @param object $container Container object
-	*/
-	public function __construct(phpbb_config $config, $avatar_drivers, $container)
-	{
-		$this->config = $config;
-		$this->avatar_drivers = $avatar_drivers;
-		$this->container = $container;
-	}
-
-	/**
-	* Get the driver object specified by the avatar type
-	*
-	* @param string $avatar_type Avatar type; by default an avatar's service container name
-	* @param bool $load_enabled Load only enabled avatars
-	*
-	* @return object Avatar driver object
-	*/
-	public function get_driver($avatar_type, $load_enabled = true)
-	{
-		if (self::$enabled_drivers === false)
-		{
-			$this->load_enabled_drivers();
-		}
-
-		$avatar_drivers = ($load_enabled) ? self::$enabled_drivers : $this->get_all_drivers();
-
-		// Legacy stuff...
-		switch ($avatar_type)
-		{
-			case AVATAR_GALLERY:
-				$avatar_type = 'avatar.driver.local';
-			break;
-			case AVATAR_UPLOAD:
-				$avatar_type = 'avatar.driver.upload';
-			break;
-			case AVATAR_REMOTE:
-				$avatar_type = 'avatar.driver.remote';
-			break;
-		}
-
-		if (!isset($avatar_drivers[$avatar_type]))
-		{
-			return null;
-		}
-
-		/*
-		* There is no need to handle invalid avatar types as the following code
-		* will cause a ServiceNotFoundException if the type does not exist
-		*/
-		$driver = $this->container->get($avatar_type);
-
-		return $driver;
-	}
-
-	/**
-	* Load the list of enabled drivers
-	* This is executed once and fills self::$enabled_drivers
-	*/
-	protected function load_enabled_drivers()
-	{
-		if (!empty($this->avatar_drivers))
-		{
-			self::$enabled_drivers = array();
-			foreach ($this->avatar_drivers as $driver)
-			{
-				if ($this->is_enabled($driver))
-				{
-					self::$enabled_drivers[$driver->get_name()] = $driver->get_name();
-				}
-			}
-			asort(self::$enabled_drivers);
-		}
-	}
-
-	/**
-	* Get a list of all avatar drivers
-	*
-	* As this function will only be called in the ACP avatar settings page, it
-	* doesn't make much sense to cache the list of all avatar drivers like the
-	* list of the enabled drivers.
-	*
-	* @return array Array containing a list of all avatar drivers
-	*/
-	public function get_all_drivers()
-	{
-		$drivers = array();
-
-		if (!empty($this->avatar_drivers))
-		{
-			foreach ($this->avatar_drivers as $driver)
-			{
-				$drivers[$driver->get_name()] = $driver->get_name();
-			}
-			asort($drivers);
-		}
-
-		return $drivers;
-	}
-
-	/**
-	* Get a list of enabled avatar drivers
-	*
-	* @return array Array containing a list of the enabled avatar drivers
-	*/
-	public function get_enabled_drivers()
-	{
-		if (self::$enabled_drivers === false)
-		{
-			$this->load_enabled_drivers();
-		}
-
-		return self::$enabled_drivers;
-	}
-
-	/**
-	* Strip out user_ and group_ prefixes from keys
-	*
-	* @param array	$row User data or group data
-	*
-	* @return array User data or group data with keys that have been
-	*        stripped from the preceding "user_" or "group_"
-	*/
-	static public function clean_row($row)
-	{
-		// Upon creation of a user/group $row might be empty
-		if (empty($row))
-		{
-			return self::$default_row;
-		}
-
-		$keys = array_keys($row);
-		$values = array_values($row);
-
-		$keys = array_map(array('phpbb_avatar_manager', 'strip_prefix'), $keys);
-
-		return array_combine($keys, $values);
-	}
-
-	/**
-	* Strip prepending user_ or group_ prefix from key
-	*
-	* @param string Array key
-	* @return string Key that has been stripped from its prefix
-	*/
-	static protected function strip_prefix($key)
-	{
-		return preg_replace('#^(?:user_|group_)#', '', $key);
-	}
-
-	/**
-	* Clean driver names that are returned from template files
-	* Underscores are replaced with dots
-	*
-	* @param string $name Driver name
-	*
-	* @return string Cleaned driver name
-	*/
-	static public function clean_driver_name($name)
-	{
-		return str_replace('_', '.', $name);
-	}
-
-	/**
-	* Prepare driver names for use in template files
-	* Dots are replaced with underscores
-	*
-	* @param string $name Clean driver name
-	*
-	* @return string Prepared driver name
-	*/
-	static public function prepare_driver_name($name)
-	{
-		return str_replace('.', '_', $name);
-	}
-
-	/**
-	* Check if avatar is enabled
-	*
-	* @param object $driver Avatar driver object
-	*
-	* @return bool True if avatar is enabled, false if it's disabled
-	*/
-	public function is_enabled($driver)
-	{
-		$config_name = $this->get_driver_config_name($driver);
-
-		return $this->config["allow_avatar_{$config_name}"];
-	}
-
-	/**
-	* Get the settings array for enabling/disabling an avatar driver
-	*
-	* @param object $driver Avatar driver object
-	*
-	* @return array Array of configuration options as consumed by acp_board
-	*/
-	public function get_avatar_settings($driver)
-	{
-		$config_name = $this->get_driver_config_name($driver);
-
-		return array(
-			'allow_avatar_' . $config_name	=> array('lang' => 'ALLOW_' . strtoupper($config_name),		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
-		);
-	}
-
-	/**
-	* Get the config name of an avatar driver
-	*
-	* @param object $driver Avatar driver object
-	*
-	* @return string Avatar driver config name
-	*/
-	public function get_driver_config_name($driver)
-	{
-		return preg_replace('#^phpbb_avatar_driver_#', '', get_class($driver));
-	}
-
-	/**
-	* Replace "error" strings with their real, localized form
-	*
-	* @param phpbb_user phpBB User object
-	* @param array	$error Array containing error strings
-	*        Key values can either be a string with a language key or an array
-	*        that will be passed to vsprintf() with the language key in the
-	*        first array key.
-	*
-	* @return array Array containing the localized error strings
-	*/
-	public function localize_errors(phpbb_user $user, $error)
-	{
-		foreach ($error as $key => $lang)
-		{
-			if (is_array($lang))
-			{
-				$lang_key = array_shift($lang);
-				$error[$key] = vsprintf($user->lang($lang_key), $lang);
-			}
-			else
-			{
-				$error[$key] = $user->lang("$lang");
-			}
-		}
-
-		return $error;
-	}
-}
diff --git a/phpBB/includes/cache/driver/apc.php b/phpBB/includes/cache/driver/apc.php
deleted file mode 100644
index 0516b669c8..0000000000
--- a/phpBB/includes/cache/driver/apc.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2005, 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ACM for APC
-* @package acm
-*/
-class phpbb_cache_driver_apc extends phpbb_cache_driver_memory
-{
-	var $extension = 'apc';
-
-	/**
-	* Purge cache data
-	*
-	* @return null
-	*/
-	function purge()
-	{
-		apc_clear_cache('user');
-
-		parent::purge();
-	}
-
-	/**
-	* Fetch an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return mixed Cached data
-	*/
-	function _read($var)
-	{
-		return apc_fetch($this->key_prefix . $var);
-	}
-
-	/**
-	* Store data in the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @param mixed $data Data to store
-	* @param int $ttl Time-to-live of cached data
-	* @return bool True if the operation succeeded
-	*/
-	function _write($var, $data, $ttl = 2592000)
-	{
-		return apc_store($this->key_prefix . $var, $data, $ttl);
-	}
-
-	/**
-	* Remove an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return bool True if the operation succeeded
-	*/
-	function _delete($var)
-	{
-		return apc_delete($this->key_prefix . $var);
-	}
-}
diff --git a/phpBB/includes/cache/driver/base.php b/phpBB/includes/cache/driver/base.php
deleted file mode 100644
index 32e04f813a..0000000000
--- a/phpBB/includes/cache/driver/base.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package acm
-*/
-abstract class phpbb_cache_driver_base implements phpbb_cache_driver_interface
-{
-}
diff --git a/phpBB/includes/cache/driver/eaccelerator.php b/phpBB/includes/cache/driver/eaccelerator.php
deleted file mode 100644
index 257b90c76e..0000000000
--- a/phpBB/includes/cache/driver/eaccelerator.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2005, 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ACM for eAccelerator
-* @package acm
-* @todo Missing locks from destroy() talk with David
-*/
-class phpbb_cache_driver_eaccelerator extends phpbb_cache_driver_memory
-{
-	var $extension = 'eaccelerator';
-	var $function = 'eaccelerator_get';
-
-	var $serialize_header = '#phpbb-serialized#';
-
-	/**
-	* Purge cache data
-	*
-	* @return null
-	*/
-	function purge()
-	{
-		foreach (eaccelerator_list_keys() as $var)
-		{
-			// @todo Check why the substr()
-			// @todo Only unset vars matching $this->key_prefix
-			eaccelerator_rm(substr($var['name'], 1));
-		}
-
-		parent::purge();
-	}
-
-	/**
-	 * Perform cache garbage collection
-	 *
-	 * @return null
-	 */
-	function tidy()
-	{
-		eaccelerator_gc();
-
-		set_config('cache_last_gc', time(), true);
-	}
-
-	/**
-	* Fetch an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return mixed Cached data
-	*/
-	function _read($var)
-	{
-		$result = eaccelerator_get($this->key_prefix . $var);
-
-		if ($result === null)
-		{
-			return false;
-		}
-
-		// Handle serialized objects
-		if (is_string($result) && strpos($result, $this->serialize_header . 'O:') === 0)
-		{
-			$result = unserialize(substr($result, strlen($this->serialize_header)));
-		}
-
-		return $result;
-	}
-
-	/**
-	* Store data in the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @param mixed $data Data to store
-	* @param int $ttl Time-to-live of cached data
-	* @return bool True if the operation succeeded
-	*/
-	function _write($var, $data, $ttl = 2592000)
-	{
-		// Serialize objects and make them easy to detect
-		$data = (is_object($data)) ? $this->serialize_header . serialize($data) : $data;
-
-		return eaccelerator_put($this->key_prefix . $var, $data, $ttl);
-	}
-
-	/**
-	* Remove an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return bool True if the operation succeeded
-	*/
-	function _delete($var)
-	{
-		return eaccelerator_rm($this->key_prefix . $var);
-	}
-}
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php
deleted file mode 100644
index 85decbe3e8..0000000000
--- a/phpBB/includes/cache/driver/file.php
+++ /dev/null
@@ -1,740 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2005, 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ACM File Based Caching
-* @package acm
-*/
-class phpbb_cache_driver_file extends phpbb_cache_driver_base
-{
-	var $vars = array();
-	var $var_expires = array();
-	var $is_modified = false;
-
-	var $sql_rowset = array();
-	var $sql_row_pointer = array();
-	var $cache_dir = '';
-
-	/**
-	* Set cache path
-	*/
-	function __construct($cache_dir = null)
-	{
-		global $phpbb_root_path;
-		$this->cache_dir = !is_null($cache_dir) ? $cache_dir : $phpbb_root_path . 'cache/';
-	}
-
-	/**
-	* Load global cache
-	*/
-	function load()
-	{
-		return $this->_read('data_global');
-	}
-
-	/**
-	* Unload cache object
-	*/
-	function unload()
-	{
-		$this->save();
-		unset($this->vars);
-		unset($this->var_expires);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
-		$this->var_expires = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
-	}
-
-	/**
-	* Save modified objects
-	*/
-	function save()
-	{
-		if (!$this->is_modified)
-		{
-			return;
-		}
-
-		global $phpEx;
-
-		if (!$this->_write('data_global'))
-		{
-			if (!function_exists('phpbb_is_writable'))
-			{
-				global $phpbb_root_path;
-				include($phpbb_root_path . 'includes/functions.' . $phpEx);
-			}
-
-			// Now, this occurred how often? ... phew, just tell the user then...
-			if (!phpbb_is_writable($this->cache_dir))
-			{
-				// We need to use die() here, because else we may encounter an infinite loop (the message handler calls $cache->unload())
-				die('Fatal: ' . $this->cache_dir . ' is NOT writable.');
-				exit;
-			}
-
-			die('Fatal: Not able to open ' . $this->cache_dir . 'data_global.' . $phpEx);
-			exit;
-		}
-
-		$this->is_modified = false;
-	}
-
-	/**
-	* Tidy cache
-	*/
-	function tidy()
-	{
-		global $phpEx;
-
-		$dir = @opendir($this->cache_dir);
-
-		if (!$dir)
-		{
-			return;
-		}
-
-		$time = time();
-
-		while (($entry = readdir($dir)) !== false)
-		{
-			if (!preg_match('/^(sql_|data_(?!global))/', $entry))
-			{
-				continue;
-			}
-
-			if (!($handle = @fopen($this->cache_dir . $entry, 'rb')))
-			{
-				continue;
-			}
-
-			// Skip the PHP header
-			fgets($handle);
-
-			// Skip expiration
-			$expires = (int) fgets($handle);
-
-			fclose($handle);
-
-			if ($time >= $expires)
-			{
-				$this->remove_file($this->cache_dir . $entry);
-			}
-		}
-		closedir($dir);
-
-		if (file_exists($this->cache_dir . 'data_global.' . $phpEx))
-		{
-			if (!sizeof($this->vars))
-			{
-				$this->load();
-			}
-
-			foreach ($this->var_expires as $var_name => $expires)
-			{
-				if ($time >= $expires)
-				{
-					$this->destroy($var_name);
-				}
-			}
-		}
-
-		set_config('cache_last_gc', time(), true);
-	}
-
-	/**
-	* Get saved cache object
-	*/
-	function get($var_name)
-	{
-		if ($var_name[0] == '_')
-		{
-			global $phpEx;
-
-			if (!$this->_exists($var_name))
-			{
-				return false;
-			}
-
-			return $this->_read('data' . $var_name);
-		}
-		else
-		{
-			return ($this->_exists($var_name)) ? $this->vars[$var_name] : false;
-		}
-	}
-
-	/**
-	* Put data into cache
-	*/
-	function put($var_name, $var, $ttl = 31536000)
-	{
-		if ($var_name[0] == '_')
-		{
-			$this->_write('data' . $var_name, $var, time() + $ttl);
-		}
-		else
-		{
-			$this->vars[$var_name] = $var;
-			$this->var_expires[$var_name] = time() + $ttl;
-			$this->is_modified = true;
-		}
-	}
-
-	/**
-	* Purge cache data
-	*/
-	function purge()
-	{
-		// Purge all phpbb cache files
-		$dir = @opendir($this->cache_dir);
-
-		if (!$dir)
-		{
-			return;
-		}
-
-		while (($entry = readdir($dir)) !== false)
-		{
-			if (strpos($entry, 'container_') !== 0 &&
-				strpos($entry, 'url_matcher') !== 0 &&
-				strpos($entry, 'sql_') !== 0 &&
-				strpos($entry, 'data_') !== 0 &&
-				strpos($entry, 'ctpl_') !== 0 &&
-				strpos($entry, 'tpl_') !== 0)
-			{
-				continue;
-			}
-
-			$this->remove_file($this->cache_dir . $entry);
-		}
-		closedir($dir);
-
-		unset($this->vars);
-		unset($this->var_expires);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
-		$this->var_expires = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
-
-		$this->is_modified = false;
-	}
-
-	/**
-	* Destroy cache data
-	*/
-	function destroy($var_name, $table = '')
-	{
-		global $phpEx;
-
-		if ($var_name == 'sql' && !empty($table))
-		{
-			if (!is_array($table))
-			{
-				$table = array($table);
-			}
-
-			$dir = @opendir($this->cache_dir);
-
-			if (!$dir)
-			{
-				return;
-			}
-
-			while (($entry = readdir($dir)) !== false)
-			{
-				if (strpos($entry, 'sql_') !== 0)
-				{
-					continue;
-				}
-
-				if (!($handle = @fopen($this->cache_dir . $entry, 'rb')))
-				{
-					continue;
-				}
-
-				// Skip the PHP header
-				fgets($handle);
-
-				// Skip expiration
-				fgets($handle);
-
-				// Grab the query, remove the LF
-				$query = substr(fgets($handle), 0, -1);
-
-				fclose($handle);
-
-				foreach ($table as $check_table)
-				{
-					// Better catch partial table names than no table names. ;)
-					if (strpos($query, $check_table) !== false)
-					{
-						$this->remove_file($this->cache_dir . $entry);
-						break;
-					}
-				}
-			}
-			closedir($dir);
-
-			return;
-		}
-
-		if (!$this->_exists($var_name))
-		{
-			return;
-		}
-
-		if ($var_name[0] == '_')
-		{
-			$this->remove_file($this->cache_dir . 'data' . $var_name . ".$phpEx", true);
-		}
-		else if (isset($this->vars[$var_name]))
-		{
-			$this->is_modified = true;
-			unset($this->vars[$var_name]);
-			unset($this->var_expires[$var_name]);
-
-			// We save here to let the following cache hits succeed
-			$this->save();
-		}
-	}
-
-	/**
-	* Check if a given cache entry exist
-	*/
-	function _exists($var_name)
-	{
-		if ($var_name[0] == '_')
-		{
-			global $phpEx;
-			return file_exists($this->cache_dir . 'data' . $var_name . ".$phpEx");
-		}
-		else
-		{
-			if (!sizeof($this->vars))
-			{
-				$this->load();
-			}
-
-			if (!isset($this->var_expires[$var_name]))
-			{
-				return false;
-			}
-
-			return (time() > $this->var_expires[$var_name]) ? false : isset($this->vars[$var_name]);
-		}
-	}
-
-	/**
-	* Load cached sql query
-	*/
-	function sql_load($query)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-
-		if (($rowset = $this->_read('sql_' . md5($query))) === false)
-		{
-			return false;
-		}
-
-		$query_id = sizeof($this->sql_rowset);
-		$this->sql_rowset[$query_id] = $rowset;
-		$this->sql_row_pointer[$query_id] = 0;
-
-		return $query_id;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-
-		$query_id = sizeof($this->sql_rowset);
-		$this->sql_rowset[$query_id] = array();
-		$this->sql_row_pointer[$query_id] = 0;
-
-		while ($row = $db->sql_fetchrow($query_result))
-		{
-			$this->sql_rowset[$query_id][] = $row;
-		}
-		$db->sql_freeresult($query_result);
-
-		if ($this->_write('sql_' . md5($query), $this->sql_rowset[$query_id], $ttl + time(), $query))
-		{
-			return $query_id;
-		}
-
-		return $query_result;
-	}
-
-	/**
-	* Ceck if a given sql query exist in cache
-	*/
-	function sql_exists($query_id)
-	{
-		return isset($this->sql_rowset[$query_id]);
-	}
-
-	/**
-	* Fetch row from cache (database)
-	*/
-	function sql_fetchrow($query_id)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++];
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch a field from the current row of a cached database result (database)
-	*/
-	function sql_fetchfield($query_id, $field)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++][$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek a specific row in an a cached database result (database)
-	*/
-	function sql_rowseek($rownum, $query_id)
-	{
-		if ($rownum >= sizeof($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		$this->sql_row_pointer[$query_id] = $rownum;
-		return true;
-	}
-
-	/**
-	* Free memory used for a cached database result (database)
-	*/
-	function sql_freeresult($query_id)
-	{
-		if (!isset($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		unset($this->sql_rowset[$query_id]);
-		unset($this->sql_row_pointer[$query_id]);
-
-		return true;
-	}
-
-	/**
-	* Read cached data from a specified file
-	*
-	* @access private
-	* @param string $filename Filename to write
-	* @return mixed False if an error was encountered, otherwise the data type of the cached data
-	*/
-	function _read($filename)
-	{
-		global $phpEx;
-
-		$file = "{$this->cache_dir}$filename.$phpEx";
-
-		$type = substr($filename, 0, strpos($filename, '_'));
-
-		if (!file_exists($file))
-		{
-			return false;
-		}
-
-		if (!($handle = @fopen($file, 'rb')))
-		{
-			return false;
-		}
-
-		// Skip the PHP header
-		fgets($handle);
-
-		if ($filename == 'data_global')
-		{
-			$this->vars = $this->var_expires = array();
-
-			$time = time();
-
-			while (($expires = (int) fgets($handle)) && !feof($handle))
-			{
-				// Number of bytes of data
-				$bytes = substr(fgets($handle), 0, -1);
-
-				if (!is_numeric($bytes) || ($bytes = (int) $bytes) === 0)
-				{
-					// We cannot process the file without a valid number of bytes
-					// so we discard it
-					fclose($handle);
-
-					$this->vars = $this->var_expires = array();
-					$this->is_modified = false;
-
-					$this->remove_file($file);
-
-					return false;
-				}
-
-				if ($time >= $expires)
-				{
-					fseek($handle, $bytes, SEEK_CUR);
-
-					continue;
-				}
-
-				$var_name = substr(fgets($handle), 0, -1);
-
-				// Read the length of bytes that consists of data.
-				$data = fread($handle, $bytes - strlen($var_name));
-				$data = @unserialize($data);
-
-				// Don't use the data if it was invalid
-				if ($data !== false)
-				{
-					$this->vars[$var_name] = $data;
-					$this->var_expires[$var_name] = $expires;
-				}
-
-				// Absorb the LF
-				fgets($handle);
-			}
-
-			fclose($handle);
-
-			$this->is_modified = false;
-
-			return true;
-		}
-		else
-		{
-			$data = false;
-			$line = 0;
-
-			while (($buffer = fgets($handle)) && !feof($handle))
-			{
-				$buffer = substr($buffer, 0, -1); // Remove the LF
-
-				// $buffer is only used to read integers
-				// if it is non numeric we have an invalid
-				// cache file, which we will now remove.
-				if (!is_numeric($buffer))
-				{
-					break;
-				}
-
-				if ($line == 0)
-				{
-					$expires = (int) $buffer;
-
-					if (time() >= $expires)
-					{
-						break;
-					}
-
-					if ($type == 'sql')
-					{
-						// Skip the query
-						fgets($handle);
-					}
-				}
-				else if ($line == 1)
-				{
-					$bytes = (int) $buffer;
-
-					// Never should have 0 bytes
-					if (!$bytes)
-					{
-						break;
-					}
-
-					// Grab the serialized data
-					$data = fread($handle, $bytes);
-
-					// Read 1 byte, to trigger EOF
-					fread($handle, 1);
-
-					if (!feof($handle))
-					{
-						// Somebody tampered with our data
-						$data = false;
-					}
-					break;
-				}
-				else
-				{
-					// Something went wrong
-					break;
-				}
-				$line++;
-			}
-			fclose($handle);
-
-			// unserialize if we got some data
-			$data = ($data !== false) ? @unserialize($data) : $data;
-
-			if ($data === false)
-			{
-				$this->remove_file($file);
-				return false;
-			}
-
-			return $data;
-		}
-	}
-
-	/**
-	* Write cache data to a specified file
-	*
-	* 'data_global' is a special case and the generated format is different for this file:
-	* <code>
-	* <?php exit; ?>
-	* (expiration)
-	* (length of var and serialised data)
-	* (var)
-	* (serialised data)
-	* ... (repeat)
-	* </code>
-	*
-	* The other files have a similar format:
-	* <code>
-	* <?php exit; ?>
-	* (expiration)
-	* (query) [SQL files only]
-	* (length of serialised data)
-	* (serialised data)
-	* </code>
-	*
-	* @access private
-	* @param string $filename Filename to write
-	* @param mixed $data Data to store
-	* @param int $expires Timestamp when the data expires
-	* @param string $query Query when caching SQL queries
-	* @return bool True if the file was successfully created, otherwise false
-	*/
-	function _write($filename, $data = null, $expires = 0, $query = '')
-	{
-		global $phpEx;
-
-		$file = "{$this->cache_dir}$filename.$phpEx";
-
-		$lock = new phpbb_lock_flock($file);
-		$lock->acquire();
-
-		if ($handle = @fopen($file, 'wb'))
-		{
-			// File header
-			fwrite($handle, '<' . '?php exit; ?' . '>');
-
-			if ($filename == 'data_global')
-			{
-				// Global data is a different format
-				foreach ($this->vars as $var => $data)
-				{
-					if (strpos($var, "\r") !== false || strpos($var, "\n") !== false)
-					{
-						// CR/LF would cause fgets() to read the cache file incorrectly
-						// do not cache test entries, they probably won't be read back
-						// the cache keys should really be alphanumeric with a few symbols.
-						continue;
-					}
-					$data = serialize($data);
-
-					// Write out the expiration time
-					fwrite($handle, "\n" . $this->var_expires[$var] . "\n");
-
-					// Length of the remaining data for this var (ignoring two LF's)
-					fwrite($handle, strlen($data . $var) . "\n");
-					fwrite($handle, $var . "\n");
-					fwrite($handle, $data);
-				}
-			}
-			else
-			{
-				fwrite($handle, "\n" . $expires . "\n");
-
-				if (strpos($filename, 'sql_') === 0)
-				{
-					fwrite($handle, $query . "\n");
-				}
-				$data = serialize($data);
-
-				fwrite($handle, strlen($data) . "\n");
-				fwrite($handle, $data);
-			}
-
-			fclose($handle);
-
-			if (!function_exists('phpbb_chmod'))
-			{
-				global $phpbb_root_path;
-				include($phpbb_root_path . 'includes/functions.' . $phpEx);
-			}
-
-			phpbb_chmod($file, CHMOD_READ | CHMOD_WRITE);
-
-			$return_value = true;
-		}
-		else
-		{
-			$return_value = false;
-		}
-
-		$lock->release();
-
-		return $return_value;
-	}
-
-	/**
-	* Removes/unlinks file
-	*/
-	function remove_file($filename, $check = false)
-	{
-		if (!function_exists('phpbb_is_writable'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include($phpbb_root_path . 'includes/functions.' . $phpEx);
-		}
-
-		if ($check && !phpbb_is_writable($this->cache_dir))
-		{
-			// E_USER_ERROR - not using language entry - intended.
-			trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR);
-		}
-
-		return @unlink($filename);
-	}
-}
diff --git a/phpBB/includes/cache/driver/interface.php b/phpBB/includes/cache/driver/interface.php
deleted file mode 100644
index 53f684d1c8..0000000000
--- a/phpBB/includes/cache/driver/interface.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* An interface that all cache drivers must implement
-*
-* @package acm
-*/
-interface phpbb_cache_driver_interface
-{
-	/**
-	* Load global cache
-	*/
-	public function load();
-
-	/**
-	* Unload cache object
-	*/
-	public function unload();
-
-	/**
-	* Save modified objects
-	*/
-	public function save();
-
-	/**
-	* Tidy cache
-	*/
-	public function tidy();
-
-	/**
-	* Get saved cache object
-	*/
-	public function get($var_name);
-
-	/**
-	* Put data into cache
-	*/
-	public function put($var_name, $var, $ttl = 0);
-
-	/**
-	* Purge cache data
-	*/
-	public function purge();
-
-	/**
-	* Destroy cache data
-	*/
-	public function destroy($var_name, $table = '');
-
-	/**
-	* Check if a given cache entry exists
-	*/
-	public function _exists($var_name);
-
-	/**
-	* Load result of an SQL query from cache.
-	*
-	* @param string $query			SQL query
-	*
-	* @return int|bool				Query ID (integer) if cache contains a rowset
-	*								for the specified query.
-	*								False otherwise.
-	*/
-	public function sql_load($query);
-
-	/**
-	* Save result of an SQL query in cache.
-	*
-	* In persistent cache stores, this function stores the query
-	* result to persistent storage. In other words, there is no need
-	* to call save() afterwards.
-	*
-	* @param phpbb_db_driver $db	Database connection
-	* @param string $query			SQL query, should be used for generating storage key
-	* @param mixed $query_result	The result from dbal::sql_query, to be passed to
-	* 								dbal::sql_fetchrow to get all rows and store them
-	* 								in cache.
-	* @param int $ttl				Time to live, after this timeout the query should
-	*								expire from the cache.
-	* @return int|mixed				If storing in cache succeeded, an integer $query_id
-	* 								representing the query should be returned. Otherwise
-	* 								the original $query_result should be returned.
-	*/
-	public function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl);
-
-	/**
-	* Check if result for a given SQL query exists in cache.
-	*
-	* @param int $query_id
-	* @return bool
-	*/
-	public function sql_exists($query_id);
-
-	/**
-	* Fetch row from cache (database)
-	*
-	* @param int $query_id
-	* @return array|bool 			The query result if found in the cache, otherwise
-	* 								false.
-	*/
-	public function sql_fetchrow($query_id);
-
-	/**
-	* Fetch a field from the current row of a cached database result (database)
-	*
-	* @param int $query_id
-	* @param $field 				The name of the column.
-	* @return string|bool 			The field of the query result if found in the cache,
-	* 								otherwise false.
-	*/
-	public function sql_fetchfield($query_id, $field);
-
-	/**
-	* Seek a specific row in an a cached database result (database)
-	*
-	* @param int $rownum 			Row to seek to.
-	* @param int $query_id
-	* @return bool
-	*/
-	public function sql_rowseek($rownum, $query_id);
-
-	/**
-	* Free memory used for a cached database result (database)
-	*
-	* @param int $query_id
-	* @return bool
-	*/
-	public function sql_freeresult($query_id);
-}
diff --git a/phpBB/includes/cache/driver/memcache.php b/phpBB/includes/cache/driver/memcache.php
deleted file mode 100644
index 3fd16b23b0..0000000000
--- a/phpBB/includes/cache/driver/memcache.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2005, 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (!defined('PHPBB_ACM_MEMCACHE_PORT'))
-{
-	define('PHPBB_ACM_MEMCACHE_PORT', 11211);
-}
-
-if (!defined('PHPBB_ACM_MEMCACHE_COMPRESS'))
-{
-	define('PHPBB_ACM_MEMCACHE_COMPRESS', false);
-}
-
-if (!defined('PHPBB_ACM_MEMCACHE_HOST'))
-{
-	define('PHPBB_ACM_MEMCACHE_HOST', 'localhost');
-}
-
-if (!defined('PHPBB_ACM_MEMCACHE'))
-{
-	//can define multiple servers with host1/port1,host2/port2 format
-	define('PHPBB_ACM_MEMCACHE', PHPBB_ACM_MEMCACHE_HOST . '/' . PHPBB_ACM_MEMCACHE_PORT);
-}
-
-/**
-* ACM for Memcached
-* @package acm
-*/
-class phpbb_cache_driver_memcache extends phpbb_cache_driver_memory
-{
-	var $extension = 'memcache';
-
-	var $memcache;
-	var $flags = 0;
-
-	function __construct()
-	{
-		// Call the parent constructor
-		parent::__construct();
-
-		$this->memcache = new Memcache;
-		foreach(explode(',', PHPBB_ACM_MEMCACHE) as $u)
-		{
-			$parts = explode('/', $u);
-			$this->memcache->addServer(trim($parts[0]), trim($parts[1]));
-		}
-		$this->flags = (PHPBB_ACM_MEMCACHE_COMPRESS) ? MEMCACHE_COMPRESSED : 0;
-	}
-
-	/**
-	* Unload the cache resources
-	*
-	* @return null
-	*/
-	function unload()
-	{
-		parent::unload();
-
-		$this->memcache->close();
-	}
-
-	/**
-	* Purge cache data
-	*
-	* @return null
-	*/
-	function purge()
-	{
-		$this->memcache->flush();
-
-		parent::purge();
-	}
-
-	/**
-	* Fetch an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return mixed Cached data
-	*/
-	function _read($var)
-	{
-		return $this->memcache->get($this->key_prefix . $var);
-	}
-
-	/**
-	* Store data in the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @param mixed $data Data to store
-	* @param int $ttl Time-to-live of cached data
-	* @return bool True if the operation succeeded
-	*/
-	function _write($var, $data, $ttl = 2592000)
-	{
-		if (!$this->memcache->replace($this->key_prefix . $var, $data, $this->flags, $ttl))
-		{
-			return $this->memcache->set($this->key_prefix . $var, $data, $this->flags, $ttl);
-		}
-		return true;
-	}
-
-	/**
-	* Remove an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return bool True if the operation succeeded
-	*/
-	function _delete($var)
-	{
-		return $this->memcache->delete($this->key_prefix . $var);
-	}
-}
diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/includes/cache/driver/memory.php
deleted file mode 100644
index f77a1df316..0000000000
--- a/phpBB/includes/cache/driver/memory.php
+++ /dev/null
@@ -1,439 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ACM Abstract Memory Class
-* @package acm
-*/
-abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base
-{
-	var $key_prefix;
-
-	var $vars = array();
-	var $is_modified = false;
-
-	var $sql_rowset = array();
-	var $sql_row_pointer = array();
-	var $cache_dir = '';
-
-	/**
-	* Set cache path
-	*/
-	function __construct()
-	{
-		global $phpbb_root_path, $dbname, $table_prefix;
-
-		$this->cache_dir	= $phpbb_root_path . 'cache/';
-		$this->key_prefix	= substr(md5($dbname . $table_prefix), 0, 8) . '_';
-
-		if (!isset($this->extension) || !extension_loaded($this->extension))
-		{
-			global $acm_type;
-
-			trigger_error("Could not find required extension [{$this->extension}] for the ACM module $acm_type.", E_USER_ERROR);
-		}
-
-		if (isset($this->function) && !function_exists($this->function))
-		{
-			global $acm_type;
-
-			trigger_error("The required function [{$this->function}] is not available for the ACM module $acm_type.", E_USER_ERROR);
-		}
-	}
-
-	/**
-	* Load global cache
-	*/
-	function load()
-	{
-		// grab the global cache
-		$this->vars = $this->_read('global');
-
-		if ($this->vars !== false)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Unload cache object
-	*/
-	function unload()
-	{
-		$this->save();
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
-	}
-
-	/**
-	* Save modified objects
-	*/
-	function save()
-	{
-		if (!$this->is_modified)
-		{
-			return;
-		}
-
-		$this->_write('global', $this->vars, 2592000);
-
-		$this->is_modified = false;
-	}
-
-	/**
-	* Tidy cache
-	*/
-	function tidy()
-	{
-		// cache has auto GC, no need to have any code here :)
-
-		set_config('cache_last_gc', time(), true);
-	}
-
-	/**
-	* Get saved cache object
-	*/
-	function get($var_name)
-	{
-		if ($var_name[0] == '_')
-		{
-			if (!$this->_exists($var_name))
-			{
-				return false;
-			}
-
-			return $this->_read($var_name);
-		}
-		else
-		{
-			return ($this->_exists($var_name)) ? $this->vars[$var_name] : false;
-		}
-	}
-
-	/**
-	* Put data into cache
-	*/
-	function put($var_name, $var, $ttl = 2592000)
-	{
-		if ($var_name[0] == '_')
-		{
-			$this->_write($var_name, $var, $ttl);
-		}
-		else
-		{
-			$this->vars[$var_name] = $var;
-			$this->is_modified = true;
-		}
-	}
-
-	/**
-	* Purge cache data
-	*/
-	function purge()
-	{
-		// Purge all phpbb cache files
-		$dir = @opendir($this->cache_dir);
-
-		if (!$dir)
-		{
-			return;
-		}
-
-		while (($entry = readdir($dir)) !== false)
-		{
-			if (strpos($entry, 'container_') !== 0 &&
-				strpos($entry, 'url_matcher') !== 0 &&
-				strpos($entry, 'sql_') !== 0 &&
-				strpos($entry, 'data_') !== 0 &&
-				strpos($entry, 'ctpl_') !== 0 &&
-				strpos($entry, 'tpl_') !== 0)
-			{
-				continue;
-			}
-
-			$this->remove_file($this->cache_dir . $entry);
-		}
-		closedir($dir);
-
-		unset($this->vars);
-		unset($this->sql_rowset);
-		unset($this->sql_row_pointer);
-
-		$this->vars = array();
-		$this->sql_rowset = array();
-		$this->sql_row_pointer = array();
-
-		$this->is_modified = false;
-	}
-
-
-	/**
-	* Destroy cache data
-	*/
-	function destroy($var_name, $table = '')
-	{
-		if ($var_name == 'sql' && !empty($table))
-		{
-			if (!is_array($table))
-			{
-				$table = array($table);
-			}
-
-			foreach ($table as $table_name)
-			{
-				// gives us the md5s that we want
-				$temp = $this->_read('sql_' . $table_name);
-
-				if ($temp === false)
-				{
-					continue;
-				}
-
-				// delete each query ref
-				foreach ($temp as $md5_id => $void)
-				{
-					$this->_delete('sql_' . $md5_id);
-				}
-
-				// delete the table ref
-				$this->_delete('sql_' . $table_name);
-			}
-
-			return;
-		}
-
-		if (!$this->_exists($var_name))
-		{
-			return;
-		}
-
-		if ($var_name[0] == '_')
-		{
-			$this->_delete($var_name);
-		}
-		else if (isset($this->vars[$var_name]))
-		{
-			$this->is_modified = true;
-			unset($this->vars[$var_name]);
-
-			// We save here to let the following cache hits succeed
-			$this->save();
-		}
-	}
-
-	/**
-	* Check if a given cache entry exist
-	*/
-	function _exists($var_name)
-	{
-		if ($var_name[0] == '_')
-		{
-			return $this->_isset($var_name);
-		}
-		else
-		{
-			if (!sizeof($this->vars))
-			{
-				$this->load();
-			}
-
-			return isset($this->vars[$var_name]);
-		}
-	}
-
-	/**
-	* Load cached sql query
-	*/
-	function sql_load($query)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-		$query_id = sizeof($this->sql_rowset);
-
-		if (($result = $this->_read('sql_' . md5($query))) === false)
-		{
-			return false;
-		}
-
-		$this->sql_rowset[$query_id] = $result;
-		$this->sql_row_pointer[$query_id] = 0;
-
-		return $query_id;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl)
-	{
-		// Remove extra spaces and tabs
-		$query = preg_replace('/[\n\r\s\t]+/', ' ', $query);
-		$hash = md5($query);
-
-		// determine which tables this query belongs to
-		// Some queries use backticks, namely the get_database_size() query
-		// don't check for conformity, the SQL would error and not reach here.
-		if (!preg_match('/FROM \\(?(`?\\w+`?(?: \\w+)?(?:, ?`?\\w+`?(?: \\w+)?)*)\\)?/', $query, $regs))
-		{
-			// Bail out if the match fails.
-			return $query_result;
-		}
-		$tables = array_map('trim', explode(',', $regs[1]));
-
-		foreach ($tables as $table_name)
-		{
-			// Remove backticks
-			$table_name = ($table_name[0] == '`') ? substr($table_name, 1, -1) : $table_name;
-
-			if (($pos = strpos($table_name, ' ')) !== false)
-			{
-				$table_name = substr($table_name, 0, $pos);
-			}
-
-			$temp = $this->_read('sql_' . $table_name);
-
-			if ($temp === false)
-			{
-				$temp = array();
-			}
-
-			$temp[$hash] = true;
-
-			// This must never expire
-			$this->_write('sql_' . $table_name, $temp, 0);
-		}
-
-		// store them in the right place
-		$query_id = sizeof($this->sql_rowset);
-		$this->sql_rowset[$query_id] = array();
-		$this->sql_row_pointer[$query_id] = 0;
-
-		while ($row = $db->sql_fetchrow($query_result))
-		{
-			$this->sql_rowset[$query_id][] = $row;
-		}
-		$db->sql_freeresult($query_result);
-
-		$this->_write('sql_' . $hash, $this->sql_rowset[$query_id], $ttl);
-
-		return $query_id;
-	}
-
-	/**
-	* Ceck if a given sql query exist in cache
-	*/
-	function sql_exists($query_id)
-	{
-		return isset($this->sql_rowset[$query_id]);
-	}
-
-	/**
-	* Fetch row from cache (database)
-	*/
-	function sql_fetchrow($query_id)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++];
-		}
-
-		return false;
-	}
-
-	/**
-	* Fetch a field from the current row of a cached database result (database)
-	*/
-	function sql_fetchfield($query_id, $field)
-	{
-		if ($this->sql_row_pointer[$query_id] < sizeof($this->sql_rowset[$query_id]))
-		{
-			return (isset($this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]][$field])) ? $this->sql_rowset[$query_id][$this->sql_row_pointer[$query_id]++][$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek a specific row in an a cached database result (database)
-	*/
-	function sql_rowseek($rownum, $query_id)
-	{
-		if ($rownum >= sizeof($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		$this->sql_row_pointer[$query_id] = $rownum;
-		return true;
-	}
-
-	/**
-	* Free memory used for a cached database result (database)
-	*/
-	function sql_freeresult($query_id)
-	{
-		if (!isset($this->sql_rowset[$query_id]))
-		{
-			return false;
-		}
-
-		unset($this->sql_rowset[$query_id]);
-		unset($this->sql_row_pointer[$query_id]);
-
-		return true;
-	}
-
-	/**
-	* Removes/unlinks file
-	*/
-	function remove_file($filename, $check = false)
-	{
-		if (!function_exists('phpbb_is_writable'))
-		{
-			global $phpbb_root_path, $phpEx;
-			include($phpbb_root_path . 'includes/functions.' . $phpEx);
-		}
-
-		if ($check && !phpbb_is_writable($this->cache_dir))
-		{
-			// E_USER_ERROR - not using language entry - intended.
-			trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR);
-		}
-
-		return @unlink($filename);
-	}
-
-	/**
-	* Check if a cache var exists
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return bool True if it exists, otherwise false
-	*/
-	function _isset($var)
-	{
-		// Most caches don't need to check
-		return true;
-	}
-}
diff --git a/phpBB/includes/cache/driver/null.php b/phpBB/includes/cache/driver/null.php
deleted file mode 100644
index 2fadc27ba3..0000000000
--- a/phpBB/includes/cache/driver/null.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2005, 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ACM Null Caching
-* @package acm
-*/
-class phpbb_cache_driver_null extends phpbb_cache_driver_base
-{
-	/**
-	* Set cache path
-	*/
-	function __construct()
-	{
-	}
-
-	/**
-	* Load global cache
-	*/
-	function load()
-	{
-		return true;
-	}
-
-	/**
-	* Unload cache object
-	*/
-	function unload()
-	{
-	}
-
-	/**
-	* Save modified objects
-	*/
-	function save()
-	{
-	}
-
-	/**
-	* Tidy cache
-	*/
-	function tidy()
-	{
-		// This cache always has a tidy room.
-		set_config('cache_last_gc', time(), true);
-	}
-
-	/**
-	* Get saved cache object
-	*/
-	function get($var_name)
-	{
-		return false;
-	}
-
-	/**
-	* Put data into cache
-	*/
-	function put($var_name, $var, $ttl = 0)
-	{
-	}
-
-	/**
-	* Purge cache data
-	*/
-	function purge()
-	{
-	}
-
-	/**
-	* Destroy cache data
-	*/
-	function destroy($var_name, $table = '')
-	{
-	}
-
-	/**
-	* Check if a given cache entry exist
-	*/
-	function _exists($var_name)
-	{
-		return false;
-	}
-
-	/**
-	* Load cached sql query
-	*/
-	function sql_load($query)
-	{
-		return false;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl)
-	{
-		return $query_result;
-	}
-
-	/**
-	* Ceck if a given sql query exist in cache
-	*/
-	function sql_exists($query_id)
-	{
-		return false;
-	}
-
-	/**
-	* Fetch row from cache (database)
-	*/
-	function sql_fetchrow($query_id)
-	{
-		return false;
-	}
-
-	/**
-	* Fetch a field from the current row of a cached database result (database)
-	*/
-	function sql_fetchfield($query_id, $field)
-	{
-		return false;
-	}
-
-	/**
-	* Seek a specific row in an a cached database result (database)
-	*/
-	function sql_rowseek($rownum, $query_id)
-	{
-		return false;
-	}
-
-	/**
-	* Free memory used for a cached database result (database)
-	*/
-	function sql_freeresult($query_id)
-	{
-		return false;
-	}
-}
diff --git a/phpBB/includes/cache/driver/redis.php b/phpBB/includes/cache/driver/redis.php
deleted file mode 100644
index 960735b673..0000000000
--- a/phpBB/includes/cache/driver/redis.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (!defined('PHPBB_ACM_REDIS_PORT'))
-{
-	define('PHPBB_ACM_REDIS_PORT', 6379);
-}
-
-if (!defined('PHPBB_ACM_REDIS_HOST'))
-{
-	define('PHPBB_ACM_REDIS_HOST', 'localhost');
-}
-
-/**
-* ACM for Redis
-*
-* Compatible with the php extension phpredis available
-* at https://github.com/nicolasff/phpredis
-*
-* @package acm
-*/
-class phpbb_cache_driver_redis extends phpbb_cache_driver_memory
-{
-	var $extension = 'redis';
-
-	var $redis;
-
-	/**
-	* Creates a redis cache driver.
-	*
-	* The following global constants affect operation:
-	*
-	* PHPBB_ACM_REDIS_HOST
-	* PHPBB_ACM_REDIS_PORT
-	* PHPBB_ACM_REDIS_PASSWORD
-	* PHPBB_ACM_REDIS_DB
-	*
-	* There are no publicly documented constructor parameters.
-	*/
-	function __construct()
-	{
-		// Call the parent constructor
-		parent::__construct();
-
-		$this->redis = new Redis();
-
-		$args = func_get_args();
-		if (!empty($args))
-		{
-			$ok = call_user_func_array(array($this->redis, 'connect'), $args);
-		}
-		else
-		{
-			$ok = $this->redis->connect(PHPBB_ACM_REDIS_HOST, PHPBB_ACM_REDIS_PORT);
-		}
-
-		if (!$ok)
-		{
-			trigger_error('Could not connect to redis server');
-		}
-
-		if (defined('PHPBB_ACM_REDIS_PASSWORD'))
-		{
-			if (!$this->redis->auth(PHPBB_ACM_REDIS_PASSWORD))
-			{
-				global $acm_type;
-
-				trigger_error("Incorrect password for the ACM module $acm_type.", E_USER_ERROR);
-			}
-		}
-
-		$this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);
-		$this->redis->setOption(Redis::OPT_PREFIX, $this->key_prefix);
-
-		if (defined('PHPBB_ACM_REDIS_DB'))
-		{
-			if (!$this->redis->select(PHPBB_ACM_REDIS_DB))
-			{
-				global $acm_type;
-
-				trigger_error("Incorrect database for the ACM module $acm_type.", E_USER_ERROR);
-			}
-		}
-	}
-
-	/**
-	* Unload the cache resources
-	*
-	* @return null
-	*/
-	function unload()
-	{
-		parent::unload();
-
-		$this->redis->close();
-	}
-
-	/**
-	* Purge cache data
-	*
-	* @return null
-	*/
-	function purge()
-	{
-		$this->redis->flushDB();
-
-		parent::purge();
-	}
-
-	/**
-	* Fetch an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return mixed Cached data
-	*/
-	function _read($var)
-	{
-		return $this->redis->get($var);
-	}
-
-	/**
-	* Store data in the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @param mixed $data Data to store
-	* @param int $ttl Time-to-live of cached data
-	* @return bool True if the operation succeeded
-	*/
-	function _write($var, $data, $ttl = 2592000)
-	{
-		return $this->redis->setex($var, $ttl, $data);
-	}
-
-	/**
-	* Remove an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return bool True if the operation succeeded
-	*/
-	function _delete($var)
-	{
-		if ($this->redis->delete($var) > 0)
-		{
-			return true;
-		}
-		return false;
-	}
-}
-
diff --git a/phpBB/includes/cache/driver/wincache.php b/phpBB/includes/cache/driver/wincache.php
deleted file mode 100644
index 58f3b4a581..0000000000
--- a/phpBB/includes/cache/driver/wincache.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ACM for WinCache
-* @package acm
-*/
-class phpbb_cache_driver_wincache extends phpbb_cache_driver_memory
-{
-	var $extension = 'wincache';
-
-	/**
-	* Purge cache data
-	*
-	* @return null
-	*/
-	function purge()
-	{
-		wincache_ucache_clear();
-
-		parent::purge();
-	}
-
-	/**
-	* Fetch an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return mixed Cached data
-	*/
-	function _read($var)
-	{
-		$success = false;
-		$result = wincache_ucache_get($this->key_prefix . $var, $success);
-
-		return ($success) ? $result : false;
-	}
-
-	/**
-	* Store data in the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @param mixed $data Data to store
-	* @param int $ttl Time-to-live of cached data
-	* @return bool True if the operation succeeded
-	*/
-	function _write($var, $data, $ttl = 2592000)
-	{
-		return wincache_ucache_set($this->key_prefix . $var, $data, $ttl);
-	}
-
-	/**
-	* Remove an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return bool True if the operation succeeded
-	*/
-	function _delete($var)
-	{
-		return wincache_ucache_delete($this->key_prefix . $var);
-	}
-}
diff --git a/phpBB/includes/cache/driver/xcache.php b/phpBB/includes/cache/driver/xcache.php
deleted file mode 100644
index 06c5fafd97..0000000000
--- a/phpBB/includes/cache/driver/xcache.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2005, 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* ACM for XCache
-* @package acm
-*
-* To use this module you need ini_get() enabled and the following INI settings configured as follows:
-* - xcache.var_size > 0
-* - xcache.admin.enable_auth = off (or xcache.admin.user and xcache.admin.password set)
-*
-*/
-class phpbb_cache_driver_xcache extends phpbb_cache_driver_memory
-{
-	var $extension = 'XCache';
-
-	function __construct()
-	{
-		parent::__construct();
-
-		if (!function_exists('ini_get') || (int) ini_get('xcache.var_size') <= 0)
-		{
-			trigger_error('Increase xcache.var_size setting above 0 or enable ini_get() to use this ACM module.', E_USER_ERROR);
-		}
-	}
-
-	/**
-	* Purge cache data
-	*
-	* @return null
-	*/
-	function purge()
-	{
-		// Run before for XCache, if admin functions are disabled it will terminate execution
-		parent::purge();
-
-		// If the admin authentication is enabled but not set up, this will cause a nasty error.
-		// Not much we can do about it though.
-		$n = xcache_count(XC_TYPE_VAR);
-
-		for ($i = 0; $i < $n; $i++)
-		{
-			xcache_clear_cache(XC_TYPE_VAR, $i);
-		}
-	}
-
-	/**
-	* Fetch an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return mixed Cached data
-	*/
-	function _read($var)
-	{
-		$result = xcache_get($this->key_prefix . $var);
-
-		return ($result !== null) ? $result : false;
-	}
-
-	/**
-	* Store data in the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @param mixed $data Data to store
-	* @param int $ttl Time-to-live of cached data
-	* @return bool True if the operation succeeded
-	*/
-	function _write($var, $data, $ttl = 2592000)
-	{
-		return xcache_set($this->key_prefix . $var, $data, $ttl);
-	}
-
-	/**
-	* Remove an item from the cache
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return bool True if the operation succeeded
-	*/
-	function _delete($var)
-	{
-		return xcache_unset($this->key_prefix . $var);
-	}
-
-	/**
-	* Check if a cache var exists
-	*
-	* @access protected
-	* @param string $var Cache key
-	* @return bool True if it exists, otherwise false
-	*/
-	function _isset($var)
-	{
-		return xcache_isset($this->key_prefix . $var);
-	}
-}
diff --git a/phpBB/includes/cache/service.php b/phpBB/includes/cache/service.php
deleted file mode 100644
index 69c5e0fdd0..0000000000
--- a/phpBB/includes/cache/service.php
+++ /dev/null
@@ -1,406 +0,0 @@
-<?php
-/**
-*
-* @package acm
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Class for grabbing/handling cached entries
-* @package acm
-*/
-class phpbb_cache_service
-{
-	/**
-	* Cache driver.
-	*
-	* @var phpbb_cache_driver_interface
-	*/
-	protected $driver;
-
-	/**
-	* The config.
-	*
-	* @var phpbb_config
-	*/
-	protected $config;
-
-	/**
-	* Database connection.
-	*
-	* @var phpbb_db_driver
-	*/
-	protected $db;
-
-	/**
-	* Root path.
-	*
-	* @var string
-	*/
-	protected $phpbb_root_path;
-
-	/**
-	* PHP extension.
-	*
-	* @var string
-	*/
-	protected $php_ext;
-
-	/**
-	* Creates a cache service around a cache driver
-	*
-	* @param phpbb_cache_driver_interface $driver The cache driver
-	* @param phpbb_config $config The config
-	* @param phpbb_db_driver $db Database connection
-	* @param string $phpbb_root_path Root path
-	* @param string $php_ext PHP extension
-	*/
-	public function __construct(phpbb_cache_driver_interface $driver, phpbb_config $config, phpbb_db_driver $db, $phpbb_root_path, $php_ext)
-	{
-		$this->set_driver($driver);
-		$this->config = $config;
-		$this->db = $db;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	* Returns the cache driver used by this cache service.
-	*
-	* @return phpbb_cache_driver_interface The cache driver
-	*/
-	public function get_driver()
-	{
-		return $this->driver;
-	}
-
-	/**
-	* Replaces the cache driver used by this cache service.
-	*
-	* @param phpbb_cache_driver_interface $driver The cache driver
-	*/
-	public function set_driver(phpbb_cache_driver_interface $driver)
-	{
-		$this->driver = $driver;
-	}
-
-	public function __call($method, $arguments)
-	{
-		return call_user_func_array(array($this->driver, $method), $arguments);
-	}
-
-	/**
-	* Obtain list of naughty words and build preg style replacement arrays for use by the
-	* calling script
-	*/
-	function obtain_word_list()
-	{
-		if (($censors = $this->driver->get('_word_censors')) === false)
-		{
-			$sql = 'SELECT word, replacement
-				FROM ' . WORDS_TABLE;
-			$result = $this->db->sql_query($sql);
-
-			$censors = array();
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$censors['match'][] = get_censor_preg_expression($row['word']);
-				$censors['replace'][] = $row['replacement'];
-			}
-			$this->db->sql_freeresult($result);
-
-			$this->driver->put('_word_censors', $censors);
-		}
-
-		return $censors;
-	}
-
-	/**
-	* Obtain currently listed icons
-	*/
-	function obtain_icons()
-	{
-		if (($icons = $this->driver->get('_icons')) === false)
-		{
-			// Topic icons
-			$sql = 'SELECT *
-				FROM ' . ICONS_TABLE . '
-				ORDER BY icons_order';
-			$result = $this->db->sql_query($sql);
-
-			$icons = array();
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$icons[$row['icons_id']]['img'] = $row['icons_url'];
-				$icons[$row['icons_id']]['width'] = (int) $row['icons_width'];
-				$icons[$row['icons_id']]['height'] = (int) $row['icons_height'];
-				$icons[$row['icons_id']]['display'] = (bool) $row['display_on_posting'];
-			}
-			$this->db->sql_freeresult($result);
-
-			$this->driver->put('_icons', $icons);
-		}
-
-		return $icons;
-	}
-
-	/**
-	* Obtain ranks
-	*/
-	function obtain_ranks()
-	{
-		if (($ranks = $this->driver->get('_ranks')) === false)
-		{
-			$sql = 'SELECT *
-				FROM ' . RANKS_TABLE . '
-				ORDER BY rank_min DESC';
-			$result = $this->db->sql_query($sql);
-
-			$ranks = array();
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if ($row['rank_special'])
-				{
-					$ranks['special'][$row['rank_id']] = array(
-						'rank_title'	=>	$row['rank_title'],
-						'rank_image'	=>	$row['rank_image']
-					);
-				}
-				else
-				{
-					$ranks['normal'][] = array(
-						'rank_title'	=>	$row['rank_title'],
-						'rank_min'		=>	$row['rank_min'],
-						'rank_image'	=>	$row['rank_image']
-					);
-				}
-			}
-			$this->db->sql_freeresult($result);
-
-			$this->driver->put('_ranks', $ranks);
-		}
-
-		return $ranks;
-	}
-
-	/**
-	* Obtain allowed extensions
-	*
-	* @param mixed $forum_id If false then check for private messaging, if int then check for forum id. If true, then only return extension informations.
-	*
-	* @return array allowed extensions array.
-	*/
-	function obtain_attach_extensions($forum_id)
-	{
-		if (($extensions = $this->driver->get('_extensions')) === false)
-		{
-			$extensions = array(
-				'_allowed_post'	=> array(),
-				'_allowed_pm'	=> array(),
-			);
-
-			// The rule is to only allow those extensions defined. ;)
-			$sql = 'SELECT e.extension, g.*
-				FROM ' . EXTENSIONS_TABLE . ' e, ' . EXTENSION_GROUPS_TABLE . ' g
-				WHERE e.group_id = g.group_id
-					AND (g.allow_group = 1 OR g.allow_in_pm = 1)';
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$extension = strtolower(trim($row['extension']));
-
-				$extensions[$extension] = array(
-					'display_cat'	=> (int) $row['cat_id'],
-					'download_mode'	=> (int) $row['download_mode'],
-					'upload_icon'	=> trim($row['upload_icon']),
-					'max_filesize'	=> (int) $row['max_filesize'],
-					'allow_group'	=> $row['allow_group'],
-					'allow_in_pm'	=> $row['allow_in_pm'],
-					'group_name'	=> $row['group_name'],
-				);
-
-				$allowed_forums = ($row['allowed_forums']) ? unserialize(trim($row['allowed_forums'])) : array();
-
-				// Store allowed extensions forum wise
-				if ($row['allow_group'])
-				{
-					$extensions['_allowed_post'][$extension] = (!sizeof($allowed_forums)) ? 0 : $allowed_forums;
-				}
-
-				if ($row['allow_in_pm'])
-				{
-					$extensions['_allowed_pm'][$extension] = 0;
-				}
-			}
-			$this->db->sql_freeresult($result);
-
-			$this->driver->put('_extensions', $extensions);
-		}
-
-		// Forum post
-		if ($forum_id === false)
-		{
-			// We are checking for private messages, therefore we only need to get the pm extensions...
-			$return = array('_allowed_' => array());
-
-			foreach ($extensions['_allowed_pm'] as $extension => $check)
-			{
-				$return['_allowed_'][$extension] = 0;
-				$return[$extension] = $extensions[$extension];
-			}
-
-			$extensions = $return;
-		}
-		else if ($forum_id === true)
-		{
-			return $extensions;
-		}
-		else
-		{
-			$forum_id = (int) $forum_id;
-			$return = array('_allowed_' => array());
-
-			foreach ($extensions['_allowed_post'] as $extension => $check)
-			{
-				// Check for allowed forums
-				if (is_array($check))
-				{
-					$allowed = (!in_array($forum_id, $check)) ? false : true;
-				}
-				else
-				{
-					$allowed = true;
-				}
-
-				if ($allowed)
-				{
-					$return['_allowed_'][$extension] = 0;
-					$return[$extension] = $extensions[$extension];
-				}
-			}
-
-			$extensions = $return;
-		}
-
-		if (!isset($extensions['_allowed_']))
-		{
-			$extensions['_allowed_'] = array();
-		}
-
-		return $extensions;
-	}
-
-	/**
-	* Obtain active bots
-	*/
-	function obtain_bots()
-	{
-		if (($bots = $this->driver->get('_bots')) === false)
-		{
-			switch ($this->db->sql_layer)
-			{
-				case 'mssql':
-				case 'mssql_odbc':
-				case 'mssqlnative':
-					$sql = 'SELECT user_id, bot_agent, bot_ip
-						FROM ' . BOTS_TABLE . '
-						WHERE bot_active = 1
-					ORDER BY LEN(bot_agent) DESC';
-				break;
-
-				case 'firebird':
-					$sql = 'SELECT user_id, bot_agent, bot_ip
-						FROM ' . BOTS_TABLE . '
-						WHERE bot_active = 1
-					ORDER BY CHAR_LENGTH(bot_agent) DESC';
-				break;
-
-				// LENGTH supported by MySQL, IBM DB2 and Oracle for sure...
-				default:
-					$sql = 'SELECT user_id, bot_agent, bot_ip
-						FROM ' . BOTS_TABLE . '
-						WHERE bot_active = 1
-					ORDER BY LENGTH(bot_agent) DESC';
-				break;
-			}
-			$result = $this->db->sql_query($sql);
-
-			$bots = array();
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$bots[] = $row;
-			}
-			$this->db->sql_freeresult($result);
-
-			$this->driver->put('_bots', $bots);
-		}
-
-		return $bots;
-	}
-
-	/**
-	* Obtain cfg file data
-	*/
-	function obtain_cfg_items($style)
-	{
-		$parsed_array = $this->driver->get('_cfg_' . $style['style_path']);
-
-		if ($parsed_array === false)
-		{
-			$parsed_array = array();
-		}
-
-		$filename = $this->phpbb_root_path . 'styles/' . $style['style_path'] . '/style.cfg';
-
-		if (!file_exists($filename))
-		{
-			return $parsed_array;
-		}
-
-		if (!isset($parsed_array['filetime']) || (($this->config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime'])))
-		{
-			// Re-parse cfg file
-			$parsed_array = parse_cfg_file($filename);
-			$parsed_array['filetime'] = @filemtime($filename);
-
-			$this->driver->put('_cfg_' . $style['style_path'], $parsed_array);
-		}
-
-		return $parsed_array;
-	}
-
-	/**
-	* Obtain disallowed usernames
-	*/
-	function obtain_disallowed_usernames()
-	{
-		if (($usernames = $this->driver->get('_disallowed_usernames')) === false)
-		{
-			$sql = 'SELECT disallow_username
-				FROM ' . DISALLOW_TABLE;
-			$result = $this->db->sql_query($sql);
-
-			$usernames = array();
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$usernames[] = str_replace('%', '.*?', preg_quote(utf8_clean_string($row['disallow_username']), '#'));
-			}
-			$this->db->sql_freeresult($result);
-
-			$this->driver->put('_disallowed_usernames', $usernames);
-		}
-
-		return $usernames;
-	}
-}
diff --git a/phpBB/includes/class_loader.php b/phpBB/includes/class_loader.php
deleted file mode 100644
index 02a2d584dc..0000000000
--- a/phpBB/includes/class_loader.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The class loader resolves class names to file system paths and loads them if
-* necessary.
-*
-* Classes have to be of the form phpbb_(dir_)*(classpart_)*, so directory names
-* must never contain underscores. Example: phpbb_dir_subdir_class_name is a
-* valid class name, while phpbb_dir_sub_dir_class_name is not.
-*
-* If every part of the class name is a directory, the last directory name is
-* also used as the filename, e.g. phpbb_dir would resolve to dir/dir.php.
-*
-* @package phpBB3
-*/
-class phpbb_class_loader
-{
-	private $prefix;
-	private $path;
-	private $php_ext;
-	private $cache;
-
-	/**
-	* A map of looked up class names to paths relative to $this->path.
-	* This map is stored in cache and looked up if the cache is available.
-	*
-	* @var array
-	*/
-	private $cached_paths = array();
-
-	/**
-	* Creates a new phpbb_class_loader, which loads files with the given
-	* file extension from the given path.
-	*
-	* @param string $prefix  Required class name prefix for files to be loaded
-	* @param string $path    Directory to load files from
-	* @param string $php_ext The file extension for PHP files
-	* @param phpbb_cache_driver_interface $cache An implementation of the phpBB cache interface.
-	*/
-	public function __construct($prefix, $path, $php_ext = 'php', phpbb_cache_driver_interface $cache = null)
-	{
-		$this->prefix = $prefix;
-		$this->path = $path;
-		$this->php_ext = $php_ext;
-
-		$this->set_cache($cache);
-	}
-
-	/**
-	* Provide the class loader with a cache to store paths. If set to null, the
-	* the class loader will resolve paths by checking for the existance of every
-	* directory in the class name every time.
-	*
-	* @param phpbb_cache_driver_interface $cache An implementation of the phpBB cache interface.
-	*/
-	public function set_cache(phpbb_cache_driver_interface $cache = null)
-	{
-		if ($cache)
-		{
-			$this->cached_paths = $cache->get('class_loader_' . $this->prefix);
-
-			if ($this->cached_paths === false)
-			{
-				$this->cached_paths = array();
-			}
-		}
-
-		$this->cache = $cache;
-	}
-
-	/**
-	* Registers the class loader as an autoloader using SPL.
-	*/
-	public function register()
-	{
-		spl_autoload_register(array($this, 'load_class'));
-	}
-
-	/**
-	* Removes the class loader from the SPL autoloader stack.
-	*/
-	public function unregister()
-	{
-		spl_autoload_unregister(array($this, 'load_class'));
-	}
-
-	/**
-	* Resolves a phpBB class name to a relative path which can be included.
-	*
-	* @param string       $class The class name to resolve, must have a phpbb_
-	*                            prefix
-	* @return string|bool        A relative path to the file containing the
-	*                            class or false if looking it up failed.
-	*/
-	public function resolve_path($class)
-	{
-		if (isset($this->cached_paths[$class]))
-		{
-			return $this->path . $this->cached_paths[$class] . '.' . $this->php_ext;
-		}
-
-		if (!preg_match('/^' . $this->prefix . '[a-zA-Z0-9_]+$/', $class))
-		{
-			return false;
-		}
-
-		$parts = explode('_', substr($class, strlen($this->prefix)));
-
-		$dirs = '';
-
-		for ($i = 0, $n = sizeof($parts); $i < $n && is_dir($this->path . $dirs . $parts[$i]); $i++)
-		{
-			$dirs .= $parts[$i] . '/';
-		}
-
-		// no file name left => use last dir name as file name
-		if ($i == sizeof($parts))
-		{
-			$parts[] = $parts[$i - 1];
-		}
-
-		$relative_path = $dirs . implode(array_slice($parts, $i, sizeof($parts) - $i), '_');
-
-		if (!file_exists($this->path . $relative_path . '.' . $this->php_ext))
-		{
-			return false;
-		}
-
-		if ($this->cache)
-		{
-			$this->cached_paths[$class] = $relative_path;
-			$this->cache->put('class_loader_' . $this->prefix, $this->cached_paths);
-		}
-
-		return $this->path . $relative_path . '.' . $this->php_ext;
-	}
-
-	/**
-	* Resolves a class name to a path and then includes it.
-	*
-	* @param string $class The class name which is being loaded.
-	*/
-	public function load_class($class)
-	{
-		if (substr($class, 0, strlen($this->prefix)) === $this->prefix)
-		{
-			$path = $this->resolve_path($class);
-
-			if ($path)
-			{
-				require $path;
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/config/config.php b/phpBB/includes/config/config.php
deleted file mode 100644
index 4b533dd55c..0000000000
--- a/phpBB/includes/config/config.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Configuration container class
-* @package phpBB3
-*/
-class phpbb_config implements ArrayAccess, IteratorAggregate, Countable
-{
-	/**
-	* The configuration data
-	* @var array(string => string)
-	*/
-	protected $config;
-
-	/**
-	* Creates a configuration container with a default set of values
-	*
-	* @param array(string => string) $config The configuration data.
-	*/
-	public function __construct(array $config)
-	{
-		$this->config = $config;
-	}
-
-	/**
-	* Retrieves an ArrayIterator over the configuration values.
-	*
-	* @return ArrayIterator An iterator over all config data
-	*/
-	public function getIterator()
-	{
-		return new ArrayIterator($this->config);
-	}
-
-	/**
-	* Checks if the specified config value exists.
-	*
-	* @param  string $key The configuration option's name.
-	* @return bool        Whether the configuration option exists.
-	*/
-	public function offsetExists($key)
-	{
-		return isset($this->config[$key]);
-	}
-
-	/**
-	* Retrieves a configuration value.
-	*
-	* @param  string $key The configuration option's name.
-	* @return string      The configuration value
-	*/
-	public function offsetGet($key)
-	{
-		return (isset($this->config[$key])) ? $this->config[$key] : '';
-	}
-
-	/**
-	* Temporarily overwrites the value of a configuration variable.
-	*
-	* The configuration change will not persist. It will be lost
-	* after the request.
-	*
-	* @param string $key   The configuration option's name.
-	* @param string $value The temporary value.
-	*/
-	public function offsetSet($key, $value)
-	{
-		$this->config[$key] = $value;
-	}
-
-	/**
-	* Called when deleting a configuration value directly, triggers an error.
-	*
-	* @param string $key The configuration option's name.
-	*/
-	public function offsetUnset($key)
-	{
-		trigger_error('Config values have to be deleted explicitly with the phpbb_config::delete($key) method.', E_USER_ERROR);
-	}
-
-	/**
-	* Retrieves the number of configuration options currently set.
-	*
-	* @return int Number of config options
-	*/
-	public function count()
-	{
-		return count($this->config);
-	}
-
-	/**
-	* Removes a configuration option
-	*
-	* @param  String $key       The configuration option's name
-	* @param  bool   $use_cache Whether this variable should be cached or if it
-	*                           changes too frequently to be efficiently cached
-	* @return null
-	*/
-	public function delete($key, $use_cache = true)
-	{
-		unset($this->config[$key]);
-	}
-
-	/**
-	* Sets a configuration option's value
-	*
-	* @param string $key       The configuration option's name
-	* @param string $value     New configuration value
-	* @param bool   $use_cache Whether this variable should be cached or if it
-	*                          changes too frequently to be efficiently cached.
-	*/
-	public function set($key, $value, $use_cache = true)
-	{
-		$this->config[$key] = $value;
-	}
-
-	/**
-	* Sets a configuration option's value only if the old_value matches the
-	* current configuration value or the configuration value does not exist yet.
-	*
-	* @param  string $key       The configuration option's name
-	* @param  string $old_value Current configuration value
-	* @param  string $new_value New configuration value
-	* @param  bool   $use_cache Whether this variable should be cached or if it
-	*                           changes too frequently to be efficiently cached.
-	* @return bool              True if the value was changed, false otherwise.
-	*/
-	public function set_atomic($key, $old_value, $new_value, $use_cache = true)
-	{
-		if (!isset($this->config[$key]) || $this->config[$key] == $old_value)
-		{
-			$this->config[$key] = $new_value;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Increments an integer configuration value.
-	*
-	* @param string $key       The configuration option's name
-	* @param int    $increment Amount to increment by
-	* @param bool   $use_cache Whether this variable should be cached or if it
-	*                          changes too frequently to be efficiently cached.
-	*/
-	function increment($key, $increment, $use_cache = true)
-	{
-		if (!isset($this->config[$key]))
-		{
-			$this->config[$key] = 0;
-		}
-
-		$this->config[$key] += $increment;
-	}
-}
diff --git a/phpBB/includes/config/db.php b/phpBB/includes/config/db.php
deleted file mode 100644
index b18369a479..0000000000
--- a/phpBB/includes/config/db.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Configuration container class
-* @package phpBB3
-*/
-class phpbb_config_db extends phpbb_config
-{
-	/**
-	* Cache instance
-	* @var phpbb_cache_driver_interface
-	*/
-	protected $cache;
-
-	/**
-	* Database connection
-	* @var phpbb_db_driver
-	*/
-	protected $db;
-
-	/**
-	* Name of the database table used for configuration.
-	* @var string
-	*/
-	protected $table;
-
-	/**
-	* Creates a configuration container with a default set of values
-	*
-	* @param phpbb_db_driver              $db    Database connection
-	* @param phpbb_cache_driver_interface $cache Cache instance
-	* @param string                       $table Configuration table name
-	*/
-	public function __construct(phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $table)
-	{
-		$this->db = $db;
-		$this->cache = $cache;
-		$this->table = $table;
-
-		if (($config = $cache->get('config')) !== false)
-		{
-			$sql = 'SELECT config_name, config_value
-				FROM ' . $this->table . '
-				WHERE is_dynamic = 1';
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$config[$row['config_name']] = $row['config_value'];
-			}
-			$this->db->sql_freeresult($result);
-		}
-		else
-		{
-			$config = $cached_config = array();
-
-			$sql = 'SELECT config_name, config_value, is_dynamic
-				FROM ' . $this->table;
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if (!$row['is_dynamic'])
-				{
-					$cached_config[$row['config_name']] = $row['config_value'];
-				}
-
-				$config[$row['config_name']] = $row['config_value'];
-			}
-			$this->db->sql_freeresult($result);
-
-			$cache->put('config', $cached_config);
-		}
-
-		parent::__construct($config);
-	}
-
-	/**
-	* Removes a configuration option
-	*
-	* @param  String $key       The configuration option's name
-	* @param  bool   $use_cache Whether this variable should be cached or if it
-	*                           changes too frequently to be efficiently cached
-	* @return null
-	*/
-	public function delete($key, $use_cache = true)
-	{
-		$sql = 'DELETE FROM ' . $this->table . "
-			WHERE config_name = '" . $this->db->sql_escape($key) . "'";
-		$this->db->sql_query($sql);
-
-		unset($this->config[$key]);
-
-		if ($use_cache)
-		{
-			$this->cache->destroy('config');
-		}
-	}
-
-	/**
-	* Sets a configuration option's value
-	*
-	* @param string $key       The configuration option's name
-	* @param string $value     New configuration value
-	* @param bool   $use_cache Whether this variable should be cached or if it
-	*                          changes too frequently to be efficiently cached.
-	*/
-	public function set($key, $value, $use_cache = true)
-	{
-		$this->set_atomic($key, false, $value, $use_cache);
-	}
-
-	/**
-	* Sets a configuration option's value only if the old_value matches the
-	* current configuration value or the configuration value does not exist yet.
-	*
-	* @param  string $key       The configuration option's name
-	* @param  mixed  $old_value Current configuration value or false to ignore
-	*                           the old value
-	* @param  string $new_value New configuration value
-	* @param  bool   $use_cache Whether this variable should be cached or if it
-	*                           changes too frequently to be efficiently cached
-	* @return bool              True if the value was changed, false otherwise
-	*/
-	public function set_atomic($key, $old_value, $new_value, $use_cache = true)
-	{
-		$sql = 'UPDATE ' . $this->table . "
-			SET config_value = '" . $this->db->sql_escape($new_value) . "'
-			WHERE config_name = '" . $this->db->sql_escape($key) . "'";
-
-		if ($old_value !== false)
-		{
-			$sql .= " AND config_value = '" . $this->db->sql_escape($old_value) . "'";
-		}
-
-		$result = $this->db->sql_query($sql);
-
-		if (!$this->db->sql_affectedrows($result) && isset($this->config[$key]))
-		{
-			return false;
-		}
-
-		if (!isset($this->config[$key]))
-		{
-			$sql = 'INSERT INTO ' . $this->table . ' ' . $this->db->sql_build_array('INSERT', array(
-				'config_name'	=> $key,
-				'config_value'	=> $new_value,
-				'is_dynamic'	=> ($use_cache) ? 0 : 1));
-			$this->db->sql_query($sql);
-		}
-
-		if ($use_cache)
-		{
-			$this->cache->destroy('config');
-		}
-
-		$this->config[$key] = $new_value;
-		return true;
-	}
-
-	/**
-	* Increments an integer config value directly in the database.
-	*
-	* Using this method instead of setting the new value directly avoids race
-	* conditions and unlike set_atomic it cannot fail.
-	*
-	* @param string $key       The configuration option's name
-	* @param int    $increment Amount to increment by
-	* @param bool   $use_cache Whether this variable should be cached or if it
-	*                          changes too frequently to be efficiently cached.
-	*/
-	function increment($key, $increment, $use_cache = true)
-	{
-		if (!isset($this->config[$key]))
-		{
-			$this->set($key, '0', $use_cache);
-		}
-
-		$sql_update = $this->db->cast_expr_to_string($this->db->cast_expr_to_bigint('config_value') . ' + ' . (int) $increment);
-
-		$this->db->sql_query('UPDATE ' . $this->table . '
-			SET config_value = ' . $sql_update . "
-			WHERE config_name = '" . $this->db->sql_escape($key) . "'");
-
-		if ($use_cache)
-		{
-			$this->cache->destroy('config');
-		}
-
-		$this->config[$key] += $increment;
-	}
-}
diff --git a/phpBB/includes/config/db_text.php b/phpBB/includes/config/db_text.php
deleted file mode 100644
index b365cb5c77..0000000000
--- a/phpBB/includes/config/db_text.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Manages configuration options with an arbitrary length value stored in a TEXT
-* column. In constrast to class phpbb_config_db, values are never cached and
-* prefetched, but every get operation sends a query to the database.
-*
-* @package phpBB3
-*/
-class phpbb_config_db_text
-{
-	/**
-	* Database connection
-	* @var phpbb_db_driver
-	*/
-	protected $db;
-
-	/**
-	* Name of the database table used.
-	* @var string
-	*/
-	protected $table;
-
-	/**
-	* @param phpbb_db_driver $db        Database connection
-	* @param string          $table     Table name
-	*/
-	public function __construct(phpbb_db_driver $db, $table)
-	{
-		$this->db = $db;
-		$this->table = $this->db->sql_escape($table);
-	}
-
-	/**
-	* Sets the configuration option with the name $key to $value.
-	*
-	* @param string $key       The configuration option's name
-	* @param string $value     New configuration value
-	*
-	* @return null
-	*/
-	public function set($key, $value)
-	{
-		$this->set_array(array($key => $value));
-	}
-
-	/**
-	* Gets the configuration value for the name $key.
-	*
-	* @param string $key       The configuration option's name
-	*
-	* @return string|null      String result on success
-	*                          null if there is no such option
-	*/
-	public function get($key)
-	{
-		$map = $this->get_array(array($key));
-
-		return isset($map[$key]) ? $map[$key] : null;
-	}
-
-	/**
-	* Removes the configuration option with the name $key.
-	*
-	* @param string $key       The configuration option's name
-	*
-	* @return null
-	*/
-	public function delete($key)
-	{
-		$this->delete_array(array($key));
-	}
-
-	/**
-	* Mass set configuration options: Receives an associative array,
-	* treats array keys as configuration option names and associated
-	* array values as their configuration option values.
-	*
-	* @param array $map        Map from configuration names to values
-	*
-	* @return null
-	*/
-	public function set_array(array $map)
-	{
-		$this->db->sql_transaction('begin');
-
-		foreach ($map as $key => $value)
-		{
-			$sql = 'UPDATE ' . $this->table . "
-				SET config_value = '" . $this->db->sql_escape($value) . "'
-				WHERE config_name = '" . $this->db->sql_escape($key) . "'";
-			$result = $this->db->sql_query($sql);
-
-			if (!$this->db->sql_affectedrows($result))
-			{
-				$sql = 'INSERT INTO ' . $this->table . ' ' . $this->db->sql_build_array('INSERT', array(
-					'config_name'	=> $key,
-					'config_value'	=> $value,
-				));
-				$this->db->sql_query($sql);
-			}
-		}
-
-		$this->db->sql_transaction('commit');
-	}
-
-	/**
-	* Mass get configuration options: Receives a set of configuration
-	* option names and returns the result as a key => value map where
-	* array keys are configuration option names and array values are
-	* associated config option values.
-	*
-	* @param array $keys       Set of configuration option names
-	*
-	* @return array            Map from configuration names to values
-	*/
-	public function get_array(array $keys)
-	{
-		$sql = 'SELECT *
-			FROM ' . $this->table . '
-			WHERE ' . $this->db->sql_in_set('config_name', $keys, false, true);
-		$result = $this->db->sql_query($sql);
-
-		$map = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$map[$row['config_name']] = $row['config_value'];
-		}
-		$this->db->sql_freeresult($result);
-
-		return $map;
-	}
-
-	/**
-	* Mass delete configuration options.
-	*
-	* @param array $keys       Set of configuration option names
-	*
-	* @return null
-	*/
-	public function delete_array(array $keys)
-	{
-		$sql = 'DELETE
-			FROM ' . $this->table . '
-			WHERE ' . $this->db->sql_in_set('config_name', $keys, false, true);
-		$result = $this->db->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/content_visibility.php b/phpBB/includes/content_visibility.php
deleted file mode 100644
index 4ad5f6793e..0000000000
--- a/phpBB/includes/content_visibility.php
+++ /dev/null
@@ -1,651 +0,0 @@
-<?php
-/**
-*
-* @package phpbb
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* phpbb_visibility
-* Handle fetching and setting the visibility for topics and posts
-* @package phpbb
-*/
-class phpbb_content_visibility
-{
-	/**
-	* Database object
-	* @var phpbb_db_driver
-	*/
-	protected $db;
-
-	/**
-	* User object
-	* @var phpbb_user
-	*/
-	protected $user;
-
-	/**
-	* Auth object
-	* @var phpbb_auth
-	*/
-	protected $auth;
-
-	/**
-	* phpBB root path
-	* @var string
-	*/
-	protected $phpbb_root_path;
-
-	/**
-	* PHP Extension
-	* @var string
-	*/
-	protected $php_ext;
-
-	/**
-	* Constructor
-	*
-	* @param	phpbb_auth		$auth	Auth object
-	* @param	phpbb_db_driver	$db		Database object
-	* @param	phpbb_user		$user	User object
-	* @param	string		$phpbb_root_path	Root path
-	* @param	string		$php_ext			PHP Extension
-	* @return	null
-	*/
-	public function __construct(phpbb_auth $auth, phpbb_db_driver $db, phpbb_user $user, $phpbb_root_path, $php_ext, $forums_table, $posts_table, $topics_table, $users_table)
-	{
-		$this->auth = $auth;
-		$this->db = $db;
-		$this->user = $user;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->forums_table = $forums_table;
-		$this->posts_table = $posts_table;
-		$this->topics_table = $topics_table;
-		$this->users_table = $users_table;
-	}
-
-	/**
-	* Can the current logged-in user soft-delete posts?
-	*
-	* @param $forum_id		int		Forum ID whose permissions to check
-	* @param $poster_id		int		Poster ID of the post in question
-	* @param $post_locked	bool	Is the post locked?
-	* @return bool
-	*/
-	public function can_soft_delete($forum_id, $poster_id, $post_locked)
-	{
-		if ($this->auth->acl_get('m_softdelete', $forum_id))
-		{
-			return true;
-		}
-		else if ($this->auth->acl_get('f_softdelete', $forum_id) && $poster_id == $this->user->data['user_id'] && !$post_locked)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Get the topics post count or the forums post/topic count based on permissions
-	*
-	* @param $mode			string	One of topic_posts, forum_posts or forum_topics
-	* @param $data			array	Array with the topic/forum data to calculate from
-	* @param $forum_id		int		The forum id is used for permission checks
-	* @return int	Number of posts/topics the user can see in the topic/forum
-	*/
-	public function get_count($mode, $data, $forum_id)
-	{
-		if (!$this->auth->acl_get('m_approve', $forum_id))
-		{
-			return (int) $data[$mode . '_approved'];
-		}
-
-		return (int) $data[$mode . '_approved'] + (int) $data[$mode . '_unapproved'] + (int) $data[$mode . '_softdeleted'];
-	}
-
-	/**
-	* Create topic/post visibility SQL for a given forum ID
-	*
-	* Note: Read permissions are not checked.
-	*
-	* @param $mode			string	Either "topic" or "post"
-	* @param $forum_id		int		The forum id is used for permission checks
-	* @param $table_alias	string	Table alias to prefix in SQL queries
-	* @return string	The appropriate combination SQL logic for topic/post_visibility
-	*/
-	public function get_visibility_sql($mode, $forum_id, $table_alias = '')
-	{
-		if ($this->auth->acl_get('m_approve', $forum_id))
-		{
-			return '1 = 1';
-		}
-
-		return $table_alias . $mode . '_visibility = ' . ITEM_APPROVED;
-	}
-
-	/**
-	* Create topic/post visibility SQL for a set of forums
-	*
-	* Note: Read permissions are not checked. Forums without read permissions
-	*		should not be in $forum_ids
-	*
-	* @param $mode			string	Either "topic" or "post"
-	* @param $forum_ids		array	Array of forum ids which the posts/topics are limited to
-	* @param $table_alias	string	Table alias to prefix in SQL queries
-	* @return string	The appropriate combination SQL logic for topic/post_visibility
-	*/
-	public function get_forums_visibility_sql($mode, $forum_ids = array(), $table_alias = '')
-	{
-		$where_sql = '(';
-
-		$approve_forums = array_intersect($forum_ids, array_keys($this->auth->acl_getf('m_approve', true)));
-
-		if (sizeof($approve_forums))
-		{
-			// Remove moderator forums from the rest
-			$forum_ids = array_diff($forum_ids, $approve_forums);
-
-			if (!sizeof($forum_ids))
-			{
-				// The user can see all posts/topics in all specified forums
-				return $this->db->sql_in_set($table_alias . 'forum_id', $approve_forums);
-			}
-			else
-			{
-				// Moderator can view all posts/topics in some forums
-				$where_sql .= $this->db->sql_in_set($table_alias . 'forum_id', $approve_forums) . ' OR ';
-			}
-		}
-		else
-		{
-			// The user is just a normal user
-			return $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . '
-				AND ' . $this->db->sql_in_set($table_alias . 'forum_id', $forum_ids, false, true);
-		}
-
-		$where_sql .= '(' . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . '
-			AND ' . $this->db->sql_in_set($table_alias . 'forum_id', $forum_ids) . '))';
-
-		return $where_sql;
-	}
-
-	/**
-	* Create topic/post visibility SQL for all forums on the board
-	*
-	* Note: Read permissions are not checked. Forums without read permissions
-	*		should be in $exclude_forum_ids
-	*
-	* @param $mode				string	Either "topic" or "post"
-	* @param $exclude_forum_ids	array	Array of forum ids which are excluded
-	* @param $table_alias		string	Table alias to prefix in SQL queries
-	* @return string	The appropriate combination SQL logic for topic/post_visibility
-	*/
-	public function get_global_visibility_sql($mode, $exclude_forum_ids = array(), $table_alias = '')
-	{
-		$where_sqls = array();
-
-		$approve_forums = array_diff(array_keys($this->auth->acl_getf('m_approve', true)), $exclude_forum_ids);
-
-		if (sizeof($exclude_forum_ids))
-		{
-			$where_sqls[] = '(' . $this->db->sql_in_set($table_alias . 'forum_id', $exclude_forum_ids, true) . '
-				AND ' . $table_alias . $mode . '_visibility = ' . ITEM_APPROVED . ')';
-		}
-		else
-		{
-			$where_sqls[] = $table_alias . $mode . '_visibility = ' . ITEM_APPROVED;
-		}
-
-		if (sizeof($approve_forums))
-		{
-			$where_sqls[] = $this->db->sql_in_set($table_alias . 'forum_id', $approve_forums);
-			return '(' . implode(' OR ', $where_sqls) . ')';
-		}
-
-		// There is only one element, so we just return that one
-		return $where_sqls[0];
-	}
-
-	/**
-	* Change visibility status of one post or all posts of a topic
-	*
-	* @param $visibility	int		Element of {ITEM_APPROVED, ITEM_DELETED}
-	* @param $post_id		mixed	Post ID or array of post IDs to act on,
-	*								if it is empty, all posts of topic_id will be modified
-	* @param $topic_id		int		Topic where $post_id is found
-	* @param $forum_id		int		Forum where $topic_id is found
-	* @param $user_id		int		User performing the action
-	* @param $time			int		Timestamp when the action is performed
-	* @param $reason		string	Reason why the visibilty was changed.
-	* @param $is_starter	bool	Is this the first post of the topic changed?
-	* @param $is_latest		bool	Is this the last post of the topic changed?
-	* @param $limit_visibility	mixed	Limit updating per topic_id to a certain visibility
-	* @param $limit_delete_time	mixed	Limit updating per topic_id to a certain deletion time
-	* @return array		Changed post data, empty array if an error occured.
-	*/
-	public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $user_id, $time, $reason, $is_starter, $is_latest, $limit_visibility = false, $limit_delete_time = false)
-	{
-		if (!in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
-		{
-			return array();
-		}
-
-		if ($post_id)
-		{
-			if (is_array($post_id))
-			{
-				$where_sql = $this->db->sql_in_set('post_id', array_map('intval', $post_id));
-			}
-			else
-			{
-				$where_sql = 'post_id = ' . (int) $post_id;
-			}
-			$where_sql .= ' AND topic_id = ' . (int) $topic_id;
-		}
-		else
-		{
-			$where_sql = 'topic_id = ' . (int) $topic_id;
-
-			// Limit the posts to a certain visibility and deletion time
-			// This allows us to only restore posts, that were approved
-			// when the topic got soft deleted. So previous soft deleted
-			// and unapproved posts are still soft deleted/unapproved
-			if ($limit_visibility !== false)
-			{
-				$where_sql .= ' AND post_visibility = ' . (int) $limit_visibility;
-			}
-
-			if ($limit_delete_time !== false)
-			{
-				$where_sql .= ' AND post_delete_time = ' . (int) $limit_delete_time;
-			}
-		}
-
-		$sql = 'SELECT poster_id, post_id, post_postcount, post_visibility
-			FROM ' . $this->posts_table . '
-			WHERE ' . $where_sql;
-		$result = $this->db->sql_query($sql);
-
-		$post_ids = $poster_postcounts = $postcounts = $postcount_visibility = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$post_ids[] = (int) $row['post_id'];
-
-			if ($row['post_visibility'] != $visibility)
-			{
-				if ($row['post_postcount'] && !isset($poster_postcounts[(int) $row['poster_id']]))
-				{
-					$poster_postcounts[(int) $row['poster_id']] = 1;
-				}
-				else if ($row['post_postcount'])
-				{
-					$poster_postcounts[(int) $row['poster_id']]++;
-				}
-
-				if (!isset($postcount_visibility[$row['post_visibility']]))
-				{
-					$postcount_visibility[$row['post_visibility']] = 1;
-				}
-				else
-				{
-					$postcount_visibility[$row['post_visibility']]++;
-				}
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($post_ids))
-		{
-			return array();
-		}
-
-		$data = array(
-			'post_visibility'		=> (int) $visibility,
-			'post_delete_user'		=> (int) $user_id,
-			'post_delete_time'		=> ((int) $time) ?: time(),
-			'post_delete_reason'	=> truncate_string($reason, 255, 255, false),
-		);
-
-		$sql = 'UPDATE ' . $this->posts_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $data) . '
-			WHERE ' . $this->db->sql_in_set('post_id', $post_ids);
-		$this->db->sql_query($sql);
-
-		// Group the authors by post count, to reduce the number of queries
-		foreach ($poster_postcounts as $poster_id => $num_posts)
-		{
-			$postcounts[$num_posts][] = $poster_id;
-		}
-
-		// Update users postcounts
-		foreach ($postcounts as $num_posts => $poster_ids)
-		{
-			if ($visibility == ITEM_DELETED)
-			{
-				$sql = 'UPDATE ' . $this->users_table . '
-					SET user_posts = 0
-					WHERE ' . $this->db->sql_in_set('user_id', $poster_ids) . '
-						AND user_posts < ' . $num_posts;
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . $this->users_table . '
-					SET user_posts = user_posts - ' . $num_posts . '
-					WHERE ' . $this->db->sql_in_set('user_id', $poster_ids) . '
-						AND user_posts >= ' . $num_posts;
-				$this->db->sql_query($sql);
-			}
-			else
-			{
-				$sql = 'UPDATE ' . $this->users_table . '
-					SET user_posts = user_posts + ' . $num_posts . '
-					WHERE ' . $this->db->sql_in_set('user_id', $poster_ids);
-				$this->db->sql_query($sql);
-			}
-		}
-
-		$update_topic_postcount = true;
-
-		// Sync the first/last topic information if needed
-		if (!$is_starter && $is_latest)
-		{
-			// update_post_information can only update the last post info ...
-			if ($topic_id)
-			{
-				update_post_information('topic', $topic_id, false);
-			}
-			if ($forum_id)
-			{
-				update_post_information('forum', $forum_id, false);
-			}
-		}
-		else if ($is_starter && $topic_id)
-		{
-			if (!function_exists('sync'))
-			{
-				include($this->phpbb_root_path . 'includes/functions_admin.' . $this->php_ext);
-			}
-
-			// ... so we need to use sync, if the first post is changed.
-			// The forum is resynced recursive by sync() itself.
-			sync('topic', 'topic_id', $topic_id, true);
-
-			// sync recalculates the topic replies and forum posts by itself, so we don't do that.
-			$update_topic_postcount = false;
-		}
-
-		// Update the topic's reply count and the forum's post count
-		if ($update_topic_postcount)
-		{
-			$cur_posts = $cur_unapproved_posts = $cur_softdeleted_posts = 0;
-			foreach ($postcount_visibility as $post_visibility => $visibility_posts)
-			{
-				// We need to substract the posts from the counters ...
-				if ($post_visibility == ITEM_APPROVED)
-				{
-					$cur_posts += $visibility_posts;
-				}
-				else if ($post_visibility == ITEM_UNAPPROVED)
-				{
-					$cur_unapproved_posts += $visibility_posts;
-				}
-				else if ($post_visibility == ITEM_DELETED)
-				{
-					$cur_softdeleted_posts += $visibility_posts;
-				}
-			}
-
-			$sql_ary = array();
-			if ($visibility == ITEM_DELETED)
-			{
-				if ($cur_posts)
-				{
-					$sql_ary['posts_approved'] = ' - ' . $cur_posts;
-				}
-				if ($cur_unapproved_posts)
-				{
-					$sql_ary['posts_unapproved'] = ' - ' . $cur_unapproved_posts;
-				}
-				if ($cur_posts + $cur_unapproved_posts)
-				{
-					$sql_ary['posts_softdeleted'] = ' + ' . ($cur_posts + $cur_unapproved_posts);
-				}
-			}
-			else
-			{
-				if ($cur_unapproved_posts)
-				{
-					$sql_ary['posts_unapproved'] = ' - ' . $cur_unapproved_posts;
-				}
-				if ($cur_softdeleted_posts)
-				{
-					$sql_ary['posts_softdeleted'] = ' - ' . $cur_softdeleted_posts;
-				}
-				if ($cur_softdeleted_posts + $cur_unapproved_posts)
-				{
-					$sql_ary['posts_approved'] = ' + ' . ($cur_softdeleted_posts + $cur_unapproved_posts);
-				}
-			}
-
-			if (sizeof($sql_ary))
-			{
-				$topic_sql = $forum_sql = array();
-
-				foreach ($sql_ary as $field => $value_change)
-				{
-					$topic_sql[] = 'topic_' . $field . ' = topic_' . $field . $value_change;
-					$forum_sql[] = 'forum_' . $field . ' = forum_' . $field . $value_change;
-				}
-
-				// Update the number for replies and posts
-				$sql = 'UPDATE ' . $this->topics_table . '
-					SET ' . implode(', ', $topic_sql) . '
-					WHERE topic_id = ' . (int) $topic_id;
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . $this->forums_table . '
-					SET ' . implode(', ', $forum_sql) . '
-					WHERE forum_id = ' . (int) $forum_id;
-				$this->db->sql_query($sql);
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	* Set topic visibility
-	*
-	* Allows approving (which is akin to undeleting/restore) or soft deleting an entire topic.
-	* Calls set_post_visibility as needed.
-	*
-	* Note: By default, when a soft deleted topic is restored. Only posts that
-	*		were approved at the time of soft deleting, are being restored.
-	*		Same applies to soft deleting. Only approved posts will be marked
-	*		as soft deleted.
-	*		If you want to update all posts, use the force option.
-	*
-	* @param $visibility	int		Element of {ITEM_APPROVED, ITEM_DELETED}
-	* @param $topic_id		mixed	Topic ID to act on
-	* @param $forum_id		int		Forum where $topic_id is found
-	* @param $user_id		int		User performing the action
-	* @param $time			int		Timestamp when the action is performed
-	* @param $reason		string	Reason why the visibilty was changed.
-	* @param $force_update_all	bool	Force to update all posts within the topic
-	* @return array		Changed topic data, empty array if an error occured.
-	*/
-	public function set_topic_visibility($visibility, $topic_id, $forum_id, $user_id, $time, $reason, $force_update_all = false)
-	{
-		if (!in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
-		{
-			return array();
-		}
-
-		if (!$force_update_all)
-		{
-			$sql = 'SELECT topic_visibility, topic_delete_time
-				FROM ' . $this->topics_table . '
-				WHERE topic_id = ' . (int) $topic_id;
-			$result = $this->db->sql_query($sql);
-			$original_topic_data = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$original_topic_data)
-			{
-				// The topic does not exist...
-				return array();
-			}
-		}
-
-		// Note, we do not set a reason for the posts, just for the topic
-		$data = array(
-			'topic_visibility'		=> (int) $visibility,
-			'topic_delete_user'		=> (int) $user_id,
-			'topic_delete_time'		=> ((int) $time) ?: time(),
-			'topic_delete_reason'	=> truncate_string($reason, 255, 255, false),
-		);
-
-		$sql = 'UPDATE ' . $this->topics_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $data) . '
-			WHERE topic_id = ' . (int) $topic_id;
-		$this->db->sql_query($sql);
-
-		if (!$this->db->sql_affectedrows())
-		{
-			return array();
-		}
-
-		if (!$force_update_all && $original_topic_data['topic_delete_time'] && $original_topic_data['topic_visibility'] == ITEM_DELETED && $visibility == ITEM_APPROVED)
-		{
-			// If we're restoring a topic we only restore posts, that were soft deleted through the topic soft deletion.
-			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true, $original_topic_data['topic_visibility'], $original_topic_data['topic_delete_time']);
-		}
-		else if (!$force_update_all && $original_topic_data['topic_visibility'] == ITEM_APPROVED && $visibility == ITEM_DELETED)
-		{
-			// If we're soft deleting a topic we only approved posts are soft deleted.
-			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true, $original_topic_data['topic_visibility']);
-		}
-		else
-		{
-			self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true);
-		}
-
-		return $data;
-	}
-
-	/**
-	* Add post to topic and forum statistics
-	*
-	* @param $data			array	Contains information from the topics table about given topic
-	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
-	* @return void
-	*/
-	public function add_post_to_statistic($data, &$sql_data)
-	{
-		$sql_data[$this->topics_table] = (($sql_data[$this->topics_table]) ? $sql_data[$this->topics_table] . ', ' : '') . 'topic_posts_approved = topic_posts_approved + 1';
-
-		$sql_data[$this->forums_table] = (($sql_data[$this->forums_table]) ? $sql_data[$this->forums_table] . ', ' : '') . 'forum_posts_approved = forum_posts_approved + 1';
-
-		if ($data['post_postcount'])
-		{
-			$sql_data[$this->users_table] = (($sql_data[$this->users_table]) ? $sql_data[$this->users_table] . ', ' : '') . 'user_posts = user_posts + 1';
-		}
-
-		set_config_count('num_posts', 1, true);
-	}
-
-	/**
-	* Remove post from topic and forum statistics
-	*
-	* @param $data			array	Contains information from the topics table about given topic
-	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
-	* @return void
-	*/
-	public function remove_post_from_statistic($data, &$sql_data)
-	{
-		$sql_data[$this->topics_table] = ((!empty($sql_data[$this->topics_table])) ? $sql_data[$this->topics_table] . ', ' : '') . 'topic_posts_approved = topic_posts_approved - 1';
-		$sql_data[$this->forums_table] = ((!empty($sql_data[$this->forums_table])) ? $sql_data[$this->forums_table] . ', ' : '') . 'forum_posts_approved = forum_posts_approved - 1';
-
-		if ($data['post_postcount'])
-		{
-			$sql_data[$this->users_table] = ((!empty($sql_data[$this->users_table])) ? $sql_data[$this->users_table] . ', ' : '') . 'user_posts = user_posts - 1';
-		}
-
-		set_config_count('num_posts', -1, true);
-	}
-
-	/**
-	* Remove topic from forum statistics
-	*
-	* @param $topic_id		int		The topic to act on
-	* @param $forum_id		int		Forum where the topic is found
-	* @param $topic_row		array	Contains information from the topic, may be empty at call time
-	* @param $sql_data		array	Populated with the SQL changes, may be empty at call time
-	* @return void
-	*/
-	public function remove_topic_from_statistic($topic_id, $forum_id, &$topic_row, &$sql_data)
-	{
-		// Do we need to grab some topic informations?
-		if (!sizeof($topic_row))
-		{
-			$sql = 'SELECT topic_type, topic_posts_approved, topic_posts_unapproved, topic_posts_softdeleted, topic_visibility
-				FROM ' . $this->topics_table . '
-				WHERE topic_id = ' . (int) $topic_id;
-			$result = $this->db->sql_query($sql);
-			$topic_row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-		}
-
-		// If this is an edited topic or the first post the topic gets completely disapproved later on...
-		$sql_data[$this->forums_table] = (($sql_data[$this->forums_table]) ? $sql_data[$this->forums_table] . ', ' : '') . 'forum_topics_approved = forum_topics_approved - 1';
-		$sql_data[$this->forums_table] .= ', forum_posts_approved = forum_posts_approved - ' . $topic_row['topic_posts_approved'];
-		$sql_data[$this->forums_table] .= ', forum_posts_unapproved = forum_posts_unapproved - ' . $topic_row['topic_posts_unapproved'];
-		$sql_data[$this->forums_table] .= ', forum_posts_softdeleted = forum_posts_softdeleted - ' . $topic_row['topic_posts_softdeleted'];
-
-		set_config_count('num_topics', -1, true);
-		set_config_count('num_posts', $topic_row['topic_posts_approved'] * (-1), true);
-
-		// Get user post count information
-		$sql = 'SELECT poster_id, COUNT(post_id) AS num_posts
-			FROM ' . $this->posts_table . '
-			WHERE topic_id = ' . (int) $topic_id . '
-				AND post_postcount = 1
-				AND post_visibility = ' . ITEM_APPROVED . '
-			GROUP BY poster_id';
-		$result = $this->db->sql_query($sql);
-
-		$postcounts = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$postcounts[(int) $row['num_posts']][] = (int) $row['poster_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		// Decrement users post count
-		foreach ($postcounts as $num_posts => $poster_ids)
-		{
-			$sql = 'UPDATE ' . $this->users_table . '
-				SET user_posts = 0
-				WHERE user_posts < ' . $num_posts . '
-					AND ' . $this->db->sql_in_set('user_id', $poster_ids);
-			$this->db->sql_query($sql);
-
-			$sql = 'UPDATE ' . $this->users_table . '
-				SET user_posts = user_posts - ' . $num_posts . '
-				WHERE user_posts >= ' . $num_posts . '
-					AND ' . $this->db->sql_in_set('user_id', $poster_ids);
-			$this->db->sql_query($sql);
-		}
-	}
-}
diff --git a/phpBB/includes/controller/exception.php b/phpBB/includes/controller/exception.php
deleted file mode 100644
index faa8b6b584..0000000000
--- a/phpBB/includes/controller/exception.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
-*
-* @package controller
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Controller exception class
-* @package phpBB3
-*/
-class phpbb_controller_exception extends RuntimeException
-{
-}
diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php
deleted file mode 100644
index 74410ddfd1..0000000000
--- a/phpBB/includes/controller/helper.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
-*
-* @package controller
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\HttpFoundation\Response;
-
-/**
-* Controller helper class, contains methods that do things for controllers
-* @package phpBB3
-*/
-class phpbb_controller_helper
-{
-	/**
-	* Template object
-	* @var phpbb_template
-	*/
-	protected $template;
-
-	/**
-	* User object
-	* @var phpbb_user
-	*/
-	protected $user;
-
-	/**
-	* phpBB root path
-	* @var string
-	*/
-	protected $phpbb_root_path;
-
-	/**
-	* PHP extension
-	* @var string
-	*/
-	protected $php_ext;
-
-	/**
-	* Constructor
-	*
-	* @param phpbb_template $template Template object
-	* @param phpbb_user $user User object
-	* @param string $phpbb_root_path phpBB root path
-	* @param string $php_ext PHP extension
-	*/
-	public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext)
-	{
-		$this->template = $template;
-		$this->user = $user;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	* Automate setting up the page and creating the response object.
-	*
-	* @param string $handle The template handle to render
-	* @param string $page_title The title of the page to output
-	* @param int $status_code The status code to be sent to the page header
-	* @return Response object containing rendered page
-	*/
-	public function render($template_file, $page_title = '', $status_code = 200)
-	{
-		page_header($page_title);
-
-		$this->template->set_filenames(array(
-			'body'	=> $template_file,
-		));
-
-		page_footer(true, false, false);
-
-		return new Response($this->template->assign_display('body'), $status_code);
-	}
-
-	/**
-	* Generate a URL
-	*
-	* @param string	$route		The route to travel
-	* @param mixed	$params		String or array of additional url parameters
-	* @param bool	$is_amp		Is url using &amp; (true) or & (false)
-	* @param string	$session_id	Possibility to use a custom session id instead of the global one
-	* @return string The URL already passed through append_sid()
-	*/
-	public function url($route, $params = false, $is_amp = true, $session_id = false)
-	{
-		$route_params = '';
-		if (($route_delim = strpos($route, '?')) !== false)
-		{
-			$route_params = substr($route, $route_delim);
-			$route = substr($route, 0, $route_delim);
-		}
-
-		if (is_array($params) && !empty($params))
-		{
-			$params = array_merge(array(
-				'controller' => $route,
-			), $params);
-		}
-		else if (is_string($params) && $params)
-		{
-			$params = 'controller=' . $route . (($is_amp) ? '&amp;' : '&') . $params;
-		}
-		else
-		{
-			$params = array('controller' => $route);
-		}
-
-		return append_sid($this->phpbb_root_path . 'app.' . $this->php_ext . $route_params, $params, $is_amp, $session_id);
-	}
-
-	/**
-	* Output an error, effectively the same thing as trigger_error
-	*
-	* @param string $message The error message
-	* @param string $code The error code (e.g. 404, 500, 503, etc.)
-	* @return Response A Reponse instance
-	*/
-	public function error($message, $code = 500)
-	{
-		$this->template->assign_vars(array(
-			'MESSAGE_TEXT'	=> $message,
-			'MESSAGE_TITLE'	=> $this->user->lang('INFORMATION'),
-		));
-
-		return $this->render('message_body.html', $this->user->lang('INFORMATION'), $code);
-	}
-}
diff --git a/phpBB/includes/controller/provider.php b/phpBB/includes/controller/provider.php
deleted file mode 100644
index b2a5b9f6b2..0000000000
--- a/phpBB/includes/controller/provider.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
-*
-* @package controller
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Loader\YamlFileLoader;
-use Symfony\Component\Config\FileLocator;
-
-/**
-* Controller interface
-* @package phpBB3
-*/
-class phpbb_controller_provider
-{
-	/**
-	* YAML file(s) containing route information
-	* @var array
-	*/
-	protected $routing_paths;
-
-	/**
-	* Construct method
-	*
-	* @param array() $routing_paths Array of strings containing paths
-	*							to YAML files holding route information
-	*/
-	public function __construct($routing_paths = array())
-	{
-		$this->routing_paths = $routing_paths;
-	}
-
-	/**
-	* Locate paths containing routing files
-	* This sets an internal property but does not return the paths.
-	*
-	* @return The current instance of this object for method chaining
-	*/
-	public function import_paths_from_finder(phpbb_extension_finder $finder)
-	{
-		// We hardcode the path to the core config directory
-		// because the finder cannot find it
-		$this->routing_paths = array_merge(array('config'), array_map('dirname', array_keys($finder
-			->directory('config')
-			->prefix('routing')
-			->suffix('yml')
-			->find()
-		)));
-
-		return $this;
-	}
-
-	/**
-	* Get a list of controllers and return it
-	*
-	* @param string $base_path Base path to prepend to file paths
-	* @return array Array of controllers and their route information
-	*/
-	public function find($base_path = '')
-	{
-		$routes = new RouteCollection;
-		foreach ($this->routing_paths as $path)
-		{
-			$loader = new YamlFileLoader(new FileLocator($base_path . $path));
-			$routes->addCollection($loader->load('routing.yml'));
-		}
-
-		return $routes;
-	}
-}
diff --git a/phpBB/includes/controller/resolver.php b/phpBB/includes/controller/resolver.php
deleted file mode 100644
index 95dfc8da8e..0000000000
--- a/phpBB/includes/controller/resolver.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
-*
-* @package controller
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
-* Controller manager class
-* @package phpBB3
-*/
-class phpbb_controller_resolver implements ControllerResolverInterface
-{
-	/**
-	* User object
-	* @var phpbb_user
-	*/
-	protected $user;
-
-	/**
-	* ContainerInterface object
-	* @var ContainerInterface
-	*/
-	protected $container;
-
-	/**
-	* phpbb_style object
-	* @var phpbb_style
-	*/
-	protected $style;
-
-	/**
-	* Construct method
-	*
-	* @param phpbb_user $user User Object
-	* @param ContainerInterface $container ContainerInterface object
-	* @param phpbb_style $style
-	*/
-	public function __construct(phpbb_user $user, ContainerInterface $container, phpbb_style $style = null)
-	{
-		$this->user = $user;
-		$this->container = $container;
-		$this->style = $style;
-	}
-
-	/**
-	* Load a controller callable
-	*
-	* @param Symfony\Component\HttpFoundation\Request $request Symfony Request object
-	* @return bool|Callable Callable or false
-	* @throws phpbb_controller_exception
-	*/
-	public function getController(Request $request)
-	{
-		$controller = $request->attributes->get('_controller');
-
-		if (!$controller)
-		{
-			throw new phpbb_controller_exception($this->user->lang['CONTROLLER_NOT_SPECIFIED']);
-		}
-
-		// Require a method name along with the service name
-		if (stripos($controller, ':') === false)
-		{
-			throw new phpbb_controller_exception($this->user->lang['CONTROLLER_METHOD_NOT_SPECIFIED']);
-		}
-
-		list($service, $method) = explode(':', $controller);
-
-		if (!$this->container->has($service))
-		{
-			throw new phpbb_controller_exception($this->user->lang('CONTROLLER_SERVICE_UNDEFINED', $service));
-		}
-
-		$controller_object = $this->container->get($service);
-
-		/*
-		* If this is an extension controller, we'll try to automatically set
-		* the style paths for the extension (the ext author can change them
-		* if necessary).
-		*/
-		$controller_dir = explode('_', get_class($controller_object));
-
-		// 0 phpbb, 1 ext, 2 vendor, 3 extension name, ...
-		if (!is_null($this->style) && isset($controller_dir[3]) && $controller_dir[1] === 'ext')
-		{
-			$controller_style_dir = 'ext/' . $controller_dir[2] . '/' . $controller_dir[3] . '/styles';
-
-			if (is_dir($controller_style_dir))
-			{
-				$this->style->set_style(array($controller_style_dir, 'styles'));
-			}
-		}
-
-		return array($controller_object, $method);
-	}
-
-	/**
-	* Dependencies should be specified in the service definition and can be
-	* then accessed in __construct(). Arguments are sent through the URL path
-	* and should match the parameters of the method you are using as your
-	* controller.
-	*
-	* @param Symfony\Component\HttpFoundation\Request $request Symfony Request object
-	* @param mixed $controller A callable (controller class, method)
-	* @return bool False
-	* @throws phpbb_controller_exception
-	*/
-	public function getArguments(Request $request, $controller)
-	{
-		// At this point, $controller contains the object and method name
-		list($object, $method) = $controller;
-		$mirror = new ReflectionMethod($object, $method);
-
-		$arguments = array();
-		$parameters = $mirror->getParameters();
-		$attributes = $request->attributes->all();
-		foreach ($parameters as $param)
-		{
-			if (array_key_exists($param->name, $attributes))
-			{
-				$arguments[] = $attributes[$param->name];
-			}
-			else if ($param->getClass() && $param->getClass()->isInstance($request))
-			{
-				$arguments[] = $request;
-			}
-			else if ($param->isDefaultValueAvailable())
-			{
-				$arguments[] = $param->getDefaultValue();
-			}
-			else
-			{
-				throw new phpbb_controller_exception($this->user->lang('CONTROLLER_ARGUMENT_VALUE_MISSING', $param->getPosition() + 1, get_class($object) . ':' . $method, $param->name));
-			}
-		}
-
-		return $arguments;
-	}
-}
diff --git a/phpBB/includes/cron/manager.php b/phpBB/includes/cron/manager.php
deleted file mode 100644
index 84c9650830..0000000000
--- a/phpBB/includes/cron/manager.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Cron manager class.
-*
-* Finds installed cron tasks, stores task objects, provides task selection.
-*
-* @package phpBB3
-*/
-class phpbb_cron_manager
-{
-	/**
-	* Set of phpbb_cron_task_wrapper objects.
-	* Array holding all tasks that have been found.
-	*
-	* @var array
-	*/
-	protected $tasks = array();
-
-	protected $phpbb_root_path;
-	protected $php_ext;
-
-	/**
-	* Constructor. Loads all available tasks.
-	*
-	* @param array|Traversable $tasks Provides an iterable set of task names
-	*/
-	public function __construct($tasks, $phpbb_root_path, $php_ext)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-
-		$this->load_tasks($tasks);
-	}
-
-	/**
-	* Loads tasks given by name, wraps them
-	* and puts them into $this->tasks.
-	*
-	* @param array|Traversable $tasks		Array of instances of phpbb_cron_task
-	*
-	* @return null
-	*/
-	public function load_tasks($tasks)
-	{
-		foreach ($tasks as $task)
-		{
-			$this->tasks[] = $this->wrap_task($task);
-		}
-	}
-
-	/**
-	* Finds a task that is ready to run.
-	*
-	* If several tasks are ready, any one of them could be returned.
-	*
-	* If no tasks are ready, null is returned.
-	*
-	* @return phpbb_cron_task_wrapper|null
-	*/
-	public function find_one_ready_task()
-	{
-		foreach ($this->tasks as $task)
-		{
-			if ($task->is_ready())
-			{
-				return $task;
-			}
-		}
-		return null;
-	}
-
-	/**
-	* Finds all tasks that are ready to run.
-	*
-	* @return array		List of tasks which are ready to run (wrapped in phpbb_cron_task_wrapper).
-	*/
-	public function find_all_ready_tasks()
-	{
-		$tasks = array();
-		foreach ($this->tasks as $task)
-		{
-			if ($task->is_ready())
-			{
-				$tasks[] = $task;
-			}
-		}
-		return $tasks;
-	}
-
-	/**
-	* Finds a task by name.
-	*
-	* If there is no task with the specified name, null is returned.
-	*
-	* Web runner uses this method to resolve names to tasks.
-	*
-	* @param string				$name Name of the task to look up.
-	* @return phpbb_cron_task	A task corresponding to the given name, or null.
-	*/
-	public function find_task($name)
-	{
-		foreach ($this->tasks as $task)
-		{
-			if ($task->get_name() == $name)
-			{
-				return $task;
-			}
-		}
-		return null;
-	}
-
-	/**
-	* Wraps a task inside an instance of phpbb_cron_task_wrapper.
-	*
-	* @param  phpbb_cron_task 			$task The task.
-	* @return phpbb_cron_task_wrapper	The wrapped task.
-	*/
-	public function wrap_task(phpbb_cron_task $task)
-	{
-		return new phpbb_cron_task_wrapper($task, $this->phpbb_root_path, $this->php_ext);
-	}
-}
diff --git a/phpBB/includes/cron/task/base.php b/phpBB/includes/cron/task/base.php
deleted file mode 100644
index 94a2f267b4..0000000000
--- a/phpBB/includes/cron/task/base.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Cron task base class. Provides sensible defaults for cron tasks
-* and partially implements cron task interface, making writing cron tasks easier.
-*
-* At a minimum, subclasses must override the run() method.
-*
-* Cron tasks need not inherit from this base class. If desired,
-* they may implement cron task interface directly.
-*
-* @package phpBB3
-*/
-abstract class phpbb_cron_task_base implements phpbb_cron_task
-{
-	private $name;
-
-	/**
-	* Returns the name of the task.
-	*
-	* @return string		Name of wrapped task.
-	*/
-	public function get_name()
-	{
-		return $this->name;
-	}
-
-	/**
-	* Sets the name of the task.
-	*
-	* @param string	$name The task name
-	*/
-	public function set_name($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	* Returns whether this cron task can run, given current board configuration.
-	*
-	* For example, a cron task that prunes forums can only run when
-	* forum pruning is enabled.
-	*
-	* @return bool
-	*/
-	public function is_runnable()
-	{
-		return true;
-	}
-
-	/**
-	* Returns whether this cron task should run now, because enough time
-	* has passed since it was last run.
-	*
-	* @return bool
-	*/
-	public function should_run()
-	{
-		return true;
-	}
-}
diff --git a/phpBB/includes/cron/task/core/prune_all_forums.php b/phpBB/includes/cron/task/core/prune_all_forums.php
deleted file mode 100644
index 2c5d38cec0..0000000000
--- a/phpBB/includes/cron/task/core/prune_all_forums.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Prune all forums cron task.
-*
-* It is intended to be invoked from system cron.
-* This task will find all forums for which pruning is enabled, and will
-* prune all forums as necessary.
-*
-* @package phpBB3
-*/
-class phpbb_cron_task_core_prune_all_forums extends phpbb_cron_task_base
-{
-	protected $phpbb_root_path;
-	protected $php_ext;
-	protected $config;
-	protected $db;
-
-	/**
-	* Constructor.
-	*
-	* @param string $phpbb_root_path The root path
-	* @param string $php_ext The PHP extension
-	* @param phpbb_config $config The config
-	* @param phpbb_db_driver $db The db connection
-	*/
-	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_db_driver $db)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->config = $config;
-		$this->db = $db;
-	}
-
-	/**
-	* Runs this cron task.
-	*
-	* @return null
-	*/
-	public function run()
-	{
-		if (!function_exists('auto_prune'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_admin.' . $this->php_ext);
-		}
-
-		$sql = 'SELECT forum_id, prune_next, enable_prune, prune_days, prune_viewed, forum_flags, prune_freq
-			FROM ' . FORUMS_TABLE . "
-			WHERE enable_prune = 1
-				AND prune_next < " . time();
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if ($row['prune_days'])
-			{
-				auto_prune($row['forum_id'], 'posted', $row['forum_flags'], $row['prune_days'], $row['prune_freq']);
-			}
-
-			if ($row['prune_viewed'])
-			{
-				auto_prune($row['forum_id'], 'viewed', $row['forum_flags'], $row['prune_viewed'], $row['prune_freq']);
-			}
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	/**
-	* Returns whether this cron task can run, given current board configuration.
-	*
-	* This cron task will only run when system cron is utilised.
-	*
-	* @return bool
-	*/
-	public function is_runnable()
-	{
-		return (bool) $this->config['use_system_cron'];
-	}
-}
diff --git a/phpBB/includes/cron/task/core/prune_forum.php b/phpBB/includes/cron/task/core/prune_forum.php
deleted file mode 100644
index e3c497f072..0000000000
--- a/phpBB/includes/cron/task/core/prune_forum.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Prune one forum cron task.
-*
-* It is intended to be used when cron is invoked via web.
-* This task can decide whether it should be run using data obtained by viewforum
-* code, without making additional database queries.
-*
-* @package phpBB3
-*/
-class phpbb_cron_task_core_prune_forum extends phpbb_cron_task_base implements phpbb_cron_task_parametrized
-{
-	protected $phpbb_root_path;
-	protected $php_ext;
-	protected $config;
-	protected $db;
-
-	/**
-	* If $forum_data is given, it is assumed to contain necessary information
-	* about a single forum that is to be pruned.
-	*
-	* If $forum_data is not given, forum id will be retrieved via request_var
-	* and a database query will be performed to load the necessary information
-	* about the forum.
-	*/
-	protected $forum_data;
-
-	/**
-	* Constructor.
-	*
-	* @param string $phpbb_root_path The root path
-	* @param string $php_ext The PHP extension
-	* @param phpbb_config $config The config
-	* @param phpbb_db_driver $db The db connection
-	*/
-	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config, phpbb_db_driver $db)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->config = $config;
-		$this->db = $db;
-	}
-
-	/**
-	* Manually set forum data.
-	*
-	* @param array $forum_data Information about a forum to be pruned.
-	*/
-	public function set_forum_data($forum_data)
-	{
-		$this->forum_data = $forum_data;
-	}
-
-	/**
-	* Runs this cron task.
-	*
-	* @return null
-	*/
-	public function run()
-	{
-		if (!function_exists('auto_prune'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_admin.' . $this->php_ext);
-		}
-
-		if ($this->forum_data['prune_days'])
-		{
-			auto_prune($this->forum_data['forum_id'], 'posted', $this->forum_data['forum_flags'], $this->forum_data['prune_days'], $this->forum_data['prune_freq']);
-		}
-
-		if ($this->forum_data['prune_viewed'])
-		{
-			auto_prune($this->forum_data['forum_id'], 'viewed', $this->forum_data['forum_flags'], $this->forum_data['prune_viewed'], $this->forum_data['prune_freq']);
-		}
-	}
-
-	/**
-	* Returns whether this cron task can run, given current board configuration.
-	*
-	* This cron task will not run when system cron is utilised, as in
-	* such cases prune_all_forums task would run instead.
-	*
-	* Additionally, this task must be given the forum data, either via
-	* the constructor or parse_parameters method.
-	*
-	* @return bool
-	*/
-	public function is_runnable()
-	{
-		return !$this->config['use_system_cron'] && $this->forum_data;
-	}
-
-	/**
-	* Returns whether this cron task should run now, because enough time
-	* has passed since it was last run.
-	*
-	* Forum pruning interval is specified in the forum data.
-	*
-	* @return bool
-	*/
-	public function should_run()
-	{
-		return $this->forum_data['enable_prune'] && $this->forum_data['prune_next'] < time();
-	}
-
-	/**
-	* Returns parameters of this cron task as an array.
-	* The array has one key, f, whose value is id of the forum to be pruned.
-	*
-	* @return array
-	*/
-	public function get_parameters()
-	{
-		return array('f' => $this->forum_data['forum_id']);
-	}
-
-	/**
-	* Parses parameters found in $request, which is an instance of
-	* phpbb_request_interface.
-	*
-	* It is expected to have a key f whose value is id of the forum to be pruned.
-	*
-	* @param phpbb_request_interface $request Request object.
-	*
-	* @return null
-	*/
-	public function parse_parameters(phpbb_request_interface $request)
-	{
-		$this->forum_data = null;
-		if ($request->is_set('f'))
-		{
-			$forum_id = $request->variable('f', 0);
-
-			$sql = 'SELECT forum_id, prune_next, enable_prune, prune_days, prune_viewed, forum_flags, prune_freq
-				FROM ' . FORUMS_TABLE . "
-				WHERE forum_id = $forum_id";
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if ($row)
-			{
-				$this->forum_data = $row;
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/cron/task/core/queue.php b/phpBB/includes/cron/task/core/queue.php
deleted file mode 100644
index 732f9c6bea..0000000000
--- a/phpBB/includes/cron/task/core/queue.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Queue cron task. Sends email and jabber messages queued by other scripts.
-*
-* @package phpBB3
-*/
-class phpbb_cron_task_core_queue extends phpbb_cron_task_base
-{
-	protected $phpbb_root_path;
-	protected $php_ext;
-	protected $config;
-
-	/**
-	* Constructor.
-	*
-	* @param string $phpbb_root_path The root path
-	* @param string $php_ext The PHP extension
-	* @param phpbb_config $config The config
-	*/
-	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->config = $config;
-	}
-
-	/**
-	* Runs this cron task.
-	*
-	* @return null
-	*/
-	public function run()
-	{
-		if (!class_exists('queue'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
-		}
-		$queue = new queue();
-		$queue->process();
-	}
-
-	/**
-	* Returns whether this cron task can run, given current board configuration.
-	*
-	* Queue task is only run if the email queue (file) exists.
-	*
-	* @return bool
-	*/
-	public function is_runnable()
-	{
-		return file_exists($this->phpbb_root_path . 'cache/queue.' . $this->php_ext);
-	}
-
-	/**
-	* Returns whether this cron task should run now, because enough time
-	* has passed since it was last run.
-	*
-	* The interval between queue runs is specified in board configuration.
-	*
-	* @return bool
-	*/
-	public function should_run()
-	{
-		return $this->config['last_queue_run'] < time() - $this->config['queue_interval_config'];
-	}
-}
diff --git a/phpBB/includes/cron/task/core/tidy_cache.php b/phpBB/includes/cron/task/core/tidy_cache.php
deleted file mode 100644
index 16a45dae7c..0000000000
--- a/phpBB/includes/cron/task/core/tidy_cache.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Tidy cache cron task.
-*
-* @package phpBB3
-*/
-class phpbb_cron_task_core_tidy_cache extends phpbb_cron_task_base
-{
-	protected $config;
-	protected $cache;
-
-	/**
-	* Constructor.
-	*
-	* @param phpbb_config $config The config
-	* @param phpbb_cache_driver_interface $cache The cache driver
-	*/
-	public function __construct(phpbb_config $config, phpbb_cache_driver_interface $cache)
-	{
-		$this->config = $config;
-		$this->cache = $cache;
-	}
-
-	/**
-	* Runs this cron task.
-	*
-	* @return null
-	*/
-	public function run()
-	{
-		$this->cache->tidy();
-	}
-
-	/**
-	* Returns whether this cron task can run, given current board configuration.
-	*
-	* Tidy cache cron task runs if the cache implementation in use
-	* supports tidying.
-	*
-	* @return bool
-	*/
-	public function is_runnable()
-	{
-		return true;
-	}
-
-	/**
-	* Returns whether this cron task should run now, because enough time
-	* has passed since it was last run.
-	*
-	* The interval between cache tidying is specified in board
-	* configuration.
-	*
-	* @return bool
-	*/
-	public function should_run()
-	{
-		return $this->config['cache_last_gc'] < time() - $this->config['cache_gc'];
-	}
-}
diff --git a/phpBB/includes/cron/task/core/tidy_database.php b/phpBB/includes/cron/task/core/tidy_database.php
deleted file mode 100644
index b882e7b500..0000000000
--- a/phpBB/includes/cron/task/core/tidy_database.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Tidy database cron task.
-*
-* @package phpBB3
-*/
-class phpbb_cron_task_core_tidy_database extends phpbb_cron_task_base
-{
-	protected $phpbb_root_path;
-	protected $php_ext;
-	protected $config;
-
-	/**
-	* Constructor.
-	*
-	* @param string $phpbb_root_path The root path
-	* @param string $php_ext The PHP extension
-	* @param phpbb_config $config The config
-	*/
-	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->config = $config;
-	}
-
-	/**
-	* Runs this cron task.
-	*
-	* @return null
-	*/
-	public function run()
-	{
-		if (!function_exists('tidy_database'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_admin.' . $this->php_ext);
-		}
-		tidy_database();
-	}
-
-	/**
-	* Returns whether this cron task should run now, because enough time
-	* has passed since it was last run.
-	*
-	* The interval between database tidying is specified in board
-	* configuration.
-	*
-	* @return bool
-	*/
-	public function should_run()
-	{
-		return $this->config['database_last_gc'] < time() - $this->config['database_gc'];
-	}
-}
diff --git a/phpBB/includes/cron/task/core/tidy_search.php b/phpBB/includes/cron/task/core/tidy_search.php
deleted file mode 100644
index 3ec25aa021..0000000000
--- a/phpBB/includes/cron/task/core/tidy_search.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Tidy search cron task.
-*
-* Will only run when the currently selected search backend supports tidying.
-*
-* @package phpBB3
-*/
-class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base
-{
-	protected $phpbb_root_path;
-	protected $php_ext;
-	protected $auth;
-	protected $config;
-	protected $db;
-	protected $user;
-
-	/**
-	* Constructor.
-	*
-	* @param string $phpbb_root_path The root path
-	* @param string $php_ext The PHP extension
-	* @param phpbb_auth $auth The auth
-	* @param phpbb_config $config The config
-	* @param phpbb_db_driver $db The db connection
-	* @param phpbb_user $user The user
-	*/
-	public function __construct($phpbb_root_path, $php_ext, phpbb_auth $auth, phpbb_config $config, phpbb_db_driver $db, phpbb_user $user)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->auth = $auth;
-		$this->config = $config;
-		$this->db = $db;
-		$this->user = $user;
-	}
-
-	/**
-	* Runs this cron task.
-	*
-	* @return null
-	*/
-	public function run()
-	{
-		// Select the search method
-		$search_type = basename($this->config['search_type']);
-
-		if (!class_exists($search_type))
-		{
-			include($this->phpbb_root_path . "includes/search/$search_type." . $this->php_ext);
-		}
-
-		// We do some additional checks in the module to ensure it can actually be utilised
-		$error = false;
-		$search = new $search_type($error, $this->phpbb_root_path, $this->php_ext, $this->auth, $this->config, $this->db, $this->user);
-
-		if (!$error)
-		{
-			$search->tidy();
-		}
-	}
-
-	/**
-	* Returns whether this cron task can run, given current board configuration.
-	*
-	* Search cron task is runnable in all normal use. It may not be
-	* runnable if the search backend implementation selected in board
-	* configuration does not exist.
-	*
-	* @return bool
-	*/
-	public function is_runnable()
-	{
-		// Select the search method
-		$search_type = basename($this->config['search_type']);
-
-		return file_exists($this->phpbb_root_path . 'includes/search/' . $search_type . '.' . $this->php_ext);
-	}
-
-	/**
-	* Returns whether this cron task should run now, because enough time
-	* has passed since it was last run.
-	*
-	* The interval between search tidying is specified in board
-	* configuration.
-	*
-	* @return bool
-	*/
-	public function should_run()
-	{
-		return $this->config['search_last_gc'] < time() - $this->config['search_gc'];
-	}
-}
diff --git a/phpBB/includes/cron/task/core/tidy_sessions.php b/phpBB/includes/cron/task/core/tidy_sessions.php
deleted file mode 100644
index 95f55235c9..0000000000
--- a/phpBB/includes/cron/task/core/tidy_sessions.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Tidy sessions cron task.
-*
-* @package phpBB3
-*/
-class phpbb_cron_task_core_tidy_sessions extends phpbb_cron_task_base
-{
-	protected $config;
-	protected $user;
-
-	/**
-	* Constructor.
-	*
-	* @param phpbb_config $config The config
-	* @param phpbb_user $user The user
-	*/
-	public function __construct(phpbb_config $config, phpbb_user $user)
-	{
-		$this->config = $config;
-		$this->user = $user;
-	}
-
-	/**
-	* Runs this cron task.
-	*
-	* @return null
-	*/
-	public function run()
-	{
-		$this->user->session_gc();
-	}
-
-	/**
-	* Returns whether this cron task should run now, because enough time
-	* has passed since it was last run.
-	*
-	* The interval between session tidying is specified in board
-	* configuration.
-	*
-	* @return bool
-	*/
-	public function should_run()
-	{
-		return $this->config['session_last_gc'] < time() - $this->config['session_gc'];
-	}
-}
diff --git a/phpBB/includes/cron/task/core/tidy_warnings.php b/phpBB/includes/cron/task/core/tidy_warnings.php
deleted file mode 100644
index 2a7798e56e..0000000000
--- a/phpBB/includes/cron/task/core/tidy_warnings.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Tidy warnings cron task.
-*
-* Will only run when warnings are configured to expire.
-*
-* @package phpBB3
-*/
-class phpbb_cron_task_core_tidy_warnings extends phpbb_cron_task_base
-{
-	protected $phpbb_root_path;
-	protected $php_ext;
-	protected $config;
-
-	/**
-	* Constructor.
-	*
-	* @param string $phpbb_root_path The root path
-	* @param string $php_ext The PHP extension
-	* @param phpbb_config $config The config
-	*/
-	public function __construct($phpbb_root_path, $php_ext, phpbb_config $config)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->config = $config;
-	}
-
-	/**
-	* Runs this cron task.
-	*
-	* @return null
-	*/
-	public function run()
-	{
-		if (!function_exists('tidy_warnings'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_admin.' . $this->php_ext);
-		}
-		tidy_warnings();
-	}
-
-	/**
-	* Returns whether this cron task can run, given current board configuration.
-	*
-	* If warnings are set to never expire, this cron task will not run.
-	*
-	* @return bool
-	*/
-	public function is_runnable()
-	{
-		return (bool) $this->config['warnings_expire_days'];
-	}
-
-	/**
-	* Returns whether this cron task should run now, because enough time
-	* has passed since it was last run.
-	*
-	* The interval between warnings tidying is specified in board
-	* configuration.
-	*
-	* @return bool
-	*/
-	public function should_run()
-	{
-		return $this->config['warnings_last_gc'] < time() - $this->config['warnings_gc'];
-	}
-}
diff --git a/phpBB/includes/cron/task/parametrized.php b/phpBB/includes/cron/task/parametrized.php
deleted file mode 100644
index 5f0e46eafc..0000000000
--- a/phpBB/includes/cron/task/parametrized.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Parametrized cron task interface.
-*
-* Parametrized cron tasks are somewhat of a cross between regular cron tasks and
-* delayed jobs. Whereas regular cron tasks perform some action globally,
-* parametrized cron tasks perform actions on a particular object (or objects).
-* Parametrized cron tasks do not make sense and are not usable without
-* specifying these objects.
-*
-* @package phpBB3
-*/
-interface phpbb_cron_task_parametrized extends phpbb_cron_task
-{
-	/**
-	* Returns parameters of this cron task as an array.
-	*
-	* The array must map string keys to string values.
-	*
-	* @return array
-	*/
-	public function get_parameters();
-
-	/**
-	* Parses parameters found in $request, which is an instance of
-	* phpbb_request_interface.
-	*
-	* $request contains user input and must not be trusted.
-	* Cron task must validate all data before using it.
-	*
-	* @param phpbb_request_interface $request Request object.
-	*
-	* @return null
-	*/
-	public function parse_parameters(phpbb_request_interface $request);
-}
diff --git a/phpBB/includes/cron/task/task.php b/phpBB/includes/cron/task/task.php
deleted file mode 100644
index 2d585df96d..0000000000
--- a/phpBB/includes/cron/task/task.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Cron task interface
-* @package phpBB3
-*/
-interface phpbb_cron_task
-{
-	/**
-	* Returns the name of the task.
-	*
-	* @return string		Name of wrapped task.
-	*/
-	public function get_name();
-
-	/**
-	* Runs this cron task.
-	*
-	* @return null
-	*/
-	public function run();
-
-	/**
-	* Returns whether this cron task can run, given current board configuration.
-	*
-	* For example, a cron task that prunes forums can only run when
-	* forum pruning is enabled.
-	*
-	* @return bool
-	*/
-	public function is_runnable();
-
-	/**
-	* Returns whether this cron task should run now, because enough time
-	* has passed since it was last run.
-	*
-	* @return bool
-	*/
-	public function should_run();
-}
diff --git a/phpBB/includes/cron/task/wrapper.php b/phpBB/includes/cron/task/wrapper.php
deleted file mode 100644
index 386fb5b383..0000000000
--- a/phpBB/includes/cron/task/wrapper.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Cron task wrapper class.
-* Enhances cron tasks with convenience methods that work identically for all tasks.
-*
-* @package phpBB3
-*/
-class phpbb_cron_task_wrapper
-{
-	protected $task;
-	protected $phpbb_root_path;
-	protected $php_ext;
-
-	/**
-	* Constructor.
-	*
-	* Wraps a task $task, which must implement cron_task interface.
-	*
-	* @param phpbb_cron_task $task The cron task to wrap.
-	*/
-	public function __construct(phpbb_cron_task $task, $phpbb_root_path, $php_ext)
-	{
-		$this->task = $task;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	* Returns whether the wrapped task is parametrised.
-	*
-	* Parametrized tasks accept parameters during initialization and must
-	* normally be scheduled with parameters.
-	*
-	* @return bool		Whether or not this task is parametrized.
-	*/
-	public function is_parametrized()
-	{
-		return $this->task instanceof phpbb_cron_task_parametrized;
-	}
-
-	/**
-	* Returns whether the wrapped task is ready to run.
-	*
-	* A task is ready to run when it is runnable according to current configuration
-	* and enough time has passed since it was last run.
-	*
-	* @return bool		Whether the wrapped task is ready to run.
-	*/
-	public function is_ready()
-	{
-		return $this->task->is_runnable() && $this->task->should_run();
-	}
-
-	/**
-	* Returns a url through which this task may be invoked via web.
-	*
-	* When system cron is not in use, running a cron task is accomplished
-	* by outputting an image with the url returned by this function as
-	* source.
-	*
-	* @return string		URL through which this task may be invoked.
-	*/
-	public function get_url()
-	{
-		$name = $this->get_name();
-		if ($this->is_parametrized())
-		{
-			$params = $this->task->get_parameters();
-			$extra = '';
-			foreach ($params as $key => $value)
-			{
-				$extra .= '&amp;' . $key . '=' . urlencode($value);
-			}
-		}
-		else
-		{
-			$extra = '';
-		}
-		$url = append_sid($this->phpbb_root_path . 'cron.' . $this->php_ext, 'cron_type=' . $name . $extra);
-		return $url;
-	}
-
-	/**
-	* Forwards all other method calls to the wrapped task implementation.
-	*
-	* @return mixed
-	*/
-	public function __call($name, $args)
-	{
-		return call_user_func_array(array($this->task, $name), $args);
-	}
-}
diff --git a/phpBB/includes/datetime.php b/phpBB/includes/datetime.php
deleted file mode 100644
index 3c6d4971b9..0000000000
--- a/phpBB/includes/datetime.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*/
-
-/**
-* phpBB custom extensions to the PHP DateTime class
-* This handles the relative formats phpBB employs
-*/
-class phpbb_datetime extends DateTime
-{
-	/**
-	* String used to wrap the date segment which should be replaced by today/tomorrow/yesterday
-	*/
-	const RELATIVE_WRAPPER = '|';
-
-	/**
-	* @var user User who is the context for this DateTime instance
-	*/
-	protected $user;
-
-	/**
-	* @var array Date formats are preprocessed by phpBB, to save constant recalculation they are cached.
-	*/
-	static protected $format_cache = array();
-
-	/**
-	* Constructs a new instance of phpbb_datetime, expanded to include an argument to inject
-	* the user context and modify the timezone to the users selected timezone if one is not set.
-	*
-	* @param string $time String in a format accepted by strtotime().
-	* @param DateTimeZone $timezone Time zone of the time.
-	* @param user User object for context.
-	*/
-	public function __construct($user, $time = 'now', DateTimeZone $timezone = null)
-	{
-		$this->user	= $user;
-		$timezone	= $timezone ?: $this->user->timezone;
-
-		parent::__construct($time, $timezone);
-	}
-
-	/**
-	* Formats the current date time into the specified format
-	*
-	* @param string $format Optional format to use for output, defaults to users chosen format
-	* @param boolean $force_absolute Force output of a non relative date
-	* @return string Formatted date time
-	*/
-	public function format($format = '', $force_absolute = false)
-	{
-		$format		= $format ? $format : $this->user->date_format;
-		$format		= self::format_cache($format, $this->user);
-		$relative	= ($format['is_short'] && !$force_absolute);
-		$now		= new self($this->user, 'now', $this->user->timezone);
-
-		$timestamp	= $this->getTimestamp();
-		$now_ts		= $now->getTimeStamp();
-
-		$delta		= $now_ts - $timestamp;
-
-		if ($relative)
-		{
-			/*
-			* Check the delta is less than or equal to 1 hour
-			* and the delta not more than a minute in the past
-			* and the delta is either greater than -5 seconds or timestamp
-			* and current time are of the same minute (they must be in the same hour already)
-			* finally check that relative dates are supported by the language pack
-			*/
-			if ($delta <= 3600 && $delta > -60 &&
-			  ($delta >= -5 || (($now_ts / 60) % 60) == (($timestamp / 60) % 60))
-			  && isset($this->user->lang['datetime']['AGO']))
-			{
-				return $this->user->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60)));
-			}
-			else
-			{
-				$midnight = clone $now;
-				$midnight->setTime(0, 0, 0);
-
-				$midnight	= $midnight->getTimestamp();
-
-				$day = false;
-
-				if ($timestamp > $midnight + 86400)
-				{
-					$day = 'TOMORROW';
-				}
-				else if ($timestamp > $midnight)
-				{
-					$day = 'TODAY';
-				}
-				else if ($timestamp > $midnight - 86400)
-				{
-					$day = 'YESTERDAY';
-				}
-
-				if ($day !== false)
-				{
-					// Format using the short formatting and finally swap out the relative token placeholder with the correct value
-					return str_replace(self::RELATIVE_WRAPPER . self::RELATIVE_WRAPPER, $this->user->lang['datetime'][$day], strtr(parent::format($format['format_short']), $format['lang']));
-				}
-			}
-		}
-
-		return strtr(parent::format($format['format_long']), $format['lang']);
-	}
-
-	/**
-	* Magic method to convert DateTime object to string
-	*
-	* @return Formatted date time, according to the users default settings.
-	*/
-	public function __toString()
-	{
-		return $this->format();
-	}
-
-	/**
-	* Pre-processes the specified date format
-	*
-	* @param string $format Output format
-	* @param user $user User object to use for localisation
-	* @return array Processed date format
-	*/
-	static protected function format_cache($format, $user)
-	{
-		$lang = $user->lang_name;
-
-		if (!isset(self::$format_cache[$lang]))
-		{
-			self::$format_cache[$lang] = array();
-		}
-
-		if (!isset(self::$format_cache[$lang][$format]))
-		{
-			// Is the user requesting a friendly date format (i.e. 'Today 12:42')?
-			self::$format_cache[$lang][$format] = array(
-				'is_short'		=> strpos($format, self::RELATIVE_WRAPPER) !== false,
-				'format_short'	=> substr($format, 0, strpos($format, self::RELATIVE_WRAPPER)) . self::RELATIVE_WRAPPER . self::RELATIVE_WRAPPER . substr(strrchr($format, self::RELATIVE_WRAPPER), 1),
-				'format_long'	=> str_replace(self::RELATIVE_WRAPPER, '', $format),
-				'lang'			=> array_filter($user->lang['datetime'], 'is_string'),
-			);
-
-			// Short representation of month in format? Some languages use different terms for the long and short format of May
-			if ((strpos($format, '\M') === false && strpos($format, 'M') !== false) || (strpos($format, '\r') === false && strpos($format, 'r') !== false))
-			{
-				self::$format_cache[$lang][$format]['lang']['May'] = $user->lang['datetime']['May_short'];
-			}
-		}
-
-		return self::$format_cache[$lang][$format];
-	}
-}
diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php
deleted file mode 100644
index 08c966c07a..0000000000
--- a/phpBB/includes/db/driver/driver.php
+++ /dev/null
@@ -1,1044 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Database Abstraction Layer
-* @package dbal
-*/
-class phpbb_db_driver
-{
-	var $db_connect_id;
-	var $query_result;
-	var $return_on_error = false;
-	var $transaction = false;
-	var $sql_time = 0;
-	var $num_queries = array();
-	var $open_queries = array();
-
-	var $curtime = 0;
-	var $query_hold = '';
-	var $html_hold = '';
-	var $sql_report = '';
-
-	var $persistency = false;
-	var $user = '';
-	var $server = '';
-	var $dbname = '';
-
-	// Set to true if error triggered
-	var $sql_error_triggered = false;
-
-	// Holding the last sql query on sql error
-	var $sql_error_sql = '';
-	// Holding the error information - only populated if sql_error_triggered is set
-	var $sql_error_returned = array();
-
-	// Holding transaction count
-	var $transactions = 0;
-
-	// Supports multi inserts?
-	var $multi_insert = false;
-
-	/**
-	* Current sql layer
-	*/
-	var $sql_layer = '';
-
-	/**
-	* Wildcards for matching any (%) or exactly one (_) character within LIKE expressions
-	*/
-	var $any_char;
-	var $one_char;
-
-	/**
-	* Exact version of the DBAL, directly queried
-	*/
-	var $sql_server_version = false;
-
-	/**
-	* Constructor
-	*/
-	function __construct()
-	{
-		$this->num_queries = array(
-			'cached'	=> 0,
-			'normal'	=> 0,
-			'total'		=> 0,
-		);
-
-		// Fill default sql layer based on the class being called.
-		// This can be changed by the specified layer itself later if needed.
-		$this->sql_layer = substr(get_class($this), strlen('phpbb_db_driver_'));
-
-		// Do not change this please! This variable is used to easy the use of it - and is hardcoded.
-		$this->any_char = chr(0) . '%';
-		$this->one_char = chr(0) . '_';
-	}
-
-	/**
-	* return on error or display error message
-	*/
-	function sql_return_on_error($fail = false)
-	{
-		$this->sql_error_triggered = false;
-		$this->sql_error_sql = '';
-
-		$this->return_on_error = $fail;
-	}
-
-	/**
-	* Return number of sql queries and cached sql queries used
-	*/
-	function sql_num_queries($cached = false)
-	{
-		return ($cached) ? $this->num_queries['cached'] : $this->num_queries['normal'];
-	}
-
-	/**
-	* Add to query count
-	*/
-	function sql_add_num_queries($cached = false)
-	{
-		$this->num_queries['cached'] += ($cached !== false) ? 1 : 0;
-		$this->num_queries['normal'] += ($cached !== false) ? 0 : 1;
-		$this->num_queries['total'] += 1;
-	}
-
-	/**
-	* DBAL garbage collection, close sql connection
-	*/
-	function sql_close()
-	{
-		if (!$this->db_connect_id)
-		{
-			return false;
-		}
-
-		if ($this->transaction)
-		{
-			do
-			{
-				$this->sql_transaction('commit');
-			}
-			while ($this->transaction);
-		}
-
-		foreach ($this->open_queries as $query_id)
-		{
-			$this->sql_freeresult($query_id);
-		}
-
-		// Connection closed correctly. Set db_connect_id to false to prevent errors
-		if ($result = $this->_sql_close())
-		{
-			$this->db_connect_id = false;
-		}
-
-		return $result;
-	}
-
-	/**
-	* Build LIMIT query
-	* Doing some validation here.
-	*/
-	function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		if (empty($query))
-		{
-			return false;
-		}
-
-		// Never use a negative total or offset
-		$total = ($total < 0) ? 0 : $total;
-		$offset = ($offset < 0) ? 0 : $offset;
-
-		return $this->_sql_query_limit($query, $total, $offset, $cache_ttl);
-	}
-
-	/**
-	* Fetch all rows
-	*/
-	function sql_fetchrowset($query_id = false)
-	{
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($query_id !== false)
-		{
-			$result = array();
-			while ($row = $this->sql_fetchrow($query_id))
-			{
-				$result[] = $row;
-			}
-
-			return $result;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$this->sql_freeresult($query_id);
-		$query_id = $this->sql_query($this->last_query_text);
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
-		for ($i = 0; $i < $rownum; $i++)
-		{
-			if (!$this->sql_fetchrow($query_id))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Fetch field
-	* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
-	*/
-	function sql_fetchfield($field, $rownum = false, $query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($query_id !== false)
-		{
-			if ($rownum !== false)
-			{
-				$this->sql_rowseek($rownum, $query_id);
-			}
-
-			if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
-			{
-				return $cache->sql_fetchfield($query_id, $field);
-			}
-
-			$row = $this->sql_fetchrow($query_id);
-			return (isset($row[$field])) ? $row[$field] : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters
-	* Some DBMS are handling them in a different way
-	*
-	* @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char
-	* @return string LIKE expression including the keyword!
-	*/
-	function sql_like_expression($expression)
-	{
-		$expression = utf8_str_replace(array('_', '%'), array("\_", "\%"), $expression);
-		$expression = utf8_str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression);
-
-		return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\'');
-	}
-
-	/**
-	* Build a case expression
-	*
-	* Note: The two statements action_true and action_false must have the same data type (int, vchar, ...) in the database!
-	*
-	* @param	string	$condition		The condition which must be true, to use action_true rather then action_else
-	* @param	string	$action_true	SQL expression that is used, if the condition is true
-	* @param	string	$action_else	SQL expression that is used, if the condition is false, optional
-	* @return	string			CASE expression including the condition and statements
-	*/
-	public function sql_case($condition, $action_true, $action_false = false)
-	{
-		$sql_case = 'CASE WHEN ' . $condition;
-		$sql_case .= ' THEN ' . $action_true;
-		$sql_case .= ($action_false !== false) ? ' ELSE ' . $action_false : '';
-		$sql_case .= ' END';
-		return $sql_case;
-	}
-
-	/**
-	* Build a concatenated expression
-	*
-	* @param	string	$expr1		Base SQL expression where we append the second one
-	* @param	string	$expr2		SQL expression that is appended to the first expression
-	* @return	string		Concatenated string
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return $expr1 . ' || ' . $expr2;
-	}
-
-	/**
-	* Returns whether results of a query need to be buffered to run a transaction while iterating over them.
-	*
-	* @return bool Whether buffering is required.
-	*/
-	function sql_buffer_nested_transactions()
-	{
-		return false;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				// If we are within a transaction we will not open another one, but enclose the current one to not loose data (prevening auto commit)
-				if ($this->transaction)
-				{
-					$this->transactions++;
-					return true;
-				}
-
-				$result = $this->_sql_transaction('begin');
-
-				if (!$result)
-				{
-					$this->sql_error();
-				}
-
-				$this->transaction = true;
-			break;
-
-			case 'commit':
-				// If there was a previously opened transaction we do not commit yet... but count back the number of inner transactions
-				if ($this->transaction && $this->transactions)
-				{
-					$this->transactions--;
-					return true;
-				}
-
-				// Check if there is a transaction (no transaction can happen if there was an error, with a combined rollback and error returning enabled)
-				// This implies we have transaction always set for autocommit db's
-				if (!$this->transaction)
-				{
-					return false;
-				}
-
-				$result = $this->_sql_transaction('commit');
-
-				if (!$result)
-				{
-					$this->sql_error();
-				}
-
-				$this->transaction = false;
-				$this->transactions = 0;
-			break;
-
-			case 'rollback':
-				$result = $this->_sql_transaction('rollback');
-				$this->transaction = false;
-				$this->transactions = 0;
-			break;
-
-			default:
-				$result = $this->_sql_transaction($status);
-			break;
-		}
-
-		return $result;
-	}
-
-	/**
-	* Build sql statement from array for insert/update/select statements
-	*
-	* Idea for this from Ikonboard
-	* Possible query values: INSERT, INSERT_SELECT, UPDATE, SELECT
-	*
-	*/
-	function sql_build_array($query, $assoc_ary = false)
-	{
-		if (!is_array($assoc_ary))
-		{
-			return false;
-		}
-
-		$fields = $values = array();
-
-		if ($query == 'INSERT' || $query == 'INSERT_SELECT')
-		{
-			foreach ($assoc_ary as $key => $var)
-			{
-				$fields[] = $key;
-
-				if (is_array($var) && is_string($var[0]))
-				{
-					// This is used for INSERT_SELECT(s)
-					$values[] = $var[0];
-				}
-				else
-				{
-					$values[] = $this->_sql_validate_value($var);
-				}
-			}
-
-			$query = ($query == 'INSERT') ? ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')' : ' (' . implode(', ', $fields) . ') SELECT ' . implode(', ', $values) . ' ';
-		}
-		else if ($query == 'MULTI_INSERT')
-		{
-			trigger_error('The MULTI_INSERT query value is no longer supported. Please use sql_multi_insert() instead.', E_USER_ERROR);
-		}
-		else if ($query == 'UPDATE' || $query == 'SELECT')
-		{
-			$values = array();
-			foreach ($assoc_ary as $key => $var)
-			{
-				$values[] = "$key = " . $this->_sql_validate_value($var);
-			}
-			$query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values);
-		}
-
-		return $query;
-	}
-
-	/**
-	* Build IN or NOT IN sql comparison string, uses <> or = on single element
-	* arrays to improve comparison speed
-	*
-	* @access public
-	* @param	string	$field				name of the sql column that shall be compared
-	* @param	array	$array				array of values that are allowed (IN) or not allowed (NOT IN)
-	* @param	bool	$negate				true for NOT IN (), false for IN () (default)
-	* @param	bool	$allow_empty_set	If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false.
-	*/
-	function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
-	{
-		if (!sizeof($array))
-		{
-			if (!$allow_empty_set)
-			{
-				// Print the backtrace to help identifying the location of the problematic code
-				$this->sql_error('No values specified for SQL IN comparison');
-			}
-			else
-			{
-				// NOT IN () actually means everything so use a tautology
-				if ($negate)
-				{
-					return '1=1';
-				}
-				// IN () actually means nothing so use a contradiction
-				else
-				{
-					return '1=0';
-				}
-			}
-		}
-
-		if (!is_array($array))
-		{
-			$array = array($array);
-		}
-
-		if (sizeof($array) == 1)
-		{
-			@reset($array);
-			$var = current($array);
-
-			return $field . ($negate ? ' <> ' : ' = ') . $this->_sql_validate_value($var);
-		}
-		else
-		{
-			return $field . ($negate ? ' NOT IN ' : ' IN ') . '(' . implode(', ', array_map(array($this, '_sql_validate_value'), $array)) . ')';
-		}
-	}
-
-	/**
-	* Run binary AND operator on DB column.
-	* Results in sql statement: "{$column_name} & (1 << {$bit}) {$compare}"
-	*
-	* @param string $column_name The column name to use
-	* @param int $bit The value to use for the AND operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
-	* @param string $compare Any custom SQL code after the check (for example "= 0")
-	*/
-	function sql_bit_and($column_name, $bit, $compare = '')
-	{
-		if (method_exists($this, '_sql_bit_and'))
-		{
-			return $this->_sql_bit_and($column_name, $bit, $compare);
-		}
-
-		return $column_name . ' & ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
-	}
-
-	/**
-	* Run binary OR operator on DB column.
-	* Results in sql statement: "{$column_name} | (1 << {$bit}) {$compare}"
-	*
-	* @param string $column_name The column name to use
-	* @param int $bit The value to use for the OR operator, will be converted to (1 << $bit). Is used by options, using the number schema... 0, 1, 2...29
-	* @param string $compare Any custom SQL code after the check (for example "= 0")
-	*/
-	function sql_bit_or($column_name, $bit, $compare = '')
-	{
-		if (method_exists($this, '_sql_bit_or'))
-		{
-			return $this->_sql_bit_or($column_name, $bit, $compare);
-		}
-
-		return $column_name . ' | ' . (1 << $bit) . (($compare) ? ' ' . $compare : '');
-	}
-
-	/**
-	* Returns SQL string to cast a string expression to an int.
-	*
-	* @param  string $expression An expression evaluating to string
-	* @return string             Expression returning an int
-	*/
-	function cast_expr_to_bigint($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Returns SQL string to cast an integer expression to a string.
-	*
-	* @param  string $expression An expression evaluating to int
-	* @return string             Expression returning a string
-	*/
-	function cast_expr_to_string($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Run LOWER() on DB column of type text (i.e. neither varchar nor char).
-	*
-	* @param string $column_name	The column name to use
-	*
-	* @return string				A SQL statement like "LOWER($column_name)"
-	*/
-	function sql_lower_text($column_name)
-	{
-		return "LOWER($column_name)";
-	}
-
-	/**
-	* Run more than one insert statement.
-	*
-	* @param string $table table name to run the statements on
-	* @param array $sql_ary multi-dimensional array holding the statement data.
-	*
-	* @return bool false if no statements were executed.
-	* @access public
-	*/
-	function sql_multi_insert($table, $sql_ary)
-	{
-		if (!sizeof($sql_ary))
-		{
-			return false;
-		}
-
-		if ($this->multi_insert)
-		{
-			$ary = array();
-			foreach ($sql_ary as $id => $_sql_ary)
-			{
-				// If by accident the sql array is only one-dimensional we build a normal insert statement
-				if (!is_array($_sql_ary))
-				{
-					return $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $sql_ary));
-				}
-
-				$values = array();
-				foreach ($_sql_ary as $key => $var)
-				{
-					$values[] = $this->_sql_validate_value($var);
-				}
-				$ary[] = '(' . implode(', ', $values) . ')';
-			}
-
-			return $this->sql_query('INSERT INTO ' . $table . ' ' . ' (' . implode(', ', array_keys($sql_ary[0])) . ') VALUES ' . implode(', ', $ary));
-		}
-		else
-		{
-			foreach ($sql_ary as $ary)
-			{
-				if (!is_array($ary))
-				{
-					return false;
-				}
-
-				$result = $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $ary));
-
-				if (!$result)
-				{
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Function for validating values
-	* @access private
-	*/
-	function _sql_validate_value($var)
-	{
-		if (is_null($var))
-		{
-			return 'NULL';
-		}
-		else if (is_string($var))
-		{
-			return "'" . $this->sql_escape($var) . "'";
-		}
-		else
-		{
-			return (is_bool($var)) ? intval($var) : $var;
-		}
-	}
-
-	/**
-	* Build sql statement from array for select and select distinct statements
-	*
-	* Possible query values: SELECT, SELECT_DISTINCT
-	*/
-	function sql_build_query($query, $array)
-	{
-		$sql = '';
-		switch ($query)
-		{
-			case 'SELECT':
-			case 'SELECT_DISTINCT';
-
-				$sql = str_replace('_', ' ', $query) . ' ' . $array['SELECT'] . ' FROM ';
-
-				// Build table array. We also build an alias array for later checks.
-				$table_array = $aliases = array();
-				$used_multi_alias = false;
-
-				foreach ($array['FROM'] as $table_name => $alias)
-				{
-					if (is_array($alias))
-					{
-						$used_multi_alias = true;
-
-						foreach ($alias as $multi_alias)
-						{
-							$table_array[] = $table_name . ' ' . $multi_alias;
-							$aliases[] = $multi_alias;
-						}
-					}
-					else
-					{
-						$table_array[] = $table_name . ' ' . $alias;
-						$aliases[] = $alias;
-					}
-				}
-
-				// We run the following code to determine if we need to re-order the table array. ;)
-				// The reason for this is that for multi-aliased tables (two equal tables) in the FROM statement the last table need to match the first comparison.
-				// DBMS who rely on this: Oracle, PostgreSQL and MSSQL. For all other DBMS it makes absolutely no difference in which order the table is.
-				if (!empty($array['LEFT_JOIN']) && sizeof($array['FROM']) > 1 && $used_multi_alias !== false)
-				{
-					// Take first LEFT JOIN
-					$join = current($array['LEFT_JOIN']);
-
-					// Determine the table used there (even if there are more than one used, we only want to have one
-					preg_match('/(' . implode('|', $aliases) . ')\.[^\s]+/U', str_replace(array('(', ')', 'AND', 'OR', ' '), '', $join['ON']), $matches);
-
-					// If there is a first join match, we need to make sure the table order is correct
-					if (!empty($matches[1]))
-					{
-						$first_join_match = trim($matches[1]);
-						$table_array = $last = array();
-
-						foreach ($array['FROM'] as $table_name => $alias)
-						{
-							if (is_array($alias))
-							{
-								foreach ($alias as $multi_alias)
-								{
-									($multi_alias === $first_join_match) ? $last[] = $table_name . ' ' . $multi_alias : $table_array[] = $table_name . ' ' . $multi_alias;
-								}
-							}
-							else
-							{
-								($alias === $first_join_match) ? $last[] = $table_name . ' ' . $alias : $table_array[] = $table_name . ' ' . $alias;
-							}
-						}
-
-						$table_array = array_merge($table_array, $last);
-					}
-				}
-
-				$sql .= $this->_sql_custom_build('FROM', implode(' CROSS JOIN ', $table_array));
-
-				if (!empty($array['LEFT_JOIN']))
-				{
-					foreach ($array['LEFT_JOIN'] as $join)
-					{
-						$sql .= ' LEFT JOIN ' . key($join['FROM']) . ' ' . current($join['FROM']) . ' ON (' . $join['ON'] . ')';
-					}
-				}
-
-				if (!empty($array['WHERE']))
-				{
-					$sql .= ' WHERE ' . $this->_sql_custom_build('WHERE', $array['WHERE']);
-				}
-
-				if (!empty($array['GROUP_BY']))
-				{
-					$sql .= ' GROUP BY ' . $array['GROUP_BY'];
-				}
-
-				if (!empty($array['ORDER_BY']))
-				{
-					$sql .= ' ORDER BY ' . $array['ORDER_BY'];
-				}
-
-			break;
-		}
-
-		return $sql;
-	}
-
-	/**
-	* display sql error page
-	*/
-	function sql_error($sql = '')
-	{
-		global $auth, $user, $config;
-
-		// Set var to retrieve errored status
-		$this->sql_error_triggered = true;
-		$this->sql_error_sql = $sql;
-
-		$this->sql_error_returned = $this->_sql_error();
-
-		if (!$this->return_on_error)
-		{
-			$message = 'SQL ERROR [ ' . $this->sql_layer . ' ]<br /><br />' . $this->sql_error_returned['message'] . ' [' . $this->sql_error_returned['code'] . ']';
-
-			// Show complete SQL error and path to administrators only
-			// Additionally show complete error on installation or if extended debug mode is enabled
-			// The DEBUG constant is for development only!
-			if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG'))
-			{
-				$message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : '';
-			}
-			else
-			{
-				// If error occurs in initiating the session we need to use a pre-defined language string
-				// This could happen if the connection could not be established for example (then we are not able to grab the default language)
-				if (!isset($user->lang['SQL_ERROR_OCCURRED']))
-				{
-					$message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.';
-				}
-				else
-				{
-					if (!empty($config['board_contact']))
-					{
-						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
-					}
-					else
-					{
-						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', '');
-					}
-				}
-			}
-
-			if ($this->transaction)
-			{
-				$this->sql_transaction('rollback');
-			}
-
-			if (strlen($message) > 1024)
-			{
-				// We need to define $msg_long_text here to circumvent text stripping.
-				global $msg_long_text;
-				$msg_long_text = $message;
-
-				trigger_error(false, E_USER_ERROR);
-			}
-
-			trigger_error($message, E_USER_ERROR);
-		}
-
-		if ($this->transaction)
-		{
-			$this->sql_transaction('rollback');
-		}
-
-		return $this->sql_error_returned;
-	}
-
-	/**
-	* Explain queries
-	*/
-	function sql_report($mode, $query = '')
-	{
-		global $cache, $starttime, $phpbb_root_path, $phpbb_admin_path, $user;
-		global $request;
-
-		if (is_object($request) && !$request->variable('explain', false))
-		{
-			return false;
-		}
-
-		if (!$query && $this->query_hold != '')
-		{
-			$query = $this->query_hold;
-		}
-
-		switch ($mode)
-		{
-			case 'display':
-				if (!empty($cache))
-				{
-					$cache->unload();
-				}
-				$this->sql_close();
-
-				$mtime = explode(' ', microtime());
-				$totaltime = $mtime[0] + $mtime[1] - $starttime;
-
-				echo '<!DOCTYPE html>
-					<html dir="ltr">
-					<head>
-						<meta charset="utf-8">
-						<title>SQL Report</title>
-						<link href="' . htmlspecialchars($phpbb_admin_path) . 'style/admin.css" rel="stylesheet" type="text/css" media="screen" />
-					</head>
-					<body id="errorpage">
-					<div id="wrap">
-						<div id="page-header">
-							<a href="' . build_url('explain') . '">Return to previous page</a>
-						</div>
-						<div id="page-body">
-							<div id="acp">
-							<div class="panel">
-								<span class="corners-top"><span></span></span>
-								<div id="content">
-									<h1>SQL Report</h1>
-									<br />
-									<p><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries['normal']} queries" . (($this->num_queries['cached']) ? " + {$this->num_queries['cached']} " . (($this->num_queries['cached'] == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></p>
-
-									<p>Time spent on ' . $this->sql_layer . ' queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></p>
-
-									<br /><br />
-									' . $this->sql_report . '
-								</div>
-								<span class="corners-bottom"><span></span></span>
-							</div>
-							</div>
-						</div>
-						<div id="page-footer">
-							Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
-						</div>
-					</div>
-					</body>
-					</html>';
-
-				exit_handler();
-
-			break;
-
-			case 'stop':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$this->sql_report .= '
-
-					<table cellspacing="1">
-					<thead>
-					<tr>
-						<th>Query #' . $this->num_queries['total'] . '</th>
-					</tr>
-					</thead>
-					<tbody>
-					<tr>
-						<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td>
-					</tr>
-					</tbody>
-					</table>
-
-					' . $this->html_hold . '
-
-					<p style="text-align: center;">
-				';
-
-				if ($this->query_result)
-				{
-					if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query))
-					{
-						$this->sql_report .= 'Affected rows: <b>' . $this->sql_affectedrows($this->query_result) . '</b> | ';
-					}
-					$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $this->curtime) . 's</b>';
-				}
-				else
-				{
-					$error = $this->sql_error();
-					$this->sql_report .= '<b style="color: red">FAILED</b> - ' . $this->sql_layer . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
-				}
-
-				$this->sql_report .= '</p><br /><br />';
-
-				$this->sql_time += $endtime - $this->curtime;
-			break;
-
-			case 'start':
-				$this->query_hold = $query;
-				$this->html_hold = '';
-
-				$this->_sql_report($mode, $query);
-
-				$this->curtime = explode(' ', microtime());
-				$this->curtime = $this->curtime[0] + $this->curtime[1];
-
-			break;
-
-			case 'add_select_row':
-
-				$html_table = func_get_arg(2);
-				$row = func_get_arg(3);
-
-				if (!$html_table && sizeof($row))
-				{
-					$html_table = true;
-					$this->html_hold .= '<table cellspacing="1"><tr>';
-
-					foreach (array_keys($row) as $val)
-					{
-						$this->html_hold .= '<th>' . (($val) ? ucwords(str_replace('_', ' ', $val)) : '&nbsp;') . '</th>';
-					}
-					$this->html_hold .= '</tr>';
-				}
-				$this->html_hold .= '<tr>';
-
-				$class = 'row1';
-				foreach (array_values($row) as $val)
-				{
-					$class = ($class == 'row1') ? 'row2' : 'row1';
-					$this->html_hold .= '<td class="' . $class . '">' . (($val) ? $val : '&nbsp;') . '</td>';
-				}
-				$this->html_hold .= '</tr>';
-
-				return $html_table;
-
-			break;
-
-			case 'fromcache':
-
-				$this->_sql_report($mode, $query);
-
-			break;
-
-			case 'record_fromcache':
-
-				$endtime = func_get_arg(2);
-				$splittime = func_get_arg(3);
-
-				$time_cache = $endtime - $this->curtime;
-				$time_db = $splittime - $endtime;
-				$color = ($time_db > $time_cache) ? 'green' : 'red';
-
-				$this->sql_report .= '<table cellspacing="1"><thead><tr><th>Query results obtained from the cache</th></tr></thead><tbody><tr>';
-				$this->sql_report .= '<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></tbody></table>';
-				$this->sql_report .= '<p style="text-align: center;">';
-				$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br /><br />';
-
-				// Pad the start time to not interfere with page timing
-				$starttime += $time_db;
-
-			break;
-
-			default:
-
-				$this->_sql_report($mode, $query);
-
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Gets the estimated number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Number of rows in $table_name.
-	*								Prefixed with ~ if estimated (otherwise exact).
-	*
-	* @access public
-	*/
-	function get_estimated_row_count($table_name)
-	{
-		return $this->get_row_count($table_name);
-	}
-
-	/**
-	* Gets the exact number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Exact number of rows in $table_name.
-	*
-	* @access public
-	*/
-	function get_row_count($table_name)
-	{
-		$sql = 'SELECT COUNT(*) AS rows_total
-			FROM ' . $this->sql_escape($table_name);
-		$result = $this->sql_query($sql);
-		$rows_total = $this->sql_fetchfield('rows_total');
-		$this->sql_freeresult($result);
-
-		return $rows_total;
-	}
-}
diff --git a/phpBB/includes/db/driver/firebird.php b/phpBB/includes/db/driver/firebird.php
deleted file mode 100644
index 787c28b812..0000000000
--- a/phpBB/includes/db/driver/firebird.php
+++ /dev/null
@@ -1,538 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Firebird/Interbase Database Abstraction Layer
-* Minimum Requirement is Firebird 2.1
-* @package dbal
-*/
-class phpbb_db_driver_firebird extends phpbb_db_driver
-{
-	var $last_query_text = '';
-	var $service_handle = false;
-	var $affected_rows = 0;
-	var $connect_error = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->server = $sqlserver . (($port) ? ':' . $port : '');
-		$this->dbname = str_replace('\\', '/', $database);
-
-		// There are three possibilities to connect to an interbase db
-		if (!$this->server)
-		{
-			$use_database = $this->dbname;
-		}
-		else if (strpos($this->server, '//') === 0)
-		{
-			$use_database = $this->server . $this->dbname;
-		}
-		else
-		{
-			$use_database = $this->server . ':' . $this->dbname;
-		}
-
-		if ($this->persistency)
-		{
-			if (!function_exists('ibase_pconnect'))
-			{
-				$this->connect_error = 'ibase_pconnect function does not exist, is interbase extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @ibase_pconnect($use_database, $this->user, $sqlpassword, false, false, 3);
-		}
-		else
-		{
-			if (!function_exists('ibase_connect'))
-			{
-				$this->connect_error = 'ibase_connect function does not exist, is interbase extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3);
-		}
-
-		// Do not call ibase_service_attach if connection failed,
-		// otherwise error message from ibase_(p)connect call will be clobbered.
-		if ($this->db_connect_id && function_exists('ibase_service_attach') && $this->server)
-		{
-			$this->service_handle = @ibase_service_attach($this->server, $this->user, $sqlpassword);
-		}
-		else
-		{
-			$this->service_handle = false;
-		}
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache forced to false for Interbase
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		/**
-		* force $use_cache false.  I didn't research why the caching code there is no caching code
-		* but I assume its because the IB extension provides a direct method to access it
-		* without a query.
-		*/
-
-		$use_cache = false;
-
-		if ($this->service_handle !== false && function_exists('ibase_server_info'))
-		{
-			return @ibase_server_info($this->service_handle, IBASE_SVC_SERVER_VERSION);
-		}
-
-		return ($raw) ? '2.1' : 'Firebird/Interbase';
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return true;
-			break;
-
-			case 'commit':
-				return @ibase_commit();
-			break;
-
-			case 'rollback':
-				return @ibase_rollback();
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->last_query_text = $query;
-			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				$array = array();
-				// We overcome Firebird's 32767 char limit by binding vars
-				if (strlen($query) > 32767)
-				{
-					if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/s', $query, $regs))
-					{
-						if (strlen($regs[3]) > 32767)
-						{
-							preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
-
-							$inserts = $vals[0];
-							unset($vals);
-
-							foreach ($inserts as $key => $value)
-							{
-								if (!empty($value) && $value[0] === "'" && strlen($value) > 32769) // check to see if this thing is greater than the max + 'x2
-								{
-									$inserts[$key] = '?';
-									$array[] = str_replace("''", "'", substr($value, 1, -1));
-								}
-							}
-
-							$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
-						}
-					}
-					else if (preg_match('/^(UPDATE ([\\w_]++)\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|\\d+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data))
-					{
-						if (strlen($data[3]) > 32767)
-						{
-							$update = $data[1];
-							$where = $data[4];
-							preg_match_all('/(\\w++)\\s*=\\s*(\'(?:[^\']++|\'\')*+\'|[\d-.]++)/', $data[3], $temp, PREG_SET_ORDER);
-							unset($data);
-
-							$cols = array();
-							foreach ($temp as $value)
-							{
-								if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 32769) // check to see if this thing is greater than the max + 'x2
-								{
-									$array[] = str_replace("''", "'", substr($value[2], 1, -1));
-									$cols[] = $value[1] . '=?';
-								}
-								else
-								{
-									$cols[] = $value[1] . '=' . $value[2];
-								}
-							}
-
-							$query = $update . implode(', ', $cols) . ' ' . $where;
-							unset($cols);
-						}
-					}
-				}
-
-				if (!function_exists('ibase_affected_rows') && (preg_match('/^UPDATE ([\w_]++)\s+SET [\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\s*[\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+\s+(WHERE.*)?$/s', $query, $regs) || preg_match('/^DELETE FROM ([\w_]++)\s*(WHERE\s*.*)?$/s', $query, $regs)))
-				{
-					$affected_sql = 'SELECT COUNT(*) as num_rows_affected FROM ' . $regs[1];
-					if (!empty($regs[2]))
-					{
-						$affected_sql .= ' ' . $regs[2];
-					}
-
-					if (!($temp_q_id = @ibase_query($this->db_connect_id, $affected_sql)))
-					{
-						return false;
-					}
-
-					$temp_result = @ibase_fetch_assoc($temp_q_id);
-					@ibase_free_result($temp_q_id);
-
-					$this->affected_rows = ($temp_result) ? $temp_result['NUM_ROWS_AFFECTED'] : false;
-				}
-
-				if (sizeof($array))
-				{
-					$p_query = @ibase_prepare($this->db_connect_id, $query);
-					array_unshift($array, $p_query);
-					$this->query_result = call_user_func_array('ibase_execute', $array);
-					unset($array);
-
-					if ($this->query_result === false)
-					{
-						$this->sql_error($query);
-					}
-				}
-				else if (($this->query_result = @ibase_query($this->db_connect_id, $query)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if (!$this->transaction)
-				{
-					if (function_exists('ibase_commit_ret'))
-					{
-						@ibase_commit_ret();
-					}
-					else
-					{
-						// way cooler than ibase_commit_ret :D
-						@ibase_query('COMMIT RETAIN;');
-					}
-				}
-
-				if ($cache && $cache_ttl)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		$query = 'SELECT FIRST ' . $total . ((!empty($offset)) ? ' SKIP ' . $offset : '') . substr($query, 6);
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		// PHP 5+ function
-		if (function_exists('ibase_affected_rows'))
-		{
-			return ($this->db_connect_id) ? @ibase_affected_rows($this->db_connect_id) : false;
-		}
-		else
-		{
-			return $this->affected_rows;
-		}
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$row = array();
-		$cur_row = @ibase_fetch_object($query_id, IBASE_TEXT);
-
-		if (!$cur_row)
-		{
-			return false;
-		}
-
-		foreach (get_object_vars($cur_row) as $key => $value)
-		{
-			$row[strtolower($key)] = (is_string($value)) ? trim(str_replace(array("\\0", "\\n"), array("\0", "\n"), $value)) : $value;
-		}
-
-		return (sizeof($row)) ? $row : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$query_id = $this->query_result;
-
-		if ($query_id !== false && $this->last_query_text != '')
-		{
-			if ($this->query_result && preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#i', $this->last_query_text, $tablename))
-			{
-				$sql = 'SELECT GEN_ID(' . $tablename[1] . '_gen, 0) AS new_id FROM RDB$DATABASE';
-
-				if (!($temp_q_id = @ibase_query($this->db_connect_id, $sql)))
-				{
-					return false;
-				}
-
-				$temp_result = @ibase_fetch_assoc($temp_q_id);
-				@ibase_free_result($temp_q_id);
-
-				return ($temp_result) ? $temp_result['NEW_ID'] : false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @ibase_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	function _sql_bit_and($column_name, $bit, $compare = '')
-	{
-		return 'BIN_AND(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
-	}
-
-	function _sql_bit_or($column_name, $bit, $compare = '')
-	{
-		return 'BIN_OR(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	function cast_expr_to_bigint($expression)
-	{
-		// Precision must be from 1 to 18
-		return 'CAST(' . $expression . ' as DECIMAL(18, 0))';
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	function cast_expr_to_string($expression)
-	{
-		return 'CAST(' . $expression . ' as VARCHAR(255))';
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		// Need special handling here because ibase_errmsg returns
-		// connection errors, however if the interbase extension
-		// is not installed then ibase_errmsg does not exist and
-		// we cannot call it.
-		if (function_exists('ibase_errmsg'))
-		{
-			$msg = @ibase_errmsg();
-			if (!$msg)
-			{
-				$msg = $this->connect_error;
-			}
-		}
-		else
-		{
-			$msg = $this->connect_error;
-		}
-		return array(
-			'message'	=> $msg,
-			'code'		=> (@function_exists('ibase_errcode') ? @ibase_errcode() : '')
-		);
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		if ($this->service_handle !== false)
-		{
-			@ibase_service_detach($this->service_handle);
-		}
-
-		return @ibase_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @ibase_query($this->db_connect_id, $query);
-				while ($void = @ibase_fetch_object($result, IBASE_TEXT))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@ibase_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/driver/mssql.php b/phpBB/includes/db/driver/mssql.php
deleted file mode 100644
index 89c2c2351b..0000000000
--- a/phpBB/includes/db/driver/mssql.php
+++ /dev/null
@@ -1,472 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* MSSQL Database Abstraction Layer
-* Minimum Requirement is MSSQL 2000+
-* @package dbal
-*/
-class phpbb_db_driver_mssql extends phpbb_db_driver
-{
-	var $connect_error = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		if (!function_exists('mssql_connect'))
-		{
-			$this->connect_error = 'mssql_connect function does not exist, is mssql extension installed?';
-			return $this->sql_error('');
-		}
-
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->dbname = $database;
-
-		$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
-		$this->server = $sqlserver . (($port) ? $port_delimiter . $port : '');
-
-		@ini_set('mssql.charset', 'UTF-8');
-		@ini_set('mssql.textlimit', 2147483647);
-		@ini_set('mssql.textsize', 2147483647);
-
-		$this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mssql_connect($this->server, $this->user, $sqlpassword, $new_link);
-
-		if ($this->db_connect_id && $this->dbname != '')
-		{
-			if (!@mssql_select_db($this->dbname, $this->db_connect_id))
-			{
-				@mssql_close($this->db_connect_id);
-				return false;
-			}
-		}
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mssql_version')) === false)
-		{
-			$result_id = @mssql_query("SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')", $this->db_connect_id);
-
-			$row = false;
-			if ($result_id)
-			{
-				$row = @mssql_fetch_assoc($result_id);
-				@mssql_free_result($result_id);
-			}
-
-			$this->sql_server_version = ($row) ? trim(implode(' ', $row)) : 0;
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('mssql_version', $this->sql_server_version);
-			}
-		}
-
-		if ($raw)
-		{
-			return $this->sql_server_version;
-		}
-
-		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return $expr1 . ' + ' . $expr2;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @mssql_query('BEGIN TRANSACTION', $this->db_connect_id);
-			break;
-
-			case 'commit':
-				return @mssql_query('COMMIT TRANSACTION', $this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @mssql_query('ROLLBACK TRANSACTION', $this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @mssql_query($query, $this->db_connect_id)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache && $cache_ttl)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows)
-		if ($total)
-		{
-			// We need to grab the total number of rows + the offset number of rows to get the correct result
-			if (strpos($query, 'SELECT DISTINCT') === 0)
-			{
-				$query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15);
-			}
-			else
-			{
-				$query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6);
-			}
-		}
-
-		$result = $this->sql_query($query, $cache_ttl);
-
-		// Seek by $offset rows
-		if ($offset)
-		{
-			$this->sql_rowseek($offset, $result);
-		}
-
-		return $result;
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @mssql_rows_affected($this->db_connect_id) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$row = @mssql_fetch_assoc($query_id);
-
-		// I hope i am able to remove this later... hopefully only a PHP or MSSQL bug
-		if ($row)
-		{
-			foreach ($row as $key => $value)
-			{
-				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
-			}
-		}
-
-		return $row;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @mssql_data_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$result_id = @mssql_query('SELECT SCOPE_IDENTITY()', $this->db_connect_id);
-		if ($result_id)
-		{
-			if ($row = @mssql_fetch_assoc($result_id))
-			{
-				@mssql_free_result($result_id);
-				return $row['computed'];
-			}
-			@mssql_free_result($result_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[$query_id]))
-		{
-			unset($this->open_queries[$query_id]);
-			return @mssql_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_lower_text($column_name)
-	{
-		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		if (function_exists('mssql_get_last_message'))
-		{
-			$error = array(
-				'message'	=> @mssql_get_last_message(),
-				'code'		=> '',
-			);
-
-			// Get error code number
-			$result_id = @mssql_query('SELECT @@ERROR as code', $this->db_connect_id);
-			if ($result_id)
-			{
-				$row = @mssql_fetch_assoc($result_id);
-				$error['code'] = $row['code'];
-				@mssql_free_result($result_id);
-			}
-
-			// Get full error message if possible
-			$sql = 'SELECT CAST(description as varchar(255)) as message
-				FROM master.dbo.sysmessages
-				WHERE error = ' . $error['code'];
-			$result_id = @mssql_query($sql);
-
-			if ($result_id)
-			{
-				$row = @mssql_fetch_assoc($result_id);
-				if (!empty($row['message']))
-				{
-					$error['message'] .= '<br />' . $row['message'];
-				}
-				@mssql_free_result($result_id);
-			}
-		}
-		else
-		{
-			$error = array(
-				'message'	=> $this->connect_error,
-				'code'		=> '',
-			);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @mssql_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-				$html_table = false;
-				@mssql_query('SET SHOWPLAN_TEXT ON;', $this->db_connect_id);
-				if ($result = @mssql_query($query, $this->db_connect_id))
-				{
-					@mssql_next_result($result);
-					while ($row = @mssql_fetch_row($result))
-					{
-						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-					}
-				}
-				@mssql_query('SET SHOWPLAN_TEXT OFF;', $this->db_connect_id);
-				@mssql_free_result($result);
-
-				if ($html_table)
-				{
-					$this->html_hold .= '</table>';
-				}
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @mssql_query($query, $this->db_connect_id);
-				while ($void = @mssql_fetch_assoc($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@mssql_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/driver/mssql_base.php b/phpBB/includes/db/driver/mssql_base.php
deleted file mode 100644
index 56c111c871..0000000000
--- a/phpBB/includes/db/driver/mssql_base.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* MSSQL Database Base Abstraction Layer
-* @package dbal
- */
-abstract class phpbb_db_driver_mssql_base extends phpbb_db_driver
-{
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return $expr1 . ' + ' . $expr2;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_lower_text($column_name)
-	{
-		return "LOWER(SUBSTRING($column_name, 1, DATALENGTH($column_name)))";
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-}
diff --git a/phpBB/includes/db/driver/mssql_odbc.php b/phpBB/includes/db/driver/mssql_odbc.php
deleted file mode 100644
index a1d1a5d5dd..0000000000
--- a/phpBB/includes/db/driver/mssql_odbc.php
+++ /dev/null
@@ -1,383 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Unified ODBC functions
-* Unified ODBC functions support any database having ODBC driver, for example Adabas D, IBM DB2, iODBC, Solid, Sybase SQL Anywhere...
-* Here we only support MSSQL Server 2000+ because of the provided schema
-*
-* @note number of bytes returned for returning data depends on odbc.defaultlrl php.ini setting.
-* If it is limited to 4K for example only 4K of data is returned max, resulting in incomplete theme data for example.
-* @note odbc.defaultbinmode may affect UTF8 characters
-*
-* @package dbal
-*/
-class phpbb_db_driver_mssql_odbc extends phpbb_db_driver_mssql_base
-{
-	var $last_query_text = '';
-	var $connect_error = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->dbname = $database;
-
-		$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
-		$this->server = $sqlserver . (($port) ? $port_delimiter . $port : '');
-
-		$max_size = @ini_get('odbc.defaultlrl');
-		if (!empty($max_size))
-		{
-			$unit = strtolower(substr($max_size, -1, 1));
-			$max_size = (int) $max_size;
-
-			if ($unit == 'k')
-			{
-				$max_size = floor($max_size / 1024);
-			}
-			else if ($unit == 'g')
-			{
-				$max_size *= 1024;
-			}
-			else if (is_numeric($unit))
-			{
-				$max_size = floor((int) ($max_size . $unit) / 1048576);
-			}
-			$max_size = max(8, $max_size) . 'M';
-
-			@ini_set('odbc.defaultlrl', $max_size);
-		}
-
-		if ($this->persistency)
-		{
-			if (!function_exists('odbc_pconnect'))
-			{
-				$this->connect_error = 'odbc_pconnect function does not exist, is odbc extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @odbc_pconnect($this->server, $this->user, $sqlpassword);
-		}
-		else
-		{
-			if (!function_exists('odbc_connect'))
-			{
-				$this->connect_error = 'odbc_connect function does not exist, is odbc extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @odbc_connect($this->server, $this->user, $sqlpassword);
-		}
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mssqlodbc_version')) === false)
-		{
-			$result_id = @odbc_exec($this->db_connect_id, "SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')");
-
-			$row = false;
-			if ($result_id)
-			{
-				$row = @odbc_fetch_array($result_id);
-				@odbc_free_result($result_id);
-			}
-
-			$this->sql_server_version = ($row) ? trim(implode(' ', $row)) : 0;
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('mssqlodbc_version', $this->sql_server_version);
-			}
-		}
-
-		if ($raw)
-		{
-			return $this->sql_server_version;
-		}
-
-		return ($this->sql_server_version) ? 'MSSQL (ODBC)<br />' . $this->sql_server_version : 'MSSQL (ODBC)';
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @odbc_exec($this->db_connect_id, 'BEGIN TRANSACTION');
-			break;
-
-			case 'commit':
-				return @odbc_exec($this->db_connect_id, 'COMMIT TRANSACTION');
-			break;
-
-			case 'rollback':
-				return @odbc_exec($this->db_connect_id, 'ROLLBACK TRANSACTION');
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->last_query_text = $query;
-			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @odbc_exec($this->db_connect_id, $query)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache && $cache_ttl)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows)
-		if ($total)
-		{
-			// We need to grab the total number of rows + the offset number of rows to get the correct result
-			if (strpos($query, 'SELECT DISTINCT') === 0)
-			{
-				$query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15);
-			}
-			else
-			{
-				$query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6);
-			}
-		}
-
-		$result = $this->sql_query($query, $cache_ttl);
-
-		// Seek by $offset rows
-		if ($offset)
-		{
-			$this->sql_rowseek($offset, $result);
-		}
-
-		return $result;
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @odbc_num_rows($this->query_result) : false;
-	}
-
-	/**
-	* Fetch current row
-	* @note number of bytes returned depends on odbc.defaultlrl php.ini setting. If it is limited to 4K for example only 4K of data is returned max.
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		return ($query_id !== false) ? @odbc_fetch_array($query_id) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$result_id = @odbc_exec($this->db_connect_id, 'SELECT @@IDENTITY');
-
-		if ($result_id)
-		{
-			if (@odbc_fetch_array($result_id))
-			{
-				$id = @odbc_result($result_id, 1);
-				@odbc_free_result($result_id);
-				return $id;
-			}
-			@odbc_free_result($result_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @odbc_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		if (function_exists('odbc_errormsg'))
-		{
-			$error = array(
-				'message'	=> @odbc_errormsg(),
-				'code'		=> @odbc_error(),
-			);
-		}
-		else
-		{
-			$error = array(
-				'message'	=> $this->connect_error,
-				'code'		=> '',
-			);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @odbc_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @odbc_exec($this->db_connect_id, $query);
-				while ($void = @odbc_fetch_array($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@odbc_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/driver/mssqlnative.php b/phpBB/includes/db/driver/mssqlnative.php
deleted file mode 100644
index 28fc88298a..0000000000
--- a/phpBB/includes/db/driver/mssqlnative.php
+++ /dev/null
@@ -1,613 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-* This is the MS SQL Server Native database abstraction layer.
-* PHP mssql native driver required.
-* @author Chris Pucci
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * Prior to version 1.1 the SQL Server Native PHP driver didn't support sqlsrv_num_rows, or cursor based seeking so we recall all rows into an array
- * and maintain our own cursor index into that array.
- */
-class result_mssqlnative
-{
-	public function result_mssqlnative($queryresult = false)
-	{
-		$this->m_cursor = 0;
-		$this->m_rows = array();
-		$this->m_num_fields = sqlsrv_num_fields($queryresult);
-		$this->m_field_meta = sqlsrv_field_metadata($queryresult);
-
-		while ($row = sqlsrv_fetch_array($queryresult, SQLSRV_FETCH_ASSOC))
-		{
-			if ($row !== null)
-			{
-				foreach($row as $k => $v)
-				{
-					if (is_object($v) && method_exists($v, 'format'))
-					{
-						$row[$k] = $v->format("Y-m-d\TH:i:s\Z");
-					}
-				}
-				$this->m_rows[] = $row;//read results into memory, cursors are not supported
-			}
-		}
-
-		$this->m_row_count = sizeof($this->m_rows);
-	}
-
-	private function array_to_obj($array, &$obj)
-	{
-		foreach ($array as $key => $value)
-		{
-			if (is_array($value))
-			{
-				$obj->$key = new stdClass();
-				array_to_obj($value, $obj->$key);
-			}
-			else
-			{
-				$obj->$key = $value;
-			}
-		}
-		return $obj;
-	}
-
-	public function fetch($mode = SQLSRV_FETCH_BOTH, $object_class = 'stdClass')
-	{
-		if ($this->m_cursor >= $this->m_row_count || $this->m_row_count == 0)
-		{
-			return false;
-		}
-
-		$ret = false;
-		$arr_num = array();
-
-		if ($mode == SQLSRV_FETCH_NUMERIC || $mode == SQLSRV_FETCH_BOTH)
-		{
-			foreach($this->m_rows[$this->m_cursor] as $key => $value)
-			{
-				$arr_num[] = $value;
-			}
-		}
-
-		switch ($mode)
-		{
-			case SQLSRV_FETCH_ASSOC:
-				$ret = $this->m_rows[$this->m_cursor];
-			break;
-			case SQLSRV_FETCH_NUMERIC:
-				$ret = $arr_num;
-			break;
-			case 'OBJECT':
-				$ret = $this->array_to_obj($this->m_rows[$this->m_cursor], $o = new $object_class);
-			break;
-			case SQLSRV_FETCH_BOTH:
-			default:
-				$ret = $this->m_rows[$this->m_cursor] + $arr_num;
-			break;
-		}
-		$this->m_cursor++;
-		return $ret;
-	}
-
-	public function get($pos, $fld)
-	{
-		return $this->m_rows[$pos][$fld];
-	}
-
-	public function num_rows()
-	{
-		return $this->m_row_count;
-	}
-
-	public function seek($iRow)
-	{
-		$this->m_cursor = min($iRow, $this->m_row_count);
-	}
-
-	public function num_fields()
-	{
-		return $this->m_num_fields;
-	}
-
-	public function field_name($nr)
-	{
-		$arr_keys = array_keys($this->m_rows[0]);
-		return $arr_keys[$nr];
-	}
-
-	public function field_type($nr)
-	{
-		$i = 0;
-		$int_type = -1;
-		$str_type = '';
-
-		foreach ($this->m_field_meta as $meta)
-		{
-			if ($nr == $i)
-			{
-				$int_type = $meta['Type'];
-				break;
-			}
-			$i++;
-		}
-
-		//http://msdn.microsoft.com/en-us/library/cc296183.aspx contains type table
-		switch ($int_type)
-		{
-			case SQLSRV_SQLTYPE_BIGINT: 		$str_type = 'bigint'; break;
-			case SQLSRV_SQLTYPE_BINARY: 		$str_type = 'binary'; break;
-			case SQLSRV_SQLTYPE_BIT: 			$str_type = 'bit'; break;
-			case SQLSRV_SQLTYPE_CHAR: 			$str_type = 'char'; break;
-			case SQLSRV_SQLTYPE_DATETIME: 		$str_type = 'datetime'; break;
-			case SQLSRV_SQLTYPE_DECIMAL/*($precision, $scale)*/: $str_type = 'decimal'; break;
-			case SQLSRV_SQLTYPE_FLOAT: 			$str_type = 'float'; break;
-			case SQLSRV_SQLTYPE_IMAGE: 			$str_type = 'image'; break;
-			case SQLSRV_SQLTYPE_INT: 			$str_type = 'int'; break;
-			case SQLSRV_SQLTYPE_MONEY: 			$str_type = 'money'; break;
-			case SQLSRV_SQLTYPE_NCHAR/*($charCount)*/: $str_type = 'nchar'; break;
-			case SQLSRV_SQLTYPE_NUMERIC/*($precision, $scale)*/: $str_type = 'numeric'; break;
-			case SQLSRV_SQLTYPE_NVARCHAR/*($charCount)*/: $str_type = 'nvarchar'; break;
-			case SQLSRV_SQLTYPE_NTEXT: 			$str_type = 'ntext'; break;
-			case SQLSRV_SQLTYPE_REAL: 			$str_type = 'real'; break;
-			case SQLSRV_SQLTYPE_SMALLDATETIME: 	$str_type = 'smalldatetime'; break;
-			case SQLSRV_SQLTYPE_SMALLINT: 		$str_type = 'smallint'; break;
-			case SQLSRV_SQLTYPE_SMALLMONEY: 	$str_type = 'smallmoney'; break;
-			case SQLSRV_SQLTYPE_TEXT: 			$str_type = 'text'; break;
-			case SQLSRV_SQLTYPE_TIMESTAMP: 		$str_type = 'timestamp'; break;
-			case SQLSRV_SQLTYPE_TINYINT: 		$str_type = 'tinyint'; break;
-			case SQLSRV_SQLTYPE_UNIQUEIDENTIFIER: $str_type = 'uniqueidentifier'; break;
-			case SQLSRV_SQLTYPE_UDT: 			$str_type = 'UDT'; break;
-			case SQLSRV_SQLTYPE_VARBINARY/*($byteCount)*/: $str_type = 'varbinary'; break;
-			case SQLSRV_SQLTYPE_VARCHAR/*($charCount)*/: $str_type = 'varchar'; break;
-			case SQLSRV_SQLTYPE_XML: 			$str_type = 'xml'; break;
-			default: $str_type = $int_type;
-		}
-		return $str_type;
-	}
-
-	public function free()
-	{
-		unset($this->m_rows);
-		return;
-	}
-}
-
-/**
-* @package dbal
-*/
-class phpbb_db_driver_mssqlnative extends phpbb_db_driver_mssql_base
-{
-	var $m_insert_id = NULL;
-	var $last_query_text = '';
-	var $query_options = array();
-	var $connect_error = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		// Test for driver support, to avoid suppressed fatal error
-		if (!function_exists('sqlsrv_connect'))
-		{
-			$this->connect_error = 'Native MS SQL Server driver for PHP is missing or needs to be updated. Version 1.1 or later is required to install phpBB3. You can download the driver from: http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx';
-			return $this->sql_error('');
-		}
-
-		//set up connection variables
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->dbname = $database;
-		$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
-		$this->server = $sqlserver . (($port) ? $port_delimiter . $port : '');
-
-		//connect to database
-		$this->db_connect_id = sqlsrv_connect($this->server, array(
-			'Database' => $this->dbname,
-			'UID' => $this->user,
-			'PWD' => $sqlpassword
-		));
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mssql_version')) === false)
-		{
-			$arr_server_info = sqlsrv_server_info($this->db_connect_id);
-			$this->sql_server_version = $arr_server_info['SQLServerVersion'];
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('mssql_version', $this->sql_server_version);
-			}
-		}
-
-		if ($raw)
-		{
-			return $this->sql_server_version;
-		}
-
-		return ($this->sql_server_version) ? 'MSSQL<br />' . $this->sql_server_version : 'MSSQL';
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	function sql_buffer_nested_transactions()
-	{
-		return true;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return sqlsrv_begin_transaction($this->db_connect_id);
-			break;
-
-			case 'commit':
-				return sqlsrv_commit($this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return sqlsrv_rollback($this->db_connect_id);
-			break;
-		}
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->last_query_text = $query;
-			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @sqlsrv_query($this->db_connect_id, $query, array(), $this->query_options)) === false)
-				{
-					$this->sql_error($query);
-				}
-				// reset options for next query
-				$this->query_options = array();
-
-				if (defined('DEBUG'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache && $cache_ttl)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// total == 0 means all results - not zero results
-		if ($offset == 0 && $total !== 0)
-		{
-			if (strpos($query, "SELECT") === false)
-			{
-				$query = "TOP {$total} " . $query;
-			}
-			else
-			{
-				$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP '.$total, $query);
-			}
-		}
-		else if ($offset > 0)
-		{
-			$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP(10000000) ', $query);
-			$query = 'SELECT *
-					FROM (SELECT sub2.*, ROW_NUMBER() OVER(ORDER BY sub2.line2) AS line3
-					FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3';
-
-			if ($total > 0)
-			{
-				$query .= ' WHERE line3 BETWEEN ' . ($offset+1) . ' AND ' . ($offset + $total);
-			}
-			else
-			{
-				$query .= ' WHERE line3 > ' . $offset;
-			}
-		}
-
-		$result = $this->sql_query($query, $cache_ttl);
-
-		return $result;
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @sqlsrv_rows_affected($this->query_result) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		$row = @sqlsrv_fetch_array($query_id, SQLSRV_FETCH_ASSOC);
-
-		if ($row)
-		{
-			foreach ($row as $key => $value)
-			{
-				$row[$key] = ($value === ' ' || $value === NULL) ? '' : $value;
-			}
-
-			// remove helper values from LIMIT queries
-			if (isset($row['line2']))
-			{
-				unset($row['line2'], $row['line3']);
-			}
-		}
-		return (sizeof($row)) ? $row : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$result_id = @sqlsrv_query($this->db_connect_id, 'SELECT @@IDENTITY');
-
-		if ($result_id !== false)
-		{
-			$row = @sqlsrv_fetch_array($result_id);
-			$id = $row[0];
-			@sqlsrv_free_stmt($result_id);
-			return $id;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache->sql_exists($query_id))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @sqlsrv_free_stmt($query_id);
-		}
-		return false;
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		if (function_exists('sqlsrv_errors'))
-		{
-			$errors = @sqlsrv_errors(SQLSRV_ERR_ERRORS);
-			$error_message = '';
-			$code = 0;
-
-			if ($errors != null)
-			{
-				foreach ($errors as $error)
-				{
-					$error_message .= "SQLSTATE: " . $error[ 'SQLSTATE'] . "\n";
-					$error_message .= "code: " . $error[ 'code'] . "\n";
-					$code = $error['code'];
-					$error_message .= "message: " . $error[ 'message'] . "\n";
-				}
-				$this->last_error_result = $error_message;
-				$error = $this->last_error_result;
-			}
-			else
-			{
-				$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
-			}
-
-			$error = array(
-				'message'	=> $error,
-				'code'		=> $code,
-			);
-		}
-		else
-		{
-			$error = array(
-				'message'	=> $this->connect_error,
-				'code'		=> '',
-			);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @sqlsrv_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-				$html_table = false;
-				@sqlsrv_query($this->db_connect_id, 'SET SHOWPLAN_TEXT ON;');
-				if ($result = @sqlsrv_query($this->db_connect_id, $query))
-				{
-					@sqlsrv_next_result($result);
-					while ($row = @sqlsrv_fetch_array($result))
-					{
-						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-					}
-				}
-				@sqlsrv_query($this->db_connect_id, 'SET SHOWPLAN_TEXT OFF;');
-				@sqlsrv_free_stmt($result);
-
-				if ($html_table)
-				{
-					$this->html_hold .= '</table>';
-				}
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @sqlsrv_query($this->db_connect_id, $query);
-				while ($void = @sqlsrv_fetch_array($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@sqlsrv_free_stmt($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-
-	/**
-	* Utility method used to retrieve number of rows
-	* Emulates mysql_num_rows
-	* Used in acp_database.php -> write_data_mssqlnative()
-	* Requires a static or keyset cursor to be definde via
-	* mssqlnative_set_query_options()
-	*/
-	function mssqlnative_num_rows($res)
-	{
-		if ($res !== false)
-		{
-			return sqlsrv_num_rows($res);
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	* Allows setting mssqlnative specific query options passed to sqlsrv_query as 4th parameter.
-	*/
-	function mssqlnative_set_query_options($options)
-	{
-		$this->query_options = $options;
-	}
-}
diff --git a/phpBB/includes/db/driver/mysql.php b/phpBB/includes/db/driver/mysql.php
deleted file mode 100644
index f3744ac09d..0000000000
--- a/phpBB/includes/db/driver/mysql.php
+++ /dev/null
@@ -1,472 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* MySQL4 Database Abstraction Layer
-* Compatible with:
-* MySQL 3.23+
-* MySQL 4.0+
-* MySQL 4.1+
-* MySQL 5.0+
-* @package dbal
-*/
-class phpbb_db_driver_mysql extends phpbb_db_driver_mysql_base
-{
-	var $multi_insert = true;
-	var $connect_error = '';
-
-	/**
-	* Connect to server
-	* @access public
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->server = $sqlserver . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-
-		$this->sql_layer = 'mysql4';
-
-		if ($this->persistency)
-		{
-			if (!function_exists('mysql_pconnect'))
-			{
-				$this->connect_error = 'mysql_pconnect function does not exist, is mysql extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @mysql_pconnect($this->server, $this->user, $sqlpassword);
-		}
-		else
-		{
-			if (!function_exists('mysql_connect'))
-			{
-				$this->connect_error = 'mysql_connect function does not exist, is mysql extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @mysql_connect($this->server, $this->user, $sqlpassword, $new_link);
-		}
-
-		if ($this->db_connect_id && $this->dbname != '')
-		{
-			if (@mysql_select_db($this->dbname, $this->db_connect_id))
-			{
-				// Determine what version we are using and if it natively supports UNICODE
-				if (version_compare($this->sql_server_info(true), '4.1.0', '>='))
-				{
-					@mysql_query("SET NAMES 'utf8'", $this->db_connect_id);
-
-					// enforce strict mode on databases that support it
-					if (version_compare($this->sql_server_info(true), '5.0.2', '>='))
-					{
-						$result = @mysql_query('SELECT @@session.sql_mode AS sql_mode', $this->db_connect_id);
-						$row = @mysql_fetch_assoc($result);
-						@mysql_free_result($result);
-						$modes = array_map('trim', explode(',', $row['sql_mode']));
-
-						// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
-						if (!in_array('TRADITIONAL', $modes))
-						{
-							if (!in_array('STRICT_ALL_TABLES', $modes))
-							{
-								$modes[] = 'STRICT_ALL_TABLES';
-							}
-
-							if (!in_array('STRICT_TRANS_TABLES', $modes))
-							{
-								$modes[] = 'STRICT_TRANS_TABLES';
-							}
-						}
-
-						$mode = implode(',', $modes);
-						@mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id);
-					}
-				}
-				else if (version_compare($this->sql_server_info(true), '4.0.0', '<'))
-				{
-					$this->sql_layer = 'mysql';
-				}
-
-				return $this->db_connect_id;
-			}
-		}
-
-		return $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mysql_version')) === false)
-		{
-			$result = @mysql_query('SELECT VERSION() AS version', $this->db_connect_id);
-			$row = @mysql_fetch_assoc($result);
-			@mysql_free_result($result);
-
-			$this->sql_server_version = $row['version'];
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('mysql_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'MySQL ' . $this->sql_server_version;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @mysql_query('BEGIN', $this->db_connect_id);
-			break;
-
-			case 'commit':
-				return @mysql_query('COMMIT', $this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @mysql_query('ROLLBACK', $this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @mysql_query($query, $this->db_connect_id)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache && $cache_ttl)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @mysql_affected_rows($this->db_connect_id) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		return ($query_id !== false) ? @mysql_fetch_assoc($query_id) : false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @mysql_data_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		return ($this->db_connect_id) ? @mysql_insert_id($this->db_connect_id) : false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @mysql_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		if (!$this->db_connect_id)
-		{
-			return @mysql_real_escape_string($msg);
-		}
-
-		return @mysql_real_escape_string($msg, $this->db_connect_id);
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		if ($this->db_connect_id)
-		{
-			$error = array(
-				'message'	=> @mysql_error($this->db_connect_id),
-				'code'		=> @mysql_errno($this->db_connect_id),
-			);
-		}
-		else if (function_exists('mysql_error'))
-		{
-			$error = array(
-				'message'	=> @mysql_error(),
-				'code'		=> @mysql_errno(),
-			);
-		}
-		else
-		{
-			$error = array(
-				'message'	=> $this->connect_error,
-				'code'		=> '',
-			);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @mysql_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		static $test_prof;
-
-		// current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING
-		if ($test_prof === null)
-		{
-			$test_prof = false;
-			if (version_compare($this->sql_server_info(true), '5.0.37', '>=') && version_compare($this->sql_server_info(true), '5.1', '<'))
-			{
-				$test_prof = true;
-			}
-		}
-
-		switch ($mode)
-		{
-			case 'start':
-
-				$explain_query = $query;
-				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-
-				if (preg_match('/^SELECT/', $explain_query))
-				{
-					$html_table = false;
-
-					// begin profiling
-					if ($test_prof)
-					{
-						@mysql_query('SET profiling = 1;', $this->db_connect_id);
-					}
-
-					if ($result = @mysql_query("EXPLAIN $explain_query", $this->db_connect_id))
-					{
-						while ($row = @mysql_fetch_assoc($result))
-						{
-							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-						}
-					}
-					@mysql_free_result($result);
-
-					if ($html_table)
-					{
-						$this->html_hold .= '</table>';
-					}
-
-					if ($test_prof)
-					{
-						$html_table = false;
-
-						// get the last profile
-						if ($result = @mysql_query('SHOW PROFILE ALL;', $this->db_connect_id))
-						{
-							$this->html_hold .= '<br />';
-							while ($row = @mysql_fetch_assoc($result))
-							{
-								// make <unknown> HTML safe
-								if (!empty($row['Source_function']))
-								{
-									$row['Source_function'] = str_replace(array('<', '>'), array('&lt;', '&gt;'), $row['Source_function']);
-								}
-
-								// remove unsupported features
-								foreach ($row as $key => $val)
-								{
-									if ($val === null)
-									{
-										unset($row[$key]);
-									}
-								}
-								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-							}
-						}
-						@mysql_free_result($result);
-
-						if ($html_table)
-						{
-							$this->html_hold .= '</table>';
-						}
-
-						@mysql_query('SET profiling = 0;', $this->db_connect_id);
-					}
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @mysql_query($query, $this->db_connect_id);
-				while ($void = @mysql_fetch_assoc($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@mysql_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/driver/mysql_base.php b/phpBB/includes/db/driver/mysql_base.php
deleted file mode 100644
index ba44ea61aa..0000000000
--- a/phpBB/includes/db/driver/mysql_base.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Abstract MySQL Database Base Abstraction Layer
-* @package dbal
-*/
-abstract class phpbb_db_driver_mysql_base extends phpbb_db_driver
-{
-	/**
-	* {@inheritDoc}
-	*/
-	public function sql_concatenate($expr1, $expr2)
-	{
-		return 'CONCAT(' . $expr1 . ', ' . $expr2 . ')';
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			// MySQL 4.1+ no longer supports -1 in limit queries
-			$total = '18446744073709551615';
-		}
-
-		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Gets the estimated number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Number of rows in $table_name.
-	*								Prefixed with ~ if estimated (otherwise exact).
-	*
-	* @access public
-	*/
-	function get_estimated_row_count($table_name)
-	{
-		$table_status = $this->get_table_status($table_name);
-
-		if (isset($table_status['Engine']))
-		{
-			if ($table_status['Engine'] === 'MyISAM')
-			{
-				return $table_status['Rows'];
-			}
-			else if ($table_status['Engine'] === 'InnoDB' && $table_status['Rows'] > 100000)
-			{
-				return '~' . $table_status['Rows'];
-			}
-		}
-
-		return parent::get_row_count($table_name);
-	}
-
-	/**
-	* Gets the exact number of rows in a specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return string				Exact number of rows in $table_name.
-	*
-	* @access public
-	*/
-	function get_row_count($table_name)
-	{
-		$table_status = $this->get_table_status($table_name);
-
-		if (isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM')
-		{
-			return $table_status['Rows'];
-		}
-
-		return parent::get_row_count($table_name);
-	}
-
-	/**
-	* Gets some information about the specified table.
-	*
-	* @param string $table_name		Table name
-	*
-	* @return array
-	*
-	* @access protected
-	*/
-	function get_table_status($table_name)
-	{
-		$sql = "SHOW TABLE STATUS
-			LIKE '" . $this->sql_escape($table_name) . "'";
-		$result = $this->sql_query($sql);
-		$table_status = $this->sql_fetchrow($result);
-		$this->sql_freeresult($result);
-
-		return $table_status;
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		switch ($stage)
-		{
-			case 'FROM':
-				$data = '(' . $data . ')';
-			break;
-		}
-
-		return $data;
-	}
-}
diff --git a/phpBB/includes/db/driver/mysqli.php b/phpBB/includes/db/driver/mysqli.php
deleted file mode 100644
index 0f7a73ee6e..0000000000
--- a/phpBB/includes/db/driver/mysqli.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* MySQLi Database Abstraction Layer
-* mysqli-extension has to be compiled with:
-* MySQL 4.1+ or MySQL 5.0+
-* @package dbal
-*/
-class phpbb_db_driver_mysqli extends phpbb_db_driver_mysql_base
-{
-	var $multi_insert = true;
-	var $connect_error = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false)
-	{
-		if (!function_exists('mysqli_connect'))
-		{
-			$this->connect_error = 'mysqli_connect function does not exist, is mysqli extension installed?';
-			return $this->sql_error('');
-		}
-
-		// Mysqli extension supports persistent connection since PHP 5.3.0
-		$this->persistency = (version_compare(PHP_VERSION, '5.3.0', '>=')) ? $persistency : false;
-		$this->user = $sqluser;
-
-		// If persistent connection, set dbhost to localhost when empty and prepend it with 'p:' prefix
-		$this->server = ($this->persistency) ? 'p:' . (($sqlserver) ? $sqlserver : 'localhost') : $sqlserver;
-
-		$this->dbname = $database;
-		$port = (!$port) ? NULL : $port;
-
-		// If port is set and it is not numeric, most likely mysqli socket is set.
-		// Try to map it to the $socket parameter.
-		$socket = NULL;
-		if ($port)
-		{
-			if (is_numeric($port))
-			{
-				$port = (int) $port;
-			}
-			else
-			{
-				$socket = $port;
-				$port = NULL;
-			}
-		}
-
-		$this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket);
-
-		if ($this->db_connect_id && $this->dbname != '')
-		{
-			@mysqli_query($this->db_connect_id, "SET NAMES 'utf8'");
-
-			// enforce strict mode on databases that support it
-			if (version_compare($this->sql_server_info(true), '5.0.2', '>='))
-			{
-				$result = @mysqli_query($this->db_connect_id, 'SELECT @@session.sql_mode AS sql_mode');
-				$row = @mysqli_fetch_assoc($result);
-				@mysqli_free_result($result);
-
-				$modes = array_map('trim', explode(',', $row['sql_mode']));
-
-				// TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES
-				if (!in_array('TRADITIONAL', $modes))
-				{
-					if (!in_array('STRICT_ALL_TABLES', $modes))
-					{
-						$modes[] = 'STRICT_ALL_TABLES';
-					}
-
-					if (!in_array('STRICT_TRANS_TABLES', $modes))
-					{
-						$modes[] = 'STRICT_TRANS_TABLES';
-					}
-				}
-
-				$mode = implode(',', $modes);
-				@mysqli_query($this->db_connect_id, "SET SESSION sql_mode='{$mode}'");
-			}
-			return $this->db_connect_id;
-		}
-
-		return $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('mysqli_version')) === false)
-		{
-			$result = @mysqli_query($this->db_connect_id, 'SELECT VERSION() AS version');
-			$row = @mysqli_fetch_assoc($result);
-			@mysqli_free_result($result);
-
-			$this->sql_server_version = $row['version'];
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('mysqli_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'MySQL(i) ' . $this->sql_server_version;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @mysqli_autocommit($this->db_connect_id, false);
-			break;
-
-			case 'commit':
-				$result = @mysqli_commit($this->db_connect_id);
-				@mysqli_autocommit($this->db_connect_id, true);
-				return $result;
-			break;
-
-			case 'rollback':
-				$result = @mysqli_rollback($this->db_connect_id);
-				@mysqli_autocommit($this->db_connect_id, true);
-				return $result;
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @mysqli_query($this->db_connect_id, $query)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache && $cache_ttl)
-				{
-					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
-				}
-			}
-			else if (defined('DEBUG'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @mysqli_affected_rows($this->db_connect_id) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		if ($query_id !== false)
-		{
-			$result = @mysqli_fetch_assoc($query_id);
-			return $result !== null ? $result : false;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @mysqli_data_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		return ($this->db_connect_id) ? @mysqli_insert_id($this->db_connect_id) : false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		return @mysqli_free_result($query_id);
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return @mysqli_real_escape_string($this->db_connect_id, $msg);
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		if ($this->db_connect_id)
-		{
-			$error = array(
-				'message'	=> @mysqli_error($this->db_connect_id),
-				'code'		=> @mysqli_errno($this->db_connect_id)
-			);
-		}
-		else if (function_exists('mysqli_connect_error'))
-		{
-			$error = array(
-				'message'	=> @mysqli_connect_error(),
-				'code'		=> @mysqli_connect_errno(),
-			);
-		}
-		else
-		{
-			$error = array(
-				'message'	=> $this->connect_error,
-				'code'		=> '',
-			);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @mysqli_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		static $test_prof;
-
-		// current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING
-		if ($test_prof === null)
-		{
-			$test_prof = false;
-			if (strpos(mysqli_get_server_info($this->db_connect_id), 'community') !== false)
-			{
-				$ver = mysqli_get_server_version($this->db_connect_id);
-				if ($ver >= 50037 && $ver < 50100)
-				{
-					$test_prof = true;
-				}
-			}
-		}
-
-		switch ($mode)
-		{
-			case 'start':
-
-				$explain_query = $query;
-				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-
-				if (preg_match('/^SELECT/', $explain_query))
-				{
-					$html_table = false;
-
-					// begin profiling
-					if ($test_prof)
-					{
-						@mysqli_query($this->db_connect_id, 'SET profiling = 1;');
-					}
-
-					if ($result = @mysqli_query($this->db_connect_id, "EXPLAIN $explain_query"))
-					{
-						while ($row = @mysqli_fetch_assoc($result))
-						{
-							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-						}
-					}
-					@mysqli_free_result($result);
-
-					if ($html_table)
-					{
-						$this->html_hold .= '</table>';
-					}
-
-					if ($test_prof)
-					{
-						$html_table = false;
-
-						// get the last profile
-						if ($result = @mysqli_query($this->db_connect_id, 'SHOW PROFILE ALL;'))
-						{
-							$this->html_hold .= '<br />';
-							while ($row = @mysqli_fetch_assoc($result))
-							{
-								// make <unknown> HTML safe
-								if (!empty($row['Source_function']))
-								{
-									$row['Source_function'] = str_replace(array('<', '>'), array('&lt;', '&gt;'), $row['Source_function']);
-								}
-
-								// remove unsupported features
-								foreach ($row as $key => $val)
-								{
-									if ($val === null)
-									{
-										unset($row[$key]);
-									}
-								}
-								$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-							}
-						}
-						@mysqli_free_result($result);
-
-						if ($html_table)
-						{
-							$this->html_hold .= '</table>';
-						}
-
-						@mysqli_query($this->db_connect_id, 'SET profiling = 0;');
-					}
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @mysqli_query($this->db_connect_id, $query);
-				while ($void = @mysqli_fetch_assoc($result))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@mysqli_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/driver/oracle.php b/phpBB/includes/db/driver/oracle.php
deleted file mode 100644
index e21e07055d..0000000000
--- a/phpBB/includes/db/driver/oracle.php
+++ /dev/null
@@ -1,803 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Oracle Database Abstraction Layer
-* @package dbal
-*/
-class phpbb_db_driver_oracle extends phpbb_db_driver
-{
-	var $last_query_text = '';
-	var $connect_error = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->server = $sqlserver . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-
-		$connect = $database;
-
-		// support for "easy connect naming"
-		if ($sqlserver !== '' && $sqlserver !== '/')
-		{
-			if (substr($sqlserver, -1, 1) == '/')
-			{
-				$sqlserver == substr($sqlserver, 0, -1);
-			}
-			$connect = $sqlserver . (($port) ? ':' . $port : '') . '/' . $database;
-		}
-
-		if ($new_link)
-		{
-			if (!function_exists('ocinlogon'))
-			{
-				$this->connect_error = 'ocinlogon function does not exist, is oci extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @ocinlogon($this->user, $sqlpassword, $connect, 'UTF8');
-		}
-		else if ($this->persistency)
-		{
-			if (!function_exists('ociplogon'))
-			{
-				$this->connect_error = 'ociplogon function does not exist, is oci extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @ociplogon($this->user, $sqlpassword, $connect, 'UTF8');
-		}
-		else
-		{
-			if (!function_exists('ocilogon'))
-			{
-				$this->connect_error = 'ocilogon function does not exist, is oci extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @ocilogon($this->user, $sqlpassword, $connect, 'UTF8');
-		}
-
-		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache forced to false for Oracle
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		/**
-		* force $use_cache false.  I didn't research why the caching code below is commented out
-		* but I assume its because the Oracle extension provides a direct method to access it
-		* without a query.
-		*/
-
-		$use_cache = false;
-/*
-		global $cache;
-
-		if (empty($cache) || ($this->sql_server_version = $cache->get('oracle_version')) === false)
-		{
-			$result = @ociparse($this->db_connect_id, 'SELECT * FROM v$version WHERE banner LIKE \'Oracle%\'');
-			@ociexecute($result, OCI_DEFAULT);
-			@ocicommit($this->db_connect_id);
-
-			$row = array();
-			@ocifetchinto($result, $row, OCI_ASSOC + OCI_RETURN_NULLS);
-			@ocifreestatement($result);
-			$this->sql_server_version = trim($row['BANNER']);
-
-			$cache->put('oracle_version', $this->sql_server_version);
-		}
-*/
-		$this->sql_server_version = @ociserverversion($this->db_connect_id);
-
-		return $this->sql_server_version;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return true;
-			break;
-
-			case 'commit':
-				return @ocicommit($this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @ocirollback($this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Oracle specific code to handle the fact that it does not compare columns properly
-	* @access private
-	*/
-	function _rewrite_col_compare($args)
-	{
-		if (sizeof($args) == 4)
-		{
-			if ($args[2] == '=')
-			{
-				return '(' . $args[0] . ' OR (' . $args[1] . ' is NULL AND ' . $args[3] . ' is NULL))';
-			}
-			else if ($args[2] == '<>')
-			{
-				// really just a fancy way of saying foo <> bar or (foo is NULL XOR bar is NULL) but SQL has no XOR :P
-				return '(' . $args[0] . ' OR ((' . $args[1] . ' is NULL AND ' . $args[3] . ' is NOT NULL) OR (' . $args[1] . ' is NOT NULL AND ' . $args[3] . ' is NULL)))';
-			}
-		}
-		else
-		{
-			return $this->_rewrite_where($args[0]);
-		}
-	}
-
-	/**
-	* Oracle specific code to handle it's lack of sanity
-	* @access private
-	*/
-	function _rewrite_where($where_clause)
-	{
-		preg_match_all('/\s*(AND|OR)?\s*([\w_.()]++)\s*(?:(=|<[=>]?|>=?|LIKE)\s*((?>\'(?>[^\']++|\'\')*+\'|[\d-.()]+))|((NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))/', $where_clause, $result, PREG_SET_ORDER);
-		$out = '';
-		foreach ($result as $val)
-		{
-			if (!isset($val[5]))
-			{
-				if ($val[4] !== "''")
-				{
-					$out .= $val[0];
-				}
-				else
-				{
-					$out .= ' ' . $val[1] . ' ' . $val[2];
-					if ($val[3] == '=')
-					{
-						$out .= ' is NULL';
-					}
-					else if ($val[3] == '<>')
-					{
-						$out .= ' is NOT NULL';
-					}
-				}
-			}
-			else
-			{
-				$in_clause = array();
-				$sub_exp = substr($val[5], strpos($val[5], '(') + 1, -1);
-				$extra = false;
-				preg_match_all('/\'(?>[^\']++|\'\')*+\'|[\d-.]++/', $sub_exp, $sub_vals, PREG_PATTERN_ORDER);
-				$i = 0;
-				foreach ($sub_vals[0] as $sub_val)
-				{
-					// two things:
-					// 1) This determines if an empty string was in the IN clausing, making us turn it into a NULL comparison
-					// 2) This fixes the 1000 list limit that Oracle has (ORA-01795)
-					if ($sub_val !== "''")
-					{
-						$in_clause[(int) $i++/1000][] = $sub_val;
-					}
-					else
-					{
-						$extra = true;
-					}
-				}
-				if (!$extra && $i < 1000)
-				{
-					$out .= $val[0];
-				}
-				else
-				{
-					$out .= ' ' . $val[1] . '(';
-					$in_array = array();
-
-					// constuct each IN() clause
-					foreach ($in_clause as $in_values)
-					{
-						$in_array[] = $val[2] . ' ' . (isset($val[6]) ? $val[6] : '') . 'IN(' . implode(', ', $in_values) . ')';
-					}
-
-					// Join the IN() clauses against a few ORs (IN is just a nicer OR anyway)
-					$out .= implode(' OR ', $in_array);
-
-					// handle the empty string case
-					if ($extra)
-					{
-						$out .= ' OR ' . $val[2] . ' is ' . (isset($val[6]) ? $val[6] : '') . 'NULL';
-					}
-					$out .= ')';
-
-					unset($in_array, $in_clause);
-				}
-			}
-		}
-
-		return $out;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->last_query_text = $query;
-			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				$in_transaction = false;
-				if (!$this->transaction)
-				{
-					$this->sql_transaction('begin');
-				}
-				else
-				{
-					$in_transaction = true;
-				}
-
-				$array = array();
-
-				// We overcome Oracle's 4000 char limit by binding vars
-				if (strlen($query) > 4000)
-				{
-					if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/sU', $query, $regs))
-					{
-						if (strlen($regs[3]) > 4000)
-						{
-							$cols = explode(', ', $regs[2]);
-
-							preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER);
-
-/*						The code inside this comment block breaks clob handling, but does allow the
-						database restore script to work.  If you want to allow no posts longer than 4KB
-						and/or need the db restore script, uncomment this.
-
-
-							if (sizeof($cols) !== sizeof($vals))
-							{
-								// Try to replace some common data we know is from our restore script or from other sources
-								$regs[3] = str_replace("'||chr(47)||'", '/', $regs[3]);
-								$_vals = explode(', ', $regs[3]);
-
-								$vals = array();
-								$is_in_val = false;
-								$i = 0;
-								$string = '';
-
-								foreach ($_vals as $value)
-								{
-									if (strpos($value, "'") === false && !$is_in_val)
-									{
-										$vals[$i++] = $value;
-										continue;
-									}
-
-									if (substr($value, -1) === "'")
-									{
-										$vals[$i] = $string . (($is_in_val) ? ', ' : '') . $value;
-										$string = '';
-										$is_in_val = false;
-
-										if ($vals[$i][0] !== "'")
-										{
-											$vals[$i] = "''" . $vals[$i];
-										}
-										$i++;
-										continue;
-									}
-									else
-									{
-										$string .= (($is_in_val) ? ', ' : '') . $value;
-										$is_in_val = true;
-									}
-								}
-
-								if ($string)
-								{
-									// New value if cols != value
-									$vals[(sizeof($cols) !== sizeof($vals)) ? $i : $i - 1] .= $string;
-								}
-
-								$vals = array(0 => $vals);
-							}
-*/
-
-							$inserts = $vals[0];
-							unset($vals);
-
-							foreach ($inserts as $key => $value)
-							{
-								if (!empty($value) && $value[0] === "'" && strlen($value) > 4002) // check to see if this thing is greater than the max + 'x2
-								{
-									$inserts[$key] = ':' . strtoupper($cols[$key]);
-									$array[$inserts[$key]] = str_replace("''", "'", substr($value, 1, -1));
-								}
-							}
-
-							$query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')';
-						}
-					}
-					else if (preg_match_all('/^(UPDATE [\\w_]++\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data, PREG_SET_ORDER))
-					{
-						if (strlen($data[0][2]) > 4000)
-						{
-							$update = $data[0][1];
-							$where = $data[0][3];
-							preg_match_all('/([\\w_]++)\\s*=\\s*(\'(?:[^\']++|\'\')*+\'|[\d-.]++)/', $data[0][2], $temp, PREG_SET_ORDER);
-							unset($data);
-
-							$cols = array();
-							foreach ($temp as $value)
-							{
-								if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 4002) // check to see if this thing is greater than the max + 'x2
-								{
-									$cols[] = $value[1] . '=:' . strtoupper($value[1]);
-									$array[$value[1]] = str_replace("''", "'", substr($value[2], 1, -1));
-								}
-								else
-								{
-									$cols[] = $value[1] . '=' . $value[2];
-								}
-							}
-
-							$query = $update . implode(', ', $cols) . ' ' . $where;
-							unset($cols);
-						}
-					}
-				}
-
-				switch (substr($query, 0, 6))
-				{
-					case 'DELETE':
-						if (preg_match('/^(DELETE FROM [\w_]++ WHERE)((?:\s*(?:AND|OR)?\s*[\w_]+\s*(?:(?:=|<>)\s*(?>\'(?>[^\']++|\'\')*+\'|[\d-.]+)|(?:NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))*+)$/', $query, $regs))
-						{
-							$query = $regs[1] . $this->_rewrite_where($regs[2]);
-							unset($regs);
-						}
-					break;
-
-					case 'UPDATE':
-						if (preg_match('/^(UPDATE [\\w_]++\\s+SET [\\w_]+\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]++|:\w++)(?:, [\\w_]+\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]++|:\w++))*+\\s+WHERE)(.*)$/s',  $query, $regs))
-						{
-							$query = $regs[1] . $this->_rewrite_where($regs[2]);
-							unset($regs);
-						}
-					break;
-
-					case 'SELECT':
-						$query = preg_replace_callback('/([\w_.]++)\s*(?:(=|<>)\s*(?>\'(?>[^\']++|\'\')*+\'|[\d-.]++|([\w_.]++))|(?:NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]++,? ?)*+\))/', array($this, '_rewrite_col_compare'), $query);
-					break;
-				}
-
-				$this->query_result = @ociparse($this->db_connect_id, $query);
-
-				foreach ($array as $key => $value)
-				{
-					@ocibindbyname($this->query_result, $key, $array[$key], -1);
-				}
-
-				$success = @ociexecute($this->query_result, OCI_DEFAULT);
-
-				if (!$success)
-				{
-					$this->sql_error($query);
-					$this->query_result = false;
-				}
-				else
-				{
-					if (!$in_transaction)
-					{
-						$this->sql_transaction('commit');
-					}
-				}
-
-				if (defined('DEBUG'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache && $cache_ttl)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		$query = 'SELECT * FROM (SELECT /*+ FIRST_ROWS */ rownum AS xrownum, a.* FROM (' . $query . ') a WHERE rownum <= ' . ($offset + $total) . ') WHERE xrownum >= ' . $offset;
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->query_result) ? @ocirowcount($this->query_result) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		if ($query_id !== false)
-		{
-			$row = array();
-			$result = @ocifetchinto($query_id, $row, OCI_ASSOC + OCI_RETURN_NULLS);
-
-			if (!$result || !$row)
-			{
-				return false;
-			}
-
-			$result_row = array();
-			foreach ($row as $key => $value)
-			{
-				// Oracle treats empty strings as null
-				if (is_null($value))
-				{
-					$value = '';
-				}
-
-				// OCI->CLOB?
-				if (is_object($value))
-				{
-					$value = $value->load();
-				}
-
-				$result_row[strtolower($key)] = $value;
-			}
-
-			return $result_row;
-		}
-
-		return false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		if ($query_id === false)
-		{
-			return false;
-		}
-
-		// Reset internal pointer
-		@ociexecute($query_id, OCI_DEFAULT);
-
-		// We do not fetch the row for rownum == 0 because then the next resultset would be the second row
-		for ($i = 0; $i < $rownum; $i++)
-		{
-			if (!$this->sql_fetchrow($query_id))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$query_id = $this->query_result;
-
-		if ($query_id !== false && $this->last_query_text != '')
-		{
-			if (preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename))
-			{
-				$query = 'SELECT ' . $tablename[1] . '_seq.currval FROM DUAL';
-				$stmt = @ociparse($this->db_connect_id, $query);
-				@ociexecute($stmt, OCI_DEFAULT);
-
-				$temp_result = @ocifetchinto($stmt, $temp_array, OCI_ASSOC + OCI_RETURN_NULLS);
-				@ocifreestatement($stmt);
-
-				if ($temp_result)
-				{
-					return $temp_array['CURRVAL'];
-				}
-				else
-				{
-					return false;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @ocifreestatement($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return str_replace(array("'", "\0"), array("''", ''), $msg);
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression . " ESCAPE '\\'";
-	}
-
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	function _sql_bit_and($column_name, $bit, $compare = '')
-	{
-		return 'BITAND(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
-	}
-
-	function _sql_bit_or($column_name, $bit, $compare = '')
-	{
-		return 'BITOR(' . $column_name . ', ' . (1 << $bit) . ')' . (($compare) ? ' ' . $compare : '');
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		if (function_exists('ocierror'))
-		{
-			$error = @ocierror();
-			$error = (!$error) ? @ocierror($this->query_result) : $error;
-			$error = (!$error) ? @ocierror($this->db_connect_id) : $error;
-
-			if ($error)
-			{
-				$this->last_error_result = $error;
-			}
-			else
-			{
-				$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
-			}
-		}
-		else
-		{
-			$error = array(
-				'message'	=> $this->connect_error,
-				'code'		=> '',
-			);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @ocilogoff($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-
-				$html_table = false;
-
-				// Grab a plan table, any will do
-				$sql = "SELECT table_name
-					FROM USER_TABLES
-					WHERE table_name LIKE '%PLAN_TABLE%'";
-				$stmt = ociparse($this->db_connect_id, $sql);
-				ociexecute($stmt);
-				$result = array();
-
-				if (ocifetchinto($stmt, $result, OCI_ASSOC + OCI_RETURN_NULLS))
-				{
-					$table = $result['TABLE_NAME'];
-
-					// This is the statement_id that will allow us to track the plan
-					$statement_id = substr(md5($query), 0, 30);
-
-					// Remove any stale plans
-					$stmt2 = ociparse($this->db_connect_id, "DELETE FROM $table WHERE statement_id='$statement_id'");
-					ociexecute($stmt2);
-					ocifreestatement($stmt2);
-
-					// Explain the plan
-					$sql = "EXPLAIN PLAN
-						SET STATEMENT_ID = '$statement_id'
-						FOR $query";
-					$stmt2 = ociparse($this->db_connect_id, $sql);
-					ociexecute($stmt2);
-					ocifreestatement($stmt2);
-
-					// Get the data from the plan
-					$sql = "SELECT operation, options, object_name, object_type, cardinality, cost
-						FROM plan_table
-						START WITH id = 0 AND statement_id = '$statement_id'
-						CONNECT BY PRIOR id = parent_id
-							AND statement_id = '$statement_id'";
-					$stmt2 = ociparse($this->db_connect_id, $sql);
-					ociexecute($stmt2);
-
-					$row = array();
-					while (ocifetchinto($stmt2, $row, OCI_ASSOC + OCI_RETURN_NULLS))
-					{
-						$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-					}
-
-					ocifreestatement($stmt2);
-
-					// Remove the plan we just made, we delete them on request anyway
-					$stmt2 = ociparse($this->db_connect_id, "DELETE FROM $table WHERE statement_id='$statement_id'");
-					ociexecute($stmt2);
-					ocifreestatement($stmt2);
-				}
-
-				ocifreestatement($stmt);
-
-				if ($html_table)
-				{
-					$this->html_hold .= '</table>';
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @ociparse($this->db_connect_id, $query);
-				$success = @ociexecute($result, OCI_DEFAULT);
-				$row = array();
-
-				while (@ocifetchinto($result, $row, OCI_ASSOC + OCI_RETURN_NULLS))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@ocifreestatement($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/driver/postgres.php b/phpBB/includes/db/driver/postgres.php
deleted file mode 100644
index 14854d179d..0000000000
--- a/phpBB/includes/db/driver/postgres.php
+++ /dev/null
@@ -1,491 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* PostgreSQL Database Abstraction Layer
-* Minimum Requirement is Version 7.3+
-* @package dbal
-*/
-class phpbb_db_driver_postgres extends phpbb_db_driver
-{
-	var $last_query_text = '';
-	var $connect_error = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$connect_string = '';
-
-		if ($sqluser)
-		{
-			$connect_string .= "user=$sqluser ";
-		}
-
-		if ($sqlpassword)
-		{
-			$connect_string .= "password=$sqlpassword ";
-		}
-
-		if ($sqlserver)
-		{
-			// $sqlserver can carry a port separated by : for compatibility reasons
-			// If $sqlserver has more than one : it's probably an IPv6 address.
-			// In this case we only allow passing a port via the $port variable.
-			if (substr_count($sqlserver, ':') === 1)
-			{
-				list($sqlserver, $port) = explode(':', $sqlserver);
-			}
-
-			if ($sqlserver !== 'localhost')
-			{
-				$connect_string .= "host=$sqlserver ";
-			}
-
-			if ($port)
-			{
-				$connect_string .= "port=$port ";
-			}
-		}
-
-		$schema = '';
-
-		if ($database)
-		{
-			$this->dbname = $database;
-			if (strpos($database, '.') !== false)
-			{
-				list($database, $schema) = explode('.', $database);
-			}
-			$connect_string .= "dbname=$database";
-		}
-
-		$this->persistency = $persistency;
-
-		if ($this->persistency)
-		{
-			if (!function_exists('pg_pconnect'))
-			{
-				$this->connect_error = 'pg_pconnect function does not exist, is pgsql extension installed?';
-				return $this->sql_error('');
-			}
-			$collector = new phpbb_error_collector;
-			$collector->install();
-			$this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW);
-		}
-		else
-		{
-			if (!function_exists('pg_connect'))
-			{
-				$this->connect_error = 'pg_connect function does not exist, is pgsql extension installed?';
-				return $this->sql_error('');
-			}
-			$collector = new phpbb_error_collector;
-			$collector->install();
-			$this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW);
-		}
-
-		$collector->uninstall();
-
-		if ($this->db_connect_id)
-		{
-			if (version_compare($this->sql_server_info(true), '8.2', '>='))
-			{
-				$this->multi_insert = true;
-			}
-
-			if ($schema !== '')
-			{
-				@pg_query($this->db_connect_id, 'SET search_path TO ' . $schema);
-			}
-			return $this->db_connect_id;
-		}
-
-		$this->connect_error = $collector->format_errors();
-		return $this->sql_error('');
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache If true, it is safe to retrieve the value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('pgsql_version')) === false)
-		{
-			$query_id = @pg_query($this->db_connect_id, 'SELECT VERSION() AS version');
-			$row = @pg_fetch_assoc($query_id, null);
-			@pg_free_result($query_id);
-
-			$this->sql_server_version = (!empty($row['version'])) ? trim(substr($row['version'], 10)) : 0;
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('pgsql_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'PostgreSQL ' . $this->sql_server_version;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @pg_query($this->db_connect_id, 'BEGIN');
-			break;
-
-			case 'commit':
-				return @pg_query($this->db_connect_id, 'COMMIT');
-			break;
-
-			case 'rollback':
-				return @pg_query($this->db_connect_id, 'ROLLBACK');
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->last_query_text = $query;
-			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @pg_query($this->db_connect_id, $query)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache && $cache_ttl)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			$total = 'ALL';
-		}
-
-		$query .= "\n LIMIT $total OFFSET $offset";
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->query_result) ? @pg_affected_rows($this->query_result) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		return ($query_id !== false) ? @pg_fetch_assoc($query_id, null) : false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @pg_result_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		$query_id = $this->query_result;
-
-		if ($query_id !== false && $this->last_query_text != '')
-		{
-			if (preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text, $tablename))
-			{
-				$query = "SELECT currval('" . $tablename[1] . "_seq') AS last_value";
-				$temp_q_id = @pg_query($this->db_connect_id, $query);
-
-				if (!$temp_q_id)
-				{
-					return false;
-				}
-
-				$temp_result = @pg_fetch_assoc($temp_q_id, NULL);
-				@pg_free_result($query_id);
-
-				return ($temp_result) ? $temp_result['last_value'] : false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		if (isset($this->open_queries[(int) $query_id]))
-		{
-			unset($this->open_queries[(int) $query_id]);
-			return @pg_free_result($query_id);
-		}
-
-		return false;
-	}
-
-	/**
-	* Escape string used in sql query
-	* Note: Do not use for bytea values if we may use them at a later stage
-	*/
-	function sql_escape($msg)
-	{
-		return @pg_escape_string($msg);
-	}
-
-	/**
-	* Build LIKE expression
-	* @access private
-	*/
-	function _sql_like_expression($expression)
-	{
-		return $expression;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	function cast_expr_to_bigint($expression)
-	{
-		return 'CAST(' . $expression . ' as DECIMAL(255, 0))';
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	function cast_expr_to_string($expression)
-	{
-		return 'CAST(' . $expression . ' as VARCHAR(255))';
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		// pg_last_error only works when there is an established connection.
-		// Connection errors have to be tracked by us manually.
-		if ($this->db_connect_id)
-		{
-			$message = @pg_last_error($this->db_connect_id);
-		}
-		else
-		{
-			$message = $this->connect_error;
-		}
-
-		return array(
-			'message'	=> $message,
-			'code'		=> ''
-		);
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @pg_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-
-				$explain_query = $query;
-				if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-				else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m))
-				{
-					$explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2];
-				}
-
-				if (preg_match('/^SELECT/', $explain_query))
-				{
-					$html_table = false;
-
-					if ($result = @pg_query($this->db_connect_id, "EXPLAIN $explain_query"))
-					{
-						while ($row = @pg_fetch_assoc($result, NULL))
-						{
-							$html_table = $this->sql_report('add_select_row', $query, $html_table, $row);
-						}
-					}
-					@pg_free_result($result);
-
-					if ($html_table)
-					{
-						$this->html_hold .= '</table>';
-					}
-				}
-
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @pg_query($this->db_connect_id, $query);
-				while ($void = @pg_fetch_assoc($result, NULL))
-				{
-					// Take the time spent on parsing rows into account
-				}
-				@pg_free_result($result);
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/driver/sqlite.php b/phpBB/includes/db/driver/sqlite.php
deleted file mode 100644
index 7188f0daa2..0000000000
--- a/phpBB/includes/db/driver/sqlite.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Sqlite Database Abstraction Layer
-* Minimum Requirement: 2.8.2+
-* @package dbal
-*/
-class phpbb_db_driver_sqlite extends phpbb_db_driver
-{
-	var $connect_error = '';
-
-	/**
-	* Connect to server
-	*/
-	function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false)
-	{
-		$this->persistency = $persistency;
-		$this->user = $sqluser;
-		$this->server = $sqlserver . (($port) ? ':' . $port : '');
-		$this->dbname = $database;
-
-		$error = '';
-		if ($this->persistency)
-		{
-			if (!function_exists('sqlite_popen'))
-			{
-				$this->connect_error = 'sqlite_popen function does not exist, is sqlite extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @sqlite_popen($this->server, 0666, $error);
-		}
-		else
-		{
-			if (!function_exists('sqlite_open'))
-			{
-				$this->connect_error = 'sqlite_open function does not exist, is sqlite extension installed?';
-				return $this->sql_error('');
-			}
-			$this->db_connect_id = @sqlite_open($this->server, 0666, $error);
-		}
-
-		if ($this->db_connect_id)
-		{
-			@sqlite_query('PRAGMA short_column_names = 1', $this->db_connect_id);
-//			@sqlite_query('PRAGMA encoding = "UTF-8"', $this->db_connect_id);
-		}
-
-		return ($this->db_connect_id) ? true : array('message' => $error);
-	}
-
-	/**
-	* Version information about used database
-	* @param bool $raw if true, only return the fetched sql_server_version
-	* @param bool $use_cache if true, it is safe to retrieve the stored value from the cache
-	* @return string sql server version
-	*/
-	function sql_server_info($raw = false, $use_cache = true)
-	{
-		global $cache;
-
-		if (!$use_cache || empty($cache) || ($this->sql_server_version = $cache->get('sqlite_version')) === false)
-		{
-			$result = @sqlite_query('SELECT sqlite_version() AS version', $this->db_connect_id);
-			$row = @sqlite_fetch_array($result, SQLITE_ASSOC);
-
-			$this->sql_server_version = (!empty($row['version'])) ? $row['version'] : 0;
-
-			if (!empty($cache) && $use_cache)
-			{
-				$cache->put('sqlite_version', $this->sql_server_version);
-			}
-		}
-
-		return ($raw) ? $this->sql_server_version : 'SQLite ' . $this->sql_server_version;
-	}
-
-	/**
-	* SQL Transaction
-	* @access private
-	*/
-	function _sql_transaction($status = 'begin')
-	{
-		switch ($status)
-		{
-			case 'begin':
-				return @sqlite_query('BEGIN', $this->db_connect_id);
-			break;
-
-			case 'commit':
-				return @sqlite_query('COMMIT', $this->db_connect_id);
-			break;
-
-			case 'rollback':
-				return @sqlite_query('ROLLBACK', $this->db_connect_id);
-			break;
-		}
-
-		return true;
-	}
-
-	/**
-	* Base query method
-	*
-	* @param	string	$query		Contains the SQL query which shall be executed
-	* @param	int		$cache_ttl	Either 0 to avoid caching or the time in seconds which the result shall be kept in cache
-	* @return	mixed				When casted to bool the returned value returns true on success and false on failure
-	*
-	* @access	public
-	*/
-	function sql_query($query = '', $cache_ttl = 0)
-	{
-		if ($query != '')
-		{
-			global $cache;
-
-			// EXPLAIN only in extra debug mode
-			if (defined('DEBUG'))
-			{
-				$this->sql_report('start', $query);
-			}
-
-			$this->query_result = ($cache && $cache_ttl) ? $cache->sql_load($query) : false;
-			$this->sql_add_num_queries($this->query_result);
-
-			if ($this->query_result === false)
-			{
-				if (($this->query_result = @sqlite_query($query, $this->db_connect_id)) === false)
-				{
-					$this->sql_error($query);
-				}
-
-				if (defined('DEBUG'))
-				{
-					$this->sql_report('stop', $query);
-				}
-
-				if ($cache && $cache_ttl)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-					$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
-				}
-				else if (strpos($query, 'SELECT') === 0 && $this->query_result)
-				{
-					$this->open_queries[(int) $this->query_result] = $this->query_result;
-				}
-			}
-			else if (defined('DEBUG'))
-			{
-				$this->sql_report('fromcache', $query);
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		return $this->query_result;
-	}
-
-	/**
-	* Build LIMIT query
-	*/
-	function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0)
-	{
-		$this->query_result = false;
-
-		// if $total is set to 0 we do not want to limit the number of rows
-		if ($total == 0)
-		{
-			$total = -1;
-		}
-
-		$query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total);
-
-		return $this->sql_query($query, $cache_ttl);
-	}
-
-	/**
-	* Return number of affected rows
-	*/
-	function sql_affectedrows()
-	{
-		return ($this->db_connect_id) ? @sqlite_changes($this->db_connect_id) : false;
-	}
-
-	/**
-	* Fetch current row
-	*/
-	function sql_fetchrow($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_fetchrow($query_id);
-		}
-
-		return ($query_id !== false) ? @sqlite_fetch_array($query_id, SQLITE_ASSOC) : false;
-	}
-
-	/**
-	* Seek to given row number
-	* rownum is zero-based
-	*/
-	function sql_rowseek($rownum, &$query_id)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_rowseek($rownum, $query_id);
-		}
-
-		return ($query_id !== false) ? @sqlite_seek($query_id, $rownum) : false;
-	}
-
-	/**
-	* Get last inserted id after insert statement
-	*/
-	function sql_nextid()
-	{
-		return ($this->db_connect_id) ? @sqlite_last_insert_rowid($this->db_connect_id) : false;
-	}
-
-	/**
-	* Free sql result
-	*/
-	function sql_freeresult($query_id = false)
-	{
-		global $cache;
-
-		if ($query_id === false)
-		{
-			$query_id = $this->query_result;
-		}
-
-		if ($cache && $cache->sql_exists($query_id))
-		{
-			return $cache->sql_freeresult($query_id);
-		}
-
-		return true;
-	}
-
-	/**
-	* Escape string used in sql query
-	*/
-	function sql_escape($msg)
-	{
-		return @sqlite_escape_string($msg);
-	}
-
-	/**
-	* Correctly adjust LIKE expression for special characters
-	* For SQLite an underscore is a not-known character... this may change with SQLite3
-	*/
-	function sql_like_expression($expression)
-	{
-		// Unlike LIKE, GLOB is case sensitive (unfortunatly). SQLite users need to live with it!
-		// We only catch * and ? here, not the character map possible on file globbing.
-		$expression = str_replace(array(chr(0) . '_', chr(0) . '%'), array(chr(0) . '?', chr(0) . '*'), $expression);
-
-		$expression = str_replace(array('?', '*'), array("\?", "\*"), $expression);
-		$expression = str_replace(array(chr(0) . "\?", chr(0) . "\*"), array('?', '*'), $expression);
-
-		return 'GLOB \'' . $this->sql_escape($expression) . '\'';
-	}
-
-	/**
-	* return sql error array
-	* @access private
-	*/
-	function _sql_error()
-	{
-		if (function_exists('sqlite_error_string'))
-		{
-			$error = array(
-				'message'	=> @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
-				'code'		=> @sqlite_last_error($this->db_connect_id),
-			);
-		}
-		else
-		{
-			$error = array(
-				'message'	=> $this->connect_error,
-				'code'		=> '',
-			);
-		}
-
-		return $error;
-	}
-
-	/**
-	* Build db-specific query data
-	* @access private
-	*/
-	function _sql_custom_build($stage, $data)
-	{
-		return $data;
-	}
-
-	/**
-	* Close sql connection
-	* @access private
-	*/
-	function _sql_close()
-	{
-		return @sqlite_close($this->db_connect_id);
-	}
-
-	/**
-	* Build db-specific report
-	* @access private
-	*/
-	function _sql_report($mode, $query = '')
-	{
-		switch ($mode)
-		{
-			case 'start':
-			break;
-
-			case 'fromcache':
-				$endtime = explode(' ', microtime());
-				$endtime = $endtime[0] + $endtime[1];
-
-				$result = @sqlite_query($query, $this->db_connect_id);
-				while ($void = @sqlite_fetch_array($result, SQLITE_ASSOC))
-				{
-					// Take the time spent on parsing rows into account
-				}
-
-				$splittime = explode(' ', microtime());
-				$splittime = $splittime[0] + $splittime[1];
-
-				$this->sql_report('record_fromcache', $query, $endtime, $splittime);
-
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_1.php b/phpBB/includes/db/migration/data/30x/3_0_1.php
deleted file mode 100644
index c996a0138a..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_1_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10.php b/phpBB/includes/db/migration/data/30x/3_0_10.php
deleted file mode 100644
index 122f93d6b4..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_10.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_10 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.10', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_10_rc3');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.10')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php
deleted file mode 100644
index 0ed05812dc..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_10_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.10-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_9');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('email_max_chunk_size', 50)),
-
-			array('config.update', array('version', '3.0.10-rc1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php
deleted file mode 100644
index b14b3b00aa..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_10_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.10-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_10_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.10-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php b/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php
deleted file mode 100644
index 473057d65d..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_10_rc3 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.10-rc3', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_10_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.10-rc3')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11.php b/phpBB/includes/db/migration/data/30x/3_0_11.php
deleted file mode 100644
index e063c699cc..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_11.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_11 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.11', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_11_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.11')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php
deleted file mode 100644
index dddfc0e0e7..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_11_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.11-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_10');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
-			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
-
-			array('config.update', array('version', '3.0.11-rc1')),
-		);
-	}
-
-	public function cleanup_deactivated_styles()
-	{
-		// Updates users having current style a deactivated one
-		$sql = 'SELECT style_id
-			FROM ' . STYLES_TABLE . '
-			WHERE style_active = 0';
-		$result = $this->sql_query($sql);
-
-		$deactivated_style_ids = array();
-		while ($style_id = $this->db->sql_fetchfield('style_id', false, $result))
-		{
-			$deactivated_style_ids[] = (int) $style_id;
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($deactivated_style_ids))
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_style = ' . (int) $this->config['default_style'] .'
-				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
-			$this->sql_query($sql);
-		}
-	}
-
-	public function delete_orphan_private_messages()
-	{
-		// Delete orphan private messages
-		$batch_size = 500;
-
-		$sql_array = array(
-			'SELECT'	=> 'p.msg_id',
-			'FROM'		=> array(
-				PRIVMSGS_TABLE	=> 'p',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
-					'ON'	=> 'p.msg_id = t.msg_id',
-				),
-			),
-			'WHERE'		=> 't.user_id IS NULL',
-		);
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-
-		$result = $this->db->sql_query_limit($sql, $batch_size);
-
-		$delete_pms = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$delete_pms[] = (int) $row['msg_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($delete_pms))
-		{
-			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
-			$this->sql_query($sql);
-
-			// Return false to have the Migrator call this function again
-			return false;
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php
deleted file mode 100644
index fac8523e8c..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_11_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.11-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_11_rc1');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_novalue' => array('BOOL', 0),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_novalue',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.11-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php
deleted file mode 100644
index 6a31a51201..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 **/
-
-class phpbb_db_migration_data_30x_3_0_12_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.12-rc1', '>=');
-	}
-
- 	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_module_auth'))),
-			array('custom', array(array(&$this, 'update_bots'))),
-			array('custom', array(array(&$this, 'disable_bots_from_receiving_pms'))),
-
-			array('config.update', array('version', '3.0.12-rc1')),
-		);
-	}
-
-	public function disable_bots_from_receiving_pms()
-	{
-		// Disable receiving pms for bots
-		$sql = 'SELECT user_id
-			FROM ' . BOTS_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		$bot_user_ids = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$bot_user_ids[] = (int) $row['user_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($bot_user_ids))
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_allow_pm = 0
-				WHERE ' . $this->db->sql_in_set('user_id', $bot_user_ids);
-			$this->sql_query($sql);
-		}
-	}
-
-	public function update_module_auth()
-	{
-		$sql = 'UPDATE ' . MODULES_TABLE . '
-			SET module_auth = \'acl_u_sig\'
-			WHERE module_class = \'ucp\'
-				AND module_basename = \'profile\'
-				AND module_mode = \'signature\'';
-		$this->sql_query($sql);
-	}
-
-	public function update_bots()
-	{
-		// Update bots
-		if (!function_exists('user_delete'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-		}
-
-		$bots_updates = array(
-			// Bot Deletions
-			'NG-Search [Bot]'		=> false,
-			'Nutch/CVS [Bot]'		=> false,
-			'OmniExplorer [Bot]'	=> false,
-			'Seekport [Bot]'		=> false,
-			'Synoo [Bot]'			=> false,
-			'WiseNut [Bot]'			=> false,
-
-			// Bot Updates
-			// Bot name to bot user agent map
-			'Baidu [Spider]'	=> 'Baiduspider',
-			'Exabot [Bot]'		=> 'Exabot',
-			'Voyager [Bot]'		=> 'voyager/',
-			'W3C [Validator]'	=> 'W3C_Validator',
-		);
-
-		foreach ($bots_updates as $bot_name => $bot_agent)
-		{
-			$sql = 'SELECT user_id
-				FROM ' . USERS_TABLE . '
-				WHERE user_type = ' . USER_IGNORE . "
-					AND username_clean = '" . $this->db->sql_escape(utf8_clean_string($bot_name)) . "'";
-			$result = $this->db->sql_query($sql);
-			$bot_user_id = (int) $this->db->sql_fetchfield('user_id');
-			$this->db->sql_freeresult($result);
-
-			if ($bot_user_id)
-			{
-				if ($bot_agent === false)
-				{
-					$sql = 'DELETE FROM ' . BOTS_TABLE . "
-						WHERE user_id = $bot_user_id";
-					$this->sql_query($sql);
-
-					user_delete('remove', $bot_user_id);
-				}
-				else
-				{
-					$sql = 'UPDATE ' . BOTS_TABLE . "
-						SET bot_agent = '" .  $this->db->sql_escape($bot_agent) . "'
-						WHERE user_id = $bot_user_id";
-					$this->sql_query($sql);
-				}
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php
deleted file mode 100644
index 562ccf077c..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_1_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.1-rc1', '>=');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'display_subforum_list' => array('BOOL', 1),
-				),
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array('UINT', 0),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'groups' => array(
-					'group_legend',
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array('session_forum_id'),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_legend_name' => array('group_legend', 'group_name'),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'display_subforum_list',
-				),
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id',
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'groups' => array(
-					'group_legend' => array('group_legend'),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id',
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_legend_name',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
-			array('custom', array(array(&$this, 'reset_smiley_size'))),
-
-			array('config.update', array('version', '3.0.1-rc1')),
-		);
-	}
-
-	public function fix_unset_last_view_time()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . "topics
-			SET topic_last_view_time = topic_last_post_time
-			WHERE topic_last_view_time = 0";
-		$this->sql_query($sql);
-	}
-
-	public function reset_smiley_size()
-	{
-		// Update smiley sizes
-		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
-
-		foreach ($smileys as $smiley)
-		{
-			if (file_exists($this->phpbb_root_path . 'images/smilies/' . $smiley))
-			{
-				list($width, $height) = getimagesize($this->phpbb_root_path . 'images/smilies/' . $smiley);
-
-				$sql = 'UPDATE ' . SMILIES_TABLE . '
-					SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
-					WHERE smiley_url = '" . $this->db->sql_escape($smiley) . "'";
-
-				$this->sql_query($sql);
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2.php b/phpBB/includes/db/migration/data/30x/3_0_2.php
deleted file mode 100644
index eed5acef82..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_2_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php
deleted file mode 100644
index a960e90765..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_2_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.2-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('referer_validation', '1')),
-			array('config.add', array('check_attachment_content', '1')),
-			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
-
-			array('config.update', array('version', '3.0.2-rc1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php
deleted file mode 100644
index 8917dfea77..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_2_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.2-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_2_rc1');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'change_columns' => array(
-				$this->table_prefix . 'drafts' => array(
-					'draft_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_last_post_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_subject' => array('STEXT_UNI', '', 'true_sort'),
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_subject' => array('STEXT_UNI', ''),
-				),
-				$this->table_prefix . 'topics' => array(
-					'topic_title' => array('STEXT_UNI', '', 'true_sort'),
-					'topic_last_post_subject' => array('STEXT_UNI', ''),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id',
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_fid' => array('session_forum_id'),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'add_index' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_forum_id' => array(
-						'session_forum_id',
-					),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'sessions' => array(
-					'session_fid',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.2-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_3.php b/phpBB/includes/db/migration/data/30x/3_0_3.php
deleted file mode 100644
index 8984cf7b76..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_3.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_3 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.3', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_3_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.3')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php
deleted file mode 100644
index 4b102e1a2e..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_3_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.3-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_2');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'styles_template' => array(
-					'template_inherits_id' => array('UINT:4', 0),
-					'template_inherit_path' => array('VCHAR', ''),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_max_recipients' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns' => array(
-				$this->table_prefix . 'styles_template' => array(
-					'template_inherits_id',
-					'template_inherit_path',
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_max_recipients',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('enable_queue_trigger', '0')),
-			array('config.add', array('queue_trigger_posts', '3')),
-			array('config.add', array('pm_max_recipients', '0')),
-			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
-			array('config.add', array('dbms_version', $this->db->sql_server_info(true))),
-			array('permission.add', array('u_masspm_group', true, 'u_masspm')),
-			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
-
-			array('config.update', array('version', '3.0.3-rc1')),
-		);
-	}
-
-	public function correct_acp_email_permissions()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . 'modules
-			SET module_auth = \'acl_a_email && cfg_email_enable\'
-			WHERE module_class = \'acp\'
-				AND module_basename = \'email\'';
-		$this->sql_query($sql);
-	}
-
-	public function set_group_default_max_recipients()
-	{
-		// Set maximum number of recipients for the registered users, bots, guests group
-		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
-			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_4.php b/phpBB/includes/db/migration/data/30x/3_0_4.php
deleted file mode 100644
index 9a0c132e78..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_4.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_4 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.4', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_4_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
-
-			array('config.update', array('version', '3.0.4')),
-		);
-	}
-
-	public function rename_log_delete_topic()
-	{
-		if ($this->db->sql_layer == 'oracle')
-		{
-			// log_operation is CLOB - but we can change this later
-			$sql = 'UPDATE ' . $this->table_prefix . "log
-				SET log_operation = 'LOG_DELETE_TOPIC'
-				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
-			$this->sql_query($sql);
-		}
-		else
-		{
-			$sql = 'UPDATE ' . $this->table_prefix . "log
-				SET log_operation = 'LOG_DELETE_TOPIC'
-				WHERE log_operation = 'LOG_TOPIC_DELETED'";
-			$this->sql_query($sql);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php
deleted file mode 100644
index 8ad75a557b..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_4_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.4-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_3');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_profile' => array('BOOL', 0),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'styles' => array(
-					'style_id' => array('UINT', NULL, 'auto_increment'),
-					'template_id' => array('UINT', 0),
-					'theme_id' => array('UINT', 0),
-					'imageset_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'styles_imageset' => array(
-					'imageset_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_imageset_data' => array(
-					'image_id' => array('UINT', NULL, 'auto_increment'),
-					'imageset_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'styles_theme' => array(
-					'theme_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_template' => array(
-					'template_id' => array('UINT', NULL, 'auto_increment'),
-				),
-				$this->table_prefix . 'styles_template_data' => array(
-					'template_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_style' => array('UINT', 0),
-				),
-				$this->table_prefix . 'users' => array(
-					'user_style' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns' => array(
-				$this->table_prefix . 'profile_fields' => array(
-					'field_show_profile',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
-
-			array('config.update', array('version', '3.0.4-rc1')),
-		);
-	}
-
-	public function update_custom_profile_fields()
-	{
-		// Update the Custom Profile Fields based on previous settings to the new format
-		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
-				FROM ' . PROFILE_FIELDS_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql_ary = array(
-				'field_required'	=> 0,
-				'field_show_on_reg'	=> 0,
-				'field_hide'		=> 0,
-				'field_show_profile'=> 0,
-			);
-
-			if ($row['field_required'])
-			{
-				$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
-			}
-			else if ($row['field_show_on_reg'])
-			{
-				$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
-			}
-			else if ($row['field_hide'])
-			{
-				// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
-				$sql_ary['field_hide'] = 1;
-			}
-			else
-			{
-				// equivelant to "none", which is the "Display in user control panel" option
-				$sql_ary['field_show_profile'] = 1;
-			}
-
-			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
-		}
-
-		$this->db->sql_freeresult($result);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5.php b/phpBB/includes/db/migration/data/30x/3_0_5.php
deleted file mode 100644
index 16d2dee457..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_5.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_5 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.5', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_5_rc1part2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.5')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php
deleted file mode 100644
index ea17cc1e31..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_5_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_4');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'change_columns' => array(
-				$this->table_prefix . 'forums' => array(
-					'forum_style' => array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		$search_indexing_state = $this->config['search_indexing_state'];
-
-		return array(
-			array('config.add', array('captcha_gd_wave', 0)),
-			array('config.add', array('captcha_gd_3d_noise', 1)),
-			array('config.add', array('captcha_gd_fonts', 1)),
-			array('config.add', array('confirm_refresh', 1)),
-			array('config.add', array('max_num_search_keywords', 10)),
-			array('config.remove', array('search_indexing_state')),
-			array('config.add', array('search_indexing_state', $search_indexing_state, true)),
-			array('custom', array(array(&$this, 'hash_old_passwords'))),
-			array('custom', array(array(&$this, 'update_ichiro_bot'))),
-		);
-	}
-
-	public function hash_old_passwords()
-	{
-		$sql = 'SELECT user_id, user_password
-				FROM ' . $this->table_prefix . 'users
-				WHERE user_pass_convert = 1';
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (strlen($row['user_password']) == 32)
-			{
-				$sql_ary = array(
-					'user_password'	=> phpbb_hash($row['user_password']),
-				);
-
-				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
-			}
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function update_ichiro_bot()
-	{
-		// Adjust bot entry
-		$sql = 'UPDATE ' . $this->table_prefix . "bots
-			SET bot_agent = 'ichiro/'
-			WHERE bot_agent = 'ichiro/2'";
-		$this->sql_query($sql);
-	}
-
-	public function remove_duplicate_auth_options()
-	{
-		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
-		$sql = 'SELECT auth_option
-			FROM ' . $this->table_prefix . 'acl_options
-			GROUP BY auth_option
-			HAVING COUNT(*) >= 2';
-		$result = $this->db->sql_query($sql);
-
-		$auth_options = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$auth_options[] = $row['auth_option'];
-		}
-		$this->db->sql_freeresult($result);
-
-		// Remove specific auth options
-		if (!empty($auth_options))
-		{
-			foreach ($auth_options as $option)
-			{
-				// Select auth_option_ids... the largest id will be preserved
-				$sql = 'SELECT auth_option_id
-					FROM ' . ACL_OPTIONS_TABLE . "
-					WHERE auth_option = '" . $db->sql_escape($option) . "'
-					ORDER BY auth_option_id DESC";
-				// sql_query_limit not possible here, due to bug in postgresql layer
-				$result = $this->db->sql_query($sql);
-
-				// Skip first row, this is our original auth option we want to preserve
-				$row = $this->db->sql_fetchrow($result);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					// Ok, remove this auth option...
-					$this->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-					$this->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
-				}
-				$this->db->sql_freeresult($result);
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php b/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php
deleted file mode 100644
index 8538347b1a..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_5_rc1part2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_5_rc1');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_keys'			=> array(
-				$this->table_prefix . 'acl_options'		=> array('auth_option'),
-			),
-			'add_unique_index'	=> array(
-				$this->table_prefix . 'acl_options'		=> array(
-					'auth_option'		=> array('auth_option'),
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.5-rc1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6.php b/phpBB/includes/db/migration/data/30x/3_0_6.php
deleted file mode 100644
index bb651dc7cd..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_6.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_6 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.6', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_6_rc4');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.6')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php
deleted file mode 100644
index 38c282ebf0..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.6-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_5');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns' => array(
-				$this->table_prefix . 'confirm' => array(
-					'attempts' => array('UINT', 0),
-				),
-				$this->table_prefix . 'users' => array(
-					'user_new' => array('BOOL', 1),
-					'user_reminded' => array('TINT:4', 0),
-					'user_reminded_time' => array('TIMESTAMP', 0),
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_reported' => array('BOOL', 0),
-				),
-				$this->table_prefix . 'reports' => array(
-					'pm_id' => array('UINT', 0),
-				),
-				$this->table_prefix . 'profile_fields'	=> array(
-					'field_show_on_vt' => array('BOOL', 0),
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_options' => array('UINT:20', 0),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'users' => array(
-					'user_options' => array('UINT:11', 230271),
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'reports' => array(
-					'post_id' => array('post_id'),
-					'pm_id' => array('pm_id'),
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_username' => array('post_username:255'),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns' => array(
-				$this->table_prefix . 'confirm' => array(
-					'attempts',
-				),
-				$this->table_prefix . 'users' => array(
-					'user_new',
-					'user_reminded',
-					'user_reminded_time',
-				),
-				$this->table_prefix . 'groups' => array(
-					'group_skip_auth',
-				),
-				$this->table_prefix . 'privmsgs' => array(
-					'message_reported',
-				),
-				$this->table_prefix . 'reports' => array(
-					'pm_id',
-				),
-				$this->table_prefix . 'profile_fields'	=> array(
-					'field_show_on_vt',
-				),
-				$this->table_prefix . 'forums' => array(
-					'forum_options',
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'reports' => array(
-					'post_id',
-					'pm_id',
-				),
-				$this->table_prefix . 'posts' => array(
-					'post_username',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
-			array('if', array(
-				($this->config['captcha_gd']),
-				array('config.update', array('captcha_plugin', 'phpbb_captcha_gd')),
-			)),
-
-			array('config.add', array('feed_enable', 0)),
-			array('config.add', array('feed_limit', 10)),
-			array('config.add', array('feed_overall_forums', 1)),
-			array('config.add', array('feed_overall_forums_limit', 15)),
-			array('config.add', array('feed_overall_topics', 0)),
-			array('config.add', array('feed_overall_topics_limit', 15)),
-			array('config.add', array('feed_forum', 1)),
-			array('config.add', array('feed_topic', 1)),
-			array('config.add', array('feed_item_statistics', 1)),
-
-			array('config.add', array('smilies_per_page', 50)),
-			array('config.add', array('allow_pm_report', 1)),
-			array('config.add', array('min_post_chars', 1)),
-			array('config.add', array('allow_quick_reply', 1)),
-			array('config.add', array('new_member_post_limit', 0)),
-			array('config.add', array('new_member_group_default', 0)),
-			array('config.add', array('delete_time', $this->config['edit_time'])),
-
-			array('config.add', array('allow_avatar', 0)),
-			array('if', array(
-				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
-				array('config.update', array('allow_avatar', 1)),
-			)),
-			array('config.add', array('allow_avatar_remote_upload', 0)),
-			array('if', array(
-				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
-				array('config.update', array('allow_avatar_remote_upload', 1)),
-			)),
-
-			array('module.add', array(
-				'acp',
-				'ACP_BOARD_CONFIGURATION',
-				array(
-					'module_basename'	=> 'acp_board',
-					'modes'				=> array('feed'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_CAT_USERS',
-				array(
-					'module_basename'	=> 'acp_users',
-					'modes'				=> array('warnings'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_SERVER_CONFIGURATION',
-				array(
-					'module_basename'	=> 'acp_send_statistics',
-					'modes'				=> array('send_statistics'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_FORUM_BASED_PERMISSIONS',
-				array(
-					'module_basename'	=> 'acp_permissions',
-					'modes'				=> array('setting_forum_copy'),
-				),
-			)),
-			array('module.add', array(
-				'mcp',
-				'MCP_REPORTS',
-				array(
-					'module_basename'	=> 'mcp_pm_reports',
-					'modes'				=> array('pm_reports','pm_reports_closed','pm_report_details'),
-				),
-			)),
-			array('custom', array(array(&$this, 'add_newly_registered_group'))),
-			array('custom', array(array(&$this, 'set_user_options_default'))),
-
-			array('config.update', array('version', '3.0.6-rc1')),
-		);
-	}
-
-	public function set_user_options_default()
-	{
-		// 229376 is the added value to enable all three signature options
-		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
-		$this->sql_query($sql);
-	}
-
-	public function add_newly_registered_group()
-	{
-		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . "
-			WHERE group_name = 'NEWLY_REGISTERED'";
-		$result = $this->db->sql_query($sql);
-		$group_id = (int) $this->db->sql_fetchfield('group_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$group_id)
-		{
-			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
-			$this->sql_query($sql);
-
-			$group_id = $this->db->sql_nextid();
-		}
-
-		// Insert new user role... at the end of the chain
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
-				AND role_type = 'u_'";
-		$result = $this->db->sql_query($sql);
-		$u_role = (int) $this->db->sql_fetchfield('role_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$u_role)
-		{
-			$sql = 'SELECT MAX(role_order) as max_order_id
-				FROM ' . ACL_ROLES_TABLE . "
-				WHERE role_type = 'u_'";
-			$result = $this->db->sql_query($sql);
-			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
-			$this->db->sql_freeresult($result);
-
-			$next_order_id++;
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
-			$this->sql_query($sql);
-			$u_role = $this->db->sql_nextid();
-
-			// Now add the correct data to the roles...
-			// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
-			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
-			$this->sql_query($sql);
-
-			// Add user role to group
-			$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
-			$this->sql_query($sql);
-		}
-
-		// Insert new forum role
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
-				AND role_type = 'f_'";
-		$result = $this->db->sql_query($sql);
-		$f_role = (int) $this->db->sql_fetchfield('role_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$f_role)
-		{
-			$sql = 'SELECT MAX(role_order) as max_order_id
-				FROM ' . ACL_ROLES_TABLE . "
-				WHERE role_type = 'f_'";
-			$result = $this->db->sql_query($sql);
-			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
-			$this->db->sql_freeresult($result);
-
-			$next_order_id++;
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
-			$this->sql_query($sql);
-			$f_role = $this->db->sql_nextid();
-
-			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
-			$this->sql_query($sql);
-		}
-
-		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
-		$sql = 'SELECT 1
-			FROM ' . USERS_TABLE . '
-			WHERE user_new = 0';
-		$result = $this->db->sql_query_limit($sql, 1);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (!$row)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
-			$this->sql_query($sql);
-		}
-
-		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
-		// Check if the role is already assigned...
-		$sql = 'SELECT forum_id
-			FROM ' . ACL_GROUPS_TABLE . '
-			WHERE group_id = ' . $group_id . '
-				AND auth_role_id = ' . $f_role;
-		$result = $this->db->sql_query($sql);
-		$is_options = (int) $this->db->sql_fetchfield('forum_id');
-		$this->db->sql_freeresult($result);
-
-		// Not assigned at all... :/
-		if (!$is_options)
-		{
-			// Get postable forums
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_type != ' . FORUM_LINK;
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$this->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)');
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		// Clear permissions...
-		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
-		$auth_admin = new auth_admin();
-		$auth_admin->acl_clear_prefetch();
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php
deleted file mode 100644
index a939dbd489..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_6_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.6-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_6_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.6-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php
deleted file mode 100644
index b3f09d8ab8..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_6_rc3 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.6-rc3', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_6_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_cp_fields'))),
-
-			array('config.update', array('version', '3.0.6-rc3')),
-		);
-	}
-
-	public function update_cp_fields()
-	{
-		// Update the Custom Profile Fields based on previous settings to the new format
-		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
-			SET field_show_on_vt = 1
-			WHERE field_hide = 0
-				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php
deleted file mode 100644
index fc2923f99b..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_6_rc4 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.6-rc4', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_6_rc3');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.6-rc4')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7.php b/phpBB/includes/db/migration/data/30x/3_0_7.php
deleted file mode 100644
index 9ff2e9e4ab..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_7.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_7 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.7', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_7_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.7')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php b/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php
deleted file mode 100644
index c9cc9d19ac..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_7_pl1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.7-pl1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_7');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.7-pl1')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php
deleted file mode 100644
index ffebf66f2d..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_7_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.7-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_6');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_keys' => array(
-				$this->table_prefix . 'log' => array(
-					'log_time',
-				),
-			),
-			'add_index' => array(
-				$this->table_prefix . 'topics_track' => array(
-					'topic_id' => array('topic_id'),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'add_index' => array(
-				$this->table_prefix . 'log' => array(
-					'log_time'	=> array('log_time'),
-				),
-			),
-			'drop_keys' => array(
-				$this->table_prefix . 'topics_track' => array(
-					'topic_id',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('feed_overall', 1)),
-			array('config.add', array('feed_http_auth', 0)),
-			array('config.add', array('feed_limit_post', $this->config['feed_limit'])),
-			array('config.add', array('feed_limit_topic', $this->config['feed_overall_topics_limit'])),
-			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
-			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
-			array('custom', array(array(&$this, 'delete_text_templates'))),
-
-			array('config.update', array('version', '3.0.7-rc1')),
-		);
-	}
-
-	public function delete_text_templates()
-	{
-		// Delete all text-templates from the template_data
-		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
-			WHERE template_filename ' . $this->db->sql_like_expression($this->db->any_char . '.txt');
-		$this->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php
deleted file mode 100644
index 55bc2bc679..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_7_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.7-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_7_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_email_hash'))),
-
-			array('config.update', array('version', '3.0.7-rc2')),
-		);
-	}
-
-	public function update_email_hash($start = 0)
-	{
-		$limit = 1000;
-
-		$sql = 'SELECT user_id, user_email, user_email_hash
-			FROM ' . USERS_TABLE . '
-			WHERE user_type <> ' . USER_IGNORE . "
-				AND user_email <> ''";
-		$result = $this->db->sql_query_limit($sql, $limit, $start);
-
-		$i = 0;
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$i++;
-
-			// Snapshot of the phpbb_email_hash() function
-			// We cannot call it directly because the auto updater updates the DB first. :/
-			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
-
-			if ($user_email_hash != $row['user_email_hash'])
-			{
-				$sql_ary = array(
-					'user_email_hash'	=> $user_email_hash,
-				);
-
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE user_id = ' . (int) $row['user_id'];
-				$this->sql_query($sql);
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		if ($i < $limit)
-		{
-			// Completed
-			return;
-		}
-
-		// Return the next start, will be sent to $start when this function is called again
-		return $start + $limit;
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_8.php b/phpBB/includes/db/migration/data/30x/3_0_8.php
deleted file mode 100644
index 8998ef9627..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_8.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_8 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.8', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_8_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.8')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php
deleted file mode 100644
index aeff35333e..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_8_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.8-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_7_pl1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
-			array('custom', array(array(&$this, 'update_module_auth'))),
-			array('custom', array(array(&$this, 'update_bots'))),
-			array('custom', array(array(&$this, 'delete_orphan_shadow_topics'))),
-			array('module.add', array(
-				'acp',
-				'ACP_MESSAGES',
-				array(
-					'module_basename'	=> 'acp_board',
-					'modes'				=> array('post'),
-				),
-			)),
-			array('config.add', array('load_unreads_search', 1)),
-			array('config.update_if_equals', array(600, 'queue_interval', 60)),
-			array('config.update_if_equals', array(50, 'email_package_size', 20)),
-
-			array('config.update', array('version', '3.0.8-rc1')),
-		);
-	}
-
-	public function update_file_extension_group_names()
-	{
-		// Update file extension group names to use language strings.
-		$sql = 'SELECT lang_dir
-			FROM ' . LANG_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		$extension_groups_updated = array();
-		while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
-		{
-			$lang_dir = basename($lang_dir);
-
-			// The language strings we need are either in language/.../acp/attachments.php
-			// in the update package if we're updating to 3.0.8-RC1 or later,
-			// or they are in language/.../install.php when we're updating from 3.0.7-PL1 or earlier.
-			// On an already updated board, they can also already be in language/.../acp/attachments.php
-			// in the board root.
-			$lang_files = array(
-				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.{$this->php_ext}",
-				"{$this->phpbb_root_path}language/$lang_dir/install.{$this->php_ext}",
-				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.{$this->php_ext}",
-			);
-
-			foreach ($lang_files as $lang_file)
-			{
-				if (!file_exists($lang_file))
-				{
-					continue;
-				}
-
-				$lang = array();
-				include($lang_file);
-
-				foreach($lang as $lang_key => $lang_val)
-				{
-					if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
-					{
-						continue;
-					}
-
-					$sql_ary = array(
-						'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
-					);
-
-					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-						SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
-						WHERE group_name = '" . $this->db->sql_escape($lang_val) . "'";
-					$this->sql_query($sql);
-
-					$extension_groups_updated[$lang_key] = true;
-				}
-			}
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function update_module_auth()
-	{
-		$sql = 'UPDATE ' . MODULES_TABLE . '
-			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
-			WHERE module_class = \'ucp\'
-				AND module_basename = \'profile\'
-				AND module_mode = \'avatar\'';
-		$this->sql_query($sql);
-	}
-
-	public function update_bots()
-	{
-		$bot_name = 'Bing [Bot]';
-		$bot_name_clean = utf8_clean_string($bot_name);
-
-		$sql = 'SELECT user_id
-			FROM ' . USERS_TABLE . "
-			WHERE username_clean = '" . $this->db->sql_escape($bot_name_clean) . "'";
-		$result = $this->db->sql_query($sql);
-		$bing_already_added = (bool) $this->db->sql_fetchfield('user_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$bing_already_added)
-		{
-			$bot_agent = 'bingbot/';
-			$bot_ip = '';
-			$sql = 'SELECT group_id, group_colour
-				FROM ' . GROUPS_TABLE . "
-				WHERE group_name = 'BOTS'";
-			$result = $this->db->sql_query($sql);
-			$group_row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$group_row)
-			{
-				// default fallback, should never get here
-				$group_row['group_id'] = 6;
-				$group_row['group_colour'] = '9E8DA7';
-			}
-
-			if (!function_exists('user_add'))
-			{
-				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-			}
-
-			$user_row = array(
-				'user_type'				=> USER_IGNORE,
-				'group_id'				=> $group_row['group_id'],
-				'username'				=> $bot_name,
-				'user_regdate'			=> time(),
-				'user_password'			=> '',
-				'user_colour'			=> $group_row['group_colour'],
-				'user_email'			=> '',
-				'user_lang'				=> $this->config['default_lang'],
-				'user_style'			=> $this->config['default_style'],
-				'user_timezone'			=> 0,
-				'user_dateformat'		=> $this->config['default_dateformat'],
-				'user_allow_massemail'	=> 0,
-			);
-
-			$user_id = user_add($user_row);
-
-			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
-				'bot_active'	=> 1,
-				'bot_name'		=> (string) $bot_name,
-				'user_id'		=> (int) $user_id,
-				'bot_agent'		=> (string) $bot_agent,
-				'bot_ip'		=> (string) $bot_ip,
-			));
-
-			$this->sql_query($sql);
-		}
-	}
-
-	public function delete_orphan_shadow_topics()
-	{
-		// Delete shadow topics pointing to not existing topics
-		$batch_size = 500;
-
-		// Set of affected forums we have to resync
-		$sync_forum_ids = array();
-
-		$sql_array = array(
-			'SELECT'	=> 't1.topic_id, t1.forum_id',
-			'FROM'		=> array(
-				TOPICS_TABLE	=> 't1',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(TOPICS_TABLE	=> 't2'),
-					'ON'	=> 't1.topic_moved_id = t2.topic_id',
-				),
-			),
-			'WHERE'		=> 't1.topic_moved_id <> 0
-						AND t2.topic_id IS NULL',
-		);
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-		$result = $this->db->sql_query_limit($sql, $batch_size);
-
-		$topic_ids = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$topic_ids[] = (int) $row['topic_id'];
-
-			$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($topic_ids))
-		{
-			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
-				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
-			$this->db->sql_query($sql);
-
-			// Sync the forums we have deleted shadow topics from.
-			sync('forum', 'forum_id', $sync_forum_ids, true, true);
-
-			return false;
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9.php b/phpBB/includes/db/migration/data/30x/3_0_9.php
deleted file mode 100644
index d5269ea6f0..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_9.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_9 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.9', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_9_rc4');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php
deleted file mode 100644
index 4c345b429b..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_9_rc1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.9-rc1', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_8');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_tables' => array(
-				$this->table_prefix . 'login_attempts' => array(
-					'COLUMNS' => array(
-						// this column was removed from the database updater
-						// after 3.0.9-RC3 was released. It might still exist
-						// in 3.0.9-RCX installations and has to be dropped as
-						// soon as the db_tools class is capable of properly
-						// removing a primary key.
-						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
-						'attempt_ip'			=> array('VCHAR:40', ''),
-						'attempt_browser'		=> array('VCHAR:150', ''),
-						'attempt_forwarded_for'	=> array('VCHAR:255', ''),
-						'attempt_time'			=> array('TIMESTAMP', 0),
-						'user_id'				=> array('UINT', 0),
-						'username'				=> array('VCHAR_UNI:255', 0),
-						'username_clean'		=> array('VCHAR_CI', 0),
-					),
-					//'PRIMARY_KEY' => 'attempt_id',
-					'KEYS' => array(
-						'att_ip' => array('INDEX', array('attempt_ip', 'attempt_time')),
-						'att_for' => array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
-						'att_time' => array('INDEX', array('attempt_time')),
-						'user_id' => array('INDEX', 'user_id'),
-					),
-				),
-			),
-			'change_columns' => array(
-				$this->table_prefix . 'bbcodes' => array(
-					'bbcode_id' => array('USINT', 0),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_tables' => array(
-				$this->table_prefix . 'login_attempts',
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('ip_login_limit_max', 50)),
-			array('config.add', array('ip_login_limit_time', 21600)),
-			array('config.add', array('ip_login_limit_use_forwarded', 0)),
-			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
-			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
-
-			array('config.update', array('version', '3.0.9-rc1')),
-		);
-	}
-
-	public function update_file_extension_group_names()
-	{
-		// Update file extension group names to use language strings, again.
-		$sql = 'SELECT group_id, group_name
-			FROM ' . EXTENSION_GROUPS_TABLE . '
-			WHERE group_name ' . $this->db->sql_like_expression('EXT_GROUP_' . $this->db->any_char);
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql_ary = array(
-				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
-			);
-
-			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE group_id = ' . $row['group_id'];
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function fix_firebird_qa_captcha()
-	{
-		// Recover from potentially broken Q&A CAPTCHA table on firebird
-		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
-		// without data loss
-		if ($this->db_tools->sql_layer == 'firebird')
-		{
-			$tables = array(
-				$this->table_prefix . 'captcha_questions',
-				$this->table_prefix . 'captcha_answers',
-				$this->table_prefix . 'qa_confirm',
-			);
-			foreach ($tables as $table)
-			{
-				if ($this->db_tools->sql_table_exists($table))
-				{
-					$this->db_tools->sql_table_drop($table);
-				}
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php
deleted file mode 100644
index c0e662aa45..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_9_rc2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.9-rc2', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_9_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9-rc2')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php
deleted file mode 100644
index d6d1f14b2e..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_9_rc3 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.9-rc3', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_9_rc2');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9-rc3')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php
deleted file mode 100644
index e673249343..0000000000
--- a/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_3_0_9_rc4 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.0.9-rc4', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_9_rc3');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('version', '3.0.9-rc4')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/30x/local_url_bbcode.php b/phpBB/includes/db/migration/data/30x/local_url_bbcode.php
deleted file mode 100644
index f324b8880d..0000000000
--- a/phpBB/includes/db/migration/data/30x/local_url_bbcode.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-class phpbb_db_migration_data_30x_local_url_bbcode extends phpbb_db_migration
-{
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_12_rc1');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'update_local_url_bbcode'))),
-		);
-	}
-
-	/**
-	* Update BBCodes that currently use the LOCAL_URL tag
-	*
-	* To fix http://tracker.phpbb.com/browse/PHPBB3-8319 we changed
-	* the second_pass_replace value, so that needs updating for existing ones
-	*/
-	public function update_local_url_bbcode()
-	{
-		$sql = 'SELECT *
-			FROM ' . BBCODES_TABLE . '
-			WHERE bbcode_match ' . $this->db->sql_like_expression($this->db->any_char . 'LOCAL_URL' . $this->db->any_char);
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (!class_exists('acp_bbcodes'))
-			{
-				global $phpEx;
-				phpbb_require_updated('includes/acp/acp_bbcodes.' . $phpEx);
-			}
-			$bbcode_match = $row['bbcode_match'];
-			$bbcode_tpl = $row['bbcode_tpl'];
-
-			$acp_bbcodes = new acp_bbcodes();
-			$sql_ary = $acp_bbcodes->build_regexp($bbcode_match, $bbcode_tpl);
-
-			$sql = 'UPDATE ' . BBCODES_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE bbcode_id = ' . (int) $row['bbcode_id'];
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/avatars.php b/phpBB/includes/db/migration/data/310/avatars.php
deleted file mode 100644
index 79547337f7..0000000000
--- a/phpBB/includes/db/migration/data/310/avatars.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_avatars extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return isset($this->config['allow_avatar_gravatar']);
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'change_columns'	=> array(
-				$this->table_prefix . 'users'			=> array(
-					'user_avatar_type'		=> array('VCHAR:255', ''),
-				),
-				$this->table_prefix . 'groups'			=> array(
-					'group_avatar_type'		=> array('VCHAR:255', ''),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'change_columns'	=> array(
-				$this->table_prefix . 'users'			=> array(
-					'user_avatar_type'		=> array('TINT:2', ''),
-				),
-				$this->table_prefix . 'groups'			=> array(
-					'group_avatar_type'		=> array('TINT:2', ''),
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('allow_avatar_gravatar', 0)),
-			array('custom', array(array($this, 'update_module_auth'))),
-		);
-	}
-
-	public function update_module_auth()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . "modules
-			SET module_auth = 'cfg_allow_avatar'
-			WHERE module_class = 'ucp'
-				AND module_basename = 'ucp_profile'
-				AND module_mode = 'avatar'";
-		$this->db->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/boardindex.php b/phpBB/includes/db/migration/data/310/boardindex.php
deleted file mode 100644
index 965e32c15c..0000000000
--- a/phpBB/includes/db/migration/data/310/boardindex.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_boardindex extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return isset($this->config['board_index_text']);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('board_index_text', '')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/config_db_text.php b/phpBB/includes/db/migration/data/310/config_db_text.php
deleted file mode 100644
index 89f211adda..0000000000
--- a/phpBB/includes/db/migration/data/310/config_db_text.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_config_db_text extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return $this->db_tools->sql_table_exists($this->table_prefix . 'config_text');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_tables' => array(
-				$this->table_prefix . 'config_text' => array(
-					'COLUMNS' => array(
-						'config_name'	=> array('VCHAR', ''),
-						'config_value'	=> array('MTEXT', ''),
-					),
-					'PRIMARY_KEY' => 'config_name',
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_tables' => array(
-				$this->table_prefix . 'config_text',
-			),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
deleted file mode 100644
index 0fc2950987..0000000000
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ /dev/null
@@ -1,408 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_dev extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return version_compare($this->config['version'], '3.1.0-dev', '>=');
-	}
-
-	static public function depends_on()
-	{
-		return array(
-			'phpbb_db_migration_data_310_extensions',
-			'phpbb_db_migration_data_310_style_update_p2',
-			'phpbb_db_migration_data_310_timezone_p2',
-			'phpbb_db_migration_data_310_reported_posts_display',
-		);
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns'		=> array(
-				$this->table_prefix . 'groups'		=> array(
-					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
-				),
-				$this->table_prefix . 'profile_fields'	=> array(
-					'field_show_on_pm'		=> array('BOOL', 0),
-				),
-				$this->table_prefix . 'styles'		=> array(
-					'style_path'			=> array('VCHAR:100', ''),
-					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
-					'style_parent_id'		=> array('UINT:4', 0),
-					'style_parent_tree'		=> array('TEXT', ''),
-				),
-				$this->table_prefix . 'reports'		=> array(
-					'reported_post_text'		=> array('MTEXT_UNI', ''),
-					'reported_post_uid'			=> array('VCHAR:8', ''),
-					'reported_post_bitfield'	=> array('VCHAR:255', ''),
-				),
-			),
-			'change_columns'	=> array(
-				$this->table_prefix . 'groups'		=> array(
-					'group_legend'		=> array('UINT', 0),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns'		=> array(
-				$this->table_prefix . 'groups'		=> array(
-					'group_teampage',
-				),
-				$this->table_prefix . 'profile_fields'	=> array(
-					'field_show_on_pm',
-				),
-				$this->table_prefix . 'styles'		=> array(
-					'style_path',
-					'bbcode_bitfield',
-					'style_parent_id',
-					'style_parent_tree',
-				),
-				$this->table_prefix . 'reports'		=> array(
-					'reported_post_text',
-					'reported_post_uid',
-					'reported_post_bitfield',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('if', array(
-				(strpos('phpbb_search_', $this->config['search_type']) !== 0),
-				array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
-			)),
-
-			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
-			array('config.add', array('fulltext_postgres_min_word_len', 4)),
-			array('config.add', array('fulltext_postgres_max_word_len', 254)),
-			array('config.add', array('fulltext_sphinx_stopwords', 0)),
-			array('config.add', array('fulltext_sphinx_indexer_mem_limit', 512)),
-
-			array('config.add', array('load_jquery_cdn', 0)),
-			array('config.add', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js')),
-
-			array('config.add', array('use_system_cron', 0)),
-
-			array('config.add', array('legend_sort_groupname', 0)),
-			array('config.add', array('teampage_forums', 1)),
-			array('config.add', array('teampage_memberships', 1)),
-
-			array('config.add', array('load_cpf_pm', 0)),
-
-			array('config.add', array('display_last_subject', 1)),
-
-			array('config.add', array('assets_version', 1)),
-
-			array('config.add', array('site_home_url', '')),
-			array('config.add', array('site_home_text', '')),
-
-			array('permission.add', array('u_chgprofileinfo', true, 'u_sig')),
-
-			array('module.add', array(
-				'acp',
-				'ACP_GROUPS',
-				array(
-					'module_basename'	=> 'acp_groups',
-					'modes'				=> array('position'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_ATTACHMENTS',
-				array(
-					'module_basename'	=> 'acp_attachments',
-					'modes'				=> array('manage'),
-				),
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_STYLE_MANAGEMENT',
-				array(
-					'module_basename'	=> 'acp_styles',
-					'modes'				=> array('install', 'cache'),
-				),
-			)),
-			array('module.add', array(
-				'ucp',
-				'UCP_PROFILE',
-				array(
-					'module_basename'	=> 'ucp_profile',
-					'modes'				=> array('autologin_keys'),
-				),
-			)),
-			// Module will be renamed later
-			array('module.add', array(
-				'acp',
-				'ACP_CAT_STYLES',
-				'ACP_LANGUAGE'
-			)),
-
-			array('module.remove', array(
-				'acp',
-				false,
-				'ACP_TEMPLATES',
-			)),
-			array('module.remove', array(
-				'acp',
-				false,
-				'ACP_THEMES',
-			)),
-			array('module.remove', array(
-				'acp',
-				false,
-				'ACP_IMAGESETS',
-			)),
-
-			array('custom', array(array($this, 'rename_module_basenames'))),
-			array('custom', array(array($this, 'rename_styles_module'))),
-			array('custom', array(array($this, 'add_group_teampage'))),
-			array('custom', array(array($this, 'update_group_legend'))),
-			array('custom', array(array($this, 'localise_global_announcements'))),
-			array('custom', array(array($this, 'update_ucp_pm_basename'))),
-			array('custom', array(array($this, 'update_ucp_profile_auth'))),
-			array('custom', array(array($this, 'move_customise_modules'))),
-
-			array('config.update', array('version', '3.1.0-dev')),
-		);
-	}
-
-	public function move_customise_modules()
-	{
-		// Move language management to new location in the Customise tab
-		// First get language module id
-		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-			WHERE module_basename = 'acp_language'";
-		$result = $this->db->sql_query($sql);
-		$language_module_id = $this->db->sql_fetchfield('module_id');
-		$this->db->sql_freeresult($result);
-		// Next get language management module id of the one just created
-		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-			WHERE module_langname = 'ACP_LANGUAGE'";
-		$result = $this->db->sql_query($sql);
-		$language_management_module_id = $this->db->sql_fetchfield('module_id');
-		$this->db->sql_freeresult($result);
-
-		if (!class_exists('acp_modules'))
-		{
-			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
-		}
-		// acp_modules calls adm_back_link, which is undefined at this point
-		if (!function_exists('adm_back_link'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
-		}
-		$module_manager = new acp_modules();
-		$module_manager->module_class = 'acp';
-		$module_manager->move_module($language_module_id, $language_management_module_id);
-	}
-
-	public function update_ucp_pm_basename()
-	{
-		$sql = 'SELECT module_id, module_basename
-			FROM ' . MODULES_TABLE . "
-			WHERE module_basename <> 'ucp_pm' AND
-				module_langname='UCP_PM'";
-		$result = $this->db->sql_query_limit($sql, 1);
-
-		if ($row = $this->db->sql_fetchrow($result))
-		{
-			// This update is still not applied. Applying it
-
-			$sql = 'UPDATE ' . MODULES_TABLE . "
-				SET module_basename = 'ucp_pm'
-				WHERE  module_id = " . (int) $row['module_id'];
-
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function update_ucp_profile_auth()
-	{
-		// Update the auth setting for the module
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET module_auth = 'acl_u_chgprofileinfo'
-			WHERE module_class = 'ucp'
-				AND module_basename = 'ucp_profile'
-				AND module_mode = 'profile_info'";
-		$this->sql_query($sql);
-	}
-
-	public function rename_styles_module()
-	{
-		// Rename styles module to Customise
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET module_langname = 'ACP_CAT_CUSTOMISE'
-			WHERE module_langname = 'ACP_CAT_STYLES'";
-		$this->sql_query($sql);
-	}
-
-	public function rename_module_basenames()
-	{
-		// rename all module basenames to full classname
-		$sql = 'SELECT module_id, module_basename, module_class
-			FROM ' . MODULES_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$module_id = (int) $row['module_id'];
-			unset($row['module_id']);
-
-			if (!empty($row['module_basename']) && !empty($row['module_class']))
-			{
-				// all the class names start with class name or with phpbb_ for auto loading
-				if (strpos($row['module_basename'], $row['module_class'] . '_') !== 0 &&
-					strpos($row['module_basename'], 'phpbb_') !== 0)
-				{
-					$row['module_basename'] = $row['module_class'] . '_' . $row['module_basename'];
-
-					$sql_update = $this->db->sql_build_array('UPDATE', $row);
-
-					$sql = 'UPDATE ' . MODULES_TABLE . '
-						SET ' . $sql_update . '
-						WHERE module_id = ' . $module_id;
-					$this->sql_query($sql);
-				}
-			}
-		}
-
-		$this->db->sql_freeresult($result);
-	}
-
-	public function add_group_teampage()
-	{
-		$sql = 'UPDATE ' . GROUPS_TABLE . '
-			SET group_teampage = 1
-			WHERE group_type = ' . GROUP_SPECIAL . "
-				AND group_name = 'ADMINISTRATORS'";
-		$this->sql_query($sql);
-
-		$sql = 'UPDATE ' . GROUPS_TABLE . '
-			SET group_teampage = 2
-			WHERE group_type = ' . GROUP_SPECIAL . "
-				AND group_name = 'GLOBAL_MODERATORS'";
-		$this->sql_query($sql);
-	}
-
-	public function update_group_legend()
-	{
-		$sql = 'SELECT group_id
-			FROM ' . GROUPS_TABLE . '
-			WHERE group_legend = 1
-			ORDER BY group_name ASC';
-		$result = $this->db->sql_query($sql);
-
-		$next_legend = 1;
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET group_legend = ' . $next_legend . '
-				WHERE group_id = ' . (int) $row['group_id'];
-			$this->sql_query($sql);
-
-			$next_legend++;
-		}
-		$this->db->sql_freeresult($result);
-	}
-
-	public function localise_global_announcements()
-	{
-		// Localise Global Announcements
-		$sql = 'SELECT topic_id, topic_approved, (topic_replies + 1) AS topic_posts, topic_last_post_id, topic_last_post_subject, topic_last_post_time, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour
-			FROM ' . TOPICS_TABLE . '
-			WHERE forum_id = 0
-				AND topic_type = ' . POST_GLOBAL;
-		$result = $this->db->sql_query($sql);
-
-		$global_announcements = $update_lastpost_data = array();
-		$update_lastpost_data['forum_last_post_time'] = 0;
-		$update_forum_data = array(
-			'forum_posts'		=> 0,
-			'forum_topics'		=> 0,
-			'forum_topics_real'	=> 0,
-		);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$global_announcements[] = (int) $row['topic_id'];
-
-			$update_forum_data['forum_posts'] += (int) $row['topic_posts'];
-			$update_forum_data['forum_topics_real']++;
-			if ($row['topic_approved'])
-			{
-				$update_forum_data['forum_topics']++;
-			}
-
-			if ($update_lastpost_data['forum_last_post_time'] < $row['topic_last_post_time'])
-			{
-				$update_lastpost_data = array(
-					'forum_last_post_id'		=> (int) $row['topic_last_post_id'],
-					'forum_last_post_subject'	=> $row['topic_last_post_subject'],
-					'forum_last_post_time'		=> (int) $row['topic_last_post_time'],
-					'forum_last_poster_id'		=> (int) $row['topic_last_poster_id'],
-					'forum_last_poster_name'	=> $row['topic_last_poster_name'],
-					'forum_last_poster_colour'	=> $row['topic_last_poster_colour'],
-				);
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!empty($global_announcements))
-		{
-			// Update the post/topic-count for the forum and the last-post if needed
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_type = ' . FORUM_POST;
-			$result = $this->db->sql_query_limit($sql, 1);
-			$ga_forum_id = $this->db->sql_fetchfield('forum_id');
-			$this->db->sql_freeresult($result);
-
-			$sql = 'SELECT forum_last_post_time
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_id = ' . $ga_forum_id;
-			$result = $this->db->sql_query($sql);
-			$lastpost = (int) $this->db->sql_fetchfield('forum_last_post_time');
-			$this->db->sql_freeresult($result);
-
-			$sql_update = 'forum_posts = forum_posts + ' . $update_forum_data['forum_posts'] . ', ';
-			$sql_update .= 'forum_topics_real = forum_topics_real + ' . $update_forum_data['forum_topics_real'] . ', ';
-			$sql_update .= 'forum_topics = forum_topics + ' . $update_forum_data['forum_topics'];
-			if ($lastpost < $update_lastpost_data['forum_last_post_time'])
-			{
-				$sql_update .= ', ' . $this->db->sql_build_array('UPDATE', $update_lastpost_data);
-			}
-
-			$sql = 'UPDATE ' . FORUMS_TABLE . '
-				SET ' . $sql_update . '
-				WHERE forum_id = ' . $ga_forum_id;
-			$this->sql_query($sql);
-
-			// Update some forum_ids
-			$table_ary = array(TOPICS_TABLE, POSTS_TABLE, LOG_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE);
-			foreach ($table_ary as $table)
-			{
-				$sql = "UPDATE $table
-					SET forum_id = $ga_forum_id
-					WHERE " . $this->db->sql_in_set('topic_id', $global_announcements);
-				$this->sql_query($sql);
-			}
-			unset($table_ary);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/extensions.php b/phpBB/includes/db/migration/data/310/extensions.php
deleted file mode 100644
index 6a9caa1cfc..0000000000
--- a/phpBB/includes/db/migration/data/310/extensions.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_extensions extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return $this->db_tools->sql_table_exists($this->table_prefix . 'ext');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_tables'		=> array(
-				$this->table_prefix . 'ext'	=> array(
-					'COLUMNS'			=> array(
-						'ext_name'		=> array('VCHAR', ''),
-						'ext_active'	=> array('BOOL', 0),
-						'ext_state'		=> array('TEXT', ''),
-					),
-					'KEYS'				=> array(
-						'ext_name'		=> array('UNIQUE', 'ext_name'),
-					),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_tables'		=> array(
-				$this->table_prefix . 'ext',
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			// Module will be renamed later
-			array('module.add', array(
-				'acp',
-				'ACP_CAT_STYLES',
-				'ACP_EXTENSION_MANAGEMENT'
-			)),
-			array('module.add', array(
-				'acp',
-				'ACP_EXTENSION_MANAGEMENT',
-				array(
-					'module_basename'	=> 'acp_extensions',
-					'modes'				=> array('main'),
-				),
-			)),
-			array('permission.add', array('a_extensions', true, 'a_styles')),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/forgot_password.php b/phpBB/includes/db/migration/data/310/forgot_password.php
deleted file mode 100644
index a553e51f35..0000000000
--- a/phpBB/includes/db/migration/data/310/forgot_password.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_forgot_password extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return isset($this->config['allow_password_reset']);
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.add', array('allow_password_reset', 1)),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/jquery_update.php b/phpBB/includes/db/migration/data/310/jquery_update.php
deleted file mode 100644
index dc49f74fcb..0000000000
--- a/phpBB/includes/db/migration/data/310/jquery_update.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_jquery_update extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return $this->config['load_jquery_url'] !== '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js';
-	}
-
-	static public function depends_on()
-	{
-		return array(
-			'phpbb_db_migration_data_310_dev',
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('config.update', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js')),
-		);
-	}
-
-}
diff --git a/phpBB/includes/db/migration/data/310/notification_options_reconvert.php b/phpBB/includes/db/migration/data/310/notification_options_reconvert.php
deleted file mode 100644
index d994d7ec5f..0000000000
--- a/phpBB/includes/db/migration/data/310/notification_options_reconvert.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_notification_options_reconvert extends phpbb_db_migration
-{
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_310_notifications_schema_fix');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'convert_notifications'))),
-		);
-	}
-
-	public function convert_notifications()
-	{
-		$insert_table = $this->table_prefix . 'user_notifications';
-		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table);
-
-		$this->perform_conversion($insert_buffer, $insert_table);
-	}
-
-	/**
-	* Perform the conversion (separate for testability)
-	*
-	* @param phpbb_db_sql_insert_buffer $insert_buffer
-	* @param string $insert_table
-	*/
-	public function perform_conversion(phpbb_db_sql_insert_buffer $insert_buffer, $insert_table)
-	{
-		$sql = 'DELETE FROM ' . $insert_table;
-		$this->db->sql_query($sql);
-
-		$sql = 'SELECT user_id, user_notify_type, user_notify_pm
-			FROM ' . USERS_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$notification_methods = array();
-
-			// In-board notification
-			$notification_methods[] = '';
-
-			if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
-			{
-				$notification_methods[] = 'email';
-			}
-
-			if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
-			{
-				$notification_methods[] = 'jabber';
-			}
-
-			// Notifications for posts
-			foreach (array('post', 'topic') as $item_type)
-			{
-				$this->add_method_rows(
-					$insert_buffer,
-					$item_type,
-					0,
-					$row['user_id'],
-					$notification_methods
-				);
-			}
-
-			if ($row['user_notify_pm'])
-			{
-				// Notifications for private messages
-				// User either gets all methods or no method
-				$this->add_method_rows(
-					$insert_buffer,
-					'pm',
-					0,
-					$row['user_id'],
-					$notification_methods
-				);
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		$insert_buffer->flush();
-	}
-
-	/**
-	* Insert method rows to DB
-	*
-	* @param phpbb_db_sql_insert_buffer $insert_buffer
-	* @param string $item_type
-	* @param int $item_id
-	* @param int $user_id
-	* @param string $methods
-	*/
-	protected function add_method_rows(phpbb_db_sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods)
-	{
-		$row_base = array(
-			'item_type'		=> $item_type,
-			'item_id'		=> (int) $item_id,
-			'user_id'		=> (int) $user_id,
-			'notify'		=> 1
-		);
-
-		foreach ($methods as $method)
-		{
-			$row_base['method'] = $method;
-			$insert_buffer->insert($row_base);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/notifications.php b/phpBB/includes/db/migration/data/310/notifications.php
deleted file mode 100644
index 17c939d95a..0000000000
--- a/phpBB/includes/db/migration/data/310/notifications.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_notifications extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return $this->db_tools->sql_table_exists($this->table_prefix . 'notifications');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_310_dev');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_tables'		=> array(
-				$this->table_prefix . 'notification_types'	=> array(
-					'COLUMNS'			=> array(
-						'notification_type'			=> array('VCHAR:255', ''),
-						'notification_type_enabled'	=> array('BOOL', 1),
-					),
-					'PRIMARY_KEY'		=> array('notification_type', 'notification_type_enabled'),
-				),
-				$this->table_prefix . 'notifications'		=> array(
-					'COLUMNS'			=> array(
-						'notification_id'  				=> array('UINT', NULL, 'auto_increment'),
-						'item_type'			   			=> array('VCHAR:255', ''),
-						'item_id'		  				=> array('UINT', 0),
-						'item_parent_id'   				=> array('UINT', 0),
-						'user_id'						=> array('UINT', 0),
-						'notification_read'				=> array('BOOL', 0),
-						'notification_time'				=> array('TIMESTAMP', 1),
-						'notification_data'			   	=> array('TEXT_UNI', ''),
-					),
-					'PRIMARY_KEY'		=> 'notification_id',
-					'KEYS'				=> array(
-						'item_ident'		=> array('INDEX', array('item_type', 'item_id')),
-						'user'				=> array('INDEX', array('user_id', 'notification_read')),
-					),
-				),
-				$this->table_prefix . 'user_notifications'	=> array(
-					'COLUMNS'			=> array(
-						'item_type'			=> array('VCHAR:255', ''),
-						'item_id'			=> array('UINT', 0),
-						'user_id'			=> array('UINT', 0),
-						'method'			=> array('VCHAR:255', ''),
-						'notify'			=> array('BOOL', 1),
-					),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_tables'	=> array(
-				$this->table_prefix . 'notification_types',
-				$this->table_prefix . 'notifications',
-				$this->table_prefix . 'user_notifications',
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('module.add', array(
-				'ucp',
-				'UCP_MAIN',
-				array(
-					'module_basename'	=> 'ucp_notifications',
-					'modes'				=> array('notification_list'),
-				),
-			)),
-			array('module.add', array(
-				'ucp',
-				'UCP_PREFS',
-				array(
-					'module_basename'	=> 'ucp_notifications',
-					'modes'				=> array('notification_options'),
-				),
-			)),
-			array('config.add', array('load_notifications', 1)),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/notifications_schema_fix.php b/phpBB/includes/db/migration/data/310/notifications_schema_fix.php
deleted file mode 100644
index 27e63e10d0..0000000000
--- a/phpBB/includes/db/migration/data/310/notifications_schema_fix.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_notifications_schema_fix extends phpbb_db_migration
-{
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_310_notifications');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_tables'		=> array(
-				$this->table_prefix . 'notification_types',
-				$this->table_prefix . 'notifications',
-			),
-			'add_tables'		=> array(
-				$this->table_prefix . 'notification_types'	=> array(
-					'COLUMNS'			=> array(
-						'notification_type_id'		=> array('USINT', NULL, 'auto_increment'),
-						'notification_type_name'	=> array('VCHAR:255', ''),
-						'notification_type_enabled'	=> array('BOOL', 1),
-					),
-					'PRIMARY_KEY'		=> array('notification_type_id'),
-					'KEYS'				=> array(
-						'type'			=> array('UNIQUE', array('notification_type_name')),
-					),
-				),
-				$this->table_prefix . 'notifications'		=> array(
-					'COLUMNS'			=> array(
-						'notification_id'				=> array('UINT:10', NULL, 'auto_increment'),
-						'notification_type_id'			=> array('USINT', 0),
-						'item_id'						=> array('UINT', 0),
-						'item_parent_id'				=> array('UINT', 0),
-						'user_id'						=> array('UINT', 0),
-						'notification_read'				=> array('BOOL', 0),
-						'notification_time'				=> array('TIMESTAMP', 1),
-						'notification_data'				=> array('TEXT_UNI', ''),
-					),
-					'PRIMARY_KEY'		=> 'notification_id',
-					'KEYS'				=> array(
-						'item_ident'		=> array('INDEX', array('notification_type_id', 'item_id')),
-						'user'				=> array('INDEX', array('user_id', 'notification_read')),
-					),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_tables'	=> array(
-				$this->table_prefix . 'notification_types',
-				$this->table_prefix . 'notifications',
-			),
-			'add_tables'		=> array(
-				$this->table_prefix . 'notification_types'	=> array(
-					'COLUMNS'			=> array(
-						'notification_type'			=> array('VCHAR:255', ''),
-						'notification_type_enabled'	=> array('BOOL', 1),
-					),
-					'PRIMARY_KEY'		=> array('notification_type', 'notification_type_enabled'),
-				),
-				$this->table_prefix . 'notifications'		=> array(
-					'COLUMNS'			=> array(
-						'notification_id'  				=> array('UINT', NULL, 'auto_increment'),
-						'item_type'			   			=> array('VCHAR:255', ''),
-						'item_id'		  				=> array('UINT', 0),
-						'item_parent_id'   				=> array('UINT', 0),
-						'user_id'						=> array('UINT', 0),
-						'notification_read'				=> array('BOOL', 0),
-						'notification_time'				=> array('TIMESTAMP', 1),
-						'notification_data'			   	=> array('TEXT_UNI', ''),
-					),
-					'PRIMARY_KEY'		=> 'notification_id',
-					'KEYS'				=> array(
-						'item_ident'		=> array('INDEX', array('item_type', 'item_id')),
-						'user'				=> array('INDEX', array('user_id', 'notification_read')),
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/reported_posts_display.php b/phpBB/includes/db/migration/data/310/reported_posts_display.php
deleted file mode 100644
index 80a0a0e43f..0000000000
--- a/phpBB/includes/db/migration/data/310/reported_posts_display.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_reported_posts_display extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return $this->db_tools->sql_column_exists($this->table_prefix . 'reports', 'reported_post_enable_bbcode');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns'		=> array(
-				$this->table_prefix . 'reports'		=> array(
-					'reported_post_enable_bbcode'		=> array('BOOL', 1),
-					'reported_post_enable_smilies'		=> array('BOOL', 1),
-					'reported_post_enable_magic_url'	=> array('BOOL', 1),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns'		=> array(
-				$this->table_prefix . 'reports'		=> array(
-					'reported_post_enable_bbcode',
-					'reported_post_enable_smilies',
-					'reported_post_enable_magic_url',
-				),
-			),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/signature_module_auth.php b/phpBB/includes/db/migration/data/310/signature_module_auth.php
deleted file mode 100644
index e4fbb27bcb..0000000000
--- a/phpBB/includes/db/migration/data/310/signature_module_auth.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_signature_module_auth extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		$sql = 'SELECT module_auth
-			FROM ' . MODULES_TABLE . "
-			WHERE module_class = 'ucp'
-				AND module_basename = 'ucp_profile'
-				AND module_mode = 'signature'";
-		$result = $this->db->sql_query($sql);
-		$module_auth = $this->db_sql_fetchfield('module_auth');
-		$this->db->sql_freeresult($result);
-
-		return $module_auth === 'acl_u_sig' || $module_auth === false;
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_31x_dev');
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(
-					array($this, 'update_signature_module_auth'),
-				),
-			),
-		);
-	}
-
-	public function update_signature_module_auth()
-	{
-		$sql = 'UPDATE ' . MODULES_TABLE . "
-			SET module_auth = 'acl_u_sig'
-			WHERE module_class = 'ucp'
-				AND module_basename = 'ucp_profile'
-				AND module_mode = 'signature'
-				AND module_auth = ''";
-		$this->db->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/softdelete_p1.php b/phpBB/includes/db/migration/data/310/softdelete_p1.php
deleted file mode 100644
index 84f8eebd4a..0000000000
--- a/phpBB/includes/db/migration/data/310/softdelete_p1.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_softdelete_p1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return $this->db_tools->sql_column_exists($this->table_prefix . 'posts', 'post_visibility');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_310_dev');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns'		=> array(
-				$this->table_prefix . 'forums'		=> array(
-					'forum_posts_approved'		=> array('UINT', 0),
-					'forum_posts_unapproved'	=> array('UINT', 0),
-					'forum_posts_softdeleted'	=> array('UINT', 0),
-					'forum_topics_approved'		=> array('UINT', 0),
-					'forum_topics_unapproved'	=> array('UINT', 0),
-					'forum_topics_softdeleted'	=> array('UINT', 0),
-				),
-				$this->table_prefix . 'posts'		=> array(
-					'post_visibility'		=> array('TINT:3', 0),
-					'post_delete_time'		=> array('TIMESTAMP', 0),
-					'post_delete_reason'	=> array('STEXT_UNI', ''),
-					'post_delete_user'		=> array('UINT', 0),
-				),
-				$this->table_prefix . 'topics'		=> array(
-					'topic_visibility'		=> array('TINT:3', 0),
-					'topic_delete_time'		=> array('TIMESTAMP', 0),
-					'topic_delete_reason'	=> array('STEXT_UNI', ''),
-					'topic_delete_user'		=> array('UINT', 0),
-					'topic_posts_approved'		=> array('UINT', 0),
-					'topic_posts_unapproved'	=> array('UINT', 0),
-					'topic_posts_softdeleted'	=> array('UINT', 0),
-				),
-			),
-			'add_index'		=> array(
-				$this->table_prefix . 'posts'		=> array(
-					'post_visibility'		=> array('post_visibility'),
-				),
-				$this->table_prefix . 'topics'		=> array(
-					'topic_visibility'		=> array('topic_visibility'),
-					'forum_vis_last'		=> array('forum_id', 'topic_visibility', 'topic_last_post_id'),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns'		=> array(
-				$this->table_prefix . 'forums'		=> array(
-					'forum_posts_approved',
-					'forum_posts_unapproved',
-					'forum_posts_softdeleted',
-					'forum_topics_approved',
-					'forum_topics_unapproved',
-					'forum_topics_softdeleted',
-				),
-				$this->table_prefix . 'posts'		=> array(
-					'post_visibility',
-					'post_delete_time',
-					'post_delete_reason',
-					'post_delete_user',
-				),
-				$this->table_prefix . 'topics'		=> array(
-					'topic_visibility',
-					'topic_delete_time',
-					'topic_delete_reason',
-					'topic_delete_user',
-					'topic_posts_approved',
-					'topic_posts_unapproved',
-					'topic_posts_softdeleted',
-				),
-			),
-			'drop_keys'		=> array(
-				$this->table_prefix . 'posts'		=> array('post_visibility'),
-				$this->table_prefix . 'topics'	=> array('topic_visibility', 'forum_vis_last'),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'update_post_visibility'))),
-			array('custom', array(array($this, 'update_topic_visibility'))),
-			array('custom', array(array($this, 'update_topic_forum_counts'))),
-
-			array('permission.add', array('f_softdelete', false)),
-			array('permission.add', array('m_softdelete', false)),
-		);
-	}
-
-	public function update_post_visibility()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . 'posts
-			SET post_visibility = post_approved';
-		$this->sql_query($sql);
-	}
-
-	public function update_topic_visibility()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . 'topics
-			SET topic_visibility = topic_approved';
-		$this->sql_query($sql);
-	}
-
-	public function update_topic_forum_counts()
-	{
-		$sql = 'UPDATE ' . $this->table_prefix . 'topics
-			SET topic_posts_approved = topic_replies + 1,
-				topic_posts_unapproved = topic_replies_real - topic_replies
-			WHERE topic_visibility = ' . ITEM_APPROVED;
-		$this->sql_query($sql);
-
-		$sql = 'UPDATE ' . $this->table_prefix . 'topics
-			SET topic_posts_approved = 0,
-				topic_posts_unapproved = (topic_replies_real - topic_replies) + 1
-			WHERE topic_visibility = ' . ITEM_UNAPPROVED;
-		$this->sql_query($sql);
-
-		$sql = 'SELECT forum_id, topic_visibility, COUNT(topic_id) AS sum_topics, SUM(topic_posts_approved) AS sum_posts_approved, SUM(topic_posts_unapproved) AS sum_posts_unapproved
-			FROM ' . $this->table_prefix . 'topics
-			GROUP BY forum_id, topic_visibility';
-		$result = $this->db->sql_query($sql);
-
-		$update_forums = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$forum_id = (int) $row['forum_id'];
-			if (!isset($update_forums[$forum_id]))
-			{
-				$update_forums[$forum_id] = array(
-					'forum_posts_approved'		=> 0,
-					'forum_posts_unapproved'	=> 0,
-					'forum_topics_approved'		=> 0,
-					'forum_topics_unapproved'	=> 0,
-				);
-			}
-
-			$update_forums[$forum_id]['forum_posts_approved'] += (int) $row['sum_posts_approved'];
-			$update_forums[$forum_id]['forum_posts_unapproved'] += (int) $row['sum_posts_unapproved'];
-
-			$update_forums[$forum_id][(($row['topic_visibility'] == ITEM_APPROVED) ? 'forum_topics_approved' : 'forum_topics_unapproved')] += (int) $row['sum_topics'];
-		}
-		$this->db->sql_freeresult($result);
-
-		foreach ($update_forums as $forum_id => $forum_data)
-		{
-			$sql = 'UPDATE ' . FORUMS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $forum_data) . '
-				WHERE forum_id = ' . $forum_id;
-			$this->sql_query($sql);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/softdelete_p2.php b/phpBB/includes/db/migration/data/310/softdelete_p2.php
deleted file mode 100644
index 7320a2c2bf..0000000000
--- a/phpBB/includes/db/migration/data/310/softdelete_p2.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_softdelete_p2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return !$this->db_tools->sql_column_exists($this->table_prefix . 'posts', 'post_approved');
-	}
-
-	static public function depends_on()
-	{
-		return array(
-			'phpbb_db_migration_data_310_dev',
-			'phpbb_db_migration_data_310_softdelete_p1',
-		);
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_columns'		=> array(
-				$this->table_prefix . 'forums'			=> array('forum_posts', 'forum_topics', 'forum_topics_real'),
-				$this->table_prefix . 'posts'			=> array('post_approved'),
-				$this->table_prefix . 'topics'			=> array('topic_approved', 'topic_replies', 'topic_replies_real'),
-			),
-			'drop_keys'		=> array(
-				$this->table_prefix . 'posts'			=> array('post_approved'),
-				$this->table_prefix . 'topics'			=> array('forum_appr_last'),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'add_columns'		=> array(
-				$this->table_prefix . 'forums'			=> array(
-					'forum_posts'			=> array('UINT', 0),
-					'forum_topics'			=> array('UINT', 0),
-					'forum_topics_real'		=> array('UINT', 0),
-				),
-				$this->table_prefix . 'posts'			=> array(
-					'post_approved'			=> array('BOOL', 1),
-				),
-				$this->table_prefix . 'topics'		=> array(
-					'topic_approved'			=> array('BOOL', 1),
-					'topic_replies'				=> array('UINT', 0),
-					'topic_replies_real'		=> array('UINT', 0),
-				),
-			),
-			'add_index'		=> array(
-				$this->table_prefix . 'posts'			=> array(
-					'post_approved'		=> array('post_approved'),
-				),
-				$this->table_prefix . 'topics'		=> array(
-					'forum_appr_last'	=> array('forum_id', 'topic_approved', 'topic_last_post_id'),
-				),
-			),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/style_update_p1.php b/phpBB/includes/db/migration/data/310/style_update_p1.php
deleted file mode 100644
index d43537559d..0000000000
--- a/phpBB/includes/db/migration/data/310/style_update_p1.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_style_update_p1 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return !$this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_columns'	=> array(
-				$this->table_prefix . 'styles'		=> array(
-					'style_path'			=> array('VCHAR:100', ''),
-					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
-					'style_parent_id'		=> array('UINT', 0),
-					'style_parent_tree'		=> array('TEXT', ''),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_columns'	=> array(
-				$this->table_prefix . 'styles'		=> array(
-					'style_path',
-					'bbcode_bitfield',
-					'style_parent_id',
-					'style_parent_tree',
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'styles_update'))),
-		);
-	}
-
-	public function styles_update()
-	{
-		// Get list of valid 3.1 styles
-		$available_styles = array('prosilver');
-
-		$iterator = new DirectoryIterator($this->phpbb_root_path . 'styles');
-		$skip_dirs = array('.', '..', 'prosilver');
-		foreach ($iterator as $fileinfo)
-		{
-			if ($fileinfo->isDir() && !in_array($fileinfo->getFilename(), $skip_dirs) && file_exists($fileinfo->getPathname() . '/style.cfg'))
-			{
-				$style_cfg = parse_cfg_file($fileinfo->getPathname() . '/style.cfg');
-				if (isset($style_cfg['phpbb_version']) && version_compare($style_cfg['phpbb_version'], '3.1.0-dev', '>='))
-				{
-					// 3.1 style
-					$available_styles[] = $fileinfo->getFilename();
-				}
-			}
-		}
-
-		// Get all installed styles
-		if ($this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset'))
-		{
-			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id, i.imageset_path
-				FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . 'styles_theme c, ' . $this->table_prefix . "styles_imageset i
-				WHERE t.template_id = s.template_id
-					AND c.theme_id = s.theme_id
-					AND i.imageset_id = s.imageset_id";
-		}
-		else
-		{
-			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id
-				FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . "stles_theme c
-				WHERE t.template_id = s.template_id
-					AND c.theme_id = s.theme_id";
-		}
-		$result = $this->db->sql_query($sql);
-
-		$styles = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$styles[] = $row;
-		}
-		$this->db->sql_freeresult($result);
-
-		// Decide which styles to keep, all others will be deleted
-		$valid_styles = array();
-		foreach ($styles as $style_row)
-		{
-			if (
-				// Delete styles with parent style (not supported yet)
-				$style_row['template_inherits_id'] == 0 &&
-				// Check if components match
-				$style_row['template_path'] == $style_row['theme_path'] && (!isset($style_row['imageset_path']) || $style_row['template_path'] == $style_row['imageset_path']) &&
-				// Check if components are valid
-				in_array($style_row['template_path'], $available_styles)
-				)
-			{
-				// Valid style. Keep it
-				$sql_ary = array(
-					'style_path'	=> $style_row['template_path'],
-					'bbcode_bitfield'	=> $style_row['bbcode_bitfield'],
-					'style_parent_id'	=> 0,
-					'style_parent_tree'	=> '',
-				);
-				$this->sql_query('UPDATE ' . STYLES_TABLE . '
-					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-					WHERE style_id = ' . $style_row['style_id']);
-				$valid_styles[] = (int) $style_row['style_id'];
-			}
-		}
-
-		// Remove old entries from styles table
-		if (!sizeof($valid_styles))
-		{
-			// No valid styles: remove everything and add prosilver
-			$this->sql_query('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
-
-			$sql_ary = array(
-				'style_name'		=> 'prosilver',
-				'style_copyright'	=> '&copy; phpBB Group',
-				'style_active'		=> 1,
-				'style_path'		=> 'prosilver',
-				'bbcode_bitfield'	=> 'lNg=',
-				'style_parent_id'	=> 0,
-				'style_parent_tree'	=> '',
-
-				// Will be removed in the next step
-				'imageset_id'		=> 0,
-				'template_id'		=> 0,
-				'theme_id'			=> 0,
-			);
-
-			$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
-			$this->sql_query($sql);
-
-			$sql = 'SELECT style_id
-				FROM ' . $table . "
-				WHERE style_name = 'prosilver'";
-			$result = $this->sql_query($sql);
-			$default_style = $this->db->sql_fetchfield($result);
-			$this->db->sql_freeresult($result);
-
-			set_config('default_style', $default_style);
-
-			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
-			$this->sql_query($sql);
-		}
-		else
-		{
-			// There are valid styles in styles table. Remove styles that are outdated
-			$this->sql_query('DELETE FROM ' . STYLES_TABLE . '
-				WHERE ' . $this->db->sql_in_set('style_id', $valid_styles, true));
-
-			// Change default style
-			if (!in_array($this->config['default_style'], $valid_styles))
-			{
-				$this->sql_query('UPDATE ' . CONFIG_TABLE . "
-					SET config_value = '" . $valid_styles[0] . "'
-					WHERE config_name = 'default_style'");
-			}
-
-			// Reset styles for users
-			$this->sql_query('UPDATE ' . USERS_TABLE . '
-				SET user_style = 0
-				WHERE ' . $this->db->sql_in_set('user_style', $valid_styles, true));
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/style_update_p2.php b/phpBB/includes/db/migration/data/310/style_update_p2.php
deleted file mode 100644
index 7b10518a66..0000000000
--- a/phpBB/includes/db/migration/data/310/style_update_p2.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_style_update_p2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return !$this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_310_style_update_p1');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_columns'	=> array(
-				$this->table_prefix . 'styles'		=> array(
-					'imageset_id',
-					'template_id',
-					'theme_id',
-				),
-			),
-
-			'drop_tables'	=> array(
-				$this->table_prefix . 'styles_imageset',
-				$this->table_prefix . 'styles_imageset_data',
-				$this->table_prefix . 'styles_template',
-				$this->table_prefix . 'styles_template_data',
-				$this->table_prefix . 'styles_theme',
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'add_columns'	=> array(
-				$this->table_prefix . 'styles'		=> array(
-					'imageset_id'	=> array('UINT', 0),
-					'template_id'	=> array('UINT', 0),
-					'theme_id'		=> array('UINT', 0),
-				),
-			),
-
-			'add_tables'	=> array(
-				$this->table_prefix . 'styles_imageset'		=> array(
-					'COLUMNS'		=> array(
-						'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
-						'imageset_name'				=> array('VCHAR_UNI:255', ''),
-						'imageset_copyright'		=> array('VCHAR_UNI', ''),
-						'imageset_path'				=> array('VCHAR:100', ''),
-					),
-					'PRIMARY_KEY'		=> 'imageset_id',
-					'KEYS'				=> array(
-						'imgset_nm'			=> array('UNIQUE', 'imageset_name'),
-					),
-				),
-				$this->table_prefix . 'styles_imageset_data'	=> array(
-					'COLUMNS'		=> array(
-						'image_id'				=> array('UINT', NULL, 'auto_increment'),
-						'image_name'			=> array('VCHAR:200', ''),
-						'image_filename'		=> array('VCHAR:200', ''),
-						'image_lang'			=> array('VCHAR:30', ''),
-						'image_height'			=> array('USINT', 0),
-						'image_width'			=> array('USINT', 0),
-						'imageset_id'			=> array('UINT', 0),
-					),
-					'PRIMARY_KEY'		=> 'image_id',
-					'KEYS'				=> array(
-						'i_d'			=> array('INDEX', 'imageset_id'),
-					),
-				),
-				$this->table_prefix . 'styles_template'		=> array(
-					'COLUMNS'		=> array(
-						'template_id'			=> array('UINT', NULL, 'auto_increment'),
-						'template_name'			=> array('VCHAR_UNI:255', ''),
-						'template_copyright'	=> array('VCHAR_UNI', ''),
-						'template_path'			=> array('VCHAR:100', ''),
-						'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
-						'template_storedb'		=> array('BOOL', 0),
-						'template_inherits_id'		=> array('UINT:4', 0),
-						'template_inherit_path'		=> array('VCHAR', ''),
-					),
-					'PRIMARY_KEY'	=> 'template_id',
-					'KEYS'			=> array(
-						'tmplte_nm'				=> array('UNIQUE', 'template_name'),
-					),
-				),
-				$this->table_prefix . 'styles_template_data'	=> array(
-					'COLUMNS'		=> array(
-						'template_id'			=> array('UINT', 0),
-						'template_filename'		=> array('VCHAR:100', ''),
-						'template_included'		=> array('TEXT', ''),
-						'template_mtime'		=> array('TIMESTAMP', 0),
-						'template_data'			=> array('MTEXT_UNI', ''),
-					),
-					'KEYS'			=> array(
-						'tid'					=> array('INDEX', 'template_id'),
-						'tfn'					=> array('INDEX', 'template_filename'),
-					),
-				),
-				$this->table_prefix . 'styles_theme'			=> array(
-					'COLUMNS'		=> array(
-						'theme_id'				=> array('UINT', NULL, 'auto_increment'),
-						'theme_name'			=> array('VCHAR_UNI:255', ''),
-						'theme_copyright'		=> array('VCHAR_UNI', ''),
-						'theme_path'			=> array('VCHAR:100', ''),
-						'theme_storedb'			=> array('BOOL', 0),
-						'theme_mtime'			=> array('TIMESTAMP', 0),
-						'theme_data'			=> array('MTEXT_UNI', ''),
-					),
-					'PRIMARY_KEY'	=> 'theme_id',
-					'KEYS'			=> array(
-						'theme_name'		=> array('UNIQUE', 'theme_name'),
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/teampage.php b/phpBB/includes/db/migration/data/310/teampage.php
deleted file mode 100644
index 4e77da17b7..0000000000
--- a/phpBB/includes/db/migration/data/310/teampage.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_teampage extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return $this->db_tools->sql_table_exists($this->table_prefix . 'teampage');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_310_dev');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_tables'		=> array(
-				$this->table_prefix . 'teampage'	=> array(
-					'COLUMNS'		=> array(
-						'teampage_id'		=> array('UINT', NULL, 'auto_increment'),
-						'group_id'			=> array('UINT', 0),
-						'teampage_name'		=> array('VCHAR_UNI:255', ''),
-						'teampage_position'	=> array('UINT', 0),
-						'teampage_parent'	=> array('UINT', 0),
-					),
-					'PRIMARY_KEY'		=> 'teampage_id',
-				),
-			),
-			'drop_columns'		=> array(
-				$this->table_prefix . 'groups'		=> array(
-					'group_teampage',
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_tables'		=> array(
-				$this->table_prefix . 'teampage',
-			),
-			'add_columns'		=> array(
-				$this->table_prefix . 'groups'		=> array(
-					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'add_groups_teampage'))),
-		);
-	}
-
-	public function add_groups_teampage()
-	{
-		$sql = 'SELECT teampage_id
-			FROM ' . TEAMPAGE_TABLE;
-		$result = $this->db->sql_query_limit($sql, 1);
-		$added_groups_teampage = (bool) $this->db->sql_fetchfield('teampage_id');
-		$this->db->sql_freeresult($result);
-
-		if (!$added_groups_teampage)
-		{
-			$sql = 'SELECT *
-				FROM ' . GROUPS_TABLE . '
-				WHERE group_type = ' . GROUP_SPECIAL . "
-					AND (group_name = 'ADMINISTRATORS'
-						OR group_name = 'GLOBAL_MODERATORS')
-				ORDER BY group_name ASC";
-			$result = $this->db->sql_query($sql);
-
-			$teampage_entries = array();
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$teampage_entries[] = array(
-					'group_id'			=> (int) $row['group_id'],
-					'teampage_name'		=> '',
-					'teampage_position'	=> sizeof($teampage_entries) + 1,
-					'teampage_parent'	=> 0,
-				);
-			}
-			$this->db->sql_freeresult($result);
-
-			if (sizeof($teampage_entries))
-			{
-				$this->db->sql_multi_insert(TEAMPAGE_TABLE, $teampage_entries);
-			}
-			unset($teampage_entries);
-		}
-
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/timezone.php b/phpBB/includes/db/migration/data/310/timezone.php
deleted file mode 100644
index 6e50cbe45f..0000000000
--- a/phpBB/includes/db/migration/data/310/timezone.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_timezone extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_dst');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'change_columns'	=> array(
-				$this->table_prefix . 'users'			=> array(
-					'user_timezone'		=> array('VCHAR:100', ''),
-				),
-			),
-		);
-	}
-
-	public function update_data()
-	{
-		return array(
-			array('custom', array(array($this, 'update_timezones'))),
-		);
-	}
-
-	public function update_timezones()
-	{
-		// Update user timezones
-		$sql = 'SELECT user_dst, user_timezone
-			FROM ' . $this->table_prefix . 'users
-			GROUP BY user_timezone, user_dst';
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$sql = 'UPDATE ' . $this->table_prefix . "users
-				SET user_timezone = '" . $this->db->sql_escape($this->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
-				WHERE user_timezone = '" . $this->db->sql_escape($row['user_timezone']) . "'
-					AND user_dst = " . (int) $row['user_dst'];
-			$this->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-
-		// Update board default timezone
-		$sql = 'UPDATE ' . $this->table_prefix . "config
-			SET config_value = '" . $this->convert_phpbb30_timezone($this->config['board_timezone'], $this->config['board_dst']) . "'
-			WHERE config_name = 'board_timezone'";
-		$this->sql_query($sql);
-	}
-
-	/**
-	* Determine the new timezone for a given phpBB 3.0 timezone and
-	* "Daylight Saving Time" option
-	*
-	*	@param	$timezone	float	Users timezone in 3.0
-	*	@param	$dst		int		Users daylight saving time
-	*	@return		string		Users new php Timezone which is used since 3.1
-	*/
-	public function convert_phpbb30_timezone($timezone, $dst)
-	{
-		$offset = $timezone + $dst;
-
-		switch ($timezone)
-		{
-			case '-12':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 12] Baker Island Time'
-			case '-11':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 11] Niue Time, Samoa Standard Time'
-			case '-10':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time'
-			case '-9.5':
-				return 'Pacific/Marquesas';			//'[UTC - 9:30] Marquesas Islands Time'
-			case '-9':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 9] Alaska Standard Time, Gambier Island Time'
-			case '-8':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 8] Pacific Standard Time'
-			case '-7':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 7] Mountain Standard Time'
-			case '-6':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 6] Central Standard Time'
-			case '-5':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 5] Eastern Standard Time'
-			case '-4.5':
-				return 'America/Caracas';			//'[UTC - 4:30] Venezuelan Standard Time'
-			case '-4':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 4] Atlantic Standard Time'
-			case '-3.5':
-				return 'America/St_Johns';			//'[UTC - 3:30] Newfoundland Standard Time'
-			case '-3':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 3] Amazon Standard Time, Central Greenland Time'
-			case '-2':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time'
-			case '-1':
-				return 'Etc/GMT+' . abs($offset);	//'[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time'
-			case '0':
-				return (!$dst) ? 'UTC' : 'Etc/GMT-1';	//'[UTC] Western European Time, Greenwich Mean Time'
-			case '1':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 1] Central European Time, West African Time'
-			case '2':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 2] Eastern European Time, Central African Time'
-			case '3':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 3] Moscow Standard Time, Eastern African Time'
-			case '3.5':
-				return 'Asia/Tehran';				//'[UTC + 3:30] Iran Standard Time'
-			case '4':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 4] Gulf Standard Time, Samara Standard Time'
-			case '4.5':
-				return 'Asia/Kabul';				//'[UTC + 4:30] Afghanistan Time'
-			case '5':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time'
-			case '5.5':
-				return 'Asia/Kolkata';				//'[UTC + 5:30] Indian Standard Time, Sri Lanka Time'
-			case '5.75':
-				return 'Asia/Kathmandu';			//'[UTC + 5:45] Nepal Time'
-			case '6':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time'
-			case '6.5':
-				return 'Indian/Cocos';				//'[UTC + 6:30] Cocos Islands Time, Myanmar Time'
-			case '7':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 7] Indochina Time, Krasnoyarsk Standard Time'
-			case '8':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time'
-			case '8.75':
-				return 'Australia/Eucla';			//'[UTC + 8:45] Southeastern Western Australia Standard Time'
-			case '9':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time'
-			case '9.5':
-				return 'Australia/ACT';				//'[UTC + 9:30] Australian Central Standard Time'
-			case '10':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time'
-			case '10.5':
-				return 'Australia/Lord_Howe';		//'[UTC + 10:30] Lord Howe Standard Time'
-			case '11':
-				return 'Etc/GMT-' . $offset;		//'[UTC + 11] Solomon Island Time, Magadan Standard Time'
-			case '11.5':
-				return 'Pacific/Norfolk';			//'[UTC + 11:30] Norfolk Island Time'
-			case '12':
-				return 'Etc/GMT-12';				//'[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time'
-			case '12.75':
-				return 'Pacific/Chatham';			//'[UTC + 12:45] Chatham Islands Time'
-			case '13':
-				return 'Pacific/Tongatapu';			//'[UTC + 13] Tonga Time, Phoenix Islands Time'
-			case '14':
-				return 'Pacific/Kiritimati';		//'[UTC + 14] Line Island Time'
-			default:
-				return 'UTC';
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/data/310/timezone_p2.php b/phpBB/includes/db/migration/data/310/timezone_p2.php
deleted file mode 100644
index 113b979e4f..0000000000
--- a/phpBB/includes/db/migration/data/310/timezone_p2.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_timezone_p2 extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_dst');
-	}
-
-	static public function depends_on()
-	{
-		return array('phpbb_db_migration_data_310_timezone');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'drop_columns'	=> array(
-				$this->table_prefix . 'users'			=> array(
-					'user_dst',
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'add_columns'	=> array(
-				$this->table_prefix . 'users'			=> array(
-					'user_dst'		=> array('BOOL', 0),
-				),
-			),
-		);
-	}
-}
diff --git a/phpBB/includes/db/migration/exception.php b/phpBB/includes/db/migration/exception.php
deleted file mode 100644
index e84330dd71..0000000000
--- a/phpBB/includes/db/migration/exception.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
-*
-* @package db
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The migrator is responsible for applying new migrations in the correct order.
-*
-* @package db
-*/
-class phpbb_db_migration_exception extends \Exception
-{
-	/**
-	* Extra parameters sent to exception to aid in debugging
-	* @var array
-	*/
-	protected $parameters;
-
-	/**
-	* Throw an exception.
-	*
-	* First argument is the error message.
-	* Additional arguments will be output with the error message.
-	*/
-	public function __construct()
-	{
-		$parameters = func_get_args();
-		$message = array_shift($parameters);
-		parent::__construct($message);
-
-		$this->parameters = $parameters;
-	}
-
-	/**
-	* Output the error as a string
-	*
-	* @return string
-	*/
-	public function __toString()
-	{
-		return $this->message . ': ' . var_export($this->parameters, true);
-	}
-
-	/**
-	* Get the parameters
-	*
-	* @return array
-	*/
-	public function getParameters()
-	{
-		return $this->parameters;
-	}
-
-	/**
-	* Get localised message (with $user->lang()) 
-	* 
-	* @param phpbb_user $user
-	* @return string
-	*/
-	public function getLocalisedMessage(phpbb_user $user)
-	{
-		$parameters = $this->getParameters();
-		array_unshift($parameters, $this->getMessage());
-
-		return call_user_func_array(array($user, 'lang'), $parameters);
-	}
-}
diff --git a/phpBB/includes/db/migration/migration.php b/phpBB/includes/db/migration/migration.php
deleted file mode 100644
index 0ffa96fd14..0000000000
--- a/phpBB/includes/db/migration/migration.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
-*
-* @package db
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Abstract base class for database migrations
-*
-* Each migration consists of a set of schema and data changes to be implemented
-* in a subclass. This class provides various utility methods to simplify editing
-* a phpBB.
-*
-* @package db
-*/
-abstract class phpbb_db_migration
-{
-	/** @var phpbb_config */
-	protected $config;
-
-	/** @var phpbb_db_driver */
-	protected $db;
-
-	/** @var phpbb_db_tools */
-	protected $db_tools;
-
-	/** @var string */
-	protected $table_prefix;
-
-	/** @var string */
-	protected $phpbb_root_path;
-
-	/** @var string */
-	protected $php_ext;
-
-	/** @var array Errors, if any occurred */
-	protected $errors;
-
-	/** @var array List of queries executed through $this->sql_query() */
-	protected $queries = array();
-
-	/**
-	* Constructor
-	*
-	* @param phpbb_config $config
-	* @param phpbb_db_driver $db
-	* @param phpbb_db_tools $db_tools
-	* @param string $phpbb_root_path
-	* @param string $php_ext
-	* @param string $table_prefix
-	*/
-	public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, $phpbb_root_path, $php_ext, $table_prefix)
-	{
-		$this->config = $config;
-		$this->db = $db;
-		$this->db_tools = $db_tools;
-		$this->table_prefix = $table_prefix;
-
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-
-		$this->errors = array();
-	}
-
-	/**
-	* Defines other migrations to be applied first
-	*
-	* @return array An array of migration class names
-	*/
-	static public function depends_on()
-	{
-		return array();
-	}
-
-	/**
-	* Allows you to check if the migration is effectively installed (entirely optional)
-	*
-	* This is checked when a migration is installed. If true is returned, the migration will be set as
-	* installed without performing the database changes.
-	* This function is intended to help moving to migrations from a previous database updater, where some
-	* migrations may have been installed already even though they are not yet listed in the migrations table.
-	*
-	* @return bool True if this migration is installed, False if this migration is not installed (checked on install)
-	*/
-	public function effectively_installed()
-	{
-		return false;
-	}
-
-	/**
-	* Updates the database schema by providing a set of change instructions
-	*
-	* @return array Array of schema changes (compatible with db_tools->perform_schema_changes())
-	*/
-	public function update_schema()
-	{
-		return array();
-	}
-
-	/**
-	* Reverts the database schema by providing a set of change instructions
-	*
-	* @return array Array of schema changes (compatible with db_tools->perform_schema_changes())
-	*/
-	public function revert_schema()
-	{
-		return array();
-	}
-
-	/**
-	* Updates data by returning a list of instructions to be executed
-	*
-	* @return array Array of data update instructions
-	*/
-	public function update_data()
-	{
-		return array();
-	}
-
-	/**
-	* Reverts data by returning a list of instructions to be executed
-	*
-	* @return array Array of data instructions that will be performed on revert
-	* 	NOTE: calls to tools (such as config.add) are automatically reverted when
-	* 		possible, so you should not attempt to revert those, this is mostly for
-	* 		otherwise unrevertable calls (custom functions for example)
-	*/
-	public function revert_data()
-	{
-		return array();
-	}
-
-	/**
-	* Wrapper for running queries to generate user feedback on updates
-	*
-	* @param string $sql SQL query to run on the database
-	* @return mixed Query result from db->sql_query()
-	*/
-	protected function sql_query($sql)
-	{
-		$this->queries[] = $sql;
-
-		$this->db->sql_return_on_error(true);
-
-		if ($sql === 'begin')
-		{
-			$result = $this->db->sql_transaction('begin');
-		}
-		else if ($sql === 'commit')
-		{
-			$result = $this->db->sql_transaction('commit');
-		}
-		else
-		{
-			$result = $this->db->sql_query($sql);
-			if ($this->db->sql_error_triggered)
-			{
-				$this->errors[] = array(
-					'sql'	=> $this->db->sql_error_sql,
-					'code'	=> $this->db->sql_error_returned,
-				);
-			}
-		}
-
-		$this->db->sql_return_on_error(false);
-
-		return $result;
-	}
-
-	/**
-	* Get the list of queries run
-	*
-	* @return array
-	*/
-	public function get_queries()
-	{
-		return $this->queries;
-	}
-}
diff --git a/phpBB/includes/db/migration/tool/config.php b/phpBB/includes/db/migration/tool/config.php
deleted file mode 100644
index 0b626bf455..0000000000
--- a/phpBB/includes/db/migration/tool/config.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/**
-* Migration config tool
-*
-* @package db
-*/
-class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interface
-{
-	/** @var phpbb_config */
-	protected $config;
-
-	/**
-	* Constructor
-	*
-	* @param phpbb_config $config
-	*/
-	public function __construct(phpbb_config $config)
-	{
-		$this->config = $config;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function get_name()
-	{
-		return 'config';
-	}
-
-	/**
-	* Add a config setting.
-	*
-	* @param string $config_name The name of the config setting
-	* 	you would like to add
-	* @param mixed $config_value The value of the config setting
-	* @param bool $is_dynamic True if it is dynamic (changes very often)
-	* 	and should not be stored in the cache, false if not.
-	* @return null
-	*/
-	public function add($config_name, $config_value, $is_dynamic = false)
-	{
-		if (isset($this->config[$config_name]))
-		{
-			return;
-		}
-
-		$this->config->set($config_name, $config_value, !$is_dynamic);
-	}
-
-	/**
-	* Update an existing config setting.
-	*
-	* @param string $config_name The name of the config setting you would
-	* 	like to update
-	* @param mixed $config_value The value of the config setting
-	* @return null
-	*/
-	public function update($config_name, $config_value)
-	{
-		if (!isset($this->config[$config_name]))
-		{
-			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
-		}
-
-		$this->config->set($config_name, $config_value);
-	}
-
-	/**
-	* Update a config setting if the first argument equal to the
-	* current config value
-	*
-	* @param string $compare If equal to the current config value, will be
-	* 	updated to the new config value, otherwise not
-	* @param string $config_name The name of the config setting you would
-	* 	like to update
-	* @param mixed $config_value The value of the config setting
-	* @return null
-	*/
-	public function update_if_equals($compare, $config_name, $config_value)
-	{
-		if (!isset($this->config[$config_name]))
-		{
-			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
-		}
-
-		$this->config->set_atomic($config_name, $compare, $config_value);
-	}
-
-	/**
-	* Remove an existing config setting.
-	*
-	* @param string $config_name The name of the config setting you would
-	* 	like to remove
-	* @return null
-	*/
-	public function remove($config_name)
-	{
-		if (!isset($this->config[$config_name]))
-		{
-			return;
-		}
-
-		$this->config->delete($config_name);
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function reverse()
-	{
-		$arguments = func_get_args();
-		$original_call = array_shift($arguments);
-
-		$call = false;
-		switch ($original_call)
-		{
-			case 'add':
-				$call = 'remove';
-			break;
-
-			case 'remove':
-				$call = 'add';
-			break;
-
-			case 'update_if_equals':
-				$call = 'update_if_equals';
-
-				// Set to the original value if the current value is what we compared to originally
-				$arguments = array(
-					$arguments[2],
-					$arguments[1],
-					$arguments[0],
-				);
-			break;
-		}
-
-		if ($call)
-		{
-			return call_user_func_array(array(&$this, $call), $arguments);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migration/tool/interface.php b/phpBB/includes/db/migration/tool/interface.php
deleted file mode 100644
index ced53b2023..0000000000
--- a/phpBB/includes/db/migration/tool/interface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/**
-* Migration tool interface
-*
-* @package db
-*/
-interface phpbb_db_migration_tool_interface
-{
-	/**
-	* Retrieve a short name used for commands in migrations.
-	*
-	* @return string short name
-	*/
-	public function get_name();
-
-	/**
-	* Reverse an original install action
-	*
-	* First argument is the original call to the class (e.g. add, remove)
-	* After the first argument, send the original arguments to the function in the original call
-	*
-	* @return null
-	*/
-	public function reverse();
-}
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
deleted file mode 100644
index ac4d2c9bd7..0000000000
--- a/phpBB/includes/db/migration/tool/module.php
+++ /dev/null
@@ -1,501 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/**
-* Migration module management tool
-*
-* @package db
-*/
-class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interface
-{
-	/** @var phpbb_cache_service */
-	protected $cache;
-
-	/** @var dbal */
-	protected $db;
-
-	/** @var phpbb_user */
-	protected $user;
-
-	/** @var string */
-	protected $phpbb_root_path;
-
-	/** @var string */
-	protected $php_ext;
-
-	/** @var string */
-	protected $modules_table;
-
-	/**
-	* Constructor
-	*
-	* @param phpbb_db_driver $db
-	* @param mixed $cache
-	* @param phpbb_user $user
-	* @param string $phpbb_root_path
-	* @param string $php_ext
-	* @param string $modules_table
-	*/
-	public function __construct(phpbb_db_driver $db, phpbb_cache_service $cache, phpbb_user $user, $phpbb_root_path, $php_ext, $modules_table)
-	{
-		$this->db = $db;
-		$this->cache = $cache;
-		$this->user = $user;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->modules_table = $modules_table;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function get_name()
-	{
-		return 'module';
-	}
-
-	/**
-	* Module Exists
-	*
-	* Check if a module exists
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string|bool $parent The parent module_id|module_langname (0 for no parent).
-	*		Use false to ignore the parent check and check class wide.
-	* @param int|string $module The module_id|module_langname you would like to
-	* 		check for to see if it exists
-	* @return bool true/false if module exists
-	*/
-	public function exists($class, $parent, $module)
-	{
-		// the main root directory should return true
-		if (!$module)
-		{
-			return true;
-		}
-
-		$parent_sql = '';
-		if ($parent !== false)
-		{
-			// Allows '' to be sent as 0
-			$parent = $parent ?: 0;
-
-			if (!is_numeric($parent))
-			{
-				$sql = 'SELECT module_id
-					FROM ' . $this->modules_table . "
-					WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-						AND module_class = '" . $this->db->sql_escape($class) . "'";
-				$result = $this->db->sql_query($sql);
-				$module_id = $this->db->sql_fetchfield('module_id');
-				$this->db->sql_freeresult($result);
-
-				if (!$module_id)
-				{
-					return false;
-				}
-
-				$parent_sql = 'AND parent_id = ' . (int) $module_id;
-			}
-			else
-			{
-				$parent_sql = 'AND parent_id = ' . (int) $parent;
-			}
-		}
-
-		$sql = 'SELECT module_id
-			FROM ' . $this->modules_table . "
-			WHERE module_class = '" . $this->db->sql_escape($class) . "'
-				$parent_sql
-				AND " . ((is_numeric($module)) ? 'module_id = ' . (int) $module : "module_langname = '" . $this->db->sql_escape($module) . "'");
-		$result = $this->db->sql_query($sql);
-		$module_id = $this->db->sql_fetchfield('module_id');
-		$this->db->sql_freeresult($result);
-
-		if ($module_id)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Module Add
-	*
-	* Add a new module
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string $parent The parent module_id|module_langname (0 for no parent)
-	* @param array $data an array of the data on the new module.
-	* 	This can be setup in two different ways.
-	*	1. The "manual" way.  For inserting a category or one at a time.
-	*		It will be merged with the base array shown a bit below,
-	*			but at the least requires 'module_langname' to be sent, and,
-	*			if you want to create a module (instead of just a category) you must
-	*			send module_basename and module_mode.
-	*		array(
-	*			'module_enabled'	=> 1,
-	*			'module_display'	=> 1,
-	*	   		'module_basename'	=> '',
-	*			'module_class'		=> $class,
-	*	   		'parent_id'			=> (int) $parent,
-	*			'module_langname'	=> '',
-	*	   		'module_mode'		=> '',
-	*	   		'module_auth'		=> '',
-	*		)
-	*	2. The "automatic" way.  For inserting multiple at a time based on the
-	*			specs in the info file for the module(s).  For this to work the
-	*			modules must be correctly setup in the info file.
-	*		An example follows (this would insert the settings, log, and flag
-	*			modes from the includes/acp/info/acp_asacp.php file):
-	* 		array(
-	* 			'module_basename'	=> 'asacp',
-	* 			'modes'				=> array('settings', 'log', 'flag'),
-	* 		)
-	* 		Optionally you may not send 'modes' and it will insert all of the
-	* 			modules in that info file.
-	* @param string|bool $include_path If you would like to use a custom include
-	* 	path, specify that here
-	* @return null
-	*/
-	public function add($class, $parent = 0, $data = array(), $include_path = false)
-	{
-		// Allows '' to be sent as 0
-		$parent = $parent ?: 0;
-
-		// allow sending the name as a string in $data to create a category
-		if (!is_array($data))
-		{
-			$data = array('module_langname' => $data);
-		}
-
-		if (!isset($data['module_langname']))
-		{
-			// The "automatic" way
-			$basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
-			$basename = str_replace(array('/', '\\'), '', $basename);
-			$class = str_replace(array('/', '\\'), '', $class);
-
-			$module = $this->get_module_info($class, $basename);
-
-			$result = '';
-			foreach ($module['modes'] as $mode => $module_info)
-			{
-				if (!isset($data['modes']) || in_array($mode, $data['modes']))
-				{
-					$new_module = array(
-						'module_basename'	=> $basename,
-						'module_langname'	=> $module_info['title'],
-						'module_mode'		=> $mode,
-						'module_auth'		=> $module_info['auth'],
-						'module_display'	=> (isset($module_info['display'])) ? $module_info['display'] : true,
-						'before'			=> (isset($module_info['before'])) ? $module_info['before'] : false,
-						'after'				=> (isset($module_info['after'])) ? $module_info['after'] : false,
-					);
-
-					// Run the "manual" way with the data we've collected.
-					$this->add($class, $parent, $new_module);
-				}
-			}
-
-			return;
-		}
-
-		// The "manual" way
-		if (!is_numeric($parent))
-		{
-			$sql = 'SELECT module_id
-				FROM ' . $this->modules_table . "
-				WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-					AND module_class = '" . $this->db->sql_escape($class) . "'";
-			$result = $this->db->sql_query($sql);
-			$module_id = $this->db->sql_fetchfield('module_id');
-			$this->db->sql_freeresult($result);
-
-			if (!$module_id)
-			{
-				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $parent);
-			}
-
-			$parent = $data['parent_id'] = $module_id;
-		}
-		else if (!$this->exists($class, false, $parent))
-		{
-			throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $parent);
-		}
-
-		if ($this->exists($class, $parent, $data['module_langname']))
-		{
-			return;
-		}
-
-		if (!class_exists('acp_modules'))
-		{
-			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
-			$this->user->add_lang('acp/modules');
-		}
-		$acp_modules = new acp_modules();
-
-		$module_data = array(
-			'module_enabled'	=> (isset($data['module_enabled'])) ? $data['module_enabled'] : 1,
-			'module_display'	=> (isset($data['module_display'])) ? $data['module_display'] : 1,
-			'module_basename'	=> (isset($data['module_basename'])) ? $data['module_basename'] : '',
-			'module_class'		=> $class,
-			'parent_id'			=> (int) $parent,
-			'module_langname'	=> (isset($data['module_langname'])) ? $data['module_langname'] : '',
-			'module_mode'		=> (isset($data['module_mode'])) ? $data['module_mode'] : '',
-			'module_auth'		=> (isset($data['module_auth'])) ? $data['module_auth'] : '',
-		);
-		$result = $acp_modules->update_module_data($module_data, true);
-
-		// update_module_data can either return a string or an empty array...
-		if (is_string($result))
-		{
-			// Error
-			throw new phpbb_db_migration_exception('MODULE_ERROR', $result);
-		}
-		else
-		{
-			// Success
-			$module_log_name = ((isset($this->user->lang[$data['module_langname']])) ? $this->user->lang[$data['module_langname']] : $data['module_langname']);
-			add_log('admin', 'LOG_MODULE_ADD', $module_log_name);
-
-			// Move the module if requested above/below an existing one
-			if (isset($data['before']) && $data['before'])
-			{
-				$sql = 'SELECT left_id
-					FROM ' . $this->modules_table . "
-					WHERE module_class = '" . $this->db->sql_escape($class) . "'
-						AND parent_id = " . (int) $parent . "
-						AND module_langname = '" . $this->db->sql_escape($data['before']) . "'";
-				$this->db->sql_query($sql);
-				$to_left = (int) $this->db->sql_fetchfield('left_id');
-
-				$sql = 'UPDATE ' . $this->modules_table . "
-					SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE module_class = '" . $this->db->sql_escape($class) . "'
-						AND left_id >= $to_left
-						AND left_id < {$module_data['left_id']}";
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . $this->modules_table . "
-					SET left_id = $to_left, right_id = " . ($to_left + 1) . "
-					WHERE module_class = '" . $this->db->sql_escape($class) . "'
-						AND module_id = {$module_data['module_id']}";
-				$this->db->sql_query($sql);
-			}
-			else if (isset($data['after']) && $data['after'])
-			{
-				$sql = 'SELECT right_id
-					FROM ' . $this->modules_table . "
-					WHERE module_class = '" . $this->db->sql_escape($class) . "'
-						AND parent_id = " . (int) $parent . "
-						AND module_langname = '" . $this->db->sql_escape($data['after']) . "'";
-				$this->db->sql_query($sql);
-				$to_right = (int) $this->db->sql_fetchfield('right_id');
-
-				$sql = 'UPDATE ' . $this->modules_table . "
-					SET left_id = left_id + 2, right_id = right_id + 2
-					WHERE module_class = '" . $this->db->sql_escape($class) . "'
-						AND left_id >= $to_right
-						AND left_id < {$module_data['left_id']}";
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . $this->modules_table . '
-					SET left_id = ' . ($to_right + 1) . ', right_id = ' . ($to_right + 2) . "
-					WHERE module_class = '" . $this->db->sql_escape($class) . "'
-						AND module_id = {$module_data['module_id']}";
-				$this->db->sql_query($sql);
-			}
-		}
-
-		// Clear the Modules Cache
-		$this->cache->destroy("_modules_$class");
-	}
-
-	/**
-	* Module Remove
-	*
-	* Remove a module
-	*
-	* @param string $class The module class(acp|mcp|ucp)
-	* @param int|string|bool $parent The parent module_id|module_langname(0 for no parent).
-	* 	Use false to ignore the parent check and check class wide.
-	* @param int|string $module The module id|module_langname
-	* @param string|bool $include_path If you would like to use a custom include path,
-	* 	specify that here
-	* @return null
-	*/
-	public function remove($class, $parent = 0, $module = '', $include_path = false)
-	{
-		// Imitation of module_add's "automatic" and "manual" method so the uninstaller works from the same set of instructions for umil_auto
-		if (is_array($module))
-		{
-			if (isset($module['module_langname']))
-			{
-				// Manual Method
-				return $this->remove($class, $parent, $module['module_langname'], $include_path);
-			}
-
-			// Failed.
-			if (!isset($module['module_basename']))
-			{
-				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST');
-			}
-
-			// Automatic method
-			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
-			$class = str_replace(array('/', '\\'), '', $class);
-
-			$module_info = $this->get_module_info($class, $basename);
-
-			foreach ($module_info['modes'] as $mode => $info)
-			{
-				if (!isset($module['modes']) || in_array($mode, $module['modes']))
-				{
-					$this->remove($class, $parent, $info['title']);
-				}
-			}
-		}
-		else
-		{
-			if (!$this->exists($class, $parent, $module))
-			{
-				return;
-			}
-
-			$parent_sql = '';
-			if ($parent !== false)
-			{
-				// Allows '' to be sent as 0
-				$parent = ($parent) ?: 0;
-
-				if (!is_numeric($parent))
-				{
-					$sql = 'SELECT module_id
-						FROM ' . $this->modules_table . "
-						WHERE module_langname = '" . $this->db->sql_escape($parent) . "'
-							AND module_class = '" . $this->db->sql_escape($class) . "'";
-					$result = $this->db->sql_query($sql);
-					$module_id = $this->db->sql_fetchfield('module_id');
-					$this->db->sql_freeresult($result);
-
-					// we know it exists from the module_exists check
-					$parent_sql = 'AND parent_id = ' . (int) $module_id;
-				}
-				else
-				{
-					$parent_sql = 'AND parent_id = ' . (int) $parent;
-				}
-			}
-
-			$module_ids = array();
-			if (!is_numeric($module))
-			{
-				$sql = 'SELECT module_id
-					FROM ' . $this->modules_table . "
-					WHERE module_langname = '" . $this->db->sql_escape($module) . "'
-						AND module_class = '" . $this->db->sql_escape($class) . "'
-						$parent_sql";
-				$result = $this->db->sql_query($sql);
-				while ($module_id = $this->db->sql_fetchfield('module_id'))
-				{
-					$module_ids[] = (int) $module_id;
-				}
-				$this->db->sql_freeresult($result);
-
-				$module_name = $module;
-			}
-			else
-			{
-				$module = (int) $module;
-				$sql = 'SELECT module_langname
-					FROM ' . $this->modules_table . "
-					WHERE module_id = $module
-						AND module_class = '" . $this->db->sql_escape($class) . "'
-						$parent_sql";
-				$result = $this->db->sql_query($sql);
-				$module_name = $this->db->sql_fetchfield('module_id');
-				$this->db->sql_freeresult($result);
-
-				$module_ids[] = $module;
-			}
-
-			if (!class_exists('acp_modules'))
-			{
-				include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
-				$this->user->add_lang('acp/modules');
-			}
-			$acp_modules = new acp_modules();
-			$acp_modules->module_class = $class;
-
-			foreach ($module_ids as $module_id)
-			{
-				$result = $acp_modules->delete_module($module_id);
-				if (!empty($result))
-				{
-					return;
-				}
-			}
-
-			$this->cache->destroy("_modules_$class");
-		}
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function reverse()
-	{
-		$arguments = func_get_args();
-		$original_call = array_shift($arguments);
-
-		$call = false;
-		switch ($original_call)
-		{
-			case 'add':
-				$call = 'remove';
-			break;
-
-			case 'remove':
-				$call = 'add';
-			break;
-		}
-
-		if ($call)
-		{
-			return call_user_func_array(array(&$this, $call), $arguments);
-		}
-	}
-
-	/**
-	* Wrapper for acp_modules::get_module_infos()
-	*
-	* @param string $class Module Class
-	* @param string $basename Module Basename
-	* @return array Module Information
-	*/
-	protected function get_module_info($class, $basename)
-	{
-		if (!class_exists('acp_modules'))
-		{
-			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
-		}
-		$acp_modules = new acp_modules();
-		$module = $acp_modules->get_module_infos($basename, $class, true);
-
-		if (empty($module))
-		{
-			throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename);
-		}
-
-		return array_pop($module);
-	}
-}
diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php
deleted file mode 100644
index 2f09c0ac72..0000000000
--- a/phpBB/includes/db/migration/tool/permission.php
+++ /dev/null
@@ -1,622 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/**
-* Migration permission management tool
-*
-* @package db
-*/
-class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_interface
-{
-	/** @var phpbb_auth */
-	protected $auth;
-
-	/** @var phpbb_cache_service */
-	protected $cache;
-
-	/** @var dbal */
-	protected $db;
-
-	/** @var string */
-	protected $phpbb_root_path;
-
-	/** @var string */
-	protected $php_ext;
-
-	/**
-	* Constructor
-	*
-	* @param phpbb_db_driver $db
-	* @param mixed $cache
-	* @param phpbb_auth $auth
-	* @param string $phpbb_root_path
-	* @param string $php_ext
-	*/
-	public function __construct(phpbb_db_driver $db, phpbb_cache_service $cache, phpbb_auth $auth, $phpbb_root_path, $php_ext)
-	{
-		$this->db = $db;
-		$this->cache = $cache;
-		$this->auth = $auth;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function get_name()
-	{
-		return 'permission';
-	}
-
-	/**
-	* Permission Exists
-	*
-	* Check if a permission (auth) setting exists
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting,
-	* 	False for a local permission setting
-	* @return bool true if it exists, false if not
-	*/
-	public function exists($auth_option, $global = true)
-	{
-		if ($global)
-		{
-			$type_sql = ' AND is_global = 1';
-		}
-		else
-		{
-			$type_sql = ' AND is_local = 1';
-		}
-
-		$sql = 'SELECT auth_option_id
-			FROM ' . ACL_OPTIONS_TABLE . "
-			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'"
-				. $type_sql;
-		$result = $this->db->sql_query($sql);
-
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Permission Add
-	*
-	* Add a permission (auth) option
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting,
-	* 	False for a local permission setting
-	* @return null
-	*/
-	public function add($auth_option, $global = true, $copy_from = false)
-	{
-		if ($this->exists($auth_option, $global))
-		{
-			return;
-		}
-
-		// We've added permissions, so set to true to notify the user.
-		$this->permissions_added = true;
-
-		if (!class_exists('auth_admin'))
-		{
-			include($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
-		}
-		$auth_admin = new auth_admin();
-
-		// We have to add a check to see if the !$global (if global, local, and if local, global) permission already exists.  If it does, acl_add_option currently has a bug which would break the ACL system, so we are having a work-around here.
-		if ($this->exists($auth_option, !$global))
-		{
-			$sql_ary = array(
-				'is_global'	=> 1,
-				'is_local'	=> 1,
-			);
-			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
-				WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'";
-			$this->db->sql_query($sql);
-		}
-		else
-		{
-			if ($global)
-			{
-				$auth_admin->acl_add_option(array('global' => array($auth_option)));
-			}
-			else
-			{
-				$auth_admin->acl_add_option(array('local' => array($auth_option)));
-			}
-		}
-
-		// The permission has been added, now we can copy it if needed
-		if ($copy_from && isset($auth_admin->acl_options['id'][$copy_from]))
-		{
-			$old_id = $auth_admin->acl_options['id'][$copy_from];
-			$new_id = $auth_admin->acl_options['id'][$auth_option];
-
-			$tables = array(ACL_GROUPS_TABLE, ACL_ROLES_DATA_TABLE, ACL_USERS_TABLE);
-
-			foreach ($tables as $table)
-			{
-				$sql = 'SELECT *
-					FROM ' . $table . '
-					WHERE auth_option_id = ' . $old_id;
-				$result = $this->db->sql_query($sql);
-
-				$sql_ary = array();
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$row['auth_option_id'] = $new_id;
-					$sql_ary[] = $row;
-				}
-				$this->db->sql_freeresult($result);
-
-				if (!empty($sql_ary))
-				{
-					$this->db->sql_multi_insert($table, $sql_ary);
-				}
-			}
-
-			$auth_admin->acl_clear_prefetch();
-		}
-	}
-
-	/**
-	* Permission Remove
-	*
-	* Remove a permission (auth) option
-	*
-	* @param string $auth_option The name of the permission (auth) option
-	* @param bool $global True for checking a global permission setting,
-	* 	False for a local permission setting
-	* @return null
-	*/
-	public function remove($auth_option, $global = true)
-	{
-		if (!$this->exists($auth_option, $global))
-		{
-			return;
-		}
-
-		if ($global)
-		{
-			$type_sql = ' AND is_global = 1';
-		}
-		else
-		{
-			$type_sql = ' AND is_local = 1';
-		}
-		$sql = 'SELECT auth_option_id, is_global, is_local
-			FROM ' . ACL_OPTIONS_TABLE . "
-			WHERE auth_option = '" . $this->db->sql_escape($auth_option) . "'" .
-				$type_sql;
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		$id = (int) $row['auth_option_id'];
-
-		// If it is a local and global permission, do not remove the row! :P
-		if ($row['is_global'] && $row['is_local'])
-		{
-			$sql = 'UPDATE ' . ACL_OPTIONS_TABLE . '
-				SET ' . (($global) ? 'is_global = 0' : 'is_local = 0') . '
-				WHERE auth_option_id = ' . $id;
-			$this->db->sql_query($sql);
-		}
-		else
-		{
-			// Delete time
-			$tables = array(ACL_GROUPS_TABLE, ACL_ROLES_DATA_TABLE, ACL_USERS_TABLE, ACL_OPTIONS_TABLE);
-			foreach ($tables as $table)
-			{
-				$this->db->sql_query('DELETE FROM ' . $table . '
-					WHERE auth_option_id = ' . $id);
-			}
-		}
-
-		// Purge the auth cache
-		$this->cache->destroy('_acl_options');
-		$this->auth->acl_clear_prefetch();
-	}
-
-	/**
-	* Add a new permission role
-	*
-	* @param string $role_name The new role name
-	* @param sting $role_type The type (u_, m_, a_)
-	* @return null
-	*/
-	public function role_add($role_name, $role_type, $role_description = '')
-	{
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = '" . $this->db->sql_escape($role_name) . "'";
-		$this->db->sql_query($sql);
-		$role_id = (int) $this->db->sql_fetchfield('role_id');
-
-		if ($role_id)
-		{
-			return;
-		}
-
-		$sql = 'SELECT MAX(role_order) AS max_role_order
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_type = '" . $this->db->sql_escape($role_type) . "'";
-		$this->db->sql_query($sql);
-		$role_order = (int) $this->db->sql_fetchfield('max_role_order');
-		$role_order = (!$role_order) ? 1 : $role_order + 1;
-
-		$sql_ary = array(
-			'role_name'			=> $role_name,
-			'role_description'	=> $role_description,
-			'role_type'			=> $role_type,
-			'role_order'		=> $role_order,
-		);
-
-		$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Update the name on a permission role
-	*
-	* @param string $old_role_name The old role name
-	* @param string $new_role_name The new role name
-	* @return null
-	*/
-	public function role_update($old_role_name, $new_role_name)
-	{
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = '" . $this->db->sql_escape($old_role_name) . "'";
-		$this->db->sql_query($sql);
-		$role_id = (int) $this->db->sql_fetchfield('role_id');
-
-		if (!$role_id)
-		{
-			throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $old_role_name);
-		}
-
-		$sql = 'UPDATE ' . ACL_ROLES_TABLE . "
-			SET role_name = '" . $this->db->sql_escape($new_role_name) . "'
-			WHERE role_name = '" . $this->db->sql_escape($old_role_name) . "'";
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Remove a permission role
-	*
-	* @param string $role_name The role name to remove
-	* @return null
-	*/
-	public function role_remove($role_name)
-	{
-		$sql = 'SELECT role_id
-			FROM ' . ACL_ROLES_TABLE . "
-			WHERE role_name = '" . $this->db->sql_escape($role_name) . "'";
-		$this->db->sql_query($sql);
-		$role_id = (int) $this->db->sql_fetchfield('role_id');
-
-		if (!$role_id)
-		{
-			return;
-		}
-
-		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-			WHERE role_id = ' . $role_id;
-		$this->db->sql_query($sql);
-
-		$sql = 'DELETE FROM ' . ACL_ROLES_TABLE . '
-			WHERE role_id = ' . $role_id;
-		$this->db->sql_query($sql);
-
-		$this->auth->acl_clear_prefetch();
-	}
-
-	/**
-	* Permission Set
-	*
-	* Allows you to set permissions for a certain group/role
-	*
-	* @param string $name The name of the role/group
-	* @param string|array $auth_option The auth_option or array of
-	* 	auth_options you would like to set
-	* @param string $type The type (role|group)
-	* @param bool $has_permission True if you want to give them permission,
-	* 	false if you want to deny them permission
-	* @return null
-	*/
-	public function permission_set($name, $auth_option, $type = 'role', $has_permission = true)
-	{
-		if (!is_array($auth_option))
-		{
-			$auth_option = array($auth_option);
-		}
-
-		$new_auth = array();
-		$sql = 'SELECT auth_option_id
-			FROM ' . ACL_OPTIONS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$new_auth[] = (int) $row['auth_option_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($new_auth))
-		{
-			return;
-		}
-
-		$current_auth = array();
-
-		$type = (string) $type; // Prevent PHP bug.
-
-		switch ($type)
-		{
-			case 'role':
-				$sql = 'SELECT role_id
-					FROM ' . ACL_ROLES_TABLE . "
-					WHERE role_name = '" . $this->db->sql_escape($name) . "'";
-				$this->db->sql_query($sql);
-				$role_id = (int) $this->db->sql_fetchfield('role_id');
-
-				if (!$role_id)
-				{
-					throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name);
-				}
-
-				$sql = 'SELECT auth_option_id, auth_setting
-					FROM ' . ACL_ROLES_DATA_TABLE . '
-					WHERE role_id = ' . $role_id;
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
-				}
-				$this->db->sql_freeresult($result);
-			break;
-
-			case 'group':
-				$sql = 'SELECT group_id
-					FROM ' . GROUPS_TABLE . "
-					WHERE group_name = '" . $this->db->sql_escape($name) . "'";
-				$this->db->sql_query($sql);
-				$group_id = (int) $this->db->sql_fetchfield('group_id');
-
-				if (!$group_id)
-				{
-					throw new phpbb_db_migration_exception('GROUP_NOT_EXIST', $name);
-				}
-
-				// If the group has a role set for them we will add the requested permissions to that role.
-				$sql = 'SELECT auth_role_id
-					FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id . '
-						AND auth_role_id <> 0
-						AND forum_id = 0';
-				$this->db->sql_query($sql);
-				$role_id = (int) $this->db->sql_fetchfield('auth_role_id');
-				if ($role_id)
-				{
-					$sql = 'SELECT role_name
-						FROM ' . ACL_ROLES_TABLE . '
-						WHERE role_id = ' . $role_id;
-					$this->db->sql_query($sql);
-					$role_name = $this->db->sql_fetchfield('role_name');
-
-					return $this->permission_set($role_name, $auth_option, 'role', $has_permission);
-				}
-
-				$sql = 'SELECT auth_option_id, auth_setting
-					FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id;
-				$result = $this->db->sql_query($sql);
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$current_auth[$row['auth_option_id']] = $row['auth_setting'];
-				}
-				$this->db->sql_freeresult($result);
-			break;
-		}
-
-		$sql_ary = array();
-		switch ($type)
-		{
-			case 'role':
-				foreach ($new_auth as $auth_option_id)
-				{
-					if (!isset($current_auth[$auth_option_id]))
-					{
-						$sql_ary[] = array(
-							'role_id'			=> $role_id,
-							'auth_option_id'	=> $auth_option_id,
-							'auth_setting'		=> $has_permission,
-						);
-					}
-				}
-
-				$this->db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary);
-			break;
-
-			case 'group':
-				foreach ($new_auth as $auth_option_id)
-				{
-					if (!isset($current_auth[$auth_option_id]))
-					{
-						$sql_ary[] = array(
-							'group_id'			=> $group_id,
-							'auth_option_id'	=> $auth_option_id,
-							'auth_setting'		=> $has_permission,
-						);
-					}
-				}
-
-				$this->db->sql_multi_insert(ACL_GROUPS_TABLE, $sql_ary);
-			break;
-		}
-
-		$this->auth->acl_clear_prefetch();
-	}
-
-	/**
-	* Permission Unset
-	*
-	* Allows you to unset (remove) permissions for a certain group/role
-	*
-	* @param string $name The name of the role/group
-	* @param string|array $auth_option The auth_option or array of
-	* 	auth_options you would like to set
-	* @param string $type The type (role|group)
-	* @return null
-	*/
-	public function permission_unset($name, $auth_option, $type = 'role')
-	{
-		if (!is_array($auth_option))
-		{
-			$auth_option = array($auth_option);
-		}
-
-		$to_remove = array();
-		$sql = 'SELECT auth_option_id
-			FROM ' . ACL_OPTIONS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('auth_option', $auth_option);
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$to_remove[] = (int) $row['auth_option_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($to_remove))
-		{
-			return;
-		}
-
-		$type = (string) $type; // Prevent PHP bug.
-
-		switch ($type)
-		{
-			case 'role':
-				$sql = 'SELECT role_id
-					FROM ' . ACL_ROLES_TABLE . "
-					WHERE role_name = '" . $this->db->sql_escape($name) . "'";
-				$this->db->sql_query($sql);
-				$role_id = (int) $this->db->sql_fetchfield('role_id');
-
-				if (!$role_id)
-				{
-					throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $name);
-				}
-
-				$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
-				$this->db->sql_query($sql);
-			break;
-
-			case 'group':
-				$sql = 'SELECT group_id
-					FROM ' . GROUPS_TABLE . "
-					WHERE group_name = '" . $this->db->sql_escape($name) . "'";
-				$this->db->sql_query($sql);
-				$group_id = (int) $this->db->sql_fetchfield('group_id');
-
-				if (!$group_id)
-				{
-					throw new phpbb_db_migration_exception('GROUP_NOT_EXIST', $name);
-				}
-
-				// If the group has a role set for them we will remove the requested permissions from that role.
-				$sql = 'SELECT auth_role_id
-					FROM ' . ACL_GROUPS_TABLE . '
-					WHERE group_id = ' . $group_id . '
-						AND auth_role_id <> 0';
-				$this->db->sql_query($sql);
-				$role_id = (int) $this->db->sql_fetchfield('auth_role_id');
-				if ($role_id)
-				{
-					$sql = 'SELECT role_name
-						FROM ' . ACL_ROLES_TABLE . '
-						WHERE role_id = ' . $role_id;
-					$this->db->sql_query($sql);
-					$role_name = $this->db->sql_fetchfield('role_name');
-
-					return $this->permission_unset($role_name, $auth_option, 'role');
-				}
-
-				$sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . '
-					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
-				$this->db->sql_query($sql);
-			break;
-		}
-
-		$this->auth->acl_clear_prefetch();
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function reverse()
-	{
-		$arguments = func_get_args();
-		$original_call = array_shift($arguments);
-
-		$call = false;
-		switch ($original_call)
-		{
-			case 'add':
-				$call = 'remove';
-			break;
-
-			case 'remove':
-				$call = 'add';
-			break;
-
-			case 'permission_set':
-				$call = 'permission_unset';
-			break;
-
-			case 'permission_unset':
-				$call = 'permission_set';
-			break;
-
-			case 'role_add':
-				$call = 'role_remove';
-			break;
-
-			case 'role_remove':
-				$call = 'role_add';
-			break;
-
-			case 'role_update':
-				// Set to the original value if the current value is what we compared to originally
-				$arguments = array(
-					$arguments[1],
-					$arguments[0],
-				);
-			break;
-		}
-
-		if ($call)
-		{
-			return call_user_func_array(array(&$this, $call), $arguments);
-		}
-	}
-}
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
deleted file mode 100644
index ca3ffc8043..0000000000
--- a/phpBB/includes/db/migrator.php
+++ /dev/null
@@ -1,746 +0,0 @@
-<?php
-/**
-*
-* @package db
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The migrator is responsible for applying new migrations in the correct order.
-*
-* @package db
-*/
-class phpbb_db_migrator
-{
-	/** @var phpbb_config */
-	protected $config;
-
-	/** @var phpbb_db_driver */
-	protected $db;
-
-	/** @var phpbb_db_tools */
-	protected $db_tools;
-
-	/** @var string */
-	protected $table_prefix;
-
-	/** @var string */
-	protected $phpbb_root_path;
-
-	/** @var string */
-	protected $php_ext;
-
-	/** @var string */
-	protected $migrations_table;
-
-	/**
-	* State of all migrations
-	*
-	* (SELECT * FROM migrations table)
-	*
-	* @var array
-	*/
-	protected $migration_state = array();
-
-	/**
-	* Array of all migrations available to be run
-	*
-	* @var array
-	*/
-	protected $migrations = array();
-
-	/**
-	* 'name,' 'class,' and 'state' of the last migration run
-	*
-	* 'effectively_installed' set and set to true if the migration was effectively_installed
-	*
-	* @var array
-	*/
-	public $last_run_migration = false;
-
-	/**
-	* Constructor of the database migrator
-	*/
-	public function __construct(phpbb_config $config, phpbb_db_driver $db, phpbb_db_tools $db_tools, $migrations_table, $phpbb_root_path, $php_ext, $table_prefix, $tools)
-	{
-		$this->config = $config;
-		$this->db = $db;
-		$this->db_tools = $db_tools;
-
-		$this->migrations_table = $migrations_table;
-
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-
-		$this->table_prefix = $table_prefix;
-
-		foreach ($tools as $tool)
-		{
-			$this->tools[$tool->get_name()] = $tool;
-		}
-
-		$this->load_migration_state();
-	}
-
-	/**
-	* Loads all migrations and their application state from the database.
-	*
-	* @return null
-	*/
-	public function load_migration_state()
-	{
-		$this->migration_state = array();
-
-		// prevent errors in case the table does not exist yet
-		$this->db->sql_return_on_error(true);
-
-		$sql = "SELECT *
-			FROM " . $this->migrations_table;
-		$result = $this->db->sql_query($sql);
-
-		if (!$this->db->sql_error_triggered)
-		{
-			while ($migration = $this->db->sql_fetchrow($result))
-			{
-				$this->migration_state[$migration['migration_name']] = $migration;
-
-				$this->migration_state[$migration['migration_name']]['migration_depends_on'] = unserialize($migration['migration_depends_on']);
-			}
-		}
-
-		$this->db->sql_freeresult($result);
-
-		$this->db->sql_return_on_error(false);
-	}
-
-	/**
-	* Sets the list of available migration class names to the given array.
-	*
-	* @param array $class_names An array of migration class names
-	* @return null
-	*/
-	public function set_migrations($class_names)
-	{
-		$this->migrations = $class_names;
-	}
-
-	/**
-	* Runs a single update step from the next migration to be applied.
-	*
-	* The update step can either be a schema or a (partial) data update. To
-	* check if update() needs to be called again use the finished() method.
-	*
-	* @return null
-	*/
-	public function update()
-	{
-		foreach ($this->migrations as $name)
-		{
-			if (!isset($this->migration_state[$name]) ||
-				!$this->migration_state[$name]['migration_schema_done'] ||
-				!$this->migration_state[$name]['migration_data_done'])
-			{
-				if (!$this->try_apply($name))
-				{
-					continue;
-				}
-				else
-				{
-					return;
-				}
-			}
-		}
-	}
-
-	/**
-	* Attempts to apply a step of the given migration or one of its dependencies
-	*
-	* @param	string	The class name of the migration
-	* @return	bool	Whether any update step was successfully run
-	*/
-	protected function try_apply($name)
-	{
-		if (!class_exists($name))
-		{
-			return false;
-		}
-
-		$migration = $this->get_migration($name);
-
-		$state = (isset($this->migration_state[$name])) ?
-			$this->migration_state[$name] :
-			array(
-				'migration_depends_on'	=> $migration->depends_on(),
-				'migration_schema_done' => false,
-				'migration_data_done'	=> false,
-				'migration_data_state'	=> '',
-				'migration_start_time'	=> 0,
-				'migration_end_time'	=> 0,
-			);
-
-		foreach ($state['migration_depends_on'] as $depend)
-		{
-			if (!isset($this->migration_state[$depend]) ||
-				!$this->migration_state[$depend]['migration_schema_done'] ||
-				!$this->migration_state[$depend]['migration_data_done'])
-			{
-				return $this->try_apply($depend);
-			}
-		}
-
-		$this->last_run_migration = array(
-			'name'	=> $name,
-			'class'	=> $migration,
-			'state'	=> $state,
-		);
-
-		if (!isset($this->migration_state[$name]))
-		{
-			if ($migration->effectively_installed())
-			{
-				$state = array(
-					'migration_depends_on'	=> $migration->depends_on(),
-					'migration_schema_done' => true,
-					'migration_data_done'	=> true,
-					'migration_data_state'	=> '',
-					'migration_start_time'	=> 0,
-					'migration_end_time'	=> 0,
-				);
-
-				$this->last_run_migration['effectively_installed'] = true;
-			}
-			else
-			{
-				$state['migration_start_time'] = time();
-			}
-		}
-
-		if (!$state['migration_schema_done'])
-		{
-			$this->apply_schema_changes($migration->update_schema());
-			$state['migration_schema_done'] = true;
-		}
-		else if (!$state['migration_data_done'])
-		{
-			try
-			{
-				$result = $this->process_data_step($migration->update_data(), $state['migration_data_state']);
-
-				$state['migration_data_state'] = ($result === true) ? '' : $result;
-				$state['migration_data_done'] = ($result === true);
-				$state['migration_end_time'] = ($result === true) ? time() : 0;
-			}
-			catch (phpbb_db_migration_exception $e)
-			{
-				// Revert the schema changes
-				$this->revert($name);
-
-				// Rethrow exception
-				throw $e;
-			}
-		}
-
-		$this->set_migration_state($name, $state);
-
-		return true;
-	}
-
-	/**
-	* Runs a single revert step from the last migration installed
-	*
-	* YOU MUST ADD/SET ALL MIGRATIONS THAT COULD BE DEPENDENT ON THE MIGRATION TO REVERT TO BEFORE CALLING THIS METHOD!
-	* The revert step can either be a schema or a (partial) data revert. To
-	* check if revert() needs to be called again use the migration_state() method.
-	*
-	* @param string $migration String migration name to revert (including any that depend on this migration)
-	* @return null
-	*/
-	public function revert($migration)
-	{
-		if (!isset($this->migration_state[$migration]))
-		{
-			// Not installed
-			return;
-		}
-
-		foreach ($this->migration_state as $name => $state)
-		{
-			if (!empty($state['migration_depends_on']) && in_array($migration, $state['migration_depends_on']))
-			{
-				$this->revert($name);
-			}
-		}
-
-		$this->try_revert($migration);
-	}
-
-	/**
-	* Attempts to revert a step of the given migration or one of its dependencies
-	*
-	* @param	string	The class name of the migration
-	* @return	bool	Whether any update step was successfully run
-	*/
-	protected function try_revert($name)
-	{
-		if (!class_exists($name))
-		{
-			return false;
-		}
-
-		$migration = $this->get_migration($name);
-
-		$state = $this->migration_state[$name];
-
-		$this->last_run_migration = array(
-			'name'	=> $name,
-			'class'	=> $migration,
-		);
-
-		if ($state['migration_data_done'])
-		{
-			if ($state['migration_data_state'] !== 'revert_data')
-			{
-				$result = $this->process_data_step($migration->update_data(), $state['migration_data_state'], true);
-
-				$state['migration_data_state'] = ($result === true) ? 'revert_data' : $result;
-			}
-			else
-			{
-				$result = $this->process_data_step($migration->revert_data(), '', false);
-
-				$state['migration_data_state'] = ($result === true) ? '' : $result;
-				$state['migration_data_done'] = ($result === true) ? false : true;
-			}
-
-			$this->set_migration_state($name, $state);
-		}
-		else
-		{
-			$this->apply_schema_changes($migration->revert_schema());
-
-			$sql = 'DELETE FROM ' . $this->migrations_table . "
-				WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
-			$this->db->sql_query($sql);
-
-			unset($this->migration_state[$name]);
-		}
-
-		return true;
-	}
-
-	/**
-	* Apply schema changes from a migration
-	*
-	* Just calls db_tools->perform_schema_changes
-	*
-	* @param array $schema_changes from migration
-	*/
-	protected function apply_schema_changes($schema_changes)
-	{
-		$this->db_tools->perform_schema_changes($schema_changes);
-	}
-
-	/**
-	* Process the data step of the migration
-	*
-	* @param array $steps The steps to run
-	* @param bool|string $state Current state of the migration
-	* @param bool $revert true to revert a data step
-	* @return bool|string migration state. True if completed, serialized array if not finished
-	*/
-	protected function process_data_step($steps, $state, $revert = false)
-	{
-		$state = ($state) ? unserialize($state) : false;
-
-		// reverse order of steps if reverting
-		if ($revert === true)
-		{
-			$steps = array_reverse($steps);
-		}
-
-		foreach ($steps as $step_identifier => $step)
-		{
-			$last_result = false;
-			if ($state)
-			{
-				// Continue until we reach the step that matches the last step called
-				if ($state['step'] != $step_identifier)
-				{
-					continue;
-				}
-
-				// We send the result from last time to the callable function
-				$last_result = $state['result'];
-
-				// Set state to false since we reached the point we were at
-				$state = false;
-			}
-
-			try
-			{
-				// Result will be null or true if everything completed correctly
-				$result = $this->run_step($step, $last_result, $revert);
-				if ($result !== null && $result !== true)
-				{
-					return serialize(array(
-						'result'	=> $result,
-						'step'		=> $step_identifier,
-					));
-				}
-			}
-			catch (phpbb_db_migration_exception $e)
-			{
-				// We should try rolling back here
-				foreach ($steps as $reverse_step_identifier => $reverse_step)
-				{
-					// If we've reached the current step we can break because we reversed everything that was run
-					if ($reverse_step_identifier == $step_identifier)
-					{
-						break;
-					}
-
-					// Reverse the step that was run
-					$result = $this->run_step($reverse_step, false, !$revert);
-				}
-
-				// rethrow the exception
-				throw $e;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Run a single step
-	*
-	* An exception should be thrown if an error occurs
-	*
-	* @param mixed $step Data step from migration
-	* @param mixed $last_result Result to pass to the callable (only for 'custom' method)
-	* @param bool $reverse False to install, True to attempt uninstallation by reversing the call
-	* @return null
-	*/
-	protected function run_step($step, $last_result = false, $reverse = false)
-	{
-		$callable_and_parameters = $this->get_callable_from_step($step, $last_result, $reverse);
-
-		if ($callable_and_parameters === false)
-		{
-			return;
-		}
-
-		$callable = $callable_and_parameters[0];
-		$parameters = $callable_and_parameters[1];
-
-		return call_user_func_array($callable, $parameters);
-	}
-
-	/**
-	* Get a callable statement from a data step
-	*
-	* @param array $step Data step from migration
-	* @param mixed $last_result Result to pass to the callable (only for 'custom' method)
-	* @param bool $reverse False to install, True to attempt uninstallation by reversing the call
-	* @return array Array with parameters for call_user_func_array(), 0 is the callable, 1 is parameters
-	*/
-	protected function get_callable_from_step(array $step, $last_result = false, $reverse = false)
-	{
-		$type = $step[0];
-		$parameters = $step[1];
-
-		$parts = explode('.', $type);
-
-		$class = $parts[0];
-		$method = false;
-
-		if (isset($parts[1]))
-		{
-			$method = $parts[1];
-		}
-
-		switch ($class)
-		{
-			case 'if':
-				if (!isset($parameters[0]))
-				{
-					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_MISSING_CONDITION', $step);
-				}
-
-				if (!isset($parameters[1]))
-				{
-					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_MISSING_STEP', $step);
-				}
-
-				$condition = $parameters[0];
-
-				if (!$condition)
-				{
-					return false;
-				}
-
-				$step = $parameters[1];
-
-				return $this->get_callable_from_step($step);
-			break;
-			case 'custom':
-				if (!is_callable($parameters[0]))
-				{
-					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_CUSTOM_NOT_CALLABLE', $step);
-				}
-
-				return array(
-					$parameters[0],
-					array($last_result),
-				);
-			break;
-
-			default:
-				if (!$method)
-				{
-					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_UNKNOWN_TYPE', $step);
-				}
-
-				if (!isset($this->tools[$class]))
-				{
-					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_UNDEFINED_TOOL', $step);
-				}
-
-				if (!method_exists(get_class($this->tools[$class]), $method))
-				{
-					throw new phpbb_db_migration_exception('MIGRATION_INVALID_DATA_UNDEFINED_METHOD', $step);
-				}
-
-				// Attempt to reverse operations
-				if ($reverse)
-				{
-					array_unshift($parameters, $method);
-
-					return array(
-						array($this->tools[$class], 'reverse'),
-						$parameters,
-					);
-				}
-
-				return array(
-					array($this->tools[$class], $method),
-					$parameters,
-				);
-			break;
-		}
-	}
-
-	/**
-	* Insert/Update migration row into the database
-	*
-	* @param string $name Name of the migration
-	* @param array $state
-	* @return null
-	*/
-	protected function set_migration_state($name, $state)
-	{
-		$migration_row = $state;
-		$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);
-
-		if (isset($this->migration_state[$name]))
-		{
-			$sql = 'UPDATE ' . $this->migrations_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $migration_row) . "
-				WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
-			$this->db->sql_query($sql);
-		}
-		else
-		{
-			$migration_row['migration_name'] = $name;
-			$sql = 'INSERT INTO ' . $this->migrations_table . '
-				' . $this->db->sql_build_array('INSERT', $migration_row);
-			$this->db->sql_query($sql);
-		}
-
-		$this->migration_state[$name] = $state;
-
-		$this->last_run_migration['state'] = $state;
-	}
-
-	/**
-	* Checks if a migration's dependencies can even theoretically be satisfied.
-	*
-	* @param string	$name The class name of the migration
-	* @return bool|string False if fulfillable, string of missing migration name if unfulfillable
-	*/
-	public function unfulfillable($name)
-	{
-		if (isset($this->migration_state[$name]))
-		{
-			return false;
-		}
-
-		if (!class_exists($name))
-		{
-			return $name;
-		}
-
-		$migration = $this->get_migration($name);
-		$depends = $migration->depends_on();
-
-		foreach ($depends as $depend)
-		{
-			$unfulfillable = $this->unfulfillable($depend);
-			if ($unfulfillable !== false)
-			{
-				return $unfulfillable;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Checks whether all available, fulfillable migrations have been applied.
-	*
-	* @return bool Whether the migrations have been applied
-	*/
-	public function finished()
-	{
-		foreach ($this->migrations as $name)
-		{
-			if (!isset($this->migration_state[$name]))
-			{
-				// skip unfulfillable migrations, but fulfillables mean we
-				// are not finished yet
-				if ($this->unfulfillable($name) !== false)
-				{
-					continue;
-				}
-				return false;
-			}
-
-			$migration = $this->migration_state[$name];
-
-			if (!$migration['migration_schema_done'] || !$migration['migration_data_done'])
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Gets a migration state (whether it is installed and to what extent)
-	*
-	* @param string $migration String migration name to check if it is installed
-	* @return bool|array False if the migration has not at all been installed, array
-	*/
-	public function migration_state($migration)
-	{
-		if (!isset($this->migration_state[$migration]))
-		{
-			return false;
-		}
-
-		return $this->migration_state[$migration];
-	}
-
-	/**
-	* Helper to get a migration
-	*
-	* @param string $name Name of the migration
-	* @return phpbb_db_migration
-	*/
-	protected function get_migration($name)
-	{
-		return new $name($this->config, $this->db, $this->db_tools, $this->phpbb_root_path, $this->php_ext, $this->table_prefix);
-	}
-
-	/**
-	* This function adds all migrations sent to it to the migrations table
-	*
-	* THIS SHOULD NOT GENERALLY BE USED! THIS IS FOR THE PHPBB INSTALLER.
-	* THIS WILL THROW ERRORS IF MIGRATIONS ALREADY EXIST IN THE TABLE, DO NOT CALL MORE THAN ONCE!
-	*
-	* @param array $migrations Array of migrations (names) to add to the migrations table
-	* @return null
-	*/
-	public function populate_migrations($migrations)
-	{
-		foreach ($migrations as $name)
-		{
-			if ($this->migration_state($name) === false)
-			{
-				$state = array(
-					'migration_depends_on'	=> $name::depends_on(),
-					'migration_schema_done' => true,
-					'migration_data_done'	=> true,
-					'migration_data_state'	=> '',
-					'migration_start_time'	=> time(),
-					'migration_end_time'	=> time(),
-				);
-				$this->set_migration_state($name, $state);
-			}
-		}
-	}
-
-	/**
-	* Load migration data files from a directory
-	*
-	* @param phpbb_extension_finder $finder
-	* @param string $path Path to migration data files
-	* @param bool $check_fulfillable If TRUE (default), we will check
-	* 	if all of the migrations are fulfillable after loading them.
-	* 	If FALSE, we will not check. You SHOULD check at least once
-	* 	to prevent errors (if including multiple directories, check
-	* 	with the last call to prevent throwing errors unnecessarily).
-	* @return array Array of migration names
-	*/
-	public function load_migrations(phpbb_extension_finder $finder, $path, $check_fulfillable = true)
-	{
-		if (!is_dir($path))
-		{
-			throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path);
-		}
-
-		$migrations = array();
-
-		$files = $finder
-			->extension_directory("/")
-			->find_from_paths(array('/' => $path));
-		foreach ($files as $file)
-		{
-			$migrations[$file['path'] . $file['filename']] = '';
-		}
-		$migrations = $finder->get_classes_from_files($migrations);
-
-		foreach ($migrations as $migration)
-		{
-			if (!in_array($migration, $this->migrations))
-			{
-				$this->migrations[] = $migration;
-			}
-		}
-
-		if ($check_fulfillable)
-		{
-			foreach ($this->migrations as $name)
-			{
-				$unfulfillable = $this->unfulfillable($name);
-				if ($unfulfillable !== false)
-				{
-					throw new phpbb_db_migration_exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable);
-				}
-			}
-		}
-
-		return $this->migrations;
-	}
-}
diff --git a/phpBB/includes/db/sql_insert_buffer.php b/phpBB/includes/db/sql_insert_buffer.php
deleted file mode 100644
index c18f908429..0000000000
--- a/phpBB/includes/db/sql_insert_buffer.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Collects rows for insert into a database until the buffer size is reached.
-* Then flushes the buffer to the database and starts over again.
-*
-* Benefits over collecting a (possibly huge) insert array and then using
-* $db->sql_multi_insert() include:
-*
-*  - Going over max packet size of the database connection is usually prevented
-*    because the data is submitted in batches.
-*
-*  - Reaching database connection timeout is usually prevented because
-*    submission of batches talks to the database every now and then.
-*
-*  - Usage of less PHP memory because data no longer needed is discarded on
-*    buffer flush.
-*
-* Attention:
-* Please note that users of this class have to call flush() to flush the
-* remaining rows to the database after their batch insert operation is
-* finished.
-*
-* Usage:
-* <code>
-*	$buffer = new phpbb_db_sql_insert_buffer($db, 'test_table', 1234);
-*
-*	while (do_stuff())
-*	{
-*		$buffer->insert(array(
-*			'column1' => 'value1',
-*			'column2' => 'value2',
-*		));
-*	}
-*
-*	$buffer->flush();
-* </code>
-*
-* @package dbal
-*/
-class phpbb_db_sql_insert_buffer
-{
-	/** @var phpbb_db_driver */
-	protected $db;
-
-	/** @var string */
-	protected $table_name;
-
-	/** @var int */
-	protected $max_buffered_rows;
-
-	/** @var array */
-	protected $buffer = array();
-
-	/**
-	* @param phpbb_db_driver $db
-	* @param string          $table_name
-	* @param int             $max_buffered_rows
-	*/
-	public function __construct(phpbb_db_driver $db, $table_name, $max_buffered_rows = 500)
-	{
-		$this->db = $db;
-		$this->table_name = $table_name;
-		$this->max_buffered_rows = $max_buffered_rows;
-	}
-
-	/**
-	* Inserts a single row into the buffer if multi insert is supported by the
-	* database (otherwise an insert query is sent immediately). Then flushes
-	* the buffer if the number of rows in the buffer is now greater than or
-	* equal to $max_buffered_rows.
-	*
-	* @param array $row
-	*
-	* @return bool		True when some data was flushed to the database.
-	*					False otherwise.
-	*/
-	public function insert(array $row)
-	{
-		$this->buffer[] = $row;
-
-		// Flush buffer if it is full or when DB does not support multi inserts.
-		// In the later case, the buffer will always only contain one row.
-		if (!$this->db->multi_insert || sizeof($this->buffer) >= $this->max_buffered_rows)
-		{
-			return $this->flush();
-		}
-
-		return false;
-	}
-
-	/**
-	* Inserts a row set, i.e. an array of rows, by calling insert().
-	*
-	* Please note that it is in most cases better to use insert() instead of
-	* first building a huge rowset. Or at least sizeof($rows) should be kept
-	* small.
-	*
-	* @param array $rows 
-	*
-	* @return bool		True when some data was flushed to the database.
-	*					False otherwise.
-	*/
-	public function insert_all(array $rows)
-	{
-		// Using bitwise |= because PHP does not have logical ||=
-		$result = 0;
-
-		foreach ($rows as $row)
-		{
-			$result |= (int) $this->insert($row);
-		}
-
-		return (bool) $result;
-	}
-
-	/**
-	* Flushes the buffer content to the DB and clears the buffer.
-	*
-	* @return bool		True when some data was flushed to the database.
-	*					False otherwise.
-	*/
-	public function flush()
-	{
-		if (!empty($this->buffer))
-		{
-			$this->db->sql_multi_insert($this->table_name, $this->buffer);
-			$this->buffer = array();
-
-			return true;
-		}
-
-		return false;
-	}
-}
diff --git a/phpBB/includes/di/extension/config.php b/phpBB/includes/di/extension/config.php
deleted file mode 100644
index 6c272a6588..0000000000
--- a/phpBB/includes/di/extension/config.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\Config\FileLocator;
-
-/**
-* Container config extension
-*/
-class phpbb_di_extension_config extends Extension
-{
-	public function __construct($config_file)
-	{
-		$this->config_file = $config_file;
-	}
-
-	/**
-	* Loads a specific configuration.
-	*
-	* @param array            $config    An array of configuration values
-	* @param ContainerBuilder $container A ContainerBuilder instance
-	*
-	* @throws InvalidArgumentException When provided tag is not defined in this extension
-	*/
-	public function load(array $config, ContainerBuilder $container)
-	{
-		require($this->config_file);
-
-		$container->setParameter('core.adm_relative_path', (isset($phpbb_adm_relative_path) ? $phpbb_adm_relative_path : 'adm/'));
-		$container->setParameter('core.table_prefix', $table_prefix);
-		$container->setParameter('cache.driver.class', $this->convert_30_acm_type($acm_type));
-		$container->setParameter('dbal.driver.class', phpbb_convert_30_dbms_to_31($dbms));
-		$container->setParameter('dbal.dbhost', $dbhost);
-		$container->setParameter('dbal.dbuser', $dbuser);
-		$container->setParameter('dbal.dbpasswd', $dbpasswd);
-		$container->setParameter('dbal.dbname', $dbname);
-		$container->setParameter('dbal.dbport', $dbport);
-		$container->setParameter('dbal.new_link', defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK);
-	}
-
-	/**
-	* Returns the recommended alias to use in XML.
-	*
-	* This alias is also the mandatory prefix to use when using YAML.
-	*
-	* @return string The alias
-	*/
-	public function getAlias()
-	{
-		return 'config';
-	}
-
-	/**
-	* Convert 3.0 ACM type to 3.1 cache driver class name
-	*
-	* @param string $acm_type ACM type
-	* @return cache driver class
-	*/
-	protected function convert_30_acm_type($acm_type)
-	{
-		if (preg_match('#^[a-z]+$#', $acm_type))
-		{
-			return 'phpbb_cache_driver_'.$acm_type;
-		}
-
-		return $acm_type;
-	}
-}
diff --git a/phpBB/includes/di/extension/core.php b/phpBB/includes/di/extension/core.php
deleted file mode 100644
index 9c36ba2fc4..0000000000
--- a/phpBB/includes/di/extension/core.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\Config\FileLocator;
-
-/**
-* Container core extension
-*/
-class phpbb_di_extension_core extends Extension
-{
-	/**
-	* phpBB Root path
-	* @var string
-	*/
-	protected $root_path;
-
-	/**
-	* Constructor
-	*
-	* @param string $root_path Root path
-	*/
-	public function __construct($root_path)
-	{
-		$this->root_path = $root_path;
-	}
-
-	/**
-	* Loads a specific configuration.
-	*
-	* @param array            $config    An array of configuration values
-	* @param ContainerBuilder $container A ContainerBuilder instance
-	*
-	* @throws InvalidArgumentException When provided tag is not defined in this extension
-	*/
-	public function load(array $config, ContainerBuilder $container)
-	{
-		$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'config')));
-		$loader->load('services.yml');
-	}
-
-	/**
-	* Returns the recommended alias to use in XML.
-	*
-	* This alias is also the mandatory prefix to use when using YAML.
-	*
-	* @return string The alias
-	*/
-	public function getAlias()
-	{
-		return 'core';
-	}
-}
diff --git a/phpBB/includes/di/extension/ext.php b/phpBB/includes/di/extension/ext.php
deleted file mode 100644
index 7d9b433751..0000000000
--- a/phpBB/includes/di/extension/ext.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\Config\FileLocator;
-
-/**
-* Container ext extension
-*/
-class phpbb_di_extension_ext extends Extension
-{
-	protected $paths = array();
-
-	public function __construct($enabled_extensions)
-	{
-		foreach ($enabled_extensions as $ext => $path)
-		{
-			$this->paths[] = $path;
-		}
-	}
-
-	/**
-	* Loads a specific configuration.
-	*
-	* @param array            $config    An array of configuration values
-	* @param ContainerBuilder $container A ContainerBuilder instance
-	*
-	* @throws InvalidArgumentException When provided tag is not defined in this extension
-	*/
-	public function load(array $config, ContainerBuilder $container)
-	{
-		foreach ($this->paths as $path)
-		{
-			if (file_exists($path . '/config/services.yml'))
-			{
-				$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($path . '/config')));
-				$loader->load('services.yml');
-			}
-		}
-	}
-
-	/**
-	* Returns the recommended alias to use in XML.
-	*
-	* This alias is also the mandatory prefix to use when using YAML.
-	*
-	* @return string The alias
-	*/
-	public function getAlias()
-	{
-		return 'ext';
-	}
-}
diff --git a/phpBB/includes/di/pass/collection_pass.php b/phpBB/includes/di/pass/collection_pass.php
deleted file mode 100644
index 63a5c7dfc4..0000000000
--- a/phpBB/includes/di/pass/collection_pass.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-
-/**
-* Appends an add method call to the definition of each collection service for
-* the services tagged with the appropriate name defined in the collection's
-* service_collection tag.
-*/
-class phpbb_di_pass_collection_pass implements CompilerPassInterface
-{
-	/**
-	* Modify the container before it is passed to the rest of the code
-	*
-	* @param ContainerBuilder $container ContainerBuilder object
-	* @return null
-	*/
-	public function process(ContainerBuilder $container)
-	{
-		foreach ($container->findTaggedServiceIds('service_collection') as $id => $data)
-		{
-			$definition = $container->getDefinition($id);
-
-			foreach ($container->findTaggedServiceIds($data[0]['tag']) as $service_id => $service_data)
-			{
-				$definition->addMethodCall('add', array($service_id));
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/di/pass/kernel_pass.php b/phpBB/includes/di/pass/kernel_pass.php
deleted file mode 100644
index a701ebcfa6..0000000000
--- a/phpBB/includes/di/pass/kernel_pass.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-
-class phpbb_di_pass_kernel_pass implements CompilerPassInterface
-{
-	/**
-	* Modify the container before it is passed to the rest of the code
-	*
-	* @param ContainerBuilder $container ContainerBuilder object
-	* @return null
-	*/
-	public function process(ContainerBuilder $container)
-	{
-		$definition = $container->getDefinition('dispatcher');
-
-		foreach ($container->findTaggedServiceIds('kernel.event_listener') as $id => $events)
-		{
-			foreach ($events as $event)
-			{
-				$priority = isset($event['priority']) ? $event['priority'] : 0;
-
-				if (!isset($event['event']))
-				{
-					throw new InvalidArgumentException(sprintf('Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.', $id));
-				}
-
-				if (!isset($event['method']))
-				{
-					throw new InvalidArgumentException(sprintf('Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.', $id));
-				}
-
-				$definition->addMethodCall('addListenerService', array($event['event'], array($id, $event['method']), $priority));
-			}
-		}
-
-		foreach ($container->findTaggedServiceIds('kernel.event_subscriber') as $id => $attributes)
-		{
-			// We must assume that the class value has been correctly filled, even if the service is created by a factory
-			$class = $container->getDefinition($id)->getClass();
-
-			$refClass = new ReflectionClass($class);
-			$interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface';
-			if (!$refClass->implementsInterface($interface))
-			{
-				throw new InvalidArgumentException(sprintf('Service "%1$s" must implement interface "%2$s".', $id, $interface));
-			}
-
-			$definition->addMethodCall('addSubscriberService', array($id, $class));
-		}
-	}
-}
diff --git a/phpBB/includes/di/service_collection.php b/phpBB/includes/di/service_collection.php
deleted file mode 100644
index 880cb46d4d..0000000000
--- a/phpBB/includes/di/service_collection.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
-* Collection of services to be configured at container compile time.
-*
-* @package phpBB3
-*/
-class phpbb_di_service_collection extends ArrayObject
-{
-	/**
-	* Constructor
-	*
-	* @param ContainerInterface $container Container object
-	*/
-	public function __construct(ContainerInterface $container)
-	{
-		$this->container = $container;
-	}
-
-	/**
-	* Add a service to the collection
-	*
-	* @param string $name The service name
-	* @return null
-	*/
-	public function add($name)
-	{
-		$task = $this->container->get($name);
-
-		$this->offsetSet($name, $task);
-	}
-}
diff --git a/phpBB/includes/error_collector.php b/phpBB/includes/error_collector.php
deleted file mode 100644
index 358da747b8..0000000000
--- a/phpBB/includes/error_collector.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
-*
-* @package phpBB
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class phpbb_error_collector
-{
-	var $errors;
-
-	function phpbb_error_collector()
-	{
-		$this->errors = array();
-	}
-
-	function install()
-	{
-		set_error_handler(array(&$this, 'error_handler'));
-	}
-
-	function uninstall()
-	{
-		restore_error_handler();
-	}
-
-	function error_handler($errno, $msg_text, $errfile, $errline)
-	{
-		$this->errors[] = array($errno, $msg_text, $errfile, $errline);
-	}
-
-	function format_errors()
-	{
-		$text = '';
-		foreach ($this->errors as $error)
-		{
-			if (!empty($text))
-			{
-				$text .= "<br />\n";
-			}
-
-			list($errno, $msg_text, $errfile, $errline) = $error;
-
-			// Prevent leakage of local path to phpBB install
-			$errfile = phpbb_filter_root_path($errfile);
-
-			$text .= "Errno $errno: $msg_text at $errfile line $errline";
-		}
-
-		return $text;
-	}
-}
diff --git a/phpBB/includes/event/data.php b/phpBB/includes/event/data.php
deleted file mode 100644
index 70718ff0ae..0000000000
--- a/phpBB/includes/event/data.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-    exit;
-}
-
-use Symfony\Component\EventDispatcher\Event;
-
-class phpbb_event_data extends Event implements ArrayAccess
-{
-    private $data;
-
-    public function __construct(array $data = array())
-    {
-        $this->set_data($data);
-    }
-
-    public function set_data(array $data = array())
-    {
-        $this->data = $data;
-    }
-
-    public function get_data()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Returns data filtered to only include specified keys.
-     *
-     * This effectively discards any keys added to data by hooks.
-     */
-    public function get_data_filtered($keys)
-    {
-        return array_intersect_key($this->data, array_flip($keys));
-    }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->data[$offset]);
-    }
-
-    public function offsetGet($offset)
-    {
-        return isset($this->data[$offset]) ? $this->data[$offset] : null;
-    }
-
-    public function offsetSet($offset, $value)
-    {
-        $this->data[$offset] = $value;
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->data[$offset]);
-    }
-}
diff --git a/phpBB/includes/event/dispatcher.php b/phpBB/includes/event/dispatcher.php
deleted file mode 100644
index 4f637ce3bb..0000000000
--- a/phpBB/includes/event/dispatcher.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
-
-/**
-* Extension of the Symfony2 EventDispatcher
-*
-* It provides an additional `trigger_event` method, which
-* gives some syntactic sugar for dispatching events. Instead
-* of creating the event object, the method will do that for
-* you.
-*
-* Example:
-*
-*     $vars = array('page_title');
-*     extract($phpbb_dispatcher->trigger_event('core.index', compact($vars)));
-*
-*/
-class phpbb_event_dispatcher extends ContainerAwareEventDispatcher
-{
-	public function trigger_event($eventName, $data = array())
-	{
-		$event = new phpbb_event_data($data);
-		$this->dispatch($eventName, $event);
-		return $event->get_data_filtered(array_keys($data));
-	}
-}
diff --git a/phpBB/includes/event/extension_subscriber_loader.php b/phpBB/includes/event/extension_subscriber_loader.php
deleted file mode 100644
index d933b943d7..0000000000
--- a/phpBB/includes/event/extension_subscriber_loader.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-class phpbb_event_extension_subscriber_loader
-{
-	private $dispatcher;
-	private $extension_manager;
-
-	public function __construct(EventDispatcherInterface $dispatcher, phpbb_extension_manager $extension_manager)
-	{
-		$this->dispatcher = $dispatcher;
-		$this->extension_manager = $extension_manager;
-	}
-
-	public function load()
-	{
-		$finder = $this->extension_manager->get_finder();
-		$subscriber_classes = $finder
-			->extension_directory('/event')
-			->suffix('listener')
-			->core_path('event/')
-			->get_classes();
-
-		foreach ($subscriber_classes as $class)
-		{
-			$subscriber = new $class();
-			$this->dispatcher->addSubscriber($subscriber);
-		}
-	}
-}
diff --git a/phpBB/includes/event/kernel_exception_subscriber.php b/phpBB/includes/event/kernel_exception_subscriber.php
deleted file mode 100644
index f90989a74c..0000000000
--- a/phpBB/includes/event/kernel_exception_subscriber.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpFoundation\Response;
-
-class phpbb_event_kernel_exception_subscriber implements EventSubscriberInterface
-{
-	/**
-	* Template object
-	* @var phpbb_template
-	*/
-	protected $template;
-
-	/**
-	* User object
-	* @var phpbb_user
-	*/
-	protected $user;
-
-	/**
-	* Construct method
-	*
-	* @param phpbb_template $template Template object
-	* @param phpbb_user $user User object
-	*/
-	public function __construct(phpbb_template $template, phpbb_user $user)
-	{
-		$this->template = $template;
-		$this->user = $user;
-	}
-
-	/**
-	* This listener is run when the KernelEvents::EXCEPTION event is triggered
-	*
-	* @param GetResponseForExceptionEvent $event
-	* @return null
-	*/
-	public function on_kernel_exception(GetResponseForExceptionEvent $event)
-	{
-		page_header($this->user->lang('INFORMATION'));
-
-		$exception = $event->getException();
-
-		$this->template->assign_vars(array(
-			'MESSAGE_TITLE'		=> $this->user->lang('INFORMATION'),
-			'MESSAGE_TEXT'		=> $exception->getMessage(),
-		));
-
-		$this->template->set_filenames(array(
-			'body'	=> 'message_body.html',
-		));
-
-		page_footer(true, false, false);
-
-
-		$status_code = $exception instanceof HttpException ? $exception->getStatusCode() : 500;
-		$response = new Response($this->template->assign_display('body'), $status_code);
-		$event->setResponse($response);
-	}
-
-	public static function getSubscribedEvents()
-	{
-		return array(
-			KernelEvents::EXCEPTION		=> 'on_kernel_exception',
-		);
-	}
-}
diff --git a/phpBB/includes/event/kernel_request_subscriber.php b/phpBB/includes/event/kernel_request_subscriber.php
deleted file mode 100644
index afb8464f80..0000000000
--- a/phpBB/includes/event/kernel_request_subscriber.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\EventListener\RouterListener;
-use Symfony\Component\Routing\RequestContext;
-
-class phpbb_event_kernel_request_subscriber implements EventSubscriberInterface
-{
-	/**
-	* Extension finder object
-	* @var phpbb_extension_finder
-	*/
-	protected $finder;
-
-	/**
-	* PHP extension
-	* @var string
-	*/
-	protected $php_ext;
-
-	/**
-	* Root path
-	* @var string
-	*/
-	protected $root_path;
-
-	/**
-	* Construct method
-	*
-	* @param phpbb_extension_finder $finder Extension finder object
-	* @param string $root_path Root path
-	* @param string $php_ext PHP extension
-	*/
-	public function __construct(phpbb_extension_finder $finder, $root_path, $php_ext)
-	{
-		$this->finder = $finder;
-		$this->root_path = $root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	* This listener is run when the KernelEvents::REQUEST event is triggered
-	*
-	* This is responsible for setting up the routing information
-	*
-	* @param GetResponseEvent $event
-	* @return null
-	*/
-	public function on_kernel_request(GetResponseEvent $event)
-	{
-		$request = $event->getRequest();
-		$context = new RequestContext();
-		$context->fromRequest($request);
-
-		$matcher = phpbb_get_url_matcher($this->finder, $context, $this->root_path, $this->php_ext);
-		$router_listener = new RouterListener($matcher, $context);
-		$router_listener->onKernelRequest($event);
-	}
-
-	public static function getSubscribedEvents()
-	{
-		return array(
-			KernelEvents::REQUEST		=> 'on_kernel_request',
-		);
-	}
-}
diff --git a/phpBB/includes/event/kernel_terminate_subscriber.php b/phpBB/includes/event/kernel_terminate_subscriber.php
deleted file mode 100644
index 1eaf890e42..0000000000
--- a/phpBB/includes/event/kernel_terminate_subscriber.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\PostResponseEvent;
-
-class phpbb_event_kernel_terminate_subscriber implements EventSubscriberInterface
-{
-	/**
-	* This listener is run when the KernelEvents::TERMINATE event is triggered
-	* This comes after a Response has been sent to the server; this is
-	* primarily cleanup stuff.
-	*
-	* @param PostResponseEvent $event
-	* @return null
-	*/
-	public function on_kernel_terminate(PostResponseEvent $event)
-	{
-		exit_handler();
-	}
-
-	public static function getSubscribedEvents()
-	{
-		return array(
-			KernelEvents::TERMINATE		=> 'on_kernel_terminate',
-		);
-	}
-}
diff --git a/phpBB/includes/extension/base.php b/phpBB/includes/extension/base.php
deleted file mode 100644
index c4462b64d8..0000000000
--- a/phpBB/includes/extension/base.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
-*
-* @package extension
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
-* A base class for extensions without custom enable/disable/purge code.
-*
-* @package extension
-*/
-class phpbb_extension_base implements phpbb_extension_interface
-{
-	/** @var ContainerInterface */
-	protected $container;
-
-	/** @var phpbb_extension_finder */
-	protected $finder;
-
-	/** @var phpbb_db_migrator */
-	protected $migrator;
-
-	/** @var string */
-	protected $extension_name;
-
-	/** @var string */
-	protected $extension_path;
-
-	/**
-	* Constructor
-	*
-	* @param ContainerInterface $container Container object
-	* @param phpbb_extension_finder $extension_finder
-	* @param string $extension_name Name of this extension (from ext.manager)
-	* @param string $extension_path Relative path to this extension
-	*/
-	public function __construct(ContainerInterface $container, phpbb_extension_finder $extension_finder, phpbb_db_migrator $migrator, $extension_name, $extension_path)
-	{
-		$this->container = $container;
-		$this->extension_finder = $extension_finder;
-		$this->migrator = $migrator;
-
-		$this->extension_name = $extension_name;
-		$this->extension_path = $extension_path;
-	}
-
-	/**
-	* Single enable step that installs any included migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return false Indicates no further steps are required
-	*/
-	public function enable_step($old_state)
-	{
-		$migrations = $this->get_migration_file_list();
-
-		$this->migrator->set_migrations($migrations);
-
-		$this->migrator->update();
-
-		return !$this->migrator->finished();
-	}
-
-	/**
-	* Single disable step that does nothing
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return false Indicates no further steps are required
-	*/
-	public function disable_step($old_state)
-	{
-		return false;
-	}
-
-	/**
-	* Single purge step that reverts any included and installed migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return false Indicates no further steps are required
-	*/
-	public function purge_step($old_state)
-	{
-		$migrations = $this->get_migration_file_list();
-
-		$this->migrator->set_migrations($migrations);
-
-		foreach ($migrations as $migration)
-		{
-			while ($this->migrator->migration_state($migration) !== false)
-			{
-				$this->migrator->revert($migration);
-
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Get the list of migration files from this extension
-	*
-	* @return array
-	*/
-	protected function get_migration_file_list()
-	{
-		static $migrations = false;
-
-		if ($migrations !== false)
-		{
-			return $migrations;
-		}
-
-		// Only have the finder search in this extension path directory
-		$migrations = $this->extension_finder
-			->extension_directory('/migrations')
-			->find_from_extension($this->extension_name, $this->extension_path);
-		$migrations = $this->extension_finder->get_classes_from_files($migrations);
-
-		return $migrations;
-	}
-}
diff --git a/phpBB/includes/extension/exception.php b/phpBB/includes/extension/exception.php
deleted file mode 100644
index e08a8912ea..0000000000
--- a/phpBB/includes/extension/exception.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
-*
-* @package extension
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
- * Exception class for metadata
- */
-class phpbb_extension_exception extends UnexpectedValueException
-{
-	public function __toString()
-	{
-		return $this->getMessage();
-	}
-}
\ No newline at end of file
diff --git a/phpBB/includes/extension/finder.php b/phpBB/includes/extension/finder.php
deleted file mode 100644
index 49bb2a514f..0000000000
--- a/phpBB/includes/extension/finder.php
+++ /dev/null
@@ -1,523 +0,0 @@
-<?php
-/**
-*
-* @package extension
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The extension finder provides a simple way to locate files in active extensions
-*
-* @package extension
-*/
-class phpbb_extension_finder
-{
-	protected $extension_manager;
-	protected $filesystem;
-	protected $phpbb_root_path;
-	protected $cache;
-	protected $php_ext;
-
-	/**
-	* The cache variable name used to store $this->cached_queries in $this->cache.
-	*
-	* Allows the use of multiple differently configured finders with the same cache.
-	* @var string
-	*/
-	protected $cache_name;
-
-	/**
-	* An associative array, containing all search parameters set in methods.
-	* @var	array
-	*/
-	protected $query;
-
-	/**
-	* A map from md5 hashes of serialized queries to their previously retrieved
-	* results.
-	* @var	array
-	*/
-	protected $cached_queries;
-
-	/**
-	* Creates a new finder instance with its dependencies
-	*
-	* @param phpbb_extension_manager $extension_manager An extension manager
-	*            instance that provides the finder with a list of active
-	*            extensions and their locations
-	* @param phpbb_filesystem $filesystem Filesystem instance
-	* @param string $phpbb_root_path Path to the phpbb root directory
-	* @param phpbb_cache_driver_interface $cache A cache instance or null
-	* @param string $php_ext php file extension
-	* @param string $cache_name The name of the cache variable, defaults to
-	*                           _ext_finder
-	*/
-	public function __construct(phpbb_extension_manager $extension_manager, phpbb_filesystem $filesystem, $phpbb_root_path = '', phpbb_cache_driver_interface $cache = null, $php_ext = 'php', $cache_name = '_ext_finder')
-	{
-		$this->extension_manager = $extension_manager;
-		$this->filesystem = $filesystem;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->cache = $cache;
-		$this->php_ext = $php_ext;
-		$this->cache_name = $cache_name;
-
-		$this->query = array(
-			'core_path' => false,
-			'core_suffix' => false,
-			'core_prefix' => false,
-			'core_directory' => false,
-			'extension_suffix' => false,
-			'extension_prefix' => false,
-			'extension_directory' => false,
-		);
-
-		$this->cached_queries = ($this->cache) ? $this->cache->get($this->cache_name) : false;
-	}
-
-	/**
-	* Sets a core path to be searched in addition to extensions
-	*
-	* @param string $core_path The path relative to phpbb_root_path
-	* @return phpbb_extension_finder This object for chaining calls
-	*/
-	public function core_path($core_path)
-	{
-		$this->query['core_path'] = $core_path;
-		return $this;
-	}
-
-	/**
-	* Sets the suffix all files found in extensions and core must match.
-	*
-	* There is no default file extension, so to find PHP files only, you will
-	* have to specify .php as a suffix. However when using get_classes, the .php
-	* file extension is automatically added to suffixes.
-	*
-	* @param string $suffix A filename suffix
-	* @return phpbb_extension_finder This object for chaining calls
-	*/
-	public function suffix($suffix)
-	{
-		$this->core_suffix($suffix);
-		$this->extension_suffix($suffix);
-		return $this;
-	}
-
-	/**
-	* Sets a suffix all files found in extensions must match
-	*
-	* There is no default file extension, so to find PHP files only, you will
-	* have to specify .php as a suffix. However when using get_classes, the .php
-	* file extension is automatically added to suffixes.
-	*
-	* @param string $extension_suffix A filename suffix
-	* @return phpbb_extension_finder This object for chaining calls
-	*/
-	public function extension_suffix($extension_suffix)
-	{
-		$this->query['extension_suffix'] = $extension_suffix;
-		return $this;
-	}
-
-	/**
-	* Sets a suffix all files found in the core path must match
-	*
-	* There is no default file extension, so to find PHP files only, you will
-	* have to specify .php as a suffix. However when using get_classes, the .php
-	* file extension is automatically added to suffixes.
-	*
-	* @param string $core_suffix A filename suffix
-	* @return phpbb_extension_finder This object for chaining calls
-	*/
-	public function core_suffix($core_suffix)
-	{
-		$this->query['core_suffix'] = $core_suffix;
-		return $this;
-	}
-
-	/**
-	* Sets the prefix all files found in extensions and core must match
-	*
-	* @param string $prefix A filename prefix
-	* @return phpbb_extension_finder This object for chaining calls
-	*/
-	public function prefix($prefix)
-	{
-		$this->core_prefix($prefix);
-		$this->extension_prefix($prefix);
-		return $this;
-	}
-
-	/**
-	* Sets a prefix all files found in extensions must match
-	*
-	* @param string $extension_prefix A filename prefix
-	* @return phpbb_extension_finder This object for chaining calls
-	*/
-	public function extension_prefix($extension_prefix)
-	{
-		$this->query['extension_prefix'] = $extension_prefix;
-		return $this;
-	}
-
-	/**
-	* Sets a prefix all files found in the core path must match
-	*
-	* @param string $core_prefix A filename prefix
-	* @return phpbb_extension_finder This object for chaining calls
-	*/
-	public function core_prefix($core_prefix)
-	{
-		$this->query['core_prefix'] = $core_prefix;
-		return $this;
-	}
-
-	/**
-	* Sets a directory all files found in extensions and core must be contained in
-	*
-	* Automatically sets the core_directory if its value does not differ from
-	* the current directory.
-	*
-	* @param string $directory
-	* @return phpbb_extension_finder This object for chaining calls
-	*/
-	public function directory($directory)
-	{
-		$this->core_directory($directory);
-		$this->extension_directory($directory);
-		return $this;
-	}
-
-	/**
-	* Sets a directory all files found in extensions must be contained in
-	*
-	* @param string $extension_directory
-	* @return phpbb_extension_finder This object for chaining calls
-	*/
-	public function extension_directory($extension_directory)
-	{
-		$this->query['extension_directory'] = $this->sanitise_directory($extension_directory);
-		return $this;
-	}
-
-	/**
-	* Sets a directory all files found in the core path must be contained in
-	*
-	* @param string $core_directory
-	* @return phpbb_extension_finder This object for chaining calls
-	*/
-	public function core_directory($core_directory)
-	{
-		$this->query['core_directory'] = $this->sanitise_directory($core_directory);
-		return $this;
-	}
-
-	/**
-	* Removes occurances of /./ and makes sure path ends without trailing slash
-	*
-	* @param string $directory A directory pattern
-	* @return string A cleaned up directory pattern
-	*/
-	protected function sanitise_directory($directory)
-	{
-		$directory = $this->filesystem->clean_path($directory);
-		$dir_len = strlen($directory);
-
-		if ($dir_len > 1 && $directory[$dir_len - 1] === '/')
-		{
-			$directory = substr($directory, 0, -1);
-		}
-
-		return $directory;
-	}
-
-	/**
-	* Finds classes matching the configured options if they follow phpBB naming rules.
-	*
-	* The php file extension is automatically added to suffixes.
-	*
-	* Note: If a file is matched but contains a class name not following the
-	* phpBB naming rules an incorrect class name will be returned.
-	*
-	* @param bool $cache Whether the result should be cached
-	* @param bool $use_all_available Use all available instead of just all
-	* 						enabled extensions
-	* @return array An array of found class names
-	*/
-	public function get_classes($cache = true, $use_all_available = false)
-	{
-		$this->query['extension_suffix'] .= '.' . $this->php_ext;
-		$this->query['core_suffix'] .= '.' . $this->php_ext;
-
-		$files = $this->find($cache, false, $use_all_available);
-
-		return $this->get_classes_from_files($files);
-	}
-
-	/**
-	* Get class names from a list of files
-	*
-	* @param array $files Array of files (from find())
-	* @return array Array of class names
-	*/
-	public function get_classes_from_files($files)
-	{
-		$classes = array();
-		foreach ($files as $file => $ext_name)
-		{
-			$file = preg_replace('#^includes/#', '', $file);
-
-			$classes[] = 'phpbb_' . str_replace('/', '_', substr($file, 0, -strlen('.' . $this->php_ext)));
-		}
-		return $classes;
-	}
-
-	/**
-	* Finds all directories matching the configured options
-	*
-	* @param bool $cache Whether the result should be cached
-	* @param bool $use_all_available Use all available instead of just all
-	* 						enabled extensions
-	* @param bool $extension_keys Whether the result should have extension name as array key
-	* @return array An array of paths to found directories
-	*/
-	public function get_directories($cache = true, $use_all_available = false, $extension_keys = false)
-	{
-		return $this->find_with_root_path($cache, true, $use_all_available, $extension_keys);
-	}
-
-	/**
-	* Finds all files matching the configured options.
-	*
-	* @param bool $cache Whether the result should be cached
-	* @param bool $use_all_available Use all available instead of just all
-	* 						enabled extensions
-	* @return array An array of paths to found files
-	*/
-	public function get_files($cache = true, $use_all_available = false)
-	{
-		return $this->find_with_root_path($cache, false, $use_all_available);
-	}
-
-	/**
-	* A wrapper around the general find which prepends a root path to results
-	*
-	* @param bool $cache Whether the result should be cached
-	* @param bool $is_dir Directories will be returned when true, only files
-	*                     otherwise
-	* @param bool $use_all_available Use all available instead of just all
-	* 						enabled extensions
-	* @param bool $extension_keys If true, result will be associative array
-	*					with extension name as key
-	* @return array An array of paths to found items
-	*/
-	protected function find_with_root_path($cache = true, $is_dir = false, $use_all_available = false, $extension_keys = false)
-	{
-		$items = $this->find($cache, $is_dir, $use_all_available);
-
-		$result = array();
-		foreach ($items as $item => $ext_name)
-		{
-			if ($extension_keys)
-			{
-				$result[$ext_name] = $this->phpbb_root_path . $item;
-			}
-			else
-			{
-				$result[] = $this->phpbb_root_path . $item;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	* Finds all file system entries matching the configured options
-	*
-	* @param bool $cache Whether the result should be cached
-	* @param bool $is_dir Directories will be returned when true, only files
-	*                     otherwise
-	* @param bool $use_all_available Use all available instead of just all
-	* 						enabled extensions
-	* @return array An array of paths to found items
-	*/
-	public function find($cache = true, $is_dir = false, $use_all_available = false)
-	{
-		if ($use_all_available)
-		{
-			$extensions = $this->extension_manager->all_available();
-		}
-		else
-		{
-			$extensions = $this->extension_manager->all_enabled();
-		}
-
-		if ($this->query['core_path'])
-		{
-			$extensions['/'] = $this->phpbb_root_path . $this->query['core_path'];
-		}
-
-		$files = array();
-		$file_list = $this->find_from_paths($extensions, $cache, $is_dir);
-
-		foreach ($file_list as $file)
-		{
-			$files[$file['named_path']] = $file['ext_name'];
-		}
-
-		return $files;
-	}
-	
-	/**
-	* Finds all file system entries matching the configured options for one
-	* specific extension
-	*
-	* @param string $extension_name Name of the extension
-	* @param string $extension_path Relative path to the extension root directory
-	* @param bool $cache Whether the result should be cached
-	* @param bool $is_dir Directories will be returned when true, only files
-	*                     otherwise
-	* @return array An array of paths to found items
-	*/
-	public function find_from_extension($extension_name, $extension_path, $cache = true, $is_dir = false)
-	{
-		$extensions = array(
-			$extension_name => $extension_path,
-		);
-
-		$files = array();
-		$file_list = $this->find_from_paths($extensions, $cache, $is_dir);
-
-		foreach ($file_list as $file)
-		{
-			$files[$file['named_path']] = $file['ext_name'];
-		}
-
-		return $files;
-	}
-
-	/**
-	* Finds all file system entries matching the configured options from
-	* an array of paths
-	*
-	* @param array $extensions Array of extensions (name => full relative path)
-	* @param bool $cache Whether the result should be cached
-	* @param bool $is_dir Directories will be returned when true, only files
-	*                     otherwise
-	* @return array An array of paths to found items
-	*/
-	public function find_from_paths($extensions, $cache = true, $is_dir = false)
-	{
-		$this->query['is_dir'] = $is_dir;
-		$query = md5(serialize($this->query) . serialize($extensions));
-
-		if (!defined('DEBUG') && $cache && isset($this->cached_queries[$query]))
-		{
-			return $this->cached_queries[$query];
-		}
-
-		$files = array();
-
-		foreach ($extensions as $name => $path)
-		{
-			$ext_name = $name;
-
-			if (!file_exists($path))
-			{
-				continue;
-			}
-
-			if ($name === '/')
-			{
-				$location = $this->query['core_path'];
-				$name = '';
-				$suffix = $this->query['core_suffix'];
-				$prefix = $this->query['core_prefix'];
-				$directory = $this->query['core_directory'];
-			}
-			else
-			{
-				$location = 'ext/';
-				$name .= '/';
-				$suffix = $this->query['extension_suffix'];
-				$prefix = $this->query['extension_prefix'];
-				$directory = $this->query['extension_directory'];
-			}
-
-			// match only first directory if leading slash is given
-			if ($directory === '/')
-			{
-				$directory_pattern = '^' . preg_quote(DIRECTORY_SEPARATOR, '#');
-			}
-			else if ($directory && $directory[0] === '/')
-			{
-				$directory_pattern = '^' . preg_quote(str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR, '#');
-			}
-			else
-			{
-				$directory_pattern = preg_quote(DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR, '#');
-			}
-			if ($is_dir)
-			{
-				$directory_pattern .= '$';
-			}
-			$directory_pattern = '#' . $directory_pattern . '#';
-
-			$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST);
-			foreach ($iterator as $file_info)
-			{
-				$filename = $file_info->getFilename();
-				if ($filename == '.' || $filename == '..')
-				{
-					continue;
-				}
-
-				if ($file_info->isDir() == $is_dir)
-				{
-					if ($is_dir)
-					{
-						$relative_path = $iterator->getInnerIterator()->getSubPath() . DIRECTORY_SEPARATOR . basename($filename) . DIRECTORY_SEPARATOR;
-						if ($relative_path[0] !== DIRECTORY_SEPARATOR)
-						{
-							$relative_path = DIRECTORY_SEPARATOR . $relative_path;
-						}
-					}
-					else
-					{
-						$relative_path = DIRECTORY_SEPARATOR . $iterator->getInnerIterator()->getSubPathname();
-					}
-
-					if ((!$suffix || substr($relative_path, -strlen($suffix)) === $suffix) &&
-						(!$prefix || substr($filename, 0, strlen($prefix)) === $prefix) &&
-						(!$directory || preg_match($directory_pattern, $relative_path)))
-					{
-						$files[] = array(
-							'named_path'	=> str_replace(DIRECTORY_SEPARATOR, '/', $location . $name . substr($relative_path, 1)),
-							'ext_name'		=> $ext_name,
-							'path'			=> str_replace(array(DIRECTORY_SEPARATOR, $this->phpbb_root_path), array('/', ''), $file_info->getPath()) . '/',
-							'filename'		=> $filename,
-						);
-					}
-				}
-			}
-		}
-
-		if ($cache && $this->cache)
-		{
-			$this->cached_queries[$query] = $files;
-			$this->cache->put($this->cache_name, $this->cached_queries);
-		}
-
-		return $files;
-	}
-}
diff --git a/phpBB/includes/extension/interface.php b/phpBB/includes/extension/interface.php
deleted file mode 100644
index 7b36a12bf6..0000000000
--- a/phpBB/includes/extension/interface.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
-*
-* @package extension
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The interface extension meta classes have to implement to run custom code
-* on enable/disable/purge.
-*
-* @package extension
-*/
-interface phpbb_extension_interface
-{
-	/**
-	* enable_step is executed on enabling an extension until it returns false.
-	*
-	* Calls to this function can be made in subsequent requests, when the
-	* function is invoked through a webserver with a too low max_execution_time.
-	*
-	* @param	mixed	$old_state	The return value of the previous call
-	*								of this method, or false on the first call
-	* @return	mixed				Returns false after last step, otherwise
-	*								temporary state which is passed as an
-	*								argument to the next step
-	*/
-	public function enable_step($old_state);
-
-	/**
-	* Disables the extension.
-	*
-	* Calls to this function can be made in subsequent requests, when the
-	* function is invoked through a webserver with a too low max_execution_time.
-	*
-	* @param	mixed	$old_state	The return value of the previous call
-	*								of this method, or false on the first call
-	* @return	mixed				Returns false after last step, otherwise
-	*								temporary state which is passed as an
-	*								argument to the next step
-	*/
-	public function disable_step($old_state);
-
-	/**
-	* purge_step is executed on purging an extension until it returns false.
-	*
-	* Calls to this function can be made in subsequent requests, when the
-	* function is invoked through a webserver with a too low max_execution_time.
-	*
-	* @param	mixed	$old_state	The return value of the previous call
-	*								of this method, or false on the first call
-	* @return	mixed				Returns false after last step, otherwise
-	*								temporary state which is passed as an
-	*								argument to the next step
-	*/
-	public function purge_step($old_state);
-}
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php
deleted file mode 100644
index 4451049d04..0000000000
--- a/phpBB/includes/extension/manager.php
+++ /dev/null
@@ -1,513 +0,0 @@
-<?php
-/**
-*
-* @package extension
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
-* The extension manager provides means to activate/deactivate extensions.
-*
-* @package extension
-*/
-class phpbb_extension_manager
-{
-	/** @var ContainerInterface */
-	protected $container;
-
-	protected $db;
-	protected $config;
-	protected $cache;
-	protected $php_ext;
-	protected $extensions;
-	protected $extension_table;
-	protected $phpbb_root_path;
-	protected $cache_name;
-
-	/**
-	* Creates a manager and loads information from database
-	*
-	* @param ContainerInterface $container A container
-	* @param phpbb_db_driver $db A database connection
-	* @param phpbb_config $config phpbb_config
-	* @param phpbb_filesystem $filesystem
-	* @param string $extension_table The name of the table holding extensions
-	* @param string $phpbb_root_path Path to the phpbb includes directory.
-	* @param string $php_ext php file extension
-	* @param phpbb_cache_driver_interface $cache A cache instance or null
-	* @param string $cache_name The name of the cache variable, defaults to _ext
-	*/
-	public function __construct(ContainerInterface $container, phpbb_db_driver $db, phpbb_config $config, phpbb_filesystem $filesystem, $extension_table, $phpbb_root_path, $php_ext = 'php', phpbb_cache_driver_interface $cache = null, $cache_name = '_ext')
-	{
-		$this->container = $container;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->db = $db;
-		$this->config = $config;
-		$this->cache = $cache;
-		$this->filesystem = $filesystem;
-		$this->php_ext = $php_ext;
-		$this->extension_table = $extension_table;
-		$this->cache_name = $cache_name;
-
-		$this->extensions = ($this->cache) ? $this->cache->get($this->cache_name) : false;
-
-		if ($this->extensions === false)
-		{
-			$this->load_extensions();
-		}
-	}
-
-	/**
-	* Loads all extension information from the database
-	*
-	* @return null
-	*/
-	public function load_extensions()
-	{
-		$this->extensions = array();
-
-		// Do not try to load any extensions when installing or updating
-		// Note: database updater invokes this code, and in 3.0
-		// there is no extension table therefore the rest of this function
-		// fails
-		if (defined('IN_INSTALL'))
-		{
-			return;
-		}
-
-		$sql = 'SELECT *
-			FROM ' . $this->extension_table;
-
-		$result = $this->db->sql_query($sql);
-		$extensions = $this->db->sql_fetchrowset($result);
-		$this->db->sql_freeresult($result);
-
-		foreach ($extensions as $extension)
-		{
-			$extension['ext_path'] = $this->get_extension_path($extension['ext_name']);
-			$this->extensions[$extension['ext_name']] = $extension;
-		}
-
-		ksort($this->extensions);
-
-		if ($this->cache)
-		{
-			$this->cache->put($this->cache_name, $this->extensions);
-		}
-	}
-
-	/**
-	* Generates the path to an extension
-	*
-	* @param string $name The name of the extension
-	* @param bool $phpbb_relative Whether the path should be relative to phpbb root
-	* @return string Path to an extension
-	*/
-	public function get_extension_path($name, $phpbb_relative = false)
-	{
-		$name = str_replace('.', '', $name);
-
-		return (($phpbb_relative) ? $this->phpbb_root_path : '') . 'ext/' . $name . '/';
-	}
-
-	/**
-	* Instantiates the extension meta class for the extension with the given name
-	*
-	* @param string $name The extension name
-	* @return phpbb_extension_interface Instance of the extension meta class or
-	*                     phpbb_extension_base if the class does not exist
-	*/
-	public function get_extension($name)
-	{
-		$extension_class_name = 'phpbb_ext_' . str_replace('/', '_', $name) . '_ext';
-
-		$migrator = $this->container->get('migrator');
-
-		if (class_exists($extension_class_name))
-		{
-			return new $extension_class_name($this->container, $this->get_finder(), $migrator, $name, $this->get_extension_path($name, true));
-		}
-		else
-		{
-			return new phpbb_extension_base($this->container, $this->get_finder(), $migrator, $name, $this->get_extension_path($name, true));
-		}
-	}
-
-	/**
-	* Instantiates the metadata manager for the extension with the given name
-	*
-	* @param string $name The extension name
-	* @param string $template The template manager
-	* @return phpbb_extension_metadata_manager Instance of the metadata manager
-	*/
-	public function create_extension_metadata_manager($name, phpbb_template $template)
-	{
-		return new phpbb_extension_metadata_manager($name, $this->config, $this, $template, $this->phpbb_root_path);
-	}
-
-	/**
-	* Runs a step of the extension enabling process.
-	*
-	* Allows the exentension to enable in a long running script that works
-	* in multiple steps across requests. State is kept for the extension
-	* in the extensions table.
-	*
-	* @param	string	$name	The extension's name
-	* @return	bool			False if enabling is finished, true otherwise
-	*/
-	public function enable_step($name)
-	{
-		// ignore extensions that are already enabled
-		if (isset($this->extensions[$name]) && $this->extensions[$name]['ext_active'])
-		{
-			return false;
-		}
-
-		$old_state = (isset($this->extensions[$name]['ext_state'])) ? unserialize($this->extensions[$name]['ext_state']) : false;
-
-		$extension = $this->get_extension($name);
-		$state = $extension->enable_step($old_state);
-
-		$active = ($state === false);
-
-		$extension_data = array(
-			'ext_name'		=> $name,
-			'ext_active'	=> $active,
-			'ext_state'		=> serialize($state),
-		);
-
-		$this->extensions[$name] = $extension_data;
-		$this->extensions[$name]['ext_path'] = $this->get_extension_path($extension_data['ext_name']);
-		ksort($this->extensions);
-
-		$sql = 'SELECT COUNT(ext_name) as row_count
-			FROM ' . $this->extension_table . "
-			WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
-		$result = $this->db->sql_query($sql);
-		$count = $this->db->sql_fetchfield('row_count');
-		$this->db->sql_freeresult($result);
-
-		if ($count)
-		{
-			$sql = 'UPDATE ' . $this->extension_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $extension_data) . "
-				WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
-			$this->db->sql_query($sql);
-		}
-		else
-		{
-			$sql = 'INSERT INTO ' . $this->extension_table . '
-				' . $this->db->sql_build_array('INSERT', $extension_data);
-			$this->db->sql_query($sql);
-		}
-
-		if ($this->cache)
-		{
-			$this->cache->purge();
-		}
-
-		return !$active;
-	}
-
-	/**
-	* Enables an extension
-	*
-	* This method completely enables an extension. But it could be long running
-	* so never call this in a script that has a max_execution time.
-	*
-	* @param string $name The extension's name
-	* @return null
-	*/
-	public function enable($name)
-	{
-		while ($this->enable_step($name));
-	}
-
-	/**
-	* Disables an extension
-	*
-	* Calls the disable method on the extension's meta class to allow it to
-	* process the event.
-	*
-	* @param string $name The extension's name
-	* @return bool False if disabling is finished, true otherwise
-	*/
-	public function disable_step($name)
-	{
-		// ignore extensions that are already disabled
-		if (!isset($this->extensions[$name]) || !$this->extensions[$name]['ext_active'])
-		{
-			return false;
-		}
-
-		$old_state = unserialize($this->extensions[$name]['ext_state']);
-
-		$extension = $this->get_extension($name);
-		$state = $extension->disable_step($old_state);
-
-		// continue until the state is false
-		if ($state !== false)
-		{
-			$extension_data = array(
-				'ext_state'		=> serialize($state),
-			);
-			$this->extensions[$name]['ext_state'] = serialize($state);
-
-			$sql = 'UPDATE ' . $this->extension_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $extension_data) . "
-				WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
-			$this->db->sql_query($sql);
-
-			if ($this->cache)
-			{
-				$this->cache->purge();
-			}
-
-			return true;
-		}
-
-		$extension_data = array(
-			'ext_active'	=> false,
-			'ext_state'		=> serialize(false),
-		);
-		$this->extensions[$name]['ext_active'] = false;
-		$this->extensions[$name]['ext_state'] = serialize(false);
-
-		$sql = 'UPDATE ' . $this->extension_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $extension_data) . "
-			WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
-		$this->db->sql_query($sql);
-
-		if ($this->cache)
-		{
-			$this->cache->purge();
-		}
-
-		return false;
-	}
-
-	/**
-	* Disables an extension
-	*
-	* Disables an extension completely at once. This process could run for a
-	* while so never call this in a script that has a max_execution time.
-	*
-	* @param string $name The extension's name
-	* @return null
-	*/
-	public function disable($name)
-	{
-		while ($this->disable_step($name));
-	}
-
-	/**
-	* Purge an extension
-	*
-	* Disables the extension first if active, and then calls purge on the
-	* extension's meta class to delete the extension's database content.
-	*
-	* @param string $name The extension's name
-	* @return bool False if purging is finished, true otherwise
-	*/
-	public function purge_step($name)
-	{
-		// ignore extensions that do not exist
-		if (!isset($this->extensions[$name]))
-		{
-			return false;
-		}
-
-		// disable first if necessary
-		if ($this->extensions[$name]['ext_active'])
-		{
-			$this->disable($name);
-		}
-
-		$old_state = unserialize($this->extensions[$name]['ext_state']);
-
-		$extension = $this->get_extension($name);
-		$state = $extension->purge_step($old_state);
-
-		// continue until the state is false
-		if ($state !== false)
-		{
-			$extension_data = array(
-				'ext_state'		=> serialize($state),
-			);
-			$this->extensions[$name]['ext_state'] = serialize($state);
-
-			$sql = 'UPDATE ' . $this->extension_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $extension_data) . "
-				WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
-			$this->db->sql_query($sql);
-
-			if ($this->cache)
-			{
-				$this->cache->purge();
-			}
-
-			return true;
-		}
-
-		unset($this->extensions[$name]);
-
-		$sql = 'DELETE FROM ' . $this->extension_table . "
-			WHERE ext_name = '" . $this->db->sql_escape($name) . "'";
-		$this->db->sql_query($sql);
-
-		if ($this->cache)
-		{
-			$this->cache->purge();
-		}
-
-		return false;
-	}
-
-	/**
-	* Purge an extension
-	*
-	* Purges an extension completely at once. This process could run for a while
-	* so never call this in a script that has a max_execution time.
-	*
-	* @param string $name The extension's name
-	* @return null
-	*/
-	public function purge($name)
-	{
-		while ($this->purge_step($name));
-	}
-
-	/**
-	* Retrieves a list of all available extensions on the filesystem
-	*
-	* @return array An array with extension names as keys and paths to the
-	*               extension as values
-	*/
-	public function all_available()
-	{
-		$available = array();
-		if (!is_dir($this->phpbb_root_path . 'ext/'))
-		{
-			return $available;
-		}
-
-		$iterator = new RecursiveIteratorIterator(
-			new RecursiveDirectoryIterator($this->phpbb_root_path . 'ext/', FilesystemIterator::NEW_CURRENT_AND_KEY | FilesystemIterator::FOLLOW_SYMLINKS),
-			RecursiveIteratorIterator::SELF_FIRST);
-		foreach ($iterator as $file_info)
-		{
-			if ($file_info->isFile() && $file_info->getFilename() == 'ext.' . $this->php_ext)
-			{
-				$ext_name = $iterator->getInnerIterator()->getSubPath();
-
-				$ext_name = str_replace(DIRECTORY_SEPARATOR, '/', $ext_name);
-
-				$available[$ext_name] = $this->phpbb_root_path . 'ext/' . $ext_name . '/';
-			}
-		}
-		ksort($available);
-		return $available;
-	}
-
-	/**
-	* Retrieves all configured extensions.
-	*
-	* All enabled and disabled extensions are considered configured. A purged
-	* extension that is no longer in the database is not configured.
-	*
-	* @return array An array with extension names as keys and and the
-	*               database stored extension information as values
-	*/
-	public function all_configured()
-	{
-		$configured = array();
-		foreach ($this->extensions as $name => $data)
-		{
-			$data['ext_path'] = $this->phpbb_root_path . $data['ext_path'];
-			$configured[$name] = $data;
-		}
-		return $configured;
-	}
-
-	/**
-	* Retrieves all enabled extensions.
-	*
-	* @return array An array with extension names as keys and and the
-	*               database stored extension information as values
-	*/
-	public function all_enabled()
-	{
-		$enabled = array();
-		foreach ($this->extensions as $name => $data)
-		{
-			if ($data['ext_active'])
-			{
-				$enabled[$name] = $this->phpbb_root_path . $data['ext_path'];
-			}
-		}
-		return $enabled;
-	}
-
-	/**
-	* Retrieves all disabled extensions.
-	*
-	* @return array An array with extension names as keys and and the
-	*               database stored extension information as values
-	*/
-	public function all_disabled()
-	{
-		$disabled = array();
-		foreach ($this->extensions as $name => $data)
-		{
-			if (!$data['ext_active'])
-			{
-				$disabled[$name] = $this->phpbb_root_path . $data['ext_path'];
-			}
-		}
-		return $disabled;
-	}
-
-	/**
-	* Check to see if a given extension is available on the filesystem
-	*
-	* @param string $name Extension name to check NOTE: Can be user input
-	* @return bool Depending on whether or not the extension is available
-	*/
-	public function available($name)
-	{
-		return file_exists($this->get_extension_path($name, true));
-	}
-
-	/**
-	* Check to see if a given extension is enabled
-	*
-	* @param string $name Extension name to check
-	* @return bool Depending on whether or not the extension is enabled
-	*/
-	public function enabled($name)
-	{
-		return isset($this->extensions[$name]) && $this->extensions[$name]['ext_active'];
-	}
-
-	/**
-	* Instantiates a phpbb_extension_finder.
-	*
-	* @return phpbb_extension_finder An extension finder instance
-	*/
-	public function get_finder()
-	{
-		return new phpbb_extension_finder($this, $this->filesystem, $this->phpbb_root_path, $this->cache, $this->php_ext, $this->cache_name . '_finder');
-	}
-}
diff --git a/phpBB/includes/extension/metadata_manager.php b/phpBB/includes/extension/metadata_manager.php
deleted file mode 100644
index 14b77c085b..0000000000
--- a/phpBB/includes/extension/metadata_manager.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-/**
-*
-* @package extension
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The extension metadata manager validates and gets meta-data for extensions
-*
-* @package extension
-*/
-class phpbb_extension_metadata_manager
-{
-	/**
-	* phpBB Config instance
-	* @var phpbb_config
-	*/
-	protected $config;
-
-	/**
-	* phpBB Extension Manager
-	* @var phpbb_extension_manager
-	*/
-	protected $extension_manager;
-
-	/**
-	* phpBB Template instance
-	* @var phpbb_template
-	*/
-	protected $template;
-
-	/**
-	* phpBB root path
-	* @var string
-	*/
-	protected $phpbb_root_path;
-
-	/**
-	* Name (including vendor) of the extension
-	* @var string
-	*/
-	protected $ext_name;
-
-	/**
-	* Metadata from the composer.json file
-	* @var array
-	*/
-	protected $metadata;
-
-	/**
-	* Link (including root path) to the metadata file
-	* @var string
-	*/
-	protected $metadata_file;
-
-	/**
-	* Creates the metadata manager
-	*
-	* @param string				$ext_name			Name (including vendor) of the extension
-	* @param phpbb_config		$config				phpBB Config instance
-	* @param phpbb_extension_manager	$extension_manager An instance of the phpBBb extension manager
-	* @param phpbb_template		$template			phpBB Template instance
-	* @param string				$phpbb_root_path	Path to the phpbb includes directory.
-	*/
-	public function __construct($ext_name, phpbb_config $config, phpbb_extension_manager $extension_manager, phpbb_template $template, $phpbb_root_path)
-	{
-		$this->config = $config;
-		$this->extension_manager = $extension_manager;
-		$this->template = $template;
-		$this->phpbb_root_path = $phpbb_root_path;
-
-		$this->ext_name = $ext_name;
-		$this->metadata = array();
-		$this->metadata_file = '';
-	}
-
-	/**
-	 * Processes and gets the metadata requested
-	 *
-	 * @param  string $element			All for all metadata that it has and is valid, otherwise specify which section you want by its shorthand term.
-	 * @return array					Contains all of the requested metadata, throws an exception on failure
-	 */
-	public function get_metadata($element = 'all')
-	{
-		$this->set_metadata_file();
-
-		// Fetch the metadata
-		$this->fetch_metadata();
-
-		// Clean the metadata
-		$this->clean_metadata_array();
-
-		switch ($element)
-		{
-			case 'all':
-			default:
-				// Validate the metadata
-				if (!$this->validate())
-				{
-					return false;
-				}
-
-				return $this->metadata;
-			break;
-
-			case 'name':
-				return ($this->validate('name')) ? $this->metadata['name'] : false;
-			break;
-
-			case 'display-name':
-				if (isset($this->metadata['extra']['display-name']))
-				{
-					return $this->metadata['extra']['display-name'];
-				}
-				else
-				{
-					return ($this->validate('name')) ? $this->metadata['name'] : false;
-				}
-			break;
-		}
-	}
-
-	/**
-	 * Sets the filepath of the metadata file
-	 *
-	 * @return boolean  Set to true if it exists, throws an exception on failure
-	 */
-	private function set_metadata_file()
-	{
-		$ext_filepath = $this->extension_manager->get_extension_path($this->ext_name);
-		$metadata_filepath = $this->phpbb_root_path . $ext_filepath . 'composer.json';
-
-		$this->metadata_file = $metadata_filepath;
-
-		if (!file_exists($this->metadata_file))
-		{
-    		throw new phpbb_extension_exception('The required file does not exist: ' . $this->metadata_file);
-		}
-	}
-
-	/**
-	 * Gets the contents of the composer.json file
-	 *
-	 * @return bool True if success, throws an exception on failure
-	 */
-	private function fetch_metadata()
-	{
-		if (!file_exists($this->metadata_file))
-		{
-			throw new phpbb_extension_exception('The required file does not exist: ' . $this->metadata_file);
-		}
-		else
-		{
-			if (!($file_contents = file_get_contents($this->metadata_file)))
-			{
-    			throw new phpbb_extension_exception('file_get_contents failed on ' . $this->metadata_file);
-			}
-
-			if (($metadata = json_decode($file_contents, true)) === NULL)
-			{
-    			throw new phpbb_extension_exception('json_decode failed on ' . $this->metadata_file);
-			}
-
-			$this->metadata = $metadata;
-
-			return true;
-		}
-	}
-
-	/**
-	 * This array handles the cleaning of the array
-	 *
-	 * @return array Contains the cleaned metadata array
-	 */
-	private function clean_metadata_array()
-	{
-		return $this->metadata;
-	}
-
-	/**
-	* Validate fields
-	*
-	* @param string $name  ("all" for display and enable validation
-	* 						"display" for name, type, and authors
-	* 						"name", "type")
-	* @return Bool True if valid, throws an exception if invalid
-	*/
-	public function validate($name = 'display')
-    {
-    	// Basic fields
-    	$fields = array(
-    		'name'		=> '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#',
-    		'type'		=> '#^phpbb3-extension$#',
-    		'licence'	=> '#.+#',
-    		'version'	=> '#.+#',
-    	);
-
-    	switch ($name)
-    	{
-    		case 'all':
-    			$this->validate('display');
-
-				$this->validate_enable();
-    		break;
-
-    		case 'display':
-    			foreach ($fields as $field => $data)
-				{
-					$this->validate($field);
-				}
-
-				$this->validate_authors();
-    		break;
-
-    		default:
-    			if (isset($fields[$name]))
-    			{
-    				if (!isset($this->metadata[$name]))
-    				{
-    					throw new phpbb_extension_exception("Required meta field '$name' has not been set.");
-					}
-
-					if (!preg_match($fields[$name], $this->metadata[$name]))
-					{
-    					throw new phpbb_extension_exception("Meta field '$name' is invalid.");
-					}
-				}
-			break;
-		}
-
-		return true;
-    }
-
-	/**
-	 * Validates the contents of the authors field
-	 *
-	 * @return boolean True when passes validation, throws exception if invalid
-	 */
-	public function validate_authors()
-	{
-		if (empty($this->metadata['authors']))
-		{
-    		throw new phpbb_extension_exception("Required meta field 'authors' has not been set.");
-		}
-
-		foreach ($this->metadata['authors'] as $author)
-		{
-			if (!isset($author['name']))
-			{
-    			throw new phpbb_extension_exception("Required meta field 'author name' has not been set.");
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * This array handles the verification that this extension can be enabled on this board
-	 *
-	 * @return bool True if validation succeeded, False if failed
-	 */
-	public function validate_enable()
-	{
-		// Check for phpBB, PHP versions
-		if (!$this->validate_require_phpbb() || !$this->validate_require_php())
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Validates the contents of the phpbb requirement field
-	 *
-	 * @return boolean True when passes validation
-	 */
-	public function validate_require_phpbb()
-	{
-		if (!isset($this->metadata['require']['phpbb']))
-		{
-			return true;
-		}
-
-		return $this->_validate_version($this->metadata['require']['phpbb'], $this->config['version']);
-	}
-
-	/**
-	 * Validates the contents of the php requirement field
-	 *
-	 * @return boolean True when passes validation
-	 */
-	public function validate_require_php()
-	{
-		if (!isset($this->metadata['require']['php']))
-		{
-			return true;
-		}
-
-		return $this->_validate_version($this->metadata['require']['php'], phpversion());
-	}
-
-	/**
-	* Version validation helper
-	*
-	* @param string $string The string for comparing to a version
-	* @param string $current_version The version to compare to
-	* @return bool True/False if meets version requirements
-	*/
-	private function _validate_version($string, $current_version)
-	{
-		// Allow them to specify their own comparison operator (ex: <3.1.2, >=3.1.0)
-		$comparison_matches = false;
-		preg_match('#[=<>]+#', $string, $comparison_matches);
-
-		if (!empty($comparison_matches))
-		{
-			return version_compare($current_version, str_replace(array($comparison_matches[0], ' '), '', $string), $comparison_matches[0]);
-		}
-
-		return version_compare($current_version, $string, '>=');
-	}
-
-	/**
-	 * Outputs the metadata into the template
-	 *
-	 * @return null
-	 */
-	public function output_template_data()
-	{
-		$this->template->assign_vars(array(
-			'META_NAME'			=> htmlspecialchars($this->metadata['name']),
-			'META_TYPE'			=> htmlspecialchars($this->metadata['type']),
-			'META_DESCRIPTION'	=> (isset($this->metadata['description'])) ? htmlspecialchars($this->metadata['description']) : '',
-			'META_HOMEPAGE'		=> (isset($this->metadata['homepage'])) ? $this->metadata['homepage'] : '',
-			'META_VERSION'		=> (isset($this->metadata['version'])) ? htmlspecialchars($this->metadata['version']) : '',
-			'META_TIME'			=> (isset($this->metadata['time'])) ? htmlspecialchars($this->metadata['time']) : '',
-			'META_LICENCE'		=> htmlspecialchars($this->metadata['licence']),
-
-			'META_REQUIRE_PHP'		=> (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '',
-			'META_REQUIRE_PHP_FAIL'	=> !$this->validate_require_php(),
-
-			'META_REQUIRE_PHPBB'		=> (isset($this->metadata['require']['phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb']) : '',
-			'META_REQUIRE_PHPBB_FAIL'	=> !$this->validate_require_phpbb(),
-
-			'META_DISPLAY_NAME'	=> (isset($this->metadata['extra']['display-name'])) ? htmlspecialchars($this->metadata['extra']['display-name']) : '',
-		));
-
-		foreach ($this->metadata['authors'] as $author)
-		{
-			$this->template->assign_block_vars('meta_authors', array(
-				'AUTHOR_NAME'		=> htmlspecialchars($author['name']),
-				'AUTHOR_EMAIL'		=> (isset($author['email'])) ? $author['email'] : '',
-				'AUTHOR_HOMEPAGE'	=> (isset($author['homepage'])) ? $author['homepage'] : '',
-				'AUTHOR_ROLE'		=> (isset($author['role'])) ? htmlspecialchars($author['role']) : '',
-			));
-		}
-	}
-}
diff --git a/phpBB/includes/extension/provider.php b/phpBB/includes/extension/provider.php
deleted file mode 100644
index 45b55e5cab..0000000000
--- a/phpBB/includes/extension/provider.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
-*
-* @package extension
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Provides a set of items found in extensions.
-*
-* This abstract class is essentially a wrapper around item-specific
-* finding logic. It handles storing the extension manager via constructor
-* for the finding logic to use to find the items, and provides an
-* iterator interface over the items found by the finding logic.
-*
-* Items could be anything, for example template paths or cron task names.
-* Derived classes completely define what the items are.
-*
-* @package extension
-*/
-abstract class phpbb_extension_provider implements IteratorAggregate
-{
-	/**
-	* Array holding all found items
-	* @var array|null
-	*/
-	protected $items = null;
-
-	/**
-	* An extension manager to search for items in extensions
-	* @var phpbb_extension_manager
-	*/
-	protected $extension_manager;
-
-	/**
-	* Constructor. Loads all available items.
-	*
-	* @param phpbb_extension_manager $extension_manager phpBB extension manager
-	*/
-	public function __construct(phpbb_extension_manager $extension_manager)
-	{
-		$this->extension_manager = $extension_manager;
-	}
-
-	/**
-	* Finds items using the extension manager.
-	*
-	* @return array     List of task names
-	*/
-	abstract protected function find();
-
-	/**
-	* Retrieve an iterator over all items
-	*
-	* @return ArrayIterator An iterator for the array of template paths
-	*/
-	public function getIterator()
-	{
-		if ($this->items === null)
-		{
-			$this->items = $this->find();
-		}
-
-		return new ArrayIterator($this->items);
-	}
-}
diff --git a/phpBB/includes/feed/base.php b/phpBB/includes/feed/base.php
deleted file mode 100644
index 296d830932..0000000000
--- a/phpBB/includes/feed/base.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base class with some generic functions and settings.
-*
-* @package phpBB3
-*/
-abstract class phpbb_feed_base
-{
-	/**
-	* Feed helper object
-	* @var phpbb_feed_helper
-	*/
-	protected $helper;
-
-	/** @var phpbb_config */
-	protected $config;
-
-	/** @var phpbb_db_driver */
-	protected $db;
-
-	/** @var phpbb_cache_driver_interface */
-	protected $cache;
-
-	/** @var phpbb_user */
-	protected $user;
-
-	/** @var phpbb_auth */
-	protected $auth;
-
-	/** @var string */
-	protected $phpEx;
-
-	/**
-	* SQL Query to be executed to get feed items
-	*/
-	var $sql = array();
-
-	/**
-	* Keys specified for retrieval of title, content, etc.
-	*/
-	var $keys = array();
-
-	/**
-	* Number of items to fetch. Usually overwritten by $config['feed_something']
-	*/
-	var $num_items = 15;
-
-	/**
-	* Separator for title elements to separate items (for example forum / topic)
-	*/
-	var $separator = "\xE2\x80\xA2"; // &bull;
-
-	/**
-	* Separator for the statistics row (Posted by, post date, replies, etc.)
-	*/
-	var $separator_stats = "\xE2\x80\x94"; // &mdash;
-
-	/**
-	* Constructor
-	*
-	* @param phpbb_feed_helper $helper Feed helper
-	* @param phpbb_config		$config		Config object
-	* @param phpbb_db_driver	$db			Database connection
-	* @param phpbb_cache_driver_interface	$cache			Cache object
-	* @param phpbb_user			$user		User object
-	* @param phpbb_auth			$auth		Auth object
-	* @param phpbb_content_visibility	$content_visibility		Auth object
-	* @param string				$phpEx		php file extension
-	* @return	null
-	*/
-	function __construct(phpbb_feed_helper $helper, phpbb_config $config, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, phpbb_user $user, phpbb_auth $auth, phpbb_content_visibility $content_visibility, $phpEx)
-	{
-		$this->config = $config;
-		$this->helper = $helper;
-		$this->db = $db;
-		$this->cache = $cache;
-		$this->user = $user;
-		$this->auth = $auth;
-		$this->content_visibility = $content_visibility;
-		$this->phpEx = $phpEx;
-
-		$this->set_keys();
-
-		// Allow num_items to be string
-		if (is_string($this->num_items))
-		{
-			$this->num_items = (int) $this->config[$this->num_items];
-
-			// A precaution
-			if (!$this->num_items)
-			{
-				$this->num_items = 10;
-			}
-		}
-	}
-
-	/**
-	* Set keys.
-	*/
-	function set_keys()
-	{
-	}
-
-	/**
-	* Open feed
-	*/
-	function open()
-	{
-	}
-
-	/**
-	* Close feed
-	*/
-	function close()
-	{
-		if (!empty($this->result))
-		{
-			$this->db->sql_freeresult($this->result);
-		}
-	}
-
-	/**
-	* Set key
-	*/
-	function set($key, $value)
-	{
-		$this->keys[$key] = $value;
-	}
-
-	/**
-	* Get key
-	*/
-	function get($key)
-	{
-		return (isset($this->keys[$key])) ? $this->keys[$key] : NULL;
-	}
-
-	function get_readable_forums()
-	{
-		static $forum_ids;
-
-		if (!isset($forum_ids))
-		{
-			$forum_ids = array_keys($this->auth->acl_getf('f_read', true));
-		}
-
-		return $forum_ids;
-	}
-
-	function get_moderator_approve_forums()
-	{
-		static $forum_ids;
-
-		if (!isset($forum_ids))
-		{
-			$forum_ids = array_keys($this->auth->acl_getf('m_approve', true));
-		}
-
-		return $forum_ids;
-	}
-
-	function is_moderator_approve_forum($forum_id)
-	{
-		static $forum_ids;
-
-		if (!isset($forum_ids))
-		{
-			$forum_ids = array_flip($this->get_moderator_approve_forums());
-		}
-
-		return (isset($forum_ids[$forum_id])) ? true : false;
-	}
-
-	function get_excluded_forums()
-	{
-		static $forum_ids;
-
-		// Matches acp/acp_board.php
-		$cache_name	= 'feed_excluded_forum_ids';
-
-		if (!isset($forum_ids) && ($forum_ids = $this->cache->get('_' . $cache_name)) === false)
-		{
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE ' . $this->db->sql_bit_and('forum_options', FORUM_OPTION_FEED_EXCLUDE, '<> 0');
-			$result = $this->db->sql_query($sql);
-
-			$forum_ids = array();
-			while ($forum_id = (int) $this->db->sql_fetchfield('forum_id'))
-			{
-				$forum_ids[$forum_id] = $forum_id;
-			}
-			$this->db->sql_freeresult($result);
-
-			$this->cache->put('_' . $cache_name, $forum_ids);
-		}
-
-		return $forum_ids;
-	}
-
-	function is_excluded_forum($forum_id)
-	{
-		$forum_ids = $this->get_excluded_forums();
-
-		return isset($forum_ids[$forum_id]) ? true : false;
-	}
-
-	function get_passworded_forums()
-	{
-		return $this->user->get_passworded_forums();
-	}
-
-	function get_item()
-	{
-		static $result;
-
-		if (!isset($result))
-		{
-			if (!$this->get_sql())
-			{
-				return false;
-			}
-
-			// Query database
-			$sql = $this->db->sql_build_query('SELECT', $this->sql);
-			$result = $this->db->sql_query_limit($sql, $this->num_items);
-		}
-
-		return $this->db->sql_fetchrow($result);
-	}
-
-	function user_viewprofile($row)
-	{
-		$author_id = (int) $row[$this->get('author_id')];
-
-		if ($author_id == ANONYMOUS)
-		{
-			// Since we cannot link to a profile, we just return GUEST
-			// instead of $row['username']
-			return $this->user->lang['GUEST'];
-		}
-
-		return '<a href="' . $this->helper->append_sid('memberlist.' . $this->phpEx, 'mode=viewprofile&amp;u=' . $author_id) . '">' . $row[$this->get('creator')] . '</a>';
-	}
-}
diff --git a/phpBB/includes/feed/factory.php b/phpBB/includes/feed/factory.php
deleted file mode 100644
index 63a1eb8ef0..0000000000
--- a/phpBB/includes/feed/factory.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Factory class to return correct object
-* @package phpBB3
-*/
-class phpbb_feed_factory
-{
-	/**
-	* Service container object
-	* @var object
-	*/
-	protected $container;
-
-	/** @var phpbb_config */
-	protected $config;
-
-	/** @var phpbb_db_driver */
-	protected $db;
-
-	/**
-	* Constructor
-	*
-	* @param objec				$container	Container object
-	* @param phpbb_config		$config		Config object
-	* @param phpbb_db_driver	$db			Database connection
-	* @return	null
-	*/
-	public function __construct($container, phpbb_config $config, phpbb_db_driver $db)
-	{
-		$this->container = $container;
-		$this->config = $config;
-		$this->db = $db;
-	}
-
-	/**
-	* Return correct object for specified mode
-	*
-	* @param string	$mode		The feeds mode.
-	* @param int	$forum_id	Forum id specified by the script if forum feed provided.
-	* @param int	$topic_id	Topic id specified by the script if topic feed provided.
-	*
-	* @return object	Returns correct feeds object for specified mode.
-	*/
-	function get_feed($mode, $forum_id, $topic_id)
-	{
-		switch ($mode)
-		{
-			case 'forums':
-				if (!$this->config['feed_overall_forums'])
-				{
-					return false;
-				}
-
-				return $this->container->get('feed.forums');
-			break;
-
-			case 'topics':
-			case 'topics_new':
-				if (!$this->config['feed_topics_new'])
-				{
-					return false;
-				}
-
-				return $this->container->get('feed.topics');
-			break;
-
-			case 'topics_active':
-				if (!$this->config['feed_topics_active'])
-				{
-					return false;
-				}
-
-				return $this->container->get('feed.topics_active');
-			break;
-
-			case 'news':
-				// Get at least one news forum
-				$sql = 'SELECT forum_id
-					FROM ' . FORUMS_TABLE . '
-					WHERE ' . $this->db->sql_bit_and('forum_options', FORUM_OPTION_FEED_NEWS, '<> 0');
-				$result = $this->db->sql_query_limit($sql, 1, 0, 600);
-				$s_feed_news = (int) $this->db->sql_fetchfield('forum_id');
-				$this->db->sql_freeresult($result);
-
-				if (!$s_feed_news)
-				{
-					return false;
-				}
-
-				return $this->container->get('feed.news');
-			break;
-
-			default:
-				if ($topic_id && $this->config['feed_topic'])
-				{
-					return $this->container->get('feed.topic')
-								->set_topic_id($topic_id);
-				}
-				else if ($forum_id && $this->config['feed_forum'])
-				{
-					return $this->container->get('feed.forum')
-								->set_forum_id($forum_id);
-				}
-				else if ($this->config['feed_overall'])
-				{
-				return $this->container->get('feed.overall');
-				}
-
-				return false;
-			break;
-		}
-	}
-}
diff --git a/phpBB/includes/feed/forum.php b/phpBB/includes/feed/forum.php
deleted file mode 100644
index b5f0dd0f8f..0000000000
--- a/phpBB/includes/feed/forum.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Forum feed
-*
-* This will give you the last {$this->num_items} posts made
-* within a specific forum.
-*
-* @package phpBB3
-*/
-class phpbb_feed_forum extends phpbb_feed_post_base
-{
-	var $forum_id		= 0;
-	var $forum_data		= array();
-
-	/**
-	* Set the Forum ID
-	*
-	* @param int	$forum_id			Forum ID
-	* @return	phpbb_feed_forum
-	*/
-	public function set_forum_id($topic_id)
-	{
-		$this->forum_id = (int) $forum_id;
-
-		return $this;
-	}
-
-	function open()
-	{
-		// Check if forum exists
-		$sql = 'SELECT forum_id, forum_name, forum_password, forum_type, forum_options
-			FROM ' . FORUMS_TABLE . '
-			WHERE forum_id = ' . $this->forum_id;
-		$result = $this->db->sql_query($sql);
-		$this->forum_data = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (empty($this->forum_data))
-		{
-			trigger_error('NO_FORUM');
-		}
-
-		// Forum needs to be postable
-		if ($this->forum_data['forum_type'] != FORUM_POST)
-		{
-			trigger_error('NO_FEED');
-		}
-
-		// Make sure forum is not excluded from feed
-		if (phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $this->forum_data['forum_options']))
-		{
-			trigger_error('NO_FEED');
-		}
-
-		// Make sure we can read this forum
-		if (!$this->auth->acl_get('f_read', $this->forum_id))
-		{
-			trigger_error('SORRY_AUTH_READ');
-		}
-
-		// Make sure forum is not passworded or user is authed
-		if ($this->forum_data['forum_password'])
-		{
-			$forum_ids_passworded = $this->get_passworded_forums();
-
-			if (isset($forum_ids_passworded[$this->forum_id]))
-			{
-				trigger_error('SORRY_AUTH_READ');
-			}
-
-			unset($forum_ids_passworded);
-		}
-	}
-
-	function get_sql()
-	{
-		// Determine topics with recent activity
-		$sql = 'SELECT topic_id, topic_last_post_time
-			FROM ' . TOPICS_TABLE . '
-			WHERE forum_id = ' . $this->forum_id . '
-				AND topic_moved_id = 0
-				AND ' . $this->content_visibility->get_visibility_sql('topic', $this->forum_id) . '
-			ORDER BY topic_last_post_time DESC';
-		$result = $this->db->sql_query_limit($sql, $this->num_items);
-
-		$topic_ids = array();
-		$min_post_time = 0;
-		while ($row = $this->db->sql_fetchrow())
-		{
-			$topic_ids[] = (int) $row['topic_id'];
-
-			$min_post_time = (int) $row['topic_last_post_time'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($topic_ids))
-		{
-			return false;
-		}
-
-		$this->sql = array(
-			'SELECT'	=>	'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
-							'u.username, u.user_id',
-			'FROM'		=> array(
-				POSTS_TABLE		=> 'p',
-				USERS_TABLE		=> 'u',
-			),
-			'WHERE'		=> $this->db->sql_in_set('p.topic_id', $topic_ids) . '
-							AND ' . $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.') . '
-							AND p.post_time >= ' . $min_post_time . '
-							AND p.poster_id = u.user_id',
-			'ORDER_BY'	=> 'p.post_time DESC',
-		);
-
-		return true;
-	}
-
-	function adjust_item(&$item_row, &$row)
-	{
-		parent::adjust_item($item_row, $row);
-
-		$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
-	}
-
-	function get_item()
-	{
-		return ($row = parent::get_item()) ? array_merge($this->forum_data, $row) : $row;
-	}
-}
diff --git a/phpBB/includes/feed/forums.php b/phpBB/includes/feed/forums.php
deleted file mode 100644
index 409097a9f3..0000000000
--- a/phpBB/includes/feed/forums.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* 'All Forums' feed
-*
-* This will give you a list of all postable forums where feeds are enabled
-* including forum description, topic stats and post stats
-*
-* @package phpBB3
-*/
-class phpbb_feed_forums extends phpbb_feed_base
-{
-	var $num_items	= 0;
-
-	function set_keys()
-	{
-		$this->set('title',		'forum_name');
-		$this->set('text',		'forum_desc');
-		$this->set('bitfield',	'forum_desc_bitfield');
-		$this->set('bbcode_uid','forum_desc_uid');
-		$this->set('updated',	'forum_last_post_time');
-		$this->set('options',	'forum_desc_options');
-	}
-
-	function get_sql()
-	{
-		$in_fid_ary = array_diff($this->get_readable_forums(), $this->get_excluded_forums());
-		if (empty($in_fid_ary))
-		{
-			return false;
-		}
-
-		// Build SQL Query
-		$this->sql = array(
-			'SELECT'	=> 'f.forum_id, f.left_id, f.forum_name, f.forum_last_post_time,
-							f.forum_desc, f.forum_desc_bitfield, f.forum_desc_uid, f.forum_desc_options,
-							f.forum_topics_approved, f.forum_posts_approved',
-			'FROM'		=> array(FORUMS_TABLE => 'f'),
-			'WHERE'		=> 'f.forum_type = ' . FORUM_POST . '
-							AND ' . $this->db->sql_in_set('f.forum_id', $in_fid_ary),
-			'ORDER_BY'	=> 'f.left_id ASC',
-		);
-
-		return true;
-	}
-
-	function adjust_item(&$item_row, &$row)
-	{
-		$item_row['link'] = $this->helper->append_sid('viewforum.' . $this->phpEx, 'f=' . $row['forum_id']);
-
-		if ($this->config['feed_item_statistics'])
-		{
-			$item_row['statistics'] = $this->user->lang('TOTAL_TOPICS', (int) $row['forum_topics_approved'])
-				. ' ' . $this->separator_stats . ' ' . $this->user->lang('TOTAL_POSTS_COUNT', (int) $row['forum_posts_approved']);
-		}
-	}
-}
diff --git a/phpBB/includes/feed/helper.php b/phpBB/includes/feed/helper.php
deleted file mode 100644
index 93330aa2ad..0000000000
--- a/phpBB/includes/feed/helper.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Class with some helpful functions used in feeds
-* @package phpBB3
-*/
-class phpbb_feed_helper
-{
-	/** @var phpbb_config */
-	protected $config;
-
-	/** @var phpbb_user */
-	protected $user;
-
-	/** @var string */
-	protected $phpbb_root_path;
-
-	/**
-	* Constructor
-	*
-	* @param	phpbb_config	$config		Config object
-	* @param	phpbb_user		$user		User object
-	* @param	string	$phpbb_root_path	Root path
-	* @return	null
-	*/
-	public function __construct(phpbb_config $config, phpbb_user $user, $phpbb_root_path)
-	{
-		$this->config = $config;
-		$this->user = $user;
-		$this->phpbb_root_path = $phpbb_root_path;
-	}
-
-	/**
-	* Run links through append_sid(), prepend generate_board_url() and remove session id
-	*/
-	public function get_board_url()
-	{
-		static $board_url;
-
-		if (empty($board_url))
-		{
-			$board_url = generate_board_url();
-		}
-
-		return $board_url;
-	}
-
-	/**
-	* Run links through append_sid(), prepend generate_board_url() and remove session id
-	*/
-	public function append_sid($url, $params)
-	{
-		return append_sid($this->get_board_url() . '/' . $url, $params, true, '');
-	}
-
-	/**
-	* Generate ISO 8601 date string (RFC 3339)
-	*/
-	public function format_date($time)
-	{
-		static $zone_offset;
-		static $offset_string;
-
-		if (empty($offset_string))
-		{
-			$zone_offset = $this->user->create_datetime()->getOffset();
-			$offset_string = phpbb_format_timezone_offset($zone_offset);
-		}
-
-		return gmdate("Y-m-d\TH:i:s", $time + $zone_offset) . $offset_string;
-	}
-
-	/**
-	* Generate text content
-	*/
-	public function generate_content($content, $uid, $bitfield, $options)
-	{
-		if (empty($content))
-		{
-			return '';
-		}
-
-		// Prepare some bbcodes for better parsing
-		$content	= preg_replace("#\[quote(=&quot;.*?&quot;)?:$uid\]\s*(.*?)\s*\[/quote:$uid\]#si", "[quote$1:$uid]<br />$2<br />[/quote:$uid]", $content);
-
-		$content = generate_text_for_display($content, $uid, $bitfield, $options);
-
-		// Add newlines
-		$content = str_replace('<br />', '<br />' . "\n", $content);
-
-		// Convert smiley Relative paths to Absolute path, Windows style
-		$content = str_replace($this->phpbb_root_path . $this->config['smilies_path'], $this->get_board_url() . '/' . $this->config['smilies_path'], $content);
-
-		// Remove "Select all" link and mouse events
-		$content = str_replace('<a href="#" onclick="selectCode(this); return false;">' . $this->user->lang['SELECT_ALL_CODE'] . '</a>', '', $content);
-		$content = preg_replace('#(onkeypress|onclick)="(.*?)"#si', '', $content);
-
-		// Firefox does not support CSS for feeds, though
-
-		// Remove font sizes
-	//	$content = preg_replace('#<span style="font-size: [0-9]+%; line-height: [0-9]+%;">([^>]+)</span>#iU', '\1', $content);
-
-		// Make text strong :P
-	//	$content = preg_replace('#<span style="font-weight: bold?">(.*?)</span>#iU', '<strong>\1</strong>', $content);
-
-		// Italic
-	//	$content = preg_replace('#<span style="font-style: italic?">([^<]+)</span>#iU', '<em>\1</em>', $content);
-
-		// Underline
-	//	$content = preg_replace('#<span style="text-decoration: underline?">([^<]+)</span>#iU', '<u>\1</u>', $content);
-
-		// Remove embed Windows Media Streams
-		$content	= preg_replace( '#<\!--\[if \!IE\]>-->([^[]+)<\!--<!\[endif\]-->#si', '', $content);
-
-		// Do not use &lt; and &gt;, because we want to retain code contained in [code][/code]
-
-		// Remove embed and objects
-		$content	= preg_replace( '#<(object|embed)(.*?) (value|src)=(.*?) ([^[]+)(object|embed)>#si',' <a href=$4 target="_blank"><strong>$1</strong></a> ',$content);
-
-		// Remove some specials html tag, because somewhere there are a mod to allow html tags ;)
-		$content	= preg_replace( '#<(script|iframe)([^[]+)\1>#siU', ' <strong>$1</strong> ', $content);
-
-		// Remove Comments from inline attachments [ia]
-		$content	= preg_replace('#<div class="(inline-attachment|attachtitle)">(.*?)<!-- ia(.*?) -->(.*?)<!-- ia(.*?) -->(.*?)</div>#si','$4',$content);
-
-		// Replace some entities with their unicode counterpart
-		$entities = array(
-			'&nbsp;'	=> "\xC2\xA0",
-			'&bull;'	=> "\xE2\x80\xA2",
-			'&middot;'	=> "\xC2\xB7",
-			'&copy;'	=> "\xC2\xA9",
-		);
-
-		$content = str_replace(array_keys($entities), array_values($entities), $content);
-
-		// Remove CDATA blocks. ;)
-		$content = preg_replace('#\<\!\[CDATA\[(.*?)\]\]\>#s', '', $content);
-
-		// Other control characters
-		$content = preg_replace('#(?:[\x00-\x1F\x7F]+|(?:\xC2[\x80-\x9F])+)#', '', $content);
-
-		return $content;
-	}
-}
diff --git a/phpBB/includes/feed/news.php b/phpBB/includes/feed/news.php
deleted file mode 100644
index f2d45b5165..0000000000
--- a/phpBB/includes/feed/news.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* News feed
-*
-* This will give you {$this->num_items} first posts
-* of all topics in the selected news forums.
-*
-* @package phpBB3
-*/
-class phpbb_feed_news extends phpbb_feed_topic_base
-{
-	function get_news_forums()
-	{
-		static $forum_ids;
-
-		// Matches acp/acp_board.php
-		$cache_name	= 'feed_news_forum_ids';
-
-		if (!isset($forum_ids) && ($forum_ids = $this->cache->get('_' . $cache_name)) === false)
-		{
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE ' . $this->db->sql_bit_and('forum_options', FORUM_OPTION_FEED_NEWS, '<> 0');
-			$result = $this->db->sql_query($sql);
-
-			$forum_ids = array();
-			while ($forum_id = (int) $this->db->sql_fetchfield('forum_id'))
-			{
-				$forum_ids[$forum_id] = $forum_id;
-			}
-			$this->db->sql_freeresult($result);
-
-			$this->cache->put('_' . $cache_name, $forum_ids);
-		}
-
-		return $forum_ids;
-	}
-
-	function get_sql()
-	{
-		// Determine forum ids
-		$in_fid_ary = array_intersect($this->get_news_forums(), $this->get_readable_forums());
-		if (empty($in_fid_ary))
-		{
-			return false;
-		}
-
-		$in_fid_ary = array_diff($in_fid_ary, $this->get_passworded_forums());
-		if (empty($in_fid_ary))
-		{
-			return false;
-		}
-
-		// We really have to get the post ids first!
-		$sql = 'SELECT topic_first_post_id, topic_time
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('forum_id', $in_fid_ary) . '
-				AND topic_moved_id = 0
-				AND topic_visibility = ' . ITEM_APPROVED . '
-			ORDER BY topic_time DESC';
-		$result = $this->db->sql_query_limit($sql, $this->num_items);
-
-		$post_ids = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$post_ids[] = (int) $row['topic_first_post_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($post_ids))
-		{
-			return false;
-		}
-
-		$this->sql = array(
-			'SELECT'	=> 'f.forum_id, f.forum_name,
-							t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_views, t.topic_time, t.topic_last_post_time,
-							p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
-			'FROM'		=> array(
-				TOPICS_TABLE	=> 't',
-				POSTS_TABLE		=> 'p',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(FORUMS_TABLE => 'f'),
-					'ON'	=> 'p.forum_id = f.forum_id',
-				),
-			),
-			'WHERE'		=> 'p.topic_id = t.topic_id
-							AND ' . $this->db->sql_in_set('p.post_id', $post_ids),
-			'ORDER_BY'	=> 'p.post_time DESC',
-		);
-
-		return true;
-	}
-}
diff --git a/phpBB/includes/feed/overall.php b/phpBB/includes/feed/overall.php
deleted file mode 100644
index 869df7cde0..0000000000
--- a/phpBB/includes/feed/overall.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Board wide feed (aka overall feed)
-*
-* This will give you the newest {$this->num_items} posts
-* from the whole board.
-*
-* @package phpBB3
-*/
-class phpbb_feed_overall extends phpbb_feed_post_base
-{
-	function get_sql()
-	{
-		$forum_ids = array_diff($this->get_readable_forums(), $this->get_excluded_forums(), $this->get_passworded_forums());
-		if (empty($forum_ids))
-		{
-			return false;
-		}
-
-		// Determine topics with recent activity
-		$sql = 'SELECT topic_id, topic_last_post_time
-			FROM ' . TOPICS_TABLE . '
-			WHERE topic_moved_id = 0
-				AND ' . $this->content_visibility->get_forums_visibility_sql('topic', $forum_ids) . '
-			ORDER BY topic_last_post_time DESC';
-		$result = $this->db->sql_query_limit($sql, $this->num_items);
-
-		$topic_ids = array();
-		$min_post_time = 0;
-		while ($row = $this->db->sql_fetchrow())
-		{
-			$topic_ids[] = (int) $row['topic_id'];
-
-			$min_post_time = (int) $row['topic_last_post_time'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($topic_ids))
-		{
-			return false;
-		}
-
-		// Get the actual data
-		$this->sql = array(
-			'SELECT'	=>	'f.forum_id, f.forum_name, ' .
-							'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
-							'u.username, u.user_id',
-			'FROM'		=> array(
-				USERS_TABLE		=> 'u',
-				POSTS_TABLE		=> 'p',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(FORUMS_TABLE	=> 'f'),
-					'ON'	=> 'f.forum_id = p.forum_id',
-				),
-			),
-			'WHERE'		=> $this->db->sql_in_set('p.topic_id', $topic_ids) . '
-							AND ' . $this->content_visibility->get_visibility_sql('post', array(), 'p.') . '
-							AND p.post_time >= ' . $min_post_time . '
-							AND u.user_id = p.poster_id',
-			'ORDER_BY'	=> 'p.post_time DESC',
-		);
-
-		return true;
-	}
-
-	function adjust_item(&$item_row, &$row)
-	{
-		parent::adjust_item($item_row, $row);
-
-		$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
-	}
-}
diff --git a/phpBB/includes/feed/post_base.php b/phpBB/includes/feed/post_base.php
deleted file mode 100644
index 1f4cb4b5ef..0000000000
--- a/phpBB/includes/feed/post_base.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Abstract class for post based feeds
-*
-* @package phpBB3
-*/
-abstract class phpbb_feed_post_base extends phpbb_feed_base
-{
-	var $num_items = 'feed_limit_post';
-
-	function set_keys()
-	{
-		$this->set('title',		'post_subject');
-		$this->set('title2',	'topic_title');
-
-		$this->set('author_id',	'user_id');
-		$this->set('creator',	'username');
-		$this->set('published',	'post_time');
-		$this->set('updated',	'post_edit_time');
-		$this->set('text',		'post_text');
-
-		$this->set('bitfield',	'bbcode_bitfield');
-		$this->set('bbcode_uid','bbcode_uid');
-
-		$this->set('enable_bbcode',		'enable_bbcode');
-		$this->set('enable_smilies',	'enable_smilies');
-		$this->set('enable_magic_url',	'enable_magic_url');
-	}
-
-	function adjust_item(&$item_row, &$row)
-	{
-		$item_row['link'] = $this->helper->append_sid('viewtopic.' . $this->phpEx, "t={$row['topic_id']}&amp;p={$row['post_id']}#p{$row['post_id']}");
-
-		if ($this->config['feed_item_statistics'])
-		{
-			$item_row['statistics'] = $this->user->lang['POSTED'] . ' ' . $this->user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
-				. ' ' . $this->separator_stats . ' ' . $this->user->format_date($row[$this->get('published')])
-				. (($this->is_moderator_approve_forum($row['forum_id']) && $row['post_visibility'] !== ITEM_APPROVED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_UNAPPROVED'] : '');
-		}
-	}
-}
diff --git a/phpBB/includes/feed/topic.php b/phpBB/includes/feed/topic.php
deleted file mode 100644
index 36f958ac60..0000000000
--- a/phpBB/includes/feed/topic.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Topic feed for a specific topic
-*
-* This will give you the last {$this->num_items} posts made within this topic.
-*
-* @package phpBB3
-*/
-class phpbb_feed_topic extends phpbb_feed_post_base
-{
-	var $topic_id		= 0;
-	var $forum_id		= 0;
-	var $topic_data		= array();
-
-	/**
-	* Set the Topic ID
-	*
-	* @param int	$topic_id			Topic ID
-	* @return	phpbb_feed_topic
-	*/
-	public function set_topic_id($topic_id)
-	{
-		$this->topic_id = (int) $topic_id;
-
-		return $this;
-	}
-
-	function open()
-	{
-		$sql = 'SELECT f.forum_options, f.forum_password, t.topic_id, t.forum_id, t.topic_visibility, t.topic_title, t.topic_time, t.topic_views, t.topic_replies, t.topic_type
-			FROM ' . TOPICS_TABLE . ' t
-			LEFT JOIN ' . FORUMS_TABLE . ' f
-				ON (f.forum_id = t.forum_id)
-			WHERE t.topic_id = ' . $this->topic_id;
-		$result = $this->db->sql_query($sql);
-		$this->topic_data = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (empty($this->topic_data))
-		{
-			trigger_error('NO_TOPIC');
-		}
-
-		$this->forum_id = (int) $this->topic_data['forum_id'];
-
-		// Make sure topic is either approved or user authed
-		if (!$this->topic_data['topic_approved'] && !$this->auth->acl_get('m_approve', $this->forum_id))
-		{
-			trigger_error('SORRY_AUTH_READ');
-		}
-
-		// Make sure forum is not excluded from feed
-		if (phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $this->topic_data['forum_options']))
-		{
-			trigger_error('NO_FEED');
-		}
-
-		// Make sure we can read this forum
-		if (!$this->auth->acl_get('f_read', $this->forum_id))
-		{
-			trigger_error('SORRY_AUTH_READ');
-		}
-
-		// Make sure forum is not passworded or user is authed
-		if ($this->topic_data['forum_password'])
-		{
-			$forum_ids_passworded = $this->get_passworded_forums();
-
-			if (isset($forum_ids_passworded[$this->forum_id]))
-			{
-				trigger_error('SORRY_AUTH_READ');
-			}
-
-			unset($forum_ids_passworded);
-		}
-	}
-
-	function get_sql()
-	{
-		$this->sql = array(
-			'SELECT'	=>	'p.post_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
-							'u.username, u.user_id',
-			'FROM'		=> array(
-				POSTS_TABLE		=> 'p',
-				USERS_TABLE		=> 'u',
-			),
-			'WHERE'		=> 'p.topic_id = ' . $this->topic_id . '
-								AND ' . $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.') . '
-								AND p.poster_id = u.user_id',
-			'ORDER_BY'	=> 'p.post_time DESC',
-		);
-
-		return true;
-	}
-
-	function get_item()
-	{
-		return ($row = parent::get_item()) ? array_merge($this->topic_data, $row) : $row;
-	}
-}
diff --git a/phpBB/includes/feed/topic_base.php b/phpBB/includes/feed/topic_base.php
deleted file mode 100644
index b104a46631..0000000000
--- a/phpBB/includes/feed/topic_base.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Abstract class for topic based feeds
-*
-* @package phpBB3
-*/
-abstract class phpbb_feed_topic_base extends phpbb_feed_base
-{
-	var $num_items = 'feed_limit_topic';
-
-	function set_keys()
-	{
-		$this->set('title',		'topic_title');
-		$this->set('title2',	'forum_name');
-
-		$this->set('author_id',	'topic_poster');
-		$this->set('creator',	'topic_first_poster_name');
-		$this->set('published',	'post_time');
-		$this->set('updated',	'post_edit_time');
-		$this->set('text',		'post_text');
-
-		$this->set('bitfield',	'bbcode_bitfield');
-		$this->set('bbcode_uid','bbcode_uid');
-
-		$this->set('enable_bbcode',		'enable_bbcode');
-		$this->set('enable_smilies',	'enable_smilies');
-		$this->set('enable_magic_url',	'enable_magic_url');
-	}
-
-	function adjust_item(&$item_row, &$row)
-	{
-		$item_row['link'] = $this->helper->append_sid('viewtopic.' . $this->phpEx, 't=' . $row['topic_id'] . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']);
-
-		if ($this->config['feed_item_statistics'])
-		{
-			$item_row['statistics'] = $this->user->lang['POSTED'] . ' ' . $this->user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row)
-				. ' ' . $this->separator_stats . ' ' . $this->user->format_date($row[$this->get('published')])
-				. ' ' . $this->separator_stats . ' ' . $this->user->lang['REPLIES'] . ' ' . $this->content_visibility->get_count('topic_posts', $row, $row['forum_id']) - 1
-				. ' ' . $this->separator_stats . ' ' . $this->user->lang['VIEWS'] . ' ' . $row['topic_views']
-				. (($this->is_moderator_approve_forum($row['forum_id']) && $row['topic_posts_unapproved']) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POSTS_UNAPPROVED'] : '');
-		}
-	}
-}
diff --git a/phpBB/includes/feed/topics.php b/phpBB/includes/feed/topics.php
deleted file mode 100644
index 31f5177773..0000000000
--- a/phpBB/includes/feed/topics.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* New Topics feed
-*
-* This will give you the last {$this->num_items} created topics
-* including the first post.
-*
-* @package phpBB3
-*/
-class phpbb_feed_topics extends phpbb_feed_topic_base
-{
-	function get_sql()
-	{
-		$forum_ids_read = $this->get_readable_forums();
-		if (empty($forum_ids_read))
-		{
-			return false;
-		}
-
-		$in_fid_ary = array_diff($forum_ids_read, $this->get_excluded_forums(), $this->get_passworded_forums());
-		if (empty($in_fid_ary))
-		{
-			return false;
-		}
-
-		// We really have to get the post ids first!
-		$sql = 'SELECT topic_first_post_id, topic_time
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('forum_id', $in_fid_ary) . '
-				AND topic_moved_id = 0
-				AND topic_visibility = ' . ITEM_APPROVED . '
-			ORDER BY topic_time DESC';
-		$result = $this->db->sql_query_limit($sql, $this->num_items);
-
-		$post_ids = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$post_ids[] = (int) $row['topic_first_post_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($post_ids))
-		{
-			return false;
-		}
-
-		$this->sql = array(
-			'SELECT'	=> 'f.forum_id, f.forum_name,
-							t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_views, t.topic_time, t.topic_last_post_time,
-							p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
-			'FROM'		=> array(
-				TOPICS_TABLE	=> 't',
-				POSTS_TABLE		=> 'p',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(FORUMS_TABLE => 'f'),
-					'ON'	=> 'p.forum_id = f.forum_id',
-				),
-			),
-			'WHERE'		=> 'p.topic_id = t.topic_id
-							AND ' . $this->db->sql_in_set('p.post_id', $post_ids),
-			'ORDER_BY'	=> 'p.post_time DESC',
-		);
-
-		return true;
-	}
-
-	function adjust_item(&$item_row, &$row)
-	{
-		parent::adjust_item($item_row, $row);
-
-		$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
-	}
-}
diff --git a/phpBB/includes/feed/topics_active.php b/phpBB/includes/feed/topics_active.php
deleted file mode 100644
index 249dd1d66a..0000000000
--- a/phpBB/includes/feed/topics_active.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Active Topics feed
-*
-* This will give you the last {$this->num_items} topics
-* with replies made withing the last {$this->sort_days} days
-* including the last post.
-*
-* @package phpBB3
-*/
-class phpbb_feed_topics_active extends phpbb_feed_topic_base
-{
-	var $sort_days = 7;
-
-	function set_keys()
-	{
-		parent::set_keys();
-
-		$this->set('author_id',	'topic_last_poster_id');
-		$this->set('creator',	'topic_last_poster_name');
-	}
-
-	function get_sql()
-	{
-		$forum_ids_read = $this->get_readable_forums();
-		if (empty($forum_ids_read))
-		{
-			return false;
-		}
-
-		$in_fid_ary = array_intersect($forum_ids_read, $this->get_forum_ids());
-		$in_fid_ary = array_diff($in_fid_ary, $this->get_passworded_forums());
-		if (empty($in_fid_ary))
-		{
-			return false;
-		}
-
-		// Search for topics in last X days
-		$last_post_time_sql = ($this->sort_days) ? ' AND topic_last_post_time > ' . (time() - ($this->sort_days * 24 * 3600)) : '';
-
-		// We really have to get the post ids first!
-		$sql = 'SELECT topic_last_post_id, topic_last_post_time
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('forum_id', $in_fid_ary) . '
-				AND topic_moved_id = 0
-				AND topic_visibility = ' . ITEM_APPROVED . '
-				' . $last_post_time_sql . '
-			ORDER BY topic_last_post_time DESC';
-		$result = $this->db->sql_query_limit($sql, $this->num_items);
-
-		$post_ids = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$post_ids[] = (int) $row['topic_last_post_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($post_ids))
-		{
-			return false;
-		}
-
-		$this->sql = array(
-			'SELECT'	=> 'f.forum_id, f.forum_name,
-							t.topic_id, t.topic_title, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_views,
-							t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_post_time,
-							p.post_id, p.post_time, p.post_edit_time, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url',
-			'FROM'		=> array(
-				TOPICS_TABLE	=> 't',
-				POSTS_TABLE		=> 'p',
-			),
-			'LEFT_JOIN'	=> array(
-				array(
-					'FROM'	=> array(FORUMS_TABLE => 'f'),
-					'ON'	=> 'p.forum_id = f.forum_id',
-				),
-			),
-			'WHERE'		=> 'p.topic_id = t.topic_id
-							AND ' . $this->db->sql_in_set('p.post_id', $post_ids),
-			'ORDER_BY'	=> 'p.post_time DESC',
-		);
-
-		return true;
-	}
-
-	function get_forum_ids()
-	{
-		static $forum_ids;
-
-		$cache_name	= 'feed_topic_active_forum_ids';
-
-		if (!isset($forum_ids) && ($forum_ids = $this->cache->get('_' . $cache_name)) === false)
-		{
-			$sql = 'SELECT forum_id
-				FROM ' . FORUMS_TABLE . '
-				WHERE forum_type = ' . FORUM_POST . '
-					AND ' . $this->db->sql_bit_and('forum_options', FORUM_OPTION_FEED_EXCLUDE, '= 0') . '
-					AND ' . $this->db->sql_bit_and('forum_flags', log(FORUM_FLAG_ACTIVE_TOPICS, 2), '<> 0');
-			$result = $this->db->sql_query($sql);
-
-			$forum_ids = array();
-			while ($forum_id = (int) $this->db->sql_fetchfield('forum_id'))
-			{
-				$forum_ids[$forum_id] = $forum_id;
-			}
-			$this->db->sql_freeresult($result);
-
-			$this->cache->put('_' . $cache_name, $forum_ids, 180);
-		}
-
-		return $forum_ids;
-	}
-
-	function adjust_item(&$item_row, &$row)
-	{
-		parent::adjust_item($item_row, $row);
-
-		$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
-	}
-}
diff --git a/phpBB/includes/filesystem.php b/phpBB/includes/filesystem.php
deleted file mode 100644
index 27cab48fb0..0000000000
--- a/phpBB/includes/filesystem.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* A class with various functions that are related to paths, files and the filesystem
-* @package phpBB3
-*/
-class phpbb_filesystem
-{
-	/**
-	* Eliminates useless . and .. components from specified path.
-	*
-	* @param string $path Path to clean
-	* @return string Cleaned path
-	*/
-	public function clean_path($path)
-	{
-		$exploded = explode('/', $path);
-		$filtered = array();
-		foreach ($exploded as $part)
-		{
-			if ($part === '.' && !empty($filtered))
-			{
-				continue;
-			}
-
-			if ($part === '..' && !empty($filtered) && $filtered[sizeof($filtered) - 1] !== '..')
-			{
-				array_pop($filtered);
-			}
-			else
-			{
-				$filtered[] = $part;
-			}
-		}
-		$path = implode('/', $filtered);
-		return $path;
-	}
-}
diff --git a/phpBB/includes/groupposition/exception.php b/phpBB/includes/groupposition/exception.php
deleted file mode 100644
index e4ff09c703..0000000000
--- a/phpBB/includes/groupposition/exception.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
-*
-* @package groupposition
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @package groupposition
-*/
-class phpbb_groupposition_exception extends \Exception
-{
-}
diff --git a/phpBB/includes/groupposition/interface.php b/phpBB/includes/groupposition/interface.php
deleted file mode 100644
index eacc04e1a4..0000000000
--- a/phpBB/includes/groupposition/interface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Interface to manage group positions in various places of phpbb
-*
-* The interface provides simple methods to add, delete and move a group
-*
-* @package phpBB3
-*/
-interface phpbb_groupposition_interface
-{
-	/**
-	* Returns the value for a given group, if the group exists.
-	* @param	int		$group_id	group_id of the group to be selected
-	* @return	int			position of the group
-	*/
-	public function get_group_value($group_id);
-
-	/**
-	* Get number of groups displayed 
-	*
-	* @return	int		value of the last item displayed
-	*/
-	public function get_group_count();
-
-	/**
-	* Addes a group by group_id
-	*
-	* @param	int		$group_id	group_id of the group to be added
-	* @return	bool		True if the group was added successfully
-	*/
-	public function add_group($group_id);
-
-	/**
-	* Deletes a group by group_id
-	*
-	* @param	int		$group_id		group_id of the group to be deleted
-	* @param	bool	$skip_group		Skip setting the value for this group, to save the query, when you need to update it anyway.
-	* @return	bool		True if the group was deleted successfully
-	*/
-	public function delete_group($group_id, $skip_group = false);
-
-	/**
-	* Moves a group up by group_id
-	*
-	* @param	int		$group_id	group_id of the group to be moved
-	* @return	bool		True if the group was moved successfully
-	*/
-	public function move_up($group_id);
-
-	/**
-	* Moves a group down by group_id
-	*
-	* @param	int		$group_id	group_id of the group to be moved
-	* @return	bool		True if the group was moved successfully
-	*/
-	public function move_down($group_id);
-
-	/**
-	* Moves a group up/down
-	*
-	* @param	int		$group_id	group_id of the group to be moved
-	* @param	int		$delta		number of steps:
-	*								- positive = move up
-	*								- negative = move down
-	* @return	bool		True if the group was moved successfully
-	*/
-	public function move($group_id, $delta);
-}
diff --git a/phpBB/includes/groupposition/legend.php b/phpBB/includes/groupposition/legend.php
deleted file mode 100644
index 7fddadde99..0000000000
--- a/phpBB/includes/groupposition/legend.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Legend group position class
-*
-* group_legend is an ascending list 1, 2, ..., n for groups which are displayed. 1 is the first group, n the last.
-* If the value is 0 (self::GROUP_DISABLED) the group is not displayed.
-*
-* @package phpBB3
-*/
-class phpbb_groupposition_legend implements phpbb_groupposition_interface
-{
-	/**
-	* Group is not displayed
-	*/
-	const GROUP_DISABLED = 0;
-
-	/**
-	* Database object
-	* @var phpbb_db_driver
-	*/
-	protected $db;
-
-	/**
-	* User object
-	* @var phpbb_user
-	*/
-	protected $user;
-
-	/**
-	* Constructor
-	*
-	* @param phpbb_db_driver	$db		Database object
-	* @param phpbb_user			$user	User object
-	*/
-	public function __construct(phpbb_db_driver $db, phpbb_user $user)
-	{
-		$this->db = $db;
-		$this->user = $user;
-	}
-
-	/**
-	* Returns the group_legend for a given group, if the group exists.
-	*
-	* {@inheritDoc}
-	*/
-	public function get_group_value($group_id)
-	{
-		$sql = 'SELECT group_legend
-			FROM ' . GROUPS_TABLE . '
-			WHERE group_id = ' . (int) $group_id;
-		$result = $this->db->sql_query($sql);
-		$current_value = $this->db->sql_fetchfield('group_legend');
-		$this->db->sql_freeresult($result);
-
-		if ($current_value === false)
-		{
-			// Group not found.
-			throw new phpbb_groupposition_exception('NO_GROUP');
-		}
-
-		return (int) $current_value;
-	}
-
-	/**
-	* Get number of groups, displayed on the legend
-	*
-	* {@inheritDoc}
-	*/
-	public function get_group_count()
-	{
-		$sql = 'SELECT group_legend
-			FROM ' . GROUPS_TABLE . '
-			ORDER BY group_legend DESC';
-		$result = $this->db->sql_query_limit($sql, 1);
-		$group_count = (int) $this->db->sql_fetchfield('group_legend');
-		$this->db->sql_freeresult($result);
-
-		return $group_count;
-	}
-
-	/**
-	* Adds a group by group_id
-	*
-	* {@inheritDoc}
-	*/
-	public function add_group($group_id)
-	{
-		$current_value = $this->get_group_value($group_id);
-
-		if ($current_value == self::GROUP_DISABLED)
-		{
-			// Group is currently not displayed, add it at the end.
-			$next_value = 1 + $this->get_group_count();
-
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET group_legend = ' . $next_value . '
-				WHERE group_legend = ' . self::GROUP_DISABLED . '
-					AND group_id = ' . (int) $group_id;
-			$this->db->sql_query($sql);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Deletes a group by setting the field to self::GROUP_DISABLED and closing the gap in the list.
-	*
-	* {@inheritDoc}
-	*/
-	public function delete_group($group_id, $skip_group = false)
-	{
-		$current_value = $this->get_group_value($group_id);
-
-		if ($current_value != self::GROUP_DISABLED)
-		{
-			$this->db->sql_transaction('begin');
-
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET group_legend = group_legend - 1
-				WHERE group_legend > ' . $current_value;
-			$this->db->sql_query($sql);
-
-			if (!$skip_group)
-			{
-				$sql = 'UPDATE ' . GROUPS_TABLE . '
-					SET group_legend = ' . self::GROUP_DISABLED . '
-					WHERE group_id = ' . (int) $group_id;
-				$this->db->sql_query($sql);
-			}
-
-			$this->db->sql_transaction('commit');
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Moves a group up by group_id
-	*
-	* {@inheritDoc}
-	*/
-	public function move_up($group_id)
-	{
-		return $this->move($group_id, 1);
-	}
-
-	/**
-	* Moves a group down by group_id
-	*
-	* {@inheritDoc}
-	*/
-	public function move_down($group_id)
-	{
-		return $this->move($group_id, -1);
-	}
-
-	/**
-	* Moves a group up/down
-	*
-	* {@inheritDoc}
-	*/
-	public function move($group_id, $delta)
-	{
-		$delta = (int) $delta;
-		if (!$delta)
-		{
-			return false;
-		}
-
-		$move_up = ($delta > 0) ? true : false;
-		$current_value = $this->get_group_value($group_id);
-
-		if ($current_value != self::GROUP_DISABLED)
-		{
-			$this->db->sql_transaction('begin');
-
-			// First we move all groups between our current value and the target value up/down 1,
-			// so we have a gap for our group to move.
-			$sql = 'UPDATE ' . GROUPS_TABLE . '
-				SET group_legend = group_legend' . (($move_up) ? ' + 1' : ' - 1') . '
-				WHERE group_legend > ' . self::GROUP_DISABLED . '
-					AND group_legend' . (($move_up) ? ' >= ' : ' <= ') . ($current_value - $delta) . '
-					AND group_legend' . (($move_up) ? ' < ' : ' > ') . $current_value;
-			$this->db->sql_query($sql);
-
-			// Because there might be fewer groups above/below the group than we wanted to move,
-			// we use the number of changed groups, to update the group.
-			$delta = (int) $this->db->sql_affectedrows();
-
-			if ($delta)
-			{
-				// And now finally, when we moved some other groups and built a gap,
-				// we can move the desired group to it.
-				$sql = 'UPDATE ' . GROUPS_TABLE . '
-					SET group_legend = group_legend ' . (($move_up) ? ' - ' : ' + ') . $delta . '
-					WHERE group_id = ' . (int) $group_id;
-				$this->db->sql_query($sql);
-
-				$this->db->sql_transaction('commit');
-
-				return true;
-			}
-
-			$this->db->sql_transaction('commit');
-		}
-
-		return false;
-	}
-
-	/**
-	* Get group type language var
-	*
-	* @param	int		$group_type	group_type from the groups-table
-	* @return	string		name of the language variable for the given group-type.
-	*/
-	static public function group_type_language($group_type)
-	{
-		switch ($group_type)
-		{
-			case GROUP_OPEN:
-				return 'GROUP_REQUEST';
-			case GROUP_CLOSED:
-				return 'GROUP_CLOSED';
-			case GROUP_HIDDEN:
-				return 'GROUP_HIDDEN';
-			case GROUP_SPECIAL:
-				return 'GROUP_SPECIAL';
-			case GROUP_FREE:
-				return 'GROUP_OPEN';
-		}
-	}
-}
diff --git a/phpBB/includes/groupposition/teampage.php b/phpBB/includes/groupposition/teampage.php
deleted file mode 100644
index 7c758199e7..0000000000
--- a/phpBB/includes/groupposition/teampage.php
+++ /dev/null
@@ -1,604 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Teampage group position class
-*
-* Teampage position is an ascending list 1, 2, ..., n for items which are displayed. 1 is the first item, n the last.
-*
-* @package phpBB3
-*/
-class phpbb_groupposition_teampage implements phpbb_groupposition_interface
-{
-	/**
-	* Group is not displayed
-	*/
-	const GROUP_DISABLED = 0;
-
-	/**
-	* No parent item
-	*/
-	const NO_PARENT = 0;
-
-	/**
-	* Database object
-	* @var phpbb_db_driver
-	*/
-	protected $db;
-
-	/**
-	* User object
-	* @var phpbb_user
-	*/
-	protected $user;
-
-	/**
-	* Cache object
-	* @var phpbb_cache_driver_interface
-	*/
-	protected $cache;
-
-	/**
-	* Constructor
-	*
-	* @param phpbb_db_driver				$db		Database object
-	* @param phpbb_user						$user	User object
-	* @param phpbb_cache_driver_interface	$cache	Cache object
-	*/
-	public function __construct(phpbb_db_driver $db, phpbb_user $user, phpbb_cache_driver_interface $cache)
-	{
-		$this->db = $db;
-		$this->user = $user;
-		$this->cache = $cache;
-	}
-
-	/**
-	* Returns the teampage position for a given group, if the group exists.
-	*
-	* {@inheritDoc}
-	*/
-	public function get_group_value($group_id)
-	{
-		// The join is required to ensure that the group itself exists
-		$sql = 'SELECT g.group_id, t.teampage_position
-			FROM ' . GROUPS_TABLE . ' g
-			LEFT JOIN ' . TEAMPAGE_TABLE . ' t
-				ON (t.group_id = g.group_id)
-			WHERE g.group_id = ' . (int) $group_id;
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row === false)
-		{
-			// Group not found.
-			throw new phpbb_groupposition_exception('NO_GROUP');
-		}
-
-		return (int) $row['teampage_position'];
-	}
-
-	/**
-	* Returns the row for a given group, if the group exists.
-	*
-	* @param	int		$group_id	group_id of the group to be selected
-	* @return	array			Data row of the group
-	*/
-	public function get_group_values($group_id)
-	{
-		// The join is required to ensure that the group itself exists
-		$sql = 'SELECT *
-			FROM ' . GROUPS_TABLE . ' g
-			LEFT JOIN ' . TEAMPAGE_TABLE . ' t
-				ON (t.group_id = g.group_id)
-			WHERE g.group_id = ' . (int) $group_id;
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row === false)
-		{
-			// Group not found.
-			throw new phpbb_groupposition_exception('NO_GROUP');
-		}
-
-		return $row;
-	}
-
-	/**
-	* Returns the teampage position for a given teampage item, if the item exists.
-	*
-	* @param	int		$teampage_id	Teampage_id of the selected item
-	* @return	int			Teampage position of the item
-	*/
-	public function get_teampage_value($teampage_id)
-	{
-		$sql = 'SELECT teampage_position
-			FROM ' . TEAMPAGE_TABLE . '
-			WHERE teampage_id = ' . (int) $teampage_id;
-		$result = $this->db->sql_query($sql);
-		$current_value = $this->db->sql_fetchfield('teampage_position');
-		$this->db->sql_freeresult($result);
-
-		if ($current_value === false)
-		{
-			// Group not found.
-			throw new phpbb_groupposition_exception('NO_GROUP');
-		}
-
-		return (int) $current_value;
-	}
-
-	/**
-	* Returns the teampage row for a given teampage item, if the item exists.
-	*
-	* @param	int		$teampage_id	Teampage_id of the selected item
-	* @return	array			Teampage row of the item
-	*/
-	public function get_teampage_values($teampage_id)
-	{
-		$sql = 'SELECT teampage_position, teampage_parent
-			FROM ' . TEAMPAGE_TABLE . '
-			WHERE teampage_id = ' . (int) $teampage_id;
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row === false)
-		{
-			// Group not found.
-			throw new phpbb_groupposition_exception('NO_GROUP');
-		}
-
-		return $row;
-	}
-
-
-	/**
-	* Get number of items displayed
-	*
-	* {@inheritDoc}
-	*/
-	public function get_group_count()
-	{
-		$sql = 'SELECT teampage_position
-			FROM ' . TEAMPAGE_TABLE . '
-			ORDER BY teampage_position DESC';
-		$result = $this->db->sql_query_limit($sql, 1);
-		$group_count = (int) $this->db->sql_fetchfield('teampage_position');
-		$this->db->sql_freeresult($result);
-
-		return $group_count;
-	}
-
-	/**
-	* Adds a group by group_id
-	*
-	* {@inheritDoc}
-	*/
-	public function add_group($group_id)
-	{
-		return $this->add_group_teampage($group_id, self::NO_PARENT);
-	}
-
-	/**
-	* Adds a group by group_id
-	*
-	* @param	int		$group_id	group_id of the group to be added
-	* @param	int		$parent_id	Teampage ID of the parent item
-	* @return	bool		True if the group was added successfully
-	*/
-	public function add_group_teampage($group_id, $parent_id)
-	{
-		$current_value = $this->get_group_value($group_id);
-
-		if ($current_value == self::GROUP_DISABLED)
-		{
-			if ($parent_id != self::NO_PARENT)
-			{
-				// Check, whether the given parent is a category
-				$sql = 'SELECT teampage_id
-					FROM ' . TEAMPAGE_TABLE . '
-					WHERE group_id = 0
-						AND teampage_id = ' . (int) $parent_id;
-				$result = $this->db->sql_query_limit($sql, 1);
-				$parent_is_category = (bool) $this->db->sql_fetchfield('teampage_id');
-				$this->db->sql_freeresult($result);
-
-				if ($parent_is_category)
-				{
-					// Get value of last child from this parent and add group there
-					$sql = 'SELECT teampage_position
-						FROM ' . TEAMPAGE_TABLE . '
-						WHERE teampage_parent = ' . (int) $parent_id . '
-							OR teampage_id = ' . (int) $parent_id . '
-						ORDER BY teampage_position DESC';
-					$result = $this->db->sql_query_limit($sql, 1);
-					$new_position = (int) $this->db->sql_fetchfield('teampage_position');
-					$this->db->sql_freeresult($result);
-
-					$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
-						SET teampage_position = teampage_position + 1
-						WHERE teampage_position > ' . $new_position;
-					$this->db->sql_query($sql);
-				}
-			}
-			else
-			{
-				// Add group at the end
-				$new_position = $this->get_group_count();
-			}
-
-			$sql_ary = array(
-				'group_id'			=> $group_id,
-				'teampage_position'	=> $new_position + 1,
-				'teampage_parent'	=> $parent_id,
-			);
-
-			$sql = 'INSERT INTO ' . TEAMPAGE_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
-			$this->db->sql_query($sql);
-
-			$this->cache->destroy('sql', TEAMPAGE_TABLE);
-			return true;
-		}
-
-		$this->cache->destroy('sql', TEAMPAGE_TABLE);
-		return false;
-	}
-
-	/**
-	* Adds a new category
-	*
-	* @param	string	$category_name	Name of the category to be added
-	* @return	bool		True if the category was added successfully
-	*/
-	public function add_category_teampage($category_name)
-	{
-		if ($category_name === '')
-		{
-			return false;
-		}
-
-		$num_entries = $this->get_group_count();
-
-		$sql_ary = array(
-			'group_id'			=> 0,
-			'teampage_position'	=> $num_entries + 1,
-			'teampage_parent'	=> 0,
-			'teampage_name'		=> truncate_string($category_name, 255, 255),
-		);
-
-		$sql = 'INSERT INTO ' . TEAMPAGE_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
-		$this->db->sql_query($sql);
-
-		$this->cache->destroy('sql', TEAMPAGE_TABLE);
-		return true;
-	}
-
-	/**
-	* Deletes a group from the list and closes the gap in the position list.
-	*
-	* {@inheritDoc}
-	*/
-	public function delete_group($group_id, $skip_group = false)
-	{
-		$current_value = $this->get_group_value($group_id);
-
-		if ($current_value != self::GROUP_DISABLED)
-		{
-			$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
-				SET teampage_position = teampage_position - 1
-				WHERE teampage_position > ' . $current_value;
-			$this->db->sql_query($sql);
-
-			$sql = 'DELETE FROM ' . TEAMPAGE_TABLE . '
-				WHERE group_id = ' . $group_id;
-			$this->db->sql_query($sql);
-
-			$this->cache->destroy('sql', TEAMPAGE_TABLE);
-			return true;
-		}
-
-		$this->cache->destroy('sql', TEAMPAGE_TABLE);
-		return false;
-	}
-
-	/**
-	* Deletes an item from the list and closes the gap in the position list.
-	*
-	* @param	int		$teampage_id	teampage_id of the item to be deleted
-	* @param	bool	$skip_group		Skip setting the group to GROUP_DISABLED, to save the query, when you need to update it anyway.
-	* @return	bool		True if the item was deleted successfully
-	*/
-	public function delete_teampage($teampage_id, $skip_group = false)
-	{
-		$current_value = $this->get_teampage_value($teampage_id);
-
-		if ($current_value != self::GROUP_DISABLED)
-		{
-			$sql = 'DELETE FROM ' . TEAMPAGE_TABLE . '
-				WHERE teampage_id = ' . $teampage_id . '
-					OR teampage_parent = ' . $teampage_id;
-			$this->db->sql_query($sql);
-
-			$delta = (int) $this->db->sql_affectedrows();
-
-			$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
-				SET teampage_position = teampage_position - ' . $delta . '
-				WHERE teampage_position > ' . $current_value;
-			$this->db->sql_query($sql);
-
-			$this->cache->destroy('sql', TEAMPAGE_TABLE);
-			return true;
-		}
-
-		$this->cache->destroy('sql', TEAMPAGE_TABLE);
-		return false;
-	}
-
-	/**
-	* Moves a group up by group_id
-	*
-	* {@inheritDoc}
-	*/
-	public function move_up($group_id)
-	{
-		return $this->move($group_id, 1);
-	}
-
-	/**
-	* Moves an item up by teampage_id
-	*
-	* @param	int		$group_id	group_id of the group to be moved
-	* @return	bool		True if the group was moved successfully
-	*/
-	public function move_up_teampage($teampage_id)
-	{
-		return $this->move_teampage($teampage_id, 1);
-	}
-
-	/**
-	* Moves a group down by group_id
-	*
-	* {@inheritDoc}
-	*/
-	public function move_down($group_id)
-	{
-		return $this->move($group_id, -1);
-	}
-
-	/**
-	* Movesan item down by teampage_id
-	*
-	* @param	int		$group_id	group_id of the group to be moved
-	* @return	bool		True if the group was moved successfully
-	*/
-	public function move_down_teampage($teampage_id)
-	{
-		return $this->move_teampage($teampage_id, -1);
-	}
-
-	/**
-	* Moves a group up/down
-	*
-	* {@inheritDoc}
-	*/
-	public function move($group_id, $delta)
-	{
-		$delta = (int) $delta;
-		if (!$delta)
-		{
-			return false;
-		}
-
-		$move_up = ($delta > 0) ? true : false;
-		$data = $this->get_group_values($group_id);
-
-		$current_value = (int) $data['teampage_position'];
-		if ($current_value != self::GROUP_DISABLED)
-		{
-			$this->db->sql_transaction('begin');
-
-			if (!$move_up && $data['teampage_parent'] == self::NO_PARENT)
-			{
-				// If we move items down, we need to grab the one sibling more,
-				// so we do not ignore the children of the previous sibling.
-				// We will remove the additional sibling later on.
-				$delta = abs($delta) + 1;
-			}
-
-			$sql = 'SELECT teampage_position
-				FROM ' . TEAMPAGE_TABLE . '
-				WHERE teampage_parent = ' . (int) $data['teampage_parent'] . '
-					AND teampage_position' . (($move_up) ? ' < ' : ' > ') . $current_value . '
-				ORDER BY teampage_position' . (($move_up) ? ' DESC' : ' ASC');
-			$result = $this->db->sql_query_limit($sql, $delta);
-
-			$sibling_count = 0;
-			$sibling_limit = $delta;
-
-			// Reset the delta, as we recalculate the new real delta
-			$delta = 0;
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$sibling_count++;
-				$delta = $current_value - $row['teampage_position'];
-
-				if (!$move_up && $data['teampage_parent'] == self::NO_PARENT && $sibling_count == $sibling_limit)
-				{
-					// Remove the additional sibling we added previously
-					$delta++;
-				}
-			}
-			$this->db->sql_freeresult($result);
-
-			if ($delta)
-			{
-				// First we move all items between our current value and the target value up/down 1,
-				// so we have a gap for our item to move.
-				$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
-					SET teampage_position = teampage_position' . (($move_up) ? ' + 1' : ' - 1') . '
-					WHERE teampage_position' . (($move_up) ? ' >= ' : ' <= ') . ($current_value - $delta) . '
-						AND teampage_position' . (($move_up) ? ' < ' : ' > ') . $current_value;
-				$this->db->sql_query($sql);
-
-				// And now finally, when we moved some other items and built a gap,
-				// we can move the desired item to it.
-				$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
-					SET teampage_position = teampage_position ' . (($move_up) ? ' - ' : ' + ') . abs($delta) . '
-					WHERE group_id = ' . (int) $group_id;
-				$this->db->sql_query($sql);
-
-				$this->db->sql_transaction('commit');
-				$this->cache->destroy('sql', TEAMPAGE_TABLE);
-
-				return true;
-			}
-
-			$this->db->sql_transaction('commit');
-		}
-
-		$this->cache->destroy('sql', TEAMPAGE_TABLE);
-		return false;
-	}
-
-	/**
-	* Moves an item up/down
-	*
-	* @param	int		$teampage_id	teampage_id of the item to be moved
-	* @param	int		$delta		number of steps:
-	*								- positive = move up
-	*								- negative = move down
-	* @return	bool		True if the group was moved successfully
-	*/
-	public function move_teampage($teampage_id, $delta)
-	{
-		$delta = (int) $delta;
-		if (!$delta)
-		{
-			return false;
-		}
-
-		$move_up = ($delta > 0) ? true : false;
-		$data = $this->get_teampage_values($teampage_id);
-
-		$current_value = (int) $data['teampage_position'];
-		if ($current_value != self::GROUP_DISABLED)
-		{
-			$this->db->sql_transaction('begin');
-
-			if (!$move_up && $data['teampage_parent'] == self::NO_PARENT)
-			{
-				// If we move items down, we need to grab the one sibling more,
-				// so we do not ignore the children of the previous sibling.
-				// We will remove the additional sibling later on.
-				$delta = abs($delta) + 1;
-			}
-
-			$sql = 'SELECT teampage_id, teampage_position
-				FROM ' . TEAMPAGE_TABLE . '
-				WHERE teampage_parent = ' . (int) $data['teampage_parent'] . '
-					AND teampage_position' . (($move_up) ? ' < ' : ' > ') . $current_value . '
-				ORDER BY teampage_position' . (($move_up) ? ' DESC' : ' ASC');
-			$result = $this->db->sql_query_limit($sql, $delta);
-
-			$sibling_count = 0;
-			$sibling_limit = $delta;
-
-			// Reset the delta, as we recalculate the new real delta
-			$delta = 0;
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$sibling_count++;
-				$delta = $current_value - $row['teampage_position'];
-
-				// Remove the additional sibling we added previously
-				// But only, if we included it, this is not be the case
-				// when we reached the end of our list
-				if (!$move_up && $data['teampage_parent'] == self::NO_PARENT && $sibling_count == $sibling_limit)
-				{
-					$delta++;
-				}
-			}
-			$this->db->sql_freeresult($result);
-
-			if ($delta)
-			{
-				$sql = 'SELECT COUNT(teampage_id) as num_items
-					FROM ' . TEAMPAGE_TABLE . '
-					WHERE teampage_id = ' . (int) $teampage_id . '
-						OR teampage_parent = ' . (int) $teampage_id;
-				$result = $this->db->sql_query($sql);
-				$num_items = (int) $this->db->sql_fetchfield('num_items');
-				$this->db->sql_freeresult($result);
-
-				// First we move all items between our current value and the target value up/down 1,
-				// so we have a gap for our item to move.
-				$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
-					SET teampage_position = teampage_position' . (($move_up) ? ' + ' : ' - ') . $num_items . '
-					WHERE teampage_position' . (($move_up) ? ' >= ' : ' <= ') . ($current_value - $delta) . '
-						AND teampage_position' . (($move_up) ? ' < ' : ' > ') . $current_value . '
-						AND NOT (teampage_id = ' . (int) $teampage_id . '
-							OR teampage_parent = ' . (int) $teampage_id . ')';
-				$this->db->sql_query($sql);
-
-				$delta = (!$move_up && $data['teampage_parent'] == self::NO_PARENT) ? (abs($delta) - ($num_items - 1)) : abs($delta);
-
-				// And now finally, when we moved some other items and built a gap,
-				// we can move the desired item to it.
-				$sql = 'UPDATE ' . TEAMPAGE_TABLE . '
-					SET teampage_position = teampage_position ' . (($move_up) ? ' - ' : ' + ') . $delta . '
-					WHERE teampage_id = ' . (int) $teampage_id . '
-						OR teampage_parent = ' . (int) $teampage_id;
-				$this->db->sql_query($sql);
-
-				$this->db->sql_transaction('commit');
-				$this->cache->destroy('sql', TEAMPAGE_TABLE);
-
-				return true;
-			}
-
-			$this->db->sql_transaction('commit');
-		}
-
-		$this->cache->destroy('sql', TEAMPAGE_TABLE);
-		return false;
-	}
-
-	/**
-	* Get group type language var
-	*
-	* @param	int		$group_type	group_type from the groups-table
-	* @return	string		name of the language variable for the given group-type.
-	*/
-	static public function group_type_language($group_type)
-	{
-		switch ($group_type)
-		{
-			case GROUP_OPEN:
-				return 'GROUP_REQUEST';
-			case GROUP_CLOSED:
-				return 'GROUP_CLOSED';
-			case GROUP_HIDDEN:
-				return 'GROUP_HIDDEN';
-			case GROUP_SPECIAL:
-				return 'GROUP_SPECIAL';
-			case GROUP_FREE:
-				return 'GROUP_OPEN';
-		}
-	}
-}
diff --git a/phpBB/includes/hook/finder.php b/phpBB/includes/hook/finder.php
deleted file mode 100644
index 7b0412f733..0000000000
--- a/phpBB/includes/hook/finder.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
-*
-* @package extension
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The hook finder locates installed hooks.
-*
-* @package phpBB3
-*/
-class phpbb_hook_finder
-{
-	protected $phpbb_root_path;
-	protected $cache;
-	protected $php_ext;
-
-	/**
-	* Creates a new finder instance.
-	*
-	* @param string $phpbb_root_path Path to the phpbb root directory
-	* @param string $php_ext php file extension
-	* @param phpbb_cache_driver_interface $cache A cache instance or null
-	*/
-	public function __construct($phpbb_root_path, $php_ext, phpbb_cache_driver_interface $cache = null)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->cache = $cache;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	* Finds all hook files.
-	*
-	* @param bool $cache Whether the result should be cached
-	* @return array An array of paths to found hook files
-	*/
-	public function find($cache = true)
-	{
-		if (!defined('DEBUG') && $cache && $this->cache)
-		{
-			$hook_files = $this->cache->get('_hooks');
-			if ($hook_files !== false)
-			{
-				return $hook_files;
-			}
-		}
-
-		$hook_files = array();
-
-		// Now search for hooks...
-		$dh = @opendir($this->phpbb_root_path . 'includes/hooks/');
-
-		if ($dh)
-		{
-			while (($file = readdir($dh)) !== false)
-			{
-				if (strpos($file, 'hook_') === 0 && substr($file, -strlen('.' . $this->php_ext)) === '.' . $this->php_ext)
-				{
-					$hook_files[] = substr($file, 0, -(strlen($this->php_ext) + 1));
-				}
-			}
-			closedir($dh);
-		}
-
-		if ($cache && $this->cache)
-		{
-			$this->cache->put('_hooks', $hook_files);
-		}
-
-		return $hook_files;
-	}
-}
diff --git a/phpBB/includes/json_response.php b/phpBB/includes/json_response.php
deleted file mode 100644
index 5dd904da09..0000000000
--- a/phpBB/includes/json_response.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* JSON class
-* @package phpBB3
-*/
-class phpbb_json_response
-{
-	/**
-	 * Send the data to the client and exit the script.
-	 *
-	 * @param array $data Any additional data to send.
-	 * @param bool $exit Will exit the script if true.
-	 */
-	public function send($data, $exit = true)
-	{
-		header('Content-Type: application/json');
-		echo json_encode($data);
-
-		if ($exit)
-		{
-			garbage_collection();
-			exit_handler();
-		}
-	}
-}
diff --git a/phpBB/includes/lock/db.php b/phpBB/includes/lock/db.php
deleted file mode 100644
index 5cc0821aa0..0000000000
--- a/phpBB/includes/lock/db.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Database locking class
-* @package phpBB3
-*/
-class phpbb_lock_db
-{
-	/**
-	* Name of the config variable this lock uses
-	* @var string
-	*/
-	private $config_name;
-
-	/**
-	* Unique identifier for this lock.
-	*
-	* @var string
-	*/
-	private $unique_id;
-
-	/**
-	* Stores the state of this lock
-	* @var bool
-	*/
-	private $locked;
-
-	/**
-	* The phpBB configuration
-	* @var phpbb_config
-	*/
-	private $config;
-
-	/**
-	* A database connection
-	* @var phpbb_db_driver
-	*/
-	private $db;
-
-	/**
-	* Creates a named released instance of the lock.
-	*
-	* You have to call acquire() to actually create the lock.
-	*
-	* @param	string	$config_name	A config variable to be used for locking
-	* @param	array	$config			The phpBB configuration
-	* @param	phpbb_db_driver	$db				A database connection
-	*/
-	public function __construct($config_name, phpbb_config $config, phpbb_db_driver $db)
-	{
-		$this->config_name = $config_name;
-		$this->config = $config;
-		$this->db = $db;
-	}
-
-	/**
-	* Tries to acquire the lock by updating
-	* the configuration variable in the database.
-	*
-	* As a lock may only be held by one process at a time, lock
-	* acquisition may fail if another process is holding the lock
-	* or if another process obtained the lock but never released it.
-	* Locks are forcibly released after a timeout of 1 hour.
-	*
-	* @return	bool			true if lock was acquired
-	*							false otherwise
-	*/
-	public function acquire()
-	{
-		if ($this->locked)
-		{
-			return false;
-		}
-
-		if (!isset($this->config[$this->config_name]))
-		{
-			$this->config->set($this->config_name, '0', false);
-		}
-		$lock_value = $this->config[$this->config_name];
-
-		// make sure lock cannot be acquired by multiple processes
-		if ($lock_value)
-		{
-			// if the other process is running more than an hour already we have to assume it
-			// aborted without cleaning the lock
-			$time = explode(' ', $lock_value);
-			$time = $time[0];
-
-			if ($time + 3600 >= time())
-			{
-				return false;
-			}
-		}
-
-		$this->unique_id = time() . ' ' . unique_id();
-
-		// try to update the config value, if it was already modified by another
-		// process we failed to acquire the lock.
-		$this->locked = $this->config->set_atomic($this->config_name, $lock_value, $this->unique_id, false);
-
-		return $this->locked;
-	}
-
-	/**
-	* Does this process own the lock?
-	*
-	* @return	bool			true if lock is owned
-	*							false otherwise
-	*/
-	public function owns_lock()
-	{
-		return (bool) $this->locked;
-	}
-
-	/**
-	* Releases the lock.
-	*
-	* The lock must have been previously obtained, that is, acquire() call
-	* was issued and returned true.
-	*
-	* Note: Attempting to release a lock that is already released,
-	* that is, calling release() multiple times, is harmless.
-	*
-	* @return null
-	*/
-	public function release()
-	{
-		if ($this->locked)
-		{
-			$this->config->set_atomic($this->config_name, $this->unique_id, '0', false);
-			$this->locked = false;
-		}
-	}
-}
diff --git a/phpBB/includes/lock/flock.php b/phpBB/includes/lock/flock.php
deleted file mode 100644
index 17de0847c0..0000000000
--- a/phpBB/includes/lock/flock.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* File locking class
-* @package phpBB3
-*/
-class phpbb_lock_flock
-{
-	/**
-	* Path to the file to which access is controlled
-	*
-	* @var string
-	*/
-	private $path;
-
-	/**
-	* File pointer for the lock file
-	* @var string
-	*/
-	private $lock_fp;
-
-	/**
-	* Constructor.
-	*
-	* You have to call acquire() to actually acquire the lock.
-	*
-	* @param	string	$path	Path to the file to which access is controlled
-	*/
-	public function __construct($path)
-	{
-		$this->path = $path;
-		$this->lock_fp = null;
-	}
-
-	/**
-	* Tries to acquire the lock.
-	*
-	* If the lock is already held by another process, this call will block
-	* until the other process releases the lock. If a lock is acquired and
-	* is not released before script finishes but the process continues to
-	* live (apache/fastcgi) then subsequent processes trying to acquire
-	* the same lock will be blocked forever.
-	*
-	* If the lock is already held by the same process via another instance
-	* of this class, this call will block forever.
-	*
-	* If flock function is disabled in php or fails to work, lock
-	* acquisition will fail and false will be returned.
-	*
-	* @return	bool			true if lock was acquired
-	*							false otherwise
-	*/
-	public function acquire()
-	{
-		if ($this->lock_fp)
-		{
-			return false;
-		}
-
-		// For systems that can't have two processes opening
-		// one file for writing simultaneously
-		if (file_exists($this->path . '.lock'))
-		{
-			$mode = 'rb';
-		}
-		else
-		{
-			$mode = 'wb';
-		}
-
-		$this->lock_fp = @fopen($this->path . '.lock', $mode);
-
-		if ($mode == 'wb')
-		{
-			if (!$this->lock_fp)
-			{
-				// Two processes may attempt to create lock file at the same time.
-				// Have the losing process try opening the lock file again for reading
-				// on the assumption that the winning process created it
-				$mode = 'rb';
-				$this->lock_fp = @fopen($this->path . '.lock', $mode);
-			}
-			else
-			{
-				// Only need to set mode when the lock file is written
-				@chmod($this->path . '.lock', 0666);
-			}
-		}
-
-		if ($this->lock_fp)
-		{
-			@flock($this->lock_fp, LOCK_EX);
-		}
-
-		return (bool) $this->lock_fp;
-	}
-
-	/**
-	* Does this process own the lock?
-	*
-	* @return	bool			true if lock is owned
-	*							false otherwise
-	*/
-	public function owns_lock()
-	{
-		return (bool) $this->lock_fp;
-	}
-
-	/**
-	* Releases the lock.
-	*
-	* The lock must have been previously obtained, that is, acquire() call
-	* was issued and returned true.
-	*
-	* Note: Attempting to release a lock that is already released,
-	* that is, calling release() multiple times, is harmless.
-	*
-	* @return null
-	*/
-	public function release()
-	{
-		if ($this->lock_fp)
-		{
-			@flock($this->lock_fp, LOCK_UN);
-			fclose($this->lock_fp);
-			$this->lock_fp = null;
-		}
-	}
-}
diff --git a/phpBB/includes/log/interface.php b/phpBB/includes/log/interface.php
deleted file mode 100644
index 3b459c9bdf..0000000000
--- a/phpBB/includes/log/interface.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
-*
-* @package phpbb_log
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* The interface for the log-system.
-*
-* @package phpbb_log
-*/
-interface phpbb_log_interface
-{
-	/**
-	* This function returns the state of the log system.
-	*
-	* @param	string	$type	The log type we want to check. Empty to get
-	*							global log status.
-	*
-	* @return	bool	True if log for the type is enabled
-	*/
-	public function is_enabled($type = '');
-
-	/**
-	* Disable log
-	*
-	* This function allows disabling the log system or parts of it, for this
-	* page call. When add_log is called and the type is disabled,
-	* the log will not be added to the database.
-	*
-	* @param	mixed	$type	The log type we want to disable. Empty to
-	*						disable all logs. Can also be an array of types.
-	*
-	* @return	null
-	*/
-	public function disable($type = '');
-
-	/**
-	* Enable log
-	*
-	* This function allows re-enabling the log system.
-	*
-	* @param	mixed	$type	The log type we want to enable. Empty to
-	*						enable all logs. Can also be an array of types.
-	*
-	* @return	null
-	*/
-	public function enable($type = '');
-
-	/**
-	* Adds a log entry to the database
-	*
-	* @param	string	$mode				The mode defines which log_type is used and from which log the entry is retrieved
-	* @param	int		$user_id			User ID of the user
-	* @param	string	$log_ip				IP address of the user
-	* @param	string	$log_operation		Name of the operation
-	* @param	int		$log_time			Timestamp when the log entry was added, if empty time() will be used
-	* @param	array	$additional_data	More arguments can be added, depending on the log_type
-	*
-	* @return	int|bool		Returns the log_id, if the entry was added to the database, false otherwise.
-	*/
-	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array());
-
-	/**
-	* Grab the logs from the database
-	*
-	* @param	string	$mode			The mode defines which log_type is used and ifrom which log the entry is retrieved
-	* @param	bool	$count_logs		Shall we count all matching log entries?
-	* @param	int		$limit			Limit the number of entries that are returned
-	* @param	int		$offset			Offset when fetching the log entries, f.e. when paginating
-	* @param	mixed	$forum_id		Restrict the log entries to the given forum_id (can also be an array of forum_ids)
-	* @param	int		$topic_id		Restrict the log entries to the given topic_id
-	* @param	int		$user_id		Restrict the log entries to the given user_id
-	* @param	int		$log_time		Only get log entries newer than the given timestamp
-	* @param	string	$sort_by		SQL order option, e.g. 'l.log_time DESC'
-	* @param	string	$keywords		Will only return log entries that have the keywords in log_operation or log_data
-	*
-	* @return	array			The result array with the logs
-	*/
-	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '');
-
-	/**
-	* Get total log count
-	*
-	* @return	int			Returns the number of matching logs from the last call to get_logs()
-	*/
-	public function get_log_count();
-
-	/**
-	* Get offset of the last valid page
-	*
-	* @return	int			Returns the offset of the last valid page from the last call to get_logs()
-	*/
-	public function get_valid_offset();
-}
diff --git a/phpBB/includes/log/log.php b/phpBB/includes/log/log.php
deleted file mode 100644
index 7a26858348..0000000000
--- a/phpBB/includes/log/log.php
+++ /dev/null
@@ -1,739 +0,0 @@
-<?php
-/**
-*
-* @package phpbb_log
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* This class is used to add entries into the log table.
-*
-* @package phpbb_log
-*/
-class phpbb_log implements phpbb_log_interface
-{
-	/**
-	* If set, administrative user profile links will be returned and messages
-	* will not be censored.
-	* @var bool
-	*/
-	protected $is_in_admin;
-
-	/**
-	* An array with the disabled log types. Logs of such types will not be
-	* added when add_log() is called.
-	* @var array
-	*/
-	protected $disabled_types;
-
-	/**
-	* Keeps the total log count of the last call to get_logs()
-	* @var int
-	*/
-	protected $entry_count;
-
-	/**
-	* Keeps the offset of the last valid page of the last call to get_logs()
-	* @var int
-	*/
-	protected $last_page_offset;
-
-	/**
-	* The table we use to store our logs.
-	* @var string
-	*/
-	protected $log_table;
-
-	/**
-	* Database object
-	* @var phpbb_db_driver
-	*/
-	protected $db;
-
-	/**
-	* User object
-	* @var phpbb_user
-	*/
-	protected $user;
-
-	/**
-	* Auth object
-	* @var phpbb_auth
-	*/
-	protected $auth;
-
-	/**
-	* Event dispatcher object
-	* @var phpbb_dispatcher
-	*/
-	protected $dispatcher;
-
-	/**
-	* phpBB root path
-	* @var string
-	*/
-	protected $phpbb_root_path;
-
-	/**
-	* Admin root path
-	* @var string
-	*/
-	protected $phpbb_admin_path;
-
-	/**
-	* PHP Extension
-	* @var string
-	*/
-	protected $php_ext;
-
-	/**
-	* Constructor
-	*
-	* @param	phpbb_db_driver	$db		Database object
-	* @param	phpbb_user		$user	User object
-	* @param	phpbb_auth		$auth	Auth object
-	* @param	phpbb_dispatcher	$phpbb_dispatcher	Event dispatcher
-	* @param	string		$phpbb_root_path		Root path
-	* @param	string		$relative_admin_path	Relative admin root path
-	* @param	string		$php_ext			PHP Extension
-	* @param	string		$log_table		Name of the table we use to store our logs
-	* @return	null
-	*/
-	public function __construct($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, $relative_admin_path, $php_ext, $log_table)
-	{
-		$this->db = $db;
-		$this->user = $user;
-		$this->auth = $auth;
-		$this->dispatcher = $phpbb_dispatcher;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->phpbb_admin_path = $this->phpbb_root_path . $relative_admin_path;
-		$this->php_ext = $php_ext;
-		$this->log_table = $log_table;
-
-		/*
-		* IN_ADMIN is set after the session is created,
-		* so we need to take ADMIN_START into account as well, otherwise
-		* it will not work for the phpbb_log object we create in common.php
-		*/
-		$this->set_is_admin((defined('ADMIN_START') && ADMIN_START) || (defined('IN_ADMIN') && IN_ADMIN));
-		$this->enable();
-	}
-
-	/**
-	* Set is_in_admin in order to return administrative user profile links
-	* in get_logs()
-	*
-	* @param	bool	$is_in_admin		Are we called from within the acp?
-	* @return	null
-	*/
-	public function set_is_admin($is_in_admin)
-	{
-		$this->is_in_admin = (bool) $is_in_admin;
-	}
-
-	/**
-	* Returns the is_in_admin option
-	*
-	* @return	bool
-	*/
-	public function get_is_admin()
-	{
-		return $this->is_in_admin;
-	}
-
-	/**
-	* Set table name
-	*
-	* @param	string	$log_table		Can overwrite the table to use for the logs
-	* @return	null
-	*/
-	public function set_log_table($log_table)
-	{
-		$this->log_table = $log_table;
-	}
-
-	/**
-	* This function returns the state of the log system.
-	*
-	* {@inheritDoc}
-	*/
-	public function is_enabled($type = '')
-	{
-		if ($type == '' || $type == 'all')
-		{
-			return !isset($this->disabled_types['all']);
-		}
-		return !isset($this->disabled_types[$type]) && !isset($this->disabled_types['all']);
-	}
-
-	/**
-	* Disable log
-	*
-	* This function allows disabling the log system or parts of it, for this
-	* page call. When add_log is called and the type is disabled,
-	* the log will not be added to the database.
-	*
-	* {@inheritDoc}
-	*/
-	public function disable($type = '')
-	{
-		if (is_array($type))
-		{
-			foreach ($type as $disable_type)
-			{
-				$this->disable($disable_type);
-			}
-			return;
-		}
-
-		// Empty string is an equivalent for all types.
-		if ($type == '')
-		{
-			$type = 'all';
-		}
-		$this->disabled_types[$type] = true;
-	}
-
-	/**
-	* Enable log
-	*
-	* This function allows re-enabling the log system.
-	*
-	* {@inheritDoc}
-	*/
-	public function enable($type = '')
-	{
-		if (is_array($type))
-		{
-			foreach ($type as $enable_type)
-			{
-				$this->enable($enable_type);
-			}
-			return;
-		}
-
-		if ($type == '' || $type == 'all')
-		{
-			$this->disabled_types = array();
-			return;
-		}
-		unset($this->disabled_types[$type]);
-	}
-
-	/**
-	* Adds a log to the database
-	*
-	* {@inheritDoc}
-	*/
-	public function add($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = array())
-	{
-		if (!$this->is_enabled($mode))
-		{
-			return false;
-		}
-
-		if ($log_time == false)
-		{
-			$log_time = time();
-		}
-
-		$sql_ary = array(
-			'user_id'		=> $user_id,
-			'log_ip'		=> $log_ip,
-			'log_time'		=> $log_time,
-			'log_operation'	=> $log_operation,
-		);
-
-		switch ($mode)
-		{
-			case 'admin':
-				$sql_ary += array(
-					'log_type'		=> LOG_ADMIN,
-					'log_data'		=> (!empty($additional_data)) ? serialize($additional_data) : '',
-				);
-			break;
-
-			case 'mod':
-				$forum_id = (int) $additional_data['forum_id'];
-				unset($additional_data['forum_id']);
-				$topic_id = (int) $additional_data['topic_id'];
-				unset($additional_data['topic_id']);
-				$sql_ary += array(
-					'log_type'		=> LOG_MOD,
-					'forum_id'		=> $forum_id,
-					'topic_id'		=> $topic_id,
-					'log_data'		=> (!empty($additional_data)) ? serialize($additional_data) : '',
-				);
-			break;
-
-			case 'user':
-				$reportee_id = (int) $additional_data['reportee_id'];
-				unset($additional_data['reportee_id']);
-
-				$sql_ary += array(
-					'log_type'		=> LOG_USERS,
-					'reportee_id'	=> $reportee_id,
-					'log_data'		=> (!empty($additional_data)) ? serialize($additional_data) : '',
-				);
-			break;
-
-			case 'critical':
-				$sql_ary += array(
-					'log_type'		=> LOG_CRITICAL,
-					'log_data'		=> (!empty($additional_data)) ? serialize($additional_data) : '',
-				);
-			break;
-		}
-
-		/**
-		* Allows to modify log data before we add it to the database
-		*
-		* NOTE: if sql_ary does not contain a log_type value, the entry will
-		* not be stored in the database. So ensure to set it, if needed.
-		*
-		* @event core.add_log
-		* @var	string	mode			Mode of the entry we log
-		* @var	int		user_id			ID of the user who triggered the log
-		* @var	string	log_ip			IP of the user who triggered the log
-		* @var	string	log_operation	Language key of the log operation
-		* @var	int		log_time		Timestamp, when the log was added
-		* @var	array	additional_data	Array with additional log data
-		* @var	array	sql_ary			Array with log data we insert into the
-		*							database. If sql_ary[log_type] is not set,
-		*							we won't add the entry to the database.
-		* @since 3.1-A1
-		*/
-		$vars = array('mode', 'user_id', 'log_ip', 'log_operation', 'log_time', 'additional_data', 'sql_ary');
-		extract($this->dispatcher->trigger_event('core.add_log', $vars));
-
-		// We didn't find a log_type, so we don't save it in the database.
-		if (!isset($sql_ary['log_type']))
-		{
-			return false;
-		}
-
-		$this->db->sql_query('INSERT INTO ' . $this->log_table . ' ' . $this->db->sql_build_array('INSERT', $sql_ary));
-
-		return $this->db->sql_nextid();
-	}
-
-	/**
-	* Grab the logs from the database
-	*
-	* {@inheritDoc}
-	*/
-	public function get_logs($mode, $count_logs = true, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $log_time = 0, $sort_by = 'l.log_time DESC', $keywords = '')
-	{
-		$this->entry_count = 0;
-		$this->last_page_offset = $offset;
-
-		$topic_id_list = $reportee_id_list = array();
-
-		$profile_url = ($this->get_is_admin() && $this->phpbb_admin_path) ? append_sid("{$this->phpbb_admin_path}index.{$this->php_ext}", 'i=users&amp;mode=overview') : append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=viewprofile');
-
-		switch ($mode)
-		{
-			case 'admin':
-				$log_type = LOG_ADMIN;
-				$sql_additional = '';
-			break;
-
-			case 'mod':
-				$log_type = LOG_MOD;
-				$sql_additional = '';
-
-				if ($topic_id)
-				{
-					$sql_additional = 'AND l.topic_id = ' . (int) $topic_id;
-				}
-				else if (is_array($forum_id))
-				{
-					$sql_additional = 'AND ' . $this->db->sql_in_set('l.forum_id', array_map('intval', $forum_id));
-				}
-				else if ($forum_id)
-				{
-					$sql_additional = 'AND l.forum_id = ' . (int) $forum_id;
-				}
-			break;
-
-			case 'user':
-				$log_type = LOG_USERS;
-				$sql_additional = 'AND l.reportee_id = ' . (int) $user_id;
-			break;
-
-			case 'users':
-				$log_type = LOG_USERS;
-				$sql_additional = '';
-			break;
-
-			case 'critical':
-				$log_type = LOG_CRITICAL;
-				$sql_additional = '';
-			break;
-
-			default:
-				$log_type = false;
-				$sql_additional = '';
-		}
-
-		/**
-		* Overwrite log type and limitations before we count and get the logs
-		*
-		* NOTE: if log_type is false, no entries will be returned.
-		*
-		* @event core.get_logs_modify_type
-		* @var	string	mode		Mode of the entries we display
-		* @var	bool	count_logs	Do we count all matching entries?
-		* @var	int		limit		Limit the number of entries
-		* @var	int		offset		Offset when fetching the entries
-		* @var	mixed	forum_id	Limit entries to the forum_id,
-		*							can also be an array of forum_ids
-		* @var	int		topic_id	Limit entries to the topic_id
-		* @var	int		user_id		Limit entries to the user_id
-		* @var	int		log_time	Limit maximum age of log entries
-		* @var	string	sort_by		SQL order option
-		* @var	string	keywords	Will only return entries that have the
-		*							keywords in log_operation or log_data
-		* @var	string	profile_url	URL to the users profile
-		* @var	int		log_type	Limit logs to a certain type. If log_type
-		*							is false, no entries will be returned.
-		* @var	string	sql_additional	Additional conditions for the entries,
-		*								e.g.: 'AND l.forum_id = 1'
-		* @since 3.1-A1
-		*/
-		$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
-		extract($this->dispatcher->trigger_event('core.get_logs_modify_type', $vars));
-
-		if ($log_type === false)
-		{
-			$this->last_page_offset = 0;
-			return array();
-		}
-
-		$sql_keywords = '';
-		if (!empty($keywords))
-		{
-			// Get the SQL condition for our keywords
-			$sql_keywords = $this->generate_sql_keyword($keywords);
-		}
-
-		if ($count_logs)
-		{
-			$sql = 'SELECT COUNT(l.log_id) AS total_entries
-				FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . ' u
-				WHERE l.log_type = ' . (int) $log_type . '
-					AND l.user_id = u.user_id
-					AND l.log_time >= ' . (int) $log_time . "
-					$sql_keywords
-					$sql_additional";
-			$result = $this->db->sql_query($sql);
-			$this->entry_count = (int) $this->db->sql_fetchfield('total_entries');
-			$this->db->sql_freeresult($result);
-
-			if ($this->entry_count == 0)
-			{
-				// Save the queries, because there are no logs to display
-				$this->last_page_offset = 0;
-				return array();
-			}
-
-			// Return the user to the last page that is valid
-			while ($this->last_page_offset >= $this->entry_count)
-			{
-				$this->last_page_offset = max(0, $this->last_page_offset - $limit);
-			}
-		}
-
-		$sql = 'SELECT l.*, u.username, u.username_clean, u.user_colour
-			FROM ' . LOG_TABLE . ' l, ' . USERS_TABLE . ' u
-			WHERE l.log_type = ' . (int) $log_type . '
-				AND u.user_id = l.user_id
-				' . (($log_time) ? 'AND l.log_time >= ' . (int) $log_time : '') . "
-				$sql_keywords
-				$sql_additional
-			ORDER BY $sort_by";
-		$result = $this->db->sql_query_limit($sql, $limit, $this->last_page_offset);
-
-		$i = 0;
-		$log = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$row['forum_id'] = (int) $row['forum_id'];
-			if ($row['topic_id'])
-			{
-				$topic_id_list[] = (int) $row['topic_id'];
-			}
-
-			if ($row['reportee_id'])
-			{
-				$reportee_id_list[] = (int) $row['reportee_id'];
-			}
-
-			$log_entry_data = array(
-				'id'				=> (int) $row['log_id'],
-
-				'reportee_id'			=> (int) $row['reportee_id'],
-				'reportee_username'		=> '',
-				'reportee_username_full'=> '',
-
-				'user_id'			=> (int) $row['user_id'],
-				'username'			=> $row['username'],
-				'username_full'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, $profile_url),
-
-				'ip'				=> $row['log_ip'],
-				'time'				=> (int) $row['log_time'],
-				'forum_id'			=> (int) $row['forum_id'],
-				'topic_id'			=> (int) $row['topic_id'],
-
-				'viewforum'			=> ($row['forum_id'] && $this->auth->acl_get('f_read', $row['forum_id'])) ? append_sid("{$this->phpbb_root_path}viewforum.{$this->php_ext}", 'f=' . $row['forum_id']) : false,
-				'action'			=> (isset($this->user->lang[$row['log_operation']])) ? $this->user->lang[$row['log_operation']] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}',
-			);
-
-			/**
-			* Modify the entry's data before it is returned
-			*
-			* @event core.get_logs_modify_entry_data
-			* @var	array	row			Entry data from the database
-			* @var	array	log_entry_data	Entry's data which is returned
-			* @since 3.1-A1
-			*/
-			$vars = array('row', 'log_entry_data');
-			extract($this->dispatcher->trigger_event('core.get_logs_modify_entry_data', $vars));
-
-			$log[$i] = $log_entry_data;
-
-			if (!empty($row['log_data']))
-			{
-				$log_data_ary = unserialize($row['log_data']);
-				$log_data_ary = ($log_data_ary !== false) ? $log_data_ary : array();
-
-				if (isset($this->user->lang[$row['log_operation']]))
-				{
-					// Check if there are more occurrences of % than
-					// arguments, if there are we fill out the arguments
-					// array. It doesn't matter if we add more arguments than
-					// placeholders.
-					if ((substr_count($log[$i]['action'], '%') - sizeof($log_data_ary)) > 0)
-					{
-						$log_data_ary = array_merge($log_data_ary, array_fill(0, substr_count($log[$i]['action'], '%') - sizeof($log_data_ary), ''));
-					}
-
-					$log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary);
-
-					// If within the admin panel we do not censor text out
-					if ($this->get_is_admin())
-					{
-						$log[$i]['action'] = bbcode_nl2br($log[$i]['action']);
-					}
-					else
-					{
-						$log[$i]['action'] = bbcode_nl2br(censor_text($log[$i]['action']));
-					}
-				}
-				else if (!empty($log_data_ary))
-				{
-					$log[$i]['action'] .= '<br />' . implode('', $log_data_ary);
-				}
-
-				/* Apply make_clickable... has to be seen if it is for good. :/
-				// Seems to be not for the moment, reconsider later...
-				$log[$i]['action'] = make_clickable($log[$i]['action']);
-				*/
-			}
-
-			$i++;
-		}
-		$this->db->sql_freeresult($result);
-
-		/**
-		* Get some additional data after we got all log entries
-		*
-		* @event core.get_logs_get_additional_data
-		* @var	array	log			Array with all our log entries
-		* @var	array	topic_id_list		Array of topic ids, for which we
-		*									get the permission data
-		* @var	array	reportee_id_list	Array of additional user IDs we
-		*									get the username strings for
-		* @since 3.1-A1
-		*/
-		$vars = array('log', 'topic_id_list', 'reportee_id_list');
-		extract($this->dispatcher->trigger_event('core.get_logs_get_additional_data', $vars));
-
-		if (sizeof($topic_id_list))
-		{
-			$topic_auth = $this->get_topic_auth($topic_id_list);
-
-			foreach ($log as $key => $row)
-			{
-				$log[$key]['viewtopic'] = (isset($topic_auth['f_read'][$row['topic_id']])) ? append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", 'f=' . $topic_auth['f_read'][$row['topic_id']] . '&amp;t=' . $row['topic_id']) : false;
-				$log[$key]['viewlogs'] = (isset($topic_auth['m_'][$row['topic_id']])) ? append_sid("{$this->phpbb_root_path}mcp.{$this->php_ext}", 'i=logs&amp;mode=topic_logs&amp;t=' . $row['topic_id'], true, $this->user->session_id) : false;
-			}
-		}
-
-		if (sizeof($reportee_id_list))
-		{
-			$reportee_data_list = $this->get_reportee_data($reportee_id_list);
-
-			foreach ($log as $key => $row)
-			{
-				if (!isset($reportee_data_list[$row['reportee_id']]))
-				{
-					continue;
-				}
-
-				$log[$key]['reportee_username'] = $reportee_data_list[$row['reportee_id']]['username'];
-				$log[$key]['reportee_username_full'] = get_username_string('full', $row['reportee_id'], $reportee_data_list[$row['reportee_id']]['username'], $reportee_data_list[$row['reportee_id']]['user_colour'], false, $profile_url);
-			}
-		}
-
-		return $log;
-	}
-
-	/**
-	* Generates a sql condition for the specified keywords
-	*
-	* @param	string	$keywords	The keywords the user specified to search for
-	*
-	* @return	string		Returns the SQL condition searching for the keywords
-	*/
-	protected function generate_sql_keyword($keywords)
-	{
-		// Use no preg_quote for $keywords because this would lead to sole
-		// backslashes being added. We also use an OR connection here for
-		// spaces and the | string. Currently, regex is not supported for
-		// searching (but may come later).
-		$keywords = preg_split('#[\s|]+#u', utf8_strtolower($keywords), 0, PREG_SPLIT_NO_EMPTY);
-		$sql_keywords = '';
-
-		if (!empty($keywords))
-		{
-			$keywords_pattern = array();
-
-			// Build pattern and keywords...
-			for ($i = 0, $num_keywords = sizeof($keywords); $i < $num_keywords; $i++)
-			{
-				$keywords_pattern[] = preg_quote($keywords[$i], '#');
-				$keywords[$i] = $this->db->sql_like_expression($this->db->any_char . $keywords[$i] . $this->db->any_char);
-			}
-
-			$keywords_pattern = '#' . implode('|', $keywords_pattern) . '#ui';
-
-			$operations = array();
-			foreach ($this->user->lang as $key => $value)
-			{
-				if (substr($key, 0, 4) == 'LOG_' && preg_match($keywords_pattern, $value))
-				{
-					$operations[] = $key;
-				}
-			}
-
-			$sql_keywords = 'AND (';
-			if (!empty($operations))
-			{
-				$sql_keywords .= $this->db->sql_in_set('l.log_operation', $operations) . ' OR ';
-			}
-			$sql_lower = $this->db->sql_lower_text('l.log_data');
-			$sql_keywords .= " $sql_lower " . implode(" OR $sql_lower ", $keywords) . ')';
-		}
-
-		return $sql_keywords;
-	}
-
-	/**
-	* Determine whether the user is allowed to read and/or moderate the forum of the topic
-	*
-	* @param	array	$topic_ids	Array with the topic ids
-	*
-	* @return	array		Returns an array with two keys 'm_' and 'read_f' which are also an array of topic_id => forum_id sets when the permissions are given. Sample:
-	*						array(
-	*							'permission' => array(
-	*								topic_id => forum_id
-	*							),
-	*						),
-	*/
-	protected function get_topic_auth(array $topic_ids)
-	{
-		$forum_auth = array('f_read' => array(), 'm_' => array());
-		$topic_ids = array_unique($topic_ids);
-
-		$sql = 'SELECT topic_id, forum_id
-			FROM ' . TOPICS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('topic_id', array_map('intval', $topic_ids));
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$row['topic_id'] = (int) $row['topic_id'];
-			$row['forum_id'] = (int) $row['forum_id'];
-
-			if ($this->auth->acl_get('f_read', $row['forum_id']))
-			{
-				$forum_auth['f_read'][$row['topic_id']] = $row['forum_id'];
-			}
-
-			if ($this->auth->acl_gets('a_', 'm_', $row['forum_id']))
-			{
-				$forum_auth['m_'][$row['topic_id']] = $row['forum_id'];
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		return $forum_auth;
-	}
-
-	/**
-	* Get the data for all reportee from the database
-	*
-	* @param	array	$reportee_ids	Array with the user ids of the reportees
-	*
-	* @return	array		Returns an array with the reportee data
-	*/
-	protected function get_reportee_data(array $reportee_ids)
-	{
-		$reportee_ids = array_unique($reportee_ids);
-		$reportee_data_list = array();
-
-		$sql = 'SELECT user_id, username, user_colour
-			FROM ' . USERS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('user_id', $reportee_ids);
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$reportee_data_list[$row['user_id']] = $row;
-		}
-		$this->db->sql_freeresult($result);
-
-		return $reportee_data_list;
-	}
-
-	/**
-	* Get total log count
-	*
-	* {@inheritDoc}
-	*/
-	public function get_log_count()
-	{
-		return ($this->entry_count) ? $this->entry_count : 0;
-	}
-
-	/**
-	* Get offset of the last valid log page
-	*
-	* {@inheritDoc}
-	*/
-	public function get_valid_offset()
-	{
-		return ($this->last_page_offset) ? $this->last_page_offset : 0;
-	}
-}
diff --git a/phpBB/includes/notification/exception.php b/phpBB/includes/notification/exception.php
deleted file mode 100644
index a52d6fdc57..0000000000
--- a/phpBB/includes/notification/exception.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Notifications exception
-*
-* @package notifications
-*/
-class phpbb_notification_exception extends \Exception
-{
-	public function __toString()
-	{
-		return $this->getMessage();
-	}
-}
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
deleted file mode 100644
index 97833710c0..0000000000
--- a/phpBB/includes/notification/manager.php
+++ /dev/null
@@ -1,910 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Notifications service class
-* @package notifications
-*/
-class phpbb_notification_manager
-{
-	/** @var array */
-	protected $notification_types;
-
-	/** @var array */
-	protected $notification_methods;
-
-	/** @var ContainerBuilder */
-	protected $phpbb_container;
-
-	/** @var phpbb_user_loader */
-	protected $user_loader;
-
-	/** @var phpbb_db_driver */
-	protected $db;
-
-	/** @var phpbb_cache_service */
-	protected $cache;
-
-	/** @var phpbb_user */
-	protected $user;
-
-	/** @var string */
-	protected $phpbb_root_path;
-
-	/** @var string */
-	protected $php_ext;
-
-	/** @var string */
-	protected $notification_types_table;
-
-	/** @var string */
-	protected $notifications_table;
-
-	/** @var string */
-	protected $user_notifications_table;
-
-	/**
-	* Notification Constructor
-	* 
-	* @param array $notification_types
-	* @param array $notification_methods
-	* @param ContainerBuilder $phpbb_container
-	* @param phpbb_user_loader $user_loader
-	* @param phpbb_db_driver $db
-	* @param phpbb_user $user
-	* @param string $phpbb_root_path
-	* @param string $php_ext
-	* @param string $notification_types_table
-	* @param string $notifications_table
-	* @param string $user_notifications_table
-	* @return phpbb_notification_manager
-	*/
-	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_service $cache, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
-	{
-		$this->notification_types = $notification_types;
-		$this->notification_methods = $notification_methods;
-		$this->phpbb_container = $phpbb_container;
-
-		$this->user_loader = $user_loader;
-		$this->db = $db;
-		$this->cache = $cache;
-		$this->user = $user;
-
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-
-		$this->notification_types_table = $notification_types_table;
-		$this->notifications_table = $notifications_table;
-		$this->user_notifications_table = $user_notifications_table;
-	}
-
-	/**
-	* Load the user's notifications
-	*
-	* @param array $options Optional options to control what notifications are loaded
-	*				notification_id		Notification id to load (or array of notification ids)
-	*				user_id				User id to load notifications for (Default: $user->data['user_id'])
-	*				order_by			Order by (Default: notification_time)
-	*				order_dir			Order direction (Default: DESC)
-	* 				limit				Number of notifications to load (Default: 5)
-	* 				start				Notifications offset (Default: 0)
-	* 				all_unread			Load all unread notifications? If set to true, count_unread is set to true (Default: false)
-	* 				count_unread		Count all unread notifications? (Default: false)
-	* 				count_total			Count all notifications? (Default: false)
-	* @return array Array of information based on the request with keys:
-	*	'notifications'		array of notification type objects
-	*	'unread_count'		number of unread notifications the user has if count_unread is true in the options
-	*	'total_count'		number of notifications the user has if count_total is true in the options
-	*/
-	public function load_notifications(array $options = array())
-	{
-		// Merge default options
-		$options = array_merge(array(
-			'notification_id'	=> false,
-			'user_id'			=> $this->user->data['user_id'],
-			'order_by'			=> 'notification_time',
-			'order_dir'			=> 'DESC',
-			'limit'				=> 0,
-			'start'				=> 0,
-			'all_unread'		=> false,
-			'count_unread'		=> false,
-			'count_total'		=> false,
-		), $options);
-
-		// If all_unread, count_unread must be true
-		$options['count_unread'] = ($options['all_unread']) ? true : $options['count_unread'];
-
-		// Anonymous users and bots never receive notifications
-		if ($options['user_id'] == $this->user->data['user_id'] && ($this->user->data['user_id'] == ANONYMOUS || $this->user->data['user_type'] == USER_IGNORE))
-		{
-			return array(
-				'notifications'		=> array(),
-				'unread_count'		=> 0,
-				'total_count'		=> 0,
-			);
-		}
-
-		$notifications = $user_ids = array();
-		$load_special = array();
-		$total_count = $unread_count = 0;
-
-		if ($options['count_unread'])
-		{
-			// Get the total number of unread notifications
-			$sql = 'SELECT COUNT(n.notification_id) AS unread_count
-				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
-				WHERE n.user_id = ' . (int) $options['user_id'] . '
-					AND n.notification_read = 0
-					AND nt.notification_type_id = n.notification_type_id
-					AND nt.notification_type_enabled = 1';
-			$result = $this->db->sql_query($sql);
-			$unread_count = (int) $this->db->sql_fetchfield('unread_count', $result);
-			$this->db->sql_freeresult($result);
-		}
-
-		if ($options['count_total'])
-		{
-			// Get the total number of notifications
-			$sql = 'SELECT COUNT(n.notification_id) AS total_count
-				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
-				WHERE n.user_id = ' . (int) $options['user_id'] . '
-					AND nt.notification_type_id = n.notification_type_id
-					AND nt.notification_type_enabled = 1';
-			$result = $this->db->sql_query($sql);
-			$total_count = (int) $this->db->sql_fetchfield('total_count', $result);
-			$this->db->sql_freeresult($result);
-		}
-
-		if (!$options['count_total'] || $total_count)
-		{
-			$rowset = array();
-
-			// Get the main notifications
-			$sql = 'SELECT n.*, nt.notification_type_name
-				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
-				WHERE n.user_id = ' . (int) $options['user_id'] .
-					(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('n.notification_id', $options['notification_id']) : ' AND n.notification_id = ' . (int) $options['notification_id']) : '') . '
-					AND nt.notification_type_id = n.notification_type_id
-					AND nt.notification_type_enabled = 1
-				ORDER BY n.' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
-			$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$rowset[$row['notification_id']] = $row;
-			}
-			$this->db->sql_freeresult($result);
-
-			// Get all unread notifications
-			if ($unread_count && $options['all_unread'] && !empty($rowset))
-			{
-				$sql = 'SELECT n.*, nt.notification_type_name
-				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
-					WHERE n.user_id = ' . (int) $options['user_id'] . '
-						AND n.notification_read = 0
-						AND ' . $this->db->sql_in_set('n.notification_id', array_keys($rowset), true) . '
-						AND nt.notification_type_id = n.notification_type_id
-						AND nt.notification_type_enabled = 1
-					ORDER BY n.' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
-				$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$rowset[$row['notification_id']] = $row;
-				}
-				$this->db->sql_freeresult($result);
-			}
-
-			foreach ($rowset as $row)
-			{
-				$notification = $this->get_item_type_class($row['notification_type_name'], $row);
-
-				// Array of user_ids to query all at once
-				$user_ids = array_merge($user_ids, $notification->users_to_query());
-
-				// Some notification types also require querying additional tables themselves
-				if (!isset($load_special[$row['notification_type_name']]))
-				{
-					$load_special[$row['notification_type_name']] = array();
-				}
-				$load_special[$row['notification_type_name']] = array_merge($load_special[$row['notification_type_name']], $notification->get_load_special());
-
-				$notifications[$row['notification_id']] = $notification;
-			}
-
-			$this->user_loader->load_users($user_ids);
-
-			// Allow each type to load its own special items
-			foreach ($load_special as $item_type => $data)
-			{
-				$item_class = $this->get_item_type_class($item_type);
-
-				$item_class->load_special($data, $notifications);
-			}
-		}
-
-		return array(
-			'notifications'		=> $notifications,
-			'unread_count'		=> $unread_count,
-			'total_count'		=> $total_count,
-		);
-	}
-
-	/**
-	* Mark notifications read
-	*
-	* @param bool|string|array $notification_type_name Type identifier or array of item types (only acceptable if the $data is identical for the specified types). False to mark read for all item types
-	* @param bool|int|array $item_id Item id or array of item ids. False to mark read for all item ids
-	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
-	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
-	*/
-	public function mark_notifications_read($notification_type_name, $item_id, $user_id, $time = false)
-	{
-		$time = ($time !== false) ? $time : time();
-
-		$sql = 'UPDATE ' . $this->notifications_table . "
-			SET notification_read = 1
-			WHERE notification_time <= " . (int) $time .
-				(($notification_type_name !== false) ? ' AND ' .
-					(is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name))
-					 : '') .
-				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '') .
-				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '');
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Mark notifications read from a parent identifier
-	*
-	* @param string|array $notification_type_name Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
-	* @param bool|int|array $item_parent_id Item parent id or array of item parent ids. False to mark read for all item parent ids
-	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
-	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
-	*/
-	public function mark_notifications_read_by_parent($notification_type_name, $item_parent_id, $user_id, $time = false)
-	{
-		$time = ($time !== false) ? $time : time();
-
-		$sql = 'UPDATE ' . $this->notifications_table . "
-			SET notification_read = 1
-			WHERE notification_time <= " . (int) $time .
-				(($notification_type_name !== false) ? ' AND ' .
-					(is_array($notification_type_name) ? $this->db->sql_in_set('notification_type_id', $this->get_notification_type_ids($notification_type_name)) : 'notification_type_id = ' . $this->get_notification_type_id($notification_type_name))
-					 : '') .
-				(($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') .
-				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Mark notifications read
-	*
-	* @param int|array $notification_id Notification id or array of notification ids.
-	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
-	*/
-	public function mark_notifications_read_by_id($notification_id, $time = false)
-	{
-		$time = ($time !== false) ? $time : time();
-
-		$sql = 'UPDATE ' . $this->notifications_table . "
-			SET notification_read = 1
-			WHERE notification_time <= " . (int) $time . '
-				AND ' . ((is_array($notification_id)) ? $this->db->sql_in_set('notification_id', $notification_id) : 'notification_id = ' . (int) $notification_id);
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Add a notification
-	*
-	* @param string|array $notification_type_name Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
-	*			Note: If you send an array of types, any user who could receive multiple notifications from this single item will only receive
-	* 			a single notification. If they MUST receive multiple notifications, call this function multiple times instead of sending an array
-	* @param array $data Data specific for this type that will be inserted
-	* @param array $options Optional options to control what notifications are loaded
-	* 			ignore_users	array of data to specify which users should not receive certain types of notifications
-	* @return array Information about what users were notified and how they were notified
-	*/
-	public function add_notifications($notification_type_name, $data, array $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		if (is_array($notification_type_name))
-		{
-			$notified_users = array();
-			$temp_options = $options;
-
-			foreach ($notification_type_name as $type)
-			{
-				$temp_options['ignore_users'] = $options['ignore_users'] + $notified_users;
-				$notified_users += $this->add_notifications($type, $data, $temp_options);
-			}
-
-			return $notified_users;
-		}
-
-		$item_id = $this->get_item_type_class($notification_type_name)->get_item_id($data);
-
-		// find out which users want to receive this type of notification
-		$notify_users = $this->get_item_type_class($notification_type_name)->find_users_for_notification($data, $options);
-
-		$this->add_notifications_for_users($notification_type_name, $data, $notify_users);
-
-		return $notify_users;
-	}
-
-	/**
-	* Add a notification for specific users
-	*
-	* @param string|array $notification_type_name Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
-	* @param array $data Data specific for this type that will be inserted
-	* @param array $notify_users User list to notify
-	*/
-	public function add_notifications_for_users($notification_type_name, $data, $notify_users)
-	{
-		if (is_array($notification_type_name))
-		{
-			foreach ($notification_type_name as $type)
-			{
-				$this->add_notifications_for_users($type, $data, $notify_users);
-			}
-
-			return;
-		}
-
-		$notification_type_id = $this->get_notification_type_id($notification_type_name);
-
-		$item_id = $this->get_item_type_class($notification_type_name)->get_item_id($data);
-
-		$user_ids = array();
-		$notification_objects = $notification_methods = array();
-
-		// Never send notifications to the anonymous user!
-		unset($notify_users[ANONYMOUS]);
-
-		// Make sure not to send new notifications to users who've already been notified about this item
-		// This may happen when an item was added, but now new users are able to see the item
-		$sql = 'SELECT n.user_id
-			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
-			WHERE n.notification_type_id = ' . (int) $notification_type_id . '
-				AND n.item_id = ' . (int) $item_id . '
-				AND nt.notification_type_id = n.notification_type_id
-				AND nt.notification_type_enabled = 1';
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			unset($notify_users[$row['user_id']]);
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!sizeof($notify_users))
-		{
-			return;
-		}
-
-		// Allow notifications to perform actions before creating the insert array (such as run a query to cache some data needed for all notifications)
-		$notification = $this->get_item_type_class($notification_type_name);
-		$pre_create_data = $notification->pre_create_insert_array($data, $notify_users);
-		unset($notification);
-
-		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $this->notifications_table);
-
-		// Go through each user so we can insert a row in the DB and then notify them by their desired means
-		foreach ($notify_users as $user => $methods)
-		{
-			$notification = $this->get_item_type_class($notification_type_name);
-
-			$notification->user_id = (int) $user;
-
-			// Insert notification row using buffer.
-			$insert_buffer->insert($notification->create_insert_array($data, $pre_create_data));
-
-			// Users are needed to send notifications
-			$user_ids = array_merge($user_ids, $notification->users_to_query());
-
-			foreach ($methods as $method)
-			{
-				// setup the notification methods and add the notification to the queue
-				if ($method) // blank means we just insert it as a notification, but do not notify them by any other means
-				{
-					if (!isset($notification_methods[$method]))
-					{
-						$notification_methods[$method] = $this->get_method_class($method);
-					}
-
-					$notification_methods[$method]->add_to_queue($notification);
-				}
-			}
-		}
-
-		$insert_buffer->flush();
-
-		// We need to load all of the users to send notifications
-		$this->user_loader->load_users($user_ids);
-
-		// run the queue for each method to send notifications
-		foreach ($notification_methods as $method)
-		{
-			$method->notify();
-		}
-	}
-
-	/**
-	* Update a notification
-	*
-	* @param string|array $notification_type_name Type identifier or array of item types (only acceptable if the $data is identical for the specified types)
-	* @param array $data Data specific for this type that will be updated
-	*/
-	public function update_notifications($notification_type_name, $data)
-	{
-		if (is_array($notification_type_name))
-		{
-			foreach ($notification_type_name as $type)
-			{
-				$this->update_notifications($type, $data);
-			}
-
-			return;
-		}
-
-		$notification = $this->get_item_type_class($notification_type_name);
-
-		// Allow the notifications class to over-ride the update_notifications functionality
-		if (method_exists($notification, 'update_notifications'))
-		{
-			// Return False to over-ride the rest of the update
-			if ($notification->update_notifications($data) === false)
-			{
-				return;
-			}
-		}
-
-		$notification_type_id = $this->get_notification_type_id($notification_type_name);
-		$item_id = $notification->get_item_id($data);
-		$update_array = $notification->create_update_array($data);
-
-		$sql = 'UPDATE ' . $this->notifications_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $update_array) . '
-			WHERE notification_type_id = ' . (int) $notification_type_id . '
-				AND item_id = ' . (int) $item_id;
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Delete a notification
-	*
-	* @param string|array $notification_type_name Type identifier or array of item types (only acceptable if the $item_id is identical for the specified types)
-	* @param int|array $item_id Identifier within the type (or array of ids)
-	* @param array $data Data specific for this type that will be updated
-	*/
-	public function delete_notifications($notification_type_name, $item_id)
-	{
-		if (is_array($notification_type_name))
-		{
-			foreach ($notification_type_name as $type)
-			{
-				$this->delete_notifications($type, $item_id);
-			}
-
-			return;
-		}
-
-		$notification_type_id = $this->get_notification_type_id($notification_type_name);
-
-		$sql = 'DELETE FROM ' . $this->notifications_table . '
-			WHERE notification_type_id = ' . (int) $notification_type_id . '
-				AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id);
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Get all of the subscription types
-	*
-	* @return array Array of item types
-	*/
-	public function get_subscription_types()
-	{
-		$subscription_types = array();
-
-		foreach ($this->notification_types as $type_name => $data)
-		{
-			$type = $this->get_item_type_class($type_name);
-
-			if ($type instanceof phpbb_notification_type_interface && $type->is_available())
-			{
-				$options = array_merge(array(
-					'id'		=> $type->get_type(),
-					'lang'		=> 'NOTIFICATION_TYPE_' . strtoupper($type->get_type()),
-					'group'		=> 'NOTIFICATION_GROUP_MISCELLANEOUS',
-				), (($type::$notification_option !== false) ? $type::$notification_option : array()));
-
-				$subscription_types[$options['group']][$options['id']] = $options;
-			}
-		}
-
-		// Move Miscellaneous to the very last section
-		if (isset($subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']))
-		{
-			$miscellaneous = $subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'];
-			unset($subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']);
-			$subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS'] = $miscellaneous;
-		}
-
-		return $subscription_types;
-	}
-
-	/**
-	* Get all of the subscription methods
-	*
-	* @return array Array of methods
-	*/
-	public function get_subscription_methods()
-	{
-		$subscription_methods = array();
-
-		foreach ($this->notification_methods as $method_name => $data)
-		{
-			$method = $this->get_method_class($method_name);
-
-			if ($method instanceof phpbb_notification_method_interface && $method->is_available())
-			{
-				$subscription_methods[$method_name] = array(
-					'id'		=> $method->get_type(),
-					'lang'		=> 'NOTIFICATION_METHOD_' . strtoupper($method->get_type()),
-				);
-			}
-		}
-
-		return $subscription_methods;
-	}
-
-	/**
-	* Get global subscriptions (item_id = 0)
-	*
-	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
-	*
-	* @return array Subscriptions
-	*/
-	public function get_global_subscriptions($user_id = false)
-	{
-		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
-
-		$subscriptions = array();
-
-		foreach ($this->get_subscription_types() as $group_name => $types)
-		{
-			foreach ($types as $id => $type)
-			{
-				$sql = 'SELECT method, notify
-					FROM ' . $this->user_notifications_table . '
-					WHERE user_id = ' . (int) $user_id . "
-						AND item_type = '" . $this->db->sql_escape($id) . "'
-						AND item_id = 0";
-				$result = $this->db->sql_query($sql);
-
-				$row = $this->db->sql_fetchrow($result);
-				if (!$row)
-				{
-					// No rows at all, default to ''
-					$subscriptions[$id] = array('');
-				}
-				else
-				{
-					do
-					{
-						if (!$row['notify'])
-						{
-							continue;
-						}
-
-						if (!isset($subscriptions[$id]))
-						{
-							$subscriptions[$id] = array();
-						}
-
-						$subscriptions[$id][] = $row['method'];
-					}
-					while ($row = $this->db->sql_fetchrow($result));
-				}
-
-				$this->db->sql_freeresult($result);
-			}
-		}
-
-		return $subscriptions;
-	}
-
-	/**
-	* Add a subscription
-	*
-	* @param string $item_type Type identifier of the subscription
-	* @param int $item_id The id of the item
-	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
-	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
-	*/
-	public function add_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
-	{
-		if ($method !== '')
-		{
-			// Make sure to subscribe them to the base subscription
-			$this->add_subscription($item_type, $item_id, '', $user_id);
-		}
-
-		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
-
-		$sql = 'SELECT notify
-			FROM ' . $this->user_notifications_table . "
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id . '
-				AND user_id = ' .(int) $user_id . "
-				AND method = '" . $this->db->sql_escape($method) . "'";
-		$this->db->sql_query($sql);
-		$current = $this->db->sql_fetchfield('notify');
-		$this->db->sql_freeresult();
-
-		if ($current === false)
-		{
-			$sql = 'INSERT INTO ' . $this->user_notifications_table . ' ' .
-				$this->db->sql_build_array('INSERT', array(
-					'item_type'		=> $item_type,
-					'item_id'		=> (int) $item_id,
-					'user_id'		=> (int) $user_id,
-					'method'		=> $method,
-					'notify'		=> 1,
-				));
-			$this->db->sql_query($sql);
-		}
-		else if (!$current)
-		{
-			$sql = 'UPDATE ' . $this->user_notifications_table . "
-				SET notify = 1
-				WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-					AND item_id = " . (int) $item_id . '
-					AND user_id = ' .(int) $user_id . "
-					AND method = '" . $this->db->sql_escape($method) . "'";
-			$this->db->sql_query($sql);
-		}
-	}
-
-	/**
-	* Delete a subscription
-	*
-	* @param string $item_type Type identifier of the subscription
-	* @param int $item_id The id of the item
-	* @param string $method The method of the notification e.g. '', 'email', or 'jabber'
-	* @param bool|int $user_id The user_id to add the subscription for (bool false for current user)
-	*/
-	public function delete_subscription($item_type, $item_id = 0, $method = '', $user_id = false)
-	{
-		$user_id = ($user_id === false) ? $this->user->data['user_id'] : $user_id;
-
-		// If no method, make sure that no other notification methods for this item are selected before deleting
-		if ($method === '')
-		{
-			$sql = 'SELECT COUNT(*) as num_notifications
-				FROM ' . $this->user_notifications_table . "
-				WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-					AND item_id = " . (int) $item_id . '
-					AND user_id = ' .(int) $user_id . "
-					AND method <> ''
-					AND notify = 1";
-			$this->db->sql_query($sql);
-			$num_notifications = $this->db->sql_fetchfield('num_notifications');
-			$this->db->sql_freeresult();
-
-			if ($num_notifications)
-			{
-				return;
-			}
-		}
-
-		$sql = 'UPDATE ' . $this->user_notifications_table . "
-			SET notify = 0
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id . '
-				AND user_id = ' .(int) $user_id . "
-				AND method = '" . $this->db->sql_escape($method) . "'";
-		$this->db->sql_query($sql);
-
-		if (!$this->db->sql_affectedrows())
-		{
-			$sql = 'INSERT INTO ' . $this->user_notifications_table . ' ' .
-				$this->db->sql_build_array('INSERT', array(
-					'item_type'		=> $item_type,
-					'item_id'		=> (int) $item_id,
-					'user_id'		=> (int) $user_id,
-					'method'		=> $method,
-					'notify'		=> 0,
-				));
-			$this->db->sql_query($sql);
-		}
-	}
-
-	/**
-	* Disable all notifications of a certain type
-	*
-	* This should be called when an extension which has notification types
-	* is disabled so that all those notifications are hidden and do not
-	* cause errors
-	*
-	* @param string $notification_type_name Type identifier of the subscription
-	*/
-	public function disable_notifications($notification_type_name)
-	{
-		$sql = 'UPDATE ' . $this->notification_types_table . "
-			SET notification_type_enabled = 0
-			WHERE notification_type_name = '" . $this->db->sql_escape($notification_type_name) . "'";
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Purge all notifications of a certain type
-	*
-	* This should be called when an extension which has notification types
-	* is purged so that all those notifications are removed
-	*
-	* @param string $notification_type_name Type identifier of the subscription
-	*/
-	public function purge_notifications($notification_type_name)
-	{
-		$notification_type_id = $this->get_notification_type_id($notification_type_name);
-
-		$sql = 'DELETE FROM ' . $this->notifications_table . '
-			WHERE notification_type_id = ' . (int) $notification_type_id;
-		$this->db->sql_query($sql);
-
-		$sql = 'DELETE FROM ' . $this->notification_types_table . '
-			WHERE notification_type_id = ' . (int) $notification_type_id;
-		$this->db->sql_query($sql);
-
-		$this->cache->destroy('notification_type_ids');
-	}
-
-	/**
-	* Enable all notifications of a certain type
-	*
-	* This should be called when an extension which has notification types
-	* that was disabled is re-enabled so that all those notifications that
-	* were hidden are shown again
-	*
-	* @param string $notification_type_name Type identifier of the subscription
-	*/
-	public function enable_notifications($notification_type_name)
-	{
-		$sql = 'UPDATE ' . $this->notification_types_table . "
-			SET notification_type_enabled = 1
-			WHERE notification_type_name = '" . $this->db->sql_escape($notification_type_name) . "'";
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Delete all notifications older than a certain time
-	*
-	* @param int $timestamp Unix timestamp to delete all notifications that were created before
-	*/
-	public function prune_notifications($timestamp)
-	{
-		$sql = 'DELETE FROM ' . $this->notifications_table . '
-			WHERE notification_time < ' . (int) $timestamp;
-		$this->db->sql_query($sql);
-	}
-
-	/**
-	* Helper to get the notifications item type class and set it up
-	*/
-	public function get_item_type_class($notification_type_name, $data = array())
-	{
-		$notification_type_name = (strpos($notification_type_name, 'notification.type.') === 0) ? $notification_type_name : 'notification.type.' . $notification_type_name;
-
-		$item = $this->load_object($notification_type_name);
-
-		$item->set_initial_data($data);
-
-		return $item;
-	}
-
-	/**
-	* Helper to get the notifications method class and set it up
-	*/
-	public function get_method_class($method_name)
-	{
-		$method_name = (strpos($method_name, 'notification.method.') === 0) ? $method_name : 'notification.method.' . $method_name;
-
-		return $this->load_object($method_name);
-	}
-
-	/**
-	* Helper to load objects (notification types/methods)
-	*/
-	protected function load_object($object_name)
-	{
-		$object = $this->phpbb_container->get($object_name);
-		
-		if (method_exists($object, 'set_notification_manager'))
-		{
-			$object->set_notification_manager($this);
-		}
-		
-		return $object;
-	}
-
-	/**
-	* Get the notification type id from the name
-	*
-	* @param string $notification_type_name The name
-	* @return int the notification_type_id
-	*/
-	public function get_notification_type_id($notification_type_name)
-	{
-		$notification_type_ids = $this->cache->get('notification_type_ids');
-
-		if ($notification_type_ids === false)
-		{
-			$notification_type_ids = array();
-
-			$sql = 'SELECT notification_type_id, notification_type_name
-				FROM ' . $this->notification_types_table;
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$notification_type_ids[$row['notification_type_name']] = (int) $row['notification_type_id'];
-			}
-			$this->db->sql_freeresult($result);
-
-			$this->cache->put('notification_type_ids', $notification_type_ids);
-		}
-
-		if (!isset($notification_type_ids[$notification_type_name]))
-		{
-			if (!isset($this->notification_types[$notification_type_name]) && !isset($this->notification_types['notification.type.' . $notification_type_name]))
-			{
-				throw new phpbb_notification_exception($this->user->lang('NOTIFICATION_TYPE_NOT_EXIST', $notification_type_name));
-			}
-
-			$sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array(
-				'notification_type_name'		=> $notification_type_name,
-				'notification_type_enabled'		=> 1,
-			));
-			$this->db->sql_query($sql);
-
-			$notification_type_ids[$notification_type_name] = (int) $this->db->sql_nextid();
-
-			$this->cache->put('notification_type_ids', $notification_type_ids);
-		}
-
-		return $notification_type_ids[$notification_type_name];
-	}
-
-	/**
-	* Get notification type ids (as an array)
-	*
-	* @param array $notification_type_names Array of strings
-	* @return array Array of integers
-	*/
-	public function get_notification_type_ids(array $notification_type_names)
-	{
-		$notification_type_ids = array();
-
-		foreach ($notification_type_names as $name)
-		{
-			$notification_type_ids[$name] = $this->get_notification_type_id($name);
-		}
-
-		return $notification_type_ids;
-	}
-}
diff --git a/phpBB/includes/notification/method/base.php b/phpBB/includes/notification/method/base.php
deleted file mode 100644
index b633956d01..0000000000
--- a/phpBB/includes/notification/method/base.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base notifications method class
-* @package notifications
-*/
-abstract class phpbb_notification_method_base implements phpbb_notification_method_interface
-{
-	/** @var phpbb_notification_manager */
-	protected $notification_manager;
-
-	/** @var phpbb_user_loader */
-	protected $user_loader;
-
-	/** @var phpbb_db_driver */
-	protected $db;
-
-	/** @var phpbb_cache_driver_interface */
-	protected $cache;
-
-	/** @var phpbb_template */
-	protected $template;
-
-	/** @var phpbb_extension_manager */
-	protected $extension_manager;
-
-	/** @var phpbb_user */
-	protected $user;
-
-	/** @var phpbb_auth */
-	protected $auth;
-
-	/** @var phpbb_config */
-	protected $config;
-
-	/** @var string */
-	protected $phpbb_root_path;
-
-	/** @var string */
-	protected $php_ext;
-
-	/**
-	* Queue of messages to be sent
-	*
-	* @var array
-	*/
-	protected $queue = array();
-
-	/**
-	* Notification Method Base Constructor
-	* 
-	* @param phpbb_user_loader $user_loader
-	* @param phpbb_db_driver $db
-	* @param phpbb_cache_driver_interface $cache
-	* @param phpbb_user $user
-	* @param phpbb_auth $auth
-	* @param phpbb_config $config
-	* @param string $phpbb_root_path
-	* @param string $php_ext
-	* @return phpbb_notification_method_base
-	*/
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
-	{
-		$this->user_loader = $user_loader;
-		$this->db = $db;
-		$this->cache = $cache;
-		$this->user = $user;
-		$this->auth = $auth;
-		$this->config = $config;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-	}
-
-	/**
-	* Set notification manager (required)
-	* 
-	* @param phpbb_notification_manager $notification_manager
-	*/
-	public function set_notification_manager(phpbb_notification_manager $notification_manager)
-	{
-		$this->notification_manager = $notification_manager;
-	}
-
-	/**
-	* Add a notification to the queue
-	*
-	* @param phpbb_notification_type_interface $notification
-	*/
-	public function add_to_queue(phpbb_notification_type_interface $notification)
-	{
-		$this->queue[] = $notification;
-	}
-
-	/**
-	* Empty the queue
-	*/
-	protected function empty_queue()
-	{
-		$this->queue = array();
-	}
-}
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
deleted file mode 100644
index 571b0ec656..0000000000
--- a/phpBB/includes/notification/method/email.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Email notification method class
-* This class handles sending emails for notifications
-*
-* @package notifications
-*/
-class phpbb_notification_method_email extends phpbb_notification_method_messenger_base
-{
-	/**
-	* Get notification method name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'email';
-	}
-
-	/**
-	* Is this method available for the user?
-	* This is checked on the notifications options
-	*/
-	public function is_available()
-	{
-		return $this->config['email_enable'] && $this->user->data['user_email'];
-	}
-
-	/**
-	* Parse the queue and notify the users
-	*/
-	public function notify()
-	{
-		return $this->notify_using_messenger(NOTIFY_EMAIL);
-	}
-}
diff --git a/phpBB/includes/notification/method/interface.php b/phpBB/includes/notification/method/interface.php
deleted file mode 100644
index ef875942cc..0000000000
--- a/phpBB/includes/notification/method/interface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base notifications method interface
-* @package notifications
-*/
-interface phpbb_notification_method_interface
-{
-	/**
-	* Get notification method name
-	*
-	* @return string
-	*/
-	public function get_type();
-
-	/**
-	* Is this method available for the user?
-	* This is checked on the notifications options
-	*/
-	public function is_available();
-
-	/**
-	* Add a notification to the queue
-	*
-	* @param phpbb_notification_type_interface $notification
-	*/
-	public function add_to_queue(phpbb_notification_type_interface $notification);
-
-	/**
-	* Parse the queue and notify the users
-	*/
-	public function notify();
-}
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
deleted file mode 100644
index d3b756d020..0000000000
--- a/phpBB/includes/notification/method/jabber.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Jabber notification method class
-* This class handles sending Jabber messages for notifications
-*
-* @package notifications
-*/
-class phpbb_notification_method_jabber extends phpbb_notification_method_messenger_base
-{
-	/**
-	* Get notification method name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'jabber';
-	}
-
-	/**
-	* Is this method available for the user?
-	* This is checked on the notifications options
-	*/
-	public function is_available()
-	{
-		return ($this->global_available() && $this->user->data['user_jabber']);
-	}
-
-	/**
-	* Is this method available at all?
-	* This is checked before notifications are sent
-	*/
-	public function global_available()
-	{
-		return !(
-			empty($this->config['jab_enable']) ||
-			empty($this->config['jab_host']) ||
-			empty($this->config['jab_username']) ||
-			empty($this->config['jab_password']) ||
-			!@extension_loaded('xml')
-		);
-	}
-
-	public function notify()
-	{
-		if (!$this->global_available())
-		{
-			return;
-		}
-
-		return $this->notify_using_messenger(NOTIFY_IM, 'short/');
-	}
-}
diff --git a/phpBB/includes/notification/method/messenger_base.php b/phpBB/includes/notification/method/messenger_base.php
deleted file mode 100644
index 4966aa94bc..0000000000
--- a/phpBB/includes/notification/method/messenger_base.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Abstract notification method handling email and jabber notifications
-* using the phpBB messenger.
-*
-* @package notifications
-*/
-abstract class phpbb_notification_method_messenger_base extends phpbb_notification_method_base
-{
-	/**
-	* Notify using phpBB messenger
-	*
-	* @param int $notify_method				Notify method for messenger (e.g. NOTIFY_IM)
-	* @param string $template_dir_prefix	Base directory to prepend to the email template name
-	*
-	* @return null
-	*/
-	protected function notify_using_messenger($notify_method, $template_dir_prefix = '')
-	{
-		if (empty($this->queue))
-		{
-			return;
-		}
-
-		// Load all users we want to notify (we need their email address)
-		$user_ids = $users = array();
-		foreach ($this->queue as $notification)
-		{
-			$user_ids[] = $notification->user_id;
-		}
-
-		// We do not send emails to banned users
-		if (!function_exists('phpbb_get_banned_user_ids'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-		}
-		$banned_users = phpbb_get_banned_user_ids($user_ids);
-
-		// Load all the users we need
-		$this->user_loader->load_users($user_ids);
-
-		// Load the messenger
-		if (!class_exists('messenger'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
-		}
-		$messenger = new messenger();
-		$board_url = generate_board_url();
-
-		// Time to go through the queue and send emails
-		foreach ($this->queue as $notification)
-		{
-			if ($notification->get_email_template() === false)
-			{
-				continue;
-			}
-
-			$user = $this->user_loader->get_user($notification->user_id);
-
-			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
-			{
-				continue;
-			}
-
-			$messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']);
-
-			$messenger->set_addresses($user);
-
-			$messenger->assign_vars(array_merge(array(
-				'USERNAME'						=> $user['username'],
-
-				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',
-			), $notification->get_email_template_variables()));
-
-			$messenger->send($notify_method);
-		}
-
-		// Save the queue in the messenger class (has to be called or these emails could be lost?)
-		$messenger->save_queue();
-
-		// We're done, empty the queue
-		$this->empty_queue();
-	}
-}
diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
deleted file mode 100644
index 1a30781c35..0000000000
--- a/phpBB/includes/notification/type/approve_post.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post approved notifications class
-* This class handles notifications for posts when they are approved (to their authors)
-*
-* @package notifications
-*/
-class phpbb_notification_type_approve_post extends phpbb_notification_type_post
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'approve_post';
-	}
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_POST_APPROVED';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'moderation_queue',
-		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
-		'group'	=> 'NOTIFICATION_GROUP_POSTING',
-	);
-
-	/**
-	* Is available
-	*/
-	public function is_available()
-	{
-		return !$this->auth->acl_get('m_approve');
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $post Data from
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$users = array();
-		$users[$post['poster_id']] = array('');
-
-		$auth_read = $this->auth->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		return $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], array_merge($options, array(
-			'item_type'		=> self::$notification_option['id'],
-		)));
-	}
-
-	/**
-	* Pre create insert array function
-	* This allows you to perform certain actions, like run a query
-	* and load data, before create_insert_array() is run. The data
-	* returned from this function will be sent to create_insert_array().
-	*
-	* @param array $post Post data from submit_post
-	* @param array $notify_users Notify users list
-	* 		Formated from find_users_for_notification()
-	* @return array Whatever you want to send to create_insert_array().
-	*/
-	public function pre_create_insert_array($post, $notify_users)
-	{
-		// In the parent class, this is used to check if the post is already
-		// read by a user and marks the notification read if it was marked read.
-		// Returning an empty array in effect, forces it to be marked as unread
-		// (and also saves a query)
-		return array();
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post, $pre_create_data = array())
-	{
-		$this->set_data('post_subject', $post['post_subject']);
-
-		$data = parent::create_insert_array($post, $pre_create_data);
-
-		$this->notification_time = $data['notification_time'] = time();
-
-		return $data;
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'post_approved';
-	}
-}
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
deleted file mode 100644
index e728e9ac30..0000000000
--- a/phpBB/includes/notification/type/approve_topic.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Topic approved notifications class
-* This class handles notifications for topics when they are approved (for authors)
-*
-* @package notifications
-*/
-class phpbb_notification_type_approve_topic extends phpbb_notification_type_topic
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'approve_topic';
-	}
-	
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_TOPIC_APPROVED';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'moderation_queue',
-		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
-		'group'	=> 'NOTIFICATION_GROUP_POSTING',
-	);
-
-	/**
-	* Is available
-	*/
-	public function is_available()
-	{
-		return !$this->auth->acl_get('m_approve');
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $post Data from
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$users = array();
-		$users[$post['poster_id']] = array('');
-
-		$auth_read = $this->auth->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		return $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], array_merge($options, array(
-			'item_type'		=> self::$notification_option['id'],
-		)));
-	}
-
-	/**
-	* Pre create insert array function
-	* This allows you to perform certain actions, like run a query
-	* and load data, before create_insert_array() is run. The data
-	* returned from this function will be sent to create_insert_array().
-	*
-	* @param array $post Post data from submit_post
-	* @param array $notify_users Notify users list
-	* 		Formated from find_users_for_notification()
-	* @return array Whatever you want to send to create_insert_array().
-	*/
-	public function pre_create_insert_array($post, $notify_users)
-	{
-		// In the parent class, this is used to check if the post is already
-		// read by a user and marks the notification read if it was marked read.
-		// Returning an empty array in effect, forces it to be marked as unread
-		// (and also saves a query)
-		return array();
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post, $pre_create_data = array())
-	{
-		$data = parent::create_insert_array($post, $pre_create_data);
-
-		$this->notification_time = $data['notification_time'] = time();
-
-		return $data;
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'topic_approved';
-	}
-}
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
deleted file mode 100644
index 46517f1c9b..0000000000
--- a/phpBB/includes/notification/type/base.php
+++ /dev/null
@@ -1,489 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base notifications class
-* @package notifications
-*/
-abstract class phpbb_notification_type_base implements phpbb_notification_type_interface
-{
-	/** @var phpbb_notification_manager */
-	protected $notification_manager;
-
-	/** @var phpbb_user_loader */
-	protected $user_loader;
-
-	/** @var phpbb_db_driver */
-	protected $db;
-
-	/** @var phpbb_cache_driver_interface */
-	protected $cache;
-
-	/** @var phpbb_template */
-	protected $template;
-
-	/** @var phpbb_user */
-	protected $user;
-
-	/** @var phpbb_auth */
-	protected $auth;
-
-	/** @var phpbb_config */
-	protected $config;
-
-	/** @var string */
-	protected $phpbb_root_path;
-
-	/** @var string */
-	protected $php_ext;
-
-	/** @var string */
-	protected $notification_types_table;
-
-	/** @var string */
-	protected $notifications_table;
-
-	/** @var string */
-	protected $user_notifications_table;
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use its default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = false;
-
-	/**
-	* The notification_type_id, set upon creation of the class
-	* This is the notification_type_id from the notification_types table
-	*
-	* @var int
-	*/
-	protected $notification_type_id;
-
-	/**
-	* Indentification data
-	* notification_type_id	- ID of the item type (auto generated, from notification types table)
-	* item_id				- ID of the item (e.g. post_id, msg_id)
-	* item_parent_id		- Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
-	* user_id
-	* notification_read
-	* notification_time
-	* notification_data (special serialized field that each notification type can use to store stuff)
-	*
-	* @var array $data Notification row from the database
-	* 		This must be private, all interaction should use __get(), __set(), get_data(), set_data()
-	*/
-	private $data = array();
-
-	/**
-	* Notification Type Base Constructor
-	* 
-	* @param phpbb_user_loader $user_loader
-	* @param phpbb_db_driver $db
-	* @param phpbb_cache_driver_interface $cache
-	* @param phpbb_user $user
-	* @param phpbb_auth $auth
-	* @param phpbb_config $config
-	* @param string $phpbb_root_path
-	* @param string $php_ext
-	* @param string $notification_types_table
-	* @param string $notifications_table
-	* @param string $user_notifications_table
-	* @return phpbb_notification_type_base
-	*/
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
-	{
-		$this->user_loader = $user_loader;
-		$this->db = $db;
-		$this->cache = $cache;
-		$this->user = $user;
-		$this->auth = $auth;
-		$this->config = $config;
-
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-
-		$this->notification_types_table = $notification_types_table;
-		$this->notifications_table = $notifications_table;
-		$this->user_notifications_table = $user_notifications_table;
-	}
-
-	/**
-	* Set notification manager (required)
-	* 
-	* @param phpbb_notification_manager $notification_manager
-	*/
-	public function set_notification_manager(phpbb_notification_manager $notification_manager)
-	{
-		$this->notification_manager = $notification_manager;
-
-		$this->notification_type_id = $this->notification_manager->get_notification_type_id($this->get_type());
-	}
-
-	/**
-	* Set initial data from the database
-	*
-	* @param array $data Row directly from the database
-	*/
-	public function set_initial_data($data = array())
-	{
-		// The row from the database (unless this is a new notification we're going to add)
-		$this->data = $data;
-		$this->data['notification_data'] = (isset($this->data['notification_data'])) ? unserialize($this->data['notification_data']) : array();
-	}
-
-	/**
-	* Magic method to get data from this notification
-	* 
-	* @param mixed $name
-	* @return mixed
-	*/
-	public function __get($name)
-	{
-		return (!isset($this->data[$name])) ? null : $this->data[$name];
-	}
-
-
-	/**
-	* Magic method to set data on this notification
-	* 
-	* @param mixed $name
-	* @return null
-	*/
-	public function __set($name, $value)
-	{
-		$this->data[$name] = $value;
-	}
-
-
-	/**
-	* Magic method to get a string of this notification
-	* 
-	* Primarily for testing
-	* 
-	* @param string $name
-	* @return mixed
-	*/
-	public function __toString()
-	{
-		return (!empty($this->data)) ? var_export($this->data, true) : $this->get_type();
-	}
-
-	/**
-	* Get special data (only important for the classes that extend this)
-	*
-	* @param string $name Name of the variable to get
-	* @return mixed
-	*/
-	protected function get_data($name)
-	{
-		return ($name === false) ? $this->data['notification_data'] : ((isset($this->data['notification_data'][$name])) ? $this->data['notification_data'][$name] : null);
-	}
-
-	/**
-	* Set special data (only important for the classes that extend this)
-	*
-	* @param string $name Name of the variable to set
-	* @param mixed $value Value to set to the variable
-	* @return mixed
-	*/
-	protected function set_data($name, $value)
-	{
-		$this->data['notification_data'][$name] = $value;
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $type_data Data unique to this notification type
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($type_data, $pre_create_data = array())
-	{
-		// Defaults
-		$this->data = array_merge(array(
-			'item_id'				=> static::get_item_id($type_data),
-			'notification_type_id'	=> $this->notification_type_id,
-			'item_parent_id'		=> static::get_item_parent_id($type_data),
-
-			'notification_time'		=> time(),
-			'notification_read'		=> false,
-
-			'notification_data'					=> array(),
-		), $this->data);
-
-		$data = $this->data;
-
-		$data['notification_data'] = serialize($data['notification_data']);
-
-		return $data;
-	}
-
-	/**
-	* Function for preparing the data for update in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $type_data Data unique to this notification type
-	* @return array Array of data ready to be updated in the database
-	*/
-	public function create_update_array($type_data)
-	{
-		$data = $this->create_insert_array($type_data);
-
-		// Unset data unique to each row
-		unset(
-			$data['notification_time'], // Also unsetting time, since it always tries to change the time to current (if you actually need to change the time, over-ride this function)
-			$data['notification_id'],
-			$data['notification_read'],
-			$data['user_id']
-		);
-
-		return $data;
-	}
-
-	/**
-	* Mark this item read
-	*
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string|null If $return is False, nothing will be returned, else the sql code to update this item
-	*/
-	public function mark_read($return = false)
-	{
-		return $this->mark(false, $return);
-	}
-
-	/**
-	* Mark this item unread
-	*
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string|null If $return is False, nothing will be returned, else the sql code to update this item
-	*/
-	public function mark_unread($return = false)
-	{
-		return $this->mark(true, $return);
-	}
-
-	/**
-	* Prepare to output the notification to the template
-	* 
-	* @return array Template variables
-	*/
-	public function prepare_for_display()
-	{
-		if ($this->get_url())
-		{
-			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id);
-		}
-		else
-		{
-			$redirect = (($this->user->page['page_dir']) ? $this->user->page['page_dir'] . '/' : '') . $this->user->page['page_name'] . (($this->user->page['query_string']) ? '?' . $this->user->page['query_string'] : '');
-
-			$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&amp;redirect=' . urlencode($redirect));
-		}
-
-		return array(
-			'NOTIFICATION_ID'	=> $this->notification_id,
-
-			'AVATAR'			=> $this->get_avatar(),
-
-			'FORMATTED_TITLE'	=> $this->get_title(),
-
-			'URL'				=> $this->get_url(),
-			'TIME'	   			=> $this->user->format_date($this->notification_time),
-
-			'UNREAD'			=> !$this->notification_read,
-
-			'U_MARK_READ'		=> (!$this->notification_read) ? $u_mark_read : '',
-		);
-	}
-
-	/**
-	* -------------- Fall back functions -------------------
-	*/
-
-	/**
-	* URL to unsubscribe to this notification (fall back)
-	*
-	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
-	*/
-	public function get_unsubscribe_url($method = false)
-	{
-		return false;
-	}
-
-	/**
-	* Get the user's avatar (fall back)
-	* 
-	* @return string
-	*/
-	public function get_avatar()
-	{
-		return '';
-	}
-
-	/**
-	* Get the special items to load (fall back)
-	* 
-	* @return array
-	*/
-	public function get_load_special()
-	{
-		return array();
-	}
-
-	/**
-	* Load the special items (fall back)
-	*/
-	public function load_special($data, $notifications)
-	{
-		return;
-	}
-
-	/**
-	* Is available (fall back)
-	* 
-	* @return bool
-	*/
-	public function is_available()
-	{
-		return true;
-	}
-
-	/**
-	* Pre create insert array function (fall back)
-	* 
-	* @return array
-	*/
-	public function pre_create_insert_array($type_data, $notify_users)
-	{
-		return array();
-	}
-
-	/**
-	* -------------- Helper functions -------------------
-	*/
-
-	/**
-	* Find the users who want to receive notifications (helper)
-	*
-	* @param array $user_ids User IDs to check if they want to receive notifications
-	* 		(Bool False to check all users besides anonymous and bots (USER_IGNORE))
-	*
-	* @return array
-	*/
-	protected function check_user_notification_options($user_ids = false, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-			'item_type'			=> $this->get_type(),
-			'item_id'			=> 0, // Global by default
-		), $options);
-
-		if ($user_ids === false)
-		{
-			$user_ids = array();
-
-			$sql = 'SELECT user_id
-				FROM ' . USERS_TABLE . '
-				WHERE user_id <> ' . ANONYMOUS . '
-					AND user_type <> ' . USER_IGNORE;
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$user_ids[] = $row['user_id'];
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		if (empty($user_ids))
-		{
-			return array();
-		}
-
-		$rowset = $resulting_user_ids = array();
-
-		$sql = 'SELECT user_id, method, notify
-			FROM ' . $this->user_notifications_table . '
-			WHERE ' . $this->db->sql_in_set('user_id', $user_ids) . "
-				AND item_type = '" . $this->db->sql_escape($options['item_type']) . "'
-				AND item_id = " . (int) $options['item_id'];
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$resulting_user_ids[] = $row['user_id'];
-
-			if (!$row['notify'] || (isset($options['ignore_users'][$row['user_id']]) && in_array($row['method'], $options['ignore_users'][$row['user_id']])))
-			{
-				continue;
-			}
-
-			if (!isset($rowset[$row['user_id']]))
-			{
-				$rowset[$row['user_id']] = array();
-			}
-
-			$rowset[$row['user_id']][] = $row['method'];
-		}
-
-		$this->db->sql_freeresult($result);
-
-		foreach ($user_ids as $user_id)
-		{
-			if (!in_array($user_id, $resulting_user_ids) && !isset($options['ignore_users'][$user_id]))
-			{
-				// No rows at all for this user, default to ''
-				$rowset[$user_id] = array('');
-			}
-		}
-
-		return $rowset;
-	}
-
-	/**
-	* Mark this item read/unread helper
-	*
-	* @param bool $unread Unread (True/False) (Default: False)
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string|null If $return is False, nothing will be returned, else the sql code to update this item
-	*/
-	protected function mark($unread = true, $return = false)
-	{
-		$this->notification_read = (bool) !$unread;
-
-		$where = array(
-			'notification_type_id = ' . (int) $this->notification_type_id,
-			'item_id = ' . (int) $this->item_id,
-			'user_id = ' . (int) $this->user_id,
-		);
-		$where = implode(' AND ', $where);
-
-		if ($return)
-		{
-			return $where;
-		}
-
-		$sql = 'UPDATE ' . $this->notifications_table . '
-			SET notification_read = ' . (int) $this->notification_read . '
-			WHERE ' . $where;
-		$this->db->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
deleted file mode 100644
index ae2e75d3eb..0000000000
--- a/phpBB/includes/notification/type/bookmark.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Bookmark updating notifications class
-* This class handles notifications for replies to a bookmarked topic
-*
-* @package notifications
-*/
-class phpbb_notification_type_bookmark extends phpbb_notification_type_post
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'bookmark';
-	}
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_BOOKMARK';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'lang'	=> 'NOTIFICATION_TYPE_BOOKMARK',
-		'group'	=> 'NOTIFICATION_GROUP_POSTING',
-	);
-
-	/**
-	* Is available
-	*/
-	public function is_available()
-	{
-		return $this->config['allow_bookmarks'];
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $post Data from
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$users = array();
-
-		$sql = 'SELECT user_id
-			FROM ' . BOOKMARKS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('topic_id', $post['topic_id']) . '
-				AND user_id <> ' . (int) $post['poster_id'];
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$users[] = $row['user_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($users))
-		{
-			return array();
-		}
-		sort($users);
-
-		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		$notify_users = $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], $options);
-
-		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
-		$update_notifications = array();
-		$sql = 'SELECT n.*
-			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
-			WHERE n.notification_type_id = ' . (int) $this->notification_type_id . '
-				AND n.item_parent_id = ' . (int) self::get_item_parent_id($post) . '
-				AND n.notification_read = 0
-				AND nt.notification_type_id = n.notification_type_id
-				AND nt.notification_type_enabled = 1';
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			// Do not create a new notification
-			unset($notify_users[$row['user_id']]);
-
-			$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
-			$sql = 'UPDATE ' . $this->notifications_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
-				WHERE notification_id = ' . $row['notification_id'];
-			$this->db->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'bookmark';
-	}
-}
diff --git a/phpBB/includes/notification/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
deleted file mode 100644
index 951c7e0254..0000000000
--- a/phpBB/includes/notification/type/disapprove_post.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post disapproved notifications class
-* This class handles notifications for posts when they are disapproved (for authors)
-*
-* @package notifications
-*/
-class phpbb_notification_type_disapprove_post extends phpbb_notification_type_approve_post
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'disapprove_post';
-	}
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_POST_DISAPPROVED';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'moderation_queue',
-		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
-		'group'	=> 'NOTIFICATION_GROUP_POSTING',
-	);
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		return $this->user->lang(
-			$this->language_key,
-			censor_text($this->get_data('topic_title')),
-			$this->get_data('disapprove_reason')
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return '';
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array_merge(parent::get_email_template_variables(), array(
-			'REASON'	=> htmlspecialchars_decode($this->get_data('disapprove_reason')),
-		));
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post, $pre_create_data = array())
-	{
-		$this->set_data('disapprove_reason', $post['disapprove_reason']);
-
-		$data = parent::create_insert_array($post);
-
-		$this->notification_time = $data['notification_time'] = time();
-
-		return $data;
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'post_disapproved';
-	}
-}
diff --git a/phpBB/includes/notification/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
deleted file mode 100644
index 038e528797..0000000000
--- a/phpBB/includes/notification/type/disapprove_topic.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Topic disapproved notifications class
-* This class handles notifications for topics when they are disapproved (for authors)
-*
-* @package notifications
-*/
-class phpbb_notification_type_disapprove_topic extends phpbb_notification_type_approve_topic
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'disapprove_topic';
-	}
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_TOPIC_DISAPPROVED';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'moderation_queue',
-		'lang'	=> 'NOTIFICATION_TYPE_MODERATION_QUEUE',
-		'group'	=> 'NOTIFICATION_GROUP_POSTING',
-	);
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		return $this->user->lang(
-			$this->language_key,
-			censor_text($this->get_data('topic_title')),
-			$this->get_data('disapprove_reason')
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return '';
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array_merge(parent::get_email_template_variables(), array(
-			'REASON'			=> htmlspecialchars_decode($this->get_data('disapprove_reason')),
-		));
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post, $pre_create_data = array())
-	{
-		$this->set_data('disapprove_reason', $post['disapprove_reason']);
-
-		$data = parent::create_insert_array($post, $pre_create_data);
-
-		$this->notification_time = $data['notification_time'] = time();
-
-		return $data;
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'topic_disapproved';
-	}
-}
diff --git a/phpBB/includes/notification/type/interface.php b/phpBB/includes/notification/type/interface.php
deleted file mode 100644
index a40fdafd09..0000000000
--- a/phpBB/includes/notification/type/interface.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base notifications interface
-* @package notifications
-*/
-interface phpbb_notification_type_interface
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type();
-	
-	/**
-	* Set initial data from the database
-	*
-	* @param array $data Row directly from the database
-	*/
-	public function set_initial_data($data);
-
-	/**
-	* Get the id of the item
-	*
-	* @param array $type_data The type specific data
-	*/
-	public static function get_item_id($type_data);
-
-	/**
-	* Get the id of the parent
-	*
-	* @param array $type_data The type specific data
-	*/
-	public static function get_item_parent_id($type_data);
-
-	/**
-	* Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
-	public function is_available();
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $type_data The type specific data
-	* @param array $options Options for finding users for notification
-	* 		ignore_users => array of users and user types that should not receive notifications from this type because they've already been notified
-	* 						e.g.: array(2 => array(''), 3 => array('', 'email'), ...)
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($type_data, $options);
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query();
-
-	/**
-	* Get the special items to load
-	*
-	* @return array Data will be combined sent to load_special() so you can run a single query and get data required for this notification type
-	*/
-	public function get_load_special();
-
-	/**
-	* Load the special items
-	*
-	* @param array $data Data from get_load_special()
-	* @param array $notifications Array of notifications (key is notification_id, value is the notification objects)
-	*/
-	public function load_special($data, $notifications);
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title();
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url();
-
-	/**
-	* URL to unsubscribe to this notification
-	*
-	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
-	*/
-	public function get_unsubscribe_url($method);
-
-	/**
-	* Get the user's avatar (the user who caused the notification typically)
-	*
-	* @return string
-	*/
-	public function get_avatar();
-
-	/**
-	* Prepare to output the notification to the template
-	*/
-	public function prepare_for_display();
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template();
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables();
-
-	/**
-	* Pre create insert array function
-	* This allows you to perform certain actions, like run a query
-	* and load data, before create_insert_array() is run. The data
-	* returned from this function will be sent to create_insert_array().
-	*
-	* @param array $type_data The type specific data
-	* @param array $notify_users Notify users list
-	* 		Formated from find_users_for_notification()
-	* @return array Whatever you want to send to create_insert_array().
-	*/
-	public function pre_create_insert_array($type_data, $notify_users);
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $type_data The type specific data
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($type_data, $pre_create_data);
-
-	/**
-	* Function for preparing the data for update in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $type_data Data unique to this notification type
-	*
-	* @return array Array of data ready to be updated in the database
-	*/
-	public function create_update_array($type_data);
-
-	/**
-	* Mark this item read
-	*
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
-	*/
-	public function mark_read($return);
-
-	/**
-	* Mark this item unread
-	*
-	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
-	* @return string
-	*/
-	public function mark_unread($return);
-}
diff --git a/phpBB/includes/notification/type/pm.php b/phpBB/includes/notification/type/pm.php
deleted file mode 100644
index b3db7ad5ad..0000000000
--- a/phpBB/includes/notification/type/pm.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Private message notifications class
-* This class handles notifications for private messages
-*
-* @package notifications
-*/
-class phpbb_notification_type_pm extends phpbb_notification_type_base
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'pm';
-	}
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'lang'	=> 'NOTIFICATION_TYPE_PM',
-	);
-
-	/**
-	* Is available
-	*/
-	public function is_available()
-	{
-		return ($this->config['allow_privmsg'] && $this->auth->acl_get('u_readpm'));
-	}
-
-	/**
-	* Get the id of the
-	*
-	* @param array $pm The data from the private message
-	*/
-	public static function get_item_id($pm)
-	{
-		return (int) $pm['msg_id'];
-	}
-
-	/**
-	* Get the id of the parent
-	*
-	* @param array $pm The data from the pm
-	*/
-	public static function get_item_parent_id($pm)
-	{
-		// No parent
-		return 0;
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $pm Data from
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($pm, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		if (!sizeof($pm['recipients']))
-		{
-			return array();
-		}
-
-		unset($pm['recipients'][$pm['from_user_id']]);
-
-		$this->user_loader->load_users(array_keys($pm['recipients']));
-
-		return $this->check_user_notification_options(array_keys($pm['recipients']), $options);
-	}
-
-	/**
-	* Get the user's avatar
-	*/
-	public function get_avatar()
-	{
-		return $this->user_loader->get_avatar($this->get_data('from_user_id'));
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		$username = $this->user_loader->get_username($this->get_data('from_user_id'), 'no_profile');
-
-		return $this->user->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'privmsg_notify';
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		$user_data = $this->user_loader->get_user($this->get_data('from_user_id'));
-
-		return array(
-			'AUTHOR_NAME'				=> htmlspecialchars_decode($user_data['username']),
-			'SUBJECT'					=> htmlspecialchars_decode(censor_text($this->get_data('message_subject'))),
-
-			'U_VIEW_MESSAGE'			=> generate_board_url() . '/ucp.' . $this->php_ext . "?i=pm&mode=view&p={$this->item_id}",
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=pm&amp;mode=view&amp;p={$this->item_id}");
-	}
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query()
-	{
-		return array($this->get_data('from_user_id'));
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($pm, $pre_create_data = array())
-	{
-		$this->set_data('from_user_id', $pm['from_user_id']);
-
-		$this->set_data('message_subject', $pm['message_subject']);
-
-		return parent::create_insert_array($pm, $pre_create_data);
-	}
-}
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
deleted file mode 100644
index 9207fd866e..0000000000
--- a/phpBB/includes/notification/type/post.php
+++ /dev/null
@@ -1,385 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post notifications class
-* This class handles notifications for replies to a topic
-*
-* @package notifications
-*/
-class phpbb_notification_type_post extends phpbb_notification_type_base
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'post';
-	}
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_POST';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'lang'	=> 'NOTIFICATION_TYPE_POST',
-		'group'	=> 'NOTIFICATION_GROUP_POSTING',
-	);
-
-	/**
-	* Is available
-	*/
-	public function is_available()
-	{
-		return $this->config['allow_topic_notify'];
-	}
-
-	/**
-	* Get the id of the item
-	*
-	* @param array $post The data from the post
-	*/
-	public static function get_item_id($post)
-	{
-		return (int) $post['post_id'];
-	}
-
-	/**
-	* Get the id of the parent
-	*
-	* @param array $post The data from the post
-	*/
-	public static function get_item_parent_id($post)
-	{
-		return (int) $post['topic_id'];
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $post Data from
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$users = array();
-
-		$sql = 'SELECT user_id
-			FROM ' . TOPICS_WATCH_TABLE . '
-			WHERE topic_id = ' . (int) $post['topic_id'] . '
-				AND notify_status = ' . NOTIFY_YES . '
-				AND user_id <> ' . (int) $post['poster_id'];
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$users[] = $row['user_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		$sql = 'SELECT user_id
-			FROM ' . FORUMS_WATCH_TABLE . '
-			WHERE forum_id = ' . (int) $post['forum_id'] . '
-				AND notify_status = ' . NOTIFY_YES . '
-				AND user_id <> ' . (int) $post['poster_id'];
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$users[] = $row['user_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($users))
-		{
-			return array();
-		}
-
-		$users = array_unique($users);
-		sort($users);
-
-		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		$notify_users = $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], $options);
-
-		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
-		$update_notifications = array();
-		$sql = 'SELECT n.*
-			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
-			WHERE n.notification_type_id = ' . (int) $this->notification_type_id . '
-				AND n.item_parent_id = ' . (int) self::get_item_parent_id($post) . '
-				AND n.notification_read = 0
-				AND nt.notification_type_id = n.notification_type_id
-				AND nt.notification_type_enabled = 1';
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			// Do not create a new notification
-			unset($notify_users[$row['user_id']]);
-
-			$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
-			$sql = 'UPDATE ' . $this->notifications_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
-				WHERE notification_id = ' . $row['notification_id'];
-			$this->db->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-
-	/**
-	* Get the user's avatar
-	*/
-	public function get_avatar()
-	{
-		return $this->user_loader->get_avatar($this->get_data('poster_id'));
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		$responders = $this->get_data('responders');
-		$usernames = array();
-
-		if (!is_array($responders))
-		{
-			$responders = array();
-		}
-
-		$responders = array_merge(array(array(
-			'poster_id'		=> $this->get_data('poster_id'),
-			'username'		=> $this->get_data('post_username'),
-		)), $responders);
-
-		foreach ($responders as $responder)
-		{
-			if ($responder['username'])
-			{
-				$usernames[] = $responder['username'];
-			}
-			else
-			{
-				$usernames[] = $this->user_loader->get_username($responder['poster_id'], 'no_profile');
-			}
-		}
-
-		return $this->user->lang(
-			$this->language_key,
-			implode(', ', $usernames),
-			censor_text($this->get_data('topic_title'))
-		);
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'topic_notify';
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		if ($this->get_data('post_username'))
-		{
-			$username = $this->get_data('post_username');
-		}
-		else
-		{
-			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'username');
-		}
-
-		return array(
-			'AUTHOR_NAME'				=> htmlspecialchars_decode($username),
-			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
-			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
-
-			'U_VIEW_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
-			'U_NEWEST_POST'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
-			'U_TOPIC'					=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
-			'U_VIEW_TOPIC'				=> generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
-			'U_FORUM'					=> generate_board_url() . "/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
-			'U_STOP_WATCHING_TOPIC'		=> generate_board_url() . "/viewtopic.{$this->php_ext}?uid={$this->user_id}&f={$this->get_data('forum_id')}&t={$this->item_parent_id}&unwatch=topic",
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "p={$this->item_id}#p{$this->item_id}");
-	}
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query()
-	{
-		$responders = $this->get_data('responders');
-		$users = array(
-			$this->get_data('poster_id'),
-		);
-
-		if (is_array($responders))
-		{
-			foreach ($responders as $responder)
-			{
-				$users[] = $responder['poster_id'];
-			}
-		}
-
-		return $users;
-	}
-
-	/**
-	* Pre create insert array function
-	* This allows you to perform certain actions, like run a query
-	* and load data, before create_insert_array() is run. The data
-	* returned from this function will be sent to create_insert_array().
-	*
-	* @param array $post Post data from submit_post
-	* @param array $notify_users Notify users list
-	* 		Formated from find_users_for_notification()
-	* @return array Whatever you want to send to create_insert_array().
-	*/
-	public function pre_create_insert_array($post, $notify_users)
-	{
-		if (!sizeof($notify_users))
-		{
-			return array();
-		}
-
-		$tracking_data = array();
-		$sql = 'SELECT user_id, mark_time FROM ' . TOPICS_TRACK_TABLE . '
-			WHERE topic_id = ' . (int) $post['topic_id'] . '
-				AND ' . $this->db->sql_in_set('user_id', array_keys($notify_users));
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$tracking_data[$row['user_id']] = $row['mark_time'];
-		}
-
-		return $tracking_data;
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post, $pre_create_data = array())
-	{
-		$this->set_data('poster_id', $post['poster_id']);
-
-		$this->set_data('topic_title', $post['topic_title']);
-
-		$this->set_data('post_subject', $post['post_subject']);
-
-		$this->set_data('post_username', (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''));
-
-		$this->set_data('forum_id', $post['forum_id']);
-
-		$this->set_data('forum_name', $post['forum_name']);
-
-		$this->notification_time = $post['post_time'];
-
-		// Topics can be "read" before they are public (while awaiting approval).
-		// Make sure that if the user has read the topic, it's marked as read in the notification
-		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
-		{
-			$this->notification_read = true;
-		}
-
-		return parent::create_insert_array($post, $pre_create_data);
-	}
-
-	/**
-	* Add responders to the notification
-	*
-	* @param mixed $post
-	*/
-	public function add_responders($post)
-	{
-		// Do not add them as a responder if they were the original poster that created the notification
-		if ($this->get_data('poster_id') == $post['poster_id'])
-		{
-			return array('notification_data' => serialize($this->get_data(false)));
-		}
-
-		$responders = $this->get_data('responders');
-
-		$responders = ($responders === null) ? array() : $responders;
-
-		foreach ($responders as $responder)
-		{
-			// Do not add them as a responder multiple times
-			if ($responder['poster_id'] == $post['poster_id'])
-			{
-				return array('notification_data' => serialize($this->get_data(false)));
-			}
-		}
-
-		$responders[] = array(
-			'poster_id'		=> $post['poster_id'],
-			'username'		=> (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''),
-		);
-
-		$this->set_data('responders', $responders);
-
-		return array('notification_data' => serialize($this->get_data(false)));
-	}
-}
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
deleted file mode 100644
index bc4b15cdc3..0000000000
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post in queue notifications class
-* This class handles notifications for posts that are put in the moderation queue (for moderators)
-*
-* @package notifications
-*/
-class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'post_in_queue';
-	}
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_POST_IN_QUEUE';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'needs_approval',
-		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
-		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
-	);
-
-	/**
-	* Permission to check for (in find_users_for_notification)
-	*
-	* @var string Permission name
-	*/
-	protected $permission = 'm_approve';
-
-	/**
-	* Is available
-	*/
-	public function is_available()
-	{
-		$has_permission = $this->auth->acl_getf($this->permission, true);
-
-		return (!empty($has_permission));
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $post Data from the post
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		// 0 is for global moderator permissions
-		$auth_approve = $this->auth->acl_get_list(false, $this->permission, array($post['forum_id'], 0));
-
-		if (empty($auth_approve))
-		{
-			return array();
-		}
-
-		$has_permission = array();
-
-		if (isset($auth_approve[$post['forum_id']][$this->permission]))
-		{
-			$has_permission = $auth_approve[$post['forum_id']][$this->permission];
-		}
-
-		if (isset($auth_approve[0][$this->permission]))
-		{
-			$has_permission = array_unique(array_merge($has_permission, $auth_approve[0][$this->permission]));
-		}
-		sort($has_permission);
-
-		$auth_read = $this->auth->acl_get_list($has_permission, 'f_read', $post['forum_id']);
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		return $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], array_merge($options, array(
-			'item_type'		=> self::$notification_option['id'],
-		)));
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "i=queue&amp;mode=approve_details&amp;f={$this->get_data('forum_id')}&amp;p={$this->item_id}");
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post, $pre_create_data = array())
-	{
-		$data = parent::create_insert_array($post, $pre_create_data);
-
-		$this->notification_time = $data['notification_time'] = time();
-
-		return $data;
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'post_in_queue';
-	}
-}
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
deleted file mode 100644
index 0ed13f36fb..0000000000
--- a/phpBB/includes/notification/type/quote.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post quoting notifications class
-* This class handles notifications for quoting users in a post
-*
-* @package notifications
-*/
-class phpbb_notification_type_quote extends phpbb_notification_type_post
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'quote';
-	}
-
-	/**
-	* regular expression to match to find usernames
-	*
-	* @var string
-	*/
-	protected static $regular_expression_match = '#\[quote=&quot;(.+?)&quot;#';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_QUOTE';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'lang'	=> 'NOTIFICATION_TYPE_QUOTE',
-		'group'	=> 'NOTIFICATION_GROUP_POSTING',
-	);
-
-	/**
-	* Is available
-	*/
-	public function is_available()
-	{
-		return true;
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $post Data from
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		$usernames = false;
-		preg_match_all(self::$regular_expression_match, $post['post_text'], $usernames);
-
-		if (empty($usernames[1]))
-		{
-			return array();
-		}
-
-		$usernames[1] = array_unique($usernames[1]);
-
-		$usernames = array_map('utf8_clean_string', $usernames[1]);
-
-		$users = array();
-
-		$sql = 'SELECT user_id
-			FROM ' . USERS_TABLE . '
-			WHERE ' . $this->db->sql_in_set('username_clean', $usernames) . '
-				AND user_id <> ' . (int) $post['poster_id'];
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$users[] = $row['user_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($users))
-		{
-			return array();
-		}
-		sort($users);
-
-		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		$notify_users = $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], $options);
-
-		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
-		$update_notifications = array();
-		$sql = 'SELECT n.*
-			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
-			WHERE n.notification_type_id = ' . (int) $this->notification_type_id . '
-				AND n.item_parent_id = ' . (int) self::get_item_parent_id($post) . '
-				AND n.notification_read = 0
-				AND nt.notification_type_id = n.notification_type_id
-				AND nt.notification_type_enabled = 1';
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			// Do not create a new notification
-			unset($notify_users[$row['user_id']]);
-
-			$notification = $this->notification_manager->get_item_type_class($this->get_type(), $row);
-			$sql = 'UPDATE ' . $this->notifications_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $notification->add_responders($post)) . '
-				WHERE notification_id = ' . $row['notification_id'];
-			$this->db->sql_query($sql);
-		}
-		$this->db->sql_freeresult($result);
-
-		return $notify_users;
-	}
-
-	/**
-	* Update a notification
-	*
-	* @param array $data Data specific for this type that will be updated
-	*/
-	public function update_notifications($post)
-	{
-		$old_notifications = array();
-		$sql = 'SELECT n.user_id
-			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
-			WHERE n.notification_type_id = ' . (int) $this->notification_type_id . '
-				AND n.item_id = ' . self::get_item_id($post) . '
-				AND nt.notification_type_id = n.notification_type_id
-				AND nt.notification_type_enabled = 1';
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$old_notifications[] = $row['user_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		// Find the new users to notify
-		$notifications = $this->find_users_for_notification($post);
-
-		// Find the notifications we must delete
-		$remove_notifications = array_diff($old_notifications, array_keys($notifications));
-
-		// Find the notifications we must add
-		$add_notifications = array();
-		foreach (array_diff(array_keys($notifications), $old_notifications) as $user_id)
-		{
-			$add_notifications[$user_id] = $notifications[$user_id];
-		}
-
-		// Add the necessary notifications
-		$this->notification_manager->add_notifications_for_users($this->get_type(), $post, $add_notifications);
-
-		// Remove the necessary notifications
-		if (!empty($remove_notifications))
-		{
-			$sql = 'DELETE FROM ' . $this->notifications_table . '
-				WHERE notification_type_id = ' . (int) $this->notification_type_id . '
-					AND item_id = ' . self::get_item_id($post) . '
-					AND ' . $this->db->sql_in_set('user_id', $remove_notifications);
-			$this->db->sql_query($sql);
-		}
-
-		// return true to continue with the update code in the notifications service (this will update the rest of the notifications)
-		return true;
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'quote';
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		$user_data = $this->user_loader->get_user($this->get_data('poster_id'));
-
-		return array_merge(parent::get_email_template_variables(), array(
-			'AUTHOR_NAME'		=> htmlspecialchars_decode($user_data['username']),
-		));
-	}
-}
diff --git a/phpBB/includes/notification/type/report_pm.php b/phpBB/includes/notification/type/report_pm.php
deleted file mode 100644
index 3fa73bab41..0000000000
--- a/phpBB/includes/notification/type/report_pm.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Private message reproted notifications class
-* This class handles notifications for private messages when they are reported
-*
-* @package notifications
-*/
-class phpbb_notification_type_report_pm extends phpbb_notification_type_pm
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'report_pm';
-	}
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_REPORT_PM';
-
-	/**
-	* Permission to check for (in find_users_for_notification)
-	*
-	* @var string Permission name
-	*/
-	protected $permission = 'm_report';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'report',
-		'lang'	=> 'NOTIFICATION_TYPE_REPORT',
-		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
-	);
-
-	/**
-	* Get the id of the parent
-	*
-	* @param array $pm The data from the pm
-	*/
-	public static function get_item_parent_id($pm)
-	{
-		return (int) $pm['report_id'];
-	}
-
-	/**
-	* Is this type available to the current user (defines whether or not it will be shown in the UCP Edit notification options)
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
-	public function is_available()
-	{
-		$m_approve = $this->auth->acl_getf($this->permission, true);
-
-		return (!empty($m_approve));
-	}
-
-
-	/**
-	* Find the users who want to receive notifications
-	*  (copied from post_in_queue)
-	*
-	* @param array $post Data from the post
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($post, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		// Global
-		$post['forum_id'] = 0;
-
-		$auth_approve = $this->auth->acl_get_list(false, $this->permission, $post['forum_id']);
-
-		if (empty($auth_approve))
-		{
-			return array();
-		}
-
-		if (($key = array_search($this->user->data['user_id'], $auth_approve[$post['forum_id']][$this->permission])))
-		{
-			unset($auth_approve[$post['forum_id']][$this->permission][$key]);
-		}
-
-		return $this->check_user_notification_options($auth_approve[$post['forum_id']][$this->permission], array_merge($options, array(
-			'item_type'		=> self::$notification_option['id'],
-		)));
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'report_pm';
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array(
-			'AUTHOR_NAME'				=> htmlspecialchars_decode($user_data['username']),
-			'SUBJECT'					=> htmlspecialchars_decode(censor_text($this->get_data('message_subject'))),
-
-			'U_VIEW_REPORT'				=> generate_board_url() . "mcp.{$this->php_ext}?r={$this->item_parent_id}&amp;i=pm_reports&amp;mode=pm_report_details",
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "r={$this->item_parent_id}&amp;i=pm_reports&amp;mode=pm_report_details");
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		$this->user->add_lang('mcp');
-
-		$username = $this->user_loader->get_username($this->get_data('reporter_id'), 'no_profile');
-
-		if ($this->get_data('report_text'))
-		{
-			return $this->user->lang(
-				$this->language_key,
-				$username,
-				censor_text($this->get_data('message_subject')),
-				$this->get_data('report_text')
-			);
-		}
-
-		if (isset($this->user->lang[$this->get_data('reason_title')]))
-		{
-			return $this->user->lang(
-				$this->language_key,
-				$username,
-				censor_text($this->get_data('message_subject')),
-				$this->user->lang[$this->get_data('reason_title')]
-			);
-		}
-
-		return $this->user->lang(
-			$this->language_key,
-			$username,
-			censor_text($this->get_data('message_subject')),
-			$this->get_data('reason_description')
-		);
-	}
-
-	/**
-	* Get the user's avatar
-	*/
-	public function get_avatar()
-	{
-		return $this->user_loader->get_avatar($this->get_data('reporter_id'));
-	}
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query()
-	{
-		return array($this->get_data('reporter_id'));
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post, $pre_create_data = array())
-	{
-		$this->set_data('reporter_id', $this->user->data['user_id']);
-		$this->set_data('reason_title', strtoupper($post['reason_title']));
-		$this->set_data('reason_description', $post['reason_description']);
-		$this->set_data('report_text', $post['report_text']);
-
-		return parent::create_insert_array($post, $pre_create_data);
-	}
-}
diff --git a/phpBB/includes/notification/type/report_pm_closed.php b/phpBB/includes/notification/type/report_pm_closed.php
deleted file mode 100644
index 63dfa92064..0000000000
--- a/phpBB/includes/notification/type/report_pm_closed.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* PM report closed notifications class
-* This class handles notifications for when reports are closed on PMs (for the one who reported the PM)
-*
-* @package notifications
-*/
-class phpbb_notification_type_report_pm_closed extends phpbb_notification_type_pm
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'report_pm_closed';
-	}
-
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = '';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_REPORT_CLOSED';
-
-	public function is_available()
-	{
-		return false;
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $pm Data from
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($pm, $options = array())
-	{
-		if ($pm['reporter'] == $this->user->data['user_id'])
-		{
-			return array();
-		}
-
-		return array($pm['reporter'] => array(''));
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return false;
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array();
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return '';
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		$username = $this->user_loader->get_username($this->get_data('closer_id'), 'no_profile');
-
-		return $this->user->lang(
-			$this->language_key,
-			$username,
-			censor_text($this->get_data('message_subject'))
-		);
-	}
-
-	/**
-	* Get the user's avatar
-	*/
-	public function get_avatar()
-	{
-		return $this->get_user_avatar($this->get_data('closer_id'));
-	}
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query()
-	{
-		return array($this->get_data('closer_id'));
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $pm PM Data
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($pm, $pre_create_data = array())
-	{
-		$this->set_data('closer_id', $pm['closer_id']);
-
-		$data = parent::create_insert_array($pm, $pre_create_data);
-
-		$this->notification_time = $data['notification_time'] = time();
-
-		return $data;
-	}
-}
diff --git a/phpBB/includes/notification/type/report_post.php b/phpBB/includes/notification/type/report_post.php
deleted file mode 100644
index de5c54a291..0000000000
--- a/phpBB/includes/notification/type/report_post.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Reported post notifications class
-* This class handles notifications for reported posts
-*
-* @package notifications
-*/
-class phpbb_notification_type_report_post extends phpbb_notification_type_post_in_queue
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'report_post';
-	}
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_REPORT_POST';
-
-	/**
-	* Permission to check for (in find_users_for_notification)
-	*
-	* @var string Permission name
-	*/
-	protected $permission = 'm_report';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id' and 'lang')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'report',
-		'lang'	=> 'NOTIFICATION_TYPE_REPORT',
-		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
-	);
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $post Data from the post
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($post, $options = array())
-	{
-		$notify_users = parent::find_users_for_notification($post, $options);
-
-		// never notify reporter
-		unset($notify_users[$this->user->data['user_id']]);
-
-		return $notify_users;
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'report_post';
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		$board_url = generate_board_url();
-
-		return array(
-			'POST_SUBJECT'				=> htmlspecialchars_decode(censor_text($this->get_data('post_subject'))),
-			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
-
-			'U_VIEW_REPORT'				=> "{$board_url}/mcp.{$this->php_ext}?f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports",
-			'U_VIEW_POST'				=> "{$board_url}/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}",
-			'U_NEWEST_POST'				=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}&view=unread#unread",
-			'U_TOPIC'					=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
-			'U_VIEW_TOPIC'				=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->get_data('forum_id')}&t={$this->item_parent_id}",
-			'U_FORUM'					=> "{$board_url}/viewforum.{$this->php_ext}?f={$this->get_data('forum_id')}",
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "f={$this->get_data('forum_id')}&amp;p={$this->item_id}&amp;i=reports&amp;mode=report_details#reports");
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		$this->user->add_lang('mcp');
-
-		$username = $this->user_loader->get_username($this->get_data('reporter_id'), 'no_profile');
-
-		if ($this->get_data('report_text'))
-		{
-			return $this->user->lang(
-				$this->language_key,
-				$username,
-				censor_text($this->get_data('post_subject')),
-				$this->get_data('report_text')
-			);
-		}
-
-		if (isset($this->user->lang[$this->get_data('reason_title')]))
-		{
-			return $this->user->lang(
-				$this->language_key,
-				$username,
-				censor_text($this->get_data('post_subject')),
-				$this->user->lang[$this->get_data('reason_title')]
-			);
-		}
-
-		return $this->user->lang(
-			$this->language_key,
-			$username,
-			censor_text($this->get_data('post_subject')),
-			$this->get_data('reason_description')
-		);
-	}
-
-	/**
-	* Get the user's avatar
-	*/
-	public function get_avatar()
-	{
-		return $this->user_loader->get_avatar($this->get_data('reporter_id'));
-	}
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query()
-	{
-		return array($this->get_data('reporter_id'));
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post, $pre_create_data = array())
-	{
-		$this->set_data('reporter_id', $this->user->data['user_id']);
-		$this->set_data('reason_title', strtoupper($post['reason_title']));
-		$this->set_data('reason_description', $post['reason_description']);
-		$this->set_data('report_text', $post['report_text']);
-
-		return parent::create_insert_array($post, $pre_create_data);
-	}
-}
diff --git a/phpBB/includes/notification/type/report_post_closed.php b/phpBB/includes/notification/type/report_post_closed.php
deleted file mode 100644
index 3916cd8db7..0000000000
--- a/phpBB/includes/notification/type/report_post_closed.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Post report closed notifications class
-* This class handles notifications for when reports are closed on posts (for the one who reported the post)
-*
-* @package notifications
-*/
-class phpbb_notification_type_report_post_closed extends phpbb_notification_type_post
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'report_post_closed';
-	}
-
-	/**
-	* Email template to use to send notifications
-	*
-	* @var string
-	*/
-	public $email_template = '';
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_REPORT_CLOSED';
-
-	public function is_available()
-	{
-		return false;
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $post Data from
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($post, $options = array())
-	{
-		if ($post['reporter'] == $this->user->data['user_id'])
-		{
-			return array();
-		}
-
-		return array($post['reporter'] => array(''));
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return false;
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		return array();
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return '';
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		$username = $this->user_loader->get_username($this->get_data('closer_id'), 'no_profile');
-
-		return $this->user->lang(
-			$this->language_key,
-			$username,
-			censor_text($this->get_data('post_subject'))
-		);
-	}
-
-	/**
-	* Get the user's avatar
-	*/
-	public function get_avatar()
-	{
-		return $this->user_loader->get_avatar($this->get_data('closer_id'));
-	}
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query()
-	{
-		return array($this->get_data('closer_id'));
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post, $pre_create_data = array())
-	{
-		$this->set_data('closer_id', $post['closer_id']);
-
-		$data = parent::create_insert_array($post, $pre_create_data);
-
-		$this->notification_time = $data['notification_time'] = time();
-
-		return $data;
-	}
-}
diff --git a/phpBB/includes/notification/type/topic.php b/phpBB/includes/notification/type/topic.php
deleted file mode 100644
index 22436d3fb1..0000000000
--- a/phpBB/includes/notification/type/topic.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Topic notifications class
-* This class handles notifications for new topics
-*
-* @package notifications
-*/
-class phpbb_notification_type_topic extends phpbb_notification_type_base
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'topic';
-	}
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_TOPIC';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'lang'	=> 'NOTIFICATION_TYPE_TOPIC',
-		'group'	=> 'NOTIFICATION_GROUP_POSTING',
-	);
-
-	/**
-	* Is available
-	*/
-	public function is_available()
-	{
-		return $this->config['allow_forum_notify'];
-	}
-
-	/**
-	* Get the id of the item
-	*
-	* @param array $post The data from the post
-	*/
-	public static function get_item_id($post)
-	{
-		return (int) $post['topic_id'];
-	}
-
-	/**
-	* Get the id of the parent
-	*
-	* @param array $post The data from the post
-	*/
-	public static function get_item_parent_id($post)
-	{
-		return (int) $post['forum_id'];
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $topic Data from the topic
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($topic, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'			=> array(),
-		), $options);
-
-		$users = array();
-
-		$sql = 'SELECT user_id
-			FROM ' . FORUMS_WATCH_TABLE . '
-			WHERE forum_id = ' . (int) $topic['forum_id'] . '
-				AND notify_status = ' . NOTIFY_YES . '
-				AND user_id <> ' . (int) $topic['poster_id'];
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$users[] = $row['user_id'];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (empty($users))
-		{
-			return array();
-		}
-
-		$auth_read = $this->auth->acl_get_list($users, 'f_read', $topic['forum_id']);
-
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		return $this->check_user_notification_options($auth_read[$topic['forum_id']]['f_read'], $options);
-	}
-
-	/**
-	* Get the user's avatar
-	*/
-	public function get_avatar()
-	{
-		return $this->user_loader->get_avatar($this->get_data('poster_id'));
-	}
-
-	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
-	public function get_title()
-	{
-		if ($this->get_data('post_username'))
-		{
-			$username = $this->get_data('post_username');
-		}
-		else
-		{
-			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'no_profile');
-		}
-
-		return $this->user->lang(
-			$this->language_key,
-			$username,
-			censor_text($this->get_data('topic_title')),
-			$this->get_data('forum_name')
-		);
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'newtopic_notify';
-	}
-
-	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
-	public function get_email_template_variables()
-	{
-		$board_url = generate_board_url();
-
-		if ($this->get_data('post_username'))
-		{
-			$username = $this->get_data('post_username');
-		}
-		else
-		{
-			$username = $this->user_loader->get_username($this->get_data('poster_id'), 'username');
-		}
-
-		return array(
-			'AUTHOR_NAME'				=> htmlspecialchars_decode($username),
-			'FORUM_NAME'				=> htmlspecialchars_decode($this->get_data('forum_name')),
-			'TOPIC_TITLE'				=> htmlspecialchars_decode(censor_text($this->get_data('topic_title'))),
-
-			'U_TOPIC'					=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
-			'U_VIEW_TOPIC'				=> "{$board_url}/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}",
-			'U_FORUM'					=> "{$board_url}/viewforum.{$this->php_ext}?f={$this->item_parent_id}",
-			'U_STOP_WATCHING_FORUM'		=> "{$board_url}/viewforum.{$this->php_ext}?uid={$this->user_id}&f={$this->item_parent_id}&unwatch=forum",
-		);
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f={$this->item_parent_id}&amp;t={$this->item_id}");
-	}
-
-	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
-	public function users_to_query()
-	{
-		return array($this->get_data('poster_id'));
-	}
-
-	/**
-	* Pre create insert array function
-	* This allows you to perform certain actions, like run a query
-	* and load data, before create_insert_array() is run. The data
-	* returned from this function will be sent to create_insert_array().
-	*
-	* @param array $post Post data from submit_post
-	* @param array $notify_users Notify users list
-	* 		Formated from find_users_for_notification()
-	* @return array Whatever you want to send to create_insert_array().
-	*/
-	public function pre_create_insert_array($post, $notify_users)
-	{
-		if (!sizeof($notify_users))
-		{
-			return array();
-		}
-
-		$tracking_data = array();
-		$sql = 'SELECT user_id, mark_time FROM ' . TOPICS_TRACK_TABLE . '
-			WHERE topic_id = ' . (int) $post['topic_id'] . '
-				AND ' . $this->db->sql_in_set('user_id', array_keys($notify_users));
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$tracking_data[$row['user_id']] = $row['mark_time'];
-		}
-
-		return $tracking_data;
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $post Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($post, $pre_create_data = array())
-	{
-		$this->set_data('poster_id', $post['poster_id']);
-
-		$this->set_data('topic_title', $post['topic_title']);
-
-		$this->set_data('post_username', (($post['poster_id'] == ANONYMOUS) ? $post['post_username'] : ''));
-
-		$this->set_data('forum_name', $post['forum_name']);
-
-		$this->notification_time = $post['post_time'];
-
-		// Topics can be "read" before they are public (while awaiting approval).
-		// Make sure that if the user has read the topic, it's marked as read in the notification
-		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
-		{
-			$this->notification_read = true;
-		}
-
-		return parent::create_insert_array($post, $pre_create_data);
-	}
-}
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
deleted file mode 100644
index f735e10c00..0000000000
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
-*
-* @package notifications
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Topic in queue notifications class
-* This class handles notifications for topics when they are put in the moderation queue (for moderators)
-*
-* @package notifications
-*/
-class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_topic
-{
-	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
-	public function get_type()
-	{
-		return 'topic_in_queue';
-	}
-
-	/**
-	* Language key used to output the text
-	*
-	* @var string
-	*/
-	protected $language_key = 'NOTIFICATION_TOPIC_IN_QUEUE';
-
-	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
-	public static $notification_option = array(
-		'id'	=> 'needs_approval',
-		'lang'	=> 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE',
-		'group'	=> 'NOTIFICATION_GROUP_MODERATION',
-	);
-
-	/**
-	* Permission to check for (in find_users_for_notification)
-	*
-	* @var string Permission name
-	*/
-	protected $permission = 'm_approve';
-
-	/**
-	* Is available
-	*/
-	public function is_available()
-	{
-		$has_permission = $this->auth->acl_getf($this->permission, true);
-
-		return (!empty($has_permission));
-	}
-
-	/**
-	* Find the users who want to receive notifications
-	*
-	* @param array $topic Data from the topic
-	*
-	* @return array
-	*/
-	public function find_users_for_notification($topic, $options = array())
-	{
-		$options = array_merge(array(
-			'ignore_users'		=> array(),
-		), $options);
-
-		// 0 is for global moderator permissions
-		$auth_approve = $this->auth->acl_get_list(false, 'm_approve', array($topic['forum_id'], 0));
-
-		if (empty($auth_approve))
-		{
-			return array();
-		}
-
-		$has_permission = array();
-
-		if (isset($auth_approve[$topic['forum_id']][$this->permission]))
-		{
-			$has_permission = $auth_approve[$topic['forum_id']][$this->permission];
-		}
-
-		if (isset($auth_approve[0][$this->permission]))
-		{
-			$has_permission = array_unique(array_merge($has_permission, $auth_approve[0][$this->permission]));
-		}
-		sort($has_permission);
-
-		$auth_read = $this->auth->acl_get_list($has_permission, 'f_read', $topic['forum_id']);
-		if (empty($auth_read))
-		{
-			return array();
-		}
-
-		return $this->check_user_notification_options($auth_read[$topic['forum_id']]['f_read'], array_merge($options, array(
-			'item_type'		=> self::$notification_option['id'],
-		)));
-	}
-
-	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, "i=queue&amp;mode=approve_details&amp;f={$this->item_parent_id}&amp;t={$this->item_id}");
-	}
-
-	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param array $topic Data from submit_post
-	* @param array $pre_create_data Data from pre_create_insert_array()
-	*
-	* @return array Array of data ready to be inserted into the database
-	*/
-	public function create_insert_array($topic, $pre_create_data = array())
-	{
-		$data = parent::create_insert_array($topic, $pre_create_data);
-
-		$this->notification_time = $data['notification_time'] = time();
-
-		return $data;
-	}
-
-	/**
-	* Get email template
-	*
-	* @return string|bool
-	*/
-	public function get_email_template()
-	{
-		return 'topic_in_queue';
-	}
-}
diff --git a/phpBB/includes/php/ini.php b/phpBB/includes/php/ini.php
deleted file mode 100644
index 17e8c54a57..0000000000
--- a/phpBB/includes/php/ini.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
-*
-* @package phpBB
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Wrapper class for ini_get function.
-*
-* Provides easier handling of the different interpretations of ini values.
-*
-* @package phpBB
-*/
-class phpbb_php_ini
-{
-	/**
-	* Simple wrapper for ini_get()
-	* See http://php.net/manual/en/function.ini-get.php
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool|string		False if configuration option does not exist,
-	*							the configuration option value (string) otherwise.
-	*/
-	public function get($varname)
-	{
-		return ini_get($varname);
-	}
-
-	/**
-	* Gets the configuration option value as a trimmed string.
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool|string		False if configuration option does not exist,
-	*							the configuration option value (string) otherwise.
-	*/
-	public function get_string($varname)
-	{
-		$value = $this->get($varname);
-
-		if ($value === false)
-		{
-			return false;
-		}
-
-		return trim($value);
-	}
-
-	/**
-	* Gets configuration option value as a boolean.
-	* Interprets the string value 'off' as false.
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool				False if configuration option does not exist.
-	*							False if configuration option is disabled.
-	*							True otherwise.
-	*/
-	public function get_bool($varname)
-	{
-		$value = $this->get_string($varname);
-
-		if (empty($value) || strtolower($value) == 'off')
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	* Gets configuration option value as an integer.
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool|int			False if configuration option does not exist,
-	*							false if configuration option value is not numeric,
-	*							the configuration option value (integer) otherwise.
-	*/
-	public function get_int($varname)
-	{
-		$value = $this->get_string($varname);
-
-		if (!is_numeric($value))
-		{
-			return false;
-		}
-
-		return (int) $value;
-	}
-
-	/**
-	* Gets configuration option value as a float.
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool|float		False if configuration option does not exist,
-	*							false if configuration option value is not numeric,
-	*							the configuration option value (float) otherwise.
-	*/
-	public function get_float($varname)
-	{
-		$value = $this->get_string($varname);
-
-		if (!is_numeric($value))
-		{
-			return false;
-		}
-
-		return (float) $value;
-	}
-
-	/**
-	* Gets configuration option value in bytes.
-	* Converts strings like '128M' to bytes (integer or float).
-	*
-	* @param string $varname	The configuration option name.
-	* @return bool|int|float	False if configuration option does not exist,
-	*							false if configuration option value is not well-formed,
-	*							the configuration option value otherwise.
-	*/
-	public function get_bytes($varname)
-	{
-		$value = $this->get_string($varname);
-
-		if ($value === false)
-		{
-			return false;
-		}
-
-		if (is_numeric($value))
-		{
-			// Already in bytes.
-			return phpbb_to_numeric($value);
-		}
-		else if (strlen($value) < 2)
-		{
-			// Single character.
-			return false;
-		}
-		else if (strlen($value) < 3 && $value[0] === '-')
-		{
-			// Two characters but the first one is a minus.
-			return false;
-		}
-
-		$value_lower = strtolower($value);
-		$value_numeric = phpbb_to_numeric($value);
-
-		switch ($value_lower[strlen($value_lower) - 1])
-		{
-			case 'g':
-				$value_numeric *= 1024;
-			case 'm':
-				$value_numeric *= 1024;
-			case 'k':
-				$value_numeric *= 1024;
-			break;
-
-			default:
-				// It's not already in bytes (and thus numeric)
-				// and does not carry a unit.
-				return false;
-		}
-
-		return $value_numeric;
-	}
-}
diff --git a/phpBB/includes/request/deactivated_super_global.php b/phpBB/includes/request/deactivated_super_global.php
deleted file mode 100644
index cc05847ec7..0000000000
--- a/phpBB/includes/request/deactivated_super_global.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
-*
-* @package phpbb_request
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Replacement for a superglobal (like $_GET or $_POST) which calls
-* trigger_error on all operations but isset, overloads the [] operator with SPL.
-*
-* @package phpbb_request
-*/
-class phpbb_request_deactivated_super_global implements ArrayAccess, Countable, IteratorAggregate
-{
-	/**
-	* @var	string	Holds the name of the superglobal this is replacing.
-	*/
-	private $name;
-
-	/**
-	* @var	phpbb_request_interface::POST|GET|REQUEST|COOKIE	Super global constant.
-	*/
-	private $super_global;
-
-	/**
-	* @var	phpbb_request_interface	The request class instance holding the actual request data.
-	*/
-	private $request;
-
-	/**
-	* Constructor generates an error message fitting the super global to be used within the other functions.
-	*
-	* @param	phpbb_request_interface	$request	A request class instance holding the real super global data.
-	* @param	string					$name		Name of the super global this is a replacement for - e.g. '_GET'.
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global	The variable's super global constant.
-	*/
-	public function __construct(phpbb_request_interface $request, $name, $super_global)
-	{
-		$this->request = $request;
-		$this->name = $name;
-		$this->super_global = $super_global;
-	}
-
-	/**
-	* Calls trigger_error with the file and line number the super global was used in.
-	*/
-	private function error()
-	{
-		$file = '';
-		$line = 0;
-
-		$message = 'Illegal use of $' . $this->name . '. You must use the request class or request_var() to access input data. Found in %s on line %d. This error message was generated by deactivated_super_global.';
-
-		$backtrace = debug_backtrace();
-		if (isset($backtrace[1]))
-		{
-			$file = $backtrace[1]['file'];
-			$line = $backtrace[1]['line'];
-		}
-		trigger_error(sprintf($message, $file, $line), E_USER_ERROR);
-	}
-
-	/**
-	* Redirects isset to the correct request class call.
-	*
-	* @param	string	$offset	The key of the super global being accessed.
-	*
-	* @return	bool	Whether the key on the super global exists.
-	*/
-	public function offsetExists($offset)
-	{
-		return $this->request->is_set($offset, $this->super_global);
-	}
-
-	/**#@+
-	* Part of the ArrayAccess implementation, will always result in a FATAL error.
-	*/
-	public function offsetGet($offset)
-	{
-		$this->error();
-	}
-
-	public function offsetSet($offset, $value)
-	{
-		$this->error();
-	}
-
-	public function offsetUnset($offset)
-	{
-		$this->error();
-	}
-	/**#@-*/
-
-	/**
-	* Part of the Countable implementation, will always result in a FATAL error
-	*/
-	public function count()
-	{
-		$this->error();
-	}
-
-	/**
-	* Part of the Traversable/IteratorAggregate implementation, will always result in a FATAL error
-	*/
-	public function getIterator()
-	{
-		$this->error();
-	}
-}
-
diff --git a/phpBB/includes/request/interface.php b/phpBB/includes/request/interface.php
deleted file mode 100644
index 741db35917..0000000000
--- a/phpBB/includes/request/interface.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
-*
-* @package phpbb_request
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* An interface through which all application input can be accessed.
-*
-* @package phpbb_request
-*/
-interface phpbb_request_interface
-{
-	/**#@+
-	* Constant identifying the super global with the same name.
-	*/
-	const POST = 0;
-	const GET = 1;
-	const REQUEST = 2;
-	const COOKIE = 3;
-	const SERVER = 4;
-	const FILES = 5;
-	/**#@-*/
-
-	/**
-	* This function allows overwriting or setting a value in one of the super global arrays.
-	*
-	* Changes which are performed on the super globals directly will not have any effect on the results of
-	* other methods this class provides. Using this function should be avoided if possible! It will
-	* consume twice the the amount of memory of the value
-	*
-	* @param	string	$var_name	The name of the variable that shall be overwritten
-	* @param	mixed	$value		The value which the variable shall contain.
-	* 								If this is null the variable will be unset.
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	* 								Specifies which super global shall be changed
-	*/
-	public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST);
-
-	/**
-	* Central type safe input handling function.
-	* All variables in GET or POST requests should be retrieved through this function to maximise security.
-	*
-	* @param	string|array	$var_name	The form variable's name from which data shall be retrieved.
-	* 										If the value is an array this may be an array of indizes which will give
-	* 										direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a")
-	* 										then specifying array("var", 1) as the name will return "a".
-	* @param	mixed			$default	A default value that is returned if the variable was not set.
-	* 										This function will always return a value of the same type as the default.
-	* @param	bool			$multibyte	If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters
-	*										Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	* 										Specifies which super global should be used
-	*
-	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
-	*					the same as that of $default. If the variable is not set $default is returned.
-	*/
-	public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST);
-
-	/**
-	* Shortcut method to retrieve SERVER variables.
-	*
-	* @param	string|array	$var_name		See phpbb_request_interface::variable
-	* @param	mixed			$default		See phpbb_request_interface::variable
-	*
-	* @return	mixed	The server variable value.
-	*/
-	public function server($var_name, $default = '');
-
-	/**
-	* Shortcut method to retrieve the value of client HTTP headers.
-	*
-	* @param	string|array	$header_name	The name of the header to retrieve.
-	* @param	mixed			$default		See phpbb_request_interface::variable
-	*
-	* @return	mixed	The header value.
-	*/
-	public function header($var_name, $default = '');
-
-	/**
-	* Checks whether a certain variable was sent via POST.
-	* To make sure that a request was sent using POST you should call this function
-	* on at least one variable.
-	*
-	* @param	string	$name	The name of the form variable which should have a
-	*							_p suffix to indicate the check in the code that creates the form too.
-	*
-	* @return	bool			True if the variable was set in a POST request, false otherwise.
-	*/
-	public function is_set_post($name);
-
-	/**
-	* Checks whether a certain variable is set in one of the super global
-	* arrays.
-	*
-	* @param	string	$var	Name of the variable
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	*							Specifies the super global which shall be checked
-	*
-	* @return	bool			True if the variable was sent as input
-	*/
-	public function is_set($var, $super_global = phpbb_request_interface::REQUEST);
-
-	/**
-	* Checks whether the current request is an AJAX request (XMLHttpRequest)
-	*
-	* @return	bool			True if the current request is an ajax request
-	*/
-	public function is_ajax();
-
-	/**
-	* Checks if the current request is happening over HTTPS.
-	*
-	* @return	bool			True if the request is secure.
-	*/
-	public function is_secure();
-
-	/**
-	* Returns all variable names for a given super global
-	*
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	*					The super global from which names shall be taken
-	*
-	* @return	array	All variable names that are set for the super global.
-	*					Pay attention when using these, they are unsanitised!
-	*/
-	public function variable_names($super_global = phpbb_request_interface::REQUEST);
-}
diff --git a/phpBB/includes/request/request.php b/phpBB/includes/request/request.php
deleted file mode 100644
index ae3c526d89..0000000000
--- a/phpBB/includes/request/request.php
+++ /dev/null
@@ -1,415 +0,0 @@
-<?php
-/**
-*
-* @package phpbb_request
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* All application input is accessed through this class.
-*
-* It provides a method to disable access to input data through super globals.
-* This should force MOD authors to read about data validation.
-*
-* @package phpbb_request
-*/
-class phpbb_request implements phpbb_request_interface
-{
-	/**
-	* @var	array	The names of super global variables that this class should protect if super globals are disabled.
-	*/
-	protected $super_globals = array(
-		phpbb_request_interface::POST => '_POST',
-		phpbb_request_interface::GET => '_GET',
-		phpbb_request_interface::REQUEST => '_REQUEST',
-		phpbb_request_interface::COOKIE => '_COOKIE',
-		phpbb_request_interface::SERVER => '_SERVER',
-		phpbb_request_interface::FILES => '_FILES',
-	);
-
-	/**
-	* @var	array	Stores original contents of $_REQUEST array.
-	*/
-	protected $original_request = null;
-
-	/**
-	* @var
-	*/
-	protected $super_globals_disabled = false;
-
-	/**
-	* @var	array	An associative array that has the value of super global constants as keys and holds their data as values.
-	*/
-	protected $input;
-
-	/**
-	* @var	phpbb_request_type_cast_helper_interface	An instance of a type cast helper providing convenience methods for type conversions.
-	*/
-	protected $type_cast_helper;
-
-	/**
-	* Initialises the request class, that means it stores all input data in {@link $input input}
-	* and then calls {@link phpbb_request_deactivated_super_global phpbb_request_deactivated_super_global}
-	*/
-	public function __construct(phpbb_request_type_cast_helper_interface $type_cast_helper = null, $disable_super_globals = true)
-	{
-		if ($type_cast_helper)
-		{
-			$this->type_cast_helper = $type_cast_helper;
-		}
-		else
-		{
-			$this->type_cast_helper = new phpbb_request_type_cast_helper();
-		}
-
-		foreach ($this->super_globals as $const => $super_global)
-		{
-			$this->input[$const] = isset($GLOBALS[$super_global]) ? $GLOBALS[$super_global] : array();
-		}
-
-		// simulate request_order = GP
-		$this->original_request = $this->input[phpbb_request_interface::REQUEST];
-		$this->input[phpbb_request_interface::REQUEST] = $this->input[phpbb_request_interface::POST] + $this->input[phpbb_request_interface::GET];
-
-		if ($disable_super_globals)
-		{
-			$this->disable_super_globals();
-		}
-	}
-
-	/**
-	* Getter for $super_globals_disabled
-	*
-	* @return	bool	Whether super globals are disabled or not.
-	*/
-	public function super_globals_disabled()
-	{
-		return $this->super_globals_disabled;
-	}
-
-	/**
-	* Disables access of super globals specified in $super_globals.
-	* This is achieved by overwriting the super globals with instances of {@link phpbb_request_deactivated_super_global phpbb_request_deactivated_super_global}
-	*/
-	public function disable_super_globals()
-	{
-		if (!$this->super_globals_disabled)
-		{
-			foreach ($this->super_globals as $const => $super_global)
-			{
-				unset($GLOBALS[$super_global]);
-				$GLOBALS[$super_global] = new phpbb_request_deactivated_super_global($this, $super_global, $const);
-			}
-
-			$this->super_globals_disabled = true;
-		}
-	}
-
-	/**
-	* Enables access of super globals specified in $super_globals if they were disabled by {@link disable_super_globals disable_super_globals}.
-	* This is achieved by making the super globals point to the data stored within this class in {@link $input input}.
-	*/
-	public function enable_super_globals()
-	{
-		if ($this->super_globals_disabled)
-		{
-			foreach ($this->super_globals as $const => $super_global)
-			{
-				$GLOBALS[$super_global] = $this->input[$const];
-			}
-
-			$GLOBALS['_REQUEST'] = $this->original_request;
-
-			$this->super_globals_disabled = false;
-		}
-	}
-
-	/**
-	* This function allows overwriting or setting a value in one of the super global arrays.
-	*
-	* Changes which are performed on the super globals directly will not have any effect on the results of
-	* other methods this class provides. Using this function should be avoided if possible! It will
-	* consume twice the the amount of memory of the value
-	*
-	* @param	string	$var_name	The name of the variable that shall be overwritten
-	* @param	mixed	$value		The value which the variable shall contain.
-	* 								If this is null the variable will be unset.
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	* 								Specifies which super global shall be changed
-	*/
-	public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST)
-	{
-		if (!isset($this->super_globals[$super_global]))
-		{
-			return;
-		}
-
-		$this->type_cast_helper->add_magic_quotes($value);
-
-		// setting to null means unsetting
-		if ($value === null)
-		{
-			unset($this->input[$super_global][$var_name]);
-			if (!$this->super_globals_disabled())
-			{
-				unset($GLOBALS[$this->super_globals[$super_global]][$var_name]);
-			}
-		}
-		else
-		{
-			$this->input[$super_global][$var_name] = $value;
-			if (!$this->super_globals_disabled())
-			{
-				$GLOBALS[$this->super_globals[$super_global]][$var_name] = $value;
-			}
-		}
-
-		if (!$this->super_globals_disabled())
-		{
-			unset($GLOBALS[$this->super_globals[$super_global]][$var_name]);
-			$GLOBALS[$this->super_globals[$super_global]][$var_name] = $value;
-		}
-	}
-
-	/**
-	* Central type safe input handling function.
-	* All variables in GET or POST requests should be retrieved through this function to maximise security.
-	*
-	* @param	string|array	$var_name	The form variable's name from which data shall be retrieved.
-	* 										If the value is an array this may be an array of indizes which will give
-	* 										direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a")
-	* 										then specifying array("var", 1) as the name will return "a".
-	* @param	mixed			$default	A default value that is returned if the variable was not set.
-	* 										This function will always return a value of the same type as the default.
-	* @param	bool			$multibyte	If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters
-	*										Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	* 										Specifies which super global should be used
-	*
-	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
-	*					the same as that of $default. If the variable is not set $default is returned.
-	*/
-	public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST)
-	{
-		return $this->_variable($var_name, $default, $multibyte, $super_global, true);
-	}
-
-	/**
-	* Get a variable, but without trimming strings.
-	* Same functionality as variable(), except does not run trim() on strings.
-	* This method should be used when handling passwords.
-	*
-	* @param	string|array	$var_name	The form variable's name from which data shall be retrieved.
-	* 										If the value is an array this may be an array of indizes which will give
-	* 										direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a")
-	* 										then specifying array("var", 1) as the name will return "a".
-	* @param	mixed			$default	A default value that is returned if the variable was not set.
-	* 										This function will always return a value of the same type as the default.
-	* @param	bool			$multibyte	If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters
-	*										Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	* 										Specifies which super global should be used
-	*
-	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
-	*					the same as that of $default. If the variable is not set $default is returned.
-	*/
-	public function untrimmed_variable($var_name, $default, $multibyte, $super_global = phpbb_request_interface::REQUEST)
-	{
-		return $this->_variable($var_name, $default, $multibyte, $super_global, false);
-	}
-
-	/**
-	* Shortcut method to retrieve SERVER variables.
-	*
-	* Also fall back to getenv(), some CGI setups may need it (probably not, but
-	* whatever).
-	*
-	* @param	string|array	$var_name		See phpbb_request_interface::variable
-	* @param	mixed			$Default		See phpbb_request_interface::variable
-	*
-	* @return	mixed	The server variable value.
-	*/
-	public function server($var_name, $default = '')
-	{
-		$multibyte = true;
-
-		if ($this->is_set($var_name, phpbb_request_interface::SERVER))
-		{
-			return $this->variable($var_name, $default, $multibyte, phpbb_request_interface::SERVER);
-		}
-		else
-		{
-			$var = getenv($var_name);
-			$this->type_cast_helper->recursive_set_var($var, $default, $multibyte);
-			return $var;
-		}
-	}
-
-	/**
-	* Shortcut method to retrieve the value of client HTTP headers.
-	*
-	* @param	string|array	$header_name	The name of the header to retrieve.
-	* @param	mixed			$default		See phpbb_request_interface::variable
-	*
-	* @return	mixed	The header value.
-	*/
-	public function header($header_name, $default = '')
-	{
-		$var_name = 'HTTP_' . str_replace('-', '_', strtoupper($header_name));
-		return $this->server($var_name, $default);
-	}
-
-	/**
-	* Shortcut method to retrieve $_FILES variables
-	*
-	* @param string $form_name The name of the file input form element
-	*
-	* @return array The uploaded file's information or an empty array if the
-	* variable does not exist in _FILES.
-	*/
-	public function file($form_name)
-	{
-		return $this->variable($form_name, array('name' => 'none'), false, phpbb_request_interface::FILES);
-	}
-
-	/**
-	* Checks whether a certain variable was sent via POST.
-	* To make sure that a request was sent using POST you should call this function
-	* on at least one variable.
-	*
-	* @param	string	$name	The name of the form variable which should have a
-	*							_p suffix to indicate the check in the code that creates the form too.
-	*
-	* @return	bool			True if the variable was set in a POST request, false otherwise.
-	*/
-	public function is_set_post($name)
-	{
-		return $this->is_set($name, phpbb_request_interface::POST);
-	}
-
-	/**
-	* Checks whether a certain variable is set in one of the super global
-	* arrays.
-	*
-	* @param	string	$var	Name of the variable
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	*							Specifies the super global which shall be checked
-	*
-	* @return	bool			True if the variable was sent as input
-	*/
-	public function is_set($var, $super_global = phpbb_request_interface::REQUEST)
-	{
-		return isset($this->input[$super_global][$var]);
-	}
-
-	/**
-	* Checks whether the current request is an AJAX request (XMLHttpRequest)
-	*
-	* @return	bool			True if the current request is an ajax request
-	*/
-	public function is_ajax()
-	{
-		return $this->header('X-Requested-With') == 'XMLHttpRequest';
-	}
-
-	/**
-	* Checks if the current request is happening over HTTPS.
-	*
-	* @return	bool			True if the request is secure.
-	*/
-	public function is_secure()
-	{
-		return $this->server('HTTPS') == 'on';
-	}
-
-	/**
-	* Returns all variable names for a given super global
-	*
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	*					The super global from which names shall be taken
-	*
-	* @return	array	All variable names that are set for the super global.
-	*					Pay attention when using these, they are unsanitised!
-	*/
-	public function variable_names($super_global = phpbb_request_interface::REQUEST)
-	{
-		if (!isset($this->input[$super_global]))
-		{
-			return array();
-		}
-
-		return array_keys($this->input[$super_global]);
-	}
-
-	/**
-	* Helper function used by variable() and untrimmed_variable().
-	*
-	* @param	string|array	$var_name	The form variable's name from which data shall be retrieved.
-	* 										If the value is an array this may be an array of indizes which will give
-	* 										direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a")
-	* 										then specifying array("var", 1) as the name will return "a".
-	* @param	mixed			$default	A default value that is returned if the variable was not set.
-	* 										This function will always return a value of the same type as the default.
-	* @param	bool			$multibyte	If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters
-	*										Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks
-	* @param	phpbb_request_interface::POST|GET|REQUEST|COOKIE	$super_global
-	* 										Specifies which super global should be used
-	* @param	bool			$trim		Indicates whether trim() should be applied to string values.
-	*
-	* @return	mixed	The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the
-	*					the same as that of $default. If the variable is not set $default is returned.
-	*/
-	protected function _variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST, $trim = true)
-	{
-		$path = false;
-
-		// deep direct access to multi dimensional arrays
-		if (is_array($var_name))
-		{
-			$path = $var_name;
-			// make sure at least the variable name is specified
-			if (empty($path))
-			{
-				return (is_array($default)) ? array() : $default;
-			}
-			// the variable name is the first element on the path
-			$var_name = array_shift($path);
-		}
-
-		if (!isset($this->input[$super_global][$var_name]))
-		{
-			return (is_array($default)) ? array() : $default;
-		}
-		$var = $this->input[$super_global][$var_name];
-
-		if ($path)
-		{
-			// walk through the array structure and find the element we are looking for
-			foreach ($path as $key)
-			{
-				if (is_array($var) && isset($var[$key]))
-				{
-					$var = $var[$key];
-				}
-				else
-				{
-					return (is_array($default)) ? array() : $default;
-				}
-			}
-		}
-
-		$this->type_cast_helper->recursive_set_var($var, $default, $multibyte, $trim);
-
-		return $var;
-	}
-}
diff --git a/phpBB/includes/request/type_cast_helper.php b/phpBB/includes/request/type_cast_helper.php
deleted file mode 100644
index 1a5274ed14..0000000000
--- a/phpBB/includes/request/type_cast_helper.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/**
-*
-* @package phpbb_request
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* A helper class that provides convenience methods for type casting.
-*
-* @package phpbb_request
-*/
-class phpbb_request_type_cast_helper implements phpbb_request_type_cast_helper_interface
-{
-
-	/**
-	* @var	string	Whether slashes need to be stripped from input
-	*/
-	protected $strip;
-
-	/**
-	* Initialises the type cast helper class.
-	* All it does is find out whether magic quotes are turned on.
-	*/
-	public function __construct()
-	{
-		if (version_compare(PHP_VERSION, '5.4.0-dev', '>='))
-		{
-			$this->strip = false;
-		}
-		else
-		{
-			$this->strip = (@get_magic_quotes_gpc()) ? true : false;
-		}
-	}
-
-	/**
-	* Recursively applies addslashes to a variable.
-	*
-	* @param	mixed	&$var	Variable passed by reference to which slashes will be added.
-	*/
-	public function addslashes_recursively(&$var)
-	{
-		if (is_string($var))
-		{
-			$var = addslashes($var);
-		}
-		else if (is_array($var))
-		{
-			$var_copy = $var;
-			$var = array();
-			foreach ($var_copy as $key => $value)
-			{
-				if (is_string($key))
-				{
-					$key = addslashes($key);
-				}
-				$var[$key] = $value;
-
-				$this->addslashes_recursively($var[$key]);
-			}
-		}
-	}
-
-	/**
-	* Recursively applies addslashes to a variable if magic quotes are turned on.
-	*
-	* @param	mixed	&$var	Variable passed by reference to which slashes will be added.
-	*/
-	public function add_magic_quotes(&$var)
-	{
-		if ($this->strip)
-		{
-			$this->addslashes_recursively($var);
-		}
-	}
-
-	/**
-	* Set variable $result to a particular type.
-	*
-	* @param mixed	&$result		The variable to fill
-	* @param mixed	$var			The contents to fill with
-	* @param mixed	$type			The variable type. Will be used with {@link settype()}
-	* @param bool	$multibyte		Indicates whether string values may contain UTF-8 characters.
-	* 								Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks.
-	* @param bool	$trim			Indicates whether trim() should be applied to string values.
-	* 								Default is true.
-	*/
-	public function set_var(&$result, $var, $type, $multibyte = false, $trim = true)
-	{
-		settype($var, $type);
-		$result = $var;
-
-		if ($type == 'string')
-		{
-			$result = str_replace(array("\r\n", "\r", "\0"), array("\n", "\n", ''), $result);
-
-			if ($trim)
-			{
-				$result = trim($result);
-			}
-
-			$result = htmlspecialchars($result, ENT_COMPAT, 'UTF-8');
-
-			if ($multibyte)
-			{
-				$result = utf8_normalize_nfc($result);
-			}
-
-			if (!empty($result))
-			{
-				// Make sure multibyte characters are wellformed
-				if ($multibyte)
-				{
-					if (!preg_match('/^./u', $result))
-					{
-						$result = '';
-					}
-				}
-				else
-				{
-					// no multibyte, allow only ASCII (0-127)
-					$result = preg_replace('/[\x80-\xFF]/', '?', $result);
-				}
-			}
-
-			$result = ($this->strip) ? stripslashes($result) : $result;
-		}
-	}
-
-	/**
-	* Recursively sets a variable to a given type using {@link set_var set_var}
-	*
-	* @param	string	$var		The value which shall be sanitised (passed by reference).
-	* @param	mixed	$default	Specifies the type $var shall have.
-	* 								If it is an array and $var is not one, then an empty array is returned.
-	* 								Otherwise var is cast to the same type, and if $default is an array all
-	* 								keys and values are cast recursively using this function too.
-	* @param	bool	$multibyte	Indicates whether string keys and values may contain UTF-8 characters.
-	* 								Default is false, causing all bytes outside the ASCII range (0-127) to
-	* 								be replaced with question marks.
-	* @param	bool	$trim		Indicates whether trim() should be applied to string values.
-	* 								Default is true.
-	*/
-	public function recursive_set_var(&$var, $default, $multibyte, $trim = true)
-	{
-		if (is_array($var) !== is_array($default))
-		{
-			$var = (is_array($default)) ? array() : $default;
-			return;
-		}
-
-		if (!is_array($default))
-		{
-			$type = gettype($default);
-			$this->set_var($var, $var, $type, $multibyte, $trim);
-		}
-		else
-		{
-			// make sure there is at least one key/value pair to use get the
-			// types from
-			if (empty($default))
-			{
-				$var = array();
-				return;
-			}
-
-			list($default_key, $default_value) = each($default);
-			$value_type = gettype($default_value);
-			$key_type = gettype($default_key);
-
-			$_var = $var;
-			$var = array();
-
-			foreach ($_var as $k => $v)
-			{
-				$this->set_var($k, $k, $key_type, $multibyte);
-
-				$this->recursive_set_var($v, $default_value, $multibyte, $trim);
-				$var[$k] = $v;
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/request/type_cast_helper_interface.php b/phpBB/includes/request/type_cast_helper_interface.php
deleted file mode 100644
index 3920d16fc7..0000000000
--- a/phpBB/includes/request/type_cast_helper_interface.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
-*
-* @package phpbb_request
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* An interface for type cast operations.
-*
-* @package phpbb_request
-*/
-interface phpbb_request_type_cast_helper_interface
-{
-	/**
-	* Recursively applies addslashes to a variable.
-	*
-	* @param	mixed	&$var	Variable passed by reference to which slashes will be added.
-	*/
-	public function addslashes_recursively(&$var);
-
-	/**
-	* Recursively applies addslashes to a variable if magic quotes are turned on.
-	*
-	* @param	mixed	&$var	Variable passed by reference to which slashes will be added.
-	*/
-	public function add_magic_quotes(&$var);
-
-	/**
-	* Set variable $result to a particular type.
-	*
-	* @param mixed	&$result	The variable to fill
-	* @param mixed	$var		The contents to fill with
-	* @param mixed	$type		The variable type. Will be used with {@link settype()}
-	* @param bool	$multibyte	Indicates whether string values may contain UTF-8 characters.
-	* 							Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks.
-	*/
-	public function set_var(&$result, $var, $type, $multibyte = false);
-
-	/**
-	* Recursively sets a variable to a given type using {@link set_var set_var}.
-	*
-	* @param	string	$var		The value which shall be sanitised (passed by reference).
-	* @param	mixed	$default	Specifies the type $var shall have.
-	* 								If it is an array and $var is not one, then an empty array is returned.
-	* 								Otherwise var is cast to the same type, and if $default is an array all
-	* 								keys and values are cast recursively using this function too.
-	* @param	bool	$multibyte	Indicates whether string keys and values may contain UTF-8 characters.
-	* 								Default is false, causing all bytes outside the ASCII range (0-127) to
-	* 								be replaced with question marks.
-	*/
-	public function recursive_set_var(&$var, $default, $multibyte);
-}
diff --git a/phpBB/includes/search/base.php b/phpBB/includes/search/base.php
deleted file mode 100644
index 914cef9167..0000000000
--- a/phpBB/includes/search/base.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @ignore
-*/
-define('SEARCH_RESULT_NOT_IN_CACHE', 0);
-define('SEARCH_RESULT_IN_CACHE', 1);
-define('SEARCH_RESULT_INCOMPLETE', 2);
-
-/**
-* phpbb_search_base
-* optional base class for search plugins providing simple caching based on ACM
-* and functions to retrieve ignore_words and synonyms
-* @package search
-*/
-class phpbb_search_base
-{
-	var $ignore_words = array();
-	var $match_synonym = array();
-	var $replace_synonym = array();
-
-	function search_backend(&$error)
-	{
-		// This class cannot be used as a search plugin
-		$error = true;
-	}
-
-	/**
-	* Retrieves a language dependend list of words that should be ignored by the search
-	*/
-	function get_ignore_words()
-	{
-		if (!sizeof($this->ignore_words))
-		{
-			global $user, $phpEx;
-
-			$words = array();
-
-			if (file_exists("{$user->lang_path}{$user->lang_name}/search_ignore_words.$phpEx"))
-			{
-				// include the file containing ignore words
-				include("{$user->lang_path}{$user->lang_name}/search_ignore_words.$phpEx");
-			}
-
-			$this->ignore_words = $words;
-			unset($words);
-		}
-	}
-
-	/**
-	* Stores a list of synonyms that should be replaced in $this->match_synonym and $this->replace_synonym and caches them
-	*/
-	function get_synonyms()
-	{
-		if (!sizeof($this->match_synonym))
-		{
-			global $user, $phpEx;
-
-			$synonyms = array();
-
-			if (file_exists("{$user->lang_path}{$user->lang_name}/search_synonyms.$phpEx"))
-			{
-				// include the file containing synonyms
-				include("{$user->lang_path}{$user->lang_name}/search_synonyms.$phpEx");
-			}
-
-			$this->match_synonym = array_keys($synonyms);
-			$this->replace_synonym = array_values($synonyms);
-
-			unset($synonyms);
-		}
-	}
-
-	/**
-	* Retrieves cached search results
-	*
-	* @param int &$result_count will contain the number of all results for the search (not only for the current page)
-	* @param array &$id_ary is filled with the ids belonging to the requested page that are stored in the cache
-	*
-	* @return int SEARCH_RESULT_NOT_IN_CACHE or SEARCH_RESULT_IN_CACHE or SEARCH_RESULT_INCOMPLETE
-	*/
-	function obtain_ids($search_key, &$result_count, &$id_ary, &$start, $per_page, $sort_dir)
-	{
-		global $cache;
-
-		if (!($stored_ids = $cache->get('_search_results_' . $search_key)))
-		{
-			// no search results cached for this search_key
-			return SEARCH_RESULT_NOT_IN_CACHE;
-		}
-		else
-		{
-			$result_count = $stored_ids[-1];
-			$reverse_ids = ($stored_ids[-2] != $sort_dir) ? true : false;
-			$complete = true;
-
-			// Change start parameter in case out of bounds
-			if ($result_count)
-			{
-				if ($start < 0)
-				{
-					$start = 0;
-				}
-				else if ($start >= $result_count)
-				{
-					$start = floor(($result_count - 1) / $per_page) * $per_page;
-				}
-			}
-
-			// change the start to the actual end of the current request if the sort direction differs
-			// from the dirction in the cache and reverse the ids later
-			if ($reverse_ids)
-			{
-				$start = $result_count - $start - $per_page;
-
-				// the user requested a page past the last index
-				if ($start < 0)
-				{
-					return SEARCH_RESULT_NOT_IN_CACHE;
-				}
-			}
-
-			for ($i = $start, $n = $start + $per_page; ($i < $n) && ($i < $result_count); $i++)
-			{
-				if (!isset($stored_ids[$i]))
-				{
-					$complete = false;
-				}
-				else
-				{
-					$id_ary[] = $stored_ids[$i];
-				}
-			}
-			unset($stored_ids);
-
-			if ($reverse_ids)
-			{
-				$id_ary = array_reverse($id_ary);
-			}
-
-			if (!$complete)
-			{
-				return SEARCH_RESULT_INCOMPLETE;
-			}
-			return SEARCH_RESULT_IN_CACHE;
-		}
-	}
-
-	/**
-	* Caches post/topic ids
-	*
-	* @param array &$id_ary contains a list of post or topic ids that shall be cached, the first element
-	* 	must have the absolute index $start in the result set.
-	*/
-	function save_ids($search_key, $keywords, $author_ary, $result_count, &$id_ary, $start, $sort_dir)
-	{
-		global $cache, $config, $db, $user;
-
-		$length = min(sizeof($id_ary), $config['search_block_size']);
-
-		// nothing to cache so exit
-		if (!$length)
-		{
-			return;
-		}
-
-		$store_ids = array_slice($id_ary, 0, $length);
-
-		// create a new resultset if there is none for this search_key yet
-		// or add the ids to the existing resultset
-		if (!($store = $cache->get('_search_results_' . $search_key)))
-		{
-			// add the current keywords to the recent searches in the cache which are listed on the search page
-			if (!empty($keywords) || sizeof($author_ary))
-			{
-				$sql = 'SELECT search_time
-					FROM ' . SEARCH_RESULTS_TABLE . '
-					WHERE search_key = \'' . $db->sql_escape($search_key) . '\'';
-				$result = $db->sql_query($sql);
-
-				if (!$db->sql_fetchrow($result))
-				{
-					$sql_ary = array(
-						'search_key'		=> $search_key,
-						'search_time'		=> time(),
-						'search_keywords'	=> $keywords,
-						'search_authors'	=> ' ' . implode(' ', $author_ary) . ' '
-					);
-
-					$sql = 'INSERT INTO ' . SEARCH_RESULTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-					$db->sql_query($sql);
-				}
-				$db->sql_freeresult($result);
-			}
-
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_last_search = ' . time() . '
-				WHERE user_id = ' . $user->data['user_id'];
-			$db->sql_query($sql);
-
-			$store = array(-1 => $result_count, -2 => $sort_dir);
-			$id_range = range($start, $start + $length - 1);
-		}
-		else
-		{
-			// we use one set of results for both sort directions so we have to calculate the indizes
-			// for the reversed array and we also have to reverse the ids themselves
-			if ($store[-2] != $sort_dir)
-			{
-				$store_ids = array_reverse($store_ids);
-				$id_range = range($store[-1] - $start - $length, $store[-1] - $start - 1);
-			}
-			else
-			{
-				$id_range = range($start, $start + $length - 1);
-			}
-		}
-
-		$store_ids = array_combine($id_range, $store_ids);
-
-		// append the ids
-		if (is_array($store_ids))
-		{
-			$store += $store_ids;
-
-			// if the cache is too big
-			if (sizeof($store) - 2 > 20 * $config['search_block_size'])
-			{
-				// remove everything in front of two blocks in front of the current start index
-				for ($i = 0, $n = $id_range[0] - 2 * $config['search_block_size']; $i < $n; $i++)
-				{
-					if (isset($store[$i]))
-					{
-						unset($store[$i]);
-					}
-				}
-
-				// remove everything after two blocks after the current stop index
-				end($id_range);
-				for ($i = $store[-1] - 1, $n = current($id_range) + 2 * $config['search_block_size']; $i > $n; $i--)
-				{
-					if (isset($store[$i]))
-					{
-						unset($store[$i]);
-					}
-				}
-			}
-			$cache->put('_search_results_' . $search_key, $store, $config['search_store_results']);
-
-			$sql = 'UPDATE ' . SEARCH_RESULTS_TABLE . '
-				SET search_time = ' . time() . '
-				WHERE search_key = \'' . $db->sql_escape($search_key) . '\'';
-			$db->sql_query($sql);
-		}
-
-		unset($store);
-		unset($store_ids);
-		unset($id_range);
-	}
-
-	/**
-	* Removes old entries from the search results table and removes searches with keywords that contain a word in $words.
-	*/
-	function destroy_cache($words, $authors = false)
-	{
-		global $db, $cache, $config;
-
-		// clear all searches that searched for the specified words
-		if (sizeof($words))
-		{
-			$sql_where = '';
-			foreach ($words as $word)
-			{
-				$sql_where .= " OR search_keywords " . $db->sql_like_expression($db->any_char . $word . $db->any_char);
-			}
-
-			$sql = 'SELECT search_key
-				FROM ' . SEARCH_RESULTS_TABLE . "
-				WHERE search_keywords LIKE '%*%' $sql_where";
-			$result = $db->sql_query($sql);
-
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$cache->destroy('_search_results_' . $row['search_key']);
-			}
-			$db->sql_freeresult($result);
-		}
-
-		// clear all searches that searched for the specified authors
-		if (is_array($authors) && sizeof($authors))
-		{
-			$sql_where = '';
-			foreach ($authors as $author)
-			{
-				$sql_where .= (($sql_where) ? ' OR ' : '') . 'search_authors ' . $db->sql_like_expression($db->any_char . ' ' . (int) $author . ' ' . $db->any_char);
-			}
-
-			$sql = 'SELECT search_key
-				FROM ' . SEARCH_RESULTS_TABLE . "
-				WHERE $sql_where";
-			$result = $db->sql_query($sql);
-
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$cache->destroy('_search_results_' . $row['search_key']);
-			}
-			$db->sql_freeresult($result);
-		}
-
-		$sql = 'DELETE
-			FROM ' . SEARCH_RESULTS_TABLE . '
-			WHERE search_time < ' . (time() - $config['search_store_results']);
-		$db->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
deleted file mode 100644
index 7dc4da8ffe..0000000000
--- a/phpBB/includes/search/fulltext_mysql.php
+++ /dev/null
@@ -1,948 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* fulltext_mysql
-* Fulltext search for MySQL
-* @package search
-*/
-class phpbb_search_fulltext_mysql extends phpbb_search_base
-{
-	/**
-	 * Associative array holding index stats
-	 * @var array
-	 */
-	protected $stats = array();
-
-	/**
-	 * Holds the words entered by user, obtained by splitting the entered query on whitespace
-	 * @var array
-	 */
-	protected $split_words = array();
-
-	/**
-	 * Config object
-	 * @var phpbb_config
-	 */
-	protected $config;
-	
-	/**
-	 * Database connection
-	 * @var phpbb_db_driver
-	 */
-	protected $db;
-	
-	/**
-	 * User object
-	 * @var phpbb_user
-	 */
-	protected $user;
-
-	/**
-	 * Associative array stores the min and max word length to be searched
-	 * @var array
-	 */
-	protected $word_length = array();
-
-	/**
-	 * Contains tidied search query.
-	 * Operators are prefixed in search query and common words excluded
-	 * @var string
-	 */
-	protected $search_query;
-
-	/**
-	 * Contains common words.
-	 * Common words are words with length less/more than min/max length
-	 * @var array
-	 */
-	protected $common_words = array();
-
-	/**
-	 * Constructor
-	 * Creates a new phpbb_search_fulltext_mysql, which is used as a search backend
-	 *
-	 * @param string|bool $error Any error that occurs is passed on through this reference variable otherwise false
-	 */
-	public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user)
-	{
-		$this->config = $config;
-		$this->db = $db;
-		$this->user = $user;
-
-		$this->word_length = array('min' => $this->config['fulltext_mysql_min_word_len'], 'max' => $this->config['fulltext_mysql_max_word_len']);
-
-		/**
-		 * Load the UTF tools
-		 */
-		if (!function_exists('utf8_strlen'))
-		{
-			include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
-		}
-
-		$error = false;
-	}
-
-	/**
-	* Returns the name of this search backend to be displayed to administrators
-	*
-	* @return string Name
-	*/
-	public function get_name()
-	{
-		return 'MySQL Fulltext';
-	}
-
-	/**
-	 * Returns the search_query
-	 *
-	 * @return string search query
-	 */
-	public function get_search_query()
-	{
-		return $this->search_query;
-	}
-
-	/**
-	 * Returns the common_words array
-	 *
-	 * @return array common words that are ignored by search backend
-	 */
-	public function get_common_words()
-	{
-		return $this->common_words;
-	}
-
-	/**
-	 * Returns the word_length array
-	 *
-	 * @return array min and max word length for searching
-	 */
-	public function get_word_length()
-	{
-		return $this->word_length;
-	}
-
-	/**
-	* Checks for correct MySQL version and stores min/max word length in the config
-	*
-	* @return string|bool Language key of the error/incompatiblity occurred
-	*/
-	public function init()
-	{
-		if ($this->db->sql_layer != 'mysql4' && $this->db->sql_layer != 'mysqli')
-		{
-			return $this->user->lang['FULLTEXT_MYSQL_INCOMPATIBLE_DATABASE'];
-		}
-
-		$result = $this->db->sql_query('SHOW TABLE STATUS LIKE \'' . POSTS_TABLE . '\'');
-		$info = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		$engine = '';
-		if (isset($info['Engine']))
-		{
-			$engine = $info['Engine'];
-		}
-		else if (isset($info['Type']))
-		{
-			$engine = $info['Type'];
-		}
-
-		$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($this->db->sql_server_info(true), '5.6.4', '>=');
-
-		if (!$fulltext_supported)
-		{
-			return $this->user->lang['FULLTEXT_MYSQL_NOT_SUPPORTED'];
-		}
-
-		$sql = 'SHOW VARIABLES
-			LIKE \'ft\_%\'';
-		$result = $this->db->sql_query($sql);
-
-		$mysql_info = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$mysql_info[$row['Variable_name']] = $row['Value'];
-		}
-		$this->db->sql_freeresult($result);
-
-		set_config('fulltext_mysql_max_word_len', $mysql_info['ft_max_word_len']);
-		set_config('fulltext_mysql_min_word_len', $mysql_info['ft_min_word_len']);
-
-		return false;
-	}
-
-	/**
-	* Splits keywords entered by a user into an array of words stored in $this->split_words
-	* Stores the tidied search query in $this->search_query
-	*
-	* @param string &$keywords Contains the keyword as entered by the user
-	* @param string $terms is either 'all' or 'any'
-	* @return bool false if no valid keywords were found and otherwise true
-	*/
-	public function split_keywords(&$keywords, $terms)
-	{
-		if ($terms == 'all')
-		{
-			$match		= array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#(^|\s)\+#', '#(^|\s)-#', '#(^|\s)\|#');
-			$replace	= array(' +', ' |', ' -', ' +', ' -', ' |');
-
-			$keywords = preg_replace($match, $replace, $keywords);
-		}
-
-		// Filter out as above
-		$split_keywords = preg_replace("#[\n\r\t]+#", ' ', trim(htmlspecialchars_decode($keywords)));
-
-		// Split words
-		$split_keywords = preg_replace('#([^\p{L}\p{N}\'*"()])#u', '$1$1', str_replace('\'\'', '\' \'', trim($split_keywords)));
-		$matches = array();
-		preg_match_all('#(?:[^\p{L}\p{N}*"()]|^)([+\-|]?(?:[\p{L}\p{N}*"()]+\'?)*[\p{L}\p{N}*"()])(?:[^\p{L}\p{N}*"()]|$)#u', $split_keywords, $matches);
-		$this->split_words = $matches[1];
-
-		// We limit the number of allowed keywords to minimize load on the database
-		if ($this->config['max_num_search_keywords'] && sizeof($this->split_words) > $this->config['max_num_search_keywords'])
-		{
-			trigger_error($this->user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', $this->config['max_num_search_keywords'], sizeof($this->split_words)));
-		}
-
-		// to allow phrase search, we need to concatenate quoted words
-		$tmp_split_words = array();
-		$phrase = '';
-		foreach ($this->split_words as $word)
-		{
-			if ($phrase)
-			{
-				$phrase .= ' ' . $word;
-				if (strpos($word, '"') !== false && substr_count($word, '"') % 2 == 1)
-				{
-					$tmp_split_words[] = $phrase;
-					$phrase = '';
-				}
-			}
-			else if (strpos($word, '"') !== false && substr_count($word, '"') % 2 == 1)
-			{
-				$phrase = $word;
-			}
-			else
-			{
-				$tmp_split_words[] = $word;
-			}
-		}
-		if ($phrase)
-		{
-			$tmp_split_words[] = $phrase;
-		}
-
-		$this->split_words = $tmp_split_words;
-
-		unset($tmp_split_words);
-		unset($phrase);
-
-		foreach ($this->split_words as $i => $word)
-		{
-			$clean_word = preg_replace('#^[+\-|"]#', '', $word);
-
-			// check word length
-			$clean_len = utf8_strlen(str_replace('*', '', $clean_word));
-			if (($clean_len < $this->config['fulltext_mysql_min_word_len']) || ($clean_len > $this->config['fulltext_mysql_max_word_len']))
-			{
-				$this->common_words[] = $word;
-				unset($this->split_words[$i]);
-			}
-		}
-
-		if ($terms == 'any')
-		{
-			$this->search_query = '';
-			foreach ($this->split_words as $word)
-			{
-				if ((strpos($word, '+') === 0) || (strpos($word, '-') === 0) || (strpos($word, '|') === 0))
-				{
-					$word = substr($word, 1);
-				}
-				$this->search_query .= $word . ' ';
-			}
-		}
-		else
-		{
-			$this->search_query = '';
-			foreach ($this->split_words as $word)
-			{
-				if ((strpos($word, '+') === 0) || (strpos($word, '-') === 0))
-				{
-					$this->search_query .= $word . ' ';
-				}
-				else if (strpos($word, '|') === 0)
-				{
-					$this->search_query .= substr($word, 1) . ' ';
-				}
-				else
-				{
-					$this->search_query .= '+' . $word . ' ';
-				}
-			}
-		}
-
-		$this->search_query = utf8_htmlspecialchars($this->search_query);
-
-		if ($this->search_query)
-		{
-			$this->split_words = array_values($this->split_words);
-			sort($this->split_words);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Turns text into an array of words
-	* @param string $text contains post text/subject
-	*/
-	public function split_message($text)
-	{
-		// Split words
-		$text = preg_replace('#([^\p{L}\p{N}\'*])#u', '$1$1', str_replace('\'\'', '\' \'', trim($text)));
-		$matches = array();
-		preg_match_all('#(?:[^\p{L}\p{N}*]|^)([+\-|]?(?:[\p{L}\p{N}*]+\'?)*[\p{L}\p{N}*])(?:[^\p{L}\p{N}*]|$)#u', $text, $matches);
-		$text = $matches[1];
-
-		// remove too short or too long words
-		$text = array_values($text);
-		for ($i = 0, $n = sizeof($text); $i < $n; $i++)
-		{
-			$text[$i] = trim($text[$i]);
-			if (utf8_strlen($text[$i]) < $this->config['fulltext_mysql_min_word_len'] || utf8_strlen($text[$i]) > $this->config['fulltext_mysql_max_word_len'])
-			{
-				unset($text[$i]);
-			}
-		}
-
-		return array_values($text);
-	}
-
-	/**
-	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	string		$fields				contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched)
-	* @param	string		$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
-	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
-	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
-	{
-		// No keywords? No posts
-		if (!$this->search_query)
-		{
-			return false;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			implode(', ', $this->split_words),
-			$type,
-			$fields,
-			$terms,
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			$post_visibility,
-			implode(',', $author_ary)
-		)));
-
-		if ($start < 0)
-		{
-			$start = 0;
-		}
-
-		// try reading the results from cache
-		$result_count = 0;
-		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
-		{
-			return $result_count;
-		}
-
-		$id_ary = array();
-
-		$join_topic = ($type == 'posts') ? false : true;
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-		$sql_sort_table = $sql_sort_join = '';
-
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster ';
-			break;
-
-			case 't':
-				$join_topic = true;
-			break;
-
-			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
-			break;
-		}
-
-		// Build some display specific sql strings
-		switch ($fields)
-		{
-			case 'titleonly':
-				$sql_match = 'p.post_subject';
-				$sql_match_where = ' AND p.post_id = t.topic_first_post_id';
-				$join_topic = true;
-			break;
-
-			case 'msgonly':
-				$sql_match = 'p.post_text';
-				$sql_match_where = '';
-			break;
-
-			case 'firstpost':
-				$sql_match = 'p.post_subject, p.post_text';
-				$sql_match_where = ' AND p.post_id = t.topic_first_post_id';
-				$join_topic = true;
-			break;
-
-			default:
-				$sql_match = 'p.post_subject, p.post_text';
-				$sql_match_where = '';
-			break;
-		}
-
-		$sql_select			= (!$result_count) ? 'SQL_CALC_FOUND_ROWS ' : '';
-		$sql_select			= ($type == 'posts') ? $sql_select . 'p.post_id' : 'DISTINCT ' . $sql_select . 't.topic_id';
-		$sql_from			= ($join_topic) ? TOPICS_TABLE . ' t, ' : '';
-		$field				= ($type == 'posts') ? 'post_id' : 'topic_id';
-		if (sizeof($author_ary) && $author_name)
-		{
-			// first one matches post of registered users, second one guests and deleted users
-			$sql_author = ' AND (' . $this->db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
-		}
-		else if (sizeof($author_ary))
-		{
-			$sql_author = ' AND ' . $this->db->sql_in_set('p.poster_id', $author_ary);
-		}
-		else
-		{
-			$sql_author = '';
-		}
-
-		$sql_where_options = $sql_sort_join;
-		$sql_where_options .= ($topic_id) ? ' AND p.topic_id = ' . $topic_id : '';
-		$sql_where_options .= ($join_topic) ? ' AND t.topic_id = p.topic_id' : '';
-		$sql_where_options .= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_where_options .= ' AND ' . $post_visibility;
-		$sql_where_options .= $sql_author;
-		$sql_where_options .= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_where_options .= $sql_match_where;
-
-		$sql = "SELECT $sql_select
-			FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
-			WHERE MATCH ($sql_match) AGAINST ('" . $this->db->sql_escape(htmlspecialchars_decode($this->search_query)) . "' IN BOOLEAN MODE)
-				$sql_where_options
-			ORDER BY $sql_sort";
-		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$id_ary[] = (int) $row[$field];
-		}
-		$this->db->sql_freeresult($result);
-
-		$id_ary = array_unique($id_ary);
-
-		// if the total result count is not cached yet, retrieve it from the db
-		if (!$result_count)
-		{
-			$sql_found_rows = 'SELECT FOUND_ROWS() as result_count';
-			$result = $this->db->sql_query($sql_found_rows);
-			$result_count = (int) $this->db->sql_fetchfield('result_count');
-			$this->db->sql_freeresult($result);
-
-			if (!$result_count)
-			{
-				return false;
-			}
-		}
-
-		if ($start >= $result_count)
-		{
-			$start = floor(($result_count - 1) / $per_page) * $per_page;
-
-			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$id_ary[] = (int) $row[$field];
-			}
-			$this->db->sql_freeresult($result);
-
-			$id_ary = array_unique($id_ary);
-		}
-
-		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
-		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
-		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-
-		return $result_count;
-	}
-
-	/**
-	* Performs a search on an author's posts without caring about message contents. Depends on display specific params
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	boolean		$firstpost_only		if true, only topic starting posts will be considered
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
-	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		$author_ary			an array of author ids
-	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*/
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
-	{
-		// No author? No posts
-		if (!sizeof($author_ary))
-		{
-			return 0;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			'',
-			$type,
-			($firstpost_only) ? 'firstpost' : '',
-			'',
-			'',
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			$post_visibility,
-			implode(',', $author_ary),
-			$author_name,
-		)));
-
-		if ($start < 0)
-		{
-			$start = 0;
-		}
-
-		// try reading the results from cache
-		$result_count = 0;
-		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
-		{
-			return $result_count;
-		}
-
-		$id_ary = array();
-
-		// Create some display specific sql strings
-		if ($author_name)
-		{
-			// first one matches post of registered users, second one guests and deleted users
-			$sql_author = '(' . $this->db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
-		}
-		else
-		{
-			$sql_author = $this->db->sql_in_set('p.poster_id', $author_ary);
-		}
-		$sql_fora		= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
-		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : '';
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-		$sql_sort_table = $sql_sort_join = '';
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster ';
-			break;
-
-			case 't':
-				$sql_sort_table	= ($type == 'posts' && !$firstpost_only) ? TOPICS_TABLE . ' t, ' : '';
-				$sql_sort_join	= ($type == 'posts' && !$firstpost_only) ? ' AND t.topic_id = p.topic_id ' : '';
-			break;
-
-			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
-			break;
-		}
-
-		$m_approve_fid_sql = ' AND ' . $post_visibility;
-
-		// If the cache was completely empty count the results
-		$calc_results = ($result_count) ? '' : 'SQL_CALC_FOUND_ROWS ';
-
-		// Build the query for really selecting the post_ids
-		if ($type == 'posts')
-		{
-			$sql = "SELECT {$calc_results}p.post_id
-				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					$sql_sort_join
-					$sql_time
-				ORDER BY $sql_sort";
-			$field = 'post_id';
-		}
-		else
-		{
-			$sql = "SELECT {$calc_results}t.topic_id
-				FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					AND t.topic_id = p.topic_id
-					$sql_sort_join
-					$sql_time
-				GROUP BY t.topic_id
-				ORDER BY $sql_sort";
-			$field = 'topic_id';
-		}
-
-		// Only read one block of posts from the db and then cache it
-		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$id_ary[] = (int) $row[$field];
-		}
-		$this->db->sql_freeresult($result);
-
-		// retrieve the total result count if needed
-		if (!$result_count)
-		{
-			$sql_found_rows = 'SELECT FOUND_ROWS() as result_count';
-			$result = $this->db->sql_query($sql_found_rows);
-			$result_count = (int) $this->db->sql_fetchfield('result_count');
-			$this->db->sql_freeresult($result);
-
-			if (!$result_count)
-			{
-				return false;
-			}
-		}
-
-		if ($start >= $result_count)
-		{
-			$start = floor(($result_count - 1) / $per_page) * $per_page;
-
-			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$id_ary[] = (int) $row[$field];
-			}
-			$this->db->sql_freeresult($result);
-
-			$id_ary = array_unique($id_ary);
-		}
-
-		if (sizeof($id_ary))
-		{
-			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
-			$id_ary = array_slice($id_ary, 0, $per_page);
-
-			return $result_count;
-		}
-		return false;
-	}
-
-	/**
-	* Destroys cached search results, that contained one of the new words in a post so the results won't be outdated
-	*
-	* @param	string		$mode contains the post mode: edit, post, reply, quote ...
-	* @param	int			$post_id	contains the post id of the post to index
-	* @param	string		$message	contains the post text of the post
-	* @param	string		$subject	contains the subject of the post to index
-	* @param	int			$poster_id	contains the user id of the poster
-	* @param	int			$forum_id	contains the forum id of parent forum of the post
-	*/
-	public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
-	{
-		// Split old and new post/subject to obtain array of words
-		$split_text = $this->split_message($message);
-		$split_title = ($subject) ? $this->split_message($subject) : array();
-
-		$words = array_unique(array_merge($split_text, $split_title));
-
-		unset($split_text);
-		unset($split_title);
-
-		// destroy cached search results containing any of the words removed or added
-		$this->destroy_cache($words, array($poster_id));
-
-		unset($words);
-	}
-
-	/**
-	* Destroy cached results, that might be outdated after deleting a post
-	*/
-	public function index_remove($post_ids, $author_ids, $forum_ids)
-	{
-		$this->destroy_cache(array(), array_unique($author_ids));
-	}
-
-	/**
-	* Destroy old cache entries
-	*/
-	public function tidy()
-	{
-		// destroy too old cached search results
-		$this->destroy_cache(array());
-
-		set_config('search_last_gc', time(), true);
-	}
-
-	/**
-	* Create fulltext index
-	*
-	* @return string|bool error string is returned incase of errors otherwise false
-	*/
-	public function create_index($acp_module, $u_action)
-	{
-		// Make sure we can actually use MySQL with fulltext indexes
-		if ($error = $this->init())
-		{
-			return $error;
-		}
-
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		$alter = array();
-
-		if (!isset($this->stats['post_subject']))
-		{
-			if ($this->db->sql_layer == 'mysqli' || version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
-			{
-				$alter[] = 'MODIFY post_subject varchar(255) COLLATE utf8_unicode_ci DEFAULT \'\' NOT NULL';
-			}
-			else
-			{
-				$alter[] = 'MODIFY post_subject text NOT NULL';
-			}
-			$alter[] = 'ADD FULLTEXT (post_subject)';
-		}
-
-		if (!isset($this->stats['post_text']))
-		{
-			if ($this->db->sql_layer == 'mysqli' || version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
-			{
-				$alter[] = 'MODIFY post_text mediumtext COLLATE utf8_unicode_ci NOT NULL';
-			}
-			else
-			{
-				$alter[] = 'MODIFY post_text mediumtext NOT NULL';
-			}
-			$alter[] = 'ADD FULLTEXT (post_text)';
-		}
-
-		if (!isset($this->stats['post_content']))
-		{
-			$alter[] = 'ADD FULLTEXT post_content (post_subject, post_text)';
-		}
-
-		if (sizeof($alter))
-		{
-			$this->db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ' . implode(', ', $alter));
-		}
-
-		$this->db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
-
-		return false;
-	}
-
-	/**
-	* Drop fulltext index
-	*
-	* @return string|bool error string is returned incase of errors otherwise false
-	*/
-	public function delete_index($acp_module, $u_action)
-	{
-		// Make sure we can actually use MySQL with fulltext indexes
-		if ($error = $this->init())
-		{
-			return $error;
-		}
-
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		$alter = array();
-
-		if (isset($this->stats['post_subject']))
-		{
-			$alter[] = 'DROP INDEX post_subject';
-		}
-
-		if (isset($this->stats['post_text']))
-		{
-			$alter[] = 'DROP INDEX post_text';
-		}
-
-		if (isset($this->stats['post_content']))
-		{
-			$alter[] = 'DROP INDEX post_content';
-		}
-
-		if (sizeof($alter))
-		{
-			$this->db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ' . implode(', ', $alter));
-		}
-
-		$this->db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
-
-		return false;
-	}
-
-	/**
-	* Returns true if both FULLTEXT indexes exist
-	*/
-	public function index_created()
-	{
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return (isset($this->stats['post_text']) && isset($this->stats['post_subject']) && isset($this->stats['post_content'])) ? true : false;
-	}
-
-	/**
-	* Returns an associative array containing information about the indexes
-	*/
-	public function index_stats()
-	{
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return array(
-			$this->user->lang['FULLTEXT_MYSQL_TOTAL_POSTS']			=> ($this->index_created()) ? $this->stats['total_posts'] : 0,
-		);
-	}
-
-	/**
-	 * Computes the stats and store them in the $this->stats associative array
-	 */
-	protected function get_stats()
-	{
-		if (strpos($this->db->sql_layer, 'mysql') === false)
-		{
-			$this->stats = array();
-			return;
-		}
-
-		$sql = 'SHOW INDEX
-			FROM ' . POSTS_TABLE;
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			// deal with older MySQL versions which didn't use Index_type
-			$index_type = (isset($row['Index_type'])) ? $row['Index_type'] : $row['Comment'];
-
-			if ($index_type == 'FULLTEXT')
-			{
-				if ($row['Key_name'] == 'post_text')
-				{
-					$this->stats['post_text'] = $row;
-				}
-				else if ($row['Key_name'] == 'post_subject')
-				{
-					$this->stats['post_subject'] = $row;
-				}
-				else if ($row['Key_name'] == 'post_content')
-				{
-					$this->stats['post_content'] = $row;
-				}
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		$this->stats['total_posts'] = empty($this->stats) ? 0 : $this->db->get_estimated_row_count(POSTS_TABLE);
-	}
-
-	/**
-	* Display a note, that UTF-8 support is not available with certain versions of PHP
-	*
-	* @return associative array containing template and config variables
-	*/
-	public function acp()
-	{
-		$tpl = '
-		<dl>
-			<dt><label>' . $this->user->lang['MIN_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd>' . $this->config['fulltext_mysql_min_word_len'] . '</dd>
-		</dl>
-		<dl>
-			<dt><label>' . $this->user->lang['MAX_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd>' . $this->config['fulltext_mysql_max_word_len'] . '</dd>
-		</dl>
-		';
-
-		// These are fields required in the config table
-		return array(
-			'tpl'		=> $tpl,
-			'config'	=> array()
-		);
-	}
-}
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
deleted file mode 100644
index 730c3a6c2d..0000000000
--- a/phpBB/includes/search/fulltext_native.php
+++ /dev/null
@@ -1,1821 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* fulltext_native
-* phpBB's own db driven fulltext search, version 2
-* @package search
-*/
-class phpbb_search_fulltext_native extends phpbb_search_base
-{
-	/**
-	 * Associative array holding index stats
-	 * @var array
-	 */
-	protected $stats = array();
-
-	/**
-	 * Associative array stores the min and max word length to be searched
-	 * @var array
-	 */
-	protected $word_length = array();
-
-	/**
-	 * Contains tidied search query.
-	 * Operators are prefixed in search query and common words excluded
-	 * @var string
-	 */
-	protected $search_query;
-
-	/**
-	 * Contains common words.
-	 * Common words are words with length less/more than min/max length
-	 * @var array
-	 */
-	protected $common_words = array();
-
-	/**
-	 * Post ids of posts containing words that are to be included
-	 * @var array
-	 */
-	protected $must_contain_ids = array();
-
-	/**
-	 * Post ids of posts containing words that should not be included
-	 * @var array
-	 */
-	protected $must_not_contain_ids = array();
-
-	/**
-	 * Post ids of posts containing atleast one word that needs to be excluded
-	 * @var array
-	 */
-	protected $must_exclude_one_ids = array();
-
-	/**
-	 * Relative path to board root
-	 * @var string
-	 */
-	protected $phpbb_root_path;
-
-	/**
-	 * PHP Extension
-	 * @var string
-	 */
-	protected $php_ext;
-
-	/**
-	 * Config object
-	 * @var phpbb_config
-	 */
-	protected $config;
-
-	/**
-	 * Database connection
-	 * @var phpbb_db_driver
-	 */
-	protected $db;
-
-	/**
-	 * User object
-	 * @var phpbb_user
-	 */
-	protected $user;
-
-	/**
-	* Initialises the fulltext_native search backend with min/max word length and makes sure the UTF-8 normalizer is loaded
-	*
-	* @param	boolean|string	&$error	is passed by reference and should either be set to false on success or an error message on failure
-	*/
-	public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $phpEx;
-		$this->config = $config;
-		$this->db = $db;
-		$this->user = $user;
-
-		$this->word_length = array('min' => $this->config['fulltext_native_min_chars'], 'max' => $this->config['fulltext_native_max_chars']);
-
-		/**
-		* Load the UTF tools
-		*/
-		if (!class_exists('utf_normalizer'))
-		{
-			include($this->phpbb_root_path . 'includes/utf/utf_normalizer.' . $this->php_ext);
-		}
-		if (!function_exists('utf8_decode_ncr'))
-		{
-			include($this->phpbb_root_path . 'includes/utf/utf_tools.' . $this->php_ext);
-		}
-
-		$error = false;
-	}
-
-	/**
-	* Returns the name of this search backend to be displayed to administrators
-	*
-	* @return string Name
-	*/
-	public function get_name()
-	{
-		return 'phpBB Native Fulltext';
-	}
-
-	/**
-	 * Returns the search_query
-	 *
-	 * @return string search query
-	 */
-	public function get_search_query()
-	{
-		return $this->search_query;
-	}
-
-	/**
-	 * Returns the common_words array
-	 *
-	 * @return array common words that are ignored by search backend
-	 */
-	public function get_common_words()
-	{
-		return $this->common_words;
-	}
-
-	/**
-	 * Returns the word_length array
-	 *
-	 * @return array min and max word length for searching
-	 */
-	public function get_word_length()
-	{
-		return $this->word_length;
-	}
-
-	/**
-	* This function fills $this->search_query with the cleaned user search query
-	*
-	* If $terms is 'any' then the words will be extracted from the search query
-	* and combined with | inside brackets. They will afterwards be treated like
-	* an standard search query.
-	*
-	* Then it analyses the query and fills the internal arrays $must_not_contain_ids,
-	* $must_contain_ids and $must_exclude_one_ids which are later used by keyword_search()
-	*
-	* @param	string	$keywords	contains the search query string as entered by the user
-	* @param	string	$terms		is either 'all' (use search query as entered, default words to 'must be contained in post')
-	* 	or 'any' (find all posts containing at least one of the given words)
-	* @return	boolean				false if no valid keywords were found and otherwise true
-	*/
-	public function split_keywords($keywords, $terms)
-	{
-		$tokens = '+-|()*';
-
-		$keywords = trim($this->cleanup($keywords, $tokens));
-
-		// allow word|word|word without brackets
-		if ((strpos($keywords, ' ') === false) && (strpos($keywords, '|') !== false) && (strpos($keywords, '(') === false))
-		{
-			$keywords = '(' . $keywords . ')';
-		}
-
-		$open_bracket = $space = false;
-		for ($i = 0, $n = strlen($keywords); $i < $n; $i++)
-		{
-			if ($open_bracket !== false)
-			{
-				switch ($keywords[$i])
-				{
-					case ')':
-						if ($open_bracket + 1 == $i)
-						{
-							$keywords[$i - 1] = '|';
-							$keywords[$i] = '|';
-						}
-						$open_bracket = false;
-					break;
-					case '(':
-						$keywords[$i] = '|';
-					break;
-					case '+':
-					case '-':
-					case ' ':
-						$keywords[$i] = '|';
-					break;
-					case '*':
-						if ($i === 0 || ($keywords[$i - 1] !== '*' && strcspn($keywords[$i - 1], $tokens) === 0))
-						{
-							if ($i === $n - 1 || ($keywords[$i + 1] !== '*' && strcspn($keywords[$i + 1], $tokens) === 0))
-							{
-								$keywords = substr($keywords, 0, $i) . substr($keywords, $i + 1);
-							}
-						}
-					break;
-				}
-			}
-			else
-			{
-				switch ($keywords[$i])
-				{
-					case ')':
-						$keywords[$i] = ' ';
-					break;
-					case '(':
-						$open_bracket = $i;
-						$space = false;
-					break;
-					case '|':
-						$keywords[$i] = ' ';
-					break;
-					case '-':
-					case '+':
-						$space = $keywords[$i];
-					break;
-					case ' ':
-						if ($space !== false)
-						{
-							$keywords[$i] = $space;
-						}
-					break;
-					default:
-						$space = false;
-				}
-			}
-		}
-
-		if ($open_bracket)
-		{
-			$keywords .= ')';
-		}
-
-		$match = array(
-			'#  +#',
-			'#\|\|+#',
-			'#(\+|\-)(?:\+|\-)+#',
-			'#\(\|#',
-			'#\|\)#',
-		);
-		$replace = array(
-			' ',
-			'|',
-			'$1',
-			'(',
-			')',
-		);
-
-		$keywords = preg_replace($match, $replace, $keywords);
-		$num_keywords = sizeof(explode(' ', $keywords));
-
-		// We limit the number of allowed keywords to minimize load on the database
-		if ($this->config['max_num_search_keywords'] && $num_keywords > $this->config['max_num_search_keywords'])
-		{
-			trigger_error($this->user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', $this->config['max_num_search_keywords'], $num_keywords));
-		}
-
-		// $keywords input format: each word separated by a space, words in a bracket are not separated
-
-		// the user wants to search for any word, convert the search query
-		if ($terms == 'any')
-		{
-			$words = array();
-
-			preg_match_all('#([^\\s+\\-|()]+)(?:$|[\\s+\\-|()])#u', $keywords, $words);
-			if (sizeof($words[1]))
-			{
-				$keywords = '(' . implode('|', $words[1]) . ')';
-			}
-		}
-
-		// set the search_query which is shown to the user
-		$this->search_query = $keywords;
-
-		$exact_words = array();
-		preg_match_all('#([^\\s+\\-|*()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words);
-		$exact_words = $exact_words[1];
-
-		$common_ids = $words = array();
-
-		if (sizeof($exact_words))
-		{
-			$sql = 'SELECT word_id, word_text, word_common
-				FROM ' . SEARCH_WORDLIST_TABLE . '
-				WHERE ' . $this->db->sql_in_set('word_text', $exact_words) . '
-				ORDER BY word_count ASC';
-			$result = $this->db->sql_query($sql);
-
-			// store an array of words and ids, remove common words
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if ($row['word_common'])
-				{
-					$this->common_words[] = $row['word_text'];
-					$common_ids[$row['word_text']] = (int) $row['word_id'];
-					continue;
-				}
-
-				$words[$row['word_text']] = (int) $row['word_id'];
-			}
-			$this->db->sql_freeresult($result);
-		}
-		unset($exact_words);
-
-		// now analyse the search query, first split it using the spaces
-		$query = explode(' ', $keywords);
-
-		$this->must_contain_ids = array();
-		$this->must_not_contain_ids = array();
-		$this->must_exclude_one_ids = array();
-
-		$mode = '';
-		$ignore_no_id = true;
-
-		foreach ($query as $word)
-		{
-			if (empty($word))
-			{
-				continue;
-			}
-
-			// words which should not be included
-			if ($word[0] == '-')
-			{
-				$word = substr($word, 1);
-
-				// a group of which at least one may not be in the resulting posts
-				if ($word[0] == '(')
-				{
-					$word = array_unique(explode('|', substr($word, 1, -1)));
-					$mode = 'must_exclude_one';
-				}
-				// one word which should not be in the resulting posts
-				else
-				{
-					$mode = 'must_not_contain';
-				}
-				$ignore_no_id = true;
-			}
-			// words which have to be included
-			else
-			{
-				// no prefix is the same as a +prefix
-				if ($word[0] == '+')
-				{
-					$word = substr($word, 1);
-				}
-
-				// a group of words of which at least one word should be in every resulting post
-				if ($word[0] == '(')
-				{
-					$word = array_unique(explode('|', substr($word, 1, -1)));
-				}
-				$ignore_no_id = false;
-				$mode = 'must_contain';
-			}
-
-			if (empty($word))
-			{
-				continue;
-			}
-
-			// if this is an array of words then retrieve an id for each
-			if (is_array($word))
-			{
-				$non_common_words = array();
-				$id_words = array();
-				foreach ($word as $i => $word_part)
-				{
-					if (strpos($word_part, '*') !== false)
-					{
-						$id_words[] = '\'' . $this->db->sql_escape(str_replace('*', '%', $word_part)) . '\'';
-						$non_common_words[] = $word_part;
-					}
-					else if (isset($words[$word_part]))
-					{
-						$id_words[] = $words[$word_part];
-						$non_common_words[] = $word_part;
-					}
-					else
-					{
-						$len = utf8_strlen($word_part);
-						if ($len < $this->word_length['min'] || $len > $this->word_length['max'])
-						{
-							$this->common_words[] = $word_part;
-						}
-					}
-				}
-				if (sizeof($id_words))
-				{
-					sort($id_words);
-					if (sizeof($id_words) > 1)
-					{
-						$this->{$mode . '_ids'}[] = $id_words;
-					}
-					else
-					{
-						$mode = ($mode == 'must_exclude_one') ? 'must_not_contain' : $mode;
-						$this->{$mode . '_ids'}[] = $id_words[0];
-					}
-				}
-				// throw an error if we shall not ignore unexistant words
-				else if (!$ignore_no_id && sizeof($non_common_words))
-				{
-					trigger_error(sprintf($user->lang['WORDS_IN_NO_POST'], implode($user->lang['COMMA_SEPARATOR'], $non_common_words)));
-				}
-				unset($non_common_words);
-			}
-			// else we only need one id
-			else if (($wildcard = strpos($word, '*') !== false) || isset($words[$word]))
-			{
-				if ($wildcard)
-				{
-					$len = utf8_strlen(str_replace('*', '', $word));
-					if ($len >= $this->word_length['min'] && $len <= $this->word_length['max'])
-					{
-						$this->{$mode . '_ids'}[] = '\'' . $this->db->sql_escape(str_replace('*', '%', $word)) . '\'';
-					}
-					else
-					{
-						$this->common_words[] = $word;
-					}
-				}
-				else
-				{
-					$this->{$mode . '_ids'}[] = $words[$word];
-				}
-			}
-			// throw an error if we shall not ignore unexistant words
-			else if (!$ignore_no_id)
-			{
-				if (!isset($common_ids[$word]))
-				{
-					$len = utf8_strlen($word);
-					if ($len >= $this->word_length['min'] && $len <= $this->word_length['max'])
-					{
-						trigger_error(sprintf($this->user->lang['WORD_IN_NO_POST'], $word));
-					}
-					else
-					{
-						$this->common_words[] = $word;
-					}
-				}
-			}
-			else
-			{
-				$len = utf8_strlen($word);
-				if ($len < $this->word_length['min'] || $len > $this->word_length['max'])
-				{
-					$this->common_words[] = $word;
-				}
-			}
-		}
-
-		// we can't search for negatives only
-		if (!sizeof($this->must_contain_ids))
-		{
-			return false;
-		}
-
-		if (!empty($this->search_query))
-		{
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	string		$fields				contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched)
-	* @param	string		$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
-	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
-	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
-	{
-		// No keywords? No posts.
-		if (empty($this->search_query))
-		{
-			return false;
-		}
-
-		$must_contain_ids = $this->must_contain_ids;
-		$must_not_contain_ids = $this->must_not_contain_ids;
-		$must_exclude_one_ids = $this->must_exclude_one_ids;
-
-		sort($must_contain_ids);
-		sort($must_not_contain_ids);
-		sort($must_exclude_one_ids);
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			serialize($must_contain_ids),
-			serialize($must_not_contain_ids),
-			serialize($must_exclude_one_ids),
-			$type,
-			$fields,
-			$terms,
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			$post_visibility,
-			implode(',', $author_ary),
-			$author_name,
-		)));
-
-		// try reading the results from cache
-		$total_results = 0;
-		if ($this->obtain_ids($search_key, $total_results, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
-		{
-			return $total_results;
-		}
-
-		$id_ary = array();
-
-		$sql_where = array();
-		$group_by = false;
-		$m_num = 0;
-		$w_num = 0;
-
-		$sql_array = array(
-			'SELECT'	=> ($type == 'posts') ? 'p.post_id' : 'p.topic_id',
-			'FROM'		=> array(
-				SEARCH_WORDMATCH_TABLE	=> array(),
-				SEARCH_WORDLIST_TABLE	=> array(),
-			),
-			'LEFT_JOIN' => array(array(
-				'FROM'	=> array(POSTS_TABLE => 'p'),
-				'ON'	=> 'm0.post_id = p.post_id',
-			)),
-		);
-
-		$title_match = '';
-		$left_join_topics = false;
-		$group_by = true;
-		// Build some display specific sql strings
-		switch ($fields)
-		{
-			case 'titleonly':
-				$title_match = 'title_match = 1';
-				$group_by = false;
-			// no break
-			case 'firstpost':
-				$left_join_topics = true;
-				$sql_where[] = 'p.post_id = t.topic_first_post_id';
-			break;
-
-			case 'msgonly':
-				$title_match = 'title_match = 0';
-				$group_by = false;
-			break;
-		}
-
-		if ($type == 'topics')
-		{
-			$left_join_topics = true;
-			$group_by = true;
-		}
-
-		/**
-		* @todo Add a query optimizer (handle stuff like "+(4|3) +4")
-		*/
-
-		foreach ($this->must_contain_ids as $subquery)
-		{
-			if (is_array($subquery))
-			{
-				$group_by = true;
-
-				$word_id_sql = array();
-				$word_ids = array();
-				foreach ($subquery as $id)
-				{
-					if (is_string($id))
-					{
-						$sql_array['LEFT_JOIN'][] = array(
-							'FROM'	=> array(SEARCH_WORDLIST_TABLE => 'w' . $w_num),
-							'ON'	=> "w$w_num.word_text LIKE $id"
-						);
-						$word_ids[] = "w$w_num.word_id";
-
-						$w_num++;
-					}
-					else
-					{
-						$word_ids[] = $id;
-					}
-				}
-
-				$sql_where[] = $this->db->sql_in_set("m$m_num.word_id", $word_ids);
-
-				unset($word_id_sql);
-				unset($word_ids);
-			}
-			else if (is_string($subquery))
-			{
-				$sql_array['FROM'][SEARCH_WORDLIST_TABLE][] = 'w' . $w_num;
-
-				$sql_where[] = "w$w_num.word_text LIKE $subquery";
-				$sql_where[] = "m$m_num.word_id = w$w_num.word_id";
-
-				$group_by = true;
-				$w_num++;
-			}
-			else
-			{
-				$sql_where[] = "m$m_num.word_id = $subquery";
-			}
-
-			$sql_array['FROM'][SEARCH_WORDMATCH_TABLE][] = 'm' . $m_num;
-
-			if ($title_match)
-			{
-				$sql_where[] = "m$m_num.$title_match";
-			}
-
-			if ($m_num != 0)
-			{
-				$sql_where[] = "m$m_num.post_id = m0.post_id";
-			}
-			$m_num++;
-		}
-
-		foreach ($this->must_not_contain_ids as $key => $subquery)
-		{
-			if (is_string($subquery))
-			{
-				$sql_array['LEFT_JOIN'][] = array(
-					'FROM'	=> array(SEARCH_WORDLIST_TABLE => 'w' . $w_num),
-					'ON'	=> "w$w_num.word_text LIKE $subquery"
-				);
-
-				$this->must_not_contain_ids[$key] = "w$w_num.word_id";
-
-				$group_by = true;
-				$w_num++;
-			}
-		}
-
-		if (sizeof($this->must_not_contain_ids))
-		{
-			$sql_array['LEFT_JOIN'][] = array(
-				'FROM'	=> array(SEARCH_WORDMATCH_TABLE => 'm' . $m_num),
-				'ON'	=> $this->db->sql_in_set("m$m_num.word_id", $this->must_not_contain_ids) . (($title_match) ? " AND m$m_num.$title_match" : '') . " AND m$m_num.post_id = m0.post_id"
-			);
-
-			$sql_where[] = "m$m_num.word_id IS NULL";
-			$m_num++;
-		}
-
-		foreach ($this->must_exclude_one_ids as $ids)
-		{
-			$is_null_joins = array();
-			foreach ($ids as $id)
-			{
-				if (is_string($id))
-				{
-					$sql_array['LEFT_JOIN'][] = array(
-						'FROM'	=> array(SEARCH_WORDLIST_TABLE => 'w' . $w_num),
-						'ON'	=> "w$w_num.word_text LIKE $id"
-					);
-					$id = "w$w_num.word_id";
-
-					$group_by = true;
-					$w_num++;
-				}
-
-				$sql_array['LEFT_JOIN'][] = array(
-					'FROM'	=> array(SEARCH_WORDMATCH_TABLE => 'm' . $m_num),
-					'ON'	=> "m$m_num.word_id = $id AND m$m_num.post_id = m0.post_id" . (($title_match) ? " AND m$m_num.$title_match" : '')
-				);
-				$is_null_joins[] = "m$m_num.word_id IS NULL";
-
-				$m_num++;
-			}
-			$sql_where[] = '(' . implode(' OR ', $is_null_joins) . ')';
-		}
-
-		$sql_where[] = $post_visibility;
-
-		if ($topic_id)
-		{
-			$sql_where[] = 'p.topic_id = ' . $topic_id;
-		}
-
-		if (sizeof($author_ary))
-		{
-			if ($author_name)
-			{
-				// first one matches post of registered users, second one guests and deleted users
-				$sql_author = '(' . $this->db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
-			}
-			else
-			{
-				$sql_author = $this->db->sql_in_set('p.poster_id', $author_ary);
-			}
-			$sql_where[] = $sql_author;
-		}
-
-		if (sizeof($ex_fid_ary))
-		{
-			$sql_where[] = $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true);
-		}
-
-		if ($sort_days)
-		{
-			$sql_where[] = 'p.post_time >= ' . (time() - ($sort_days * 86400));
-		}
-
-		$sql_array['WHERE'] = implode(' AND ', $sql_where);
-
-		$is_mysql = false;
-		// if the total result count is not cached yet, retrieve it from the db
-		if (!$total_results)
-		{
-			$sql = '';
-			$sql_array_count = $sql_array;
-
-			if ($left_join_topics)
-			{
-				$sql_array_count['LEFT_JOIN'][] = array(
-					'FROM'	=> array(TOPICS_TABLE => 't'),
-					'ON'	=> 'p.topic_id = t.topic_id'
-				);
-			}
-
-			switch ($this->db->sql_layer)
-			{
-				case 'mysql4':
-				case 'mysqli':
-
-					// 3.x does not support SQL_CALC_FOUND_ROWS
-					// $sql_array['SELECT'] = 'SQL_CALC_FOUND_ROWS ' . $sql_array['SELECT'];
-					$is_mysql = true;
-
-				break;
-
-				case 'sqlite':
-					$sql_array_count['SELECT'] = ($type == 'posts') ? 'DISTINCT p.post_id' : 'DISTINCT p.topic_id';
-					$sql = 'SELECT COUNT(' . (($type == 'posts') ? 'post_id' : 'topic_id') . ') as total_results
-							FROM (' . $this->db->sql_build_query('SELECT', $sql_array_count) . ')';
-
-				// no break
-
-				default:
-					$sql_array_count['SELECT'] = ($type == 'posts') ? 'COUNT(DISTINCT p.post_id) AS total_results' : 'COUNT(DISTINCT p.topic_id) AS total_results';
-					$sql = (!$sql) ? $this->db->sql_build_query('SELECT', $sql_array_count) : $sql;
-
-					$result = $this->db->sql_query($sql);
-					$total_results = (int) $this->db->sql_fetchfield('total_results');
-					$this->db->sql_freeresult($result);
-
-					if (!$total_results)
-					{
-						return false;
-					}
-				break;
-			}
-
-			unset($sql_array_count, $sql);
-		}
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_array['FROM'][USERS_TABLE] = 'u';
-				$sql_where[] = 'u.user_id = p.poster_id ';
-			break;
-
-			case 't':
-				$left_join_topics = true;
-			break;
-
-			case 'f':
-				$sql_array['FROM'][FORUMS_TABLE] = 'f';
-				$sql_where[] = 'f.forum_id = p.forum_id';
-			break;
-		}
-
-		if ($left_join_topics)
-		{
-			$sql_array['LEFT_JOIN'][] = array(
-				'FROM'	=> array(TOPICS_TABLE => 't'),
-				'ON'	=> 'p.topic_id = t.topic_id'
-			);
-		}
-
-		$sql_array['WHERE'] = implode(' AND ', $sql_where);
-		$sql_array['GROUP_BY'] = ($group_by) ? (($type == 'posts') ? 'p.post_id' : 'p.topic_id') . ', ' . $sort_by_sql[$sort_key] : '';
-		$sql_array['ORDER_BY'] = $sql_sort;
-
-		unset($sql_where, $sql_sort, $group_by);
-
-		$sql = $this->db->sql_build_query('SELECT', $sql_array);
-		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$id_ary[] = (int) $row[(($type == 'posts') ? 'post_id' : 'topic_id')];
-		}
-		$this->db->sql_freeresult($result);
-
-
-		// if we use mysql and the total result count is not cached yet, retrieve it from the db
-		if (!$total_results && $is_mysql)
-		{
-			// Count rows for the executed queries. Replace $select within $sql with SQL_CALC_FOUND_ROWS, and run it
-			$sql_array_copy = $sql_array;
-			$sql_array_copy['SELECT'] = 'SQL_CALC_FOUND_ROWS p.post_id ';
-
-			$sql_calc = $this->db->sql_build_query('SELECT', $sql_array_copy);
-			unset($sql_array_copy);
-
-			$this->db->sql_query($sql_calc);
-			$this->db->sql_freeresult($result);
-
-			$sql_count = 'SELECT FOUND_ROWS() as total_results';
-			$result = $this->db->sql_query($sql_count);
-			$total_results = (int) $this->db->sql_fetchfield('total_results');
-			$this->db->sql_freeresult($result);
-
-			if (!$total_results)
-			{
-				return false;
-			}
-		}
-
-		if ($start >= $total_results)
-		{
-			$start = floor(($total_results - 1) / $per_page) * $per_page;
-
-			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$id_ary[] = (int) $row[(($type == 'posts') ? 'post_id' : 'topic_id')];
-			}
-			$this->db->sql_freeresult($result);
-
-		}
-
-		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
-		$this->save_ids($search_key, $this->search_query, $author_ary, $total_results, $id_ary, $start, $sort_dir);
-		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-
-		return $total_results;
-	}
-
-	/**
-	* Performs a search on an author's posts without caring about message contents. Depends on display specific params
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	boolean		$firstpost_only		if true, only topic starting posts will be considered
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
-	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		$author_ary			an array of author ids
-	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*/
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
-	{
-		// No author? No posts
-		if (!sizeof($author_ary))
-		{
-			return 0;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			'',
-			$type,
-			($firstpost_only) ? 'firstpost' : '',
-			'',
-			'',
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			$post_visibility,
-			implode(',', $author_ary),
-			$author_name,
-		)));
-
-		// try reading the results from cache
-		$total_results = 0;
-		if ($this->obtain_ids($search_key, $total_results, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
-		{
-			return $total_results;
-		}
-
-		$id_ary = array();
-
-		// Create some display specific sql strings
-		if ($author_name)
-		{
-			// first one matches post of registered users, second one guests and deleted users
-			$sql_author = '(' . $this->db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
-		}
-		else
-		{
-			$sql_author = $this->db->sql_in_set('p.poster_id', $author_ary);
-		}
-		$sql_fora		= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
-		$sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : '';
-		$post_visibility = ($post_visibility) ? ' AND ' . $post_visibility : '';
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-		$sql_sort_table = $sql_sort_join = '';
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ' AND u.user_id = p.poster_id ';
-			break;
-
-			case 't':
-				$sql_sort_table	= ($type == 'posts' && !$firstpost_only) ? TOPICS_TABLE . ' t, ' : '';
-				$sql_sort_join	= ($type == 'posts' && !$firstpost_only) ? ' AND t.topic_id = p.topic_id ' : '';
-			break;
-
-			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
-			break;
-		}
-
-		$select = ($type == 'posts') ? 'p.post_id' : 't.topic_id';
-		$is_mysql = false;
-
-		// If the cache was completely empty count the results
-		if (!$total_results)
-		{
-			switch ($this->db->sql_layer)
-			{
-				case 'mysql4':
-				case 'mysqli':
-//					$select = 'SQL_CALC_FOUND_ROWS ' . $select;
-					$is_mysql = true;
-				break;
-
-				default:
-					if ($type == 'posts')
-					{
-						$sql = 'SELECT COUNT(p.post_id) as total_results
-							FROM ' . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
-							WHERE $sql_author
-								$sql_topic_id
-								$sql_firstpost
-								$post_visibility
-								$sql_fora
-								$sql_time";
-					}
-					else
-					{
-						if ($this->db->sql_layer == 'sqlite')
-						{
-							$sql = 'SELECT COUNT(topic_id) as total_results
-								FROM (SELECT DISTINCT t.topic_id';
-						}
-						else
-						{
-							$sql = 'SELECT COUNT(DISTINCT t.topic_id) as total_results';
-						}
-
-						$sql .= ' FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-							WHERE $sql_author
-								$sql_topic_id
-								$sql_firstpost
-								$post_visibility
-								$sql_fora
-								AND t.topic_id = p.topic_id
-								$sql_time" . (($this->db->sql_layer == 'sqlite') ? ')' : '');
-					}
-					$result = $this->db->sql_query($sql);
-
-					$total_results = (int) $this->db->sql_fetchfield('total_results');
-					$this->db->sql_freeresult($result);
-
-					if (!$total_results)
-					{
-						return false;
-					}
-				break;
-			}
-		}
-
-		// Build the query for really selecting the post_ids
-		if ($type == 'posts')
-		{
-			$sql = "SELECT $select
-				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t' : '') . "
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$post_visibility
-					$sql_fora
-					$sql_sort_join
-					$sql_time
-				ORDER BY $sql_sort";
-			$field = 'post_id';
-		}
-		else
-		{
-			$sql = "SELECT $select
-				FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$post_visibility
-					$sql_fora
-					AND t.topic_id = p.topic_id
-					$sql_sort_join
-					$sql_time
-				GROUP BY t.topic_id, " . $sort_by_sql[$sort_key] . '
-				ORDER BY ' . $sql_sort;
-			$field = 'topic_id';
-		}
-
-		// Only read one block of posts from the db and then cache it
-		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$id_ary[] = (int) $row[$field];
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!$total_results && $is_mysql)
-		{
-			// Count rows for the executed queries. Replace $select within $sql with SQL_CALC_FOUND_ROWS, and run it.
-			$sql_calc = str_replace('SELECT ' . $select, 'SELECT DISTINCT SQL_CALC_FOUND_ROWS p.post_id', $sql);
-
-			$this->db->sql_query($sql_calc);
-			$this->db->sql_freeresult($result);
-
-			$sql_count = 'SELECT FOUND_ROWS() as total_results';
-			$result = $this->db->sql_query($sql_count);
-			$total_results = (int) $this->db->sql_fetchfield('total_results');
-			$this->db->sql_freeresult($result);
-
-			if (!$total_results)
-			{
-				return false;
-			}
-		}
-
-		if ($start >= $total_results)
-		{
-			$start = floor(($total_results - 1) / $per_page) * $per_page;
-
-			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$id_ary[] = (int) $row[$field];
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		if (sizeof($id_ary))
-		{
-			$this->save_ids($search_key, '', $author_ary, $total_results, $id_ary, $start, $sort_dir);
-			$id_ary = array_slice($id_ary, 0, $per_page);
-
-			return $total_results;
-		}
-		return false;
-	}
-
-	/**
-	* Split a text into words of a given length
-	*
-	* The text is converted to UTF-8, cleaned up, and split. Then, words that
-	* conform to the defined length range are returned in an array.
-	*
-	* NOTE: duplicates are NOT removed from the return array
-	*
-	* @param	string	$text	Text to split, encoded in UTF-8
-	* @return	array			Array of UTF-8 words
-	*/
-	public function split_message($text)
-	{
-		$match = $words = array();
-
-		/**
-		* Taken from the original code
-		*/
-		// Do not index code
-		$match[] = '#\[code(?:=.*?)?(\:?[0-9a-z]{5,})\].*?\[\/code(\:?[0-9a-z]{5,})\]#is';
-		// BBcode
-		$match[] = '#\[\/?[a-z0-9\*\+\-]+(?:=.*?)?(?::[a-z])?(\:?[0-9a-z]{5,})\]#';
-
-		$min = $this->word_length['min'];
-		$max = $this->word_length['max'];
-
-		$isset_min = $min - 1;
-
-		/**
-		* Clean up the string, remove HTML tags, remove BBCodes
-		*/
-		$word = strtok($this->cleanup(preg_replace($match, ' ', strip_tags($text)), -1), ' ');
-
-		while (strlen($word))
-		{
-			if (strlen($word) > 255 || strlen($word) <= $isset_min)
-			{
-				/**
-				* Words longer than 255 bytes are ignored. This will have to be
-				* changed whenever we change the length of search_wordlist.word_text
-				*
-				* Words shorter than $isset_min bytes are ignored, too
-				*/
-				$word = strtok(' ');
-				continue;
-			}
-
-			$len = utf8_strlen($word);
-
-			/**
-			* Test whether the word is too short to be indexed.
-			*
-			* Note that this limit does NOT apply to CJK and Hangul
-			*/
-			if ($len < $min)
-			{
-				/**
-				* Note: this could be optimized. If the codepoint is lower than Hangul's range
-				* we know that it will also be lower than CJK ranges
-				*/
-				if ((strncmp($word, UTF8_HANGUL_FIRST, 3) < 0 || strncmp($word, UTF8_HANGUL_LAST, 3) > 0)
-				 && (strncmp($word, UTF8_CJK_FIRST, 3) < 0 || strncmp($word, UTF8_CJK_LAST, 3) > 0)
-				 && (strncmp($word, UTF8_CJK_B_FIRST, 4) < 0 || strncmp($word, UTF8_CJK_B_LAST, 4) > 0))
-				{
-					$word = strtok(' ');
-					continue;
-				}
-			}
-
-			$words[] = $word;
-			$word = strtok(' ');
-		}
-
-		return $words;
-	}
-
-	/**
-	* Updates wordlist and wordmatch tables when a message is posted or changed
-	*
-	* @param	string	$mode		Contains the post mode: edit, post, reply, quote
-	* @param	int		$post_id	The id of the post which is modified/created
-	* @param	string	&$message	New or updated post content
-	* @param	string	&$subject	New or updated post subject
-	* @param	int		$poster_id	Post author's user id
-	* @param	int		$forum_id	The id of the forum in which the post is located
-	*/
-	public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
-	{
-		if (!$this->config['fulltext_native_load_upd'])
-		{
-			/**
-			* The search indexer is disabled, return
-			*/
-			return;
-		}
-
-		// Split old and new post/subject to obtain array of 'words'
-		$split_text = $this->split_message($message);
-		$split_title = $this->split_message($subject);
-
-		$cur_words = array('post' => array(), 'title' => array());
-
-		$words = array();
-		if ($mode == 'edit')
-		{
-			$words['add']['post'] = array();
-			$words['add']['title'] = array();
-			$words['del']['post'] = array();
-			$words['del']['title'] = array();
-
-			$sql = 'SELECT w.word_id, w.word_text, m.title_match
-				FROM ' . SEARCH_WORDLIST_TABLE . ' w, ' . SEARCH_WORDMATCH_TABLE . " m
-				WHERE m.post_id = $post_id
-					AND w.word_id = m.word_id";
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$which = ($row['title_match']) ? 'title' : 'post';
-				$cur_words[$which][$row['word_text']] = $row['word_id'];
-			}
-			$this->db->sql_freeresult($result);
-
-			$words['add']['post'] = array_diff($split_text, array_keys($cur_words['post']));
-			$words['add']['title'] = array_diff($split_title, array_keys($cur_words['title']));
-			$words['del']['post'] = array_diff(array_keys($cur_words['post']), $split_text);
-			$words['del']['title'] = array_diff(array_keys($cur_words['title']), $split_title);
-		}
-		else
-		{
-			$words['add']['post'] = $split_text;
-			$words['add']['title'] = $split_title;
-			$words['del']['post'] = array();
-			$words['del']['title'] = array();
-		}
-		unset($split_text);
-		unset($split_title);
-
-		// Get unique words from the above arrays
-		$unique_add_words = array_unique(array_merge($words['add']['post'], $words['add']['title']));
-
-		// We now have unique arrays of all words to be added and removed and
-		// individual arrays of added and removed words for text and title. What
-		// we need to do now is add the new words (if they don't already exist)
-		// and then add (or remove) matches between the words and this post
-		if (sizeof($unique_add_words))
-		{
-			$sql = 'SELECT word_id, word_text
-				FROM ' . SEARCH_WORDLIST_TABLE . '
-				WHERE ' . $this->db->sql_in_set('word_text', $unique_add_words);
-			$result = $this->db->sql_query($sql);
-
-			$word_ids = array();
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$word_ids[$row['word_text']] = $row['word_id'];
-			}
-			$this->db->sql_freeresult($result);
-			$new_words = array_diff($unique_add_words, array_keys($word_ids));
-
-			$this->db->sql_transaction('begin');
-			if (sizeof($new_words))
-			{
-				$sql_ary = array();
-
-				foreach ($new_words as $word)
-				{
-					$sql_ary[] = array('word_text' => (string) $word, 'word_count' => 0);
-				}
-				$this->db->sql_return_on_error(true);
-				$this->db->sql_multi_insert(SEARCH_WORDLIST_TABLE, $sql_ary);
-				$this->db->sql_return_on_error(false);
-			}
-			unset($new_words, $sql_ary);
-		}
-		else
-		{
-			$this->db->sql_transaction('begin');
-		}
-
-		// now update the search match table, remove links to removed words and add links to new words
-		foreach ($words['del'] as $word_in => $word_ary)
-		{
-			$title_match = ($word_in == 'title') ? 1 : 0;
-
-			if (sizeof($word_ary))
-			{
-				$sql_in = array();
-				foreach ($word_ary as $word)
-				{
-					$sql_in[] = $cur_words[$word_in][$word];
-				}
-
-				$sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
-					WHERE ' . $this->db->sql_in_set('word_id', $sql_in) . '
-						AND post_id = ' . intval($post_id) . "
-						AND title_match = $title_match";
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count - 1
-					WHERE ' . $this->db->sql_in_set('word_id', $sql_in) . '
-						AND word_count > 0';
-				$this->db->sql_query($sql);
-
-				unset($sql_in);
-			}
-		}
-
-		$this->db->sql_return_on_error(true);
-		foreach ($words['add'] as $word_in => $word_ary)
-		{
-			$title_match = ($word_in == 'title') ? 1 : 0;
-
-			if (sizeof($word_ary))
-			{
-				$sql = 'INSERT INTO ' . SEARCH_WORDMATCH_TABLE . ' (post_id, word_id, title_match)
-					SELECT ' . (int) $post_id . ', word_id, ' . (int) $title_match . '
-					FROM ' . SEARCH_WORDLIST_TABLE . '
-					WHERE ' . $this->db->sql_in_set('word_text', $word_ary);
-				$this->db->sql_query($sql);
-
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count + 1
-					WHERE ' . $this->db->sql_in_set('word_text', $word_ary);
-				$this->db->sql_query($sql);
-			}
-		}
-		$this->db->sql_return_on_error(false);
-
-		$this->db->sql_transaction('commit');
-
-		// destroy cached search results containing any of the words removed or added
-		$this->destroy_cache(array_unique(array_merge($words['add']['post'], $words['add']['title'], $words['del']['post'], $words['del']['title'])), array($poster_id));
-
-		unset($unique_add_words);
-		unset($words);
-		unset($cur_words);
-	}
-
-	/**
-	* Removes entries from the wordmatch table for the specified post_ids
-	*/
-	public function index_remove($post_ids, $author_ids, $forum_ids)
-	{
-		if (sizeof($post_ids))
-		{
-			$sql = 'SELECT w.word_id, w.word_text, m.title_match
-				FROM ' . SEARCH_WORDMATCH_TABLE . ' m, ' . SEARCH_WORDLIST_TABLE . ' w
-				WHERE ' . $this->db->sql_in_set('m.post_id', $post_ids) . '
-					AND w.word_id = m.word_id';
-			$result = $this->db->sql_query($sql);
-
-			$message_word_ids = $title_word_ids = $word_texts = array();
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if ($row['title_match'])
-				{
-					$title_word_ids[] = $row['word_id'];
-				}
-				else
-				{
-					$message_word_ids[] = $row['word_id'];
-				}
-				$word_texts[] = $row['word_text'];
-			}
-			$this->db->sql_freeresult($result);
-
-			if (sizeof($title_word_ids))
-			{
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count - 1
-					WHERE ' . $this->db->sql_in_set('word_id', $title_word_ids) . '
-						AND word_count > 0';
-				$this->db->sql_query($sql);
-			}
-
-			if (sizeof($message_word_ids))
-			{
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count - 1
-					WHERE ' . $this->db->sql_in_set('word_id', $message_word_ids) . '
-						AND word_count > 0';
-				$this->db->sql_query($sql);
-			}
-
-			unset($title_word_ids);
-			unset($message_word_ids);
-
-			$sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
-				WHERE ' . $this->db->sql_in_set('post_id', $post_ids);
-			$this->db->sql_query($sql);
-		}
-
-		$this->destroy_cache(array_unique($word_texts), array_unique($author_ids));
-	}
-
-	/**
-	* Tidy up indexes: Tag 'common words' and remove
-	* words no longer referenced in the match table
-	*/
-	public function tidy()
-	{
-		// Is the fulltext indexer disabled? If yes then we need not
-		// carry on ... it's okay ... I know when I'm not wanted boo hoo
-		if (!$this->config['fulltext_native_load_upd'])
-		{
-			set_config('search_last_gc', time(), true);
-			return;
-		}
-
-		$destroy_cache_words = array();
-
-		// Remove common words
-		if ($this->config['num_posts'] >= 100 && $this->config['fulltext_native_common_thres'])
-		{
-			$common_threshold = ((double) $this->config['fulltext_native_common_thres']) / 100.0;
-			// First, get the IDs of common words
-			$sql = 'SELECT word_id, word_text
-				FROM ' . SEARCH_WORDLIST_TABLE . '
-				WHERE word_count > ' . floor($this->config['num_posts'] * $common_threshold) . '
-					OR word_common = 1';
-			$result = $this->db->sql_query($sql);
-
-			$sql_in = array();
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$sql_in[] = $row['word_id'];
-				$destroy_cache_words[] = $row['word_text'];
-			}
-			$this->db->sql_freeresult($result);
-
-			if (sizeof($sql_in))
-			{
-				// Flag the words
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_common = 1
-					WHERE ' . $this->db->sql_in_set('word_id', $sql_in);
-				$this->db->sql_query($sql);
-
-				// by setting search_last_gc to the new time here we make sure that if a user reloads because the
-				// following query takes too long, he won't run into it again
-				set_config('search_last_gc', time(), true);
-
-				// Delete the matches
-				$sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
-					WHERE ' . $this->db->sql_in_set('word_id', $sql_in);
-				$this->db->sql_query($sql);
-			}
-			unset($sql_in);
-		}
-
-		if (sizeof($destroy_cache_words))
-		{
-			// destroy cached search results containing any of the words that are now common or were removed
-			$this->destroy_cache(array_unique($destroy_cache_words));
-		}
-
-		set_config('search_last_gc', time(), true);
-	}
-
-	/**
-	* Deletes all words from the index
-	*/
-	public function delete_index($acp_module, $u_action)
-	{
-		switch ($this->db->sql_layer)
-		{
-			case 'sqlite':
-			case 'firebird':
-				$this->db->sql_query('DELETE FROM ' . SEARCH_WORDLIST_TABLE);
-				$this->db->sql_query('DELETE FROM ' . SEARCH_WORDMATCH_TABLE);
-				$this->db->sql_query('DELETE FROM ' . SEARCH_RESULTS_TABLE);
-			break;
-
-			default:
-				$this->db->sql_query('TRUNCATE TABLE ' . SEARCH_WORDLIST_TABLE);
-				$this->db->sql_query('TRUNCATE TABLE ' . SEARCH_WORDMATCH_TABLE);
-				$this->db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
-			break;
-		}
-	}
-
-	/**
-	* Returns true if both FULLTEXT indexes exist
-	*/
-	public function index_created()
-	{
-		if (!sizeof($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return ($this->stats['total_words'] && $this->stats['total_matches']) ? true : false;
-	}
-
-	/**
-	* Returns an associative array containing information about the indexes
-	*/
-	public function index_stats()
-	{
-		if (!sizeof($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return array(
-			$this->user->lang['TOTAL_WORDS']		=> $this->stats['total_words'],
-			$this->user->lang['TOTAL_MATCHES']	=> $this->stats['total_matches']);
-	}
-
-	protected function get_stats()
-	{
-		$this->stats['total_words']		= $this->db->get_estimated_row_count(SEARCH_WORDLIST_TABLE);
-		$this->stats['total_matches']	= $this->db->get_estimated_row_count(SEARCH_WORDMATCH_TABLE);
-	}
-
-	/**
-	* Clean up a text to remove non-alphanumeric characters
-	*
-	* This method receives a UTF-8 string, normalizes and validates it, replaces all
-	* non-alphanumeric characters with strings then returns the result.
-	*
-	* Any number of "allowed chars" can be passed as a UTF-8 string in NFC.
-	*
-	* @param	string	$text			Text to split, in UTF-8 (not normalized or sanitized)
-	* @param	string	$allowed_chars	String of special chars to allow
-	* @param	string	$encoding		Text encoding
-	* @return	string					Cleaned up text, only alphanumeric chars are left
-	*
-	* @todo normalizer::cleanup being able to be used?
-	*/
-	protected function cleanup($text, $allowed_chars = null, $encoding = 'utf-8')
-	{
-		static $conv = array(), $conv_loaded = array();
-		$words = $allow = array();
-
-		// Convert the text to UTF-8
-		$encoding = strtolower($encoding);
-		if ($encoding != 'utf-8')
-		{
-			$text = utf8_recode($text, $encoding);
-		}
-
-		$utf_len_mask = array(
-			"\xC0"	=>	2,
-			"\xD0"	=>	2,
-			"\xE0"	=>	3,
-			"\xF0"	=>	4
-		);
-
-		/**
-		* Replace HTML entities and NCRs
-		*/
-		$text = htmlspecialchars_decode(utf8_decode_ncr($text), ENT_QUOTES);
-
-		/**
-		* Load the UTF-8 normalizer
-		*
-		* If we use it more widely, an instance of that class should be held in a
-		* a global variable instead
-		*/
-		utf_normalizer::nfc($text);
-
-		/**
-		* The first thing we do is:
-		*
-		* - convert ASCII-7 letters to lowercase
-		* - remove the ASCII-7 non-alpha characters
-		* - remove the bytes that should not appear in a valid UTF-8 string: 0xC0,
-		*   0xC1 and 0xF5-0xFF
-		*
-		* @todo in theory, the third one is already taken care of during normalization and those chars should have been replaced by Unicode replacement chars
-		*/
-		$sb_match	= "ISTCPAMELRDOJBNHFGVWUQKYXZ\r\n\t!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\xC0\xC1\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF";
-		$sb_replace	= 'istcpamelrdojbnhfgvwuqkyxz                                                                              ';
-
-		/**
-		* This is the list of legal ASCII chars, it is automatically extended
-		* with ASCII chars from $allowed_chars
-		*/
-		$legal_ascii = ' eaisntroludcpmghbfvq10xy2j9kw354867z';
-
-		/**
-		* Prepare an array containing the extra chars to allow
-		*/
-		if (isset($allowed_chars[0]))
-		{
-			$pos = 0;
-			$len = strlen($allowed_chars);
-			do
-			{
-				$c = $allowed_chars[$pos];
-
-				if ($c < "\x80")
-				{
-					/**
-					* ASCII char
-					*/
-					$sb_pos = strpos($sb_match, $c);
-					if (is_int($sb_pos))
-					{
-						/**
-						* Remove the char from $sb_match and its corresponding
-						* replacement in $sb_replace
-						*/
-						$sb_match = substr($sb_match, 0, $sb_pos) . substr($sb_match, $sb_pos + 1);
-						$sb_replace = substr($sb_replace, 0, $sb_pos) . substr($sb_replace, $sb_pos + 1);
-						$legal_ascii .= $c;
-					}
-
-					++$pos;
-				}
-				else
-				{
-					/**
-					* UTF-8 char
-					*/
-					$utf_len = $utf_len_mask[$c & "\xF0"];
-					$allow[substr($allowed_chars, $pos, $utf_len)] = 1;
-					$pos += $utf_len;
-				}
-			}
-			while ($pos < $len);
-		}
-
-		$text = strtr($text, $sb_match, $sb_replace);
-		$ret = '';
-
-		$pos = 0;
-		$len = strlen($text);
-
-		do
-		{
-			/**
-			* Do all consecutive ASCII chars at once
-			*/
-			if ($spn = strspn($text, $legal_ascii, $pos))
-			{
-				$ret .= substr($text, $pos, $spn);
-				$pos += $spn;
-			}
-
-			if ($pos >= $len)
-			{
-				return $ret;
-			}
-
-			/**
-			* Capture the UTF char
-			*/
-			$utf_len = $utf_len_mask[$text[$pos] & "\xF0"];
-			$utf_char = substr($text, $pos, $utf_len);
-			$pos += $utf_len;
-
-			if (($utf_char >= UTF8_HANGUL_FIRST && $utf_char <= UTF8_HANGUL_LAST)
-			 || ($utf_char >= UTF8_CJK_FIRST && $utf_char <= UTF8_CJK_LAST)
-			 || ($utf_char >= UTF8_CJK_B_FIRST && $utf_char <= UTF8_CJK_B_LAST))
-			{
-				/**
-				* All characters within these ranges are valid
-				*
-				* We separate them with a space in order to index each character
-				* individually
-				*/
-				$ret .= ' ' . $utf_char . ' ';
-				continue;
-			}
-
-			if (isset($allow[$utf_char]))
-			{
-				/**
-				* The char is explicitly allowed
-				*/
-				$ret .= $utf_char;
-				continue;
-			}
-
-			if (isset($conv[$utf_char]))
-			{
-				/**
-				* The char is mapped to something, maybe to itself actually
-				*/
-				$ret .= $conv[$utf_char];
-				continue;
-			}
-
-			/**
-			* The char isn't mapped, but did we load its conversion table?
-			*
-			* The search indexer table is split into blocks. The block number of
-			* each char is equal to its codepoint right-shifted for 11 bits. It
-			* means that out of the 11, 16 or 21 meaningful bits of a 2-, 3- or
-			* 4- byte sequence we only keep the leftmost 0, 5 or 10 bits. Thus,
-			* all UTF chars encoded in 2 bytes are in the same first block.
-			*/
-			if (isset($utf_char[2]))
-			{
-				if (isset($utf_char[3]))
-				{
-					/**
-					* 1111 0nnn 10nn nnnn 10nx xxxx 10xx xxxx
-					* 0000 0111 0011 1111 0010 0000
-					*/
-					$idx = ((ord($utf_char[0]) & 0x07) << 7) | ((ord($utf_char[1]) & 0x3F) << 1) | ((ord($utf_char[2]) & 0x20) >> 5);
-				}
-				else
-				{
-					/**
-					* 1110 nnnn 10nx xxxx 10xx xxxx
-					* 0000 0111 0010 0000
-					*/
-					$idx = ((ord($utf_char[0]) & 0x07) << 1) | ((ord($utf_char[1]) & 0x20) >> 5);
-				}
-			}
-			else
-			{
-				/**
-				* 110x xxxx 10xx xxxx
-				* 0000 0000 0000 0000
-				*/
-				$idx = 0;
-			}
-
-			/**
-			* Check if the required conv table has been loaded already
-			*/
-			if (!isset($conv_loaded[$idx]))
-			{
-				$conv_loaded[$idx] = 1;
-				$file = $this->phpbb_root_path . 'includes/utf/data/search_indexer_' . $idx . '.' . $this->php_ext;
-
-				if (file_exists($file))
-				{
-					$conv += include($file);
-				}
-			}
-
-			if (isset($conv[$utf_char]))
-			{
-				$ret .= $conv[$utf_char];
-			}
-			else
-			{
-				/**
-				* We add an entry to the conversion table so that we
-				* don't have to convert to codepoint and perform the checks
-				* that are above this block
-				*/
-				$conv[$utf_char] = ' ';
-				$ret .= ' ';
-			}
-		}
-		while (1);
-
-		return $ret;
-	}
-
-	/**
-	* Returns a list of options for the ACP to display
-	*/
-	public function acp()
-	{
-		/**
-		* if we need any options, copied from fulltext_native for now, will have to be adjusted or removed
-		*/
-
-		$tpl = '
-		<dl>
-			<dt><label for="fulltext_native_load_upd">' . $this->user->lang['YES_SEARCH_UPDATE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['YES_SEARCH_UPDATE_EXPLAIN'] . '</span></dt>
-			<dd><label><input type="radio" id="fulltext_native_load_upd" name="config[fulltext_native_load_upd]" value="1"' . (($this->config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio" /> ' . $this->user->lang['YES'] . '</label><label><input type="radio" name="config[fulltext_native_load_upd]" value="0"' . ((!$this->config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio" /> ' . $this->user->lang['NO'] . '</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_native_min_chars">' . $this->user->lang['MIN_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_min_chars" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_native_min_chars]" value="' . (int) $this->config['fulltext_native_min_chars'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_native_max_chars">' . $this->user->lang['MAX_SEARCH_CHARS'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_max_chars" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_native_max_chars]" value="' . (int) $this->config['fulltext_native_max_chars'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_native_common_thres">' . $this->user->lang['COMMON_WORD_THRESHOLD'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['COMMON_WORD_THRESHOLD_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_common_thres" type="text" size="3" maxlength="3" name="config[fulltext_native_common_thres]" value="' . (double) $this->config['fulltext_native_common_thres'] . '" /> %</dd>
-		</dl>
-		';
-
-		// These are fields required in the config table
-		return array(
-			'tpl'		=> $tpl,
-			'config'	=> array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:255', 'fulltext_native_max_chars' => 'integer:0:255', 'fulltext_native_common_thres' => 'double:0:100')
-		);
-	}
-}
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
deleted file mode 100644
index 6b4b310f2e..0000000000
--- a/phpBB/includes/search/fulltext_postgres.php
+++ /dev/null
@@ -1,963 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* fulltext_postgres
-* Fulltext search for PostgreSQL
-* @package search
-*/
-class phpbb_search_fulltext_postgres extends phpbb_search_base
-{
-	/**
-	 * Associative array holding index stats
-	 * @var array
-	 */
-	protected $stats = array();
-
-	/**
-	 * Holds the words entered by user, obtained by splitting the entered query on whitespace
-	 * @var array
-	 */
-	protected $split_words = array();
-
-	/**
-	 * True if PostgreSQL version supports tsearch
-	 * @var boolean
-	 */
-	protected $tsearch_usable = false;
-
-	/**
-	 * Stores the PostgreSQL version
-	 * @var string
-	 */
-	protected $version;
-
-	/**
-	 * Stores the tsearch query
-	 * @var string
-	 */
-	protected $tsearch_query;
-
-	/**
-	 * True if phrase search is supported.
-	 * PostgreSQL fulltext currently doesn't support it
-	 * @var boolean
-	 */
-	protected $phrase_search = false;
-
-	/**
-	 * Config object
-	 * @var phpbb_config
-	 */
-	protected $config;
-
-	/**
-	 * Database connection
-	 * @var phpbb_db_driver
-	 */
-	protected $db;
-
-	/**
-	 * User object
-	 * @var phpbb_user
-	 */
-	protected $user;
-
-	/**
-	 * Contains tidied search query.
-	 * Operators are prefixed in search query and common words excluded
-	 * @var string
-	 */
-	protected $search_query;
-
-	/**
-	 * Contains common words.
-	 * Common words are words with length less/more than min/max length
-	 * @var array
-	 */
-	protected $common_words = array();
-
-	/**
-	 * Associative array stores the min and max word length to be searched
-	 * @var array
-	 */
-	protected $word_length = array();
-
-	/**
-	 * Constructor
-	 * Creates a new phpbb_search_fulltext_postgres, which is used as a search backend
-	 *
-	 * @param string|bool $error Any error that occurs is passed on through this reference variable otherwise false
-	 */
-	public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user)
-	{
-		$this->config = $config;
-		$this->db = $db;
-		$this->user = $user;
-
-		$this->word_length = array('min' => $this->config['fulltext_postgres_min_word_len'], 'max' => $this->config['fulltext_postgres_max_word_len']);
-
-		if ($this->db->sql_layer == 'postgres')
-		{
-			$pgsql_version = explode(',', substr($this->db->sql_server_info(), 10));
-			$this->version = trim($pgsql_version[0]);
-			if (version_compare($this->version, '8.3', '>='))
-			{
-				$this->tsearch_usable = true;
-			}
-		}
-
-		/**
-		 * Load the UTF tools
-		 */
-		if (!function_exists('utf8_strlen'))
-		{
-			include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
-		}
-
-		$error = false;
-	}
-
-	/**
-	* Returns the name of this search backend to be displayed to administrators
-	*
-	* @return string Name
-	*/
-	public function get_name()
-	{
-		return 'PostgreSQL Fulltext';
-	}
-
-	/**
-	 * Returns the search_query
-	 *
-	 * @return string search query
-	 */
-	public function get_search_query()
-	{
-		return $this->search_query;
-	}
-
-	/**
-	 * Returns the common_words array
-	 *
-	 * @return array common words that are ignored by search backend
-	 */
-	public function get_common_words()
-	{
-		return $this->common_words;
-	}
-
-	/**
-	 * Returns the word_length array
-	 *
-	 * @return array min and max word length for searching
-	 */
-	public function get_word_length()
-	{
-		return $this->word_length;
-	}
-
-	/**
-	 * Returns if phrase search is supported or not
-	 *
-	 * @return bool
-	 */
-	public function supports_phrase_search()
-	{
-		return $this->phrase_search;
-	}
-
-	/**
-	* Checks for correct PostgreSQL version and stores min/max word length in the config
-	*
-	* @return string|bool Language key of the error/incompatiblity occurred
-	*/
-	public function init()
-	{
-		if ($this->db->sql_layer != 'postgres')
-		{
-			return $this->user->lang['FULLTEXT_POSTGRES_INCOMPATIBLE_DATABASE'];
-		}
-
-		if (!$this->tsearch_usable)
-		{
-			return $this->user->lang['FULLTEXT_POSTGRES_TS_NOT_USABLE'];
-		}
-
-		return false;
-	}
-
-	/**
-	* Splits keywords entered by a user into an array of words stored in $this->split_words
-	* Stores the tidied search query in $this->search_query
-	*
-	* @param	string	&$keywords	Contains the keyword as entered by the user
-	* @param	string	$terms	is either 'all' or 'any'
-	* @return	bool	false	if no valid keywords were found and otherwise true
-	*/
-	public function split_keywords(&$keywords, $terms)
-	{
-		if ($terms == 'all')
-		{
-			$match		= array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#(^|\s)\+#', '#(^|\s)-#', '#(^|\s)\|#');
-			$replace	= array(' +', ' |', ' -', ' +', ' -', ' |');
-
-			$keywords = preg_replace($match, $replace, $keywords);
-		}
-
-		// Filter out as above
-		$split_keywords = preg_replace("#[\"\n\r\t]+#", ' ', trim(htmlspecialchars_decode($keywords)));
-
-		// Split words
-		$split_keywords = preg_replace('#([^\p{L}\p{N}\'*"()])#u', '$1$1', str_replace('\'\'', '\' \'', trim($split_keywords)));
-		$matches = array();
-		preg_match_all('#(?:[^\p{L}\p{N}*"()]|^)([+\-|]?(?:[\p{L}\p{N}*"()]+\'?)*[\p{L}\p{N}*"()])(?:[^\p{L}\p{N}*"()]|$)#u', $split_keywords, $matches);
-		$this->split_words = $matches[1];
-
-		foreach ($this->split_words as $i => $word)
-		{
-			$clean_word = preg_replace('#^[+\-|"]#', '', $word);
-
-			// check word length
-			$clean_len = utf8_strlen(str_replace('*', '', $clean_word));
-			if (($clean_len < $this->config['fulltext_postgres_min_word_len']) || ($clean_len > $this->config['fulltext_postgres_max_word_len']))
-			{
-				$this->common_words[] = $word;
-				unset($this->split_words[$i]);
-			}
-		}
-
-		if ($terms == 'any')
-		{
-			$this->search_query = '';
-			$this->tsearch_query = '';
-			foreach ($this->split_words as $word)
-			{
-				if ((strpos($word, '+') === 0) || (strpos($word, '-') === 0) || (strpos($word, '|') === 0))
-				{
-					$word = substr($word, 1);
-				}
-				$this->search_query .= $word . ' ';
-				$this->tsearch_query .= '|' . $word . ' ';
-			}
-		}
-		else
-		{
-			$this->search_query = '';
-			$this->tsearch_query = '';
-			foreach ($this->split_words as $word)
-			{
-				if (strpos($word, '+') === 0)
-				{
-					$this->search_query .= $word . ' ';
-					$this->tsearch_query .= '&' . substr($word, 1) . ' ';
-				}
-				elseif (strpos($word, '-') === 0)
-				{
-					$this->search_query .= $word . ' ';
-					$this->tsearch_query .= '&!' . substr($word, 1) . ' ';
-				}
-				elseif (strpos($word, '|') === 0)
-				{
-					$this->search_query .= $word . ' ';
-					$this->tsearch_query .= '|' . substr($word, 1) . ' ';
-				}
-				else
-				{
-					$this->search_query .= '+' . $word . ' ';
-					$this->tsearch_query .= '&' . $word . ' ';
-				}
-			}
-		}
-
-		$this->tsearch_query = substr($this->tsearch_query, 1);
-		$this->search_query = utf8_htmlspecialchars($this->search_query);
-
-		if ($this->search_query)
-		{
-			$this->split_words = array_values($this->split_words);
-			sort($this->split_words);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Turns text into an array of words
-	* @param string $text contains post text/subject
-	*/
-	public function split_message($text)
-	{
-		// Split words
-		$text = preg_replace('#([^\p{L}\p{N}\'*])#u', '$1$1', str_replace('\'\'', '\' \'', trim($text)));
-		$matches = array();
-		preg_match_all('#(?:[^\p{L}\p{N}*]|^)([+\-|]?(?:[\p{L}\p{N}*]+\'?)*[\p{L}\p{N}*])(?:[^\p{L}\p{N}*]|$)#u', $text, $matches);
-		$text = $matches[1];
-
-		// remove too short or too long words
-		$text = array_values($text);
-		for ($i = 0, $n = sizeof($text); $i < $n; $i++)
-		{
-			$text[$i] = trim($text[$i]);
-			if (utf8_strlen($text[$i]) < $this->config['fulltext_postgres_min_word_len'] || utf8_strlen($text[$i]) > $this->config['fulltext_postgres_max_word_len'])
-			{
-				unset($text[$i]);
-			}
-		}
-
-		return array_values($text);
-	}
-
-	/**
-	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	string		$fields				contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched)
-	* @param	string		$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
-	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
-	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
-	{
-		// No keywords? No posts
-		if (!$this->search_query)
-		{
-			return false;
-		}
-
-		// When search query contains queries like -foo
-		if (strpos($this->search_query, '+') === false)
-		{
-			return false;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			implode(', ', $this->split_words),
-			$type,
-			$fields,
-			$terms,
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			$post_visibility,
-			implode(',', $author_ary)
-		)));
-
-		if ($start < 0)
-		{
-			$start = 0;
-		}
-
-		// try reading the results from cache
-		$result_count = 0;
-		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
-		{
-			return $result_count;
-		}
-
-		$id_ary = array();
-
-		$join_topic = ($type == 'posts') ? false : true;
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-		$sql_sort_table = $sql_sort_join = '';
-
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster ';
-			break;
-
-			case 't':
-				$join_topic = true;
-			break;
-
-			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
-			break;
-		}
-
-		// Build some display specific sql strings
-		switch ($fields)
-		{
-			case 'titleonly':
-				$sql_match = 'p.post_subject';
-				$sql_match_where = ' AND p.post_id = t.topic_first_post_id';
-				$join_topic = true;
-			break;
-
-			case 'msgonly':
-				$sql_match = 'p.post_text';
-				$sql_match_where = '';
-			break;
-
-			case 'firstpost':
-				$sql_match = 'p.post_subject, p.post_text';
-				$sql_match_where = ' AND p.post_id = t.topic_first_post_id';
-				$join_topic = true;
-			break;
-
-			default:
-				$sql_match = 'p.post_subject, p.post_text';
-				$sql_match_where = '';
-			break;
-		}
-
-		$sql_select			= ($type == 'posts') ? 'p.post_id' : 'DISTINCT t.topic_id';
-		$sql_from			= ($join_topic) ? TOPICS_TABLE . ' t, ' : '';
-		$field				= ($type == 'posts') ? 'post_id' : 'topic_id';
-		$sql_author			= (sizeof($author_ary) == 1) ? ' = ' . $author_ary[0] : 'IN (' . implode(', ', $author_ary) . ')';
-
-		if (sizeof($author_ary) && $author_name)
-		{
-			// first one matches post of registered users, second one guests and deleted users
-			$sql_author = '(' . $this->db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
-		}
-		else if (sizeof($author_ary))
-		{
-			$sql_author = ' AND ' . $this->db->sql_in_set('p.poster_id', $author_ary);
-		}
-		else
-		{
-			$sql_author = '';
-		}
-
-		$sql_where_options = $sql_sort_join;
-		$sql_where_options .= ($topic_id) ? ' AND p.topic_id = ' . $topic_id : '';
-		$sql_where_options .= ($join_topic) ? ' AND t.topic_id = p.topic_id' : '';
-		$sql_where_options .= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_where_options .= ' AND ' . $post_visibility;
-		$sql_where_options .= $sql_author;
-		$sql_where_options .= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_where_options .= $sql_match_where;
-
-		$tmp_sql_match = array();
-		foreach (explode(',', $sql_match) as $sql_match_column)
-		{
-			$tmp_sql_match[] = "to_tsvector ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', " . $sql_match_column . ") @@ to_tsquery ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', '" . $this->db->sql_escape($this->tsearch_query) . "')";
-		}
-
-		$this->db->sql_transaction('begin');
-
-		$sql_from = "FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p";
-		$sql_where = "WHERE (" . implode(' OR ', $tmp_sql_match) . ")
-			$sql_where_options";
-		$sql = "SELECT $sql_select
-			$sql_from
-			$sql_where
-			ORDER BY $sql_sort";
-		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$id_ary[] = $row[$field];
-		}
-		$this->db->sql_freeresult($result);
-
-		$id_ary = array_unique($id_ary);
-
-		// if the total result count is not cached yet, retrieve it from the db
-		if (!$result_count)
-		{
-			$sql_count = "SELECT COUNT(*) as result_count
-				$sql_from
-				$sql_where";
-			$result = $this->db->sql_query($sql_count);
-			$result_count = (int) $this->db->sql_fetchfield('result_count');
-			$this->db->sql_freeresult($result);
-
-			if (!$result_count)
-			{
-				return false;
-			}
-		}
-
-		$this->db->sql_transaction('commit');
-
-		if ($start >= $result_count)
-		{
-			$start = floor(($result_count - 1) / $per_page) * $per_page;
-
-			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$id_ary[] = $row[$field];
-			}
-			$this->db->sql_freeresult($result);
-
-			$id_ary = array_unique($id_ary);
-		}
-
-		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
-		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
-		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-
-		return $result_count;
-	}
-
-	/**
-	* Performs a search on an author's posts without caring about message contents. Depends on display specific params
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	boolean		$firstpost_only		if true, only topic starting posts will be considered
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
-	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		$author_ary			an array of author ids
-	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*/
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
-	{
-		// No author? No posts
-		if (!sizeof($author_ary))
-		{
-			return 0;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			'',
-			$type,
-			($firstpost_only) ? 'firstpost' : '',
-			'',
-			'',
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			$post_visibility,
-			implode(',', $author_ary),
-			$author_name,
-		)));
-
-		if ($start < 0)
-		{
-			$start = 0;
-		}
-
-		// try reading the results from cache
-		$result_count = 0;
-		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
-		{
-			return $result_count;
-		}
-
-		$id_ary = array();
-
-		// Create some display specific sql strings
-		if ($author_name)
-		{
-			// first one matches post of registered users, second one guests and deleted users
-			$sql_author = '(' . $this->db->sql_in_set('p.poster_id', array_diff($author_ary, array(ANONYMOUS)), false, true) . ' OR p.post_username ' . $author_name . ')';
-		}
-		else
-		{
-			$sql_author = $this->db->sql_in_set('p.poster_id', $author_ary);
-		}
-		$sql_fora		= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
-		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : '';
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-		$sql_sort_table = $sql_sort_join = '';
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster ';
-			break;
-
-			case 't':
-				$sql_sort_table	= ($type == 'posts' && !$firstpost_only) ? TOPICS_TABLE . ' t, ' : '';
-				$sql_sort_join	= ($type == 'posts' && !$firstpost_only) ? ' AND t.topic_id = p.topic_id ' : '';
-			break;
-
-			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
-			break;
-		}
-
-		$m_approve_fid_sql = ' AND ' . $post_visibility;
-
-		// Build the query for really selecting the post_ids
-		if ($type == 'posts')
-		{
-			$sql = "SELECT p.post_id
-				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					$sql_sort_join
-					$sql_time
-				ORDER BY $sql_sort";
-			$field = 'post_id';
-		}
-		else
-		{
-			$sql = "SELECT t.topic_id
-				FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					AND t.topic_id = p.topic_id
-					$sql_sort_join
-					$sql_time
-				GROUP BY t.topic_id, $sort_by_sql[$sort_key]
-				ORDER BY $sql_sort";
-			$field = 'topic_id';
-		}
-
-		$this->db->sql_transaction('begin');
-
-		// Only read one block of posts from the db and then cache it
-		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$id_ary[] = $row[$field];
-		}
-		$this->db->sql_freeresult($result);
-
-		// retrieve the total result count if needed
-		if (!$result_count)
-		{
-			if ($type == 'posts')
-			{
-				$sql_count = "SELECT COUNT(*) as result_count
-					FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
-					WHERE $sql_author
-						$sql_topic_id
-						$sql_firstpost
-						$m_approve_fid_sql
-						$sql_fora
-						$sql_sort_join
-						$sql_time";
-			}
-			else
-			{
-				$sql_count = "SELECT COUNT(*) as result_count
-					FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-					WHERE $sql_author
-						$sql_topic_id
-						$sql_firstpost
-						$m_approve_fid_sql
-						$sql_fora
-						AND t.topic_id = p.topic_id
-						$sql_sort_join
-						$sql_time
-					GROUP BY t.topic_id, $sort_by_sql[$sort_key]";
-			}
-
-			$result = $this->db->sql_query($sql_count);
-			$result_count = (int) $this->db->sql_fetchfield('result_count');
-
-			if (!$result_count)
-			{
-				return false;
-			}
-		}
-
-		$this->db->sql_transaction('commit');
-
-		if ($start >= $result_count)
-		{
-			$start = floor(($result_count - 1) / $per_page) * $per_page;
-
-			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$id_ary[] = (int) $row[$field];
-			}
-			$this->db->sql_freeresult($result);
-
-			$id_ary = array_unique($id_ary);
-		}
-
-		if (sizeof($id_ary))
-		{
-			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
-			$id_ary = array_slice($id_ary, 0, $per_page);
-
-			return $result_count;
-		}
-		return false;
-	}
-
-	/**
-	* Destroys cached search results, that contained one of the new words in a post so the results won't be outdated
-	*
-	* @param	string		$mode		contains the post mode: edit, post, reply, quote ...
-	* @param	int			$post_id	contains the post id of the post to index
-	* @param	string		$message	contains the post text of the post
-	* @param	string		$subject	contains the subject of the post to index
-	* @param	int			$poster_id	contains the user id of the poster
-	* @param	int			$forum_id	contains the forum id of parent forum of the post
-	*/
-	public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
-	{
-		// Split old and new post/subject to obtain array of words
-		$split_text = $this->split_message($message);
-		$split_title = ($subject) ? $this->split_message($subject) : array();
-
-		$words = array_unique(array_merge($split_text, $split_title));
-
-		unset($split_text);
-		unset($split_title);
-
-		// destroy cached search results containing any of the words removed or added
-		$this->destroy_cache($words, array($poster_id));
-
-		unset($words);
-	}
-
-	/**
-	* Destroy cached results, that might be outdated after deleting a post
-	*/
-	public function index_remove($post_ids, $author_ids, $forum_ids)
-	{
-		$this->destroy_cache(array(), $author_ids);
-	}
-
-	/**
-	* Destroy old cache entries
-	*/
-	public function tidy()
-	{
-		// destroy too old cached search results
-		$this->destroy_cache(array());
-
-		set_config('search_last_gc', time(), true);
-	}
-
-	/**
-	* Create fulltext index
-	*
-	* @return string|bool error string is returned incase of errors otherwise false
-	*/
-	public function create_index($acp_module, $u_action)
-	{
-		// Make sure we can actually use PostgreSQL with fulltext indexes
-		if ($error = $this->init())
-		{
-			return $error;
-		}
-
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		if (!isset($this->stats['post_subject']))
-		{
-			$this->db->sql_query("CREATE INDEX " . POSTS_TABLE . "_" . $this->config['fulltext_postgres_ts_name'] . "_post_subject ON " . POSTS_TABLE . " USING gin (to_tsvector ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', post_subject))");
-		}
-
-		if (!isset($this->stats['post_text']))
-		{
-			$this->db->sql_query("CREATE INDEX " . POSTS_TABLE . "_" . $this->config['fulltext_postgres_ts_name'] . "_post_text ON " . POSTS_TABLE . " USING gin (to_tsvector ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', post_text))");
-		}
-
-		$this->db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
-
-		return false;
-	}
-
-	/**
-	* Drop fulltext index
-	*
-	* @return string|bool error string is returned incase of errors otherwise false
-	*/
-	public function delete_index($acp_module, $u_action)
-	{
-		// Make sure we can actually use PostgreSQL with fulltext indexes
-		if ($error = $this->init())
-		{
-			return $error;
-		}
-
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		if (isset($this->stats['post_subject']))
-		{
-			$this->db->sql_query('DROP INDEX ' . $this->stats['post_subject']['relname']);
-		}
-
-		if (isset($this->stats['post_text']))
-		{
-			$this->db->sql_query('DROP INDEX ' . $this->stats['post_text']['relname']);
-		}
-
-		$this->db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
-
-		return false;
-	}
-
-	/**
-	* Returns true if both FULLTEXT indexes exist
-	*/
-	public function index_created()
-	{
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return (isset($this->stats['post_text']) && isset($this->stats['post_subject'])) ? true : false;
-	}
-
-	/**
-	* Returns an associative array containing information about the indexes
-	*/
-	public function index_stats()
-	{
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return array(
-			$this->user->lang['FULLTEXT_POSTGRES_TOTAL_POSTS']			=> ($this->index_created()) ? $this->stats['total_posts'] : 0,
-		);
-	}
-
-	/**
-	 * Computes the stats and store them in the $this->stats associative array
-	 */
-	protected function get_stats()
-	{
-		if ($this->db->sql_layer != 'postgres')
-		{
-			$this->stats = array();
-			return;
-		}
-
-		$sql = "SELECT c2.relname, pg_catalog.pg_get_indexdef(i.indexrelid, 0, true) AS indexdef
-			  FROM pg_catalog.pg_class c1, pg_catalog.pg_index i, pg_catalog.pg_class c2
-			 WHERE c1.relname = '" . POSTS_TABLE . "'
-			   AND pg_catalog.pg_table_is_visible(c1.oid)
-			   AND c1.oid = i.indrelid
-			   AND i.indexrelid = c2.oid";
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			// deal with older PostgreSQL versions which didn't use Index_type
-			if (strpos($row['indexdef'], 'to_tsvector') !== false)
-			{
-				if ($row['relname'] == POSTS_TABLE . '_' . $this->config['fulltext_postgres_ts_name'] . '_post_text' || $row['relname'] == POSTS_TABLE . '_post_text')
-				{
-					$this->stats['post_text'] = $row;
-				}
-				else if ($row['relname'] == POSTS_TABLE . '_' . $this->config['fulltext_postgres_ts_name'] . '_post_subject' || $row['relname'] == POSTS_TABLE . '_post_subject')
-				{
-					$this->stats['post_subject'] = $row;
-				}
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		$this->stats['total_posts'] = $this->config['num_posts'];
-	}
-
-	/**
-	* Display various options that can be configured for the backend from the acp
-	*
-	* @return associative array containing template and config variables
-	*/
-	public function acp()
-	{
-		$tpl = '
-		<dl>
-			<dt><label>' . $this->user->lang['FULLTEXT_POSTGRES_VERSION_CHECK'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_VERSION_CHECK_EXPLAIN'] . '</span></dt>
-			<dd>' . (($this->tsearch_usable) ? $this->user->lang['YES'] : $this->user->lang['NO']) . ' (PostgreSQL ' . $this->version . ')</dd>
-		</dl>
-		<dl>
-			<dt><label>' . $this->user->lang['FULLTEXT_POSTGRES_TS_NAME'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_TS_NAME_EXPLAIN'] . '</span></dt>
-			<dd><select name="config[fulltext_postgres_ts_name]">';
-
-		if ($this->db->sql_layer == 'postgres' && $this->tsearch_usable)
-		{
-			$sql = 'SELECT cfgname AS ts_name
-				  FROM pg_ts_config';
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$tpl .= '<option value="' . $row['ts_name'] . '"' . ($row['ts_name'] === $this->config['fulltext_postgres_ts_name'] ? ' selected="selected"' : '') . '>' . $row['ts_name'] . '</option>';
-			}
-			$this->db->sql_freeresult($result);
-		}
-		else
-		{
-			$tpl .= '<option value="' . $this->config['fulltext_postgres_ts_name'] . '" selected="selected">' . $this->config['fulltext_postgres_ts_name'] . '</option>';
-		}
-
-		$tpl .= '</select></dd>
-		</dl>
-                <dl>
-                        <dt><label for="fulltext_postgres_min_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN'] . '</span></dt>
-                        <dd><input id="fulltext_postgres_min_word_len" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_postgres_min_word_len]" value="' . (int) $this->config['fulltext_postgres_min_word_len'] . '" /></dd>
-                </dl>
-                <dl>
-                        <dt><label for="fulltext_postgres_max_word_len">' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN'] . '</span></dt>
-                        <dd><input id="fulltext_postgres_max_word_len" type="number" size="3" maxlength="3" min="0" max="255" name="config[fulltext_postgres_max_word_len]" value="' . (int) $this->config['fulltext_postgres_max_word_len'] . '" /></dd>
-                </dl>
-		';
-
-		// These are fields required in the config table
-		return array(
-			'tpl'		=> $tpl,
-			'config'	=> array('fulltext_postgres_ts_name' => 'string', 'fulltext_postgres_min_word_len' => 'integer:0:255', 'fulltext_postgres_max_word_len' => 'integer:0:255')
-		);
-	}
-}
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
deleted file mode 100644
index 2f7b236c78..0000000000
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ /dev/null
@@ -1,917 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @ignore
-*/
-define('SPHINX_MAX_MATCHES', 20000);
-define('SPHINX_CONNECT_RETRIES', 3);
-define('SPHINX_CONNECT_WAIT_TIME', 300);
-
-/**
-* fulltext_sphinx
-* Fulltext search based on the sphinx search deamon
-* @package search
-*/
-class phpbb_search_fulltext_sphinx
-{
-	/**
-	 * Associative array holding index stats
-	 * @var array
-	 */
-	protected $stats = array();
-
-	/**
-	 * Holds the words entered by user, obtained by splitting the entered query on whitespace
-	 * @var array
-	 */
-	protected $split_words = array();
-
-	/**
-	 * Holds unique sphinx id
-	 * @var string
-	 */
-	protected $id;
-
-	/**
-	 * Stores the names of both main and delta sphinx indexes
-	 * separated by a semicolon
-	 * @var string
-	 */
-	protected $indexes;
-
-	/**
-	 * Sphinx searchd client object
-	 * @var SphinxClient
-	 */
-	protected $sphinx;
-
-	/**
-	 * Relative path to board root
-	 * @var string
-	 */
-	protected $phpbb_root_path;
-
-	/**
-	 * PHP Extension
-	 * @var string
-	 */
-	protected $php_ext;
-
-	/**
-	 * Auth object
-	 * @var phpbb_auth
-	 */
-	protected $auth;
-
-	/**
-	 * Config object
-	 * @var phpbb_config
-	 */
-	protected $config;
-
-	/**
-	 * Database connection
-	 * @var phpbb_db_driver
-	 */
-	protected $db;
-
-	/**
-	 * Database Tools object
-	 * @var phpbb_db_tools
-	 */
-	protected $db_tools;
-
-	/**
-	 * Stores the database type if supported by sphinx
-	 * @var string
-	 */
-	protected $dbtype;
-
-	/**
-	 * User object
-	 * @var phpbb_user
-	 */
-	protected $user;
-
-	/**
-	 * Stores the generated content of the sphinx config file
-	 * @var string
-	 */
-	protected $config_file_data = '';
-
-	/**
-	 * Contains tidied search query.
-	 * Operators are prefixed in search query and common words excluded
-	 * @var string
-	 */
-	protected $search_query;
-
-	/**
-	 * Constructor
-	 * Creates a new phpbb_search_fulltext_postgres, which is used as a search backend
-	 *
-	 * @param string|bool $error Any error that occurs is passed on through this reference variable otherwise false
-	 */
-	public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $phpEx;
-		$this->config = $config;
-		$this->user = $user;
-		$this->db = $db;
-		$this->auth = $auth;
-
-		if (!class_exists('phpbb_db_tools'))
-		{
-			require($this->phpbb_root_path . 'includes/db/db_tools.' . $this->php_ext);
-		}
-		
-		// Initialize phpbb_db_tools object
-		$this->db_tools = new phpbb_db_tools($this->db);
-
-		if(!$this->config['fulltext_sphinx_id'])
-		{
-			set_config('fulltext_sphinx_id', unique_id());
-		}
-		$this->id = $this->config['fulltext_sphinx_id'];
-		$this->indexes = 'index_phpbb_' . $this->id . '_delta;index_phpbb_' . $this->id . '_main';
-
-		if (!class_exists('SphinxClient'))
-		{
-			require($this->phpbb_root_path . 'includes/sphinxapi.' . $this->php_ext);
-		}
-
-		// Initialize sphinx client
-		$this->sphinx = new SphinxClient();
-
-		$this->sphinx->SetServer(($this->config['fulltext_sphinx_host'] ? $this->config['fulltext_sphinx_host'] : 'localhost'), ($this->config['fulltext_sphinx_port'] ? (int) $this->config['fulltext_sphinx_port'] : 9312));
-
-		$error = false;
-	}
-
-	/**
-	* Returns the name of this search backend to be displayed to administrators
-	*
-	* @return string Name
-	*/
-	public function get_name()
-	{
-		return 'Sphinx Fulltext';
-	}
-
-	/**
-	 * Returns the search_query
-	 *
-	 * @return string search query
-	 */
-	public function get_search_query()
-	{
-		return $this->search_query;
-	}
-
-	/**
-	 * Returns false as there is no word_len array
-	 *
-	 * @return false
-	 */
-	public function get_word_length()
-	{
-		return false;
-	}
-
-	/**
-	 * Returns an empty array as there are no common_words
-	 *
-	 * @return array common words that are ignored by search backend
-	 */
-	public function get_common_words()
-	{
-		return array();
-	}
-
-	/**
-	* Checks permissions and paths, if everything is correct it generates the config file
-	*
-	* @return string|bool Language key of the error/incompatiblity encountered, or false if successful
-	*/
-	public function init()
-	{
-		if ($this->db->sql_layer != 'mysql' && $this->db->sql_layer != 'mysql4' && $this->db->sql_layer != 'mysqli' && $this->db->sql_layer != 'postgres')
-		{
-			return $this->user->lang['FULLTEXT_SPHINX_WRONG_DATABASE'];
-		}
-
-		// Move delta to main index each hour
-		set_config('search_gc', 3600);
-
-		return false;
-	}
-
-	/**
-	 * Generates content of sphinx.conf
-	 *
-	 * @return bool True if sphinx.conf content is correctly generated, false otherwise
-	 */
-	protected function config_generate()
-	{
-		// Check if Database is supported by Sphinx
-		if ($this->db->sql_layer =='mysql' || $this->db->sql_layer == 'mysql4' || $this->db->sql_layer == 'mysqli')
-		{
-			$this->dbtype = 'mysql';
-		}
-		else if ($this->db->sql_layer == 'postgres')
-		{
-			$this->dbtype = 'pgsql';
-		}
-		else
-		{
-			$this->config_file_data = $this->user->lang('FULLTEXT_SPHINX_WRONG_DATABASE');
-			return false;
-		}
-
-		// Check if directory paths have been filled
-		if (!$this->config['fulltext_sphinx_data_path'])
-		{
-			$this->config_file_data = $this->user->lang('FULLTEXT_SPHINX_NO_CONFIG_DATA');
-			return false;
-		}
-
-		include($this->phpbb_root_path . 'config.' . $this->php_ext);
-
-		/* Now that we're sure everything was entered correctly,
-		generate a config for the index. We use a config value
-		fulltext_sphinx_id for this, as it should be unique. */
-		$config_object = new phpbb_search_sphinx_config($this->config_file_data);
-		$config_data = array(
-			'source source_phpbb_' . $this->id . '_main' => array(
-				array('type',						$this->dbtype . ' # mysql or pgsql'),
-				// This config value sql_host needs to be changed incase sphinx and sql are on different servers
-				array('sql_host',					$dbhost . ' # SQL server host sphinx connects to'),
-				array('sql_user',					$dbuser),
-				array('sql_pass',					$dbpasswd),
-				array('sql_db',						$dbname),
-				array('sql_port',					$dbport . ' # optional, default is 3306 for mysql and 5432 for pgsql'),
-				array('sql_query_pre',				'SET NAMES \'utf8\''),
-				array('sql_query_pre',				'UPDATE ' . SPHINX_TABLE . ' SET max_doc_id = (SELECT MAX(post_id) FROM ' . POSTS_TABLE . ') WHERE counter_id = 1'),
-				array('sql_query_range',			'SELECT MIN(post_id), MAX(post_id) FROM ' . POSTS_TABLE . ''),
-				array('sql_range_step',				'5000'),
-				array('sql_query',					'SELECT
-						p.post_id AS id,
-						p.forum_id,
-						p.topic_id,
-						p.poster_id,
-						p.post_visibility,
-						CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,
-						p.post_time,
-						p.post_subject,
-						p.post_subject as title,
-						p.post_text as data,
-						t.topic_last_post_time,
-						0 as deleted
-					FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t
-					WHERE
-						p.topic_id = t.topic_id
-						AND p.post_id >= $start AND p.post_id <= $end'),
-				array('sql_query_post',				''),
-				array('sql_query_post_index',		'UPDATE ' . SPHINX_TABLE . ' SET max_doc_id = $maxid WHERE counter_id = 1'),
-				array('sql_query_info',				'SELECT * FROM ' . POSTS_TABLE . ' WHERE post_id = $id'),
-				array('sql_attr_uint',				'forum_id'),
-				array('sql_attr_uint',				'topic_id'),
-				array('sql_attr_uint',				'poster_id'),
-				array('sql_attr_uint',				'post_visibility'),
-				array('sql_attr_bool',				'topic_first_post'),
-				array('sql_attr_bool',				'deleted'),
-				array('sql_attr_timestamp'	,		'post_time'),
-				array('sql_attr_timestamp'	,		'topic_last_post_time'),
-				array('sql_attr_str2ordinal',		'post_subject'),
-			),
-			'source source_phpbb_' . $this->id . '_delta : source_phpbb_' . $this->id . '_main' => array(
-				array('sql_query_pre',				''),
-				array('sql_query_range',			''),
-				array('sql_range_step',				''),
-				array('sql_query',					'SELECT
-						p.post_id AS id,
-						p.forum_id,
-						p.topic_id,
-						p.poster_id,
-						p.post_visibility,
-						CASE WHEN p.post_id = t.topic_first_post_id THEN 1 ELSE 0 END as topic_first_post,
-						p.post_time,
-						p.post_subject,
-						p.post_subject as title,
-						p.post_text as data,
-						t.topic_last_post_time,
-						0 as deleted
-					FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t
-					WHERE
-						p.topic_id = t.topic_id
-						AND p.post_id >=  ( SELECT max_doc_id FROM ' . SPHINX_TABLE . ' WHERE counter_id=1 )'),
-			),
-			'index index_phpbb_' . $this->id . '_main' => array(
-				array('path',						$this->config['fulltext_sphinx_data_path'] . 'index_phpbb_' . $this->id . '_main'),
-				array('source',						'source_phpbb_' . $this->id . '_main'),
-				array('docinfo',					'extern'),
-				array('morphology',					'none'),
-				array('stopwords',					''),
-				array('min_word_len',				'2'),
-				array('charset_type',				'utf-8'),
-				array('charset_table',				'U+FF10..U+FF19->0..9, 0..9, U+FF41..U+FF5A->a..z, U+FF21..U+FF3A->a..z, A..Z->a..z, a..z, U+0149, U+017F, U+0138, U+00DF, U+00FF, U+00C0..U+00D6->U+00E0..U+00F6, U+00E0..U+00F6, U+00D8..U+00DE->U+00F8..U+00FE, U+00F8..U+00FE, U+0100->U+0101, U+0101, U+0102->U+0103, U+0103, U+0104->U+0105, U+0105, U+0106->U+0107, U+0107, U+0108->U+0109, U+0109, U+010A->U+010B, U+010B, U+010C->U+010D, U+010D, U+010E->U+010F, U+010F, U+0110->U+0111, U+0111, U+0112->U+0113, U+0113, U+0114->U+0115, U+0115, U+0116->U+0117, U+0117, U+0118->U+0119, U+0119, U+011A->U+011B, U+011B, U+011C->U+011D, U+011D, U+011E->U+011F, U+011F, U+0130->U+0131, U+0131, U+0132->U+0133, U+0133, U+0134->U+0135, U+0135, U+0136->U+0137, U+0137, U+0139->U+013A, U+013A, U+013B->U+013C, U+013C, U+013D->U+013E, U+013E, U+013F->U+0140, U+0140, U+0141->U+0142, U+0142, U+0143->U+0144, U+0144, U+0145->U+0146, U+0146, U+0147->U+0148, U+0148, U+014A->U+014B, U+014B, U+014C->U+014D, U+014D, U+014E->U+014F, U+014F, U+0150->U+0151, U+0151, U+0152->U+0153, U+0153, U+0154->U+0155, U+0155, U+0156->U+0157, U+0157, U+0158->U+0159, U+0159, U+015A->U+015B, U+015B, U+015C->U+015D, U+015D, U+015E->U+015F, U+015F, U+0160->U+0161, U+0161, U+0162->U+0163, U+0163, U+0164->U+0165, U+0165, U+0166->U+0167, U+0167, U+0168->U+0169, U+0169, U+016A->U+016B, U+016B, U+016C->U+016D, U+016D, U+016E->U+016F, U+016F, U+0170->U+0171, U+0171, U+0172->U+0173, U+0173, U+0174->U+0175, U+0175, U+0176->U+0177, U+0177, U+0178->U+00FF, U+00FF, U+0179->U+017A, U+017A, U+017B->U+017C, U+017C, U+017D->U+017E, U+017E, U+0410..U+042F->U+0430..U+044F, U+0430..U+044F, U+4E00..U+9FFF'),
-				array('min_prefix_len',				'0'),
-				array('min_infix_len',				'0'),
-			),
-			'index index_phpbb_' . $this->id . '_delta : index_phpbb_' . $this->id . '_main' => array(
-				array('path',						$this->config['fulltext_sphinx_data_path'] . 'index_phpbb_' . $this->id . '_delta'),
-				array('source',						'source_phpbb_' . $this->id . '_delta'),
-			),
-			'indexer' => array(
-				array('mem_limit',					$this->config['fulltext_sphinx_indexer_mem_limit'] . 'M'),
-			),
-			'searchd' => array(
-				array('compat_sphinxql_magics'	,	'0'),
-				array('listen'	,					($this->config['fulltext_sphinx_host'] ? $this->config['fulltext_sphinx_host'] : 'localhost') . ':' . ($this->config['fulltext_sphinx_port'] ? $this->config['fulltext_sphinx_port'] : '9312')),
-				array('log',						$this->config['fulltext_sphinx_data_path'] . 'log/searchd.log'),
-				array('query_log',					$this->config['fulltext_sphinx_data_path'] . 'log/sphinx-query.log'),
-				array('read_timeout',				'5'),
-				array('max_children',				'30'),
-				array('pid_file',					$this->config['fulltext_sphinx_data_path'] . 'searchd.pid'),
-				array('max_matches',				(string) SPHINX_MAX_MATCHES),
-				array('binlog_path',				$this->config['fulltext_sphinx_data_path']),
-			),
-		);
-
-		$non_unique = array('sql_query_pre' => true, 'sql_attr_uint' => true, 'sql_attr_timestamp' => true, 'sql_attr_str2ordinal' => true, 'sql_attr_bool' => true);
-		$delete = array('sql_group_column' => true, 'sql_date_column' => true, 'sql_str2ordinal_column' => true);
-		foreach ($config_data as $section_name => $section_data)
-		{
-			$section = $config_object->get_section_by_name($section_name);
-			if (!$section)
-			{
-				$section = $config_object->add_section($section_name);
-			}
-
-			foreach ($delete as $key => $void)
-			{
-				$section->delete_variables_by_name($key);
-			}
-
-			foreach ($non_unique as $key => $void)
-			{
-				$section->delete_variables_by_name($key);
-			}
-
-			foreach ($section_data as $entry)
-			{
-				$key = $entry[0];
-				$value = $entry[1];
-
-				if (!isset($non_unique[$key]))
-				{
-					$variable = $section->get_variable_by_name($key);
-					if (!$variable)
-					{
-						$variable = $section->create_variable($key, $value);
-					}
-					else
-					{
-						$variable->set_value($value);
-					}
-				}
-				else
-				{
-					$variable = $section->create_variable($key, $value);
-				}
-			}
-		}
-		$this->config_file_data = $config_object->get_data();
-
-		return true;
-	}
-
-	/**
-	* Splits keywords entered by a user into an array of words stored in $this->split_words
-	* Stores the tidied search query in $this->search_query
-	*
-	* @param string $keywords Contains the keyword as entered by the user
-	* @param string $terms is either 'all' or 'any'
-	* @return false if no valid keywords were found and otherwise true
-	*/
-	public function split_keywords(&$keywords, $terms)
-	{
-		if ($terms == 'all')
-		{
-			$match		= array('#\sand\s#i', '#\sor\s#i', '#\snot\s#i', '#\+#', '#-#', '#\|#', '#@#');
-			$replace	= array(' & ', ' | ', '  - ', ' +', ' -', ' |', '');
-
-			$replacements = 0;
-			$keywords = preg_replace($match, $replace, $keywords);
-			$this->sphinx->SetMatchMode(SPH_MATCH_EXTENDED);
-		}
-		else
-		{
-			$this->sphinx->SetMatchMode(SPH_MATCH_ANY);
-		}
-
-		// Keep quotes and new lines
-		$keywords = str_replace(array('&quot;', "\n"), array('"', ' '), trim($keywords));
-
-		if (strlen($keywords) > 0)
-		{
-			$this->search_query = str_replace('"', '&quot;', $keywords);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	string		$fields				contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched)
-	* @param	string		$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
-	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		$author_ary			an array of author ids if the author should be ignored during the search the array is empty
-	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
-	{
-		// No keywords? No posts.
-		if (!strlen($this->search_query) && !sizeof($author_ary))
-		{
-			return false;
-		}
-
-		$id_ary = array();
-
-		$join_topic = ($type != 'posts');
-
-		// Sorting
-
-		if ($type == 'topics')
-		{
-			switch ($sort_key)
-			{
-				case 'a':
-					$this->sphinx->SetGroupBy('topic_id', SPH_GROUPBY_ATTR, 'poster_id ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'));
-				break;
-
-				case 'f':
-					$this->sphinx->SetGroupBy('topic_id', SPH_GROUPBY_ATTR, 'forum_id ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'));
-				break;
-
-				case 'i':
-
-				case 's':
-					$this->sphinx->SetGroupBy('topic_id', SPH_GROUPBY_ATTR, 'post_subject ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'));
-				break;
-
-				case 't':
-
-				default:
-					$this->sphinx->SetGroupBy('topic_id', SPH_GROUPBY_ATTR, 'topic_last_post_time ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'));
-				break;
-			}
-		}
-		else
-		{
-			switch ($sort_key)
-			{
-				case 'a':
-					$this->sphinx->SetSortMode(($sort_dir == 'a') ? SPH_SORT_ATTR_ASC : SPH_SORT_ATTR_DESC, 'poster_id');
-				break;
-
-				case 'f':
-					$this->sphinx->SetSortMode(($sort_dir == 'a') ? SPH_SORT_ATTR_ASC : SPH_SORT_ATTR_DESC, 'forum_id');
-				break;
-
-				case 'i':
-
-				case 's':
-					$this->sphinx->SetSortMode(($sort_dir == 'a') ? SPH_SORT_ATTR_ASC : SPH_SORT_ATTR_DESC, 'post_subject');
-				break;
-
-				case 't':
-
-				default:
-					$this->sphinx->SetSortMode(($sort_dir == 'a') ? SPH_SORT_ATTR_ASC : SPH_SORT_ATTR_DESC, 'post_time');
-				break;
-			}
-		}
-
-		// Most narrow filters first
-		if ($topic_id)
-		{
-			$this->sphinx->SetFilter('topic_id', array($topic_id));
-		}
-
-		$search_query_prefix = '';
-
-		switch ($fields)
-		{
-			case 'titleonly':
-				// Only search the title
-				if ($terms == 'all')
-				{
-					$search_query_prefix = '@title ';
-				}
-				// Weight for the title
-				$this->sphinx->SetFieldWeights(array("title" => 5, "data" => 1));
-				// 1 is first_post, 0 is not first post
-				$this->sphinx->SetFilter('topic_first_post', array(1));
-			break;
-
-			case 'msgonly':
-				// Only search the body
-				if ($terms == 'all')
-				{
-					$search_query_prefix = '@data ';
-				}
-				// Weight for the body
-				$this->sphinx->SetFieldWeights(array("title" => 1, "data" => 5));
-			break;
-
-			case 'firstpost':
-				// More relative weight for the title, also search the body
-				$this->sphinx->SetFieldWeights(array("title" => 5, "data" => 1));
-				// 1 is first_post, 0 is not first post
-				$this->sphinx->SetFilter('topic_first_post', array(1));
-			break;
-
-			default:
-				// More relative weight for the title, also search the body
-				$this->sphinx->SetFieldWeights(array("title" => 5, "data" => 1));
-			break;
-		}
-
-		if (sizeof($author_ary))
-		{
-			$this->sphinx->SetFilter('poster_id', $author_ary);
-		}
-
-		// As this is not simply possible at the moment, we limit the result to approved posts.
-		// This will make it impossible for moderators to search unapproved and softdeleted posts,
-		// but at least it will also cause the same for normal users.
-		$this->sphinx->SetFilter('post_visibility', array(ITEM_APPROVED));
-
-		if (sizeof($ex_fid_ary))
-		{
-			// All forums that a user is allowed to access
-			$fid_ary = array_unique(array_intersect(array_keys($this->auth->acl_getf('f_read', true)), array_keys($this->auth->acl_getf('f_search', true))));
-			// All forums that the user wants to and can search in
-			$search_forums = array_diff($fid_ary, $ex_fid_ary);
-
-			if (sizeof($search_forums))
-			{
-				$this->sphinx->SetFilter('forum_id', $search_forums);
-			}
-		}
-
-		$this->sphinx->SetFilter('deleted', array(0));
-
-		$this->sphinx->SetLimits($start, (int) $per_page, SPHINX_MAX_MATCHES);
-		$result = $this->sphinx->Query($search_query_prefix . str_replace('&quot;', '"', $this->search_query), $this->indexes);
-
-		// Could be connection to localhost:9312 failed (errno=111,
-		// msg=Connection refused) during rotate, retry if so
-		$retries = SPHINX_CONNECT_RETRIES;
-		while (!$result && (strpos($this->sphinx->GetLastError(), "errno=111,") !== false) && $retries--)
-		{
-			usleep(SPHINX_CONNECT_WAIT_TIME);
-			$result = $this->sphinx->Query($search_query_prefix . str_replace('&quot;', '"', $this->search_query), $this->indexes);
-		}
-
-		if ($this->sphinx->GetLastError())
-		{
-			add_log('critical', 'LOG_SPHINX_ERROR', $this->sphinx->GetLastError());
-			if ($this->auth->acl_get('a_'))
-			{
-				trigger_error($this->user->lang('SPHINX_SEARCH_FAILED', $this->sphinx->GetLastError()));
-			}
-			else
-			{
-				trigger_error($this->user->lang('SPHINX_SEARCH_FAILED_LOG'));
-			}
-		}
-
-		$result_count = $result['total_found'];
-
-		if ($result_count && $start >= $result_count)
-		{
-			$start = floor(($result_count - 1) / $per_page) * $per_page;
-
-			$this->sphinx->SetLimits((int) $start, (int) $per_page, SPHINX_MAX_MATCHES);
-			$result = $this->sphinx->Query($search_query_prefix . str_replace('&quot;', '"', $this->search_query), $this->indexes);
-
-			// Could be connection to localhost:9312 failed (errno=111,
-			// msg=Connection refused) during rotate, retry if so
-			$retries = SPHINX_CONNECT_RETRIES;
-			while (!$result && (strpos($this->sphinx->GetLastError(), "errno=111,") !== false) && $retries--)
-			{
-				usleep(SPHINX_CONNECT_WAIT_TIME);
-				$result = $this->sphinx->Query($search_query_prefix . str_replace('&quot;', '"', $this->search_query), $this->indexes);
-			}
-		}
-
-		$id_ary = array();
-		if (isset($result['matches']))
-		{
-			if ($type == 'posts')
-			{
-				$id_ary = array_keys($result['matches']);
-			}
-			else
-			{
-				foreach ($result['matches'] as $key => $value)
-				{
-					$id_ary[] = $value['attrs']['topic_id'];
-				}
-			}
-		}
-		else
-		{
-			return false;
-		}
-
-		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-
-		return $result_count;
-	}
-
-	/**
-	* Performs a search on an author's posts without caring about message contents. Depends on display specific params
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	boolean		$firstpost_only		if true, only topic starting posts will be considered
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$ex_fid_ary			specifies an array of forum ids which should not be searched
-	* @param	string		$post_visibility	specifies which types of posts the user can view in which forums
-	* @param	int			$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		$author_ary			an array of author ids
-	* @param	string		$author_name		specifies the author match, when ANONYMOUS is also a search-match
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*/
-	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
-	{
-		$this->search_query = '';
-
-		$this->sphinx->SetMatchMode(SPH_MATCH_FULLSCAN);
-		$fields = ($firstpost_only) ? 'firstpost' : 'all';
-		$terms = 'all';
-		return $this->keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, $id_ary, $start, $per_page);
-	}
-
-	/**
-	 * Updates wordlist and wordmatch tables when a message is posted or changed
-	 *
-	 * @param	string	$mode	Contains the post mode: edit, post, reply, quote
-	 * @param	int	$post_id	The id of the post which is modified/created
-	 * @param	string	&$message	New or updated post content
-	 * @param	string	&$subject	New or updated post subject
-	 * @param	int	$poster_id	Post author's user id
-	 * @param	int	$forum_id	The id of the forum in which the post is located
-	 */
-	public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
-	{
-		if ($mode == 'edit')
-		{
-			$this->sphinx->UpdateAttributes($this->indexes, array('forum_id', 'poster_id'), array((int)$post_id => array((int)$forum_id, (int)$poster_id)));
-		}
-		else if ($mode != 'post' && $post_id)
-		{
-			// Update topic_last_post_time for full topic
-			$sql_array = array(
-				'SELECT'	=> 'p1.post_id',
-				'FROM'		=> array(
-					POSTS_TABLE	=> 'p1',
-				),
-				'LEFT_JOIN'	=> array(array(
-					'FROM'	=> array(
-						POSTS_TABLE	=> 'p2'
-					),
-					'ON'	=> 'p1.topic_id = p2.topic_id',
-				)),
-			);
-
-			$sql = $this->db->sql_build_query('SELECT', $sql_array);
-			$result = $this->db->sql_query($sql);
-
-			$post_updates = array();
-			$post_time = time();
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$post_updates[(int)$row['post_id']] = array($post_time);
-			}
-			$this->db->sql_freeresult($result);
-
-			if (sizeof($post_updates))
-			{
-				$this->sphinx->UpdateAttributes($this->indexes, array('topic_last_post_time'), $post_updates);
-			}
-		}
-	}
-
-	/**
-	* Delete a post from the index after it was deleted
-	*/
-	public function index_remove($post_ids, $author_ids, $forum_ids)
-	{
-		$values = array();
-		foreach ($post_ids as $post_id)
-		{
-			$values[$post_id] = array(1);
-		}
-
-		$this->sphinx->UpdateAttributes($this->indexes, array('deleted'), $values);
-	}
-
-	/**
-	* Nothing needs to be destroyed
-	*/
-	public function tidy($create = false)
-	{
-		set_config('search_last_gc', time(), true);
-	}
-
-	/**
-	* Create sphinx table
-	*
-	* @return string|bool error string is returned incase of errors otherwise false
-	*/
-	public function create_index($acp_module, $u_action)
-	{
-		if (!$this->index_created())
-		{
-			$table_data = array(
-				'COLUMNS'	=> array(
-					'counter_id'	=> array('UINT', 0),
-					'max_doc_id'	=> array('UINT', 0),
-				),
-				'PRIMARY_KEY'	=> 'counter_id',
-			);
-			$this->db_tools->sql_create_table(SPHINX_TABLE, $table_data);
-
-			$sql = 'TRUNCATE TABLE ' . SPHINX_TABLE;
-			$this->db->sql_query($sql);
-
-			$data = array(
-				'counter_id'	=> '1',
-				'max_doc_id'	=> '0',
-			);
-			$sql = 'INSERT INTO ' . SPHINX_TABLE . ' ' . $this->db->sql_build_array('INSERT', $data);
-			$this->db->sql_query($sql);
-		}
-
-		return false;
-	}
-
-	/**
-	* Drop sphinx table
-	*
-	* @return string|bool error string is returned incase of errors otherwise false
-	*/
-	public function delete_index($acp_module, $u_action)
-	{
-		if (!$this->index_created())
-		{
-			return false;
-		}
-
-		$this->db_tools->sql_table_drop(SPHINX_TABLE);
-
-		return false;
-	}
-
-	/**
-	* Returns true if the sphinx table was created
-	*
-	* @return bool true if sphinx table was created
-	*/
-	public function index_created($allow_new_files = true)
-	{
-		$created = false;
-
-		if ($this->db_tools->sql_table_exists(SPHINX_TABLE))
-		{
-			$created = true;
-		}
-
-		return $created;
-	}
-
-	/**
-	* Returns an associative array containing information about the indexes
-	*
-	* @return string|bool Language string of error false otherwise
-	*/
-	public function index_stats()
-	{
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return array(
-			$this->user->lang['FULLTEXT_SPHINX_MAIN_POSTS']			=> ($this->index_created()) ? $this->stats['main_posts'] : 0,
-			$this->user->lang['FULLTEXT_SPHINX_DELTA_POSTS']			=> ($this->index_created()) ? $this->stats['total_posts'] - $this->stats['main_posts'] : 0,
-			$this->user->lang['FULLTEXT_MYSQL_TOTAL_POSTS']			=> ($this->index_created()) ? $this->stats['total_posts'] : 0,
-		);
-	}
-
-	/**
-	* Collects stats that can be displayed on the index maintenance page
-	*/
-	protected function get_stats()
-	{
-		if ($this->index_created())
-		{
-			$sql = 'SELECT COUNT(post_id) as total_posts
-				FROM ' . POSTS_TABLE;
-			$result = $this->db->sql_query($sql);
-			$this->stats['total_posts'] = (int) $this->db->sql_fetchfield('total_posts');
-			$this->db->sql_freeresult($result);
-
-			$sql = 'SELECT COUNT(p.post_id) as main_posts
-				FROM ' . POSTS_TABLE . ' p, ' . SPHINX_TABLE . ' m
-				WHERE p.post_id <= m.max_doc_id
-					AND m.counter_id = 1';
-			$result = $this->db->sql_query($sql);
-			$this->stats['main_posts'] = (int) $this->db->sql_fetchfield('main_posts');
-			$this->db->sql_freeresult($result);
-		}
-	}
-
-	/**
-	* Returns a list of options for the ACP to display
-	*
-	* @return associative array containing template and config variables
-	*/
-	public function acp()
-	{
-		$config_vars = array(
-			'fulltext_sphinx_data_path' => 'string',
-			'fulltext_sphinx_host' => 'string',
-			'fulltext_sphinx_port' => 'string',
-			'fulltext_sphinx_indexer_mem_limit' => 'int',
-		);
-
-		$tpl = '
-		<span class="error">' . $this->user->lang['FULLTEXT_SPHINX_CONFIGURE']. '</span>
-		<dl>
-			<dt><label for="fulltext_sphinx_data_path">' . $this->user->lang['FULLTEXT_SPHINX_DATA_PATH'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_DATA_PATH_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_data_path" type="text" size="40" maxlength="255" name="config[fulltext_sphinx_data_path]" value="' . $this->config['fulltext_sphinx_data_path'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_sphinx_host">' . $this->user->lang['FULLTEXT_SPHINX_HOST'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_HOST_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_host" type="text" size="40" maxlength="255" name="config[fulltext_sphinx_host]" value="' . $this->config['fulltext_sphinx_host'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_sphinx_port">' . $this->user->lang['FULLTEXT_SPHINX_PORT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_PORT_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_port" type="number" size="4" maxlength="10" name="config[fulltext_sphinx_port]" value="' . $this->config['fulltext_sphinx_port'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_sphinx_indexer_mem_limit">' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="number" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" /> ' . $this->user->lang['MIB'] . '</dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</span></dt>
-			<dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6" id="sphinx_config_data">' . htmlspecialchars($this->config_file_data) . '</textarea>' : $this->config_file_data) . '</dd>
-		<dl>
-		';
-
-		// These are fields required in the config table
-		return array(
-			'tpl'		=> $tpl,
-			'config'	=> $config_vars
-		);
-	}
-}
diff --git a/phpBB/includes/search/index.htm b/phpBB/includes/search/index.htm
deleted file mode 100644
index ee1f723a7d..0000000000
--- a/phpBB/includes/search/index.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-</body>
-</html>
diff --git a/phpBB/includes/search/sphinx/config.php b/phpBB/includes/search/sphinx/config.php
deleted file mode 100644
index f1864f0c8c..0000000000
--- a/phpBB/includes/search/sphinx/config.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* phpbb_search_sphinx_config
-* An object representing the sphinx configuration
-* Can read it from file and write it back out after modification
-* @package search
-*/
-class phpbb_search_sphinx_config
-{
-	private $sections = array();
-
-	/**
-	* Constructor which optionally loads data from a variable
-	*
-	* @param	string	$config_data	Variable containing the sphinx configuration data
-	*
-	* @access	public
-	*/
-	function __construct($config_data)
-	{
-		if ($config_data != '')
-		{
-			$this->read($config_data);
-		}
-	}
-
-	/**
-	* Get a section object by its name
-	*
-	* @param	string 								$name	The name of the section that shall be returned
-	* @return	phpbb_search_sphinx_config_section			The section object or null if none was found
-	*
-	* @access	public
-	*/
-	function get_section_by_name($name)
-	{
-		for ($i = 0, $size = sizeof($this->sections); $i < $size; $i++)
-		{
-			// Make sure this is really a section object and not a comment
-			if (($this->sections[$i] instanceof phpbb_search_sphinx_config_section) && $this->sections[$i]->get_name() == $name)
-			{
-				return $this->sections[$i];
-			}
-		}
-	}
-
-	/**
-	* Appends a new empty section to the end of the config
-	*
-	* @param	string								$name	The name for the new section
-	* @return	phpbb_search_sphinx_config_section			The newly created section object
-	*
-	* @access	public
-	*/
-	function add_section($name)
-	{
-		$this->sections[] = new phpbb_search_sphinx_config_section($name, '');
-		return $this->sections[sizeof($this->sections) - 1];
-	}
-
-	/**
-	* Reads the config file data
-	*
-	* @param	string	$config_data	The config file data
-	*
-	* @access	private
-	*/
-	function read($config_data)
-	{
-		$this->sections = array();
-
-		$section = null;
-		$found_opening_bracket = false;
-		$in_value = false;
-
-		foreach ($config_data as $i => $line)
-		{
-			// If the value of a variable continues to the next line because the line
-			// break was escaped then we don't trim leading space but treat it as a part of the value
-			if ($in_value)
-			{
-				$line = rtrim($line);
-			}
-			else
-			{
-				$line = trim($line);
-			}
-
-			// If we're not inside a section look for one
-			if (!$section)
-			{
-				// Add empty lines and comments as comment objects to the section list
-				// that way they're not deleted when reassembling the file from the sections
-				if (!$line || $line[0] == '#')
-				{
-					$this->sections[] = new phpbb_search_sphinx_config_comment($config_file[$i]);
-					continue;
-				}
-				else
-				{
-					// Otherwise we scan the line reading the section name until we find
-					// an opening curly bracket or a comment
-					$section_name = '';
-					$section_name_comment = '';
-					$found_opening_bracket = false;
-					for ($j = 0, $length = strlen($line); $j < $length; $j++)
-					{
-						if ($line[$j] == '#')
-						{
-							$section_name_comment = substr($line, $j);
-							break;
-						}
-
-						if ($found_opening_bracket)
-						{
-							continue;
-						}
-
-						if ($line[$j] == '{')
-						{
-							$found_opening_bracket = true;
-							continue;
-						}
-
-						$section_name .= $line[$j];
-					}
-
-					// And then we create the new section object
-					$section_name = trim($section_name);
-					$section = new phpbb_search_sphinx_config_section($section_name, $section_name_comment);
-				}
-			}
-			else
-			{
-				// If we're looking for variables inside a section
-				$skip_first = false;
-
-				// If we're not in a value continuing over the line feed
-				if (!$in_value)
-				{
-					// Then add empty lines and comments as comment objects to the variable list
-					// of this section so they're not deleted on reassembly
-					if (!$line || $line[0] == '#')
-					{
-						$section->add_variable(new phpbb_search_sphinx_config_comment($config_file[$i]));
-						continue;
-					}
-	
-					// As long as we haven't yet actually found an opening bracket for this section
-					// we treat everything as comments so it's not deleted either
-					if (!$found_opening_bracket)
-					{
-						if ($line[0] == '{')
-						{
-							$skip_first = true;
-							$line = substr($line, 1);
-							$found_opening_bracket = true;
-						}
-						else
-						{
-							$section->add_variable(new phpbb_search_sphinx_config_comment($config_file[$i]));
-							continue;
-						}
-					}
-				}
-
-				// If we did not find a comment in this line or still add to the previous 
-				// line's value ...
-				if ($line || $in_value)
-				{
-					if (!$in_value)
-					{
-						$name = '';
-						$value = '';
-						$comment = '';
-						$found_assignment = false;
-					}
-					$in_value = false;
-					$end_section = false;
-
-					/* ... then we should prase this line char by char:
-					 - first there's the variable name
-					 - then an equal sign
-					 - the variable value
-					 - possibly a backslash before the linefeed in this case we need to continue
-					   parsing the value in the next line
-					 - a # indicating that the rest of the line is a comment
-					 - a closing curly bracket indicating the end of this section*/
-					for ($j = 0, $length = strlen($line); $j < $length; $j++)
-					{
-						if ($line[$j] == '#')
-						{
-							$comment = substr($line, $j);
-							break;
-						}
-						else if ($line[$j] == '}')
-						{
-							$comment = substr($line, $j + 1);
-							$end_section = true;
-							break;
-						}
-						else if (!$found_assignment)
-						{
-							if ($line[$j] == '=')
-							{
-								$found_assignment = true;
-							}
-							else
-							{
-								$name .= $line[$j];
-							}
-						}
-						else
-						{
-							if ($line[$j] == '\\' && $j == $length - 1)
-							{
-								$value .= "\n";
-								$in_value = true;
-								// Go to the next line and keep processing the value in there
-								continue 2;
-							}
-							$value .= $line[$j];
-						}
-					}
-
-					// If a name and an equal sign were found then we have append a 
-					// new variable object to the section
-					if ($name && $found_assignment)
-					{
-						$section->add_variable(new phpbb_search_sphinx_config_variable(trim($name), trim($value), ($end_section) ? '' : $comment));
-						continue;
-					}
-
-					/* If we found a closing curly bracket this section has been completed
-					and we can append it to the section list and continue with looking for 
-					the next section */
-					if ($end_section)
-					{
-						$section->set_end_comment($comment);
-						$this->sections[] = $section;
-						$section = null;
-						continue;
-					}
-				}
-
-				// If we did not find anything meaningful up to here, then just treat it
-				// as a comment
-				$comment = ($skip_first) ? "\t" . substr(ltrim($config_file[$i]), 1) : $config_file[$i];
-				$section->add_variable(new phpbb_search_sphinx_config_comment($comment));
-			}
-		}
-
-	}
-
-	/**
-	* Returns the config data
-	*
-	* @return	string	$data	The config data that is generated
-	*
-	* @access	public
-	*/
-	function get_data()
-	{
-		$data = "";
-		foreach ($this->sections as $section)
-		{
-			$data .= $section->to_string();
-		}
-
-		return $data;
-	}
-}
diff --git a/phpBB/includes/search/sphinx/config_comment.php b/phpBB/includes/search/sphinx/config_comment.php
deleted file mode 100644
index 7f695dbf0c..0000000000
--- a/phpBB/includes/search/sphinx/config_comment.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* phpbb_search_sphinx_config_comment
-* Represents a comment inside the sphinx configuration
-*/
-class phpbb_search_sphinx_config_comment
-{
-	private $exact_string;
-
-	/**
-	* Create a new comment
-	*
-	* @param	string	$exact_string	The content of the comment including newlines, leading whitespace, etc.
-	*
-	* @access	public
-	*/
-	function __construct($exact_string)
-	{
-		$this->exact_string = $exact_string;
-	}
-
-	/**
-	* Simply returns the comment as it was created
-	*
-	* @return	string	The exact string that was specified in the constructor
-	*
-	* @access	public
-	*/
-	function to_string()
-	{
-		return $this->exact_string;
-	}
-}
diff --git a/phpBB/includes/search/sphinx/config_section.php b/phpBB/includes/search/sphinx/config_section.php
deleted file mode 100644
index 79c9c8563d..0000000000
--- a/phpBB/includes/search/sphinx/config_section.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* phpbb_search_sphinx_config_section
-* Represents a single section inside the sphinx configuration
-*/
-class phpbb_search_sphinx_config_section
-{
-	private $name;
-	private $comment;
-	private $end_comment;
-	private $variables = array();
-
-	/**
-	* Construct a new section
-	*
-	* @param	string	$name		Name of the section
-	* @param	string	$comment	Comment that should be appended after the name in the
-	*								textual format.
-	*
-	* @access	public
-	*/
-	function __construct($name, $comment)
-	{
-		$this->name = $name;
-		$this->comment = $comment;
-		$this->end_comment = '';
-	}
-
-	/**
-	* Add a variable object to the list of variables in this section
-	*
-	* @param	phpbb_search_sphinx_config_variable	$variable	The variable object
-	*
-	* @access	public
-	*/
-	function add_variable($variable)
-	{
-		$this->variables[] = $variable;
-	}
-
-	/**
-	* Adds a comment after the closing bracket in the textual representation
-	*
-	* @param	string	$end_comment
-	*
-	* @access	public
-	*/
-	function set_end_comment($end_comment)
-	{
-		$this->end_comment = $end_comment;
-	}
-
-	/**
-	* Getter for the name of this section
-	*
-	* @return	string	Section's name
-	*
-	* @access	public
-	*/
-	function get_name()
-	{
-		return $this->name;
-	}
-
-	/**
-	* Get a variable object by its name
-	*
-	* @param	string 								$name	The name of the variable that shall be returned
-	* @return	phpbb_search_sphinx_config_section			The first variable object from this section with the
-	*														given name or null if none was found
-	*
-	* @access	public
-	*/
-	function get_variable_by_name($name)
-	{
-		for ($i = 0, $size = sizeof($this->variables); $i < $size; $i++)
-		{
-			// Make sure this is a variable object and not a comment
-			if (($this->variables[$i] instanceof phpbb_search_sphinx_config_variable) && $this->variables[$i]->get_name() == $name)
-			{
-				return $this->variables[$i];
-			}
-		}
-	}
-
-	/**
-	* Deletes all variables with the given name
-	*
-	* @param	string	$name	The name of the variable objects that are supposed to be removed
-	*
-	* @access	public
-	*/
-	function delete_variables_by_name($name)
-	{
-		for ($i = 0, $size = sizeof($this->variables); $i < $size; $i++)
-		{
-			// Make sure this is a variable object and not a comment
-			if (($this->variables[$i] instanceof phpbb_search_sphinx_config_variable) && $this->variables[$i]->get_name() == $name)
-			{
-				array_splice($this->variables, $i, 1);
-				$i--;
-			}
-		}
-	}
-
-	/**
-	* Create a new variable object and append it to the variable list of this section
-	*
-	* @param	string								$name	The name for the new variable
-	* @param	string								$value	The value for the new variable
-	* @return	phpbb_search_sphinx_config_variable			Variable object that was created
-	*
-	* @access	public
-	*/
-	function create_variable($name, $value)
-	{
-		$this->variables[] = new phpbb_search_sphinx_config_variable($name, $value, '');
-		return $this->variables[sizeof($this->variables) - 1];
-	}
-
-	/**
-	* Turns this object into a string which can be written to a config file
-	*
-	* @return	string	Config data in textual form, parsable for sphinx
-	*
-	* @access	public
-	*/
-	function to_string()
-	{
-		$content = $this->name . ' ' . $this->comment . "\n{\n";
-
-		// Make sure we don't get too many newlines after the opening bracket
-		while (trim($this->variables[0]->to_string()) == '')
-		{
-			array_shift($this->variables);
-		}
-
-		foreach ($this->variables as $variable)
-		{
-			$content .= $variable->to_string();
-		}
-		$content .= '}' . $this->end_comment . "\n";
-
-		return $content;
-	}
-}
diff --git a/phpBB/includes/search/sphinx/config_variable.php b/phpBB/includes/search/sphinx/config_variable.php
deleted file mode 100644
index 2c1d35a49c..0000000000
--- a/phpBB/includes/search/sphinx/config_variable.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* phpbb_search_sphinx_config_variable
-* Represents a single variable inside the sphinx configuration
-*/
-class phpbb_search_sphinx_config_variable
-{
-	private $name;
-	private $value;
-	private $comment;
-
-	/**
-	* Constructs a new variable object
-	*
-	* @param	string	$name		Name of the variable
-	* @param	string	$value		Value of the variable
-	* @param	string	$comment	Optional comment after the variable in the
-	*								config file
-	*
-	* @access	public
-	*/
-	function __construct($name, $value, $comment)
-	{
-		$this->name = $name;
-		$this->value = $value;
-		$this->comment = $comment;
-	}
-
-	/**
-	* Getter for the variable's name
-	*
-	* @return	string	The variable object's name
-	*
-	* @access	public
-	*/
-	function get_name()
-	{
-		return $this->name;
-	}
-
-	/**
-	* Allows changing the variable's value
-	*
-	* @param	string	$value	New value for this variable
-	*
-	* @access	public
-	*/
-	function set_value($value)
-	{
-		$this->value = $value;
-	}
-
-	/**
-	* Turns this object into a string readable by sphinx
-	*
-	* @return	string	Config data in textual form
-	*
-	* @access	public
-	*/
-	function to_string()
-	{
-		return "\t" . $this->name . ' = ' . str_replace("\n", " \\\n", $this->value) . ' ' . $this->comment . "\n";
-	}
-}
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
deleted file mode 100644
index e0585b1523..0000000000
--- a/phpBB/includes/session.php
+++ /dev/null
@@ -1,1516 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Session class
-* @package phpBB3
-*/
-class phpbb_session
-{
-	var $cookie_data = array();
-	var $page = array();
-	var $data = array();
-	var $browser = '';
-	var $forwarded_for = '';
-	var $host = '';
-	var $session_id = '';
-	var $ip = '';
-	var $load = 0;
-	var $time_now = 0;
-	var $update_session_page = true;
-
-	/**
-	* Extract current session page
-	*
-	* @param string $root_path current root path (phpbb_root_path)
-	*/
-	static function extract_current_page($root_path)
-	{
-		global $request;
-
-		$page_array = array();
-
-		// First of all, get the request uri...
-		$script_name = htmlspecialchars_decode($request->server('PHP_SELF'));
-		$args = explode('&', htmlspecialchars_decode($request->server('QUERY_STRING')));
-
-		// If we are unable to get the script name we use REQUEST_URI as a failover and note it within the page array for easier support...
-		if (!$script_name)
-		{
-			$script_name = htmlspecialchars_decode($request->server('REQUEST_URI'));
-			$script_name = (($pos = strpos($script_name, '?')) !== false) ? substr($script_name, 0, $pos) : $script_name;
-			$page_array['failover'] = 1;
-		}
-
-		// Replace backslashes and doubled slashes (could happen on some proxy setups)
-		$script_name = str_replace(array('\\', '//'), '/', $script_name);
-
-		// Now, remove the sid and let us get a clean query string...
-		$use_args = array();
-
-		// Since some browser do not encode correctly we need to do this with some "special" characters...
-		// " -> %22, ' => %27, < -> %3C, > -> %3E
-		$find = array('"', "'", '<', '>');
-		$replace = array('%22', '%27', '%3C', '%3E');
-
-		foreach ($args as $key => $argument)
-		{
-			if (strpos($argument, 'sid=') === 0)
-			{
-				continue;
-			}
-
-			$use_args[] = str_replace($find, $replace, $argument);
-		}
-		unset($args);
-
-		// The following examples given are for an request uri of {path to the phpbb directory}/adm/index.php?i=10&b=2
-
-		// The current query string
-		$query_string = trim(implode('&', $use_args));
-
-		// basenamed page name (for example: index.php)
-		$page_name = (substr($script_name, -1, 1) == '/') ? '' : basename($script_name);
-		$page_name = urlencode(htmlspecialchars($page_name));
-
-		// current directory within the phpBB root (for example: adm)
-		$root_dirs = explode('/', str_replace('\\', '/', phpbb_realpath($root_path)));
-		$page_dirs = explode('/', str_replace('\\', '/', phpbb_realpath('./')));
-		$intersection = array_intersect_assoc($root_dirs, $page_dirs);
-
-		$root_dirs = array_diff_assoc($root_dirs, $intersection);
-		$page_dirs = array_diff_assoc($page_dirs, $intersection);
-
-		$page_dir = str_repeat('../', sizeof($root_dirs)) . implode('/', $page_dirs);
-
-		if ($page_dir && substr($page_dir, -1, 1) == '/')
-		{
-			$page_dir = substr($page_dir, 0, -1);
-		}
-
-		// Current page from phpBB root (for example: adm/index.php?i=10&b=2)
-		$page = (($page_dir) ? $page_dir . '/' : '') . $page_name . (($query_string) ? "?$query_string" : '');
-
-		// The script path from the webroot to the current directory (for example: /phpBB3/adm/) : always prefixed with / and ends in /
-		$script_path = trim(str_replace('\\', '/', dirname($script_name)));
-
-		// The script path from the webroot to the phpBB root (for example: /phpBB3/)
-		$script_dirs = explode('/', $script_path);
-		array_splice($script_dirs, -sizeof($page_dirs));
-		$root_script_path = implode('/', $script_dirs) . (sizeof($root_dirs) ? '/' . implode('/', $root_dirs) : '');
-
-		// We are on the base level (phpBB root == webroot), lets adjust the variables a bit...
-		if (!$root_script_path)
-		{
-			$root_script_path = ($page_dir) ? str_replace($page_dir, '', $script_path) : $script_path;
-		}
-
-		$script_path .= (substr($script_path, -1, 1) == '/') ? '' : '/';
-		$root_script_path .= (substr($root_script_path, -1, 1) == '/') ? '' : '/';
-
-		$page_array += array(
-			'page_name'			=> $page_name,
-			'page_dir'			=> $page_dir,
-
-			'query_string'		=> $query_string,
-			'script_path'		=> str_replace(' ', '%20', htmlspecialchars($script_path)),
-			'root_script_path'	=> str_replace(' ', '%20', htmlspecialchars($root_script_path)),
-
-			'page'				=> $page,
-			'forum'				=> request_var('f', 0),
-		);
-
-		return $page_array;
-	}
-
-	/**
-	* Get valid hostname/port. HTTP_HOST is used, SERVER_NAME if HTTP_HOST not present.
-	*/
-	function extract_current_hostname()
-	{
-		global $config, $request;
-
-		// Get hostname
-		$host = htmlspecialchars_decode($request->header('Host', $request->server('SERVER_NAME')));
-
-		// Should be a string and lowered
-		$host = (string) strtolower($host);
-
-		// If host is equal the cookie domain or the server name (if config is set), then we assume it is valid
-		if ((isset($config['cookie_domain']) && $host === $config['cookie_domain']) || (isset($config['server_name']) && $host === $config['server_name']))
-		{
-			return $host;
-		}
-
-		// Is the host actually a IP? If so, we use the IP... (IPv4)
-		if (long2ip(ip2long($host)) === $host)
-		{
-			return $host;
-		}
-
-		// Now return the hostname (this also removes any port definition). The http:// is prepended to construct a valid URL, hosts never have a scheme assigned
-		$host = @parse_url('http://' . $host);
-		$host = (!empty($host['host'])) ? $host['host'] : '';
-
-		// Remove any portions not removed by parse_url (#)
-		$host = str_replace('#', '', $host);
-
-		// If, by any means, the host is now empty, we will use a "best approach" way to guess one
-		if (empty($host))
-		{
-			if (!empty($config['server_name']))
-			{
-				$host = $config['server_name'];
-			}
-			else if (!empty($config['cookie_domain']))
-			{
-				$host = (strpos($config['cookie_domain'], '.') === 0) ? substr($config['cookie_domain'], 1) : $config['cookie_domain'];
-			}
-			else
-			{
-				// Set to OS hostname or localhost
-				$host = (function_exists('php_uname')) ? php_uname('n') : 'localhost';
-			}
-		}
-
-		// It may be still no valid host, but for sure only a hostname (we may further expand on the cookie domain... if set)
-		return $host;
-	}
-
-	/**
-	* Start session management
-	*
-	* This is where all session activity begins. We gather various pieces of
-	* information from the client and server. We test to see if a session already
-	* exists. If it does, fine and dandy. If it doesn't we'll go on to create a
-	* new one ... pretty logical heh? We also examine the system load (if we're
-	* running on a system which makes such information readily available) and
-	* halt if it's above an admin definable limit.
-	*
-	* @param bool $update_session_page if true the session page gets updated.
-	*			This can be set to circumvent certain scripts to update the users last visited page.
-	*/
-	function session_begin($update_session_page = true)
-	{
-		global $phpEx, $SID, $_SID, $_EXTRA_URL, $db, $config, $phpbb_root_path;
-		global $request, $phpbb_container;
-
-		// Give us some basic information
-		$this->time_now				= time();
-		$this->cookie_data			= array('u' => 0, 'k' => '');
-		$this->update_session_page	= $update_session_page;
-		$this->browser				= $request->header('User-Agent');
-		$this->referer				= $request->header('Referer');
-		$this->forwarded_for		= $request->header('X-Forwarded-For');
-
-		$this->host					= $this->extract_current_hostname();
-		$this->page					= $this->extract_current_page($phpbb_root_path);
-
-		// if the forwarded for header shall be checked we have to validate its contents
-		if ($config['forwarded_for_check'])
-		{
-			$this->forwarded_for = preg_replace('# {2,}#', ' ', str_replace(',', ' ', $this->forwarded_for));
-
-			// split the list of IPs
-			$ips = explode(' ', $this->forwarded_for);
-			foreach ($ips as $ip)
-			{
-				// check IPv4 first, the IPv6 is hopefully only going to be used very seldomly
-				if (!empty($ip) && !preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip))
-				{
-					// contains invalid data, don't use the forwarded for header
-					$this->forwarded_for = '';
-					break;
-				}
-			}
-		}
-		else
-		{
-			$this->forwarded_for = '';
-		}
-
-		if ($request->is_set($config['cookie_name'] . '_sid', phpbb_request_interface::COOKIE) || $request->is_set($config['cookie_name'] . '_u', phpbb_request_interface::COOKIE))
-		{
-			$this->cookie_data['u'] = request_var($config['cookie_name'] . '_u', 0, false, true);
-			$this->cookie_data['k'] = request_var($config['cookie_name'] . '_k', '', false, true);
-			$this->session_id 		= request_var($config['cookie_name'] . '_sid', '', false, true);
-
-			$SID = (defined('NEED_SID')) ? '?sid=' . $this->session_id : '?sid=';
-			$_SID = (defined('NEED_SID')) ? $this->session_id : '';
-
-			if (empty($this->session_id))
-			{
-				$this->session_id = $_SID = request_var('sid', '');
-				$SID = '?sid=' . $this->session_id;
-				$this->cookie_data = array('u' => 0, 'k' => '');
-			}
-		}
-		else
-		{
-			$this->session_id = $_SID = request_var('sid', '');
-			$SID = '?sid=' . $this->session_id;
-		}
-
-		$_EXTRA_URL = array();
-
-		// Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests
-		// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.
-		$this->ip = htmlspecialchars_decode($request->server('REMOTE_ADDR'));
-		$this->ip = preg_replace('# {2,}#', ' ', str_replace(',', ' ', $this->ip));
-
-		// split the list of IPs
-		$ips = explode(' ', trim($this->ip));
-
-		// Default IP if REMOTE_ADDR is invalid
-		$this->ip = '127.0.0.1';
-
-		foreach ($ips as $ip)
-		{
-			if (function_exists('phpbb_ip_normalise'))
-			{
-				// Normalise IP address
-				$ip = phpbb_ip_normalise($ip);
-
-				if (empty($ip))
-				{
-					// IP address is invalid.
-					break;
-				}
-
-				// IP address is valid.
-				$this->ip = $ip;
-
-				// Skip legacy code.
-				continue;
-			}
-
-			if (preg_match(get_preg_expression('ipv4'), $ip))
-			{
-				$this->ip = $ip;
-			}
-			else if (preg_match(get_preg_expression('ipv6'), $ip))
-			{
-				// Quick check for IPv4-mapped address in IPv6
-				if (stripos($ip, '::ffff:') === 0)
-				{
-					$ipv4 = substr($ip, 7);
-
-					if (preg_match(get_preg_expression('ipv4'), $ipv4))
-					{
-						$ip = $ipv4;
-					}
-				}
-
-				$this->ip = $ip;
-			}
-			else
-			{
-				// We want to use the last valid address in the chain
-				// Leave foreach loop when address is invalid
-				break;
-			}
-		}
-
-		$this->load = false;
-
-		// Load limit check (if applicable)
-		if ($config['limit_load'] || $config['limit_search_load'])
-		{
-			if ((function_exists('sys_getloadavg') && $load = sys_getloadavg()) || ($load = explode(' ', @file_get_contents('/proc/loadavg'))))
-			{
-				$this->load = array_slice($load, 0, 1);
-				$this->load = floatval($this->load[0]);
-			}
-			else
-			{
-				set_config('limit_load', '0');
-				set_config('limit_search_load', '0');
-			}
-		}
-
-		// if no session id is set, redirect to index.php
-		$session_id = $request->variable('sid', '');
-		if (defined('NEED_SID') && (empty($session_id) || $this->session_id !== $session_id))
-		{
-			send_status_line(401, 'Unauthorized');
-			redirect(append_sid("{$phpbb_root_path}index.$phpEx"));
-		}
-
-		// if session id is set
-		if (!empty($this->session_id))
-		{
-			$sql = 'SELECT u.*, s.*
-				FROM ' . SESSIONS_TABLE . ' s, ' . USERS_TABLE . " u
-				WHERE s.session_id = '" . $db->sql_escape($this->session_id) . "'
-					AND u.user_id = s.session_user_id";
-			$result = $db->sql_query($sql);
-			$this->data = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			// Did the session exist in the DB?
-			if (isset($this->data['user_id']))
-			{
-				// Validate IP length according to admin ... enforces an IP
-				// check on bots if admin requires this
-//				$quadcheck = ($config['ip_check_bot'] && $this->data['user_type'] & USER_BOT) ? 4 : $config['ip_check'];
-
-				if (strpos($this->ip, ':') !== false && strpos($this->data['session_ip'], ':') !== false)
-				{
-					$s_ip = short_ipv6($this->data['session_ip'], $config['ip_check']);
-					$u_ip = short_ipv6($this->ip, $config['ip_check']);
-				}
-				else
-				{
-					$s_ip = implode('.', array_slice(explode('.', $this->data['session_ip']), 0, $config['ip_check']));
-					$u_ip = implode('.', array_slice(explode('.', $this->ip), 0, $config['ip_check']));
-				}
-
-				$s_browser = ($config['browser_check']) ? trim(strtolower(substr($this->data['session_browser'], 0, 149))) : '';
-				$u_browser = ($config['browser_check']) ? trim(strtolower(substr($this->browser, 0, 149))) : '';
-
-				$s_forwarded_for = ($config['forwarded_for_check']) ? substr($this->data['session_forwarded_for'], 0, 254) : '';
-				$u_forwarded_for = ($config['forwarded_for_check']) ? substr($this->forwarded_for, 0, 254) : '';
-
-				// referer checks
-				// The @ before $config['referer_validation'] suppresses notices present while running the updater
-				$check_referer_path = (@$config['referer_validation'] == REFERER_VALIDATE_PATH);
-				$referer_valid = true;
-
-				// we assume HEAD and TRACE to be foul play and thus only whitelist GET
-				if (@$config['referer_validation'] && strtolower($request->server('REQUEST_METHOD')) !== 'get')
-				{
-					$referer_valid = $this->validate_referer($check_referer_path);
-				}
-
-				if ($u_ip === $s_ip && $s_browser === $u_browser && $s_forwarded_for === $u_forwarded_for && $referer_valid)
-				{
-					$session_expired = false;
-
-					// Check whether the session is still valid if we have one
-					$method = basename(trim($config['auth_method']));
-
-					$provider = $phpbb_container->get('auth.provider.' . $method);
-
-					if (!($provider instanceof phpbb_auth_provider_interface))
-					{
-						throw new \RuntimeException($provider . ' must implement phpbb_auth_provider_interface');
-					}
-
-					$ret = $provider->validate_session($this->data);
-					if ($ret !== null && !$ret)
-					{
-						$session_expired = true;
-					}
-
-					if (!$session_expired)
-					{
-						// Check the session length timeframe if autologin is not enabled.
-						// Else check the autologin length... and also removing those having autologin enabled but no longer allowed board-wide.
-						if (!$this->data['session_autologin'])
-						{
-							if ($this->data['session_time'] < $this->time_now - ($config['session_length'] + 60))
-							{
-								$session_expired = true;
-							}
-						}
-						else if (!$config['allow_autologin'] || ($config['max_autologin_time'] && $this->data['session_time'] < $this->time_now - (86400 * (int) $config['max_autologin_time']) + 60))
-						{
-							$session_expired = true;
-						}
-					}
-
-					if (!$session_expired)
-					{
-						// Only update session DB a minute or so after last update or if page changes
-						if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page']))
-						{
-							$sql_ary = array('session_time' => $this->time_now);
-
-							if ($this->update_session_page)
-							{
-								$sql_ary['session_page'] = substr($this->page['page'], 0, 199);
-								$sql_ary['session_forum_id'] = $this->page['forum'];
-							}
-
-							$db->sql_return_on_error(true);
-
-							$this->update_session($sql_ary);
-
-							$db->sql_return_on_error(false);
-
-							// If the database is not yet updated, there will be an error due to the session_forum_id
-							// @todo REMOVE for 3.0.2
-							if ($result === false)
-							{
-								unset($sql_ary['session_forum_id']);
-
-								$this->update_session($sql_ary);
-							}
-
-							if ($this->data['user_id'] != ANONYMOUS && !empty($config['new_member_post_limit']) && $this->data['user_new'] && $config['new_member_post_limit'] <= $this->data['user_posts'])
-							{
-								$this->leave_newly_registered();
-							}
-						}
-
-						$this->data['is_registered'] = ($this->data['user_id'] != ANONYMOUS && ($this->data['user_type'] == USER_NORMAL || $this->data['user_type'] == USER_FOUNDER)) ? true : false;
-						$this->data['is_bot'] = (!$this->data['is_registered'] && $this->data['user_id'] != ANONYMOUS) ? true : false;
-						$this->data['user_lang'] = basename($this->data['user_lang']);
-
-						return true;
-					}
-				}
-				else
-				{
-					// Added logging temporarly to help debug bugs...
-					if (defined('DEBUG') && $this->data['user_id'] != ANONYMOUS)
-					{
-						if ($referer_valid)
-						{
-							add_log('critical', 'LOG_IP_BROWSER_FORWARDED_CHECK', $u_ip, $s_ip, $u_browser, $s_browser, htmlspecialchars($u_forwarded_for), htmlspecialchars($s_forwarded_for));
-						}
-						else
-						{
-							add_log('critical', 'LOG_REFERER_INVALID', $this->referer);
-						}
-					}
-				}
-			}
-		}
-
-		// If we reach here then no (valid) session exists. So we'll create a new one
-		return $this->session_create();
-	}
-
-	/**
-	* Create a new session
-	*
-	* If upon trying to start a session we discover there is nothing existing we
-	* jump here. Additionally this method is called directly during login to regenerate
-	* the session for the specific user. In this method we carry out a number of tasks;
-	* garbage collection, (search)bot checking, banned user comparison. Basically
-	* though this method will result in a new session for a specific user.
-	*/
-	function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true)
-	{
-		global $SID, $_SID, $db, $config, $cache, $phpbb_root_path, $phpEx, $phpbb_container;
-
-		$this->data = array();
-
-		/* Garbage collection ... remove old sessions updating user information
-		// if necessary. It means (potentially) 11 queries but only infrequently
-		if ($this->time_now > $config['session_last_gc'] + $config['session_gc'])
-		{
-			$this->session_gc();
-		}*/
-
-		// Do we allow autologin on this board? No? Then override anything
-		// that may be requested here
-		if (!$config['allow_autologin'])
-		{
-			$this->cookie_data['k'] = $persist_login = false;
-		}
-
-		/**
-		* Here we do a bot check, oh er saucy! No, not that kind of bot
-		* check. We loop through the list of bots defined by the admin and
-		* see if we have any useragent and/or IP matches. If we do, this is a
-		* bot, act accordingly
-		*/
-		$bot = false;
-		$active_bots = $cache->obtain_bots();
-
-		foreach ($active_bots as $row)
-		{
-			if ($row['bot_agent'] && preg_match('#' . str_replace('\*', '.*?', preg_quote($row['bot_agent'], '#')) . '#i', $this->browser))
-			{
-				$bot = $row['user_id'];
-			}
-
-			// If ip is supplied, we will make sure the ip is matching too...
-			if ($row['bot_ip'] && ($bot || !$row['bot_agent']))
-			{
-				// Set bot to false, then we only have to set it to true if it is matching
-				$bot = false;
-
-				foreach (explode(',', $row['bot_ip']) as $bot_ip)
-				{
-					$bot_ip = trim($bot_ip);
-
-					if (!$bot_ip)
-					{
-						continue;
-					}
-
-					if (strpos($this->ip, $bot_ip) === 0)
-					{
-						$bot = (int) $row['user_id'];
-						break;
-					}
-				}
-			}
-
-			if ($bot)
-			{
-				break;
-			}
-		}
-
-		$method = basename(trim($config['auth_method']));
-
-		$provider = $phpbb_container->get('auth.provider.' . $method);
-		$this->data = $provider->autologin();
-
-		if (sizeof($this->data))
-		{
-			$this->cookie_data['k'] = '';
-			$this->cookie_data['u'] = $this->data['user_id'];
-		}
-
-		// If we're presented with an autologin key we'll join against it.
-		// Else if we've been passed a user_id we'll grab data based on that
-		if (isset($this->cookie_data['k']) && $this->cookie_data['k'] && $this->cookie_data['u'] && !sizeof($this->data))
-		{
-			$sql = 'SELECT u.*
-				FROM ' . USERS_TABLE . ' u, ' . SESSIONS_KEYS_TABLE . ' k
-				WHERE u.user_id = ' . (int) $this->cookie_data['u'] . '
-					AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ")
-					AND k.user_id = u.user_id
-					AND k.key_id = '" . $db->sql_escape(md5($this->cookie_data['k'])) . "'";
-			$result = $db->sql_query($sql);
-			$this->data = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-			$bot = false;
-		}
-		else if ($user_id !== false && !sizeof($this->data))
-		{
-			$this->cookie_data['k'] = '';
-			$this->cookie_data['u'] = $user_id;
-
-			$sql = 'SELECT *
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . (int) $this->cookie_data['u'] . '
-					AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')';
-			$result = $db->sql_query($sql);
-			$this->data = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-			$bot = false;
-		}
-
-		// Bot user, if they have a SID in the Request URI we need to get rid of it
-		// otherwise they'll index this page with the SID, duplicate content oh my!
-		if ($bot && isset($_GET['sid']))
-		{
-			send_status_line(301, 'Moved Permanently');
-			redirect(build_url(array('sid')));
-		}
-
-		// If no data was returned one or more of the following occurred:
-		// Key didn't match one in the DB
-		// User does not exist
-		// User is inactive
-		// User is bot
-		if (!sizeof($this->data) || !is_array($this->data))
-		{
-			$this->cookie_data['k'] = '';
-			$this->cookie_data['u'] = ($bot) ? $bot : ANONYMOUS;
-
-			if (!$bot)
-			{
-				$sql = 'SELECT *
-					FROM ' . USERS_TABLE . '
-					WHERE user_id = ' . (int) $this->cookie_data['u'];
-			}
-			else
-			{
-				// We give bots always the same session if it is not yet expired.
-				$sql = 'SELECT u.*, s.*
-					FROM ' . USERS_TABLE . ' u
-					LEFT JOIN ' . SESSIONS_TABLE . ' s ON (s.session_user_id = u.user_id)
-					WHERE u.user_id = ' . (int) $bot;
-			}
-
-			$result = $db->sql_query($sql);
-			$this->data = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-		}
-
-		if ($this->data['user_id'] != ANONYMOUS && !$bot)
-		{
-			$this->data['session_last_visit'] = (isset($this->data['session_time']) && $this->data['session_time']) ? $this->data['session_time'] : (($this->data['user_lastvisit']) ? $this->data['user_lastvisit'] : time());
-		}
-		else
-		{
-			$this->data['session_last_visit'] = $this->time_now;
-		}
-
-		// Force user id to be integer...
-		$this->data['user_id'] = (int) $this->data['user_id'];
-
-		// At this stage we should have a filled data array, defined cookie u and k data.
-		// data array should contain recent session info if we're a real user and a recent
-		// session exists in which case session_id will also be set
-
-		// Is user banned? Are they excluded? Won't return on ban, exists within method
-		if ($this->data['user_type'] != USER_FOUNDER)
-		{
-			if (!$config['forwarded_for_check'])
-			{
-				$this->check_ban($this->data['user_id'], $this->ip);
-			}
-			else
-			{
-				$ips = explode(' ', $this->forwarded_for);
-				$ips[] = $this->ip;
-				$this->check_ban($this->data['user_id'], $ips);
-			}
-		}
-
-		$this->data['is_registered'] = (!$bot && $this->data['user_id'] != ANONYMOUS && ($this->data['user_type'] == USER_NORMAL || $this->data['user_type'] == USER_FOUNDER)) ? true : false;
-		$this->data['is_bot'] = ($bot) ? true : false;
-
-		// If our friend is a bot, we re-assign a previously assigned session
-		if ($this->data['is_bot'] && $bot == $this->data['user_id'] && $this->data['session_id'])
-		{
-			// Only assign the current session if the ip, browser and forwarded_for match...
-			if (strpos($this->ip, ':') !== false && strpos($this->data['session_ip'], ':') !== false)
-			{
-				$s_ip = short_ipv6($this->data['session_ip'], $config['ip_check']);
-				$u_ip = short_ipv6($this->ip, $config['ip_check']);
-			}
-			else
-			{
-				$s_ip = implode('.', array_slice(explode('.', $this->data['session_ip']), 0, $config['ip_check']));
-				$u_ip = implode('.', array_slice(explode('.', $this->ip), 0, $config['ip_check']));
-			}
-
-			$s_browser = ($config['browser_check']) ? trim(strtolower(substr($this->data['session_browser'], 0, 149))) : '';
-			$u_browser = ($config['browser_check']) ? trim(strtolower(substr($this->browser, 0, 149))) : '';
-
-			$s_forwarded_for = ($config['forwarded_for_check']) ? substr($this->data['session_forwarded_for'], 0, 254) : '';
-			$u_forwarded_for = ($config['forwarded_for_check']) ? substr($this->forwarded_for, 0, 254) : '';
-
-			if ($u_ip === $s_ip && $s_browser === $u_browser && $s_forwarded_for === $u_forwarded_for)
-			{
-				$this->session_id = $this->data['session_id'];
-
-				// Only update session DB a minute or so after last update or if page changes
-				if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page']))
-				{
-					$this->data['session_time'] = $this->data['session_last_visit'] = $this->time_now;
-
-					$sql_ary = array('session_time' => $this->time_now, 'session_last_visit' => $this->time_now, 'session_admin' => 0);
-
-					if ($this->update_session_page)
-					{
-						$sql_ary['session_page'] = substr($this->page['page'], 0, 199);
-						$sql_ary['session_forum_id'] = $this->page['forum'];
-					}
-
-					$this->update_session($sql_ary);
-
-					// Update the last visit time
-					$sql = 'UPDATE ' . USERS_TABLE . '
-						SET user_lastvisit = ' . (int) $this->data['session_time'] . '
-						WHERE user_id = ' . (int) $this->data['user_id'];
-					$db->sql_query($sql);
-				}
-
-				$SID = '?sid=';
-				$_SID = '';
-				return true;
-			}
-			else
-			{
-				// If the ip and browser does not match make sure we only have one bot assigned to one session
-				$db->sql_query('DELETE FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = ' . $this->data['user_id']);
-			}
-		}
-
-		$session_autologin = (($this->cookie_data['k'] || $persist_login) && $this->data['is_registered']) ? true : false;
-		$set_admin = ($set_admin && $this->data['is_registered']) ? true : false;
-
-		// Create or update the session
-		$sql_ary = array(
-			'session_user_id'		=> (int) $this->data['user_id'],
-			'session_start'			=> (int) $this->time_now,
-			'session_last_visit'	=> (int) $this->data['session_last_visit'],
-			'session_time'			=> (int) $this->time_now,
-			'session_browser'		=> (string) trim(substr($this->browser, 0, 149)),
-			'session_forwarded_for'	=> (string) $this->forwarded_for,
-			'session_ip'			=> (string) $this->ip,
-			'session_autologin'		=> ($session_autologin) ? 1 : 0,
-			'session_admin'			=> ($set_admin) ? 1 : 0,
-			'session_viewonline'	=> ($viewonline) ? 1 : 0,
-		);
-
-		if ($this->update_session_page)
-		{
-			$sql_ary['session_page'] = (string) substr($this->page['page'], 0, 199);
-			$sql_ary['session_forum_id'] = $this->page['forum'];
-		}
-
-		$db->sql_return_on_error(true);
-
-		$sql = 'DELETE
-			FROM ' . SESSIONS_TABLE . '
-			WHERE session_id = \'' . $db->sql_escape($this->session_id) . '\'
-				AND session_user_id = ' . ANONYMOUS;
-
-		if (!defined('IN_ERROR_HANDLER') && (!$this->session_id || !$db->sql_query($sql) || !$db->sql_affectedrows()))
-		{
-			// Limit new sessions in 1 minute period (if required)
-			if (empty($this->data['session_time']) && $config['active_sessions'])
-			{
-//				$db->sql_return_on_error(false);
-
-				$sql = 'SELECT COUNT(session_id) AS sessions
-					FROM ' . SESSIONS_TABLE . '
-					WHERE session_time >= ' . ($this->time_now - 60);
-				$result = $db->sql_query($sql);
-				$row = $db->sql_fetchrow($result);
-				$db->sql_freeresult($result);
-
-				if ((int) $row['sessions'] > (int) $config['active_sessions'])
-				{
-					send_status_line(503, 'Service Unavailable');
-					trigger_error('BOARD_UNAVAILABLE');
-				}
-			}
-		}
-
-		// Since we re-create the session id here, the inserted row must be unique. Therefore, we display potential errors.
-		// Commented out because it will not allow forums to update correctly
-//		$db->sql_return_on_error(false);
-
-		// Something quite important: session_page always holds the *last* page visited, except for the *first* visit.
-		// We are not able to simply have an empty session_page btw, therefore we need to tell phpBB how to detect this special case.
-		// If the session id is empty, we have a completely new one and will set an "identifier" here. This identifier is able to be checked later.
-		if (empty($this->data['session_id']))
-		{
-			// This is a temporary variable, only set for the very first visit
-			$this->data['session_created'] = true;
-		}
-
-		$this->session_id = $this->data['session_id'] = md5(unique_id());
-
-		$sql_ary['session_id'] = (string) $this->session_id;
-		$sql_ary['session_page'] = (string) substr($this->page['page'], 0, 199);
-		$sql_ary['session_forum_id'] = $this->page['forum'];
-
-		$sql = 'INSERT INTO ' . SESSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-		$db->sql_query($sql);
-
-		$db->sql_return_on_error(false);
-
-		// Regenerate autologin/persistent login key
-		if ($session_autologin)
-		{
-			$this->set_login_key();
-		}
-
-		// refresh data
-		$SID = '?sid=' . $this->session_id;
-		$_SID = $this->session_id;
-		$this->data = array_merge($this->data, $sql_ary);
-
-		if (!$bot)
-		{
-			$cookie_expire = $this->time_now + (($config['max_autologin_time']) ? 86400 * (int) $config['max_autologin_time'] : 31536000);
-
-			$this->set_cookie('u', $this->cookie_data['u'], $cookie_expire);
-			$this->set_cookie('k', $this->cookie_data['k'], $cookie_expire);
-			$this->set_cookie('sid', $this->session_id, $cookie_expire);
-
-			unset($cookie_expire);
-
-			$sql = 'SELECT COUNT(session_id) AS sessions
-					FROM ' . SESSIONS_TABLE . '
-					WHERE session_user_id = ' . (int) $this->data['user_id'] . '
-					AND session_time >= ' . (int) ($this->time_now - (max($config['session_length'], $config['form_token_lifetime'])));
-			$result = $db->sql_query($sql);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			if ((int) $row['sessions'] <= 1 || empty($this->data['user_form_salt']))
-			{
-				$this->data['user_form_salt'] = unique_id();
-				// Update the form key
-				$sql = 'UPDATE ' . USERS_TABLE . '
-					SET user_form_salt = \'' . $db->sql_escape($this->data['user_form_salt']) . '\'
-					WHERE user_id = ' . (int) $this->data['user_id'];
-				$db->sql_query($sql);
-			}
-		}
-		else
-		{
-			$this->data['session_time'] = $this->data['session_last_visit'] = $this->time_now;
-
-			// Update the last visit time
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_lastvisit = ' . (int) $this->data['session_time'] . '
-				WHERE user_id = ' . (int) $this->data['user_id'];
-			$db->sql_query($sql);
-
-			$SID = '?sid=';
-			$_SID = '';
-		}
-
-		return true;
-	}
-
-	/**
-	* Kills a session
-	*
-	* This method does what it says on the tin. It will delete a pre-existing session.
-	* It resets cookie information (destroying any autologin key within that cookie data)
-	* and update the users information from the relevant session data. It will then
-	* grab guest user information.
-	*/
-	function session_kill($new_session = true)
-	{
-		global $SID, $_SID, $db, $config, $phpbb_root_path, $phpEx, $phpbb_container;
-
-		$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
-			WHERE session_id = '" . $db->sql_escape($this->session_id) . "'
-				AND session_user_id = " . (int) $this->data['user_id'];
-		$db->sql_query($sql);
-
-		// Allow connecting logout with external auth method logout
-		$method = basename(trim($config['auth_method']));
-
-		$provider = $phpbb_container->get('auth.provider.' . $method);
-		$provider->logout($this->data, $new_session);
-
-		if ($this->data['user_id'] != ANONYMOUS)
-		{
-			// Delete existing session, update last visit info first!
-			if (!isset($this->data['session_time']))
-			{
-				$this->data['session_time'] = time();
-			}
-
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_lastvisit = ' . (int) $this->data['session_time'] . '
-				WHERE user_id = ' . (int) $this->data['user_id'];
-			$db->sql_query($sql);
-
-			if ($this->cookie_data['k'])
-			{
-				$sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . '
-					WHERE user_id = ' . (int) $this->data['user_id'] . "
-						AND key_id = '" . $db->sql_escape(md5($this->cookie_data['k'])) . "'";
-				$db->sql_query($sql);
-			}
-
-			// Reset the data array
-			$this->data = array();
-
-			$sql = 'SELECT *
-				FROM ' . USERS_TABLE . '
-				WHERE user_id = ' . ANONYMOUS;
-			$result = $db->sql_query($sql);
-			$this->data = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-		}
-
-		$cookie_expire = $this->time_now - 31536000;
-		$this->set_cookie('u', '', $cookie_expire);
-		$this->set_cookie('k', '', $cookie_expire);
-		$this->set_cookie('sid', '', $cookie_expire);
-		unset($cookie_expire);
-
-		$SID = '?sid=';
-		$this->session_id = $_SID = '';
-
-		// To make sure a valid session is created we create one for the anonymous user
-		if ($new_session)
-		{
-			$this->session_create(ANONYMOUS);
-		}
-
-		return true;
-	}
-
-	/**
-	* Session garbage collection
-	*
-	* This looks a lot more complex than it really is. Effectively we are
-	* deleting any sessions older than an admin definable limit. Due to the
-	* way in which we maintain session data we have to ensure we update user
-	* data before those sessions are destroyed. In addition this method
-	* removes autologin key information that is older than an admin defined
-	* limit.
-	*/
-	function session_gc()
-	{
-		global $db, $config, $phpbb_root_path, $phpEx;
-
-		$batch_size = 10;
-
-		if (!$this->time_now)
-		{
-			$this->time_now = time();
-		}
-
-		// Firstly, delete guest sessions
-		$sql = 'DELETE FROM ' . SESSIONS_TABLE . '
-			WHERE session_user_id = ' . ANONYMOUS . '
-				AND session_time < ' . (int) ($this->time_now - $config['session_length']);
-		$db->sql_query($sql);
-
-		// Get expired sessions, only most recent for each user
-		$sql = 'SELECT session_user_id, session_page, MAX(session_time) AS recent_time
-			FROM ' . SESSIONS_TABLE . '
-			WHERE session_time < ' . ($this->time_now - $config['session_length']) . '
-			GROUP BY session_user_id, session_page';
-		$result = $db->sql_query_limit($sql, $batch_size);
-
-		$del_user_id = array();
-		$del_sessions = 0;
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_lastvisit = ' . (int) $row['recent_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "'
-				WHERE user_id = " . (int) $row['session_user_id'];
-			$db->sql_query($sql);
-
-			$del_user_id[] = (int) $row['session_user_id'];
-			$del_sessions++;
-		}
-		$db->sql_freeresult($result);
-
-		if (sizeof($del_user_id))
-		{
-			// Delete expired sessions
-			$sql = 'DELETE FROM ' . SESSIONS_TABLE . '
-				WHERE ' . $db->sql_in_set('session_user_id', $del_user_id) . '
-					AND session_time < ' . ($this->time_now - $config['session_length']);
-			$db->sql_query($sql);
-		}
-
-		if ($del_sessions < $batch_size)
-		{
-			// Less than 10 users, update gc timer ... else we want gc
-			// called again to delete other sessions
-			set_config('session_last_gc', $this->time_now, true);
-
-			if ($config['max_autologin_time'])
-			{
-				$sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . '
-					WHERE last_login < ' . (time() - (86400 * (int) $config['max_autologin_time']));
-				$db->sql_query($sql);
-			}
-
-			// only called from CRON; should be a safe workaround until the infrastructure gets going
-			if (!class_exists('phpbb_captcha_factory', false))
-			{
-				include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx);
-			}
-			phpbb_captcha_factory::garbage_collect($config['captcha_plugin']);
-
-			$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
-				WHERE attempt_time < ' . (time() - (int) $config['ip_login_limit_time']);
-			$db->sql_query($sql);
-		}
-
-		return;
-	}
-
-	/**
-	* Sets a cookie
-	*
-	* Sets a cookie of the given name with the specified data for the given length of time. If no time is specified, a session cookie will be set.
-	*
-	* @param string $name		Name of the cookie, will be automatically prefixed with the phpBB cookie name. track becomes [cookie_name]_track then.
-	* @param string $cookiedata	The data to hold within the cookie
-	* @param int $cookietime	The expiration time as UNIX timestamp. If 0 is provided, a session cookie is set.
-	*/
-	function set_cookie($name, $cookiedata, $cookietime)
-	{
-		global $config;
-
-		$name_data = rawurlencode($config['cookie_name'] . '_' . $name) . '=' . rawurlencode($cookiedata);
-		$expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime);
-		$domain = (!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain'];
-
-		header('Set-Cookie: ' . $name_data . (($cookietime) ? '; expires=' . $expire : '') . '; path=' . $config['cookie_path'] . $domain . ((!$config['cookie_secure']) ? '' : '; secure') . '; HttpOnly', false);
-	}
-
-	/**
-	* Check for banned user
-	*
-	* Checks whether the supplied user is banned by id, ip or email. If no parameters
-	* are passed to the method pre-existing session data is used. If $return is false
-	* this routine does not return on finding a banned user, it outputs a relevant
-	* message and stops execution.
-	*
-	* @param string|array	$user_ips	Can contain a string with one IP or an array of multiple IPs
-	*/
-	function check_ban($user_id = false, $user_ips = false, $user_email = false, $return = false)
-	{
-		global $config, $db;
-
-		if (defined('IN_CHECK_BAN'))
-		{
-			return;
-		}
-
-		$banned = false;
-		$cache_ttl = 3600;
-		$where_sql = array();
-
-		$sql = 'SELECT ban_ip, ban_userid, ban_email, ban_exclude, ban_give_reason, ban_end
-			FROM ' . BANLIST_TABLE . '
-			WHERE ';
-
-		// Determine which entries to check, only return those
-		if ($user_email === false)
-		{
-			$where_sql[] = "ban_email = ''";
-		}
-
-		if ($user_ips === false)
-		{
-			$where_sql[] = "(ban_ip = '' OR ban_exclude = 1)";
-		}
-
-		if ($user_id === false)
-		{
-			$where_sql[] = '(ban_userid = 0 OR ban_exclude = 1)';
-		}
-		else
-		{
-			$cache_ttl = ($user_id == ANONYMOUS) ? 3600 : 0;
-			$_sql = '(ban_userid = ' . $user_id;
-
-			if ($user_email !== false)
-			{
-				$_sql .= " OR ban_email <> ''";
-			}
-
-			if ($user_ips !== false)
-			{
-				$_sql .= " OR ban_ip <> ''";
-			}
-
-			$_sql .= ')';
-
-			$where_sql[] = $_sql;
-		}
-
-		$sql .= (sizeof($where_sql)) ? implode(' AND ', $where_sql) : '';
-		$result = $db->sql_query($sql, $cache_ttl);
-
-		$ban_triggered_by = 'user';
-		while ($row = $db->sql_fetchrow($result))
-		{
-			if ($row['ban_end'] && $row['ban_end'] < time())
-			{
-				continue;
-			}
-
-			$ip_banned = false;
-			if (!empty($row['ban_ip']))
-			{
-				if (!is_array($user_ips))
-				{
-					$ip_banned = preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ips);
-				}
-				else
-				{
-					foreach ($user_ips as $user_ip)
-					{
-						if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ip))
-						{
-							$ip_banned = true;
-							break;
-						}
-					}
-				}
-			}
-
-			if ((!empty($row['ban_userid']) && intval($row['ban_userid']) == $user_id) ||
-				$ip_banned ||
-				(!empty($row['ban_email']) && preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_email'], '#')) . '$#i', $user_email)))
-			{
-				if (!empty($row['ban_exclude']))
-				{
-					$banned = false;
-					break;
-				}
-				else
-				{
-					$banned = true;
-					$ban_row = $row;
-
-					if (!empty($row['ban_userid']) && intval($row['ban_userid']) == $user_id)
-					{
-						$ban_triggered_by = 'user';
-					}
-					else if ($ip_banned)
-					{
-						$ban_triggered_by = 'ip';
-					}
-					else
-					{
-						$ban_triggered_by = 'email';
-					}
-
-					// Don't break. Check if there is an exclude rule for this user
-				}
-			}
-		}
-		$db->sql_freeresult($result);
-
-		if ($banned && !$return)
-		{
-			global $template;
-
-			// If the session is empty we need to create a valid one...
-			if (empty($this->session_id))
-			{
-				// This seems to be no longer needed? - #14971
-//				$this->session_create(ANONYMOUS);
-			}
-
-			// Initiate environment ... since it won't be set at this stage
-			$this->setup();
-
-			// Logout the user, banned users are unable to use the normal 'logout' link
-			if ($this->data['user_id'] != ANONYMOUS)
-			{
-				$this->session_kill();
-			}
-
-			// We show a login box here to allow founders accessing the board if banned by IP
-			if (defined('IN_LOGIN') && $this->data['user_id'] == ANONYMOUS)
-			{
-				global $phpEx;
-
-				$this->setup('ucp');
-				$this->data['is_registered'] = $this->data['is_bot'] = false;
-
-				// Set as a precaution to allow login_box() handling this case correctly as well as this function not being executed again.
-				define('IN_CHECK_BAN', 1);
-
-				login_box("index.$phpEx");
-
-				// The false here is needed, else the user is able to circumvent the ban.
-				$this->session_kill(false);
-			}
-
-			// Ok, we catch the case of an empty session id for the anonymous user...
-			// This can happen if the user is logging in, banned by username and the login_box() being called "again".
-			if (empty($this->session_id) && defined('IN_CHECK_BAN'))
-			{
-				$this->session_create(ANONYMOUS);
-			}
-
-
-			// Determine which message to output
-			$till_date = ($ban_row['ban_end']) ? $this->format_date($ban_row['ban_end']) : '';
-			$message = ($ban_row['ban_end']) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM';
-
-			$message = sprintf($this->lang[$message], $till_date, '<a href="mailto:' . $config['board_contact'] . '">', '</a>');
-			$message .= ($ban_row['ban_give_reason']) ? '<br /><br />' . sprintf($this->lang['BOARD_BAN_REASON'], $ban_row['ban_give_reason']) : '';
-			$message .= '<br /><br /><em>' . $this->lang['BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)] . '</em>';
-
-			// To circumvent session_begin returning a valid value and the check_ban() not called on second page view, we kill the session again
-			$this->session_kill(false);
-
-			// A very special case... we are within the cron script which is not supposed to print out the ban message... show blank page
-			if (defined('IN_CRON'))
-			{
-				garbage_collection();
-				exit_handler();
-				exit;
-			}
-
-			trigger_error($message);
-		}
-
-		return ($banned && $ban_row['ban_give_reason']) ? $ban_row['ban_give_reason'] : $banned;
-	}
-
-	/**
-	* Check if ip is blacklisted
-	* This should be called only where absolutly necessary
-	*
-	* Only IPv4 (rbldns does not support AAAA records/IPv6 lookups)
-	*
-	* @author satmd (from the php manual)
-	* @param string $mode register/post - spamcop for example is ommitted for posting
-	* @return false if ip is not blacklisted, else an array([checked server], [lookup])
-	*/
-	function check_dnsbl($mode, $ip = false)
-	{
-		if ($ip === false)
-		{
-			$ip = $this->ip;
-		}
-
-		// Neither Spamhaus nor Spamcop supports IPv6 addresses.
-		if (strpos($ip, ':') !== false)
-		{
-			return false;
-		}
-
-		$dnsbl_check = array(
-			'sbl.spamhaus.org'	=> 'http://www.spamhaus.org/query/bl?ip=',
-		);
-
-		if ($mode == 'register')
-		{
-			$dnsbl_check['bl.spamcop.net'] = 'http://spamcop.net/bl.shtml?';
-		}
-
-		if ($ip)
-		{
-			$quads = explode('.', $ip);
-			$reverse_ip = $quads[3] . '.' . $quads[2] . '.' . $quads[1] . '.' . $quads[0];
-
-			// Need to be listed on all servers...
-			$listed = true;
-			$info = array();
-
-			foreach ($dnsbl_check as $dnsbl => $lookup)
-			{
-				if (phpbb_checkdnsrr($reverse_ip . '.' . $dnsbl . '.', 'A') === true)
-				{
-					$info = array($dnsbl, $lookup . $ip);
-				}
-				else
-				{
-					$listed = false;
-				}
-			}
-
-			if ($listed)
-			{
-				return $info;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Check if URI is blacklisted
-	* This should be called only where absolutly necessary, for example on the submitted website field
-	* This function is not in use at the moment and is only included for testing purposes, it may not work at all!
-	* This means it is untested at the moment and therefore commented out
-	*
-	* @param string $uri URI to check
-	* @return true if uri is on blacklist, else false. Only blacklist is checked (~zero FP), no grey lists
-	function check_uribl($uri)
-	{
-		// Normally parse_url() is not intended to parse uris
-		// We need to get the top-level domain name anyway... change.
-		$uri = parse_url($uri);
-
-		if ($uri === false || empty($uri['host']))
-		{
-			return false;
-		}
-
-		$uri = trim($uri['host']);
-
-		if ($uri)
-		{
-			// One problem here... the return parameter for the "windows" method is different from what
-			// we expect... this may render this check useless...
-			if (phpbb_checkdnsrr($uri . '.multi.uribl.com.', 'A') === true)
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-	*/
-
-	/**
-	* Set/Update a persistent login key
-	*
-	* This method creates or updates a persistent session key. When a user makes
-	* use of persistent (formerly auto-) logins a key is generated and stored in the
-	* DB. When they revisit with the same key it's automatically updated in both the
-	* DB and cookie. Multiple keys may exist for each user representing different
-	* browsers or locations. As with _any_ non-secure-socket no passphrase login this
-	* remains vulnerable to exploit.
-	*/
-	function set_login_key($user_id = false, $key = false, $user_ip = false)
-	{
-		global $config, $db;
-
-		$user_id = ($user_id === false) ? $this->data['user_id'] : $user_id;
-		$user_ip = ($user_ip === false) ? $this->ip : $user_ip;
-		$key = ($key === false) ? (($this->cookie_data['k']) ? $this->cookie_data['k'] : false) : $key;
-
-		$key_id = unique_id(hexdec(substr($this->session_id, 0, 8)));
-
-		$sql_ary = array(
-			'key_id'		=> (string) md5($key_id),
-			'last_ip'		=> (string) $this->ip,
-			'last_login'	=> (int) time()
-		);
-
-		if (!$key)
-		{
-			$sql_ary += array(
-				'user_id'	=> (int) $user_id
-			);
-		}
-
-		if ($key)
-		{
-			$sql = 'UPDATE ' . SESSIONS_KEYS_TABLE . '
-				SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-				WHERE user_id = ' . (int) $user_id . "
-					AND key_id = '" . $db->sql_escape(md5($key)) . "'";
-		}
-		else
-		{
-			$sql = 'INSERT INTO ' . SESSIONS_KEYS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-		}
-		$db->sql_query($sql);
-
-		$this->cookie_data['k'] = $key_id;
-
-		return false;
-	}
-
-	/**
-	* Reset all login keys for the specified user
-	*
-	* This method removes all current login keys for a specified (or the current)
-	* user. It will be called on password change to render old keys unusable
-	*/
-	function reset_login_keys($user_id = false)
-	{
-		global $config, $db;
-
-		$user_id = ($user_id === false) ? (int) $this->data['user_id'] : (int) $user_id;
-
-		$sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . '
-			WHERE user_id = ' . (int) $user_id;
-		$db->sql_query($sql);
-
-		// If the user is logged in, update last visit info first before deleting sessions
-		$sql = 'SELECT session_time, session_page
-			FROM ' . SESSIONS_TABLE . '
-			WHERE session_user_id = ' . (int) $user_id . '
-			ORDER BY session_time DESC';
-		$result = $db->sql_query_limit($sql, 1);
-		$row = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		if ($row)
-		{
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_lastvisit = ' . (int) $row['session_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "'
-				WHERE user_id = " . (int) $user_id;
-			$db->sql_query($sql);
-		}
-
-		// Let's also clear any current sessions for the specified user_id
-		// If it's the current user then we'll leave this session intact
-		$sql_where = 'session_user_id = ' . (int) $user_id;
-		$sql_where .= ($user_id === (int) $this->data['user_id']) ? " AND session_id <> '" . $db->sql_escape($this->session_id) . "'" : '';
-
-		$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
-			WHERE $sql_where";
-		$db->sql_query($sql);
-
-		// We're changing the password of the current user and they have a key
-		// Lets regenerate it to be safe
-		if ($user_id === (int) $this->data['user_id'] && $this->cookie_data['k'])
-		{
-			$this->set_login_key($user_id);
-		}
-	}
-
-
-	/**
-	* Check if the request originated from the same page.
-	* @param bool $check_script_path If true, the path will be checked as well
-	*/
-	function validate_referer($check_script_path = false)
-	{
-		global $config, $request;
-
-		// no referer - nothing to validate, user's fault for turning it off (we only check on POST; so meta can't be the reason)
-		if (empty($this->referer) || empty($this->host))
-		{
-			return true;
-		}
-
-		$host = htmlspecialchars($this->host);
-		$ref = substr($this->referer, strpos($this->referer, '://') + 3);
-
-		if (!(stripos($ref, $host) === 0) && (!$config['force_server_vars'] || !(stripos($ref, $config['server_name']) === 0)))
-		{
-			return false;
-		}
-		else if ($check_script_path && rtrim($this->page['root_script_path'], '/') !== '')
-		{
-			$ref = substr($ref, strlen($host));
-			$server_port = $request->server('SERVER_PORT', 0);
-
-			if ($server_port !== 80 && $server_port !== 443 && stripos($ref, ":$server_port") === 0)
-			{
-				$ref = substr($ref, strlen(":$server_port"));
-			}
-
-			if (!(stripos(rtrim($ref, '/'), rtrim($this->page['root_script_path'], '/')) === 0))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-
-	function unset_admin()
-	{
-		global $db;
-		$sql = 'UPDATE ' . SESSIONS_TABLE . '
-			SET session_admin = 0
-			WHERE session_id = \'' . $db->sql_escape($this->session_id) . '\'';
-		$db->sql_query($sql);
-	}
-
-	/**
-	* Update the session data
-	*
-	* @param array $session_data associative array of session keys to be updated
-	* @param string $session_id optional session_id, defaults to current user's session_id
-	*/
-	public function update_session($session_data, $session_id = null)
-	{
-		global $db;
-
-		$session_id = ($session_id) ? $session_id : $this->session_id;
-
-		$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $session_data) . "
-			WHERE session_id = '" . $db->sql_escape($session_id) . "'";
-		$db->sql_query($sql);
-	}
-}
diff --git a/phpBB/includes/style/extension_path_provider.php b/phpBB/includes/style/extension_path_provider.php
deleted file mode 100644
index ec1d85f821..0000000000
--- a/phpBB/includes/style/extension_path_provider.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Provides a style resource locator with core style paths and extension style paths
-*
-* Finds installed style paths and makes them available to the resource locator.
-*
-* @package phpBB3
-*/
-class phpbb_style_extension_path_provider extends phpbb_extension_provider implements phpbb_style_path_provider_interface
-{
-	/**
-	* Optional prefix for style paths searched within extensions.
-	*
-	* Empty by default. Relative to the extension directory. As an example, it
-	* could be adm/ for admin style.
-	*
-	* @var string
-	*/
-	protected $ext_dir_prefix = '';
-
-	/**
-	* A provider of paths to be searched for styles
-	* @var phpbb_style_path_provider
-	*/
-	protected $base_path_provider;
-
-	/** @var string */
-	protected $phpbb_root_path;
-
-	/**
-	* Constructor stores extension manager
-	*
-	* @param phpbb_extension_manager $extension_manager phpBB extension manager
-	* @param phpbb_style_path_provider $base_path_provider A simple path provider
-	*            to provide paths to be located in extensions
-	* @param string		$phpbb_root_path	phpBB root path
-	*/
-	public function __construct(phpbb_extension_manager $extension_manager, phpbb_style_path_provider $base_path_provider, $phpbb_root_path)
-	{
-		parent::__construct($extension_manager);
-		$this->base_path_provider = $base_path_provider;
-		$this->phpbb_root_path = $phpbb_root_path;
-	}
-
-	/**
-	* Sets a prefix for style paths searched within extensions.
-	*
-	* The prefix is inserted between the extension's path e.g. ext/foo/ and
-	* the looked up style path, e.g. styles/bar/. So it should not have a
-	* leading slash, but should have a trailing slash.
-	*
-	* @param string $ext_dir_prefix The prefix including trailing slash
-	* @return null
-	*/
-	public function set_ext_dir_prefix($ext_dir_prefix)
-	{
-		$this->ext_dir_prefix = $ext_dir_prefix;
-	}
-
-	/**
-	* Finds style paths using the extension manager
-	*
-	* Locates a path (e.g. styles/prosilver/) in all active extensions.
-	* Then appends the core style paths based in the current working
-	* directory.
-	*
-	* @return array     List of style paths
-	*/
-	public function find()
-	{
-		$directories = array();
-
-		$finder = $this->extension_manager->get_finder();
-		foreach ($this->base_path_provider as $key => $paths)
-		{
-			if ($key == 'style')
-			{
-				foreach ($paths as $path)
-				{
-					$directories['style'][] = $path;
-					if ($path && !phpbb_is_absolute($path))
-					{
-						// Remove phpBB root path from the style path,
-						// so the finder is able to find extension styles,
-						// when the root path is not ./
-						if (strpos($path, $this->phpbb_root_path) === 0)
-						{
-							$path = substr($path, strlen($this->phpbb_root_path));
-						}
-
-						$result = $finder->directory('/' . $this->ext_dir_prefix . $path)
-							->get_directories(true, false, true);
-						foreach ($result as $ext => $ext_path)
-						{
-							// Make sure $ext_path has no ending slash
-							if (substr($ext_path, -1) === '/')
-							{
-								$ext_path = substr($ext_path, 0, -1);
-							}
-							$directories[$ext][] = $ext_path;
-						}
-					}
-				}
-			}
-		}
-
-		return $directories;
-	}
-
-	/**
-	* Overwrites the current style paths
-	*
-	* @param array $styles An array of style paths. The first element is the main style.
-	* @return null
-	*/
-	public function set_styles(array $styles)
-	{
-		$this->base_path_provider->set_styles($styles);
-		$this->items = null;
-	}
-}
diff --git a/phpBB/includes/style/path_provider.php b/phpBB/includes/style/path_provider.php
deleted file mode 100644
index 731d682e88..0000000000
--- a/phpBB/includes/style/path_provider.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Provides a style resource locator with paths
-*
-* Finds installed style paths and makes them available to the resource locator.
-*
-* @package phpBB3
-*/
-class phpbb_style_path_provider implements IteratorAggregate, phpbb_style_path_provider_interface
-{
-	protected $paths = array();
-
-	/**
-	* Ignores the extension dir prefix
-	*
-	* @param string $ext_dir_prefix The prefix including trailing slash
-	* @return null
-	*/
-	public function set_ext_dir_prefix($ext_dir_prefix)
-	{
-	}
-
-	/**
-	* Overwrites the current style paths
-	*
-	* The first element of the passed styles map, is considered the main
-	* style.
-	*
-	* @param array $styles An array of style paths. The first element is the main style.
-	* @return null
-	*/
-	public function set_styles(array $styles)
-	{
-		$this->paths = array('style' => $styles);
-	}
-
-	/**
-	* Retrieve an iterator over all style paths
-	*
-	* @return ArrayIterator An iterator for the array of style paths
-	*/
-	public function getIterator()
-	{
-		return new ArrayIterator($this->paths);
-	}
-}
diff --git a/phpBB/includes/style/path_provider_interface.php b/phpBB/includes/style/path_provider_interface.php
deleted file mode 100644
index 1a6153a4d3..0000000000
--- a/phpBB/includes/style/path_provider_interface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Provides a style resource locator with paths
-*
-* Finds installed style paths and makes them available to the resource locator.
-*
-* @package phpBB3
-*/
-interface phpbb_style_path_provider_interface extends Traversable
-{
-	/**
-	* Defines a prefix to use for style paths in extensions
-	*
-	* @param string $ext_dir_prefix The prefix including trailing slash
-	* @return null
-	*/
-	public function set_ext_dir_prefix($ext_dir_prefix);
-
-	/**
-	* Overwrites the current style paths
-	*
-	* @param array $styles An array of style paths. The first element is the main style.
-	* @return null
-	*/
-	public function set_styles(array $styles);
-}
diff --git a/phpBB/includes/style/resource_locator.php b/phpBB/includes/style/resource_locator.php
deleted file mode 100644
index 4cf767c062..0000000000
--- a/phpBB/includes/style/resource_locator.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-/**
-* Style resource locator. 
-* Maintains mapping from template handles to source template file paths.
-* Locates style files: resources (such as .js and .css files) and templates.
-*
-* Style resource locator is aware of styles tree, and can return actual
-* filesystem paths (i.e., the "child" style or the "parent" styles)
-* depending on what files exist.
-*
-* Root paths stored in locator are paths to style directories. Templates are
-* stored in subdirectory that $template_path points to.
-*
-* @package phpBB3
-*/
-class phpbb_style_resource_locator implements phpbb_template_locator
-{
-	/**
-	* Paths to style directories.
-	* @var array
-	*/
-	private $roots = array();
-
-	/**
-	* Location of templates directory within style directories.
-	* Must have trailing slash. Empty if templates are stored in root
-	* style directory, such as admin control panel templates.
-	* @var string
-	*/
-	private $template_path;
-
-	/**
-	* Map from root index to handles to source template file paths.
-	* Normally it only contains paths for handles that are used
-	* (or are likely to be used) by the page being rendered and not
-	* all templates that exist on the filesystem.
-	* @var array
-	*/
-	private $files = array();
-
-	/**
-	* Map from handles to source template file names.
-	* Covers the same data as $files property but maps to basenames
-	* instead of paths.
-	* @var array
-	*/
-	private $filenames = array();
-
-	/**
-	* Constructor.
-	*
-	* Sets default template path to template/.
-	*/
-	public function __construct()
-	{
-		$this->set_default_template_path();
-	}
-
-	/**
-	* Sets the list of style paths
-	*
-	* These paths will be searched for style files in the provided order.
-	* Paths may be outside of phpBB, but templates loaded from these paths
-	* will still be cached.
-	*
-	* @param array $style_paths An array of paths to style directories
-	* @return null
-	*/
-	public function set_paths($style_paths)
-	{
-		$this->roots = array();
-		$this->files = array();
-		$this->filenames = array();
-
-		foreach ($style_paths as $key => $paths)
-		{
-			foreach ($paths as $path)
-			{
-				// Make sure $path has no ending slash
-				if (substr($path, -1) === '/')
-				{
-					$path = substr($path, 0, -1);
-				}
-				$this->roots[$key][] = $path;
-			}
-		}
-	}
-
-	/**
-	* Sets the location of templates directory within style directories.
-	*
-	* The location must be a relative path, with a trailing slash.
-	* Typically it is one directory level deep, e.g. "template/".
-	*
-	* @param string $template_path Relative path to templates directory within style directories
-	* @return null
-	*/
-	public function set_template_path($template_path)
-	{
-		$this->template_path = $template_path;
-	}
-
-	/**
-	* Sets the location of templates directory within style directories
-	* to the default, which is "template/".
-	*
-	* @return null
-	*/
-	public function set_default_template_path()
-	{
-		$this->template_path = 'template/';
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	public function set_filenames(array $filename_array)
-	{
-		foreach ($filename_array as $handle => $filename)
-		{
-			if (empty($filename))
-			{
-				trigger_error("style resource locator: set_filenames: Empty filename specified for $handle", E_USER_ERROR);
-			}
-
-			$this->filename[$handle] = $filename;
-
-			foreach ($this->roots as $root_key => $root_paths)
-			{
-				foreach ($root_paths as $root_index => $root)
-				{
-					$this->files[$root_key][$root_index][$handle] = $root . '/' . $this->template_path . $filename;
-				}
-			}
-		}
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	public function get_filename_for_handle($handle)
-	{
-		if (!isset($this->filename[$handle]))
-		{
-			trigger_error("style resource locator: get_filename_for_handle: No file specified for handle $handle", E_USER_ERROR);
-		}
-		return $this->filename[$handle];
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	public function get_virtual_source_file_for_handle($handle)
-	{
-		// If we don't have a file assigned to this handle, die.
-		if (!isset($this->files['style'][0][$handle]))
-		{
-			trigger_error("style resource locator: No file specified for handle $handle", E_USER_ERROR);
-		}
-
-		$source_file = $this->files['style'][0][$handle];
-		return $source_file;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	public function get_source_file_for_handle($handle, $find_all = false)
-	{
-		// If we don't have a file assigned to this handle, die.
-		if (!isset($this->files['style'][0][$handle]))
-		{
-			trigger_error("style resource locator: No file specified for handle $handle", E_USER_ERROR);
-		}
-
-		// locate a source file that exists
-		$source_file = $this->files['style'][0][$handle];
-		$tried = $source_file;
-		$found = false;
-		$found_all = array();
-		foreach ($this->roots as $root_key => $root_paths)
-		{
-			foreach ($root_paths as $root_index => $root)
-			{
-				$source_file = $this->files[$root_key][$root_index][$handle];
-				$tried .= ', ' . $source_file;
-				if (file_exists($source_file))
-				{
-					$found = true;
-					break;
-				}
-			}
-			if ($found)
-			{
-				if ($find_all)
-				{
-					$found_all[] = $source_file;
-					$found = false;
-				}
-				else
-				{
-					break;
-				}
-			}
-		}
-
-		// search failed
-		if (!$found && !$find_all)
-		{
-			trigger_error("style resource locator: File for handle $handle does not exist. Could not find: $tried", E_USER_ERROR);
-		}
-
-		return ($find_all) ? $found_all : $source_file;
-	}
-
-	/**
-	* {@inheritDoc}
-	*/
-	public function get_first_file_location($files, $return_default = false, $return_full_path = true)
-	{
-		// set default value
-		$default_result = false;
-
-		// check all available paths
-		foreach ($this->roots as $root_paths)
-		{
-			foreach ($root_paths as $path)
-			{
-				// check all files
-				foreach ($files as $filename)
-				{
-					$source_file = $path . '/' . $filename;
-					if (file_exists($source_file))
-					{
-						return ($return_full_path) ? $source_file : $filename;
-					}
-
-					// assign first file as result if $return_default is true
-					if ($return_default && $default_result === false)
-					{
-						$default_result = $source_file;
-					}
-				}
-			}
-		}
-
-		// search failed
-		return $default_result;
-	}
-
-	/**
-	* Obtains filesystem path for a template file.
-	*
-	* The simplest use is specifying a single template file as a string
-	* in the first argument. This template file should be a basename
-	* of a template file in the selected style, or its parent styles
-	* if template inheritance is being utilized.
-	*
-	* Note: "selected style" is whatever style the style resource locator
-	* is configured for.
-	*
-	* The return value then will be a path, relative to the current
-	* directory or absolute, to the template file in the selected style
-	* or its closest parent.
-	*
-	* If the selected style does not have the template file being searched,
-	* (and if inheritance is involved, none of the parents have it either),
-	* false will be returned.
-	*
-	* Specifying true for $return_default will cause the function to
-	* return the first path which was checked for existence in the event
-	* that the template file was not found, instead of false.
-	* This is the path in the selected style itself, not any of its
-	* parents.
-	*
-	* $files can be given an array of templates instead of a single
-	* template. When given an array, the function will try to resolve
-	* each template in the array to a path, and will return the first
-	* path that exists, or false if none exist.
-	*
-	* If $files is an array and template inheritance is involved, first
-	* each of the files will be checked in the selected style, then each
-	* of the files will be checked in the immediate parent, and so on.
-	*
-	* If $return_full_path is false, then instead of returning a usable
-	* path (when the template is found) only the template's basename
-	* will be returned. This can be used to check which of the templates
-	* specified in $files exists. Naturally more than one template must
-	* be given in $files.
-	*
-	* This function works identically to get_first_file_location except
-	* it operates on a list of templates, not files. Practically speaking,
-	* the templates given in the first argument first are prepended with
-	* the template path (property in this class), then given to
-	* get_first_file_location for the rest of the processing.
-	*
-	* Templates given to this function can be relative paths for templates
-	* located in subdirectories of the template directories. The paths
-	* should be relative to the templates directory (template/ by default).
-	*
-	* @param string or array $files List of templates to locate. If there is only
-	*				one template, $files can be a string to make code easier to read.
-	* @param bool $return_default Determines what to return if template does not
-	*				exist. If true, function will return location where template is
-	*				supposed to be. If false, function will return false.
-	* @param bool $return_full_path If true, function will return full path
-	*				to template. If false, function will return template file name.
-	*				This parameter can be used to check which one of set of template
-	*				files is available.
-	* @return string or boolean Source template path if template exists or $return_default is
-	*				true. False if template does not exist and $return_default is false
-	*/
-	public function get_first_template_location($templates, $return_default = false, $return_full_path = true)
-	{
-		// add template path prefix
-		$files = array();
-		if (is_string($templates))
-		{
-			$files[] = $this->template_path . $templates;
-		}
-		else
-		{
-			foreach ($templates as $template)
-			{
-				$files[] = $this->template_path . $template;
-			}
-		}
-
-		return $this->get_first_file_location($files, $return_default, $return_full_path);
-	}
-}
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
deleted file mode 100644
index 034f518091..0000000000
--- a/phpBB/includes/style/style.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group, sections (c) 2001 ispi of Lincoln Inc
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base Style class.
-* @package phpBB3
-*/
-class phpbb_style
-{
-	/**
-	* Template class.
-	* Handles everything related to templates.
-	* @var phpbb_template
-	*/
-	private $template;
-
-	/**
-	* phpBB root path
-	* @var string
-	*/
-	private $phpbb_root_path;
-
-	/**
-	* PHP file extension
-	* @var string
-	*/
-	private $php_ext;
-
-	/**
-	* phpBB config instance
-	* @var phpbb_config
-	*/
-	private $config;
-
-	/**
-	* Current user
-	* @var phpbb_user
-	*/
-	private $user;
-
-	/**
-	* Style resource locator
-	* @var phpbb_style_resource_locator
-	*/
-	private $locator;
-
-	/**
-	* Style path provider
-	* @var phpbb_style_path_provider
-	*/
-	private $provider;
-
-	/**
-	* Constructor.
-	*
-	* @param string $phpbb_root_path phpBB root path
-	* @param user $user current user
-	* @param phpbb_style_resource_locator $locator style resource locator
-	* @param phpbb_style_path_provider $provider style path provider
-	* @param phpbb_template $template template
-	*/
-	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider, phpbb_template $template)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-		$this->config = $config;
-		$this->user = $user;
-		$this->locator = $locator;
-		$this->provider = $provider;
-		$this->template = $template;
-	}
-
-	/**
-	* Get the style tree of the style preferred by the current user
-	*
-	* @return array Style tree, most specific first
-	*/
-	public function get_user_style()
-	{
-		$style_list = array(
-			$this->user->style['style_path'],
-		);
-
-		if ($this->user->style['style_parent_id'])
-		{
-			$style_list = array_merge($style_list, array_reverse(explode('/', $this->user->style['style_parent_tree'])));
-		}
-
-		return $style_list;
-	}
-
-	/**
-	* Set style location based on (current) user's chosen style.
-	*
-	* @param array $style_directories The directories to add style paths for
-	* 	E.g. array('ext/foo/bar/styles', 'styles')
-	* 	Default: array('styles') (phpBB's style directory)
-	* @return bool true
-	*/
-	public function set_style($style_directories = array('styles'))
-	{
-		$this->names = $this->get_user_style();
-
-		$paths = array();
-		foreach ($style_directories as $directory)
-		{
-			foreach ($this->names as $name)
-			{
-				$path = $this->get_style_path($name, $directory);
-
-				if (is_dir($path))
-				{
-					$paths[] = $path;
-				}
-			}
-		}
-
-		$this->provider->set_styles($paths);
-		$this->locator->set_paths($this->provider);
-
-		$new_paths = array();
-		foreach ($paths as $path)
-		{
-			$new_paths[] = $path . '/template/';
-		}
-
-		$this->template->set_style_names($this->names, $new_paths, ($style_directories === array('styles')));
-
-		return true;
-	}
-
-	/**
-	* Set custom style location (able to use directory outside of phpBB).
-	*
-	* Note: Templates are still compiled to phpBB's cache directory.
-	*
-	* @param string $name Name of style, used for cache prefix. Examples: "admin", "prosilver"
-	* @param array or string $paths Array of style paths, relative to current root directory
-	* @param array $names Array of names of templates in inheritance tree order, used by extensions. If empty, $name will be used.
-	* @param string $template_path Path to templates, relative to style directory. False if path should be set to default (templates/).
-	* @return bool true
-	*/
-	public function set_custom_style($name, $paths, $names = array(), $template_path = false)
-	{
-		if (is_string($paths))
-		{
-			$paths = array($paths);
-		}
-
-		if (empty($names))
-		{
-			$names = array($name);
-		}
-		$this->names = $names;
-
-		$this->provider->set_styles($paths);
-		$this->locator->set_paths($this->provider);
-
-		if ($template_path !== false)
-		{
-			$this->locator->set_template_path($template_path);
-		}
-
-		$new_paths = array();
-		foreach ($paths as $path)
-		{
-			$new_paths[] = $path . '/' . (($template_path !== false) ? $template_path : 'template/');
-		}
-
-		$this->template->set_style_names($names, $new_paths);
-
-		return true;
-	}
-
-	/**
-	* Get location of style directory for specific style_path
-	*
-	* @param string $path Style path, such as "prosilver"
-	* @param string $style_base_directory The base directory the style is in
-	* 	E.g. 'styles', 'ext/foo/bar/styles'
-	* 	Default: 'styles'
-	* @return string Path to style directory, relative to current path
-	*/
-	public function get_style_path($path, $style_base_directory = 'styles')
-	{
-		return $this->phpbb_root_path . trim($style_base_directory, '/') . '/' . $path;
-	}
-
-	/**
-	* Defines a prefix to use for style paths in extensions
-	*
-	* @param string $ext_dir_prefix The prefix including trailing slash
-	* @return null
-	*/
-	public function set_ext_dir_prefix($ext_dir_prefix)
-	{
-		$this->provider->set_ext_dir_prefix($ext_dir_prefix);
-	}
-
-	/**
-	* Locates source file path, accounting for styles tree and verifying that
-	* the path exists.
-	*
-	* @param string or array $files List of files to locate. If there is only
-	*				one file, $files can be a string to make code easier to read.
-	* @param bool $return_default Determines what to return if file does not
-	*				exist. If true, function will return location where file is
-	*				supposed to be. If false, function will return false.
-	* @param bool $return_full_path If true, function will return full path
-	*				to file. If false, function will return file name. This
-	*				parameter can be used to check which one of set of files
-	*				is available.
-	* @return string or boolean Source file path if file exists or $return_default is
-	*				true. False if file does not exist and $return_default is false
-	*/
-	public function locate($files, $return_default = false, $return_full_path = true)
-	{
-		// convert string to array
-		if (is_string($files))
-		{
-			$files = array($files);
-		}
-
-		// use resource locator to find files
-		return $this->locator->get_first_file_location($files, $return_default, $return_full_path);
-	}
-}
diff --git a/phpBB/includes/template/asset.php b/phpBB/includes/template/asset.php
deleted file mode 100644
index 7c322cd971..0000000000
--- a/phpBB/includes/template/asset.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class phpbb_template_asset
-{
-	protected $components = array();
-
-	/**
-	* Constructor
-	*
-	* @param string $url URL
-	*/
-	public function __construct($url)
-	{
-		$this->set_url($url);
-	}
-
-	/**
-	* Set URL
-	*
-	* @param string $url URL
-	*/
-	public function set_url($url)
-	{
-		if (version_compare(PHP_VERSION, '5.4.7') < 0 && substr($url, 0, 2) === '//')
-		{
-			// Workaround for PHP 5.4.6 and older bug #62844 - add fake scheme and then remove it
-			$this->components = parse_url('http:' . $url);
-			$this->components['scheme'] = '';
-			return;
-		}
-		$this->components = parse_url($url);
-	}
-
-	/**
-	* Convert URL components into string
-	*
-	* @param array $components URL components
-	* @return string URL
-	*/
-	protected function join_url($components)
-	{
-		$path = '';
-		if (isset($components['scheme']))
-		{
-			$path = $components['scheme'] === '' ? '//' : $components['scheme'] . '://';
-		}
-
-		if (isset($components['user']) || isset($components['pass']))
-		{
-			if ($path === '' && !isset($components['port']))
-			{
-				$path = '//';
-			}
-			$path .= $components['user'];
-			if (isset($components['pass']))
-			{
-				$path .= ':' . $components['pass'];
-			}
-			$path .= '@';
-		}
-
-		if (isset($components['host']))
-		{
-			if ($path === '' && !isset($components['port']))
-			{
-				$path = '//';
-			}
-			$path .= $components['host'];
-			if (isset($components['port']))
-			{
-				$path .= ':' . $components['port'];
-			}
-		}
-
-		if (isset($components['path']))
-		{
-			$path .= $components['path'];
-		}
-
-		if (isset($components['query']))
-		{
-			$path .= '?' . $components['query'];
-		}
-
-		if (isset($components['fragment']))
-		{
-			$path .= '#' . $components['fragment'];
-		}
-
-		return $path;
-	}
-
-	/**
-	* Get URL
-	*
-	* @return string URL
-	*/
-	public function get_url()
-	{
-		return $this->join_url($this->components);
-	}
-
-	/**
-	* Checks if URL is local and relative
-	*
-	* @return boolean True if URL is local and relative
-	*/
-	public function is_relative()
-	{
-		if (empty($this->components) || !isset($this->components['path']))
-		{
-			// Invalid URL
-			return false;
-		}
-		return !isset($this->components['scheme']) && !isset($this->components['host']) && substr($this->components['path'], 0, 1) !== '/';
-	}
-
-	/**
-	* Get path component of current URL
-	*
-	* @return string Path
-	*/
-	public function get_path()
-	{
-		return isset($this->components['path']) ? $this->components['path'] : '';
-	}
-
-	/**
-	* Set path component
-	*
-	* @param string $path Path component
-	* @param boolean $urlencode If true, parts of path should be encoded with rawurlencode()
-	*/
-	public function set_path($path, $urlencode = false)
-	{
-		if ($urlencode)
-		{
-			$paths = explode('/', $path);
-			foreach ($paths as &$dir)
-			{
-				$dir = rawurlencode($dir);
-			}
-			$path = implode('/', $paths);
-		}
-		$this->components['path'] = $path;
-	}
-
-	/**
-	* Add assets_version parameter to URL.
-	* Parameter will not be added if assets_version already exists in URL
-	*
-	* @param string $version Version
-	*/
-	public function add_assets_version($version)
-	{
-		if (!isset($this->components['query']))
-		{
-			$this->components['query'] = 'assets_version=' . $version;
-			return;
-		}
-		$query = $this->components['query'];
-		if (!preg_match('/(^|[&;])assets_version=/', $query))
-		{
-			$this->components['query'] = $query . '&amp;assets_version=' . $version;
-		}
-	}
-}
diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
deleted file mode 100644
index c5ce7422b9..0000000000
--- a/phpBB/includes/template/context.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Stores variables assigned to template.
-*
-* @package phpBB3
-*/
-class phpbb_template_context
-{
-	/**
-	* variable that holds all the data we'll be substituting into
-	* the compiled templates. Takes form:
-	* --> $this->tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value
-	* if it's a root-level variable, it'll be like this:
-	* --> $this->tpldata[.][0][varname] == value
-	*
-	* @var array
-	*/
-	private $tpldata = array('.' => array(0 => array()));
-
-	/**
-	* @var array Reference to template->tpldata['.'][0]
-	*/
-	private $rootref;
-
-	public function __construct()
-	{
-		$this->clear();
-	}
-
-	/**
-	* Clears template data set.
-	*/
-	public function clear()
-	{
-		$this->tpldata = array('.' => array(0 => array()));
-		$this->rootref = &$this->tpldata['.'][0];
-	}
-
-	/**
-	* Assign a single scalar value to a single key.
-	*
-	* Value can be a string, an integer or a boolean.
-	*
-	* @param string $varname Variable name
-	* @param string $varval Value to assign to variable
-	*/
-	public function assign_var($varname, $varval)
-	{
-		$this->rootref[$varname] = $varval;
-
-		return true;
-	}
-
-	/**
-	* Append text to the string value stored in a key.
-	*
-	* Text is appended using the string concatenation operator (.).
-	*
-	* @param string $varname Variable name
-	* @param string $varval Value to append to variable
-	*/
-	public function append_var($varname, $varval)
-	{
-		$this->rootref[$varname] = (isset($this->rootref[$varname]) ? $this->rootref[$varname] : '') . $varval;
-
-		return true;
-	}
-
-	/**
-	* Returns a reference to template data array.
-	*
-	* This function is public so that template renderer may invoke it.
-	* Users should alter template variables via functions in phpbb_template.
-	*
-	* Note: modifying returned array will affect data stored in the context.
-	*
-	* @return array template data
-	*/
-	public function &get_data_ref()
-	{
-		// returning a reference directly is not
-		// something php is capable of doing
-		$ref = &$this->tpldata;
-		return $ref;
-	}
-
-	/**
-	* Returns a reference to template root scope.
-	*
-	* This function is public so that template renderer may invoke it.
-	* Users should not need to invoke this function.
-	*
-	* Note: modifying returned array will affect data stored in the context.
-	*
-	* @return array template data
-	*/
-	public function &get_root_ref()
-	{
-		// rootref is already a reference
-		return $this->rootref;
-	}
-
-	/**
-	* Assign key variable pairs from an array to a specified block
-	*
-	* @param string $blockname Name of block to assign $vararray to
-	* @param array $vararray A hash of variable name => value pairs
-	*/
-	public function assign_block_vars($blockname, array $vararray)
-	{
-		if (strpos($blockname, '.') !== false)
-		{
-			// Nested block.
-			$blocks = explode('.', $blockname);
-			$blockcount = sizeof($blocks) - 1;
-
-			$str = &$this->tpldata;
-			for ($i = 0; $i < $blockcount; $i++)
-			{
-				$str = &$str[$blocks[$i]];
-				$str = &$str[sizeof($str) - 1];
-			}
-
-			$s_row_count = isset($str[$blocks[$blockcount]]) ? sizeof($str[$blocks[$blockcount]]) : 0;
-			$vararray['S_ROW_COUNT'] = $vararray['S_ROW_NUM'] = $s_row_count;
-
-			// Assign S_FIRST_ROW
-			if (!$s_row_count)
-			{
-				$vararray['S_FIRST_ROW'] = true;
-			}
-
-			// Assign S_BLOCK_NAME
-			$vararray['S_BLOCK_NAME'] = $blocks[$blockcount];
-
-			// Now the tricky part, we always assign S_LAST_ROW and remove the entry before
-			// This is much more clever than going through the complete template data on display (phew)
-			$vararray['S_LAST_ROW'] = true;
-			if ($s_row_count > 0)
-			{
-				unset($str[$blocks[$blockcount]][($s_row_count - 1)]['S_LAST_ROW']);
-			}
-
-			// Now we add the block that we're actually assigning to.
-			// We're adding a new iteration to this block with the given
-			// variable assignments.
-			$str[$blocks[$blockcount]][] = $vararray;
-
-			// Set S_NUM_ROWS
-			foreach ($str[$blocks[$blockcount]] as &$mod_block)
-			{
-				$mod_block['S_NUM_ROWS'] = sizeof($str[$blocks[$blockcount]]);
-			}
-		}
-		else
-		{
-			// Top-level block.
-			$s_row_count = (isset($this->tpldata[$blockname])) ? sizeof($this->tpldata[$blockname]) : 0;
-			$vararray['S_ROW_COUNT'] = $vararray['S_ROW_NUM'] = $s_row_count;
-
-			// Assign S_FIRST_ROW
-			if (!$s_row_count)
-			{
-				$vararray['S_FIRST_ROW'] = true;
-			}
-
-			// Assign S_BLOCK_NAME
-			$vararray['S_BLOCK_NAME'] = $blockname;
-
-			// We always assign S_LAST_ROW and remove the entry before
-			$vararray['S_LAST_ROW'] = true;
-			if ($s_row_count > 0)
-			{
-				unset($this->tpldata[$blockname][($s_row_count - 1)]['S_LAST_ROW']);
-			}
-
-			// Add a new iteration to this block with the variable assignments we were given.
-			$this->tpldata[$blockname][] = $vararray;
-
-			// Set S_NUM_ROWS
-			foreach ($this->tpldata[$blockname] as &$mod_block)
-			{
-				$mod_block['S_NUM_ROWS'] = sizeof($this->tpldata[$blockname]);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Change already assigned key variable pair (one-dimensional - single loop entry)
-	*
-	* An example of how to use this function:
-	* {@example alter_block_array.php}
-	*
-	* @param	string	$blockname	the blockname, for example 'loop'
-	* @param	array	$vararray	the var array to insert/add or merge
-	* @param	mixed	$key		Key to search for
-	*
-	* array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
-	*
-	* int: Position [the position to change or insert at directly given]
-	*
-	* If key is false the position is set to 0
-	* If key is true the position is set to the last entry
-	*
-	* @param	string	$mode		Mode to execute (valid modes are 'insert' and 'change')
-	*
-	*	If insert, the vararray is inserted at the given position (position counting from zero).
-	*	If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
-	*
-	* Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
-	* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
-	*
-	* @return bool false on error, true on success
-	*/
-	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
-	{
-		if (strpos($blockname, '.') !== false)
-		{
-			// Nested block.
-			$blocks = explode('.', $blockname);
-			$blockcount = sizeof($blocks) - 1;
-
-			$block = &$this->tpldata;
-			for ($i = 0; $i < $blockcount; $i++)
-			{
-				if (($pos = strpos($blocks[$i], '[')) !== false)
-				{
-					$name = substr($blocks[$i], 0, $pos);
-
-					if (strpos($blocks[$i], '[]') === $pos)
-					{
-						$index = sizeof($block[$name]) - 1;
-					}
-					else
-					{
-						$index = min((int) substr($blocks[$i], $pos + 1, -1), sizeof($block[$name]) - 1);
-					}
-				}
-				else
-				{
-					$name = $blocks[$i];
-					$index = sizeof($block[$name]) - 1;
-				}
-				$block = &$block[$name];
-				$block = &$block[$index];
-			}
-
-			$block = &$block[$blocks[$i]]; // Traverse the last block
-		}
-		else
-		{
-			// Top-level block.
-			$block = &$this->tpldata[$blockname];
-		}
-
-		// Change key to zero (change first position) if false and to last position if true
-		if ($key === false || $key === true)
-		{
-			$key = ($key === false) ? 0 : sizeof($block);
-		}
-
-		// Get correct position if array given
-		if (is_array($key))
-		{
-			// Search array to get correct position
-			list($search_key, $search_value) = @each($key);
-
-			$key = NULL;
-			foreach ($block as $i => $val_ary)
-			{
-				if ($val_ary[$search_key] === $search_value)
-				{
-					$key = $i;
-					break;
-				}
-			}
-
-			// key/value pair not found
-			if ($key === NULL)
-			{
-				return false;
-			}
-		}
-
-		// Insert Block
-		if ($mode == 'insert')
-		{
-			// Make sure we are not exceeding the last iteration
-			if ($key >= sizeof($this->tpldata[$blockname]))
-			{
-				$key = sizeof($this->tpldata[$blockname]);
-				unset($this->tpldata[$blockname][($key - 1)]['S_LAST_ROW']);
-				$vararray['S_LAST_ROW'] = true;
-			}
-			else if ($key === 0)
-			{
-				unset($this->tpldata[$blockname][0]['S_FIRST_ROW']);
-				$vararray['S_FIRST_ROW'] = true;
-			}
-
-			// Assign S_BLOCK_NAME
-			$vararray['S_BLOCK_NAME'] = $blockname;
-
-			// Re-position template blocks
-			for ($i = sizeof($block); $i > $key; $i--)
-			{
-				$block[$i] = $block[$i-1];
-
-				$block[$i]['S_ROW_COUNT'] = $block[$i]['S_ROW_NUM'] = $i;
-			}
-
-			// Insert vararray at given position
-			$block[$key] = $vararray;
-			$block[$key]['S_ROW_COUNT'] = $block[$key]['S_ROW_NUM'] = $key;
-
-			// Set S_NUM_ROWS
-			foreach ($this->tpldata[$blockname] as &$mod_block)
-			{
-				$mod_block['S_NUM_ROWS'] = sizeof($this->tpldata[$blockname]);
-			}
-
-			return true;
-		}
-
-		// Which block to change?
-		if ($mode == 'change')
-		{
-			if ($key == sizeof($block))
-			{
-				$key--;
-			}
-
-			$block[$key] = array_merge($block[$key], $vararray);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Reset/empty complete block
-	*
-	* @param string $blockname Name of block to destroy
-	*/
-	public function destroy_block_vars($blockname)
-	{
-		if (strpos($blockname, '.') !== false)
-		{
-			// Nested block.
-			$blocks = explode('.', $blockname);
-			$blockcount = sizeof($blocks) - 1;
-
-			$str = &$this->tpldata;
-			for ($i = 0; $i < $blockcount; $i++)
-			{
-				$str = &$str[$blocks[$i]];
-				$str = &$str[sizeof($str) - 1];
-			}
-
-			unset($str[$blocks[$blockcount]]);
-		}
-		else
-		{
-			// Top-level block.
-			unset($this->tpldata[$blockname]);
-		}
-
-		return true;
-	}
-}
diff --git a/phpBB/includes/template/locator.php b/phpBB/includes/template/locator.php
deleted file mode 100644
index f6fd20bcc2..0000000000
--- a/phpBB/includes/template/locator.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-/**
-* Resource locator interface.
-*
-* Objects implementing this interface maintain mapping from template handles
-* to source template file paths and locate templates.
-*
-* Locates style files.
-*
-* Resource locator is aware of styles tree, and can return actual
-* filesystem paths (i.e., the "child" style or the "parent" styles)
-* depending on what files exist.
-*
-* Root paths stored in locator are paths to style directories. Templates are
-* stored in subdirectory that $template_path points to.
-*
-* @package phpBB3
-*/
-interface phpbb_template_locator
-{
-	/**
-	* Sets the template filenames for handles. $filename_array
-	* should be a hash of handle => filename pairs.
-	*
-	* @param array $filename_array Should be a hash of handle => filename pairs.
-	*/
-	public function set_filenames(array $filename_array);
-
-	/**
-	* Determines the filename for a template handle.
-	*
-	* The filename comes from array used in a set_filenames call,
-	* which should have been performed prior to invoking this function.
-	* Return value is a file basename (without path).
-	*
-	* @param $handle string Template handle
-	* @return string Filename corresponding to the template handle
-	*/
-	public function get_filename_for_handle($handle);
-
-	/**
-	* Determines the source file path for a template handle without
-	* regard for styles tree.
-	*
-	* This function returns the path in "primary" style directory
-	* corresponding to the given template handle. That path may or
-	* may not actually exist on the filesystem. Because this function
-	* does not perform stat calls to determine whether the path it
-	* returns actually exists, it is faster than get_source_file_for_handle.
-	*
-	* Use get_source_file_for_handle to obtain the actual path that is
-	* guaranteed to exist (which might come from the parent style
-	* directory if primary style has parent styles).
-	*
-	* This function will trigger an error if the handle was never
-	* associated with a template file via set_filenames.
-	*
-	* @param $handle string Template handle
-	* @return string Path to source file path in primary style directory
-	*/
-	public function get_virtual_source_file_for_handle($handle);
-
-	/**
-	* Determines the source file path for a template handle, accounting
-	* for styles tree and verifying that the path exists.
-	*
-	* This function returns the actual path that may be compiled for
-	* the specified template handle. It will trigger an error if
-	* the template handle was never associated with a template path
-	* via set_filenames or if the template file does not exist on the
-	* filesystem.
-	*
-	* Use get_virtual_source_file_for_handle to just resolve a template
-	* handle to a path without any filesystem or styles tree checks.
-	*
-	* @param string $handle Template handle (i.e. "friendly" template name)
-	* @param bool $find_all If true, each root path will be checked and function
-	*				will return array of files instead of string and will not
-	*				trigger a error if template does not exist
-	* @return string Source file path
-	*/
-	public function get_source_file_for_handle($handle, $find_all = false);
-
-	/**
-	* Obtains a complete filesystem path for a file in a style.
-	*
-	* This function traverses the style tree (selected style and
-	* its parents in order, if inheritance is being used) and finds
-	* the first file on the filesystem matching specified relative path,
-	* or the first of the specified paths if more than one path is given.
-	*
-	* This function can be used to determine filesystem path of any
-	* file under any style, with the consequence being that complete
-	* relative to the style directory path must be provided as an argument.
-	*
-	* In particular, this function can be used to locate templates
-	* and javascript files.
-	*
-	* For locating templates get_first_template_location should be used
-	* as it prepends the configured template path to the template basename.
-	*
-	* Note: "selected style" is whatever style the style resource locator
-	* is configured for.
-	*
-	* The return value then will be a path, relative to the current
-	* directory or absolute, to the first existing file in the selected
-	* style or its closest parent.
-	*
-	* If the selected style does not have the file being searched,
-	* (and if inheritance is involved, none of the parents have it either),
-	* false will be returned.
-	*
-	* Multiple files can be specified, in which case the first file in
-	* the list that can be found on the filesystem is returned.
-	*
-	* If multiple files are specified and inheritance is involved,
-	* first each of the specified files is checked in the selected style,
-	* then each of the specified files is checked in the immediate parent,
-	* etc.
-	*
-	* Specifying true for $return_default will cause the function to
-	* return the first path which was checked for existence in the event
-	* that the template file was not found, instead of false.
-	* This is always a path in the selected style itself, not any of its
-	* parents.
-	*
-	* If $return_full_path is false, then instead of returning a usable
-	* path (when the file is found) the file's path relative to the style
-	* directory will be returned. This is the same path as was given to
-	* the function as a parameter. This can be used to check which of the
-	* files specified in $files exists. Naturally this requires passing
-	* more than one file in $files.
-	*
-	* @param array $files List of files to locate.
-	* @param bool $return_default Determines what to return if file does not
-	*				exist. If true, function will return location where file is
-	*				supposed to be. If false, function will return false.
-	* @param bool $return_full_path If true, function will return full path
-	*				to file. If false, function will return file name. This
-	*				parameter can be used to check which one of set of files
-	*				is available.
-	* @return string or boolean Source file path if file exists or $return_default is
-	*				true. False if file does not exist and $return_default is false
-	*/
-	public function get_first_file_location($files, $return_default = false, $return_full_path = true);
-}
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
deleted file mode 100644
index 89a01e924d..0000000000
--- a/phpBB/includes/template/template.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-interface phpbb_template
-{
-
-	/**
-	* Clear the cache
-	*
-	* @return phpbb_template
-	*/
-	public function clear_cache();
-
-	/**
-	* Sets the template filenames for handles.
-	*
-	* @param array $filename_array Should be a hash of handle => filename pairs.
-	* @return phpbb_template $this
-	*/
-	public function set_filenames(array $filename_array);
-
-	/**
-	* Sets the style names/paths corresponding to style hierarchy being compiled
-	* and/or rendered.
-	*
-	* @param array $style_names List of style names in inheritance tree order
-	* @param array $style_paths List of style paths in inheritance tree order
-	* @return phpbb_template $this
-	*/
-	public function set_style_names(array $style_names, array $style_paths);
-
-	/**
-	* Clears all variables and blocks assigned to this template.
-	*
-	* @return phpbb_template $this
-	*/
-	public function destroy();
-
-	/**
-	* Reset/empty complete block
-	*
-	* @param string $blockname Name of block to destroy
-	* @return phpbb_template $this
-	*/
-	public function destroy_block_vars($blockname);
-
-	/**
-	* Display a template for provided handle.
-	*
-	* The template will be loaded and compiled, if necessary, first.
-	*
-	* This function calls hooks.
-	*
-	* @param string $handle Handle to display
-	* @return phpbb_template $this
-	*/
-	public function display($handle);
-
-	/**
-	* Display the handle and assign the output to a template variable
-	* or return the compiled result.
-	*
-	* @param string $handle Handle to operate on
-	* @param string $template_var Template variable to assign compiled handle to
-	* @param bool $return_content If true return compiled handle, otherwise assign to $template_var
-	* @return phpbb_template|string if $return_content is true return string of the compiled handle, otherwise return $this
-	*/
-	public function assign_display($handle, $template_var = '', $return_content = true);
-
-	/**
-	* Assign key variable pairs from an array
-	*
-	* @param array $vararray A hash of variable name => value pairs
-	* @return phpbb_template $this
-	*/
-	public function assign_vars(array $vararray);
-
-	/**
-	* Assign a single scalar value to a single key.
-	*
-	* Value can be a string, an integer or a boolean.
-	*
-	* @param string $varname Variable name
-	* @param string $varval Value to assign to variable
-	* @return phpbb_template $this
-	*/
-	public function assign_var($varname, $varval);
-
-	/**
-	* Append text to the string value stored in a key.
-	*
-	* Text is appended using the string concatenation operator (.).
-	*
-	* @param string $varname Variable name
-	* @param string $varval Value to append to variable
-	* @return phpbb_template $this
-	*/
-	public function append_var($varname, $varval);
-
-	/**
-	* Assign key variable pairs from an array to a specified block
-	* @param string $blockname Name of block to assign $vararray to
-	* @param array $vararray A hash of variable name => value pairs
-	* @return phpbb_template $this
-	*/
-	public function assign_block_vars($blockname, array $vararray);
-
-	/**
-	* Change already assigned key variable pair (one-dimensional - single loop entry)
-	*
-	* An example of how to use this function:
-	* {@example alter_block_array.php}
-	*
-	* @param	string	$blockname	the blockname, for example 'loop'
-	* @param	array	$vararray	the var array to insert/add or merge
-	* @param	mixed	$key		Key to search for
-	*
-	* array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
-	*
-	* int: Position [the position to change or insert at directly given]
-	*
-	* If key is false the position is set to 0
-	* If key is true the position is set to the last entry
-	*
-	* @param	string	$mode		Mode to execute (valid modes are 'insert' and 'change')
-	*
-	*	If insert, the vararray is inserted at the given position (position counting from zero).
-	*	If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
-	*
-	* Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
-	* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
-	*
-	* @return bool false on error, true on success
-	*/
-	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert');
-
-	/**
-	* Get path to template for handle (required for BBCode parser)
-	*
-	* @return string
-	*/
-	public function get_source_file_for_handle($handle);
-}
diff --git a/phpBB/includes/template/twig/definition.php b/phpBB/includes/template/twig/definition.php
deleted file mode 100644
index 6557b209eb..0000000000
--- a/phpBB/includes/template/twig/definition.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* This class holds all DEFINE variables from the current page load
-*/
-class phpbb_template_twig_definition
-{
-	/** @var array **/
-	protected $definitions = array();
-
-	/**
-	* Get a DEFINE'd variable
-	*
-	* @param string $name
-	* @return mixed Null if not found
-	*/
-	public function __call($name, $arguments)
-	{
-		return (isset($this->definitions[$name])) ? $this->definitions[$name] : null;
-	}
-
-	/**
-	* DEFINE a variable
-	*
-	* @param string $name
-	* @param mixed $value
-	* @return phpbb_template_twig_definition
-	*/
-	public function set($name, $value)
-	{
-		$this->definitions[$name] = $value;
-
-		return $this;
-	}
-
-	/**
-	* Append to a variable
-	*
-	* @param string $name
-	* @param string $value
-	* @return phpbb_template_twig_definition
-	*/
-	public function append($name, $value)
-	{
-		if (!isset($this->definitions[$name]))
-		{
-			$this->definitions[$name] = '';
-		}
-
-		$this->definitions[$name] .= $value;
-
-		return $this;
-	}
-}
diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
deleted file mode 100644
index b60cd72325..0000000000
--- a/phpBB/includes/template/twig/environment.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class phpbb_template_twig_environment extends Twig_Environment
-{
-	/** @var array */
-	protected $phpbb_extensions;
-
-	/** @var phpbb_config */
-	protected $phpbb_config;
-
-	/** @var string */
-	protected $phpbb_root_path;
-
-	/** @var array **/
-	protected $namespace_look_up_order = array('__main__');
-
-	/**
-	* Constructor
-	*
-	* @param phpbb_config $phpbb_config
-	* @param array $phpbb_extensions Array of enabled extensions (name => path)
-	* @param string $phpbb_root_path
-	* @param Twig_LoaderInterface $loader
-	* @param array $options Array of options to pass to Twig
-	*/
-	public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
-	{
-		$this->phpbb_config = $phpbb_config;
-		$this->phpbb_extensions = $phpbb_extensions;
-		$this->phpbb_root_path = $phpbb_root_path;
-
-		return parent::__construct($loader, $options);
-	}
-
-	/**
-	* Get the list of enabled phpBB extensions
-	*
-	* Used in EVENT node
-	*
-	* @return array
-	*/
-	public function get_phpbb_extensions()
-	{
-		return $this->phpbb_extensions;
-	}
-
-	/**
-	* Get phpBB config
-	*
-	* @return phpbb_config
-	*/
-	public function get_phpbb_config()
-	{
-		return $this->phpbb_config;
-	}
-
-	/**
-	* Get the phpBB root path
-	*
-	* @return string
-	*/
-	public function get_phpbb_root_path()
-	{
-		return $this->phpbb_root_path;
-	}
-
-	/**
-	* Get the namespace look up order
-	*
-	* @return array
-	*/
-	public function getNamespaceLookUpOrder()
-	{
-		return $this->namespace_look_up_order;
-	}
-
-	/**
-	* Set the namespace look up order to load templates from
-	*
-	* @param array $namespace
-	* @return Twig_Environment
-	*/
-	public function setNamespaceLookUpOrder($namespace)
-	{
-		$this->namespace_look_up_order = $namespace;
-
-		return $this;
-	}
-
-	/**
-	 * Loads a template by name.
-	 *
-	 * @param string  $name  The template name
-	 * @param integer $index The index if it is an embedded template
-	 * @return Twig_TemplateInterface A template instance representing the given template name
-	 */
-	public function loadTemplate($name, $index = null)
-	{
-		if (strpos($name, '@') === false)
-		{
-			foreach ($this->getNamespaceLookUpOrder() as $namespace)
-			{
-				try
-				{
-					if ($namespace === '__main__')
-					{
-						return parent::loadTemplate($name, $index);
-					}
-
-					return parent::loadTemplate('@' . $namespace . '/' . $name, $index);
-				}
-				catch (Twig_Error_Loader $e)
-				{
-				}
-			}
-
-			// We were unable to load any templates
-			throw $e;
-		}
-		else
-		{
-			return parent::loadTemplate($name, $index);
-		}
-	}
-}
diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
deleted file mode 100644
index c279726434..0000000000
--- a/phpBB/includes/template/twig/extension.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class phpbb_template_twig_extension extends Twig_Extension
-{
-	/** @var phpbb_template_context */
-	protected $context;
-
-	/** @var phpbb_user */
-	protected $user;
-
-	/**
-	* Constructor
-	*
-	* @param phpbb_template_context $context
-	* @param phpbb_user $user
-	* @return phpbb_template_twig_extension
-	*/
-	public function __construct(phpbb_template_context $context, $user)
-	{
-		$this->context = $context;
-		$this->user = $user;
-	}
-
-	/**
-	* Get the name of this extension
-	*
-	* @return string
-	*/
-	public function getName()
-	{
-		return 'phpbb';
-	}
-
-    /**
-     * Returns the token parser instance to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParser instances
-     */
-	public function getTokenParsers()
-	{
-		return array(
-			new phpbb_template_twig_tokenparser_define,
-			new phpbb_template_twig_tokenparser_include,
-			new phpbb_template_twig_tokenparser_includejs,
-			new phpbb_template_twig_tokenparser_includecss,
-			new phpbb_template_twig_tokenparser_event,
-			new phpbb_template_twig_tokenparser_includephp,
-			new phpbb_template_twig_tokenparser_php,
-		);
-	}
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    public function getFilters()
-    {
-		return array(
-			new Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)),
-			new Twig_SimpleFilter('addslashes', 'addslashes'),
-		);
-    }
-
-    /**
-     * Returns a list of global functions to add to the existing list.
-     *
-     * @return array An array of global functions
-     */
-    public function getFunctions()
-    {
-		return array(
-			new Twig_SimpleFunction('lang', array($this, 'lang')),
-		);
-	}
-
-    /**
-     * Returns a list of operators to add to the existing list.
-     *
-     * @return array An array of operators
-     */
-	public function getOperators()
-	{
-		return array(
-			array(
-				'!' => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'),
-			),
-			array(
-				// precedence settings are copied from similar operators in Twig core extension
-				'||' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				'&&' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-
-				'eq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-
-				'ne' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				'neq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				'<>' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-
-				'===' => array('precedence' => 20, 'class' => 'phpbb_template_twig_node_expression_binary_equalequal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				'!==' => array('precedence' => 20, 'class' => 'phpbb_template_twig_node_expression_binary_notequalequal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-
-				'gt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				'gte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				'ge' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				'lt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				'lte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-				'le' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-
-				'mod' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-			),
-		);
-    }
-
-	/**
-	 * Grabs a subset of a loop
-	 *
-	 * @param Twig_Environment $env          A Twig_Environment instance
-	 * @param mixed            $item         A variable
-	 * @param integer          $start        Start of the subset
-	 * @param integer          $end   	     End of the subset
-	 * @param Boolean          $preserveKeys Whether to preserve key or not (when the input is an array)
-	 *
-	 * @return mixed The sliced variable
-	 */
-	function loop_subset(Twig_Environment $env, $item, $start, $end = null, $preserveKeys = false)
-	{
-		// We do almost the same thing as Twig's slice (array_slice), except when $end is positive
-		if ($end >= 1)
-		{
-			// When end is > 1, subset will end on the last item in an array with the specified $end
-			// This is different from slice in that it is the number we end on rather than the number
-			//  of items to grab (length)
-
-			// Start must always be the actual starting number for this calculation (not negative)
-			$start = ($start < 0) ? sizeof($item) + $start : $start;
-			$end = $end - $start;
-		}
-
-		// We always include the last element (this was the past design)
-		$end = ($end == -1 || $end === null) ? null : $end + 1;
-
-		return twig_slice($env, $item, $start, $end, $preserveKeys);
-	}
-
-	/**
-	* Get output for a language variable (L_FOO, LA_FOO)
-	*
-	* This function checks to see if the language var was outputted to $context
-	* (e.g. in the ACP, L_TITLE)
-	* If not, we return the result of $user->lang()
-	*
-	* @param string $lang name
-	* @return string
-	*/
-	function lang()
-	{
-		$args = func_get_args();
-		$key = $args[0];
-
-		$context = $this->context->get_data_ref();
-		$context_vars = $context['.'][0];
-
-		if (isset($context_vars['L_' . $key]))
-		{
-			return $context_vars['L_' . $key];
-		}
-
-		// LA_ is transformed into lang(\'$1\')|addslashes, so we should not
-		// need to check for it
-
-		return call_user_func_array(array($this->user, 'lang'), $args);
-	}
-}
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
deleted file mode 100644
index 46412ad048..0000000000
--- a/phpBB/includes/template/twig/lexer.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class phpbb_template_twig_lexer extends Twig_Lexer
-{
-	public function tokenize($code, $filename = null)
-	{
-		// Our phpBB tags
-		// Commented out tokens are handled separately from the main replace
-		$phpbb_tags = array(
-			/*'BEGIN',
-			'BEGINELSE',
-			'END',
-			'IF',
-			'ELSE',
-			'ELSEIF',
-			'ENDIF',
-			'DEFINE',
-			'UNDEFINE',*/
-			'ENDDEFINE',
-			'INCLUDE',
-			'INCLUDEPHP',
-			'INCLUDEJS',
-			'INCLUDECSS',
-			'PHP',
-			'ENDPHP',
-			'EVENT',
-		);
-
-		// Twig tag masks
-		$twig_tags = array(
-			'autoescape',
-			'endautoescape',
-			'if',
-			'elseif',
-			'else',
-			'endif',
-			'block',
-			'endblock',
-			'use',
-			'extends',
-			'embed',
-			'filter',
-			'endfilter',
-			'flush',
-			'for',
-			'endfor',
-			'macro',
-			'endmacro',
-			'import',
-			'from',
-			'sandbox',
-			'endsandbox',
-			'set',
-			'endset',
-			'spaceless',
-			'endspaceless',
-			'verbatim',
-			'endverbatim',
-		);
-
-		// Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}')
-		$code = $this->fix_inline_variable_tokens(array(
-			'DEFINE.+=',
-			'INCLUDE',
-			'INCLUDEPHP',
-			'INCLUDEJS',
-			'INCLUDECSS',
-		), $code);
-
-		// Fix our BEGIN statements
-		$code = $this->fix_begin_tokens($code);
-
-		// Fix our IF tokens
-		$code = $this->fix_if_tokens($code);
-
-		// Fix our DEFINE tokens
-		$code = $this->fix_define_tokens($code);
-
-		// Replace all of our starting tokens, <!-- TOKEN --> with Twig style, {% TOKEN %}
-		// This also strips outer parenthesis, <!-- IF (blah) --> becomes <!-- IF blah -->
-		$code = preg_replace('#<!-- (' . implode('|', $phpbb_tags) . ')(?: (.*?) ?)?-->#', '{% $1 $2 %}', $code);
-
-		// Replace all of our twig masks with Twig code (e.g. <!-- BLOCK .+ --> with {% block $1 %})
-		$code = $this->replace_twig_tag_masks($code, $twig_tags);
-
-		// Replace all of our language variables, {L_VARNAME}, with Twig style, {{ lang('NAME') }}
-		// Appends any filters after lang()
-		$code = preg_replace('#{L_([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ lang(\'$1\')$2 }}', $code);
-
-		// Replace all of our escaped language variables, {LA_VARNAME}, with Twig style, {{ lang('NAME')|addslashes }}
-		// Appends any filters after lang(), but before addslashes
-		$code = preg_replace('#{LA_([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ lang(\'$1\')$2|addslashes }}', $code);
-
-		// Replace all of our variables, {VARNAME}, with Twig style, {{ VARNAME }}
-		// Appends any filters
-		$code = preg_replace('#{([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ $1$2 }}', $code);
-
-		return parent::tokenize($code, $filename);
-	}
-
-	/**
-	* Fix tokens that may have inline variables
-	*
-	* E.g. <!-- INCLUDE {TEST}.html
-	*
-	* @param array $tokens array of tokens to search for (imploded to a regular expression)
-	* @param string $code
-	* @return string
-	*/
-	protected function fix_inline_variable_tokens($tokens, $code)
-	{
-		$callback = function($matches)
-		{
-			// Remove any quotes that may have been used in different implementations
-			// E.g. DEFINE $TEST = 'blah' vs INCLUDE foo
-			// Replace {} with start/end to parse variables (' ~ TEST ~ '.html)
-			$matches[2] = str_replace(array('"', "'", '{', '}'), array('', '', "' ~ ", " ~ '"), $matches[2]);
-
-			// Surround the matches in single quotes ('' ~ TEST ~ '.html')
-			return "<!-- {$matches[1]} '{$matches[2]}' -->";
-		};
-
-		return preg_replace_callback('#<!-- (' . implode('|', $tokens) . ') (.+?) -->#', $callback, $code);
-	}
-
-	/**
-	* Fix begin tokens (convert our BEGIN to Twig for)
-	*
-	* Not meant to be used outside of this context, public because the anonymous function calls this
-	*
-	* @param string $code
-	* @param array $parent_nodes (used in recursion)
-	* @return string
-	*/
-	public function fix_begin_tokens($code, $parent_nodes = array())
-	{
-		// PHP 5.3 cannot use $this in an anonymous function, so use this as a work-around
-		$parent_class = $this;
-		$callback = function ($matches) use ($parent_class, $parent_nodes)
-		{
-			$name = $matches[1];
-			$subset = trim(substr($matches[2], 1, -1)); // Remove parenthesis
-			$body = $matches[3];
-
-			// Is the designer wanting to call another loop in a loop?
-			// <!-- BEGIN loop -->
-			// <!-- BEGIN !loop2 -->
-			// <!-- END !loop2 -->
-			// <!-- END loop -->
-			// 'loop2' is actually on the same nesting level as 'loop' you assign
-			// variables to it with template->assign_block_vars('loop2', array(...))
-			if (strpos($name, '!') === 0)
-			{
-				// Count the number if ! occurrences
-				$count = substr_count($name, '!');
-				for ($i = 0; $i < $count; $i++)
-				{
-					array_pop($parent_nodes);
-					$name = substr($name, 1);
-				}
-			}
-
-			// Remove all parent nodes, e.g. foo, bar from foo.bar.foobar.VAR
-			foreach ($parent_nodes as $node)
-			{
-				$body = preg_replace('#([^a-zA-Z0-9_])' . $node . '\.([a-zA-Z0-9_]+)\.#', '$1$2.', $body);
-			}
-
-			// Add current node to list of parent nodes for child nodes
-			$parent_nodes[] = $name;
-
-			// Recursive...fix any child nodes
-			$body = $parent_class->fix_begin_tokens($body, $parent_nodes);
-
-			// Rename loopname vars (to prevent collisions, loop children are named (loop name)_loop_element)
-			$body = str_replace($name . '.', $name . '_loop_element.', $body);
-
-			// Need the parent variable name
-			array_pop($parent_nodes);
-			$parent = (!empty($parent_nodes)) ? end($parent_nodes) . '_loop_element.' : '';
-
-			if ($subset !== '')
-			{
-				$subset = '|subset(' . $subset . ')';
-			}
-
-			// Turn into a Twig for loop, using (loop name)_loop_element for each child
-			return "{% for {$name}_loop_element in {$parent}{$name}{$subset} %}{$body}{% endfor %}";
-		};
-
-		// Replace <!-- BEGINELSE --> correctly, only needs to be done once
-		$code = str_replace('<!-- BEGINELSE -->', '{% else %}', $code);
-
-		return preg_replace_callback('#<!-- BEGIN ([!a-zA-Z0-9_]+)(\([0-9,\-]+\))? -->(.+?)<!-- END \1 -->#s', $callback, $code);
-	}
-
-	/**
-	* Fix IF statements
-	*
-	* @param string $code
-	* @return string
-	*/
-	protected function fix_if_tokens($code)
-	{
-		$callback = function($matches)
-		{
-			// Replace $TEST with definition.TEST
-			$matches[1] = preg_replace('#\s\$([a-zA-Z_0-9]+)#', ' definition.$1', $matches[1]);
-
-			// Replace .test with test|length
-			$matches[1] = preg_replace('#\s\.([a-zA-Z_0-9\.]+)#', ' $1|length', $matches[1]);
-
-			return '<!-- IF' . $matches[1] . '-->';
-		};
-
-		// Replace our "div by" with Twig's divisibleby (Twig does not like test names with spaces)
-		$code = preg_replace('# div by ([0-9]+)#', ' divisibleby($1)', $code);
-
-		return preg_replace_callback('#<!-- IF((.*)[\s][\$|\.|!]([^\s]+)(.*))-->#', $callback, $code);
-	}
-
-	/**
-	* Fix DEFINE statements and {$VARNAME} variables
-	*
-	* @param string $code
-	* @return string
-	*/
-	protected function fix_define_tokens($code)
-	{
-		/**
-		* Changing $VARNAME to definition.varname because set is only local
-		* context (e.g. DEFINE $TEST will only make $TEST available in current
-		* template and any child templates, but not any parent templates).
-		*
-		* DEFINE handles setting it properly to definition in its node, but the
-		* variables reading FROM it need to be altered to definition.VARNAME
-		*
-		* Setting up definition as a class in the array passed to Twig
-		* ($context) makes set definition.TEST available in the global context
-		*/
-
-		// Replace <!-- DEFINE $NAME with {% DEFINE definition.NAME
-		$code = preg_replace('#<!-- DEFINE \$(.*)-->#', '{% DEFINE $1 %}', $code);
-
-		// Changing UNDEFINE NAME to DEFINE NAME = null to save from creating an extra token parser/node
-		$code = preg_replace('#<!-- UNDEFINE \$(.*)-->#', '{% DEFINE $1= null %}', $code);
-
-		// Replace all of our variables, {$VARNAME}, with Twig style, {{ definition.VARNAME }}
-		$code = preg_replace('#{\$([a-zA-Z0-9_\.]+)}#', '{{ definition.$1 }}', $code);
-
-		// Replace all of our variables, ~ $VARNAME ~, with Twig style, ~ definition.VARNAME ~
-		$code = preg_replace('#~ \$([a-zA-Z0-9_\.]+) ~#', '~ definition.$1 ~', $code);
-
-		return $code;
-	}
-
-	/**
-	* Replace Twig tag masks with Twig tag calls
-	*
-	* E.g. <!-- BLOCK foo --> with {% block foo %}
-	*
-	* @param string $code
-	* @param array $twig_tags All tags we want to create a mask for
-	* @return string
-	*/
-	protected function replace_twig_tag_masks($code, $twig_tags)
-	{
-		$callback = function ($matches)
-		{
-			$matches[1] = strtolower($matches[1]);
-
-			return "{% {$matches[1]}{$matches[2]}%}";
-		};
-
-		foreach ($twig_tags as &$tag)
-		{
-			$tag = strtoupper($tag);
-		}
-
-		// twig_tags is an array of the twig tags, which are all lowercase, but we use all uppercase tags
-		$code = preg_replace_callback('#<!-- (' . implode('|', $twig_tags) . ')(.*?)-->#',$callback, $code);
-
-		return $code;
-	}
-}
diff --git a/phpBB/includes/template/twig/node/define.php b/phpBB/includes/template/twig/node/define.php
deleted file mode 100644
index fcb19cc773..0000000000
--- a/phpBB/includes/template/twig/node/define.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_node_define extends Twig_Node
-{
-	public function __construct($capture, Twig_NodeInterface $name, Twig_NodeInterface $value, $lineno, $tag = null)
-	{
-		parent::__construct(array('name' => $name, 'value' => $value), array('capture' => $capture, 'safe' => false), $lineno, $tag);
-	}
-
-	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
-	public function compile(Twig_Compiler $compiler)
-	{
-		$compiler->addDebugInfo($this);
-
-		if ($this->getAttribute('capture')) {
-			$compiler
-				->write("ob_start();\n")
-				->subcompile($this->getNode('value'))
-			;
-
-			$compiler->write("\$value = ('' === \$value = ob_get_clean()) ? '' : new Twig_Markup(\$value, \$this->env->getCharset());\n");
-		}
-		else
-		{
-			$compiler
-				->write("\$value = ")
-				->subcompile($this->getNode('value'))
-				->raw(";\n")
-			;
-		}
-
-		$compiler
-			->write("\$context['definition']->set('")
-			->raw($this->getNode('name')->getAttribute('name'))
-			->raw("', \$value);\n")
-		;
-	}
-}
diff --git a/phpBB/includes/template/twig/node/event.php b/phpBB/includes/template/twig/node/event.php
deleted file mode 100644
index 971dea14fa..0000000000
--- a/phpBB/includes/template/twig/node/event.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_node_event extends Twig_Node
-{
-	/** @var Twig_Environment */
-	protected $environment;
-
-	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
-	{
-		$this->environment = $environment;
-
-		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
-	}
-
-	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
-	public function compile(Twig_Compiler $compiler)
-	{
-		$compiler->addDebugInfo($this);
-
-		$location = $this->getNode('expr')->getAttribute('name');
-
-		foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
-		{
-			$ext_namespace = str_replace('/', '_', $ext_namespace);
-
-			if (defined('DEBUG'))
-			{
-				// If debug mode is enabled, lets check for new/removed EVENT
-				//  templates on page load rather than at compile. This is
-				//  slower, but makes developing extensions easier (no need to
-				//  purge the cache when a new event template file is added)
-		        $compiler
-		            ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
-		            ->indent()
-		        ;
-			}
-
-			if (defined('DEBUG') || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
-			{
-				$compiler
-					->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
-
-					// We set the namespace lookup order to be this extension first, then the main path
-					->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
-					->write("\$this->env->loadTemplate('@{$ext_namespace}/{$location}.html')->display(\$context);\n")
-					->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
-				;
-			}
-
-			if (defined('DEBUG'))
-			{
-				$compiler
-					->outdent()
-		            ->write("}\n\n")
-				;
-			}
-		}
-	}
-}
diff --git a/phpBB/includes/template/twig/node/expression/binary/equalequal.php b/phpBB/includes/template/twig/node/expression/binary/equalequal.php
deleted file mode 100644
index 8ec2069114..0000000000
--- a/phpBB/includes/template/twig/node/expression/binary/equalequal.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_node_expression_binary_equalequal extends Twig_Node_Expression_Binary
-{
-	public function operator(Twig_Compiler $compiler)
-	{
-		return $compiler->raw('===');
-	}
-}
diff --git a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php b/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
deleted file mode 100644
index 96f32c502e..0000000000
--- a/phpBB/includes/template/twig/node/expression/binary/notequalequal.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_node_expression_binary_notequalequal extends Twig_Node_Expression_Binary
-{
-	public function operator(Twig_Compiler $compiler)
-	{
-		return $compiler->raw('!==');
-	}
-}
diff --git a/phpBB/includes/template/twig/node/include.php b/phpBB/includes/template/twig/node/include.php
deleted file mode 100644
index 5c6ae1bbcf..0000000000
--- a/phpBB/includes/template/twig/node/include.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_node_include extends Twig_Node_Include
-{
-	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
-	public function compile(Twig_Compiler $compiler)
-	{
-		$compiler->addDebugInfo($this);
-
-		$compiler
-			->write("\$location = ")
-			->subcompile($this->getNode('expr'))
-			->raw(";\n")
-			->write("\$namespace = false;\n")
-			->write("if (strpos(\$location, '@') === 0) {\n")
-			->indent()
-				->write("\$namespace = substr(\$location, 1, strpos(\$location, '/') - 1);\n")
-				->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
-
-				// We set the namespace lookup order to be this namespace first, then the main path
-				->write("\$this->env->setNamespaceLookUpOrder(array(\$namespace, '__main__'));\n")
-			->outdent()
-			->write("}\n")
-		;
-
-		parent::compile($compiler);
-
-		$compiler
-			->write("if (\$namespace) {\n")
-			->indent()
-				->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
-			->outdent()
-			->write("}\n")
-		;
-	}
-}
diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php
deleted file mode 100644
index 990b1c984f..0000000000
--- a/phpBB/includes/template/twig/node/includeasset.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-class phpbb_template_twig_node_includeasset extends Twig_Node
-{
-	/** @var Twig_Environment */
-	protected $environment;
-
-	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $lineno, $tag = null)
-	{
-		$this->environment = $environment;
-
-		parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
-	}
-	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
-	public function compile(Twig_Compiler $compiler)
-	{
-		$compiler->addDebugInfo($this);
-
-		$config = $this->environment->get_phpbb_config();
-
-		$compiler
-			->write("\$asset_file = ")
-			->subcompile($this->getNode('expr'))
-			->raw(";\n")
-			->write("\$asset = new phpbb_template_asset(\$asset_file);\n")
-			->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
-			->indent()
-				->write("\$asset_path = \$asset->get_path();")
-				->write("\$local_file = \$this->getEnvironment()->get_phpbb_root_path() . \$asset_path;\n")
-				->write("if (!file_exists(\$local_file)) {\n")
-				->indent()
-					->write("\$local_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_path);\n")
-					->write("\$asset->set_path(\$local_file, true);\n")
-				->outdent()
-				->write("\$asset->add_assets_version({$config['assets_version']});\n")
-				->write("\$asset_file = \$asset->get_url();\n")
-				->write("}\n")
-			->outdent()
-			->write("}\n")
-			->write("\$context['definition']->append('{$this->get_definition_name()}', '")
-		;
-
-		$this->append_asset($compiler);
-
-		$compiler
-			->raw("\n');\n")
-		;
-	}
-}
diff --git a/phpBB/includes/template/twig/node/includecss.php b/phpBB/includes/template/twig/node/includecss.php
deleted file mode 100644
index 01fda44aad..0000000000
--- a/phpBB/includes/template/twig/node/includecss.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset
-{
-	public function get_definition_name()
-	{
-		return 'STYLESHEETS';
-	}
-
-	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
-	public function append_asset(Twig_Compiler $compiler)
-	{
-		$compiler
-			->raw("<link href=\"' . ")
-			->raw("\$asset_file . '\"")
-			->raw(' rel="stylesheet" type="text/css" media="screen, projection" />')
-		;
-	}
-}
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
deleted file mode 100644
index fdf2bea3ed..0000000000
--- a/phpBB/includes/template/twig/node/includejs.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
-{
-	public function get_definition_name()
-	{
-		return 'SCRIPTS';
-	}
-
-	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
-	protected function append_asset(Twig_Compiler $compiler)
-	{
-		$config = $this->environment->get_phpbb_config();
-
-		$compiler
-			->raw("<script type=\"text/javascript\" src=\"' . ")
-			->raw("\$asset_file")
-			->raw(". '\"></script>\n")
-		;
-	}
-}
diff --git a/phpBB/includes/template/twig/node/includephp.php b/phpBB/includes/template/twig/node/includephp.php
deleted file mode 100644
index dbe54f0e1a..0000000000
--- a/phpBB/includes/template/twig/node/includephp.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_node_includephp extends Twig_Node
-{
-	/** @var Twig_Environment */
-	protected $environment;
-
-	public function __construct(Twig_Node_Expression $expr, phpbb_template_twig_environment $environment, $ignoreMissing = false, $lineno, $tag = null)
-	{
-		$this->environment = $environment;
-
-		parent::__construct(array('expr' => $expr), array('ignore_missing' => (Boolean) $ignoreMissing), $lineno, $tag);
-	}
-
-	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
-	public function compile(Twig_Compiler $compiler)
-	{
-		$compiler->addDebugInfo($this);
-
-		$config = $this->environment->get_phpbb_config();
-
-		if (!$config['tpl_allow_php'])
-		{
-			$compiler
-				->write("// INCLUDEPHP Disabled\n")
-			;
-
-			return;
-		}
-
-		if ($this->getAttribute('ignore_missing')) {
-			$compiler
-				->write("try {\n")
-				->indent()
-			;
-		}
-
-		$compiler
-			->write("\$location = ")
-			->subcompile($this->getNode('expr'))
-			->raw(";\n")
-			->write("if (phpbb_is_absolute(\$location)) {\n")
-			->indent()
-				// Absolute path specified
-				->write("require(\$location);\n")
-			->outdent()
-			->write("} else if (file_exists(\$this->getEnvironment()->get_phpbb_root_path() . \$location)) {\n")
-			->indent()
-				// PHP file relative to phpbb_root_path
-				->write("require(\$this->getEnvironment()->get_phpbb_root_path() . \$location);\n")
-			->outdent()
-			->write("} else {\n")
-			->indent()
-				// Local path (behaves like INCLUDE)
-				->write("require(\$this->getEnvironment()->getLoader()->getCacheKey(\$location));\n")
-			->outdent()
-			->write("}\n")
-		;
-
-		if ($this->getAttribute('ignore_missing')) {
-			$compiler
-				->outdent()
-				->write("} catch (Twig_Error_Loader \$e) {\n")
-				->indent()
-				->write("// ignore missing template\n")
-				->outdent()
-				->write("}\n\n")
-			;
-		}
-	}
-}
diff --git a/phpBB/includes/template/twig/node/php.php b/phpBB/includes/template/twig/node/php.php
deleted file mode 100644
index c11539ea7f..0000000000
--- a/phpBB/includes/template/twig/node/php.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_node_php extends Twig_Node
-{
-	/** @var Twig_Environment */
-	protected $environment;
-
-	public function __construct(Twig_Node_Text $text, phpbb_template_twig_environment $environment, $lineno, $tag = null)
-	{
-		$this->environment = $environment;
-
-		parent::__construct(array('text' => $text), array(), $lineno, $tag);
-	}
-
-	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
-	public function compile(Twig_Compiler $compiler)
-	{
-		$compiler->addDebugInfo($this);
-
-		$config = $this->environment->get_phpbb_config();
-
-		if (!$config['tpl_allow_php'])
-		{
-			$compiler
-				->write("// PHP Disabled\n")
-			;
-
-			return;
-		}
-
-		$compiler
-			->raw($this->getNode('text')->getAttribute('data'))
-		;
-	}
-}
diff --git a/phpBB/includes/template/twig/tokenparser/define.php b/phpBB/includes/template/twig/tokenparser/define.php
deleted file mode 100644
index 4ea15388c4..0000000000
--- a/phpBB/includes/template/twig/tokenparser/define.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_tokenparser_define extends Twig_TokenParser
-{
-	/**
-	 * Parses a token and returns a node.
-	 *
-	 * @param Twig_Token $token A Twig_Token instance
-	 *
-	 * @return Twig_NodeInterface A Twig_NodeInterface instance
-	 */
-	public function parse(Twig_Token $token)
-	{
-		$lineno = $token->getLine();
-		$stream = $this->parser->getStream();
-		$name = $this->parser->getExpressionParser()->parseExpression();
-
-		$capture = false;
-		if ($stream->test(Twig_Token::OPERATOR_TYPE, '=')) {
-			$stream->next();
-			$value = $this->parser->getExpressionParser()->parseExpression();
-
-			$stream->expect(Twig_Token::BLOCK_END_TYPE);
-		} else {
-			$capture = true;
-
-			$stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-			$value = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-			$stream->expect(Twig_Token::BLOCK_END_TYPE);
-		}
-
-		return new phpbb_template_twig_node_define($capture, $name, $value, $lineno, $this->getTag());
-	}
-
-	public function decideBlockEnd(Twig_Token $token)
-	{
-		return $token->test('ENDDEFINE');
-	}
-
-	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
-	public function getTag()
-	{
-		return 'DEFINE';
-	}
-}
diff --git a/phpBB/includes/template/twig/tokenparser/event.php b/phpBB/includes/template/twig/tokenparser/event.php
deleted file mode 100644
index e4dddd6dcc..0000000000
--- a/phpBB/includes/template/twig/tokenparser/event.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_tokenparser_event extends Twig_TokenParser
-{
-	/**
-	 * Parses a token and returns a node.
-	 *
-	 * @param Twig_Token $token A Twig_Token instance
-	 *
-	 * @return Twig_NodeInterface A Twig_NodeInterface instance
-	 */
-	public function parse(Twig_Token $token)
-	{
-		$expr = $this->parser->getExpressionParser()->parseExpression();
-
-		$stream = $this->parser->getStream();
-		$stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-		return new phpbb_template_twig_node_event($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
-	}
-
-	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
-	public function getTag()
-	{
-		return 'EVENT';
-	}
-}
diff --git a/phpBB/includes/template/twig/tokenparser/include.php b/phpBB/includes/template/twig/tokenparser/include.php
deleted file mode 100644
index 520f9fd1a0..0000000000
--- a/phpBB/includes/template/twig/tokenparser/include.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_tokenparser_include extends Twig_TokenParser_Include
-{
-	/**
-	 * Parses a token and returns a node.
-	 *
-	 * @param Twig_Token $token A Twig_Token instance
-	 *
-	 * @return Twig_NodeInterface A Twig_NodeInterface instance
-	 */
-	public function parse(Twig_Token $token)
-	{
-		$expr = $this->parser->getExpressionParser()->parseExpression();
-
-		list($variables, $only, $ignoreMissing) = $this->parseArguments();
-
-		return new phpbb_template_twig_node_include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
-	}
-
-	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
-	public function getTag()
-	{
-		return 'INCLUDE';
-	}
-}
diff --git a/phpBB/includes/template/twig/tokenparser/includecss.php b/phpBB/includes/template/twig/tokenparser/includecss.php
deleted file mode 100644
index 6c24dda647..0000000000
--- a/phpBB/includes/template/twig/tokenparser/includecss.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-class phpbb_template_twig_tokenparser_includecss extends Twig_TokenParser
-{
-	/**
-	 * Parses a token and returns a node.
-	 *
-	 * @param Twig_Token $token A Twig_Token instance
-	 *
-	 * @return Twig_NodeInterface A Twig_NodeInterface instance
-	 */
-	public function parse(Twig_Token $token)
-	{
-		$expr = $this->parser->getExpressionParser()->parseExpression();
-
-		$stream = $this->parser->getStream();
-		$stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-		return new phpbb_template_twig_node_includecss($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
-	}
-
-	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
-	public function getTag()
-	{
-		return 'INCLUDECSS';
-	}
-}
diff --git a/phpBB/includes/template/twig/tokenparser/includejs.php b/phpBB/includes/template/twig/tokenparser/includejs.php
deleted file mode 100644
index b02b2f89ba..0000000000
--- a/phpBB/includes/template/twig/tokenparser/includejs.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_tokenparser_includejs extends Twig_TokenParser
-{
-	/**
-	 * Parses a token and returns a node.
-	 *
-	 * @param Twig_Token $token A Twig_Token instance
-	 *
-	 * @return Twig_NodeInterface A Twig_NodeInterface instance
-	 */
-	public function parse(Twig_Token $token)
-	{
-		$expr = $this->parser->getExpressionParser()->parseExpression();
-
-		$stream = $this->parser->getStream();
-		$stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-		return new phpbb_template_twig_node_includejs($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
-	}
-
-	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
-	public function getTag()
-	{
-		return 'INCLUDEJS';
-	}
-}
diff --git a/phpBB/includes/template/twig/tokenparser/includephp.php b/phpBB/includes/template/twig/tokenparser/includephp.php
deleted file mode 100644
index 13fe6de8a6..0000000000
--- a/phpBB/includes/template/twig/tokenparser/includephp.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group, sections (c) 2009 Fabien Potencier, Armin Ronacher
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_tokenparser_includephp extends Twig_TokenParser
-{
-	/**
-	 * Parses a token and returns a node.
-	 *
-	 * @param Twig_Token $token A Twig_Token instance
-	 *
-	 * @return Twig_NodeInterface A Twig_NodeInterface instance
-	 */
-	public function parse(Twig_Token $token)
-	{
-		$expr = $this->parser->getExpressionParser()->parseExpression();
-
-		$stream = $this->parser->getStream();
-
-		$ignoreMissing = false;
-		if ($stream->test(Twig_Token::NAME_TYPE, 'ignore')) {
-			$stream->next();
-			$stream->expect(Twig_Token::NAME_TYPE, 'missing');
-
-			$ignoreMissing = true;
-		}
-
-		$stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-		return new phpbb_template_twig_node_includephp($expr, $this->parser->getEnvironment(), $ignoreMissing, $token->getLine(), $this->getTag());
-	}
-
-	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
-	public function getTag()
-	{
-		return 'INCLUDEPHP';
-	}
-}
diff --git a/phpBB/includes/template/twig/tokenparser/php.php b/phpBB/includes/template/twig/tokenparser/php.php
deleted file mode 100644
index 197980a59a..0000000000
--- a/phpBB/includes/template/twig/tokenparser/php.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-
-class phpbb_template_twig_tokenparser_php extends Twig_TokenParser
-{
-	/**
-	 * Parses a token and returns a node.
-	 *
-	 * @param Twig_Token $token A Twig_Token instance
-	 *
-	 * @return Twig_NodeInterface A Twig_NodeInterface instance
-	 */
-	public function parse(Twig_Token $token)
-	{
-		$stream = $this->parser->getStream();
-
-		$stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-		$body = $this->parser->subparse(array($this, 'decideEnd'), true);
-
-		$stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-		return new phpbb_template_twig_node_php($body, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
-	}
-
-	public function decideEnd(Twig_Token $token)
-	{
-		return $token->test('ENDPHP');
-	}
-
-	/**
-	 * Gets the tag name associated with this token parser.
-	 *
-	 * @return string The tag name
-	 */
-	public function getTag()
-	{
-		return 'PHP';
-    }
-}
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
deleted file mode 100644
index 92a37d1634..0000000000
--- a/phpBB/includes/template/twig/twig.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Twig Template class.
-* @package phpBB3
-*/
-class phpbb_template_twig implements phpbb_template
-{
-	/**
-	* Template context.
-	* Stores template data used during template rendering.
-	* @var phpbb_template_context
-	*/
-	protected $context;
-
-	/**
-	* Path of the cache directory for the template
-	*
-	* Cannot be changed during runtime.
-	*
-	* @var string
-	*/
-	private $cachepath = '';
-
-	/**
-	* phpBB root path
-	* @var string
-	*/
-	protected $phpbb_root_path;
-
-	/**
-	* adm relative path
-	* @var string
-	*/
-	protected $adm_relative_path;
-
-	/**
-	* PHP file extension
-	* @var string
-	*/
-	protected $php_ext;
-
-	/**
-	* phpBB config instance
-	* @var phpbb_config
-	*/
-	protected $config;
-
-	/**
-	* Current user
-	* @var phpbb_user
-	*/
-	protected $user;
-
-	/**
-	* Extension manager.
-	*
-	* @var phpbb_extension_manager
-	*/
-	protected $extension_manager;
-
-	/**
-	* Name of the style that the template being compiled and/or rendered
-	* belongs to, and its parents, in inheritance tree order.
-	*
-	* Used to invoke style-specific template events.
-	*
-	* @var array
-	*/
-	protected $style_names;
-
-	/**
-	* Twig Environment
-	*
-	* @var Twig_Environment
-	*/
-	protected $twig;
-
-	/**
-	* Array of filenames assigned to set_filenames
-	*
-	* @var array
-	*/
-	protected $filenames = array();
-
-	/**
-	* Constructor.
-	*
-	* @param string $phpbb_root_path phpBB root path
-	* @param string $php_ext php extension (typically 'php')
-	* @param phpbb_config $config
-	* @param phpbb_user $user
-	* @param phpbb_template_context $context template context
-	* @param phpbb_extension_manager $extension_manager extension manager, if null then template events will not be invoked
-	* @param string $adm_relative_path relative path to adm directory
-	*/
-	public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_context $context, phpbb_extension_manager $extension_manager = null, $adm_relative_path = null)
-	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->adm_relative_path = $adm_relative_path;
-		$this->php_ext = $php_ext;
-		$this->config = $config;
-		$this->user = $user;
-		$this->context = $context;
-		$this->extension_manager = $extension_manager;
-
-		$this->cachepath = $phpbb_root_path . 'cache/twig/';
-
-		// Initiate the loader, __main__ namespace paths will be setup later in set_style_names()
-		$loader = new Twig_Loader_Filesystem('');
-
-		$this->twig = new phpbb_template_twig_environment(
-			$this->config,
-			($this->extension_manager) ? $this->extension_manager->all_enabled() : array(),
-			$this->phpbb_root_path,
-			$loader,
-			array(
-				'cache'			=> (defined('IN_INSTALL')) ? false : $this->cachepath,
-				'debug'			=> defined('DEBUG'),
-				'auto_reload'	=> (bool) $this->config['load_tplcompile'],
-				'autoescape'	=> false,
-			)
-		);
-
-		$this->twig->addExtension(
-			new phpbb_template_twig_extension(
-				$this->context,
-				$this->user
-			)
-		);
-
-		$lexer = new phpbb_template_twig_lexer($this->twig);
-
-		$this->twig->setLexer($lexer);
-	}
-
-	/**
-	* Clear the cache
-	*
-	* @return phpbb_template
-	*/
-	public function clear_cache()
-	{
-		if (is_dir($this->cachepath))
-		{
-			$this->twig->clearCacheFiles();
-		}
-
-		return $this;
-	}
-
-	/**
-	* Sets the template filenames for handles.
-	*
-	* @param array $filename_array Should be a hash of handle => filename pairs.
-	* @return phpbb_template $this
-	*/
-	public function set_filenames(array $filename_array)
-	{
-		$this->filenames = array_merge($this->filenames, $filename_array);
-
-		return $this;
-	}
-
-	/**
-	* Sets the style names/paths corresponding to style hierarchy being compiled
-	* and/or rendered.
-	*
-	* @param array $style_names List of style names in inheritance tree order
-	* @param array $style_paths List of style paths in inheritance tree order
-	* @param bool $is_core True if the style names are the "core" styles for this page load
-	* 	Core means the main phpBB template files
-	* @return phpbb_template $this
-	*/
-	public function set_style_names(array $style_names, array $style_paths, $is_core = false)
-	{
-		$this->style_names = $style_names;
-
-		// Set as __main__ namespace
-		$this->twig->getLoader()->setPaths($style_paths);
-
-		// Core style namespace from phpbb_style::set_style()
-		if ($is_core)
-		{
-			$this->twig->getLoader()->setPaths($style_paths, 'core');
-		}
-
-		// Add admin namespace
-		if (is_dir($this->phpbb_root_path . $this->adm_relative_path . 'style/'))
-		{
-			$this->twig->getLoader()->setPaths($this->phpbb_root_path . $this->adm_relative_path . 'style/', 'admin');
-		}
-
-		// Add all namespaces for all extensions
-		if ($this->extension_manager instanceof phpbb_extension_manager)
-		{
-			$style_names[] = 'all';
-
-			foreach ($this->extension_manager->all_enabled() as $ext_namespace => $ext_path)
-			{
-				// namespaces cannot contain /
-				$namespace = str_replace('/', '_', $ext_namespace);
-				$paths = array();
-
-				foreach ($style_names as $style_name)
-				{
-					$ext_style_path = $ext_path . 'styles/' . $style_name . '/template';
-
-					if (is_dir($ext_style_path))
-					{
-						$paths[] = $ext_style_path;
-					}
-				}
-
-				$this->twig->getLoader()->setPaths($paths, $namespace);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	* Clears all variables and blocks assigned to this template.
-	*
-	* @return phpbb_template $this
-	*/
-	public function destroy()
-	{
-		$this->context = array();
-
-		return $this;
-	}
-
-	/**
-	* Reset/empty complete block
-	*
-	* @param string $blockname Name of block to destroy
-	* @return phpbb_template $this
-	*/
-	public function destroy_block_vars($blockname)
-	{
-		$this->context->destroy_block_vars($blockname);
-
-		return $this;
-	}
-
-	/**
-	* Display a template for provided handle.
-	*
-	* The template will be loaded and compiled, if necessary, first.
-	*
-	* This function calls hooks.
-	*
-	* @param string $handle Handle to display
-	* @return phpbb_template $this
-	*/
-	public function display($handle)
-	{
-		$result = $this->call_hook($handle, __FUNCTION__);
-		if ($result !== false)
-		{
-			return $result[0];
-		}
-
-		$this->twig->display($this->get_filename_from_handle($handle), $this->get_template_vars());
-
-		return $this;
-	}
-
-	/**
-	* Calls hook if any is defined.
-	*
-	* @param string $handle Template handle being displayed.
-	* @param string $method Method name of the caller.
-	*/
-	protected function call_hook($handle, $method)
-	{
-		global $phpbb_hook;
-
-		if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, $method), $handle, $this))
-		{
-			if ($phpbb_hook->hook_return(array(__CLASS__, $method)))
-			{
-				$result = $phpbb_hook->hook_return_result(array(__CLASS__, $method));
-				return array($result);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	* Display the handle and assign the output to a template variable
-	* or return the compiled result.
-	*
-	* @param string $handle Handle to operate on
-	* @param string $template_var Template variable to assign compiled handle to
-	* @param bool $return_content If true return compiled handle, otherwise assign to $template_var
-	* @return phpbb_template|string if $return_content is true return string of the compiled handle, otherwise return $this
-	*/
-	public function assign_display($handle, $template_var = '', $return_content = true)
-	{
-		if ($return_content)
-		{
-			return $this->twig->render($this->get_filename_from_handle($handle), $this->get_template_vars());
-		}
-
-		$this->assign_var($template_var, $this->twig->render($this->get_filename_from_handle($handle, $this->get_template_vars())));
-
-		return $this;
-	}
-
-	/**
-	* Assign key variable pairs from an array
-	*
-	* @param array $vararray A hash of variable name => value pairs
-	* @return phpbb_template $this
-	*/
-	public function assign_vars(array $vararray)
-	{
-		foreach ($vararray as $key => $val)
-		{
-			$this->assign_var($key, $val);
-		}
-
-		return $this;
-	}
-
-	/**
-	* Assign a single scalar value to a single key.
-	*
-	* Value can be a string, an integer or a boolean.
-	*
-	* @param string $varname Variable name
-	* @param string $varval Value to assign to variable
-	* @return phpbb_template $this
-	*/
-	public function assign_var($varname, $varval)
-	{
-		$this->context->assign_var($varname, $varval);
-
-		return $this;
-	}
-
-	/**
-	* Append text to the string value stored in a key.
-	*
-	* Text is appended using the string concatenation operator (.).
-	*
-	* @param string $varname Variable name
-	* @param string $varval Value to append to variable
-	* @return phpbb_template $this
-	*/
-	public function append_var($varname, $varval)
-	{
-		$this->context->append_var($varname, $varval);
-
-		return $this;
-	}
-
-	/**
-	* Assign key variable pairs from an array to a specified block
-	* @param string $blockname Name of block to assign $vararray to
-	* @param array $vararray A hash of variable name => value pairs
-	* @return phpbb_template $this
-	*/
-	public function assign_block_vars($blockname, array $vararray)
-	{
-		$this->context->assign_block_vars($blockname, $vararray);
-
-		return $this;
-	}
-
-	/**
-	* Change already assigned key variable pair (one-dimensional - single loop entry)
-	*
-	* An example of how to use this function:
-	* {@example alter_block_array.php}
-	*
-	* @param	string	$blockname	the blockname, for example 'loop'
-	* @param	array	$vararray	the var array to insert/add or merge
-	* @param	mixed	$key		Key to search for
-	*
-	* array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
-	*
-	* int: Position [the position to change or insert at directly given]
-	*
-	* If key is false the position is set to 0
-	* If key is true the position is set to the last entry
-	*
-	* @param	string	$mode		Mode to execute (valid modes are 'insert' and 'change')
-	*
-	*	If insert, the vararray is inserted at the given position (position counting from zero).
-	*	If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
-	*
-	* Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
-	* and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
-	*
-	* @return bool false on error, true on success
-	*/
-	public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert')
-	{
-		return $this->context->alter_block_array($blockname, $vararray, $key, $mode);
-	}
-
-	/**
-	* Get template vars in a format Twig will use (from the context)
-	*
-	* @return array
-	*/
-	public function get_template_vars()
-	{
-		$context_vars = $this->context->get_data_ref();
-
-		$vars = array_merge(
-			$context_vars['.'][0], // To get normal vars
-			$context_vars, // To get loops
-			array(
-				'definition'	=> new phpbb_template_twig_definition(),
-				'user'			=> $this->user,
-			)
-		);
-
-		// cleanup
-		unset($vars['.']);
-
-		return $vars;
-	}
-
-	/**
-	* Get a filename from the handle
-	*
-	* @param string $handle
-	* @return string
-	*/
-	protected function get_filename_from_handle($handle)
-	{
-		return (isset($this->filenames[$handle])) ? $this->filenames[$handle] : $handle;
-	}
-
-	/**
-	* Get path to template for handle (required for BBCode parser)
-	*
-	* @return string
-	*/
-	public function get_source_file_for_handle($handle)
-	{
-		return $this->twig->getLoader()->getCacheKey($this->get_filename_from_handle($handle));
-	}
-}
diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
deleted file mode 100644
index cc8aab2115..0000000000
--- a/phpBB/includes/tree/interface.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
-*
-* @package tree
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-interface phpbb_tree_interface
-{
-	/**
-	* Inserts an item into the database table and into the tree.
-	*
-	* @param array	$item	The item to be added
-	* @return array Array with item data as set in the database
-	*/
-	public function insert(array $additional_data);
-
-	/**
-	* Delete an item from the tree and from the database table
-	*
-	* Also deletes the subtree from the tree and from the database table
-	*
-	* @param int	$item_id	The item to be deleted
-	* @return array		Item ids that have been deleted
-	*/
-	public function delete($item_id);
-
-	/**
-	* Move an item by a given delta
-	*
-	* An item is only moved up/down within the same parent. If the delta is
-	* larger then the number of children, the item is moved to the top/bottom
-	* of the list of children within this parent.
-	*
-	* @param int	$item_id	The item to be moved
-	* @param int	$delta		Number of steps to move this item, < 0 => down, > 0 => up
-	* @return bool True if the item was moved
-	*/
-	public function move($item_id, $delta);
-
-	/**
-	* Move an item down by 1
-	*
-	* @param int	$item_id	The item to be moved
-	* @return bool True if the item was moved
-	*/
-	public function move_down($item_id);
-
-	/**
-	* Move an item up by 1
-	*
-	* @param int	$item_id	The item to be moved
-	* @return bool True if the item was moved
-	*/
-	public function move_up($item_id);
-
-	/**
-	* Moves all children of one item to another item
-	*
-	* If the new parent already has children, the new children are appended
-	* to the list.
-	*
-	* @param int	$current_parent_id	The current parent item
-	* @param int	$new_parent_id		The new parent item
-	* @return bool True if any items where moved
-	*/
-	public function move_children($current_parent_id, $new_parent_id);
-
-	/**
-	* Change parent item
-	*
-	* Moves the item to the bottom of the new parent's list of children
-	*
-	* @param int	$item_id			The item to be moved
-	* @param int	$new_parent_id		The new parent item
-	* @return bool True if the parent was set successfully
-	*/
-	public function change_parent($item_id, $new_parent_id);
-
-	/**
-	* Get all items that are either ancestors or descendants of the item
-	*
-	* @param int		$item_id		Id of the item to retrieve the ancestors/descendants from
-	* @param bool		$order_asc		Order the items ascendingly (most outer ancestor first)
-	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
-	* @return array			Array of items (containing all columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_path_and_subtree_data($item_id, $order_asc, $include_item);
-
-	/**
-	* Get all of the item's ancestors
-	*
-	* @param int		$item_id		Id of the item to retrieve the ancestors from
-	* @param bool		$order_asc		Order the items ascendingly (most outer ancestor first)
-	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
-	* @return array			Array of items (containing all columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_path_data($item_id, $order_asc, $include_item);
-
-	/**
-	* Get all of the item's descendants
-	*
-	* @param int		$item_id		Id of the item to retrieve the descendants from
-	* @param bool		$order_asc		Order the items ascendingly
-	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
-	* @return array			Array of items (containing all columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_subtree_data($item_id, $order_asc, $include_item);
-}
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
deleted file mode 100644
index 4d851a87a8..0000000000
--- a/phpBB/includes/tree/nestedset.php
+++ /dev/null
@@ -1,850 +0,0 @@
-<?php
-/**
-*
-* @package tree
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-abstract class phpbb_tree_nestedset implements phpbb_tree_interface
-{
-	/** @var phpbb_db_driver */
-	protected $db;
-
-	/** @var phpbb_lock_db */
-	protected $lock;
-
-	/** @var string */
-	protected $table_name;
-
-	/**
-	* Prefix for the language keys returned by exceptions
-	* @var string
-	*/
-	protected $message_prefix = '';
-
-	/**
-	* Column names in the table
-	* @var string
-	*/
-	protected $column_item_id = 'item_id';
-	protected $column_left_id = 'left_id';
-	protected $column_right_id = 'right_id';
-	protected $column_parent_id = 'parent_id';
-	protected $column_item_parents = 'item_parents';
-
-	/**
-	* Additional SQL restrictions
-	* Allows to have multiple nested sets in one table
-	* @var string
-	*/
-	protected $sql_where = '';
-
-	/**
-	* List of item properties to be cached in the item_parents column
-	* @var array
-	*/
-	protected $item_basic_data = array('*');
-
-	/**
-	* Construct
-	*
-	* @param phpbb_db_driver	$db		Database connection
-	* @param phpbb_lock_db		$lock	Lock class used to lock the table when moving forums around
-	* @param string			$table_name			Table name
-	* @param string			$message_prefix		Prefix for the messages thrown by exceptions
-	* @param string			$sql_where			Additional SQL restrictions for the queries
-	* @param array			$item_basic_data	Array with basic item data that is stored in item_parents
-	* @param array			$columns			Array with column names to overwrite
-	*/
-	public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name, $message_prefix = '', $sql_where = '', $item_basic_data = array(), $columns = array())
-	{
-		$this->db = $db;
-		$this->lock = $lock;
-
-		$this->table_name = $table_name;
-		$this->message_prefix = $message_prefix;
-		$this->sql_where = $sql_where;
-		$this->item_basic_data = (!empty($item_basic_data)) ? $item_basic_data : array('*');
-
-		if (!empty($columns))
-		{
-			foreach ($columns as $column => $name)
-			{
-				$column_name = 'column_' . $column;
-				$this->$column_name = $name;
-			}
-		}
-	}
-
-	/**
-	* Returns additional sql where restrictions
-	*
-	* @param string		$operator		SQL operator that needs to be prepended to sql_where,
-	*									if it is not empty.
-	* @param string		$column_prefix	Prefix that needs to be prepended to column names
-	* @return string		Returns additional where statements to narrow down the tree,
-	*						prefixed with operator and prepended column_prefix to column names
-	*/
-	public function get_sql_where($operator = 'AND', $column_prefix = '')
-	{
-		return (!$this->sql_where) ? '' : $operator . ' ' . sprintf($this->sql_where, $column_prefix);
-	}
-
-	/**
-	* Acquires a lock on the item table
-	*
-	* @return bool	True if the lock was acquired, false if it has been acquired previously
-	*
-	* @throws RuntimeException If the lock could not be acquired
-	*/
-	protected function acquire_lock()
-	{
-		if ($this->lock->owns_lock())
-		{
-			return false;
-		}
-
-		if (!$this->lock->acquire())
-		{
-			throw new RuntimeException($this->message_prefix . 'LOCK_FAILED_ACQUIRE');
-		}
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function insert(array $additional_data)
-	{
-		$item_data = $this->reset_nestedset_values($additional_data);
-
-		$sql = 'INSERT INTO ' . $this->table_name . ' ' . $this->db->sql_build_array('INSERT', $item_data);
-		$this->db->sql_query($sql);
-
-		$item_data[$this->column_item_id] = (int) $this->db->sql_nextid();
-
-		return array_merge($item_data, $this->add_item_to_nestedset($item_data[$this->column_item_id]));
-	}
-
-	/**
-	* Add an item which already has a database row at the end of the tree
-	*
-	* @param int	$item_id	The item to be added
-	* @return array		Array with updated data, if the item was added successfully
-	*					Empty array otherwise
-	*/
-	protected function add_item_to_nestedset($item_id)
-	{
-		$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
-			FROM ' . $this->table_name . '
-			' . $this->get_sql_where('WHERE');
-		$result = $this->db->sql_query($sql);
-		$current_max_right_id = (int) $this->db->sql_fetchfield($this->column_right_id);
-		$this->db->sql_freeresult($result);
-
-		$update_item_data = array(
-			$this->column_parent_id		=> 0,
-			$this->column_left_id		=> $current_max_right_id + 1,
-			$this->column_right_id		=> $current_max_right_id + 2,
-			$this->column_item_parents	=> '',
-		);
-
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->db->sql_build_array('UPDATE', $update_item_data) . '
-			WHERE ' . $this->column_item_id . ' = ' . (int) $item_id . '
-				AND ' . $this->column_parent_id . ' = 0
-				AND ' . $this->column_left_id . ' = 0
-				AND ' . $this->column_right_id . ' = 0';
-		$this->db->sql_query($sql);
-
-		return ($this->db->sql_affectedrows() == 1) ? $update_item_data : array();
-	}
-
-	/**
-	* Remove an item from the tree without deleting it from the database
-	*
-	* Also removes all subitems from the tree without deleting them from the database either
-	*
-	* @param int	$item_id	The item to be deleted
-	* @return array		Item ids that have been removed
-	*/
-	protected function remove_item_from_nestedset($item_id)
-	{
-		$item_id = (int) $item_id;
-		if (!$item_id)
-		{
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		$items = $this->get_subtree_data($item_id);
-		$item_ids = array_keys($items);
-
-		if (empty($items) || !isset($items[$item_id]))
-		{
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		$this->remove_subset($item_ids, $items[$item_id]);
-
-		return $item_ids;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function delete($item_id)
-	{
-		$removed_items = $this->remove_item_from_nestedset($item_id);
-
-		$sql = 'DELETE FROM ' . $this->table_name . '
-			WHERE ' . $this->db->sql_in_set($this->column_item_id, $removed_items) . '
-			' . $this->get_sql_where('AND');
-		$this->db->sql_query($sql);
-
-		return $removed_items;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function move($item_id, $delta)
-	{
-		if ($delta == 0)
-		{
-			return false;
-		}
-
-		$this->acquire_lock();
-
-		$action = ($delta > 0) ? 'move_up' : 'move_down';
-		$delta = abs($delta);
-
-		// Keep $this->get_sql_where() here, to ensure we are in the right tree.
-		$sql = 'SELECT *
-			FROM ' . $this->table_name . '
-			WHERE ' . $this->column_item_id . ' = ' . (int) $item_id . '
-				' . $this->get_sql_where();
-		$result = $this->db->sql_query_limit($sql, $delta);
-		$item = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if (!$item)
-		{
-			$this->lock->release();
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		/**
-		* Fetch all the siblings between the item's current spot
-		* and where we want to move it to. If there are less than $delta
-		* siblings between the current spot and the target then the
-		* item will move as far as possible
-		*/
-		$sql = "SELECT {$this->column_item_id}, {$this->column_parent_id}, {$this->column_left_id}, {$this->column_right_id}, {$this->column_item_parents}
-			FROM " . $this->table_name . '
-			WHERE ' . $this->column_parent_id . ' = ' . (int) $item[$this->column_parent_id] . '
-				' . $this->get_sql_where() . '
-				AND ';
-
-		if ($action == 'move_up')
-		{
-			$sql .= $this->column_right_id . ' < ' . (int) $item[$this->column_right_id] . ' ORDER BY ' . $this->column_right_id . ' DESC';
-		}
-		else
-		{
-			$sql .= $this->column_left_id . ' > ' . (int) $item[$this->column_left_id] . ' ORDER BY ' . $this->column_left_id . ' ASC';
-		}
-
-		$result = $this->db->sql_query_limit($sql, $delta);
-
-		$target = false;
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$target = $row;
-		}
-		$this->db->sql_freeresult($result);
-
-		if (!$target)
-		{
-			$this->lock->release();
-			// The item is already on top or bottom
-			return false;
-		}
-
-		/**
-		* $left_id and $right_id define the scope of the items that are affected by the move.
-		* $diff_up and $diff_down are the values to substract or add to each item's left_id
-		* and right_id in order to move them up or down.
-		* $move_up_left and $move_up_right define the scope of the items that are moving
-		* up. Other items in the scope of ($left_id, $right_id) are considered to move down.
-		*/
-		if ($action == 'move_up')
-		{
-			$left_id = (int) $target[$this->column_left_id];
-			$right_id = (int) $item[$this->column_right_id];
-
-			$diff_up = (int) $item[$this->column_left_id] - (int) $target[$this->column_left_id];
-			$diff_down = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
-
-			$move_up_left = (int) $item[$this->column_left_id];
-			$move_up_right = (int) $item[$this->column_right_id];
-		}
-		else
-		{
-			$left_id = (int) $item[$this->column_left_id];
-			$right_id = (int) $target[$this->column_right_id];
-
-			$diff_up = (int) $item[$this->column_right_id] + 1 - (int) $item[$this->column_left_id];
-			$diff_down = (int) $target[$this->column_right_id] - (int) $item[$this->column_right_id];
-
-			$move_up_left = (int) $item[$this->column_right_id] + 1;
-			$move_up_right = (int) $target[$this->column_right_id];
-		}
-
-		// Now do the dirty job
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . ' + CASE
-				WHEN ' . $this->column_left_id . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
-				ELSE {$diff_down}
-			END,
-			" . $this->column_right_id . ' = ' . $this->column_right_id . ' + CASE
-				WHEN ' . $this->column_right_id . " BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
-				ELSE {$diff_down}
-			END
-			WHERE
-				" . $this->column_left_id . " BETWEEN {$left_id} AND {$right_id}
-				AND " . $this->column_right_id . " BETWEEN {$left_id} AND {$right_id}
-				" . $this->get_sql_where();
-		$this->db->sql_query($sql);
-
-		$this->lock->release();
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function move_down($item_id)
-	{
-		return $this->move($item_id, -1);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function move_up($item_id)
-	{
-		return $this->move($item_id, 1);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function move_children($current_parent_id, $new_parent_id)
-	{
-		$current_parent_id = (int) $current_parent_id;
-		$new_parent_id = (int) $new_parent_id;
-
-		if ($current_parent_id == $new_parent_id)
-		{
-			return false;
-		}
-
-		if (!$current_parent_id)
-		{
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		$this->acquire_lock();
-
-		$item_data = $this->get_subtree_data($current_parent_id);
-		if (!isset($item_data[$current_parent_id]))
-		{
-			$this->lock->release();
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		$current_parent = $item_data[$current_parent_id];
-		unset($item_data[$current_parent_id]);
-		$move_items = array_keys($item_data);
-
-		if (($current_parent[$this->column_right_id] - $current_parent[$this->column_left_id]) <= 1)
-		{
-			$this->lock->release();
-			return false;
-		}
-
-		if (in_array($new_parent_id, $move_items))
-		{
-			$this->lock->release();
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
-		}
-
-		$diff = sizeof($move_items) * 2;
-		$sql_exclude_moved_items = $this->db->sql_in_set($this->column_item_id, $move_items, true);
-
-		$this->db->sql_transaction('begin');
-
-		$this->remove_subset($move_items, $current_parent, false, true);
-
-		if ($new_parent_id)
-		{
-			// Retrieve new-parent again, it may have been changed...
-			$sql = 'SELECT *
-				FROM ' . $this->table_name . '
-				WHERE ' . $this->column_item_id . ' = ' . $new_parent_id;
-			$result = $this->db->sql_query($sql);
-			$new_parent = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$new_parent)
-			{
-				$this->db->sql_transaction('rollback');
-				$this->lock->release();
-				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
-			}
-
-			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
-
-			if ($new_right_id > $current_parent[$this->column_right_id])
-			{
-				$diff = ' + ' . ($new_right_id - $current_parent[$this->column_right_id]);
-			}
-			else
-			{
-				$diff = ' - ' . abs($new_right_id - $current_parent[$this->column_right_id]);
-			}
-		}
-		else
-		{
-			$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
-				FROM ' . $this->table_name . '
-				WHERE ' . $sql_exclude_moved_items . '
-					' . $this->get_sql_where('AND');
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			$diff = ' + ' . ($row[$this->column_right_id] - $current_parent[$this->column_left_id]);
-		}
-
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
-				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
-				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_parent_id . ' = ' . $current_parent_id, $new_parent_id, $this->column_parent_id) . ',
-				' . $this->column_item_parents . " = ''
-			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
-				' . $this->get_sql_where('AND');
-		$this->db->sql_query($sql);
-
-		$this->db->sql_transaction('commit');
-		$this->lock->release();
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function change_parent($item_id, $new_parent_id)
-	{
-		$item_id = (int) $item_id;
-		$new_parent_id = (int) $new_parent_id;
-
-		if ($item_id == $new_parent_id)
-		{
-			return false;
-		}
-
-		if (!$item_id)
-		{
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		$this->acquire_lock();
-
-		$item_data = $this->get_subtree_data($item_id);
-		if (!isset($item_data[$item_id]))
-		{
-			$this->lock->release();
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_ITEM');
-		}
-
-		$item = $item_data[$item_id];
-		$move_items = array_keys($item_data);
-
-		if (in_array($new_parent_id, $move_items))
-		{
-			$this->lock->release();
-			throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
-		}
-
-		$diff = sizeof($move_items) * 2;
-		$sql_exclude_moved_items = $this->db->sql_in_set($this->column_item_id, $move_items, true);
-
-		$this->db->sql_transaction('begin');
-
-		$this->remove_subset($move_items, $item, false, true);
-
-		if ($new_parent_id)
-		{
-			// Retrieve new-parent again, it may have been changed...
-			$sql = 'SELECT *
-				FROM ' . $this->table_name . '
-				WHERE ' . $this->column_item_id . ' = ' . $new_parent_id;
-			$result = $this->db->sql_query($sql);
-			$new_parent = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			if (!$new_parent)
-			{
-				$this->db->sql_transaction('rollback');
-				$this->lock->release();
-				throw new OutOfBoundsException($this->message_prefix . 'INVALID_PARENT');
-			}
-
-			$new_right_id = $this->prepare_adding_subset($move_items, $new_parent, true);
-
-			if ($new_right_id > (int) $item[$this->column_right_id])
-			{
-				$diff = ' + ' . ($new_right_id - (int) $item[$this->column_right_id] - 1);
-			}
-			else
-			{
-				$diff = ' - ' . abs($new_right_id - (int) $item[$this->column_right_id] - 1);
-			}
-		}
-		else
-		{
-			$sql = 'SELECT MAX(' . $this->column_right_id . ') AS ' . $this->column_right_id . '
-				FROM ' . $this->table_name . '
-				WHERE ' . $sql_exclude_moved_items . '
-					' . $this->get_sql_where('AND');
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-			$this->db->sql_freeresult($result);
-
-			$diff = ' + ' . ($row[$this->column_right_id] - (int) $item[$this->column_left_id] + 1);
-		}
-
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->column_left_id . ' = ' . $this->column_left_id . $diff . ',
-				' . $this->column_right_id . ' = ' . $this->column_right_id . $diff . ',
-				' . $this->column_parent_id . ' = ' . $this->db->sql_case($this->column_item_id . ' = ' . $item_id, $new_parent_id, $this->column_parent_id) . ',
-				' . $this->column_item_parents . " = ''
-			WHERE " . $this->db->sql_in_set($this->column_item_id, $move_items) . '
-				' . $this->get_sql_where('AND');
-		$this->db->sql_query($sql);
-
-		$this->db->sql_transaction('commit');
-		$this->lock->release();
-
-		return true;
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_path_and_subtree_data($item_id, $order_asc = true, $include_item = true)
-	{
-		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '
-			OR i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id;
-
-		return $this->get_set_of_nodes_data($item_id, $condition, $order_asc, $include_item);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_path_data($item_id, $order_asc = true, $include_item = true)
-	{
-		$condition = 'i1.' . $this->column_left_id . ' BETWEEN i2.' . $this->column_left_id . ' AND i2.' . $this->column_right_id . '';
-
-		return $this->get_set_of_nodes_data($item_id, $condition, $order_asc, $include_item);
-	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_subtree_data($item_id, $order_asc = true, $include_item = true)
-	{
-		$condition = 'i2.' . $this->column_left_id . ' BETWEEN i1.' . $this->column_left_id . ' AND i1.' . $this->column_right_id . '';
-
-		return $this->get_set_of_nodes_data($item_id, $condition, $order_asc, $include_item);
-	}
-
-	/**
-	* Get items that are related to the given item by the condition
-	*
-	* @param int		$item_id		Id of the item to retrieve the node set from
-	* @param string		$condition		Query string restricting the item list
-	* @param bool		$order_asc		Order the items ascending by their left_id
-	* @param bool		$include_item	Should the item matching the given item id be included in the list as well
-	* @return array			Array of items (containing all columns from the item table)
-	*							ID => Item data
-	*/
-	protected function get_set_of_nodes_data($item_id, $condition, $order_asc = true, $include_item = true)
-	{
-		$rows = array();
-
-		$sql = 'SELECT i2.*
-			FROM ' . $this->table_name . ' i1
-			LEFT JOIN ' . $this->table_name . " i2
-				ON (($condition) " . $this->get_sql_where('AND', 'i2.') . ')
-			WHERE i1.' . $this->column_item_id . ' = ' . (int) $item_id . '
-				' . $this->get_sql_where('AND', 'i1.') . '
-			ORDER BY i2.' . $this->column_left_id . ' ' . ($order_asc ? 'ASC' : 'DESC');
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (!$include_item && $item_id == $row[$this->column_item_id])
-			{
-				continue;
-			}
-
-			$rows[(int) $row[$this->column_item_id]] = $row;
-		}
-		$this->db->sql_freeresult($result);
-
-		return $rows;
-	}
-
-	/**
-	* Get basic data of all parent items
-	*
-	* Basic data is defined in the $item_basic_data property.
-	* Data is cached in the item_parents column in the item table
-	*
-	* @param array	$item		The item to get the path from
-	* @return array			Array of items (containing basic columns from the item table)
-	*							ID => Item data
-	*/
-	public function get_path_basic_data(array $item)
-	{
-		$parents = array();
-		if ($item[$this->column_parent_id])
-		{
-			if (!$item[$this->column_item_parents])
-			{
-				$sql = 'SELECT ' . implode(', ', $this->item_basic_data) . '
-					FROM ' . $this->table_name . '
-					WHERE ' . $this->column_left_id . ' < ' . (int) $item[$this->column_left_id] . '
-						AND ' . $this->column_right_id . ' > ' . (int) $item[$this->column_right_id] . '
-						' . $this->get_sql_where('AND') . '
-					ORDER BY ' . $this->column_left_id . ' ASC';
-				$result = $this->db->sql_query($sql);
-
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$parents[$row[$this->column_item_id]] = $row;
-				}
-				$this->db->sql_freeresult($result);
-
-				$item_parents = serialize($parents);
-
-				$sql = 'UPDATE ' . $this->table_name . '
-					SET ' . $this->column_item_parents . " = '" . $this->db->sql_escape($item_parents) . "'
-					WHERE " . $this->column_parent_id . ' = ' . (int) $item[$this->column_parent_id];
-				$this->db->sql_query($sql);
-			}
-			else
-			{
-				$parents = unserialize($item[$this->column_item_parents]);
-			}
-		}
-
-		return $parents;
-	}
-
-	/**
-	* Remove a subset from the nested set
-	*
-	* @param array	$subset_items		Subset of items to remove
-	* @param array	$bounding_item		Item containing the right bound of the subset
-	* @param bool	$set_subset_zero	Should the parent, left and right id of the items be set to 0, or kept unchanged?
-	*									In case of removing an item from the tree, we should the values to 0
-	*									In case of moving an item, we shouldkeep the original values, in order to allow "+ diff" later
-	* @return	null
-	*/
-	protected function remove_subset(array $subset_items, array $bounding_item, $set_subset_zero = true)
-	{
-		$acquired_new_lock = $this->acquire_lock();
-
-		$diff = sizeof($subset_items) * 2;
-		$sql_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items);
-		$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
-
-		$sql_is_parent = $this->column_left_id . ' <= ' . (int) $bounding_item[$this->column_right_id] . '
-			AND ' . $this->column_right_id . ' >= ' . (int) $bounding_item[$this->column_right_id];
-
-		$sql_is_right = $this->column_left_id . ' > ' . (int) $bounding_item[$this->column_right_id];
-
-		$set_left_id = $this->db->sql_case($sql_is_right, $this->column_left_id . ' - ' . $diff, $this->column_left_id);
-		$set_right_id = $this->db->sql_case($sql_is_parent . ' OR ' . $sql_is_right, $this->column_right_id . ' - ' . $diff, $this->column_right_id);
-
-		if ($set_subset_zero)
-		{
-			$set_left_id = $this->db->sql_case($sql_subset_items, 0, $set_left_id);
-			$set_right_id = $this->db->sql_case($sql_subset_items, 0, $set_right_id);
-		}
-
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . (($set_subset_zero) ? $this->column_parent_id . ' = ' . $this->db->sql_case($sql_subset_items, 0, $this->column_parent_id) . ',' : '') . '
-				' . $this->column_left_id . ' = ' . $set_left_id . ',
-				' . $this->column_right_id . ' = ' . $set_right_id . '
-			' . ((!$set_subset_zero) ? ' WHERE ' . $sql_not_subset_items . ' ' . $this->get_sql_where('AND') : $this->get_sql_where('WHERE'));
-		$this->db->sql_query($sql);
-
-		if ($acquired_new_lock)
-		{
-			$this->lock->release();
-		}
-	}
-
-	/**
-	* Prepare adding a subset to the nested set
-	*
-	* @param array	$subset_items		Subset of items to add
-	* @param array	$new_parent	Item containing the right bound of the new parent
-	* @return	int		New right id of the parent item
-	*/
-	protected function prepare_adding_subset(array $subset_items, array $new_parent)
-	{
-		$diff = sizeof($subset_items) * 2;
-		$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
-
-		$set_left_id = $this->db->sql_case($this->column_left_id . ' > ' . (int) $new_parent[$this->column_right_id], $this->column_left_id . ' + ' . $diff, $this->column_left_id);
-		$set_right_id = $this->db->sql_case($this->column_right_id . ' >= ' . (int) $new_parent[$this->column_right_id], $this->column_right_id . ' + ' . $diff, $this->column_right_id);
-
-		$sql = 'UPDATE ' . $this->table_name . '
-			SET ' . $this->column_left_id . ' = ' . $set_left_id . ',
-				' . $this->column_right_id . ' = ' . $set_right_id . '
-			WHERE ' . $sql_not_subset_items . '
-				' . $this->get_sql_where('AND');
-		$this->db->sql_query($sql);
-
-		return $new_parent[$this->column_right_id] + $diff;
-	}
-
-	/**
-	* Resets values required for the nested set system
-	*
-	* @param array	$item		Original item data
-	* @return	array		Original item data + nested set defaults
-	*/
-	protected function reset_nestedset_values(array $item)
-	{
-		$item_data = array_merge($item, array(
-			$this->column_parent_id		=> 0,
-			$this->column_left_id		=> 0,
-			$this->column_right_id		=> 0,
-			$this->column_item_parents	=> '',
-		));
-
-		unset($item_data[$this->column_item_id]);
-
-		return $item_data;
-	}
-
-	/**
-	* Regenerate left/right ids from parent/child relationship
-	*
-	* This method regenerates the left/right ids for the tree based on
-	* the parent/child relations. This function executes three queries per
-	* item, so it should only be called, when the set has one of the following
-	* problems:
-	*	- The set has a duplicated value inside the left/right id chain
-	*	- The set has a missing value inside the left/right id chain
-	*	- The set has items that do not have a left/right id set
-	*
-	* When regenerating the items, the items are sorted by parent id and their
-	* current left id, so the current child/parent relationships are kept
-	* and running the function on a working set will not change the order.
-	*
-	* @param int	$new_id		First left_id to be used (should start with 1)
-	* @param int	$parent_id	parent_id of the current set (default = 0)
-	* @param bool	$reset_ids	Should we reset all left_id/right_id on the first call?
-	* @return	int		$new_id		The next left_id/right_id that should be used
-	*/
-	public function regenerate_left_right_ids($new_id, $parent_id = 0, $reset_ids = false)
-	{
-		if ($acquired_new_lock = $this->acquire_lock())
-		{
-			$this->db->sql_transaction('begin');
-
-			if (!$reset_ids)
-			{
-				$sql = 'UPDATE ' . $this->table_name . '
-					SET ' . $this->column_item_parents . " = ''
-					" . $this->get_sql_where('WHERE');
-				$this->db->sql_query($sql);
-			}
-		}
-
-		if ($reset_ids)
-		{
-			$sql = 'UPDATE ' . $this->table_name . '
-				SET ' . $this->db->sql_build_array('UPDATE', array(
-					$this->column_left_id		=> 0,
-					$this->column_right_id		=> 0,
-					$this->column_item_parents	=> '',
-				)) . '
-				' . $this->get_sql_where('WHERE');
-			$this->db->sql_query($sql);
-		}
-
-		$sql = 'SELECT *
-			FROM ' . $this->table_name . '
-			WHERE ' . $this->column_parent_id . ' = ' . (int) $parent_id . '
-				' . $this->get_sql_where('AND') . '
-			ORDER BY ' . $this->column_left_id . ', ' . $this->column_item_id . ' ASC';
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			// First we update the left_id for this module
-			if ($row[$this->column_left_id] != $new_id)
-			{
-				$sql = 'UPDATE ' . $this->table_name . '
-					SET ' . $this->db->sql_build_array('UPDATE', array($this->column_left_id => $new_id)) . '
-					WHERE ' . $this->column_item_id . ' = ' . (int) $row[$this->column_item_id];
-				$this->db->sql_query($sql);
-			}
-			$new_id++;
-
-			// Then we go through any children and update their left/right id's
-			$new_id = $this->regenerate_left_right_ids($new_id, $row[$this->column_item_id]);
-
-			// Then we come back and update the right_id for this module
-			if ($row[$this->column_right_id] != $new_id)
-			{
-				$sql = 'UPDATE ' . $this->table_name . '
-					SET ' . $this->db->sql_build_array('UPDATE', array($this->column_right_id => $new_id)) . '
-					WHERE ' . $this->column_item_id . ' = ' . (int) $row[$this->column_item_id];
-				$this->db->sql_query($sql);
-			}
-			$new_id++;
-		}
-		$this->db->sql_freeresult($result);
-
-		if ($acquired_new_lock)
-		{
-			$this->db->sql_transaction('commit');
-			$this->lock->release();
-		}
-
-		return $new_id;
-	}
-}
diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/includes/tree/nestedset_forum.php
deleted file mode 100644
index ff09ef55d0..0000000000
--- a/phpBB/includes/tree/nestedset_forum.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-*
-* @package tree
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset
-{
-	/**
-	* Construct
-	*
-	* @param phpbb_db_driver	$db		Database connection
-	* @param phpbb_lock_db		$lock	Lock class used to lock the table when moving forums around
-	* @param string				$table_name		Table name
-	*/
-	public function __construct(phpbb_db_driver $db, phpbb_lock_db $lock, $table_name)
-	{
-		parent::__construct(
-			$db,
-			$lock,
-			$table_name,
-			'FORUM_NESTEDSET_',
-			'',
-			array(
-				'forum_id',
-				'forum_name',
-				'forum_type',
-			),
-			array(
-				'item_id'		=> 'forum_id',
-				'item_parents'	=> 'forum_parents',
-			)
-		);
-	}
-}
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php
deleted file mode 100644
index 5530fe3f03..0000000000
--- a/phpBB/includes/user.php
+++ /dev/null
@@ -1,857 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Base user class
-*
-* This is the overarching class which contains (through session extend)
-* all methods utilised for user functionality during a session.
-*
-* @package phpBB3
-*/
-class phpbb_user extends phpbb_session
-{
-	var $lang = array();
-	var $help = array();
-	var $style = array();
-	var $date_format;
-
-	/**
-	* DateTimeZone object holding the timezone of the user
-	*/
-	public $timezone;
-
-	var $lang_name = false;
-	var $lang_id = false;
-	var $lang_path;
-	var $img_lang;
-	var $img_array = array();
-
-	// Able to add new options (up to id 31)
-	var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10, 'sig_bbcode' => 15, 'sig_smilies' => 16, 'sig_links' => 17);
-
-	/**
-	* Constructor to set the lang path
-	*/
-	function __construct()
-	{
-		global $phpbb_root_path;
-
-		$this->lang_path = $phpbb_root_path . 'language/';
-	}
-
-	/**
-	* Function to set custom language path (able to use directory outside of phpBB)
-	*
-	* @param string $lang_path New language path used.
-	* @access public
-	*/
-	function set_custom_lang_path($lang_path)
-	{
-		$this->lang_path = $lang_path;
-
-		if (substr($this->lang_path, -1) != '/')
-		{
-			$this->lang_path .= '/';
-		}
-	}
-
-	/**
-	* Setup basic user-specific items (style, language, ...)
-	*/
-	function setup($lang_set = false, $style_id = false)
-	{
-		global $db, $phpbb_style, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
-		global $phpbb_dispatcher;
-
-		if ($this->data['user_id'] != ANONYMOUS)
-		{
-			$user_lang_name = (file_exists($this->lang_path . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']);
-			$user_date_format = $this->data['user_dateformat'];
-			$user_timezone = $this->data['user_timezone'];
-		}
-		else
-		{
-			$user_lang_name = basename($config['default_lang']);
-			$user_date_format = $config['default_dateformat'];
-			$user_timezone = $config['board_timezone'];
-
-			/**
-			* If a guest user is surfing, we try to guess his/her language first by obtaining the browser language
-			* If re-enabled we need to make sure only those languages installed are checked
-			* Commented out so we do not loose the code.
-
-			if ($request->header('Accept-Language'))
-			{
-				$accept_lang_ary = explode(',', $request->header('Accept-Language'));
-
-				foreach ($accept_lang_ary as $accept_lang)
-				{
-					// Set correct format ... guess full xx_YY form
-					$accept_lang = substr($accept_lang, 0, 2) . '_' . strtoupper(substr($accept_lang, 3, 2));
-					$accept_lang = basename($accept_lang);
-
-					if (file_exists($this->lang_path . $accept_lang . "/common.$phpEx"))
-					{
-						$user_lang_name = $config['default_lang'] = $accept_lang;
-						break;
-					}
-					else
-					{
-						// No match on xx_YY so try xx
-						$accept_lang = substr($accept_lang, 0, 2);
-						$accept_lang = basename($accept_lang);
-
-						if (file_exists($this->lang_path . $accept_lang . "/common.$phpEx"))
-						{
-							$user_lang_name = $config['default_lang'] = $accept_lang;
-							break;
-						}
-					}
-				}
-			}
-			*/
-		}
-
-		$user_data = $this->data;
-
-		/**
-		* Event to load language files and modify user data on every page
-		*
-		* @event core.user_setup
-		* @var	array	user_data			Array with user's data row
-		* @var	string	user_lang_name		Basename of the user's langauge
-		* @var	string	user_date_format	User's date/time format
-		* @var	string	user_timezone		User's timezone, should be one of
-		*							http://www.php.net/manual/en/timezones.php
-		* @var	mixed	lang_set			String or array of language files
-		* @var	mixed	style_id			Style we are going to display
-		* @since 3.1-A1
-		*/
-		$vars = array('user_data', 'user_lang_name', 'user_date_format', 'user_timezone', 'lang_set', 'style_id');
-		extract($phpbb_dispatcher->trigger_event('core.user_setup', compact($vars)));
-
-		$this->data = $user_data;
-		$this->lang_name = $user_lang_name;
-		$this->date_format = $user_date_format;
-
-		try
-		{
-			$this->timezone = new DateTimeZone($user_timezone);
-		}
-		catch (Exception $e)
-		{
-			// If the timezone the user has selected is invalid, we fall back to UTC.
-			$this->timezone = new DateTimeZone('UTC');
-		}
-
-		// We include common language file here to not load it every time a custom language file is included
-		$lang = &$this->lang;
-
-		// Do not suppress error if in DEBUG mode
-		$include_result = (defined('DEBUG')) ? (include $this->lang_path . $this->lang_name . "/common.$phpEx") : (@include $this->lang_path . $this->lang_name . "/common.$phpEx");
-
-		if ($include_result === false)
-		{
-			die('Language file ' . $this->lang_path . $this->lang_name . "/common.$phpEx" . " couldn't be opened.");
-		}
-
-		$this->add_lang($lang_set);
-		unset($lang_set);
-
-		$style_request = request_var('style', 0);
-		if ($style_request && $auth->acl_get('a_styles') && !defined('ADMIN_START'))
-		{
-			global $SID, $_EXTRA_URL;
-
-			$style_id = $style_request;
-			$SID .= '&amp;style=' . $style_id;
-			$_EXTRA_URL = array('style=' . $style_id);
-		}
-		else
-		{
-			// Set up style
-			$style_id = ($style_id) ? $style_id : ((!$config['override_user_style']) ? $this->data['user_style'] : $config['default_style']);
-		}
-
-		$sql = 'SELECT *
-			FROM ' . STYLES_TABLE . " s
-			WHERE s.style_id = $style_id";
-		$result = $db->sql_query($sql, 3600);
-		$this->style = $db->sql_fetchrow($result);
-		$db->sql_freeresult($result);
-
-		// User has wrong style
-		if (!$this->style && $style_id == $this->data['user_style'])
-		{
-			$style_id = $this->data['user_style'] = $config['default_style'];
-
-			$sql = 'UPDATE ' . USERS_TABLE . "
-				SET user_style = $style_id
-				WHERE user_id = {$this->data['user_id']}";
-			$db->sql_query($sql);
-
-			$sql = 'SELECT *
-				FROM ' . STYLES_TABLE . " s
-				WHERE s.style_id = $style_id";
-			$result = $db->sql_query($sql, 3600);
-			$this->style = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-		}
-
-		if (!$this->style)
-		{
-			trigger_error('NO_STYLE_DATA', E_USER_ERROR);
-		}
-
-		// Now parse the cfg file and cache it
-		$parsed_items = $cache->obtain_cfg_items($this->style);
-
-		$check_for = array(
-			'pagination_sep'    => (string) ', '
-		);
-
-		foreach ($check_for as $key => $default_value)
-		{
-			$this->style[$key] = (isset($parsed_items[$key])) ? $parsed_items[$key] : $default_value;
-			settype($this->style[$key], gettype($default_value));
-
-			if (is_string($default_value))
-			{
-				$this->style[$key] = htmlspecialchars($this->style[$key]);
-			}
-		}
-
-		$phpbb_style->set_style();
-
-		$this->img_lang = $this->lang_name;
-
-		// Call phpbb_user_session_handler() in case external application want to "bend" some variables or replace classes...
-		// After calling it we continue script execution...
-		phpbb_user_session_handler();
-
-		// If this function got called from the error handler we are finished here.
-		if (defined('IN_ERROR_HANDLER'))
-		{
-			return;
-		}
-
-		// Disable board if the install/ directory is still present
-		// For the brave development army we do not care about this, else we need to comment out this everytime we develop locally
-		if (!defined('DEBUG') && !defined('ADMIN_START') && !defined('IN_INSTALL') && !defined('IN_LOGIN') && file_exists($phpbb_root_path . 'install') && !is_file($phpbb_root_path . 'install'))
-		{
-			// Adjust the message slightly according to the permissions
-			if ($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))
-			{
-				$message = 'REMOVE_INSTALL';
-			}
-			else
-			{
-				$message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE';
-			}
-			trigger_error($message);
-		}
-
-		// Is board disabled and user not an admin or moderator?
-		if ($config['board_disable'] && !defined('IN_LOGIN') && !$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_'))
-		{
-			if ($this->data['is_bot'])
-			{
-				send_status_line(503, 'Service Unavailable');
-			}
-
-			$message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE';
-			trigger_error($message);
-		}
-
-		// Is load exceeded?
-		if ($config['limit_load'] && $this->load !== false)
-		{
-			if ($this->load > floatval($config['limit_load']) && !defined('IN_LOGIN') && !defined('IN_ADMIN'))
-			{
-				// Set board disabled to true to let the admins/mods get the proper notification
-				$config['board_disable'] = '1';
-
-				if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_'))
-				{
-					if ($this->data['is_bot'])
-					{
-						send_status_line(503, 'Service Unavailable');
-					}
-					trigger_error('BOARD_UNAVAILABLE');
-				}
-			}
-		}
-
-		if (isset($this->data['session_viewonline']))
-		{
-			// Make sure the user is able to hide his session
-			if (!$this->data['session_viewonline'])
-			{
-				// Reset online status if not allowed to hide the session...
-				if (!$auth->acl_get('u_hideonline'))
-				{
-					$sql = 'UPDATE ' . SESSIONS_TABLE . '
-						SET session_viewonline = 1
-						WHERE session_user_id = ' . $this->data['user_id'];
-					$db->sql_query($sql);
-					$this->data['session_viewonline'] = 1;
-				}
-			}
-			else if (!$this->data['user_allow_viewonline'])
-			{
-				// the user wants to hide and is allowed to  -> cloaking device on.
-				if ($auth->acl_get('u_hideonline'))
-				{
-					$sql = 'UPDATE ' . SESSIONS_TABLE . '
-						SET session_viewonline = 0
-						WHERE session_user_id = ' . $this->data['user_id'];
-					$db->sql_query($sql);
-					$this->data['session_viewonline'] = 0;
-				}
-			}
-		}
-
-
-		// Does the user need to change their password? If so, redirect to the
-		// ucp profile reg_details page ... of course do not redirect if we're already in the ucp
-		if (!defined('IN_ADMIN') && !defined('ADMIN_START') && $config['chg_passforce'] && !empty($this->data['is_registered']) && $auth->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400))
-		{
-			if (strpos($this->page['query_string'], 'mode=reg_details') === false && $this->page['page_name'] != "ucp.$phpEx")
-			{
-				redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=profile&amp;mode=reg_details'));
-			}
-		}
-
-		return;
-	}
-
-	/**
-	* More advanced language substitution
-	* Function to mimic sprintf() with the possibility of using phpBB's language system to substitute nullar/singular/plural forms.
-	* Params are the language key and the parameters to be substituted.
-	* This function/functionality is inspired by SHS` and Ashe.
-	*
-	* Example call: <samp>$user->lang('NUM_POSTS_IN_QUEUE', 1);</samp>
-	*
-	* If the first parameter is an array, the elements are used as keys and subkeys to get the language entry:
-	* Example: <samp>$user->lang(array('datetime', 'AGO'), 1)</samp> uses $user->lang['datetime']['AGO'] as language entry.
-	*/
-	function lang()
-	{
-		$args = func_get_args();
-		$key = $args[0];
-
-		if (is_array($key))
-		{
-			$lang = &$this->lang[array_shift($key)];
-
-			foreach ($key as $_key)
-			{
-				$lang = &$lang[$_key];
-			}
-		}
-		else
-		{
-			$lang = &$this->lang[$key];
-		}
-
-		// Return if language string does not exist
-		if (!isset($lang) || (!is_string($lang) && !is_array($lang)))
-		{
-			return $key;
-		}
-
-		// If the language entry is a string, we simply mimic sprintf() behaviour
-		if (is_string($lang))
-		{
-			if (sizeof($args) == 1)
-			{
-				return $lang;
-			}
-
-			// Replace key with language entry and simply pass along...
-			$args[0] = $lang;
-			return call_user_func_array('sprintf', $args);
-		}
-		else if (sizeof($lang) == 0)
-		{
-			// If the language entry is an empty array, we just return the language key
-			return $args[0];
-		}
-
-		// It is an array... now handle different nullar/singular/plural forms
-		$key_found = false;
-
-		// We now get the first number passed and will select the key based upon this number
-		for ($i = 1, $num_args = sizeof($args); $i < $num_args; $i++)
-		{
-			if (is_int($args[$i]) || is_float($args[$i]))
-			{
-				if ($args[$i] == 0 && isset($lang[0]))
-				{
-					// We allow each translation using plural forms to specify a version for the case of 0 things,
-					// so that "0 users" may be displayed as "No users".
-					$key_found = 0;
-					break;
-				}
-				else
-				{
-					$use_plural_form = $this->get_plural_form($args[$i]);
-					if (isset($lang[$use_plural_form]))
-					{
-						// The key we should use exists, so we use it.
-						$key_found = $use_plural_form;
-					}
-					else
-					{
-						// If the key we need to use does not exist, we fall back to the previous one.
-						$numbers = array_keys($lang);
-
-						foreach ($numbers as $num)
-						{
-							if ($num > $use_plural_form)
-							{
-								break;
-							}
-
-							$key_found = $num;
-						}
-					}
-					break;
-				}
-			}
-		}
-
-		// Ok, let's check if the key was found, else use the last entry (because it is mostly the plural form)
-		if ($key_found === false)
-		{
-			$numbers = array_keys($lang);
-			$key_found = end($numbers);
-		}
-
-		// Use the language string we determined and pass it to sprintf()
-		$args[0] = $lang[$key_found];
-		return call_user_func_array('sprintf', $args);
-	}
-
-	/**
-	* Determine which plural form we should use.
-	* For some languages this is not as simple as for English.
-	*
-	* @param $number        int|float   The number we want to get the plural case for. Float numbers are floored.
-	* @param $force_rule    mixed   False to use the plural rule of the language package
-	*                               or an integer to force a certain plural rule
-	* @return   int     The plural-case we need to use for the number plural-rule combination
-	*/
-	function get_plural_form($number, $force_rule = false)
-	{
-		$number = (int) $number;
-
-		// Default to English system
-		$plural_rule = ($force_rule !== false) ? $force_rule : ((isset($this->lang['PLURAL_RULE'])) ? $this->lang['PLURAL_RULE'] : 1);
-
-		return phpbb_get_plural_form($plural_rule, $number);
-	}
-
-	/**
-	* Add Language Items - use_db and use_help are assigned where needed (only use them to force inclusion)
-	*
-	* @param mixed $lang_set specifies the language entries to include
-	* @param bool $use_db internal variable for recursion, do not use
-	* @param bool $use_help internal variable for recursion, do not use
-	* @param string $ext_name The extension to load language from, or empty for core files
-	*
-	* Examples:
-	* <code>
-	* $lang_set = array('posting', 'help' => 'faq');
-	* $lang_set = array('posting', 'viewtopic', 'help' => array('bbcode', 'faq'))
-	* $lang_set = array(array('posting', 'viewtopic'), 'help' => array('bbcode', 'faq'))
-	* $lang_set = 'posting'
-	* $lang_set = array('help' => 'faq', 'db' => array('help:faq', 'posting'))
-	* </code>
-	*/
-	function add_lang($lang_set, $use_db = false, $use_help = false, $ext_name = '')
-	{
-		global $phpEx;
-
-		if (is_array($lang_set))
-		{
-			foreach ($lang_set as $key => $lang_file)
-			{
-				// Please do not delete this line.
-				// We have to force the type here, else [array] language inclusion will not work
-				$key = (string) $key;
-
-				if ($key == 'db')
-				{
-					$this->add_lang($lang_file, true, $use_help, $ext_name);
-				}
-				else if ($key == 'help')
-				{
-					$this->add_lang($lang_file, $use_db, true, $ext_name);
-				}
-				else if (!is_array($lang_file))
-				{
-					$this->set_lang($this->lang, $this->help, $lang_file, $use_db, $use_help, $ext_name);
-				}
-				else
-				{
-					$this->add_lang($lang_file, $use_db, $use_help, $ext_name);
-				}
-			}
-			unset($lang_set);
-		}
-		else if ($lang_set)
-		{
-			$this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help, $ext_name);
-		}
-	}
-
-	/**
-	* Add Language Items from an extension - use_db and use_help are assigned where needed (only use them to force inclusion)
-	*
-	* @param string $ext_name The extension to load language from, or empty for core files
-	* @param mixed $lang_set specifies the language entries to include
-	* @param bool $use_db internal variable for recursion, do not use
-	* @param bool $use_help internal variable for recursion, do not use
-	*/
-	function add_lang_ext($ext_name, $lang_set, $use_db = false, $use_help = false)
-	{
-		if ($ext_name === '/')
-		{
-			$ext_name = '';
-		}
-
-		$this->add_lang($lang_set, $use_db, $use_help, $ext_name);
-	}
-
-	/**
-	* Set language entry (called by add_lang)
-	* @access private
-	*/
-	function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false, $ext_name = '')
-	{
-		global $phpbb_root_path, $phpEx;
-
-		// Make sure the language name is set (if the user setup did not happen it is not set)
-		if (!$this->lang_name)
-		{
-			global $config;
-			$this->lang_name = basename($config['default_lang']);
-		}
-
-		// $lang == $this->lang
-		// $help == $this->help
-		// - add appropriate variables here, name them as they are used within the language file...
-		if (!$use_db)
-		{
-			if ($use_help && strpos($lang_file, '/') !== false)
-			{
-				$filename = dirname($lang_file) . '/help_' . basename($lang_file);
-			}
-			else
-			{
-				$filename = (($use_help) ? 'help_' : '') . $lang_file;
-			}
-
-			if ($ext_name)
-			{
-				global $phpbb_extension_manager;
-				$ext_path = $phpbb_extension_manager->get_extension_path($ext_name, true);
-
-				$lang_path = $ext_path . 'language/';
-			}
-			else
-			{
-				$lang_path = $this->lang_path;
-			}
-
-			if (strpos($phpbb_root_path . $filename, $lang_path . $this->lang_name . '/') === 0)
-			{
-				$language_filename = $phpbb_root_path . $filename;
-			}
-			else
-			{
-				$language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx;
-			}
-
-			if (!file_exists($language_filename))
-			{
-				global $config;
-
-				if ($this->lang_name == 'en')
-				{
-					// The user's selected language is missing the file, the board default's language is missing the file, and the file doesn't exist in /en.
-					$language_filename = str_replace($lang_path . 'en', $lang_path . $this->data['user_lang'], $language_filename);
-					trigger_error('Language file ' . $language_filename . ' couldn\'t be opened.', E_USER_ERROR);
-				}
-				else if ($this->lang_name == basename($config['default_lang']))
-				{
-					// Fall back to the English Language
-					$this->lang_name = 'en';
-					$this->set_lang($lang, $help, $lang_file, $use_db, $use_help, $ext_name);
-				}
-				else if ($this->lang_name == $this->data['user_lang'])
-				{
-					// Fall back to the board default language
-					$this->lang_name = basename($config['default_lang']);
-					$this->set_lang($lang, $help, $lang_file, $use_db, $use_help, $ext_name);
-				}
-
-				// Reset the lang name
-				$this->lang_name = (file_exists($lang_path . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']);
-				return;
-			}
-
-			// Do not suppress error if in DEBUG mode
-			$include_result = (defined('DEBUG')) ? (include $language_filename) : (@include $language_filename);
-
-			if ($include_result === false)
-			{
-				trigger_error('Language file ' . $language_filename . ' couldn\'t be opened.', E_USER_ERROR);
-			}
-		}
-		else if ($use_db)
-		{
-			// Get Database Language Strings
-			// Put them into $lang if nothing is prefixed, put them into $help if help: is prefixed
-			// For example: help:faq, posting
-		}
-	}
-
-	/**
-	* Format user date
-	*
-	* @param int $gmepoch unix timestamp
-	* @param string $format date format in date() notation. | used to indicate relative dates, for example |d m Y|, h:i is translated to Today, h:i.
-	* @param bool $forcedate force non-relative date format.
-	*
-	* @return mixed translated date
-	*/
-	function format_date($gmepoch, $format = false, $forcedate = false)
-	{
-		static $utc;
-
-		if (!isset($utc))
-		{
-			$utc = new DateTimeZone('UTC');
-		}
-
-		$time = new phpbb_datetime($this, "@$gmepoch", $utc);
-		$time->setTimezone($this->timezone);
-
-		return $time->format($format, $forcedate);
-	}
-
-	/**
-	* Create a phpbb_datetime object in the context of the current user
-	*
-	* @since 3.1
-	* @param string $time String in a format accepted by strtotime().
-	* @param DateTimeZone $timezone Time zone of the time.
-	* @return phpbb_datetime Date time object linked to the current users locale
-	*/
-	public function create_datetime($time = 'now', DateTimeZone $timezone = null)
-	{
-		$timezone = $timezone ?: $this->timezone;
-		return new phpbb_datetime($this, $time, $timezone);
-	}
-
-	/**
-	* Get the UNIX timestamp for a datetime in the users timezone, so we can store it in the database.
-	*
-	* @param	string			$format		Format of the entered date/time
-	* @param	string			$time		Date/time with the timezone applied
-	* @param	DateTimeZone	$timezone	Timezone of the date/time, falls back to timezone of current user
-	* @return	int			Returns the unix timestamp
-	*/
-	public function get_timestamp_from_format($format, $time, DateTimeZone $timezone = null)
-	{
-		$timezone = $timezone ?: $this->timezone;
-		$date = DateTime::createFromFormat($format, $time, $timezone);
-		return ($date !== false) ? $date->format('U') : false;
-	}
-
-	/**
-	* Get language id currently used by the user
-	*/
-	function get_iso_lang_id()
-	{
-		global $config, $db;
-
-		if (!empty($this->lang_id))
-		{
-			return $this->lang_id;
-		}
-
-		if (!$this->lang_name)
-		{
-			$this->lang_name = $config['default_lang'];
-		}
-
-		$sql = 'SELECT lang_id
-			FROM ' . LANG_TABLE . "
-			WHERE lang_iso = '" . $db->sql_escape($this->lang_name) . "'";
-		$result = $db->sql_query($sql);
-		$this->lang_id = (int) $db->sql_fetchfield('lang_id');
-		$db->sql_freeresult($result);
-
-		return $this->lang_id;
-	}
-
-	/**
-	* Get users profile fields
-	*/
-	function get_profile_fields($user_id)
-	{
-		global $db;
-
-		if (isset($this->profile_fields))
-		{
-			return;
-		}
-
-		$sql = 'SELECT *
-			FROM ' . PROFILE_FIELDS_DATA_TABLE . "
-			WHERE user_id = $user_id";
-		$result = $db->sql_query_limit($sql, 1);
-		$this->profile_fields = (!($row = $db->sql_fetchrow($result))) ? array() : $row;
-		$db->sql_freeresult($result);
-	}
-
-	/**
-	* Specify/Get image
-	*/
-	function img($img, $alt = '')
-	{
-		$alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : $alt;
-		return '<span class="imageset ' . $img . '">' . $alt . '</span>';
-	}
-
-	/**
-	* Get option bit field from user options.
-	*
-	* @param int $key option key, as defined in $keyoptions property.
-	* @param int $data bit field value to use, or false to use $this->data['user_options']
-	* @return bool true if the option is set in the bit field, false otherwise
-	*/
-	function optionget($key, $data = false)
-	{
-		$var = ($data !== false) ? $data : $this->data['user_options'];
-		return phpbb_optionget($this->keyoptions[$key], $var);
-	}
-
-	/**
-	* Set option bit field for user options.
-	*
-	* @param int $key Option key, as defined in $keyoptions property.
-	* @param bool $value True to set the option, false to clear the option.
-	* @param int $data Current bit field value, or false to use $this->data['user_options']
-	* @return int|bool If $data is false, the bit field is modified and
-	*                  written back to $this->data['user_options'], and
-	*                  return value is true if the bit field changed and
-	*                  false otherwise. If $data is not false, the new
-	*                  bitfield value is returned.
-	*/
-	function optionset($key, $value, $data = false)
-	{
-		$var = ($data !== false) ? $data : $this->data['user_options'];
-
-		$new_var = phpbb_optionset($this->keyoptions[$key], $value, $var);
-
-		if ($data === false)
-		{
-			if ($new_var != $var)
-			{
-				$this->data['user_options'] = $new_var;
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-		else
-		{
-			return $new_var;
-		}
-	}
-
-	/**
-	* Funtion to make the user leave the NEWLY_REGISTERED system group.
-	* @access public
-	*/
-	function leave_newly_registered()
-	{
-		global $db;
-
-		if (empty($this->data['user_new']))
-		{
-			return false;
-		}
-
-		if (!function_exists('remove_newly_registered'))
-		{
-			global $phpbb_root_path, $phpEx;
-
-			include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-		}
-		if ($group = remove_newly_registered($this->data['user_id'], $this->data))
-		{
-			$this->data['group_id'] = $group;
-
-		}
-		$this->data['user_permissions'] = '';
-		$this->data['user_new'] = 0;
-
-		return true;
-	}
-
-	/**
-	* Returns all password protected forum ids the user is currently NOT authenticated for.
-	*
-	* @return array     Array of forum ids
-	* @access public
-	*/
-	function get_passworded_forums()
-	{
-		global $db;
-
-		$sql = 'SELECT f.forum_id, fa.user_id
-			FROM ' . FORUMS_TABLE . ' f
-			LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa
-				ON (fa.forum_id = f.forum_id
-					AND fa.session_id = '" . $db->sql_escape($this->session_id) . "')
-			WHERE f.forum_password <> ''";
-		$result = $db->sql_query($sql);
-
-		$forum_ids = array();
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$forum_id = (int) $row['forum_id'];
-
-			if ($row['user_id'] != $this->data['user_id'])
-			{
-				$forum_ids[$forum_id] = $forum_id;
-			}
-		}
-		$db->sql_freeresult($result);
-
-		return $forum_ids;
-	}
-}
diff --git a/phpBB/includes/user_loader.php b/phpBB/includes/user_loader.php
deleted file mode 100644
index 37bf9648c1..0000000000
--- a/phpBB/includes/user_loader.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* User loader class
-*
-* This handles loading users from the database and
-* storing in them in a temporary cache so we do not
-* have to query the same user multiple times in
-* different services.
-*/
-class phpbb_user_loader
-{
-	/** @var phpbb_db_driver */
-	protected $db = null;
-
-	/** @var string */
-	protected $phpbb_root_path = null;
-
-	/** @var string */
-	protected $php_ext = null;
-
-	/** @var string */
-	protected $users_table = null;
-
-	/**
-	* Users loaded from the DB
-	*
-	* @var array Array of user data that we've loaded from the DB
-	*/
-	protected $users = array();
-
-	/**
-	* User loader constructor
-	*
-	* @param phpbb_db_driver $db A database connection
-	* @param string $phpbb_root_path Path to the phpbb includes directory.
-	* @param string $php_ext php file extension
-	* @param string $users_table The name of the database table (phpbb_users)
-	*/
-	public function __construct(phpbb_db_driver $db, $phpbb_root_path, $php_ext, $users_table)
-	{
-		$this->db = $db;
-
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
-
-		$this->users_table = $users_table;
-	}
-
-	/**
-	* Load user helper
-	*
-	* @param array $user_ids
-	*/
-	public function load_users(array $user_ids)
-	{
-		$user_ids[] = ANONYMOUS;
-
-		// Make user_ids unique and convert to integer.
-		$user_ids = array_map('intval', array_unique($user_ids));
-
-		// Do not load users we already have in $this->users
-		$user_ids = array_diff($user_ids, array_keys($this->users));
-
-		if (sizeof($user_ids))
-		{
-			$sql = 'SELECT *
-				FROM ' . $this->users_table . '
-				WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$this->users[$row['user_id']] = $row;
-			}
-			$this->db->sql_freeresult($result);
-		}
-	}
-
-	/**
-	* Load a user by username
-	*
-	* Stores the full data in the user cache so they do not need to be loaded again
-	* Returns the user id so you may use get_user() from the returned value
-	*
-	* @param string $username Raw username to load (will be cleaned)
-	* @return int User ID for the username
-	*/
-	public function load_user_by_username($username)
-	{
-		$sql = 'SELECT *
-			FROM ' . $this->users_table . "
-			WHERE username_clean = '" . $this->db->sql_escape(utf8_clean_string($username)) . "'";
-		$result = $this->db->sql_query($sql);
-		$row = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		if ($row)
-		{
-			$this->users[$row['user_id']] = $row;
-
-			return $row['user_id'];
-		}
-
-		return ANONYMOUS;
-	}
-
-	/**
-	* Get a user row from our users cache
-	*
-	* @param int $user_id User ID of the user you want to retreive
-	* @param bool $query Should we query the database if this user has not yet been loaded?
-	* 						Typically this should be left as false and you should make sure
-	* 						you load users ahead of time with load_users()
-	* @return array|bool Row from the database of the user or Anonymous if the user wasn't loaded/does not exist
-	* 						or bool False if the anonymous user was not loaded
-	*/
-	public function get_user($user_id, $query = false)
-	{
-		if (isset($this->users[$user_id]))
-		{
-			return $this->users[$user_id];
-		}
-		// Query them if we must (if ANONYMOUS is sent as the user_id and we have not loaded Anonymous yet, we must load Anonymous as a last resort)
-		else if ($query || $user_id == ANONYMOUS)
-		{
-			$this->load_users(array($user_id));
-
-			return $this->get_user($user_id);
-		}
-
-		return $this->get_user(ANONYMOUS);
-	}
-
-	/**
-	* Get username
-	*
-	* @param int $user_id User ID of the user you want to retreive the username for
-	* @param string $mode The mode to load (same as get_username_string). One of the following:
-	* 			profile (for getting an url to the profile)
-	* 			username (for obtaining the username)
-	* 			colour (for obtaining the user colour)
-	* 			full (for obtaining a html string representing a coloured link to the users profile)
-	* 			no_profile (the same as full but forcing no profile link)
-	* @param string $guest_username Optional parameter to specify the guest username. It will be used in favor of the GUEST language variable then.
-	* @param string $custom_profile_url Optional parameter to specify a profile url. The user id get appended to this url as &amp;u={user_id}
-	* @param bool $query Should we query the database if this user has not yet been loaded?
-	* 						Typically this should be left as false and you should make sure
-	* 						you load users ahead of time with load_users()
-	* @return string
-	*/
-	public function get_username($user_id, $mode, $guest_username = false, $custom_profile_url = false, $query = false)
-	{
-		if (!($user = $this->get_user($user_id, $query)))
-		{
-			return '';
-		}
-
-		return get_username_string($mode, $user['user_id'], $user['username'], $user['user_colour'], $guest_username, $custom_profile_url);
-	}
-
-	/**
-	* Get avatar
-	*
-	* @param int $user_id User ID of the user you want to retreive the avatar for
-	* @param bool $query Should we query the database if this user has not yet been loaded?
-	* 						Typically this should be left as false and you should make sure
-	* 						you load users ahead of time with load_users()
-	* @return string
-	*/
-	public function get_avatar($user_id, $query = false)
-	{
-		if (!($user = $this->get_user($user_id, $query)))
-		{
-			return '';
-		}
-
-		if (!function_exists('get_user_avatar'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
-		}
-
-		return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height']);
-	}
-
-	/**
-	* Get rank
-	*
-	* @param int $user_id User ID of the user you want to retreive the rank for
-	* @param bool $query Should we query the database if this user has not yet been loaded?
-	* 						Typically this should be left as false and you should make sure
-	* 						you load users ahead of time with load_users()
-	* @return array Array with keys 'rank_title', 'rank_img', and 'rank_img_src'
-	*/
-	public function get_rank($user_id, $query = false)
-	{
-		if (!($user = $this->get_user($user_id, $query)))
-		{
-			return '';
-		}
-
-		if (!function_exists('get_user_rank'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
-		}
-
-		$rank = array(
-			'rank_title',
-			'rank_img',
-			'rank_img_src',
-		);
-
-		get_user_rank($user['user_rank'], (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts']), $rank['rank_title'], $rank['rank_img'], $rank['rank_img_src']);
-
-		return $rank;
-	}
-}
-- 
cgit v1.2.1


From 057d860d07fe829104aa938338830787415bc1c6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 14 Jul 2013 00:56:37 -0400
Subject: [ticket/11696] Rename db_tools.php so it can be autoloaded

PHPBB3-11696
---
 phpBB/includes/acp/acp_database.php                |    4 -
 .../captcha/plugins/phpbb_captcha_qa_plugin.php    |   12 +-
 phpBB/includes/db/db_tools.php                     | 2486 --------------------
 phpBB/includes/db/tools.php                        | 2486 ++++++++++++++++++++
 phpBB/includes/functions_install.php               |    6 -
 5 files changed, 2488 insertions(+), 2506 deletions(-)
 delete mode 100644 phpBB/includes/db/db_tools.php
 create mode 100644 phpBB/includes/db/tools.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index ebcbd28a87..5d191b3d0f 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -28,10 +28,6 @@ class acp_database
 		global $cache, $db, $user, $auth, $template, $table_prefix;
 		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
-		if (!class_exists('phpbb_db_tools'))
-		{
-			require($phpbb_root_path . 'includes/db/db_tools.' . $phpEx);
-		}
 		$this->db_tools = new phpbb_db_tools($db);
 
 		$user->add_lang('acp/database');
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index ec7636f511..6843f25d72 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -110,12 +110,8 @@ class phpbb_captcha_qa
 	*/
 	static public function is_installed()
 	{
-		global $db, $phpbb_root_path, $phpEx;
+		global $db;
 
-		if (!class_exists('phpbb_db_tools', false))
-		{
-			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
-		}
 		$db_tool = new phpbb_db_tools($db);
 
 		return $db_tool->sql_table_exists(CAPTCHA_QUESTIONS_TABLE);
@@ -297,12 +293,8 @@ class phpbb_captcha_qa
 	*/
 	function install()
 	{
-		global $db, $phpbb_root_path, $phpEx;
+		global $db;
 
-		if (!class_exists('phpbb_db_tools'))
-		{
-			include("$phpbb_root_path/includes/db/db_tools.$phpEx");
-		}
 		$db_tool = new phpbb_db_tools($db);
 
 		$tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE, CAPTCHA_QA_CONFIRM_TABLE);
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
deleted file mode 100644
index 983cdc18ea..0000000000
--- a/phpBB/includes/db/db_tools.php
+++ /dev/null
@@ -1,2486 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2007 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Database Tools for handling cross-db actions such as altering columns, etc.
-* Currently not supported is returning SQL for creating tables.
-*
-* @package dbal
-*/
-class phpbb_db_tools
-{
-	/**
-	* Current sql layer
-	*/
-	var $sql_layer = '';
-
-	/**
-	* @var object DB object
-	*/
-	var $db = NULL;
-
-	/**
-	* The Column types for every database we support
-	* @var array
-	*/
-	var $dbms_type_map = array(
-		'mysql_41'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'smallint(4) UNSIGNED',
-			'BOOL'		=> 'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'text',
-			'XSTEXT_UNI'=> 'varchar(100)',
-			'STEXT'		=> 'text',
-			'STEXT_UNI'	=> 'varchar(255)',
-			'TEXT'		=> 'text',
-			'TEXT_UNI'	=> 'text',
-			'MTEXT'		=> 'mediumtext',
-			'MTEXT_UNI'	=> 'mediumtext',
-			'TIMESTAMP'	=> 'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar(255)',
-			'VARBINARY'	=> 'varbinary(255)',
-		),
-
-		'mysql_40'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'smallint(4) UNSIGNED',
-			'BOOL'		=> 'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varbinary(255)',
-			'VCHAR:'	=> 'varbinary(%d)',
-			'CHAR:'		=> 'binary(%d)',
-			'XSTEXT'	=> 'blob',
-			'XSTEXT_UNI'=> 'blob',
-			'STEXT'		=> 'blob',
-			'STEXT_UNI'	=> 'blob',
-			'TEXT'		=> 'blob',
-			'TEXT_UNI'	=> 'blob',
-			'MTEXT'		=> 'mediumblob',
-			'MTEXT_UNI'	=> 'mediumblob',
-			'TIMESTAMP'	=> 'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'blob',
-			'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')),
-			'VCHAR_CI'	=> 'blob',
-			'VARBINARY'	=> 'varbinary(255)',
-		),
-
-		'firebird'	=> array(
-			'INT:'		=> 'INTEGER',
-			'BINT'		=> 'DOUBLE PRECISION',
-			'UINT'		=> 'INTEGER',
-			'UINT:'		=> 'INTEGER',
-			'TINT:'		=> 'INTEGER',
-			'USINT'		=> 'INTEGER',
-			'BOOL'		=> 'INTEGER',
-			'VCHAR'		=> 'VARCHAR(255) CHARACTER SET NONE',
-			'VCHAR:'	=> 'VARCHAR(%d) CHARACTER SET NONE',
-			'CHAR:'		=> 'CHAR(%d) CHARACTER SET NONE',
-			'XSTEXT'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'STEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'TEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'MTEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8',
-			'STEXT_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'TEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-			'MTEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-			'TIMESTAMP'	=> 'INTEGER',
-			'DECIMAL'	=> 'DOUBLE PRECISION',
-			'DECIMAL:'	=> 'DOUBLE PRECISION',
-			'PDECIMAL'	=> 'DOUBLE PRECISION',
-			'PDECIMAL:'	=> 'DOUBLE PRECISION',
-			'VCHAR_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8',
-			'VCHAR_CI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'VARBINARY'	=> 'CHAR(255) CHARACTER SET NONE',
-		),
-
-		'mssql'		=> array(
-			'INT:'		=> '[int]',
-			'BINT'		=> '[float]',
-			'UINT'		=> '[int]',
-			'UINT:'		=> '[int]',
-			'TINT:'		=> '[int]',
-			'USINT'		=> '[int]',
-			'BOOL'		=> '[int]',
-			'VCHAR'		=> '[varchar] (255)',
-			'VCHAR:'	=> '[varchar] (%d)',
-			'CHAR:'		=> '[char] (%d)',
-			'XSTEXT'	=> '[varchar] (1000)',
-			'STEXT'		=> '[varchar] (3000)',
-			'TEXT'		=> '[varchar] (8000)',
-			'MTEXT'		=> '[text]',
-			'XSTEXT_UNI'=> '[varchar] (100)',
-			'STEXT_UNI'	=> '[varchar] (255)',
-			'TEXT_UNI'	=> '[varchar] (4000)',
-			'MTEXT_UNI'	=> '[text]',
-			'TIMESTAMP'	=> '[int]',
-			'DECIMAL'	=> '[float]',
-			'DECIMAL:'	=> '[float]',
-			'PDECIMAL'	=> '[float]',
-			'PDECIMAL:'	=> '[float]',
-			'VCHAR_UNI'	=> '[varchar] (255)',
-			'VCHAR_UNI:'=> '[varchar] (%d)',
-			'VCHAR_CI'	=> '[varchar] (255)',
-			'VARBINARY'	=> '[varchar] (255)',
-		),
-
-		'mssqlnative'	=> array(
-			'INT:'		=> '[int]',
-			'BINT'		=> '[float]',
-			'UINT'		=> '[int]',
-			'UINT:'		=> '[int]',
-			'TINT:'		=> '[int]',
-			'USINT'		=> '[int]',
-			'BOOL'		=> '[int]',
-			'VCHAR'		=> '[varchar] (255)',
-			'VCHAR:'	=> '[varchar] (%d)',
-			'CHAR:'		=> '[char] (%d)',
-			'XSTEXT'	=> '[varchar] (1000)',
-			'STEXT'		=> '[varchar] (3000)',
-			'TEXT'		=> '[varchar] (8000)',
-			'MTEXT'		=> '[text]',
-			'XSTEXT_UNI'=> '[varchar] (100)',
-			'STEXT_UNI'	=> '[varchar] (255)',
-			'TEXT_UNI'	=> '[varchar] (4000)',
-			'MTEXT_UNI'	=> '[text]',
-			'TIMESTAMP'	=> '[int]',
-			'DECIMAL'	=> '[float]',
-			'DECIMAL:'	=> '[float]',
-			'PDECIMAL'	=> '[float]',
-			'PDECIMAL:'	=> '[float]',
-			'VCHAR_UNI'	=> '[varchar] (255)',
-			'VCHAR_UNI:'=> '[varchar] (%d)',
-			'VCHAR_CI'	=> '[varchar] (255)',
-			'VARBINARY'	=> '[varchar] (255)',
-		),
-
-		'oracle'	=> array(
-			'INT:'		=> 'number(%d)',
-			'BINT'		=> 'number(20)',
-			'UINT'		=> 'number(8)',
-			'UINT:'		=> 'number(%d)',
-			'TINT:'		=> 'number(%d)',
-			'USINT'		=> 'number(4)',
-			'BOOL'		=> 'number(1)',
-			'VCHAR'		=> 'varchar2(255)',
-			'VCHAR:'	=> 'varchar2(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'varchar2(1000)',
-			'STEXT'		=> 'varchar2(3000)',
-			'TEXT'		=> 'clob',
-			'MTEXT'		=> 'clob',
-			'XSTEXT_UNI'=> 'varchar2(300)',
-			'STEXT_UNI'	=> 'varchar2(765)',
-			'TEXT_UNI'	=> 'clob',
-			'MTEXT_UNI'	=> 'clob',
-			'TIMESTAMP'	=> 'number(11)',
-			'DECIMAL'	=> 'number(5, 2)',
-			'DECIMAL:'	=> 'number(%d, 2)',
-			'PDECIMAL'	=> 'number(6, 3)',
-			'PDECIMAL:'	=> 'number(%d, 3)',
-			'VCHAR_UNI'	=> 'varchar2(765)',
-			'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')),
-			'VCHAR_CI'	=> 'varchar2(255)',
-			'VARBINARY'	=> 'raw(255)',
-		),
-
-		'sqlite'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED',
-			'BOOL'		=> 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'text(65535)',
-			'STEXT'		=> 'text(65535)',
-			'TEXT'		=> 'text(65535)',
-			'MTEXT'		=> 'mediumtext(16777215)',
-			'XSTEXT_UNI'=> 'text(65535)',
-			'STEXT_UNI'	=> 'text(65535)',
-			'TEXT_UNI'	=> 'text(65535)',
-			'MTEXT_UNI'	=> 'mediumtext(16777215)',
-			'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar(255)',
-			'VARBINARY'	=> 'blob',
-		),
-
-		'postgres'	=> array(
-			'INT:'		=> 'INT4',
-			'BINT'		=> 'INT8',
-			'UINT'		=> 'INT4', // unsigned
-			'UINT:'		=> 'INT4', // unsigned
-			'USINT'		=> 'INT2', // unsigned
-			'BOOL'		=> 'INT2', // unsigned
-			'TINT:'		=> 'INT2',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'varchar(1000)',
-			'STEXT'		=> 'varchar(3000)',
-			'TEXT'		=> 'varchar(8000)',
-			'MTEXT'		=> 'TEXT',
-			'XSTEXT_UNI'=> 'varchar(100)',
-			'STEXT_UNI'	=> 'varchar(255)',
-			'TEXT_UNI'	=> 'varchar(4000)',
-			'MTEXT_UNI'	=> 'TEXT',
-			'TIMESTAMP'	=> 'INT4', // unsigned
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar_ci',
-			'VARBINARY'	=> 'bytea',
-		),
-	);
-
-	/**
-	* A list of types being unsigned for better reference in some db's
-	* @var array
-	*/
-	var $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
-
-	/**
-	* A list of supported DBMS. We change this class to support more DBMS, the DBMS itself only need to follow some rules.
-	* @var array
-	*/
-	var $supported_dbms = array('firebird', 'mssql', 'mssqlnative', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite');
-
-	/**
-	* This is set to true if user only wants to return the 'to-be-executed' SQL statement(s) (as an array).
-	* This mode has no effect on some methods (inserting of data for example). This is expressed within the methods command.
-	*/
-	var $return_statements = false;
-
-	/**
-	* Constructor. Set DB Object and set {@link $return_statements return_statements}.
-	*
-	* @param phpbb_db_driver	$db					Database connection
-	* @param bool		$return_statements	True if only statements should be returned and no SQL being executed
-	*/
-	function phpbb_db_tools(phpbb_db_driver $db, $return_statements = false)
-	{
-		$this->db = $db;
-		$this->return_statements = $return_statements;
-
-		// Determine mapping database type
-		switch ($this->db->sql_layer)
-		{
-			case 'mysql':
-				$this->sql_layer = 'mysql_40';
-			break;
-
-			case 'mysql4':
-				if (version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
-				{
-					$this->sql_layer = 'mysql_41';
-				}
-				else
-				{
-					$this->sql_layer = 'mysql_40';
-				}
-			break;
-
-			case 'mysqli':
-				$this->sql_layer = 'mysql_41';
-			break;
-
-			case 'mssql':
-			case 'mssql_odbc':
-				$this->sql_layer = 'mssql';
-			break;
-
-			case 'mssqlnative':
-				$this->sql_layer = 'mssqlnative';
-			break;
-
-			default:
-				$this->sql_layer = $this->db->sql_layer;
-			break;
-		}
-	}
-
-	/**
-	* Setter for {@link $return_statements return_statements}.
-	*
-	* @param bool $return_statements True if SQL should not be executed but returned as strings
-	* @return null
-	*/
-	public function set_return_statements($return_statements)
-	{
-		$this->return_statements = $return_statements;
-	}
-
-	/**
-	* Gets a list of tables in the database.
-	*
-	* @return array		Array of table names  (all lower case)
-	*/
-	function sql_list_tables()
-	{
-		switch ($this->db->sql_layer)
-		{
-			case 'mysql':
-			case 'mysql4':
-			case 'mysqli':
-				$sql = 'SHOW TABLES';
-			break;
-
-			case 'sqlite':
-				$sql = 'SELECT name
-					FROM sqlite_master
-					WHERE type = "table"';
-			break;
-
-			case 'mssql':
-			case 'mssql_odbc':
-			case 'mssqlnative':
-				$sql = "SELECT name
-					FROM sysobjects
-					WHERE type='U'";
-			break;
-
-			case 'postgres':
-				$sql = 'SELECT relname
-					FROM pg_stat_user_tables';
-			break;
-
-			case 'firebird':
-				$sql = 'SELECT rdb$relation_name
-					FROM rdb$relations
-					WHERE rdb$view_source is null
-						AND rdb$system_flag = 0';
-			break;
-
-			case 'oracle':
-				$sql = 'SELECT table_name
-					FROM USER_TABLES';
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-
-		$tables = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$name = current($row);
-			$tables[$name] = $name;
-		}
-		$this->db->sql_freeresult($result);
-
-		return $tables;
-	}
-
-	/**
-	* Check if table exists
-	*
-	*
-	* @param string	$table_name	The table name to check for
-	* @return bool true if table exists, else false
-	*/
-	function sql_table_exists($table_name)
-	{
-		$this->db->sql_return_on_error(true);
-		$result = $this->db->sql_query_limit('SELECT * FROM ' . $table_name, 1);
-		$this->db->sql_return_on_error(false);
-
-		if ($result)
-		{
-			$this->db->sql_freeresult($result);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Create SQL Table
-	*
-	* @param string	$table_name	The table name to create
-	* @param array	$table_data	Array containing table data.
-	* @return array	Statements if $return_statements is true.
-	*/
-	function sql_create_table($table_name, $table_data)
-	{
-		// holds the DDL for a column
-		$columns = $statements = array();
-
-		if ($this->sql_table_exists($table_name))
-		{
-			return $this->_sql_run_sql($statements);
-		}
-
-		// Begin transaction
-		$statements[] = 'begin';
-
-		// Determine if we have created a PRIMARY KEY in the earliest
-		$primary_key_gen = false;
-
-		// Determine if the table must be created with TEXTIMAGE
-		$create_textimage = false;
-
-		// Determine if the table requires a sequence
-		$create_sequence = false;
-
-		// Begin table sql statement
-		switch ($this->sql_layer)
-		{
-			case 'mssql':
-			case 'mssqlnative':
-				$table_sql = 'CREATE TABLE [' . $table_name . '] (' . "\n";
-			break;
-
-			default:
-				$table_sql = 'CREATE TABLE ' . $table_name . ' (' . "\n";
-			break;
-		}
-
-		// Iterate through the columns to create a table
-		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
-		{
-			// here lies an array, filled with information compiled on the column's data
-			$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-
-			if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
-			{
-				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR);
-			}
-
-			// here we add the definition of the new column to the list of columns
-			switch ($this->sql_layer)
-			{
-				case 'mssql':
-				case 'mssqlnative':
-					$columns[] = "\t [{$column_name}] " . $prepared_column['column_type_sql_default'];
-				break;
-
-				default:
-					$columns[] = "\t {$column_name} " . $prepared_column['column_type_sql'];
-				break;
-			}
-
-			// see if we have found a primary key set due to a column definition if we have found it, we can stop looking
-			if (!$primary_key_gen)
-			{
-				$primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set'];
-			}
-
-			// create textimage DDL based off of the existance of certain column types
-			if (!$create_textimage)
-			{
-				$create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage'];
-			}
-
-			// create sequence DDL based off of the existance of auto incrementing columns
-			if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment'])
-			{
-				$create_sequence = $column_name;
-			}
-		}
-
-		// this makes up all the columns in the create table statement
-		$table_sql .= implode(",\n", $columns);
-
-		// Close the table for two DBMS and add to the statements
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '');
-				$statements[] = $table_sql;
-			break;
-		}
-
-		// we have yet to create a primary key for this table,
-		// this means that we can add the one we really wanted instead
-		if (!$primary_key_gen)
-		{
-			// Write primary key
-			if (isset($table_data['PRIMARY_KEY']))
-			{
-				if (!is_array($table_data['PRIMARY_KEY']))
-				{
-					$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
-				}
-
-				switch ($this->sql_layer)
-				{
-					case 'mysql_40':
-					case 'mysql_41':
-					case 'postgres':
-					case 'sqlite':
-						$table_sql .= ",\n\t PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
-					break;
-
-					case 'firebird':
-					case 'mssql':
-					case 'mssqlnative':
-						// We need the data here
-						$old_return_statements = $this->return_statements;
-						$this->return_statements = true;
-
-						$primary_key_stmts = $this->sql_create_primary_key($table_name, $table_data['PRIMARY_KEY']);
-						foreach ($primary_key_stmts as $pk_stmt)
-						{
-							$statements[] = $pk_stmt;
-						}
-
-						$this->return_statements = $old_return_statements;
-					break;
-
-					case 'oracle':
-						$table_sql .= ",\n\t CONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
-					break;
-				}
-			}
-		}
-
-		// close the table
-		switch ($this->sql_layer)
-		{
-			case 'mysql_41':
-				// make sure the table is in UTF-8 mode
-				$table_sql .= "\n) CHARACTER SET `utf8` COLLATE `utf8_bin`;";
-				$statements[] = $table_sql;
-			break;
-
-			case 'mysql_40':
-			case 'sqlite':
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'postgres':
-				// do we need to add a sequence for auto incrementing columns?
-				if ($create_sequence)
-				{
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
-				}
-
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'oracle':
-				$table_sql .= "\n)";
-				$statements[] = $table_sql;
-
-				// do we need to add a sequence and a tigger for auto incrementing columns?
-				if ($create_sequence)
-				{
-					// create the actual sequence
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq";
-
-					// the trigger is the mechanism by which we increment the counter
-					$trigger = "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
-					$trigger .= "BEFORE INSERT ON {$table_name}\n";
-					$trigger .= "FOR EACH ROW WHEN (\n";
-					$trigger .= "\tnew.{$create_sequence} IS NULL OR new.{$create_sequence} = 0\n";
-					$trigger .= ")\n";
-					$trigger .= "BEGIN\n";
-					$trigger .= "\tSELECT {$table_name}_seq.nextval\n";
-					$trigger .= "\tINTO :new.{$create_sequence}\n";
-					$trigger .= "\tFROM dual;\n";
-					$trigger .= "END;";
-
-					$statements[] = $trigger;
-				}
-			break;
-
-			case 'firebird':
-				if ($create_sequence)
-				{
-					$statements[] = "CREATE GENERATOR {$table_name}_gen;";
-					$statements[] = "SET GENERATOR {$table_name}_gen TO 0;";
-
-					$trigger = "CREATE TRIGGER t_$table_name FOR $table_name\n";
-					$trigger .= "BEFORE INSERT\nAS\nBEGIN\n";
-					$trigger .= "\tNEW.{$create_sequence} = GEN_ID({$table_name}_gen, 1);\nEND;";
-					$statements[] = $trigger;
-				}
-			break;
-		}
-
-		// Write Keys
-		if (isset($table_data['KEYS']))
-		{
-			foreach ($table_data['KEYS'] as $key_name => $key_data)
-			{
-				if (!is_array($key_data[1]))
-				{
-					$key_data[1] = array($key_data[1]);
-				}
-
-				$old_return_statements = $this->return_statements;
-				$this->return_statements = true;
-
-				$key_stmts = ($key_data[0] == 'UNIQUE') ? $this->sql_create_unique_index($table_name, $key_name, $key_data[1]) : $this->sql_create_index($table_name, $key_name, $key_data[1]);
-
-				foreach ($key_stmts as $key_stmt)
-				{
-					$statements[] = $key_stmt;
-				}
-
-				$this->return_statements = $old_return_statements;
-			}
-		}
-
-		// Commit Transaction
-		$statements[] = 'commit';
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Handle passed database update array.
-	* Expected structure...
-	* Key being one of the following
-	*	drop_tables: Drop tables
-	*	add_tables: Add tables
-	*	change_columns: Column changes (only type, not name)
-	*	add_columns: Add columns to a table
-	*	drop_keys: Dropping keys
-	*	drop_columns: Removing/Dropping columns
-	*	add_primary_keys: adding primary keys
-	*	add_unique_index: adding an unique index
-	*	add_index: adding an index (can be column:index_size if you need to provide size)
-	*
-	* The values are in this format:
-	*		{TABLE NAME}		=> array(
-	*			{COLUMN NAME}		=> array({COLUMN TYPE}, {DEFAULT VALUE}, {OPTIONAL VARIABLES}),
-	*			{KEY/INDEX NAME}	=> array({COLUMN NAMES}),
-	*		)
-	*
-	* For more information have a look at /develop/create_schema_files.php (only available through SVN)
-	*/
-	function perform_schema_changes($schema_changes)
-	{
-		if (empty($schema_changes))
-		{
-			return;
-		}
-
-		$statements = array();
-		$sqlite = false;
-
-		// For SQLite we need to perform the schema changes in a much more different way
-		if ($this->db->sql_layer == 'sqlite' && $this->return_statements)
-		{
-			$sqlite_data = array();
-			$sqlite = true;
-		}
-
-		// Drop tables?
-		if (!empty($schema_changes['drop_tables']))
-		{
-			foreach ($schema_changes['drop_tables'] as $table)
-			{
-				// only drop table if it exists
-				if ($this->sql_table_exists($table))
-				{
-					$result = $this->sql_table_drop($table);
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add tables?
-		if (!empty($schema_changes['add_tables']))
-		{
-			foreach ($schema_changes['add_tables'] as $table => $table_data)
-			{
-				$result = $this->sql_create_table($table, $table_data);
-				if ($this->return_statements)
-				{
-					$statements = array_merge($statements, $result);
-				}
-			}
-		}
-
-		// Change columns?
-		if (!empty($schema_changes['change_columns']))
-		{
-			foreach ($schema_changes['change_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column_name => $column_data)
-				{
-					// If the column exists we change it, else we add it ;)
-					if ($column_exists = $this->sql_column_exists($table, $column_name))
-					{
-						$result = $this->sql_column_change($table, $column_name, $column_data, true);
-					}
-					else
-					{
-						$result = $this->sql_column_add($table, $column_name, $column_data, true);
-					}
-
-					if ($sqlite)
-					{
-						if ($column_exists)
-						{
-							$sqlite_data[$table]['change_columns'][] = $result;
-						}
-						else
-						{
-							$sqlite_data[$table]['add_columns'][] = $result;
-						}
-					}
-					else if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add columns?
-		if (!empty($schema_changes['add_columns']))
-		{
-			foreach ($schema_changes['add_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column_name => $column_data)
-				{
-					// Only add the column if it does not exist yet
-					if ($column_exists = $this->sql_column_exists($table, $column_name))
-					{
-						continue;
-						// This is commented out here because it can take tremendous time on updates
-//						$result = $this->sql_column_change($table, $column_name, $column_data, true);
-					}
-					else
-					{
-						$result = $this->sql_column_add($table, $column_name, $column_data, true);
-					}
-
-					if ($sqlite)
-					{
-						if ($column_exists)
-						{
-							continue;
-//							$sqlite_data[$table]['change_columns'][] = $result;
-						}
-						else
-						{
-							$sqlite_data[$table]['add_columns'][] = $result;
-						}
-					}
-					else if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Remove keys?
-		if (!empty($schema_changes['drop_keys']))
-		{
-			foreach ($schema_changes['drop_keys'] as $table => $indexes)
-			{
-				foreach ($indexes as $index_name)
-				{
-					if (!$this->sql_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_index_drop($table, $index_name);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Drop columns?
-		if (!empty($schema_changes['drop_columns']))
-		{
-			foreach ($schema_changes['drop_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column)
-				{
-					// Only remove the column if it exists...
-					if ($this->sql_column_exists($table, $column))
-					{
-						$result = $this->sql_column_remove($table, $column, true);
-
-						if ($sqlite)
-						{
-							$sqlite_data[$table]['drop_columns'][] = $result;
-						}
-						else if ($this->return_statements)
-						{
-							$statements = array_merge($statements, $result);
-						}
-					}
-				}
-			}
-		}
-
-		// Add primary keys?
-		if (!empty($schema_changes['add_primary_keys']))
-		{
-			foreach ($schema_changes['add_primary_keys'] as $table => $columns)
-			{
-				$result = $this->sql_create_primary_key($table, $columns, true);
-
-				if ($sqlite)
-				{
-					$sqlite_data[$table]['primary_key'] = $result;
-				}
-				else if ($this->return_statements)
-				{
-					$statements = array_merge($statements, $result);
-				}
-			}
-		}
-
-		// Add unqiue indexes?
-		if (!empty($schema_changes['add_unique_index']))
-		{
-			foreach ($schema_changes['add_unique_index'] as $table => $index_array)
-			{
-				foreach ($index_array as $index_name => $column)
-				{
-					if ($this->sql_unique_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_create_unique_index($table, $index_name, $column);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add indexes?
-		if (!empty($schema_changes['add_index']))
-		{
-			foreach ($schema_changes['add_index'] as $table => $index_array)
-			{
-				foreach ($index_array as $index_name => $column)
-				{
-					if ($this->sql_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_create_index($table, $index_name, $column);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		if ($sqlite)
-		{
-			foreach ($sqlite_data as $table_name => $sql_schema_changes)
-			{
-				// Create temporary table with original data
-				$statements[] = 'begin';
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					continue;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				// Create a backup table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				// Get the columns...
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$plain_table_cols = trim($matches[1]);
-				$new_table_cols = preg_split('/,(?![\s\w]+\))/m', $plain_table_cols);
-				$column_list = array();
-
-				foreach ($new_table_cols as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-					$column_list[] = $entities[0];
-				}
-
-				// note down the primary key notation because sqlite only supports adding it to the end for the new table
-				$primary_key = false;
-				$_new_cols = array();
-
-				foreach ($new_table_cols as $key => $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						$primary_key = $declaration;
-						continue;
-					}
-					$_new_cols[] = $declaration;
-				}
-
-				$new_table_cols = $_new_cols;
-
-				// First of all... change columns
-				if (!empty($sql_schema_changes['change_columns']))
-				{
-					foreach ($sql_schema_changes['change_columns'] as $column_sql)
-					{
-						foreach ($new_table_cols as $key => $declaration)
-						{
-							$entities = preg_split('#\s+#', trim($declaration));
-							if (strpos($column_sql, $entities[0] . ' ') === 0)
-							{
-								$new_table_cols[$key] = $column_sql;
-							}
-						}
-					}
-				}
-
-				if (!empty($sql_schema_changes['add_columns']))
-				{
-					foreach ($sql_schema_changes['add_columns'] as $column_sql)
-					{
-						$new_table_cols[] = $column_sql;
-					}
-				}
-
-				// Now drop them...
-				if (!empty($sql_schema_changes['drop_columns']))
-				{
-					foreach ($sql_schema_changes['drop_columns'] as $column_name)
-					{
-						// Remove from column list...
-						$new_column_list = array();
-						foreach ($column_list as $key => $value)
-						{
-							if ($value === $column_name)
-							{
-								continue;
-							}
-
-							$new_column_list[] = $value;
-						}
-
-						$column_list = $new_column_list;
-
-						// Remove from table...
-						$_new_cols = array();
-						foreach ($new_table_cols as $key => $declaration)
-						{
-							$entities = preg_split('#\s+#', trim($declaration));
-							if (strpos($column_name . ' ', $entities[0] . ' ') === 0)
-							{
-								continue;
-							}
-							$_new_cols[] = $declaration;
-						}
-						$new_table_cols = $_new_cols;
-					}
-				}
-
-				// Primary key...
-				if (!empty($sql_schema_changes['primary_key']))
-				{
-					$new_table_cols[] = 'PRIMARY KEY (' . implode(', ', $sql_schema_changes['primary_key']) . ')';
-				}
-				// Add a new one or the old primary key
-				else if ($primary_key !== false)
-				{
-					$new_table_cols[] = $primary_key;
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $new_table_cols) . ');';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-			}
-		}
-
-		if ($this->return_statements)
-		{
-			return $statements;
-		}
-	}
-
-	/**
-	* Gets a list of columns of a table.
-	*
-	* @param string $table		Table name
-	*
-	* @return array				Array of column names (all lower case)
-	*/
-	function sql_list_columns($table)
-	{
-		$columns = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql = "SHOW COLUMNS FROM $table";
-			break;
-
-			// PostgreSQL has a way of doing this in a much simpler way but would
-			// not allow us to support all versions of PostgreSQL
-			case 'postgres':
-				$sql = "SELECT a.attname
-					FROM pg_class c, pg_attribute a
-					WHERE c.relname = '{$table}'
-						AND a.attnum > 0
-						AND a.attrelid = c.oid";
-			break;
-
-			// same deal with PostgreSQL, we must perform more complex operations than
-			// we technically could
-			case 'mssql':
-			case 'mssqlnative':
-				$sql = "SELECT c.name
-					FROM syscolumns c
-					LEFT JOIN sysobjects o ON c.id = o.id
-					WHERE o.name = '{$table}'";
-			break;
-
-			case 'oracle':
-				$sql = "SELECT column_name
-					FROM user_tab_columns
-					WHERE LOWER(table_name) = '" . strtolower($table) . "'";
-			break;
-
-			case 'firebird':
-				$sql = "SELECT RDB\$FIELD_NAME as FNAME
-					FROM RDB\$RELATION_FIELDS
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table) . "'";
-			break;
-
-			case 'sqlite':
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table}'";
-
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					return false;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$cols = trim($matches[1]);
-				$col_array = preg_split('/,(?![\s\w]+\))/m', $cols);
-
-				foreach ($col_array as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-
-					$column = strtolower($entities[0]);
-					$columns[$column] = $column;
-				}
-
-				return $columns;
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$column = strtolower(current($row));
-			$columns[$column] = $column;
-		}
-		$this->db->sql_freeresult($result);
-
-		return $columns;
-	}
-
-	/**
-	* Check whether a specified column exist in a table
-	*
-	* @param string	$table			Table to check
-	* @param string	$column_name	Column to check
-	*
-	* @return bool		True if column exists, false otherwise
-	*/
-	function sql_column_exists($table, $column_name)
-	{
-		$columns = $this->sql_list_columns($table);
-
-		return isset($columns[$column_name]);
-	}
-
-	/**
-	* Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
-	*
-	* @param string	$table_name		Table to check the index at
-	* @param string	$index_name		The index name to check
-	*
-	* @return bool True if index exists, else false
-	*/
-	function sql_index_exists($table_name, $index_name)
-	{
-		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
-		{
-			$sql = "EXEC sp_statistics '$table_name'";
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if ($row['TYPE'] == 3)
-				{
-					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-			}
-			$this->db->sql_freeresult($result);
-
-			return false;
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
-					FROM RDB\$INDICES
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
-						AND RDB\$UNIQUE_FLAG IS NULL
-						AND RDB\$FOREIGN_KEY IS NULL";
-				$col = 'index_name';
-			break;
-
-			case 'postgres':
-				$sql = "SELECT ic.relname as index_name
-					FROM pg_class bc, pg_class ic, pg_index i
-					WHERE (bc.oid = i.indrelid)
-						AND (ic.oid = i.indexrelid)
-						AND (bc.relname = '" . $table_name . "')
-						AND (i.indisunique != 't')
-						AND (i.indisprimary != 't')";
-				$col = 'index_name';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql = 'SHOW KEYS
-					FROM ' . $table_name;
-				$col = 'Key_name';
-			break;
-
-			case 'oracle':
-				$sql = "SELECT index_name
-					FROM user_indexes
-					WHERE table_name = '" . strtoupper($table_name) . "'
-						AND generated = 'N'
-						AND uniqueness = 'NONUNIQUE'";
-				$col = 'index_name';
-			break;
-
-			case 'sqlite':
-				$sql = "PRAGMA index_list('" . $table_name . "');";
-				$col = 'name';
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
-			{
-				continue;
-			}
-
-			// These DBMS prefix index name with the table name
-			switch ($this->sql_layer)
-			{
-				case 'firebird':
-				case 'oracle':
-				case 'postgres':
-				case 'sqlite':
-					$row[$col] = substr($row[$col], strlen($table_name) + 1);
-				break;
-			}
-
-			if (strtolower($row[$col]) == strtolower($index_name))
-			{
-				$this->db->sql_freeresult($result);
-				return true;
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		return false;
-	}
-
-	/**
-	* Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
-	*
-	* @param string	$table_name		Table to check the index at
-	* @param string	$index_name		The index name to check
-	*
-	* @return bool True if index exists, else false
-	*/
-	function sql_unique_index_exists($table_name, $index_name)
-	{
-		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
-		{
-			$sql = "EXEC sp_statistics '$table_name'";
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				// Usually NON_UNIQUE is the column we want to check, but we allow for both
-				if ($row['TYPE'] == 3)
-				{
-					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-			}
-			$this->db->sql_freeresult($result);
-			return false;
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
-					FROM RDB\$INDICES
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
-						AND RDB\$UNIQUE_FLAG IS NOT NULL
-						AND RDB\$FOREIGN_KEY IS NULL";
-				$col = 'index_name';
-			break;
-
-			case 'postgres':
-				$sql = "SELECT ic.relname as index_name, i.indisunique
-					FROM pg_class bc, pg_class ic, pg_index i
-					WHERE (bc.oid = i.indrelid)
-						AND (ic.oid = i.indexrelid)
-						AND (bc.relname = '" . $table_name . "')
-						AND (i.indisprimary != 't')";
-				$col = 'index_name';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql = 'SHOW KEYS
-					FROM ' . $table_name;
-				$col = 'Key_name';
-			break;
-
-			case 'oracle':
-				$sql = "SELECT index_name, table_owner
-					FROM user_indexes
-					WHERE table_name = '" . strtoupper($table_name) . "'
-						AND generated = 'N'
-						AND uniqueness = 'UNIQUE'";
-				$col = 'index_name';
-			break;
-
-			case 'sqlite':
-				$sql = "PRAGMA index_list('" . $table_name . "');";
-				$col = 'name';
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && ($row['Non_unique'] || $row[$col] == 'PRIMARY'))
-			{
-				continue;
-			}
-
-			if ($this->sql_layer == 'sqlite' && !$row['unique'])
-			{
-				continue;
-			}
-
-			if ($this->sql_layer == 'postgres' && $row['indisunique'] != 't')
-			{
-				continue;
-			}
-
-			// These DBMS prefix index name with the table name
-			switch ($this->sql_layer)
-			{
-				case 'oracle':
-					// Two cases here... prefixed with U_[table_owner] and not prefixed with table_name
-					if (strpos($row[$col], 'U_') === 0)
-					{
-						$row[$col] = substr($row[$col], strlen('U_' . $row['table_owner']) + 1);
-					}
-					else if (strpos($row[$col], strtoupper($table_name)) === 0)
-					{
-						$row[$col] = substr($row[$col], strlen($table_name) + 1);
-					}
-				break;
-
-				case 'firebird':
-				case 'postgres':
-				case 'sqlite':
-					$row[$col] = substr($row[$col], strlen($table_name) + 1);
-				break;
-			}
-
-			if (strtolower($row[$col]) == strtolower($index_name))
-			{
-				$this->db->sql_freeresult($result);
-				return true;
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		return false;
-	}
-
-	/**
-	* Private method for performing sql statements (either execute them or return them)
-	* @access private
-	*/
-	function _sql_run_sql($statements)
-	{
-		if ($this->return_statements)
-		{
-			return $statements;
-		}
-
-		// We could add error handling here...
-		foreach ($statements as $sql)
-		{
-			if ($sql === 'begin')
-			{
-				$this->db->sql_transaction('begin');
-			}
-			else if ($sql === 'commit')
-			{
-				$this->db->sql_transaction('commit');
-			}
-			else
-			{
-				$this->db->sql_query($sql);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Function to prepare some column information for better usage
-	* @access private
-	*/
-	function sql_prepare_column_data($table_name, $column_name, $column_data)
-	{
-		if (strlen($column_name) > 30)
-		{
-			trigger_error("Column name '$column_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
-		}
-
-		// Get type
-		if (strpos($column_data[0], ':') !== false)
-		{
-			list($orig_column_type, $column_length) = explode(':', $column_data[0]);
-			if (!is_array($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']))
-			{
-				$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'], $column_length);
-			}
-			else
-			{
-				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule']))
-				{
-					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][0])
-					{
-						case 'div':
-							$column_length /= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][1];
-							$column_length = ceil($column_length);
-							$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
-						break;
-					}
-				}
-
-				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit']))
-				{
-					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][0])
-					{
-						case 'mult':
-							$column_length *= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][1];
-							if ($column_length > $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][2])
-							{
-								$column_type = $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][3];
-							}
-							else
-							{
-								$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
-							}
-						break;
-					}
-				}
-			}
-			$orig_column_type .= ':';
-		}
-		else
-		{
-			$orig_column_type = $column_data[0];
-			$column_type = $this->dbms_type_map[$this->sql_layer][$column_data[0]];
-		}
-
-		// Adjust default value if db-dependent specified
-		if (is_array($column_data[1]))
-		{
-			$column_data[1] = (isset($column_data[1][$this->sql_layer])) ? $column_data[1][$this->sql_layer] : $column_data[1]['default'];
-		}
-
-		$sql = '';
-
-		$return_array = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql .= " {$column_type} ";
-				$return_array['column_type_sql_type'] = " {$column_type} ";
-
-				if (!is_null($column_data[1]))
-				{
-					$sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
-					$return_array['column_type_sql_default'] = ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
-				}
-
-				$sql .= 'NOT NULL';
-
-				// This is a UNICODE column and thus should be given it's fair share
-				if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0]))
-				{
-					$sql .= ' COLLATE UNICODE';
-				}
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$return_array['auto_increment'] = true;
-				}
-
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$sql .= " {$column_type} ";
-				$sql_default = " {$column_type} ";
-
-				// For adding columns we need the default definition
-				if (!is_null($column_data[1]))
-				{
-					// For hexadecimal values do not use single quotes
-					if (strpos($column_data[1], '0x') === 0)
-					{
-						$return_array['default'] = 'DEFAULT (' . $column_data[1] . ') ';
-						$sql_default .= $return_array['default'];
-					}
-					else
-					{
-						$return_array['default'] = 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
-						$sql_default .= $return_array['default'];
-					}
-				}
-
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-//					$sql .= 'IDENTITY (1, 1) ';
-					$sql_default .= 'IDENTITY (1, 1) ';
-				}
-
-				$return_array['textimage'] = $column_type === '[text]';
-
-				$sql .= 'NOT NULL';
-				$sql_default .= 'NOT NULL';
-
-				$return_array['column_type_sql_default'] = $sql_default;
-
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql .= " {$column_type} ";
-
-				// For hexadecimal values do not use single quotes
-				if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
-				{
-					$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
-				}
-				$sql .= 'NOT NULL';
-
-				if (isset($column_data[2]))
-				{
-					if ($column_data[2] == 'auto_increment')
-					{
-						$sql .= ' auto_increment';
-					}
-					else if ($this->sql_layer === 'mysql_41' && $column_data[2] == 'true_sort')
-					{
-						$sql .= ' COLLATE utf8_unicode_ci';
-					}
-				}
-
-			break;
-
-			case 'oracle':
-				$sql .= " {$column_type} ";
-				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
-
-				// In Oracle empty strings ('') are treated as NULL.
-				// Therefore in oracle we allow NULL's for all DEFAULT '' entries
-				// Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields)
-				if (!preg_match('/number/i', $column_type))
-				{
-					$sql .= ($column_data[1] === '') ? '' : 'NOT NULL';
-				}
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$return_array['auto_increment'] = true;
-				}
-
-			break;
-
-			case 'postgres':
-				$return_array['column_type'] = $column_type;
-
-				$sql .= " {$column_type} ";
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$default_val = "nextval('{$table_name}_seq')";
-					$return_array['auto_increment'] = true;
-				}
-				else if (!is_null($column_data[1]))
-				{
-					$default_val = "'" . $column_data[1] . "'";
-					$return_array['null'] = 'NOT NULL';
-					$sql .= 'NOT NULL ';
-				}
-
-				$return_array['default'] = $default_val;
-
-				$sql .= "DEFAULT {$default_val}";
-
-				// Unsigned? Then add a CHECK contraint
-				if (in_array($orig_column_type, $this->unsigned_types))
-				{
-					$return_array['constraint'] = "CHECK ({$column_name} >= 0)";
-					$sql .= " CHECK ({$column_name} >= 0)";
-				}
-
-			break;
-
-			case 'sqlite':
-				$return_array['primary_key_set'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$sql .= ' INTEGER PRIMARY KEY';
-					$return_array['primary_key_set'] = true;
-				}
-				else
-				{
-					$sql .= ' ' . $column_type;
-				}
-
-				$sql .= ' NOT NULL ';
-				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
-
-			break;
-		}
-
-		$return_array['column_type_sql'] = $sql;
-
-		return $return_array;
-	}
-
-	/**
-	* Add new column
-	*/
-	function sql_column_add($table_name, $column_name, $column_data, $inline = false)
-	{
-		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				// Does not support AFTER statement, only POSITION (and there you need the column position)
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD "' . strtoupper($column_name) . '" ' . $column_data['column_type_sql'];
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				// Does not support AFTER, only through temporary table
-				$statements[] = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default'];
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$after = (!empty($column_data['after'])) ? ' AFTER ' . $column_data['after'] : '';
-				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'] . $after;
-			break;
-
-			case 'oracle':
-				// Does not support AFTER, only through temporary table
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'postgres':
-				// Does not support AFTER, only through temporary table
-				if (version_compare($this->db->sql_server_info(true), '8.0', '>='))
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql'];
-				}
-				else
-				{
-					// old versions cannot add columns with default and null information
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type'] . ' ' . $column_data['constraint'];
-
-					if (isset($column_data['null']))
-					{
-						if ($column_data['null'] == 'NOT NULL')
-						{
-							$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET NOT NULL';
-						}
-					}
-
-					if (isset($column_data['default']))
-					{
-						$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
-					}
-				}
-
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name . ' ' . $column_data['column_type_sql'];
-				}
-
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
-				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
-
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					$statements[] = 'begin';
-
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
-
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
-
-					foreach ($old_table_cols as $declaration)
-					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY')
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
-					}
-
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols;
-
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-					$statements[] = 'commit';
-				}
-				else
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' [' . $column_data['column_type_sql'] . ']';
-				}
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop column
-	*/
-	function sql_column_remove($table_name, $column_name, $inline = false)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP "' . strtoupper($column_name) . '"';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				// remove default cosntraints first
-				// http://msdn.microsoft.com/en-us/library/aa175912%28v=sql.80%29.aspx
-				$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000)
-					SET @drop_default_name =
-						(SELECT so.name FROM sysobjects so
-						JOIN sysconstraints sc ON so.id = sc.constid
-						WHERE object_name(so.parent_obj) = '{$table_name}'
-							AND so.xtype = 'D'
-							AND sc.colid = (SELECT colid FROM syscolumns
-								WHERE id = object_id('{$table_name}')
-									AND name = '{$column_name}'))
-					IF @drop_default_name <> ''
-					BEGIN
-						SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']'
-						EXEC(@cmd)
-					END";
-				$statements[] = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`';
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
-			break;
-
-			case 'postgres':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN "' . $column_name . '"';
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name;
-				}
-
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
-				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
-
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					$statements[] = 'begin';
-
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
-
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
-
-					foreach ($old_table_cols as $declaration)
-					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name)
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
-					}
-
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols);
-
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-					$statements[] = 'commit';
-				}
-				else
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
-				}
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop Index
-	*/
-	function sql_index_drop($table_name, $index_name)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'DROP INDEX ' . $table_name . '.' . $index_name;
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'DROP INDEX ' . $index_name . ' ON ' . $table_name;
-			break;
-
-			case 'firebird':
-			case 'oracle':
-			case 'postgres':
-			case 'sqlite':
-				$statements[] = 'DROP INDEX ' . $table_name . '_' . $index_name;
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop Table
-	*/
-	function sql_table_drop($table_name)
-	{
-		$statements = array();
-
-		if (!$this->sql_table_exists($table_name))
-		{
-			return $this->_sql_run_sql($statements);
-		}
-
-		// the most basic operation, get rid of the table
-		$statements[] = 'DROP TABLE ' . $table_name;
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql = 'SELECT RDB$GENERATOR_NAME as gen
-					FROM RDB$GENERATORS
-					WHERE RDB$SYSTEM_FLAG = 0
-						AND RDB$GENERATOR_NAME = \'' . strtoupper($table_name) . "_GEN'";
-				$result = $this->db->sql_query($sql);
-
-				// does a generator exist?
-				if ($row = $this->db->sql_fetchrow($result))
-				{
-					$statements[] = "DROP GENERATOR {$row['gen']};";
-				}
-				$this->db->sql_freeresult($result);
-			break;
-
-			case 'oracle':
-				$sql = 'SELECT A.REFERENCED_NAME
-					FROM USER_DEPENDENCIES A, USER_TRIGGERS B
-					WHERE A.REFERENCED_TYPE = \'SEQUENCE\'
-						AND A.NAME = B.TRIGGER_NAME
-						AND B.TABLE_NAME = \'' . strtoupper($table_name) . "'";
-				$result = $this->db->sql_query($sql);
-
-				// any sequences ref'd to this table's triggers?
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$statements[] = "DROP SEQUENCE {$row['referenced_name']}";
-				}
-				$this->db->sql_freeresult($result);
-			break;
-
-			case 'postgres':
-				// PGSQL does not "tightly" bind sequences and tables, we must guess...
-				$sql = "SELECT relname
-					FROM pg_class
-					WHERE relkind = 'S'
-						AND relname = '{$table_name}_seq'";
-				$result = $this->db->sql_query($sql);
-
-				// We don't even care about storing the results. We already know the answer if we get rows back.
-				if ($this->db->sql_fetchrow($result))
-				{
-					$statements[] =  "DROP SEQUENCE {$table_name}_seq;\n";
-				}
-				$this->db->sql_freeresult($result);
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add primary key
-	*/
-	function sql_create_primary_key($table_name, $column, $inline = false)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD ";
-				$sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED (";
-				$sql .= '[' . implode("],\n\t\t[", $column) . ']';
-				$sql .= ') ON [PRIMARY]';
-
-				$statements[] = $sql;
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . 'add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')';
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column;
-				}
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					break;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$statements[] = 'begin';
-
-				// Create a backup table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$new_table_cols = trim($matches[1]);
-				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-				$column_list = array();
-
-				foreach ($old_table_cols as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-					$column_list[] = $entities[0];
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add unique index
-	*/
-	function sql_create_unique_index($table_name, $index_name, $column)
-	{
-		$statements = array();
-
-		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
-		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
-		{
-			$max_length = strlen($table_prefix) + 24;
-			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'oracle':
-			case 'sqlite':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD UNIQUE INDEX ' . $index_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add index
-	*/
-	function sql_create_index($table_name, $index_name, $column)
-	{
-		$statements = array();
-
-		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
-		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
-		{
-			$max_length = strlen($table_prefix) + 24;
-			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
-		}
-
-		// remove index length unless MySQL4
-		if ('mysql_40' != $this->sql_layer)
-		{
-			$column = preg_replace('#:.*$#', '', $column);
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'oracle':
-			case 'sqlite':
-				$statements[] = 'CREATE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mysql_40':
-				// add index size to definition as required by MySQL4
-				foreach ($column as $i => $col)
-				{
-					if (false !== strpos($col, ':'))
-					{
-						list($col, $index_size) = explode(':', $col);
-						$column[$i] = "$col($index_size)";
-					}
-				}
-			// no break
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD INDEX ' . $index_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* List all of the indices that belong to a table,
-	* does not count:
-	* * UNIQUE indices
-	* * PRIMARY keys
-	*/
-	function sql_list_index($table_name)
-	{
-		$index_array = array();
-
-		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
-		{
-			$sql = "EXEC sp_statistics '$table_name'";
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if ($row['TYPE'] == 3)
-				{
-					$index_array[] = $row['INDEX_NAME'];
-				}
-			}
-			$this->db->sql_freeresult($result);
-		}
-		else
-		{
-			switch ($this->sql_layer)
-			{
-				case 'firebird':
-					$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
-						FROM RDB\$INDICES
-						WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
-							AND RDB\$UNIQUE_FLAG IS NULL
-							AND RDB\$FOREIGN_KEY IS NULL";
-					$col = 'index_name';
-				break;
-
-				case 'postgres':
-					$sql = "SELECT ic.relname as index_name
-						FROM pg_class bc, pg_class ic, pg_index i
-						WHERE (bc.oid = i.indrelid)
-							AND (ic.oid = i.indexrelid)
-							AND (bc.relname = '" . $table_name . "')
-							AND (i.indisunique != 't')
-							AND (i.indisprimary != 't')";
-					$col = 'index_name';
-				break;
-
-				case 'mysql_40':
-				case 'mysql_41':
-					$sql = 'SHOW KEYS
-						FROM ' . $table_name;
-					$col = 'Key_name';
-				break;
-
-				case 'oracle':
-					$sql = "SELECT index_name
-						FROM user_indexes
-						WHERE table_name = '" . strtoupper($table_name) . "'
-							AND generated = 'N'
-							AND uniqueness = 'NONUNIQUE'";
-					$col = 'index_name';
-				break;
-
-				case 'sqlite':
-					$sql = "PRAGMA index_info('" . $table_name . "');";
-					$col = 'name';
-				break;
-			}
-
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
-				{
-					continue;
-				}
-
-				switch ($this->sql_layer)
-				{
-					case 'firebird':
-					case 'oracle':
-					case 'postgres':
-					case 'sqlite':
-						$row[$col] = substr($row[$col], strlen($table_name) + 1);
-					break;
-				}
-
-				$index_array[] = $row[$col];
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		return array_map('strtolower', $index_array);
-	}
-
-	/**
-	* Change column type (not name!)
-	*/
-	function sql_column_change($table_name, $column_name, $column_data, $inline = false)
-	{
-		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				// Change type...
-				if (!empty($column_data['column_type_sql_default']))
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" SET DEFAULT ' . ' ' . $column_data['column_type_sql_default'];
-				}
-				else
-				{
-					// TODO: try to change pkey without removing trigger, generator or constraints. ATM this query may fail.
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
-				}
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'ALTER TABLE [' . $table_name . '] ALTER COLUMN [' . $column_name . '] ' . $column_data['column_type_sql'];
-
-				if (!empty($column_data['default']))
-				{
-					// Using TRANSACT-SQL for this statement because we do not want to have colliding data if statements are executed at a later stage
-					$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000)
-						SET @drop_default_name =
-							(SELECT so.name FROM sysobjects so
-							JOIN sysconstraints sc ON so.id = sc.constid
-							WHERE object_name(so.parent_obj) = '{$table_name}'
-								AND so.xtype = 'D'
-								AND sc.colid = (SELECT colid FROM syscolumns
-									WHERE id = object_id('{$table_name}')
-										AND name = '{$column_name}'))
-						IF @drop_default_name <> ''
-						BEGIN
-							SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']'
-							EXEC(@cmd)
-						END
-						SET @cmd = 'ALTER TABLE [{$table_name}] ADD CONSTRAINT [DF_{$table_name}_{$column_name}_1] {$column_data['default']} FOR [{$column_name}]'
-						EXEC(@cmd)";
-				}
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` CHANGE `' . $column_name . '` `' . $column_name . '` ' . $column_data['column_type_sql'];
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' MODIFY ' . $column_name . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'postgres':
-				$sql = 'ALTER TABLE ' . $table_name . ' ';
-
-				$sql_array = array();
-				$sql_array[] = 'ALTER COLUMN ' . $column_name . ' TYPE ' . $column_data['column_type'];
-
-				if (isset($column_data['null']))
-				{
-					if ($column_data['null'] == 'NOT NULL')
-					{
-						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET NOT NULL';
-					}
-					else if ($column_data['null'] == 'NULL')
-					{
-						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' DROP NOT NULL';
-					}
-				}
-
-				if (isset($column_data['default']))
-				{
-					$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
-				}
-
-				// we don't want to double up on constraints if we change different number data types
-				if (isset($column_data['constraint']))
-				{
-					$constraint_sql = "SELECT consrc as constraint_data
-								FROM pg_constraint, pg_class bc
-								WHERE conrelid = bc.oid
-									AND bc.relname = '{$table_name}'
-									AND NOT EXISTS (
-										SELECT *
-											FROM pg_constraint as c, pg_inherits as i
-											WHERE i.inhrelid = pg_constraint.conrelid
-												AND c.conname = pg_constraint.conname
-												AND c.consrc = pg_constraint.consrc
-												AND c.conrelid = i.inhparent
-									)";
-
-					$constraint_exists = false;
-
-					$result = $this->db->sql_query($constraint_sql);
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						if (trim($row['constraint_data']) == trim($column_data['constraint']))
-						{
-							$constraint_exists = true;
-							break;
-						}
-					}
-					$this->db->sql_freeresult($result);
-
-					if (!$constraint_exists)
-					{
-						$sql_array[] = 'ADD ' . $column_data['constraint'];
-					}
-				}
-
-				$sql .= implode(', ', $sql_array);
-
-				$statements[] = $sql;
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name . ' ' . $column_data['column_type_sql'];
-				}
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					break;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$statements[] = 'begin';
-
-				// Create a temp table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$new_table_cols = trim($matches[1]);
-				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-				$column_list = array();
-
-				foreach ($old_table_cols as $key => $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					$column_list[] = $entities[0];
-					if ($entities[0] == $column_name)
-					{
-						$old_table_cols[$key] = $column_name . ' ' . $column_data['column_type_sql'];
-					}
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-}
diff --git a/phpBB/includes/db/tools.php b/phpBB/includes/db/tools.php
new file mode 100644
index 0000000000..983cdc18ea
--- /dev/null
+++ b/phpBB/includes/db/tools.php
@@ -0,0 +1,2486 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2007 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Database Tools for handling cross-db actions such as altering columns, etc.
+* Currently not supported is returning SQL for creating tables.
+*
+* @package dbal
+*/
+class phpbb_db_tools
+{
+	/**
+	* Current sql layer
+	*/
+	var $sql_layer = '';
+
+	/**
+	* @var object DB object
+	*/
+	var $db = NULL;
+
+	/**
+	* The Column types for every database we support
+	* @var array
+	*/
+	var $dbms_type_map = array(
+		'mysql_41'	=> array(
+			'INT:'		=> 'int(%d)',
+			'BINT'		=> 'bigint(20)',
+			'UINT'		=> 'mediumint(8) UNSIGNED',
+			'UINT:'		=> 'int(%d) UNSIGNED',
+			'TINT:'		=> 'tinyint(%d)',
+			'USINT'		=> 'smallint(4) UNSIGNED',
+			'BOOL'		=> 'tinyint(1) UNSIGNED',
+			'VCHAR'		=> 'varchar(255)',
+			'VCHAR:'	=> 'varchar(%d)',
+			'CHAR:'		=> 'char(%d)',
+			'XSTEXT'	=> 'text',
+			'XSTEXT_UNI'=> 'varchar(100)',
+			'STEXT'		=> 'text',
+			'STEXT_UNI'	=> 'varchar(255)',
+			'TEXT'		=> 'text',
+			'TEXT_UNI'	=> 'text',
+			'MTEXT'		=> 'mediumtext',
+			'MTEXT_UNI'	=> 'mediumtext',
+			'TIMESTAMP'	=> 'int(11) UNSIGNED',
+			'DECIMAL'	=> 'decimal(5,2)',
+			'DECIMAL:'	=> 'decimal(%d,2)',
+			'PDECIMAL'	=> 'decimal(6,3)',
+			'PDECIMAL:'	=> 'decimal(%d,3)',
+			'VCHAR_UNI'	=> 'varchar(255)',
+			'VCHAR_UNI:'=> 'varchar(%d)',
+			'VCHAR_CI'	=> 'varchar(255)',
+			'VARBINARY'	=> 'varbinary(255)',
+		),
+
+		'mysql_40'	=> array(
+			'INT:'		=> 'int(%d)',
+			'BINT'		=> 'bigint(20)',
+			'UINT'		=> 'mediumint(8) UNSIGNED',
+			'UINT:'		=> 'int(%d) UNSIGNED',
+			'TINT:'		=> 'tinyint(%d)',
+			'USINT'		=> 'smallint(4) UNSIGNED',
+			'BOOL'		=> 'tinyint(1) UNSIGNED',
+			'VCHAR'		=> 'varbinary(255)',
+			'VCHAR:'	=> 'varbinary(%d)',
+			'CHAR:'		=> 'binary(%d)',
+			'XSTEXT'	=> 'blob',
+			'XSTEXT_UNI'=> 'blob',
+			'STEXT'		=> 'blob',
+			'STEXT_UNI'	=> 'blob',
+			'TEXT'		=> 'blob',
+			'TEXT_UNI'	=> 'blob',
+			'MTEXT'		=> 'mediumblob',
+			'MTEXT_UNI'	=> 'mediumblob',
+			'TIMESTAMP'	=> 'int(11) UNSIGNED',
+			'DECIMAL'	=> 'decimal(5,2)',
+			'DECIMAL:'	=> 'decimal(%d,2)',
+			'PDECIMAL'	=> 'decimal(6,3)',
+			'PDECIMAL:'	=> 'decimal(%d,3)',
+			'VCHAR_UNI'	=> 'blob',
+			'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')),
+			'VCHAR_CI'	=> 'blob',
+			'VARBINARY'	=> 'varbinary(255)',
+		),
+
+		'firebird'	=> array(
+			'INT:'		=> 'INTEGER',
+			'BINT'		=> 'DOUBLE PRECISION',
+			'UINT'		=> 'INTEGER',
+			'UINT:'		=> 'INTEGER',
+			'TINT:'		=> 'INTEGER',
+			'USINT'		=> 'INTEGER',
+			'BOOL'		=> 'INTEGER',
+			'VCHAR'		=> 'VARCHAR(255) CHARACTER SET NONE',
+			'VCHAR:'	=> 'VARCHAR(%d) CHARACTER SET NONE',
+			'CHAR:'		=> 'CHAR(%d) CHARACTER SET NONE',
+			'XSTEXT'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
+			'STEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
+			'TEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
+			'MTEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
+			'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8',
+			'STEXT_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
+			'TEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
+			'MTEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
+			'TIMESTAMP'	=> 'INTEGER',
+			'DECIMAL'	=> 'DOUBLE PRECISION',
+			'DECIMAL:'	=> 'DOUBLE PRECISION',
+			'PDECIMAL'	=> 'DOUBLE PRECISION',
+			'PDECIMAL:'	=> 'DOUBLE PRECISION',
+			'VCHAR_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
+			'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8',
+			'VCHAR_CI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
+			'VARBINARY'	=> 'CHAR(255) CHARACTER SET NONE',
+		),
+
+		'mssql'		=> array(
+			'INT:'		=> '[int]',
+			'BINT'		=> '[float]',
+			'UINT'		=> '[int]',
+			'UINT:'		=> '[int]',
+			'TINT:'		=> '[int]',
+			'USINT'		=> '[int]',
+			'BOOL'		=> '[int]',
+			'VCHAR'		=> '[varchar] (255)',
+			'VCHAR:'	=> '[varchar] (%d)',
+			'CHAR:'		=> '[char] (%d)',
+			'XSTEXT'	=> '[varchar] (1000)',
+			'STEXT'		=> '[varchar] (3000)',
+			'TEXT'		=> '[varchar] (8000)',
+			'MTEXT'		=> '[text]',
+			'XSTEXT_UNI'=> '[varchar] (100)',
+			'STEXT_UNI'	=> '[varchar] (255)',
+			'TEXT_UNI'	=> '[varchar] (4000)',
+			'MTEXT_UNI'	=> '[text]',
+			'TIMESTAMP'	=> '[int]',
+			'DECIMAL'	=> '[float]',
+			'DECIMAL:'	=> '[float]',
+			'PDECIMAL'	=> '[float]',
+			'PDECIMAL:'	=> '[float]',
+			'VCHAR_UNI'	=> '[varchar] (255)',
+			'VCHAR_UNI:'=> '[varchar] (%d)',
+			'VCHAR_CI'	=> '[varchar] (255)',
+			'VARBINARY'	=> '[varchar] (255)',
+		),
+
+		'mssqlnative'	=> array(
+			'INT:'		=> '[int]',
+			'BINT'		=> '[float]',
+			'UINT'		=> '[int]',
+			'UINT:'		=> '[int]',
+			'TINT:'		=> '[int]',
+			'USINT'		=> '[int]',
+			'BOOL'		=> '[int]',
+			'VCHAR'		=> '[varchar] (255)',
+			'VCHAR:'	=> '[varchar] (%d)',
+			'CHAR:'		=> '[char] (%d)',
+			'XSTEXT'	=> '[varchar] (1000)',
+			'STEXT'		=> '[varchar] (3000)',
+			'TEXT'		=> '[varchar] (8000)',
+			'MTEXT'		=> '[text]',
+			'XSTEXT_UNI'=> '[varchar] (100)',
+			'STEXT_UNI'	=> '[varchar] (255)',
+			'TEXT_UNI'	=> '[varchar] (4000)',
+			'MTEXT_UNI'	=> '[text]',
+			'TIMESTAMP'	=> '[int]',
+			'DECIMAL'	=> '[float]',
+			'DECIMAL:'	=> '[float]',
+			'PDECIMAL'	=> '[float]',
+			'PDECIMAL:'	=> '[float]',
+			'VCHAR_UNI'	=> '[varchar] (255)',
+			'VCHAR_UNI:'=> '[varchar] (%d)',
+			'VCHAR_CI'	=> '[varchar] (255)',
+			'VARBINARY'	=> '[varchar] (255)',
+		),
+
+		'oracle'	=> array(
+			'INT:'		=> 'number(%d)',
+			'BINT'		=> 'number(20)',
+			'UINT'		=> 'number(8)',
+			'UINT:'		=> 'number(%d)',
+			'TINT:'		=> 'number(%d)',
+			'USINT'		=> 'number(4)',
+			'BOOL'		=> 'number(1)',
+			'VCHAR'		=> 'varchar2(255)',
+			'VCHAR:'	=> 'varchar2(%d)',
+			'CHAR:'		=> 'char(%d)',
+			'XSTEXT'	=> 'varchar2(1000)',
+			'STEXT'		=> 'varchar2(3000)',
+			'TEXT'		=> 'clob',
+			'MTEXT'		=> 'clob',
+			'XSTEXT_UNI'=> 'varchar2(300)',
+			'STEXT_UNI'	=> 'varchar2(765)',
+			'TEXT_UNI'	=> 'clob',
+			'MTEXT_UNI'	=> 'clob',
+			'TIMESTAMP'	=> 'number(11)',
+			'DECIMAL'	=> 'number(5, 2)',
+			'DECIMAL:'	=> 'number(%d, 2)',
+			'PDECIMAL'	=> 'number(6, 3)',
+			'PDECIMAL:'	=> 'number(%d, 3)',
+			'VCHAR_UNI'	=> 'varchar2(765)',
+			'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')),
+			'VCHAR_CI'	=> 'varchar2(255)',
+			'VARBINARY'	=> 'raw(255)',
+		),
+
+		'sqlite'	=> array(
+			'INT:'		=> 'int(%d)',
+			'BINT'		=> 'bigint(20)',
+			'UINT'		=> 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED',
+			'UINT:'		=> 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED',
+			'TINT:'		=> 'tinyint(%d)',
+			'USINT'		=> 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED',
+			'BOOL'		=> 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED',
+			'VCHAR'		=> 'varchar(255)',
+			'VCHAR:'	=> 'varchar(%d)',
+			'CHAR:'		=> 'char(%d)',
+			'XSTEXT'	=> 'text(65535)',
+			'STEXT'		=> 'text(65535)',
+			'TEXT'		=> 'text(65535)',
+			'MTEXT'		=> 'mediumtext(16777215)',
+			'XSTEXT_UNI'=> 'text(65535)',
+			'STEXT_UNI'	=> 'text(65535)',
+			'TEXT_UNI'	=> 'text(65535)',
+			'MTEXT_UNI'	=> 'mediumtext(16777215)',
+			'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
+			'DECIMAL'	=> 'decimal(5,2)',
+			'DECIMAL:'	=> 'decimal(%d,2)',
+			'PDECIMAL'	=> 'decimal(6,3)',
+			'PDECIMAL:'	=> 'decimal(%d,3)',
+			'VCHAR_UNI'	=> 'varchar(255)',
+			'VCHAR_UNI:'=> 'varchar(%d)',
+			'VCHAR_CI'	=> 'varchar(255)',
+			'VARBINARY'	=> 'blob',
+		),
+
+		'postgres'	=> array(
+			'INT:'		=> 'INT4',
+			'BINT'		=> 'INT8',
+			'UINT'		=> 'INT4', // unsigned
+			'UINT:'		=> 'INT4', // unsigned
+			'USINT'		=> 'INT2', // unsigned
+			'BOOL'		=> 'INT2', // unsigned
+			'TINT:'		=> 'INT2',
+			'VCHAR'		=> 'varchar(255)',
+			'VCHAR:'	=> 'varchar(%d)',
+			'CHAR:'		=> 'char(%d)',
+			'XSTEXT'	=> 'varchar(1000)',
+			'STEXT'		=> 'varchar(3000)',
+			'TEXT'		=> 'varchar(8000)',
+			'MTEXT'		=> 'TEXT',
+			'XSTEXT_UNI'=> 'varchar(100)',
+			'STEXT_UNI'	=> 'varchar(255)',
+			'TEXT_UNI'	=> 'varchar(4000)',
+			'MTEXT_UNI'	=> 'TEXT',
+			'TIMESTAMP'	=> 'INT4', // unsigned
+			'DECIMAL'	=> 'decimal(5,2)',
+			'DECIMAL:'	=> 'decimal(%d,2)',
+			'PDECIMAL'	=> 'decimal(6,3)',
+			'PDECIMAL:'	=> 'decimal(%d,3)',
+			'VCHAR_UNI'	=> 'varchar(255)',
+			'VCHAR_UNI:'=> 'varchar(%d)',
+			'VCHAR_CI'	=> 'varchar_ci',
+			'VARBINARY'	=> 'bytea',
+		),
+	);
+
+	/**
+	* A list of types being unsigned for better reference in some db's
+	* @var array
+	*/
+	var $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
+
+	/**
+	* A list of supported DBMS. We change this class to support more DBMS, the DBMS itself only need to follow some rules.
+	* @var array
+	*/
+	var $supported_dbms = array('firebird', 'mssql', 'mssqlnative', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite');
+
+	/**
+	* This is set to true if user only wants to return the 'to-be-executed' SQL statement(s) (as an array).
+	* This mode has no effect on some methods (inserting of data for example). This is expressed within the methods command.
+	*/
+	var $return_statements = false;
+
+	/**
+	* Constructor. Set DB Object and set {@link $return_statements return_statements}.
+	*
+	* @param phpbb_db_driver	$db					Database connection
+	* @param bool		$return_statements	True if only statements should be returned and no SQL being executed
+	*/
+	function phpbb_db_tools(phpbb_db_driver $db, $return_statements = false)
+	{
+		$this->db = $db;
+		$this->return_statements = $return_statements;
+
+		// Determine mapping database type
+		switch ($this->db->sql_layer)
+		{
+			case 'mysql':
+				$this->sql_layer = 'mysql_40';
+			break;
+
+			case 'mysql4':
+				if (version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
+				{
+					$this->sql_layer = 'mysql_41';
+				}
+				else
+				{
+					$this->sql_layer = 'mysql_40';
+				}
+			break;
+
+			case 'mysqli':
+				$this->sql_layer = 'mysql_41';
+			break;
+
+			case 'mssql':
+			case 'mssql_odbc':
+				$this->sql_layer = 'mssql';
+			break;
+
+			case 'mssqlnative':
+				$this->sql_layer = 'mssqlnative';
+			break;
+
+			default:
+				$this->sql_layer = $this->db->sql_layer;
+			break;
+		}
+	}
+
+	/**
+	* Setter for {@link $return_statements return_statements}.
+	*
+	* @param bool $return_statements True if SQL should not be executed but returned as strings
+	* @return null
+	*/
+	public function set_return_statements($return_statements)
+	{
+		$this->return_statements = $return_statements;
+	}
+
+	/**
+	* Gets a list of tables in the database.
+	*
+	* @return array		Array of table names  (all lower case)
+	*/
+	function sql_list_tables()
+	{
+		switch ($this->db->sql_layer)
+		{
+			case 'mysql':
+			case 'mysql4':
+			case 'mysqli':
+				$sql = 'SHOW TABLES';
+			break;
+
+			case 'sqlite':
+				$sql = 'SELECT name
+					FROM sqlite_master
+					WHERE type = "table"';
+			break;
+
+			case 'mssql':
+			case 'mssql_odbc':
+			case 'mssqlnative':
+				$sql = "SELECT name
+					FROM sysobjects
+					WHERE type='U'";
+			break;
+
+			case 'postgres':
+				$sql = 'SELECT relname
+					FROM pg_stat_user_tables';
+			break;
+
+			case 'firebird':
+				$sql = 'SELECT rdb$relation_name
+					FROM rdb$relations
+					WHERE rdb$view_source is null
+						AND rdb$system_flag = 0';
+			break;
+
+			case 'oracle':
+				$sql = 'SELECT table_name
+					FROM USER_TABLES';
+			break;
+		}
+
+		$result = $this->db->sql_query($sql);
+
+		$tables = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$name = current($row);
+			$tables[$name] = $name;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $tables;
+	}
+
+	/**
+	* Check if table exists
+	*
+	*
+	* @param string	$table_name	The table name to check for
+	* @return bool true if table exists, else false
+	*/
+	function sql_table_exists($table_name)
+	{
+		$this->db->sql_return_on_error(true);
+		$result = $this->db->sql_query_limit('SELECT * FROM ' . $table_name, 1);
+		$this->db->sql_return_on_error(false);
+
+		if ($result)
+		{
+			$this->db->sql_freeresult($result);
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	* Create SQL Table
+	*
+	* @param string	$table_name	The table name to create
+	* @param array	$table_data	Array containing table data.
+	* @return array	Statements if $return_statements is true.
+	*/
+	function sql_create_table($table_name, $table_data)
+	{
+		// holds the DDL for a column
+		$columns = $statements = array();
+
+		if ($this->sql_table_exists($table_name))
+		{
+			return $this->_sql_run_sql($statements);
+		}
+
+		// Begin transaction
+		$statements[] = 'begin';
+
+		// Determine if we have created a PRIMARY KEY in the earliest
+		$primary_key_gen = false;
+
+		// Determine if the table must be created with TEXTIMAGE
+		$create_textimage = false;
+
+		// Determine if the table requires a sequence
+		$create_sequence = false;
+
+		// Begin table sql statement
+		switch ($this->sql_layer)
+		{
+			case 'mssql':
+			case 'mssqlnative':
+				$table_sql = 'CREATE TABLE [' . $table_name . '] (' . "\n";
+			break;
+
+			default:
+				$table_sql = 'CREATE TABLE ' . $table_name . ' (' . "\n";
+			break;
+		}
+
+		// Iterate through the columns to create a table
+		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
+		{
+			// here lies an array, filled with information compiled on the column's data
+			$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
+
+			if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
+			{
+				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR);
+			}
+
+			// here we add the definition of the new column to the list of columns
+			switch ($this->sql_layer)
+			{
+				case 'mssql':
+				case 'mssqlnative':
+					$columns[] = "\t [{$column_name}] " . $prepared_column['column_type_sql_default'];
+				break;
+
+				default:
+					$columns[] = "\t {$column_name} " . $prepared_column['column_type_sql'];
+				break;
+			}
+
+			// see if we have found a primary key set due to a column definition if we have found it, we can stop looking
+			if (!$primary_key_gen)
+			{
+				$primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set'];
+			}
+
+			// create textimage DDL based off of the existance of certain column types
+			if (!$create_textimage)
+			{
+				$create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage'];
+			}
+
+			// create sequence DDL based off of the existance of auto incrementing columns
+			if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment'])
+			{
+				$create_sequence = $column_name;
+			}
+		}
+
+		// this makes up all the columns in the create table statement
+		$table_sql .= implode(",\n", $columns);
+
+		// Close the table for two DBMS and add to the statements
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$table_sql .= "\n);";
+				$statements[] = $table_sql;
+			break;
+
+			case 'mssql':
+			case 'mssqlnative':
+				$table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '');
+				$statements[] = $table_sql;
+			break;
+		}
+
+		// we have yet to create a primary key for this table,
+		// this means that we can add the one we really wanted instead
+		if (!$primary_key_gen)
+		{
+			// Write primary key
+			if (isset($table_data['PRIMARY_KEY']))
+			{
+				if (!is_array($table_data['PRIMARY_KEY']))
+				{
+					$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
+				}
+
+				switch ($this->sql_layer)
+				{
+					case 'mysql_40':
+					case 'mysql_41':
+					case 'postgres':
+					case 'sqlite':
+						$table_sql .= ",\n\t PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
+					break;
+
+					case 'firebird':
+					case 'mssql':
+					case 'mssqlnative':
+						// We need the data here
+						$old_return_statements = $this->return_statements;
+						$this->return_statements = true;
+
+						$primary_key_stmts = $this->sql_create_primary_key($table_name, $table_data['PRIMARY_KEY']);
+						foreach ($primary_key_stmts as $pk_stmt)
+						{
+							$statements[] = $pk_stmt;
+						}
+
+						$this->return_statements = $old_return_statements;
+					break;
+
+					case 'oracle':
+						$table_sql .= ",\n\t CONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
+					break;
+				}
+			}
+		}
+
+		// close the table
+		switch ($this->sql_layer)
+		{
+			case 'mysql_41':
+				// make sure the table is in UTF-8 mode
+				$table_sql .= "\n) CHARACTER SET `utf8` COLLATE `utf8_bin`;";
+				$statements[] = $table_sql;
+			break;
+
+			case 'mysql_40':
+			case 'sqlite':
+				$table_sql .= "\n);";
+				$statements[] = $table_sql;
+			break;
+
+			case 'postgres':
+				// do we need to add a sequence for auto incrementing columns?
+				if ($create_sequence)
+				{
+					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
+				}
+
+				$table_sql .= "\n);";
+				$statements[] = $table_sql;
+			break;
+
+			case 'oracle':
+				$table_sql .= "\n)";
+				$statements[] = $table_sql;
+
+				// do we need to add a sequence and a tigger for auto incrementing columns?
+				if ($create_sequence)
+				{
+					// create the actual sequence
+					$statements[] = "CREATE SEQUENCE {$table_name}_seq";
+
+					// the trigger is the mechanism by which we increment the counter
+					$trigger = "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
+					$trigger .= "BEFORE INSERT ON {$table_name}\n";
+					$trigger .= "FOR EACH ROW WHEN (\n";
+					$trigger .= "\tnew.{$create_sequence} IS NULL OR new.{$create_sequence} = 0\n";
+					$trigger .= ")\n";
+					$trigger .= "BEGIN\n";
+					$trigger .= "\tSELECT {$table_name}_seq.nextval\n";
+					$trigger .= "\tINTO :new.{$create_sequence}\n";
+					$trigger .= "\tFROM dual;\n";
+					$trigger .= "END;";
+
+					$statements[] = $trigger;
+				}
+			break;
+
+			case 'firebird':
+				if ($create_sequence)
+				{
+					$statements[] = "CREATE GENERATOR {$table_name}_gen;";
+					$statements[] = "SET GENERATOR {$table_name}_gen TO 0;";
+
+					$trigger = "CREATE TRIGGER t_$table_name FOR $table_name\n";
+					$trigger .= "BEFORE INSERT\nAS\nBEGIN\n";
+					$trigger .= "\tNEW.{$create_sequence} = GEN_ID({$table_name}_gen, 1);\nEND;";
+					$statements[] = $trigger;
+				}
+			break;
+		}
+
+		// Write Keys
+		if (isset($table_data['KEYS']))
+		{
+			foreach ($table_data['KEYS'] as $key_name => $key_data)
+			{
+				if (!is_array($key_data[1]))
+				{
+					$key_data[1] = array($key_data[1]);
+				}
+
+				$old_return_statements = $this->return_statements;
+				$this->return_statements = true;
+
+				$key_stmts = ($key_data[0] == 'UNIQUE') ? $this->sql_create_unique_index($table_name, $key_name, $key_data[1]) : $this->sql_create_index($table_name, $key_name, $key_data[1]);
+
+				foreach ($key_stmts as $key_stmt)
+				{
+					$statements[] = $key_stmt;
+				}
+
+				$this->return_statements = $old_return_statements;
+			}
+		}
+
+		// Commit Transaction
+		$statements[] = 'commit';
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Handle passed database update array.
+	* Expected structure...
+	* Key being one of the following
+	*	drop_tables: Drop tables
+	*	add_tables: Add tables
+	*	change_columns: Column changes (only type, not name)
+	*	add_columns: Add columns to a table
+	*	drop_keys: Dropping keys
+	*	drop_columns: Removing/Dropping columns
+	*	add_primary_keys: adding primary keys
+	*	add_unique_index: adding an unique index
+	*	add_index: adding an index (can be column:index_size if you need to provide size)
+	*
+	* The values are in this format:
+	*		{TABLE NAME}		=> array(
+	*			{COLUMN NAME}		=> array({COLUMN TYPE}, {DEFAULT VALUE}, {OPTIONAL VARIABLES}),
+	*			{KEY/INDEX NAME}	=> array({COLUMN NAMES}),
+	*		)
+	*
+	* For more information have a look at /develop/create_schema_files.php (only available through SVN)
+	*/
+	function perform_schema_changes($schema_changes)
+	{
+		if (empty($schema_changes))
+		{
+			return;
+		}
+
+		$statements = array();
+		$sqlite = false;
+
+		// For SQLite we need to perform the schema changes in a much more different way
+		if ($this->db->sql_layer == 'sqlite' && $this->return_statements)
+		{
+			$sqlite_data = array();
+			$sqlite = true;
+		}
+
+		// Drop tables?
+		if (!empty($schema_changes['drop_tables']))
+		{
+			foreach ($schema_changes['drop_tables'] as $table)
+			{
+				// only drop table if it exists
+				if ($this->sql_table_exists($table))
+				{
+					$result = $this->sql_table_drop($table);
+					if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
+		// Add tables?
+		if (!empty($schema_changes['add_tables']))
+		{
+			foreach ($schema_changes['add_tables'] as $table => $table_data)
+			{
+				$result = $this->sql_create_table($table, $table_data);
+				if ($this->return_statements)
+				{
+					$statements = array_merge($statements, $result);
+				}
+			}
+		}
+
+		// Change columns?
+		if (!empty($schema_changes['change_columns']))
+		{
+			foreach ($schema_changes['change_columns'] as $table => $columns)
+			{
+				foreach ($columns as $column_name => $column_data)
+				{
+					// If the column exists we change it, else we add it ;)
+					if ($column_exists = $this->sql_column_exists($table, $column_name))
+					{
+						$result = $this->sql_column_change($table, $column_name, $column_data, true);
+					}
+					else
+					{
+						$result = $this->sql_column_add($table, $column_name, $column_data, true);
+					}
+
+					if ($sqlite)
+					{
+						if ($column_exists)
+						{
+							$sqlite_data[$table]['change_columns'][] = $result;
+						}
+						else
+						{
+							$sqlite_data[$table]['add_columns'][] = $result;
+						}
+					}
+					else if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
+		// Add columns?
+		if (!empty($schema_changes['add_columns']))
+		{
+			foreach ($schema_changes['add_columns'] as $table => $columns)
+			{
+				foreach ($columns as $column_name => $column_data)
+				{
+					// Only add the column if it does not exist yet
+					if ($column_exists = $this->sql_column_exists($table, $column_name))
+					{
+						continue;
+						// This is commented out here because it can take tremendous time on updates
+//						$result = $this->sql_column_change($table, $column_name, $column_data, true);
+					}
+					else
+					{
+						$result = $this->sql_column_add($table, $column_name, $column_data, true);
+					}
+
+					if ($sqlite)
+					{
+						if ($column_exists)
+						{
+							continue;
+//							$sqlite_data[$table]['change_columns'][] = $result;
+						}
+						else
+						{
+							$sqlite_data[$table]['add_columns'][] = $result;
+						}
+					}
+					else if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
+		// Remove keys?
+		if (!empty($schema_changes['drop_keys']))
+		{
+			foreach ($schema_changes['drop_keys'] as $table => $indexes)
+			{
+				foreach ($indexes as $index_name)
+				{
+					if (!$this->sql_index_exists($table, $index_name))
+					{
+						continue;
+					}
+
+					$result = $this->sql_index_drop($table, $index_name);
+
+					if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
+		// Drop columns?
+		if (!empty($schema_changes['drop_columns']))
+		{
+			foreach ($schema_changes['drop_columns'] as $table => $columns)
+			{
+				foreach ($columns as $column)
+				{
+					// Only remove the column if it exists...
+					if ($this->sql_column_exists($table, $column))
+					{
+						$result = $this->sql_column_remove($table, $column, true);
+
+						if ($sqlite)
+						{
+							$sqlite_data[$table]['drop_columns'][] = $result;
+						}
+						else if ($this->return_statements)
+						{
+							$statements = array_merge($statements, $result);
+						}
+					}
+				}
+			}
+		}
+
+		// Add primary keys?
+		if (!empty($schema_changes['add_primary_keys']))
+		{
+			foreach ($schema_changes['add_primary_keys'] as $table => $columns)
+			{
+				$result = $this->sql_create_primary_key($table, $columns, true);
+
+				if ($sqlite)
+				{
+					$sqlite_data[$table]['primary_key'] = $result;
+				}
+				else if ($this->return_statements)
+				{
+					$statements = array_merge($statements, $result);
+				}
+			}
+		}
+
+		// Add unqiue indexes?
+		if (!empty($schema_changes['add_unique_index']))
+		{
+			foreach ($schema_changes['add_unique_index'] as $table => $index_array)
+			{
+				foreach ($index_array as $index_name => $column)
+				{
+					if ($this->sql_unique_index_exists($table, $index_name))
+					{
+						continue;
+					}
+
+					$result = $this->sql_create_unique_index($table, $index_name, $column);
+
+					if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
+		// Add indexes?
+		if (!empty($schema_changes['add_index']))
+		{
+			foreach ($schema_changes['add_index'] as $table => $index_array)
+			{
+				foreach ($index_array as $index_name => $column)
+				{
+					if ($this->sql_index_exists($table, $index_name))
+					{
+						continue;
+					}
+
+					$result = $this->sql_create_index($table, $index_name, $column);
+
+					if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
+		if ($sqlite)
+		{
+			foreach ($sqlite_data as $table_name => $sql_schema_changes)
+			{
+				// Create temporary table with original data
+				$statements[] = 'begin';
+
+				$sql = "SELECT sql
+					FROM sqlite_master
+					WHERE type = 'table'
+						AND name = '{$table_name}'
+					ORDER BY type DESC, name;";
+				$result = $this->db->sql_query($sql);
+
+				if (!$result)
+				{
+					continue;
+				}
+
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				// Create a backup table and populate it, destroy the existing one
+				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
+				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
+				$statements[] = 'DROP TABLE ' . $table_name;
+
+				// Get the columns...
+				preg_match('#\((.*)\)#s', $row['sql'], $matches);
+
+				$plain_table_cols = trim($matches[1]);
+				$new_table_cols = preg_split('/,(?![\s\w]+\))/m', $plain_table_cols);
+				$column_list = array();
+
+				foreach ($new_table_cols as $declaration)
+				{
+					$entities = preg_split('#\s+#', trim($declaration));
+					if ($entities[0] == 'PRIMARY')
+					{
+						continue;
+					}
+					$column_list[] = $entities[0];
+				}
+
+				// note down the primary key notation because sqlite only supports adding it to the end for the new table
+				$primary_key = false;
+				$_new_cols = array();
+
+				foreach ($new_table_cols as $key => $declaration)
+				{
+					$entities = preg_split('#\s+#', trim($declaration));
+					if ($entities[0] == 'PRIMARY')
+					{
+						$primary_key = $declaration;
+						continue;
+					}
+					$_new_cols[] = $declaration;
+				}
+
+				$new_table_cols = $_new_cols;
+
+				// First of all... change columns
+				if (!empty($sql_schema_changes['change_columns']))
+				{
+					foreach ($sql_schema_changes['change_columns'] as $column_sql)
+					{
+						foreach ($new_table_cols as $key => $declaration)
+						{
+							$entities = preg_split('#\s+#', trim($declaration));
+							if (strpos($column_sql, $entities[0] . ' ') === 0)
+							{
+								$new_table_cols[$key] = $column_sql;
+							}
+						}
+					}
+				}
+
+				if (!empty($sql_schema_changes['add_columns']))
+				{
+					foreach ($sql_schema_changes['add_columns'] as $column_sql)
+					{
+						$new_table_cols[] = $column_sql;
+					}
+				}
+
+				// Now drop them...
+				if (!empty($sql_schema_changes['drop_columns']))
+				{
+					foreach ($sql_schema_changes['drop_columns'] as $column_name)
+					{
+						// Remove from column list...
+						$new_column_list = array();
+						foreach ($column_list as $key => $value)
+						{
+							if ($value === $column_name)
+							{
+								continue;
+							}
+
+							$new_column_list[] = $value;
+						}
+
+						$column_list = $new_column_list;
+
+						// Remove from table...
+						$_new_cols = array();
+						foreach ($new_table_cols as $key => $declaration)
+						{
+							$entities = preg_split('#\s+#', trim($declaration));
+							if (strpos($column_name . ' ', $entities[0] . ' ') === 0)
+							{
+								continue;
+							}
+							$_new_cols[] = $declaration;
+						}
+						$new_table_cols = $_new_cols;
+					}
+				}
+
+				// Primary key...
+				if (!empty($sql_schema_changes['primary_key']))
+				{
+					$new_table_cols[] = 'PRIMARY KEY (' . implode(', ', $sql_schema_changes['primary_key']) . ')';
+				}
+				// Add a new one or the old primary key
+				else if ($primary_key !== false)
+				{
+					$new_table_cols[] = $primary_key;
+				}
+
+				$columns = implode(',', $column_list);
+
+				// create a new table and fill it up. destroy the temp one
+				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $new_table_cols) . ');';
+				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
+				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+
+				$statements[] = 'commit';
+			}
+		}
+
+		if ($this->return_statements)
+		{
+			return $statements;
+		}
+	}
+
+	/**
+	* Gets a list of columns of a table.
+	*
+	* @param string $table		Table name
+	*
+	* @return array				Array of column names (all lower case)
+	*/
+	function sql_list_columns($table)
+	{
+		$columns = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'mysql_40':
+			case 'mysql_41':
+				$sql = "SHOW COLUMNS FROM $table";
+			break;
+
+			// PostgreSQL has a way of doing this in a much simpler way but would
+			// not allow us to support all versions of PostgreSQL
+			case 'postgres':
+				$sql = "SELECT a.attname
+					FROM pg_class c, pg_attribute a
+					WHERE c.relname = '{$table}'
+						AND a.attnum > 0
+						AND a.attrelid = c.oid";
+			break;
+
+			// same deal with PostgreSQL, we must perform more complex operations than
+			// we technically could
+			case 'mssql':
+			case 'mssqlnative':
+				$sql = "SELECT c.name
+					FROM syscolumns c
+					LEFT JOIN sysobjects o ON c.id = o.id
+					WHERE o.name = '{$table}'";
+			break;
+
+			case 'oracle':
+				$sql = "SELECT column_name
+					FROM user_tab_columns
+					WHERE LOWER(table_name) = '" . strtolower($table) . "'";
+			break;
+
+			case 'firebird':
+				$sql = "SELECT RDB\$FIELD_NAME as FNAME
+					FROM RDB\$RELATION_FIELDS
+					WHERE RDB\$RELATION_NAME = '" . strtoupper($table) . "'";
+			break;
+
+			case 'sqlite':
+				$sql = "SELECT sql
+					FROM sqlite_master
+					WHERE type = 'table'
+						AND name = '{$table}'";
+
+				$result = $this->db->sql_query($sql);
+
+				if (!$result)
+				{
+					return false;
+				}
+
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				preg_match('#\((.*)\)#s', $row['sql'], $matches);
+
+				$cols = trim($matches[1]);
+				$col_array = preg_split('/,(?![\s\w]+\))/m', $cols);
+
+				foreach ($col_array as $declaration)
+				{
+					$entities = preg_split('#\s+#', trim($declaration));
+					if ($entities[0] == 'PRIMARY')
+					{
+						continue;
+					}
+
+					$column = strtolower($entities[0]);
+					$columns[$column] = $column;
+				}
+
+				return $columns;
+			break;
+		}
+
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$column = strtolower(current($row));
+			$columns[$column] = $column;
+		}
+		$this->db->sql_freeresult($result);
+
+		return $columns;
+	}
+
+	/**
+	* Check whether a specified column exist in a table
+	*
+	* @param string	$table			Table to check
+	* @param string	$column_name	Column to check
+	*
+	* @return bool		True if column exists, false otherwise
+	*/
+	function sql_column_exists($table, $column_name)
+	{
+		$columns = $this->sql_list_columns($table);
+
+		return isset($columns[$column_name]);
+	}
+
+	/**
+	* Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
+	*
+	* @param string	$table_name		Table to check the index at
+	* @param string	$index_name		The index name to check
+	*
+	* @return bool True if index exists, else false
+	*/
+	function sql_index_exists($table_name, $index_name)
+	{
+		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
+		{
+			$sql = "EXEC sp_statistics '$table_name'";
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if ($row['TYPE'] == 3)
+				{
+					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
+					{
+						$this->db->sql_freeresult($result);
+						return true;
+					}
+				}
+			}
+			$this->db->sql_freeresult($result);
+
+			return false;
+		}
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
+					FROM RDB\$INDICES
+					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
+						AND RDB\$UNIQUE_FLAG IS NULL
+						AND RDB\$FOREIGN_KEY IS NULL";
+				$col = 'index_name';
+			break;
+
+			case 'postgres':
+				$sql = "SELECT ic.relname as index_name
+					FROM pg_class bc, pg_class ic, pg_index i
+					WHERE (bc.oid = i.indrelid)
+						AND (ic.oid = i.indexrelid)
+						AND (bc.relname = '" . $table_name . "')
+						AND (i.indisunique != 't')
+						AND (i.indisprimary != 't')";
+				$col = 'index_name';
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$sql = 'SHOW KEYS
+					FROM ' . $table_name;
+				$col = 'Key_name';
+			break;
+
+			case 'oracle':
+				$sql = "SELECT index_name
+					FROM user_indexes
+					WHERE table_name = '" . strtoupper($table_name) . "'
+						AND generated = 'N'
+						AND uniqueness = 'NONUNIQUE'";
+				$col = 'index_name';
+			break;
+
+			case 'sqlite':
+				$sql = "PRAGMA index_list('" . $table_name . "');";
+				$col = 'name';
+			break;
+		}
+
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
+			{
+				continue;
+			}
+
+			// These DBMS prefix index name with the table name
+			switch ($this->sql_layer)
+			{
+				case 'firebird':
+				case 'oracle':
+				case 'postgres':
+				case 'sqlite':
+					$row[$col] = substr($row[$col], strlen($table_name) + 1);
+				break;
+			}
+
+			if (strtolower($row[$col]) == strtolower($index_name))
+			{
+				$this->db->sql_freeresult($result);
+				return true;
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		return false;
+	}
+
+	/**
+	* Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
+	*
+	* @param string	$table_name		Table to check the index at
+	* @param string	$index_name		The index name to check
+	*
+	* @return bool True if index exists, else false
+	*/
+	function sql_unique_index_exists($table_name, $index_name)
+	{
+		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
+		{
+			$sql = "EXEC sp_statistics '$table_name'";
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				// Usually NON_UNIQUE is the column we want to check, but we allow for both
+				if ($row['TYPE'] == 3)
+				{
+					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
+					{
+						$this->db->sql_freeresult($result);
+						return true;
+					}
+				}
+			}
+			$this->db->sql_freeresult($result);
+			return false;
+		}
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
+					FROM RDB\$INDICES
+					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
+						AND RDB\$UNIQUE_FLAG IS NOT NULL
+						AND RDB\$FOREIGN_KEY IS NULL";
+				$col = 'index_name';
+			break;
+
+			case 'postgres':
+				$sql = "SELECT ic.relname as index_name, i.indisunique
+					FROM pg_class bc, pg_class ic, pg_index i
+					WHERE (bc.oid = i.indrelid)
+						AND (ic.oid = i.indexrelid)
+						AND (bc.relname = '" . $table_name . "')
+						AND (i.indisprimary != 't')";
+				$col = 'index_name';
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$sql = 'SHOW KEYS
+					FROM ' . $table_name;
+				$col = 'Key_name';
+			break;
+
+			case 'oracle':
+				$sql = "SELECT index_name, table_owner
+					FROM user_indexes
+					WHERE table_name = '" . strtoupper($table_name) . "'
+						AND generated = 'N'
+						AND uniqueness = 'UNIQUE'";
+				$col = 'index_name';
+			break;
+
+			case 'sqlite':
+				$sql = "PRAGMA index_list('" . $table_name . "');";
+				$col = 'name';
+			break;
+		}
+
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && ($row['Non_unique'] || $row[$col] == 'PRIMARY'))
+			{
+				continue;
+			}
+
+			if ($this->sql_layer == 'sqlite' && !$row['unique'])
+			{
+				continue;
+			}
+
+			if ($this->sql_layer == 'postgres' && $row['indisunique'] != 't')
+			{
+				continue;
+			}
+
+			// These DBMS prefix index name with the table name
+			switch ($this->sql_layer)
+			{
+				case 'oracle':
+					// Two cases here... prefixed with U_[table_owner] and not prefixed with table_name
+					if (strpos($row[$col], 'U_') === 0)
+					{
+						$row[$col] = substr($row[$col], strlen('U_' . $row['table_owner']) + 1);
+					}
+					else if (strpos($row[$col], strtoupper($table_name)) === 0)
+					{
+						$row[$col] = substr($row[$col], strlen($table_name) + 1);
+					}
+				break;
+
+				case 'firebird':
+				case 'postgres':
+				case 'sqlite':
+					$row[$col] = substr($row[$col], strlen($table_name) + 1);
+				break;
+			}
+
+			if (strtolower($row[$col]) == strtolower($index_name))
+			{
+				$this->db->sql_freeresult($result);
+				return true;
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		return false;
+	}
+
+	/**
+	* Private method for performing sql statements (either execute them or return them)
+	* @access private
+	*/
+	function _sql_run_sql($statements)
+	{
+		if ($this->return_statements)
+		{
+			return $statements;
+		}
+
+		// We could add error handling here...
+		foreach ($statements as $sql)
+		{
+			if ($sql === 'begin')
+			{
+				$this->db->sql_transaction('begin');
+			}
+			else if ($sql === 'commit')
+			{
+				$this->db->sql_transaction('commit');
+			}
+			else
+			{
+				$this->db->sql_query($sql);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	* Function to prepare some column information for better usage
+	* @access private
+	*/
+	function sql_prepare_column_data($table_name, $column_name, $column_data)
+	{
+		if (strlen($column_name) > 30)
+		{
+			trigger_error("Column name '$column_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
+		}
+
+		// Get type
+		if (strpos($column_data[0], ':') !== false)
+		{
+			list($orig_column_type, $column_length) = explode(':', $column_data[0]);
+			if (!is_array($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']))
+			{
+				$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'], $column_length);
+			}
+			else
+			{
+				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule']))
+				{
+					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][0])
+					{
+						case 'div':
+							$column_length /= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][1];
+							$column_length = ceil($column_length);
+							$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
+						break;
+					}
+				}
+
+				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit']))
+				{
+					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][0])
+					{
+						case 'mult':
+							$column_length *= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][1];
+							if ($column_length > $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][2])
+							{
+								$column_type = $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][3];
+							}
+							else
+							{
+								$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
+							}
+						break;
+					}
+				}
+			}
+			$orig_column_type .= ':';
+		}
+		else
+		{
+			$orig_column_type = $column_data[0];
+			$column_type = $this->dbms_type_map[$this->sql_layer][$column_data[0]];
+		}
+
+		// Adjust default value if db-dependent specified
+		if (is_array($column_data[1]))
+		{
+			$column_data[1] = (isset($column_data[1][$this->sql_layer])) ? $column_data[1][$this->sql_layer] : $column_data[1]['default'];
+		}
+
+		$sql = '';
+
+		$return_array = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$sql .= " {$column_type} ";
+				$return_array['column_type_sql_type'] = " {$column_type} ";
+
+				if (!is_null($column_data[1]))
+				{
+					$sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
+					$return_array['column_type_sql_default'] = ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
+				}
+
+				$sql .= 'NOT NULL';
+
+				// This is a UNICODE column and thus should be given it's fair share
+				if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0]))
+				{
+					$sql .= ' COLLATE UNICODE';
+				}
+
+				$return_array['auto_increment'] = false;
+				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+				{
+					$return_array['auto_increment'] = true;
+				}
+
+			break;
+
+			case 'mssql':
+			case 'mssqlnative':
+				$sql .= " {$column_type} ";
+				$sql_default = " {$column_type} ";
+
+				// For adding columns we need the default definition
+				if (!is_null($column_data[1]))
+				{
+					// For hexadecimal values do not use single quotes
+					if (strpos($column_data[1], '0x') === 0)
+					{
+						$return_array['default'] = 'DEFAULT (' . $column_data[1] . ') ';
+						$sql_default .= $return_array['default'];
+					}
+					else
+					{
+						$return_array['default'] = 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
+						$sql_default .= $return_array['default'];
+					}
+				}
+
+				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+				{
+//					$sql .= 'IDENTITY (1, 1) ';
+					$sql_default .= 'IDENTITY (1, 1) ';
+				}
+
+				$return_array['textimage'] = $column_type === '[text]';
+
+				$sql .= 'NOT NULL';
+				$sql_default .= 'NOT NULL';
+
+				$return_array['column_type_sql_default'] = $sql_default;
+
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$sql .= " {$column_type} ";
+
+				// For hexadecimal values do not use single quotes
+				if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
+				{
+					$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
+				}
+				$sql .= 'NOT NULL';
+
+				if (isset($column_data[2]))
+				{
+					if ($column_data[2] == 'auto_increment')
+					{
+						$sql .= ' auto_increment';
+					}
+					else if ($this->sql_layer === 'mysql_41' && $column_data[2] == 'true_sort')
+					{
+						$sql .= ' COLLATE utf8_unicode_ci';
+					}
+				}
+
+			break;
+
+			case 'oracle':
+				$sql .= " {$column_type} ";
+				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
+
+				// In Oracle empty strings ('') are treated as NULL.
+				// Therefore in oracle we allow NULL's for all DEFAULT '' entries
+				// Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields)
+				if (!preg_match('/number/i', $column_type))
+				{
+					$sql .= ($column_data[1] === '') ? '' : 'NOT NULL';
+				}
+
+				$return_array['auto_increment'] = false;
+				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+				{
+					$return_array['auto_increment'] = true;
+				}
+
+			break;
+
+			case 'postgres':
+				$return_array['column_type'] = $column_type;
+
+				$sql .= " {$column_type} ";
+
+				$return_array['auto_increment'] = false;
+				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+				{
+					$default_val = "nextval('{$table_name}_seq')";
+					$return_array['auto_increment'] = true;
+				}
+				else if (!is_null($column_data[1]))
+				{
+					$default_val = "'" . $column_data[1] . "'";
+					$return_array['null'] = 'NOT NULL';
+					$sql .= 'NOT NULL ';
+				}
+
+				$return_array['default'] = $default_val;
+
+				$sql .= "DEFAULT {$default_val}";
+
+				// Unsigned? Then add a CHECK contraint
+				if (in_array($orig_column_type, $this->unsigned_types))
+				{
+					$return_array['constraint'] = "CHECK ({$column_name} >= 0)";
+					$sql .= " CHECK ({$column_name} >= 0)";
+				}
+
+			break;
+
+			case 'sqlite':
+				$return_array['primary_key_set'] = false;
+				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+				{
+					$sql .= ' INTEGER PRIMARY KEY';
+					$return_array['primary_key_set'] = true;
+				}
+				else
+				{
+					$sql .= ' ' . $column_type;
+				}
+
+				$sql .= ' NOT NULL ';
+				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
+
+			break;
+		}
+
+		$return_array['column_type_sql'] = $sql;
+
+		return $return_array;
+	}
+
+	/**
+	* Add new column
+	*/
+	function sql_column_add($table_name, $column_name, $column_data, $inline = false)
+	{
+		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				// Does not support AFTER statement, only POSITION (and there you need the column position)
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD "' . strtoupper($column_name) . '" ' . $column_data['column_type_sql'];
+			break;
+
+			case 'mssql':
+			case 'mssqlnative':
+				// Does not support AFTER, only through temporary table
+				$statements[] = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default'];
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$after = (!empty($column_data['after'])) ? ' AFTER ' . $column_data['after'] : '';
+				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'] . $after;
+			break;
+
+			case 'oracle':
+				// Does not support AFTER, only through temporary table
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
+			break;
+
+			case 'postgres':
+				// Does not support AFTER, only through temporary table
+				if (version_compare($this->db->sql_server_info(true), '8.0', '>='))
+				{
+					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql'];
+				}
+				else
+				{
+					// old versions cannot add columns with default and null information
+					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type'] . ' ' . $column_data['constraint'];
+
+					if (isset($column_data['null']))
+					{
+						if ($column_data['null'] == 'NOT NULL')
+						{
+							$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET NOT NULL';
+						}
+					}
+
+					if (isset($column_data['default']))
+					{
+						$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
+					}
+				}
+
+			break;
+
+			case 'sqlite':
+
+				if ($inline && $this->return_statements)
+				{
+					return $column_name . ' ' . $column_data['column_type_sql'];
+				}
+
+				if (version_compare(sqlite_libversion(), '3.0') == -1)
+				{
+					$sql = "SELECT sql
+						FROM sqlite_master
+						WHERE type = 'table'
+							AND name = '{$table_name}'
+						ORDER BY type DESC, name;";
+					$result = $this->db->sql_query($sql);
+
+					if (!$result)
+					{
+						break;
+					}
+
+					$row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					$statements[] = 'begin';
+
+					// Create a backup table and populate it, destroy the existing one
+					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
+					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
+					$statements[] = 'DROP TABLE ' . $table_name;
+
+					preg_match('#\((.*)\)#s', $row['sql'], $matches);
+
+					$new_table_cols = trim($matches[1]);
+					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
+					$column_list = array();
+
+					foreach ($old_table_cols as $declaration)
+					{
+						$entities = preg_split('#\s+#', trim($declaration));
+						if ($entities[0] == 'PRIMARY')
+						{
+							continue;
+						}
+						$column_list[] = $entities[0];
+					}
+
+					$columns = implode(',', $column_list);
+
+					$new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols;
+
+					// create a new table and fill it up. destroy the temp one
+					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
+					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
+					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+
+					$statements[] = 'commit';
+				}
+				else
+				{
+					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' [' . $column_data['column_type_sql'] . ']';
+				}
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Drop column
+	*/
+	function sql_column_remove($table_name, $column_name, $inline = false)
+	{
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP "' . strtoupper($column_name) . '"';
+			break;
+
+			case 'mssql':
+			case 'mssqlnative':
+				// remove default cosntraints first
+				// http://msdn.microsoft.com/en-us/library/aa175912%28v=sql.80%29.aspx
+				$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000)
+					SET @drop_default_name =
+						(SELECT so.name FROM sysobjects so
+						JOIN sysconstraints sc ON so.id = sc.constid
+						WHERE object_name(so.parent_obj) = '{$table_name}'
+							AND so.xtype = 'D'
+							AND sc.colid = (SELECT colid FROM syscolumns
+								WHERE id = object_id('{$table_name}')
+									AND name = '{$column_name}'))
+					IF @drop_default_name <> ''
+					BEGIN
+						SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']'
+						EXEC(@cmd)
+					END";
+				$statements[] = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']';
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`';
+			break;
+
+			case 'oracle':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
+			break;
+
+			case 'postgres':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN "' . $column_name . '"';
+			break;
+
+			case 'sqlite':
+
+				if ($inline && $this->return_statements)
+				{
+					return $column_name;
+				}
+
+				if (version_compare(sqlite_libversion(), '3.0') == -1)
+				{
+					$sql = "SELECT sql
+						FROM sqlite_master
+						WHERE type = 'table'
+							AND name = '{$table_name}'
+						ORDER BY type DESC, name;";
+					$result = $this->db->sql_query($sql);
+
+					if (!$result)
+					{
+						break;
+					}
+
+					$row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					$statements[] = 'begin';
+
+					// Create a backup table and populate it, destroy the existing one
+					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
+					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
+					$statements[] = 'DROP TABLE ' . $table_name;
+
+					preg_match('#\((.*)\)#s', $row['sql'], $matches);
+
+					$new_table_cols = trim($matches[1]);
+					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
+					$column_list = array();
+
+					foreach ($old_table_cols as $declaration)
+					{
+						$entities = preg_split('#\s+#', trim($declaration));
+						if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name)
+						{
+							continue;
+						}
+						$column_list[] = $entities[0];
+					}
+
+					$columns = implode(',', $column_list);
+
+					$new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols);
+
+					// create a new table and fill it up. destroy the temp one
+					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
+					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
+					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+
+					$statements[] = 'commit';
+				}
+				else
+				{
+					$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
+				}
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Drop Index
+	*/
+	function sql_index_drop($table_name, $index_name)
+	{
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'mssql':
+			case 'mssqlnative':
+				$statements[] = 'DROP INDEX ' . $table_name . '.' . $index_name;
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'DROP INDEX ' . $index_name . ' ON ' . $table_name;
+			break;
+
+			case 'firebird':
+			case 'oracle':
+			case 'postgres':
+			case 'sqlite':
+				$statements[] = 'DROP INDEX ' . $table_name . '_' . $index_name;
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Drop Table
+	*/
+	function sql_table_drop($table_name)
+	{
+		$statements = array();
+
+		if (!$this->sql_table_exists($table_name))
+		{
+			return $this->_sql_run_sql($statements);
+		}
+
+		// the most basic operation, get rid of the table
+		$statements[] = 'DROP TABLE ' . $table_name;
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$sql = 'SELECT RDB$GENERATOR_NAME as gen
+					FROM RDB$GENERATORS
+					WHERE RDB$SYSTEM_FLAG = 0
+						AND RDB$GENERATOR_NAME = \'' . strtoupper($table_name) . "_GEN'";
+				$result = $this->db->sql_query($sql);
+
+				// does a generator exist?
+				if ($row = $this->db->sql_fetchrow($result))
+				{
+					$statements[] = "DROP GENERATOR {$row['gen']};";
+				}
+				$this->db->sql_freeresult($result);
+			break;
+
+			case 'oracle':
+				$sql = 'SELECT A.REFERENCED_NAME
+					FROM USER_DEPENDENCIES A, USER_TRIGGERS B
+					WHERE A.REFERENCED_TYPE = \'SEQUENCE\'
+						AND A.NAME = B.TRIGGER_NAME
+						AND B.TABLE_NAME = \'' . strtoupper($table_name) . "'";
+				$result = $this->db->sql_query($sql);
+
+				// any sequences ref'd to this table's triggers?
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$statements[] = "DROP SEQUENCE {$row['referenced_name']}";
+				}
+				$this->db->sql_freeresult($result);
+			break;
+
+			case 'postgres':
+				// PGSQL does not "tightly" bind sequences and tables, we must guess...
+				$sql = "SELECT relname
+					FROM pg_class
+					WHERE relkind = 'S'
+						AND relname = '{$table_name}_seq'";
+				$result = $this->db->sql_query($sql);
+
+				// We don't even care about storing the results. We already know the answer if we get rows back.
+				if ($this->db->sql_fetchrow($result))
+				{
+					$statements[] =  "DROP SEQUENCE {$table_name}_seq;\n";
+				}
+				$this->db->sql_freeresult($result);
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Add primary key
+	*/
+	function sql_create_primary_key($table_name, $column, $inline = false)
+	{
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+			case 'postgres':
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')';
+			break;
+
+			case 'mssql':
+			case 'mssqlnative':
+				$sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD ";
+				$sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED (";
+				$sql .= '[' . implode("],\n\t\t[", $column) . ']';
+				$sql .= ') ON [PRIMARY]';
+
+				$statements[] = $sql;
+			break;
+
+			case 'oracle':
+				$statements[] = 'ALTER TABLE ' . $table_name . 'add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')';
+			break;
+
+			case 'sqlite':
+
+				if ($inline && $this->return_statements)
+				{
+					return $column;
+				}
+
+				$sql = "SELECT sql
+					FROM sqlite_master
+					WHERE type = 'table'
+						AND name = '{$table_name}'
+					ORDER BY type DESC, name;";
+				$result = $this->db->sql_query($sql);
+
+				if (!$result)
+				{
+					break;
+				}
+
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				$statements[] = 'begin';
+
+				// Create a backup table and populate it, destroy the existing one
+				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
+				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
+				$statements[] = 'DROP TABLE ' . $table_name;
+
+				preg_match('#\((.*)\)#s', $row['sql'], $matches);
+
+				$new_table_cols = trim($matches[1]);
+				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
+				$column_list = array();
+
+				foreach ($old_table_cols as $declaration)
+				{
+					$entities = preg_split('#\s+#', trim($declaration));
+					if ($entities[0] == 'PRIMARY')
+					{
+						continue;
+					}
+					$column_list[] = $entities[0];
+				}
+
+				$columns = implode(',', $column_list);
+
+				// create a new table and fill it up. destroy the temp one
+				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));';
+				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
+				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+
+				$statements[] = 'commit';
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Add unique index
+	*/
+	function sql_create_unique_index($table_name, $index_name, $column)
+	{
+		$statements = array();
+
+		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
+		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
+		{
+			$max_length = strlen($table_prefix) + 24;
+			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
+		}
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+			case 'postgres':
+			case 'oracle':
+			case 'sqlite':
+				$statements[] = 'CREATE UNIQUE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD UNIQUE INDEX ' . $index_name . '(' . implode(', ', $column) . ')';
+			break;
+
+			case 'mssql':
+			case 'mssqlnative':
+				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Add index
+	*/
+	function sql_create_index($table_name, $index_name, $column)
+	{
+		$statements = array();
+
+		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
+		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
+		{
+			$max_length = strlen($table_prefix) + 24;
+			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
+		}
+
+		// remove index length unless MySQL4
+		if ('mysql_40' != $this->sql_layer)
+		{
+			$column = preg_replace('#:.*$#', '', $column);
+		}
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+			case 'postgres':
+			case 'oracle':
+			case 'sqlite':
+				$statements[] = 'CREATE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
+			break;
+
+			case 'mysql_40':
+				// add index size to definition as required by MySQL4
+				foreach ($column as $i => $col)
+				{
+					if (false !== strpos($col, ':'))
+					{
+						list($col, $index_size) = explode(':', $col);
+						$column[$i] = "$col($index_size)";
+					}
+				}
+			// no break
+			case 'mysql_41':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD INDEX ' . $index_name . '(' . implode(', ', $column) . ')';
+			break;
+
+			case 'mssql':
+			case 'mssqlnative':
+				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* List all of the indices that belong to a table,
+	* does not count:
+	* * UNIQUE indices
+	* * PRIMARY keys
+	*/
+	function sql_list_index($table_name)
+	{
+		$index_array = array();
+
+		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
+		{
+			$sql = "EXEC sp_statistics '$table_name'";
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if ($row['TYPE'] == 3)
+				{
+					$index_array[] = $row['INDEX_NAME'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+		else
+		{
+			switch ($this->sql_layer)
+			{
+				case 'firebird':
+					$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
+						FROM RDB\$INDICES
+						WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
+							AND RDB\$UNIQUE_FLAG IS NULL
+							AND RDB\$FOREIGN_KEY IS NULL";
+					$col = 'index_name';
+				break;
+
+				case 'postgres':
+					$sql = "SELECT ic.relname as index_name
+						FROM pg_class bc, pg_class ic, pg_index i
+						WHERE (bc.oid = i.indrelid)
+							AND (ic.oid = i.indexrelid)
+							AND (bc.relname = '" . $table_name . "')
+							AND (i.indisunique != 't')
+							AND (i.indisprimary != 't')";
+					$col = 'index_name';
+				break;
+
+				case 'mysql_40':
+				case 'mysql_41':
+					$sql = 'SHOW KEYS
+						FROM ' . $table_name;
+					$col = 'Key_name';
+				break;
+
+				case 'oracle':
+					$sql = "SELECT index_name
+						FROM user_indexes
+						WHERE table_name = '" . strtoupper($table_name) . "'
+							AND generated = 'N'
+							AND uniqueness = 'NONUNIQUE'";
+					$col = 'index_name';
+				break;
+
+				case 'sqlite':
+					$sql = "PRAGMA index_info('" . $table_name . "');";
+					$col = 'name';
+				break;
+			}
+
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
+				{
+					continue;
+				}
+
+				switch ($this->sql_layer)
+				{
+					case 'firebird':
+					case 'oracle':
+					case 'postgres':
+					case 'sqlite':
+						$row[$col] = substr($row[$col], strlen($table_name) + 1);
+					break;
+				}
+
+				$index_array[] = $row[$col];
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		return array_map('strtolower', $index_array);
+	}
+
+	/**
+	* Change column type (not name!)
+	*/
+	function sql_column_change($table_name, $column_name, $column_data, $inline = false)
+	{
+		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				// Change type...
+				if (!empty($column_data['column_type_sql_default']))
+				{
+					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
+					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" SET DEFAULT ' . ' ' . $column_data['column_type_sql_default'];
+				}
+				else
+				{
+					// TODO: try to change pkey without removing trigger, generator or constraints. ATM this query may fail.
+					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
+				}
+			break;
+
+			case 'mssql':
+			case 'mssqlnative':
+				$statements[] = 'ALTER TABLE [' . $table_name . '] ALTER COLUMN [' . $column_name . '] ' . $column_data['column_type_sql'];
+
+				if (!empty($column_data['default']))
+				{
+					// Using TRANSACT-SQL for this statement because we do not want to have colliding data if statements are executed at a later stage
+					$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000)
+						SET @drop_default_name =
+							(SELECT so.name FROM sysobjects so
+							JOIN sysconstraints sc ON so.id = sc.constid
+							WHERE object_name(so.parent_obj) = '{$table_name}'
+								AND so.xtype = 'D'
+								AND sc.colid = (SELECT colid FROM syscolumns
+									WHERE id = object_id('{$table_name}')
+										AND name = '{$column_name}'))
+						IF @drop_default_name <> ''
+						BEGIN
+							SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']'
+							EXEC(@cmd)
+						END
+						SET @cmd = 'ALTER TABLE [{$table_name}] ADD CONSTRAINT [DF_{$table_name}_{$column_name}_1] {$column_data['default']} FOR [{$column_name}]'
+						EXEC(@cmd)";
+				}
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'ALTER TABLE `' . $table_name . '` CHANGE `' . $column_name . '` `' . $column_name . '` ' . $column_data['column_type_sql'];
+			break;
+
+			case 'oracle':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' MODIFY ' . $column_name . ' ' . $column_data['column_type_sql'];
+			break;
+
+			case 'postgres':
+				$sql = 'ALTER TABLE ' . $table_name . ' ';
+
+				$sql_array = array();
+				$sql_array[] = 'ALTER COLUMN ' . $column_name . ' TYPE ' . $column_data['column_type'];
+
+				if (isset($column_data['null']))
+				{
+					if ($column_data['null'] == 'NOT NULL')
+					{
+						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET NOT NULL';
+					}
+					else if ($column_data['null'] == 'NULL')
+					{
+						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' DROP NOT NULL';
+					}
+				}
+
+				if (isset($column_data['default']))
+				{
+					$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
+				}
+
+				// we don't want to double up on constraints if we change different number data types
+				if (isset($column_data['constraint']))
+				{
+					$constraint_sql = "SELECT consrc as constraint_data
+								FROM pg_constraint, pg_class bc
+								WHERE conrelid = bc.oid
+									AND bc.relname = '{$table_name}'
+									AND NOT EXISTS (
+										SELECT *
+											FROM pg_constraint as c, pg_inherits as i
+											WHERE i.inhrelid = pg_constraint.conrelid
+												AND c.conname = pg_constraint.conname
+												AND c.consrc = pg_constraint.consrc
+												AND c.conrelid = i.inhparent
+									)";
+
+					$constraint_exists = false;
+
+					$result = $this->db->sql_query($constraint_sql);
+					while ($row = $this->db->sql_fetchrow($result))
+					{
+						if (trim($row['constraint_data']) == trim($column_data['constraint']))
+						{
+							$constraint_exists = true;
+							break;
+						}
+					}
+					$this->db->sql_freeresult($result);
+
+					if (!$constraint_exists)
+					{
+						$sql_array[] = 'ADD ' . $column_data['constraint'];
+					}
+				}
+
+				$sql .= implode(', ', $sql_array);
+
+				$statements[] = $sql;
+			break;
+
+			case 'sqlite':
+
+				if ($inline && $this->return_statements)
+				{
+					return $column_name . ' ' . $column_data['column_type_sql'];
+				}
+
+				$sql = "SELECT sql
+					FROM sqlite_master
+					WHERE type = 'table'
+						AND name = '{$table_name}'
+					ORDER BY type DESC, name;";
+				$result = $this->db->sql_query($sql);
+
+				if (!$result)
+				{
+					break;
+				}
+
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				$statements[] = 'begin';
+
+				// Create a temp table and populate it, destroy the existing one
+				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
+				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
+				$statements[] = 'DROP TABLE ' . $table_name;
+
+				preg_match('#\((.*)\)#s', $row['sql'], $matches);
+
+				$new_table_cols = trim($matches[1]);
+				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
+				$column_list = array();
+
+				foreach ($old_table_cols as $key => $declaration)
+				{
+					$entities = preg_split('#\s+#', trim($declaration));
+					$column_list[] = $entities[0];
+					if ($entities[0] == $column_name)
+					{
+						$old_table_cols[$key] = $column_name . ' ' . $column_data['column_type_sql'];
+					}
+				}
+
+				$columns = implode(',', $column_list);
+
+				// create a new table and fill it up. destroy the temp one
+				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');';
+				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
+				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+
+				$statements[] = 'commit';
+
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+}
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 8978e3fadd..bd0ffaaf00 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -184,12 +184,6 @@ function dbms_select($default = '', $only_20x_options = false)
 */
 function get_tables(&$db)
 {
-	if (!class_exists('phpbb_db_tools'))
-	{
-		global $phpbb_root_path, $phpEx;
-		require($phpbb_root_path . 'includes/db/db_tools.' . $phpEx);
-	}
-
 	$db_tools = new phpbb_db_tools($db);
 
 	return $db_tools->sql_list_tables();
-- 
cgit v1.2.1


From 131194d216f85dffe4fb9d8fd64eb15248fd374b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 14 Jul 2013 10:12:49 -0400
Subject: [ticket/11696] Rename constructor to __construct()

PHPBB3-11696
---
 phpBB/includes/db/tools.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/tools.php b/phpBB/includes/db/tools.php
index 983cdc18ea..492284ffcd 100644
--- a/phpBB/includes/db/tools.php
+++ b/phpBB/includes/db/tools.php
@@ -303,7 +303,7 @@ class phpbb_db_tools
 	* @param phpbb_db_driver	$db					Database connection
 	* @param bool		$return_statements	True if only statements should be returned and no SQL being executed
 	*/
-	function phpbb_db_tools(phpbb_db_driver $db, $return_statements = false)
+	public function __construct(phpbb_db_driver $db, $return_statements = false)
 	{
 		$this->db = $db;
 		$this->return_statements = $return_statements;
-- 
cgit v1.2.1


From f302cbe175e99f90448458f44a499eeb33f75261 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 14 Jul 2013 10:16:15 -0400
Subject: [ticket/11696] Move file to new directory

PHPBB3-11696
---
 phpBB/includes/db/tools.php | 2486 -------------------------------------------
 1 file changed, 2486 deletions(-)
 delete mode 100644 phpBB/includes/db/tools.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/tools.php b/phpBB/includes/db/tools.php
deleted file mode 100644
index 492284ffcd..0000000000
--- a/phpBB/includes/db/tools.php
+++ /dev/null
@@ -1,2486 +0,0 @@
-<?php
-/**
-*
-* @package dbal
-* @copyright (c) 2007 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* Database Tools for handling cross-db actions such as altering columns, etc.
-* Currently not supported is returning SQL for creating tables.
-*
-* @package dbal
-*/
-class phpbb_db_tools
-{
-	/**
-	* Current sql layer
-	*/
-	var $sql_layer = '';
-
-	/**
-	* @var object DB object
-	*/
-	var $db = NULL;
-
-	/**
-	* The Column types for every database we support
-	* @var array
-	*/
-	var $dbms_type_map = array(
-		'mysql_41'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'smallint(4) UNSIGNED',
-			'BOOL'		=> 'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'text',
-			'XSTEXT_UNI'=> 'varchar(100)',
-			'STEXT'		=> 'text',
-			'STEXT_UNI'	=> 'varchar(255)',
-			'TEXT'		=> 'text',
-			'TEXT_UNI'	=> 'text',
-			'MTEXT'		=> 'mediumtext',
-			'MTEXT_UNI'	=> 'mediumtext',
-			'TIMESTAMP'	=> 'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar(255)',
-			'VARBINARY'	=> 'varbinary(255)',
-		),
-
-		'mysql_40'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'smallint(4) UNSIGNED',
-			'BOOL'		=> 'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varbinary(255)',
-			'VCHAR:'	=> 'varbinary(%d)',
-			'CHAR:'		=> 'binary(%d)',
-			'XSTEXT'	=> 'blob',
-			'XSTEXT_UNI'=> 'blob',
-			'STEXT'		=> 'blob',
-			'STEXT_UNI'	=> 'blob',
-			'TEXT'		=> 'blob',
-			'TEXT_UNI'	=> 'blob',
-			'MTEXT'		=> 'mediumblob',
-			'MTEXT_UNI'	=> 'mediumblob',
-			'TIMESTAMP'	=> 'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'blob',
-			'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')),
-			'VCHAR_CI'	=> 'blob',
-			'VARBINARY'	=> 'varbinary(255)',
-		),
-
-		'firebird'	=> array(
-			'INT:'		=> 'INTEGER',
-			'BINT'		=> 'DOUBLE PRECISION',
-			'UINT'		=> 'INTEGER',
-			'UINT:'		=> 'INTEGER',
-			'TINT:'		=> 'INTEGER',
-			'USINT'		=> 'INTEGER',
-			'BOOL'		=> 'INTEGER',
-			'VCHAR'		=> 'VARCHAR(255) CHARACTER SET NONE',
-			'VCHAR:'	=> 'VARCHAR(%d) CHARACTER SET NONE',
-			'CHAR:'		=> 'CHAR(%d) CHARACTER SET NONE',
-			'XSTEXT'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'STEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'TEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'MTEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8',
-			'STEXT_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'TEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-			'MTEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-			'TIMESTAMP'	=> 'INTEGER',
-			'DECIMAL'	=> 'DOUBLE PRECISION',
-			'DECIMAL:'	=> 'DOUBLE PRECISION',
-			'PDECIMAL'	=> 'DOUBLE PRECISION',
-			'PDECIMAL:'	=> 'DOUBLE PRECISION',
-			'VCHAR_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8',
-			'VCHAR_CI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'VARBINARY'	=> 'CHAR(255) CHARACTER SET NONE',
-		),
-
-		'mssql'		=> array(
-			'INT:'		=> '[int]',
-			'BINT'		=> '[float]',
-			'UINT'		=> '[int]',
-			'UINT:'		=> '[int]',
-			'TINT:'		=> '[int]',
-			'USINT'		=> '[int]',
-			'BOOL'		=> '[int]',
-			'VCHAR'		=> '[varchar] (255)',
-			'VCHAR:'	=> '[varchar] (%d)',
-			'CHAR:'		=> '[char] (%d)',
-			'XSTEXT'	=> '[varchar] (1000)',
-			'STEXT'		=> '[varchar] (3000)',
-			'TEXT'		=> '[varchar] (8000)',
-			'MTEXT'		=> '[text]',
-			'XSTEXT_UNI'=> '[varchar] (100)',
-			'STEXT_UNI'	=> '[varchar] (255)',
-			'TEXT_UNI'	=> '[varchar] (4000)',
-			'MTEXT_UNI'	=> '[text]',
-			'TIMESTAMP'	=> '[int]',
-			'DECIMAL'	=> '[float]',
-			'DECIMAL:'	=> '[float]',
-			'PDECIMAL'	=> '[float]',
-			'PDECIMAL:'	=> '[float]',
-			'VCHAR_UNI'	=> '[varchar] (255)',
-			'VCHAR_UNI:'=> '[varchar] (%d)',
-			'VCHAR_CI'	=> '[varchar] (255)',
-			'VARBINARY'	=> '[varchar] (255)',
-		),
-
-		'mssqlnative'	=> array(
-			'INT:'		=> '[int]',
-			'BINT'		=> '[float]',
-			'UINT'		=> '[int]',
-			'UINT:'		=> '[int]',
-			'TINT:'		=> '[int]',
-			'USINT'		=> '[int]',
-			'BOOL'		=> '[int]',
-			'VCHAR'		=> '[varchar] (255)',
-			'VCHAR:'	=> '[varchar] (%d)',
-			'CHAR:'		=> '[char] (%d)',
-			'XSTEXT'	=> '[varchar] (1000)',
-			'STEXT'		=> '[varchar] (3000)',
-			'TEXT'		=> '[varchar] (8000)',
-			'MTEXT'		=> '[text]',
-			'XSTEXT_UNI'=> '[varchar] (100)',
-			'STEXT_UNI'	=> '[varchar] (255)',
-			'TEXT_UNI'	=> '[varchar] (4000)',
-			'MTEXT_UNI'	=> '[text]',
-			'TIMESTAMP'	=> '[int]',
-			'DECIMAL'	=> '[float]',
-			'DECIMAL:'	=> '[float]',
-			'PDECIMAL'	=> '[float]',
-			'PDECIMAL:'	=> '[float]',
-			'VCHAR_UNI'	=> '[varchar] (255)',
-			'VCHAR_UNI:'=> '[varchar] (%d)',
-			'VCHAR_CI'	=> '[varchar] (255)',
-			'VARBINARY'	=> '[varchar] (255)',
-		),
-
-		'oracle'	=> array(
-			'INT:'		=> 'number(%d)',
-			'BINT'		=> 'number(20)',
-			'UINT'		=> 'number(8)',
-			'UINT:'		=> 'number(%d)',
-			'TINT:'		=> 'number(%d)',
-			'USINT'		=> 'number(4)',
-			'BOOL'		=> 'number(1)',
-			'VCHAR'		=> 'varchar2(255)',
-			'VCHAR:'	=> 'varchar2(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'varchar2(1000)',
-			'STEXT'		=> 'varchar2(3000)',
-			'TEXT'		=> 'clob',
-			'MTEXT'		=> 'clob',
-			'XSTEXT_UNI'=> 'varchar2(300)',
-			'STEXT_UNI'	=> 'varchar2(765)',
-			'TEXT_UNI'	=> 'clob',
-			'MTEXT_UNI'	=> 'clob',
-			'TIMESTAMP'	=> 'number(11)',
-			'DECIMAL'	=> 'number(5, 2)',
-			'DECIMAL:'	=> 'number(%d, 2)',
-			'PDECIMAL'	=> 'number(6, 3)',
-			'PDECIMAL:'	=> 'number(%d, 3)',
-			'VCHAR_UNI'	=> 'varchar2(765)',
-			'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')),
-			'VCHAR_CI'	=> 'varchar2(255)',
-			'VARBINARY'	=> 'raw(255)',
-		),
-
-		'sqlite'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED',
-			'BOOL'		=> 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'text(65535)',
-			'STEXT'		=> 'text(65535)',
-			'TEXT'		=> 'text(65535)',
-			'MTEXT'		=> 'mediumtext(16777215)',
-			'XSTEXT_UNI'=> 'text(65535)',
-			'STEXT_UNI'	=> 'text(65535)',
-			'TEXT_UNI'	=> 'text(65535)',
-			'MTEXT_UNI'	=> 'mediumtext(16777215)',
-			'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar(255)',
-			'VARBINARY'	=> 'blob',
-		),
-
-		'postgres'	=> array(
-			'INT:'		=> 'INT4',
-			'BINT'		=> 'INT8',
-			'UINT'		=> 'INT4', // unsigned
-			'UINT:'		=> 'INT4', // unsigned
-			'USINT'		=> 'INT2', // unsigned
-			'BOOL'		=> 'INT2', // unsigned
-			'TINT:'		=> 'INT2',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'varchar(1000)',
-			'STEXT'		=> 'varchar(3000)',
-			'TEXT'		=> 'varchar(8000)',
-			'MTEXT'		=> 'TEXT',
-			'XSTEXT_UNI'=> 'varchar(100)',
-			'STEXT_UNI'	=> 'varchar(255)',
-			'TEXT_UNI'	=> 'varchar(4000)',
-			'MTEXT_UNI'	=> 'TEXT',
-			'TIMESTAMP'	=> 'INT4', // unsigned
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar_ci',
-			'VARBINARY'	=> 'bytea',
-		),
-	);
-
-	/**
-	* A list of types being unsigned for better reference in some db's
-	* @var array
-	*/
-	var $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
-
-	/**
-	* A list of supported DBMS. We change this class to support more DBMS, the DBMS itself only need to follow some rules.
-	* @var array
-	*/
-	var $supported_dbms = array('firebird', 'mssql', 'mssqlnative', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite');
-
-	/**
-	* This is set to true if user only wants to return the 'to-be-executed' SQL statement(s) (as an array).
-	* This mode has no effect on some methods (inserting of data for example). This is expressed within the methods command.
-	*/
-	var $return_statements = false;
-
-	/**
-	* Constructor. Set DB Object and set {@link $return_statements return_statements}.
-	*
-	* @param phpbb_db_driver	$db					Database connection
-	* @param bool		$return_statements	True if only statements should be returned and no SQL being executed
-	*/
-	public function __construct(phpbb_db_driver $db, $return_statements = false)
-	{
-		$this->db = $db;
-		$this->return_statements = $return_statements;
-
-		// Determine mapping database type
-		switch ($this->db->sql_layer)
-		{
-			case 'mysql':
-				$this->sql_layer = 'mysql_40';
-			break;
-
-			case 'mysql4':
-				if (version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
-				{
-					$this->sql_layer = 'mysql_41';
-				}
-				else
-				{
-					$this->sql_layer = 'mysql_40';
-				}
-			break;
-
-			case 'mysqli':
-				$this->sql_layer = 'mysql_41';
-			break;
-
-			case 'mssql':
-			case 'mssql_odbc':
-				$this->sql_layer = 'mssql';
-			break;
-
-			case 'mssqlnative':
-				$this->sql_layer = 'mssqlnative';
-			break;
-
-			default:
-				$this->sql_layer = $this->db->sql_layer;
-			break;
-		}
-	}
-
-	/**
-	* Setter for {@link $return_statements return_statements}.
-	*
-	* @param bool $return_statements True if SQL should not be executed but returned as strings
-	* @return null
-	*/
-	public function set_return_statements($return_statements)
-	{
-		$this->return_statements = $return_statements;
-	}
-
-	/**
-	* Gets a list of tables in the database.
-	*
-	* @return array		Array of table names  (all lower case)
-	*/
-	function sql_list_tables()
-	{
-		switch ($this->db->sql_layer)
-		{
-			case 'mysql':
-			case 'mysql4':
-			case 'mysqli':
-				$sql = 'SHOW TABLES';
-			break;
-
-			case 'sqlite':
-				$sql = 'SELECT name
-					FROM sqlite_master
-					WHERE type = "table"';
-			break;
-
-			case 'mssql':
-			case 'mssql_odbc':
-			case 'mssqlnative':
-				$sql = "SELECT name
-					FROM sysobjects
-					WHERE type='U'";
-			break;
-
-			case 'postgres':
-				$sql = 'SELECT relname
-					FROM pg_stat_user_tables';
-			break;
-
-			case 'firebird':
-				$sql = 'SELECT rdb$relation_name
-					FROM rdb$relations
-					WHERE rdb$view_source is null
-						AND rdb$system_flag = 0';
-			break;
-
-			case 'oracle':
-				$sql = 'SELECT table_name
-					FROM USER_TABLES';
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-
-		$tables = array();
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$name = current($row);
-			$tables[$name] = $name;
-		}
-		$this->db->sql_freeresult($result);
-
-		return $tables;
-	}
-
-	/**
-	* Check if table exists
-	*
-	*
-	* @param string	$table_name	The table name to check for
-	* @return bool true if table exists, else false
-	*/
-	function sql_table_exists($table_name)
-	{
-		$this->db->sql_return_on_error(true);
-		$result = $this->db->sql_query_limit('SELECT * FROM ' . $table_name, 1);
-		$this->db->sql_return_on_error(false);
-
-		if ($result)
-		{
-			$this->db->sql_freeresult($result);
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Create SQL Table
-	*
-	* @param string	$table_name	The table name to create
-	* @param array	$table_data	Array containing table data.
-	* @return array	Statements if $return_statements is true.
-	*/
-	function sql_create_table($table_name, $table_data)
-	{
-		// holds the DDL for a column
-		$columns = $statements = array();
-
-		if ($this->sql_table_exists($table_name))
-		{
-			return $this->_sql_run_sql($statements);
-		}
-
-		// Begin transaction
-		$statements[] = 'begin';
-
-		// Determine if we have created a PRIMARY KEY in the earliest
-		$primary_key_gen = false;
-
-		// Determine if the table must be created with TEXTIMAGE
-		$create_textimage = false;
-
-		// Determine if the table requires a sequence
-		$create_sequence = false;
-
-		// Begin table sql statement
-		switch ($this->sql_layer)
-		{
-			case 'mssql':
-			case 'mssqlnative':
-				$table_sql = 'CREATE TABLE [' . $table_name . '] (' . "\n";
-			break;
-
-			default:
-				$table_sql = 'CREATE TABLE ' . $table_name . ' (' . "\n";
-			break;
-		}
-
-		// Iterate through the columns to create a table
-		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
-		{
-			// here lies an array, filled with information compiled on the column's data
-			$prepared_column = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-
-			if (isset($prepared_column['auto_increment']) && strlen($column_name) > 26) // "${column_name}_gen"
-			{
-				trigger_error("Index name '${column_name}_gen' on table '$table_name' is too long. The maximum auto increment column length is 26 characters.", E_USER_ERROR);
-			}
-
-			// here we add the definition of the new column to the list of columns
-			switch ($this->sql_layer)
-			{
-				case 'mssql':
-				case 'mssqlnative':
-					$columns[] = "\t [{$column_name}] " . $prepared_column['column_type_sql_default'];
-				break;
-
-				default:
-					$columns[] = "\t {$column_name} " . $prepared_column['column_type_sql'];
-				break;
-			}
-
-			// see if we have found a primary key set due to a column definition if we have found it, we can stop looking
-			if (!$primary_key_gen)
-			{
-				$primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set'];
-			}
-
-			// create textimage DDL based off of the existance of certain column types
-			if (!$create_textimage)
-			{
-				$create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage'];
-			}
-
-			// create sequence DDL based off of the existance of auto incrementing columns
-			if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment'])
-			{
-				$create_sequence = $column_name;
-			}
-		}
-
-		// this makes up all the columns in the create table statement
-		$table_sql .= implode(",\n", $columns);
-
-		// Close the table for two DBMS and add to the statements
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '');
-				$statements[] = $table_sql;
-			break;
-		}
-
-		// we have yet to create a primary key for this table,
-		// this means that we can add the one we really wanted instead
-		if (!$primary_key_gen)
-		{
-			// Write primary key
-			if (isset($table_data['PRIMARY_KEY']))
-			{
-				if (!is_array($table_data['PRIMARY_KEY']))
-				{
-					$table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']);
-				}
-
-				switch ($this->sql_layer)
-				{
-					case 'mysql_40':
-					case 'mysql_41':
-					case 'postgres':
-					case 'sqlite':
-						$table_sql .= ",\n\t PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
-					break;
-
-					case 'firebird':
-					case 'mssql':
-					case 'mssqlnative':
-						// We need the data here
-						$old_return_statements = $this->return_statements;
-						$this->return_statements = true;
-
-						$primary_key_stmts = $this->sql_create_primary_key($table_name, $table_data['PRIMARY_KEY']);
-						foreach ($primary_key_stmts as $pk_stmt)
-						{
-							$statements[] = $pk_stmt;
-						}
-
-						$this->return_statements = $old_return_statements;
-					break;
-
-					case 'oracle':
-						$table_sql .= ",\n\t CONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')';
-					break;
-				}
-			}
-		}
-
-		// close the table
-		switch ($this->sql_layer)
-		{
-			case 'mysql_41':
-				// make sure the table is in UTF-8 mode
-				$table_sql .= "\n) CHARACTER SET `utf8` COLLATE `utf8_bin`;";
-				$statements[] = $table_sql;
-			break;
-
-			case 'mysql_40':
-			case 'sqlite':
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'postgres':
-				// do we need to add a sequence for auto incrementing columns?
-				if ($create_sequence)
-				{
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq;";
-				}
-
-				$table_sql .= "\n);";
-				$statements[] = $table_sql;
-			break;
-
-			case 'oracle':
-				$table_sql .= "\n)";
-				$statements[] = $table_sql;
-
-				// do we need to add a sequence and a tigger for auto incrementing columns?
-				if ($create_sequence)
-				{
-					// create the actual sequence
-					$statements[] = "CREATE SEQUENCE {$table_name}_seq";
-
-					// the trigger is the mechanism by which we increment the counter
-					$trigger = "CREATE OR REPLACE TRIGGER t_{$table_name}\n";
-					$trigger .= "BEFORE INSERT ON {$table_name}\n";
-					$trigger .= "FOR EACH ROW WHEN (\n";
-					$trigger .= "\tnew.{$create_sequence} IS NULL OR new.{$create_sequence} = 0\n";
-					$trigger .= ")\n";
-					$trigger .= "BEGIN\n";
-					$trigger .= "\tSELECT {$table_name}_seq.nextval\n";
-					$trigger .= "\tINTO :new.{$create_sequence}\n";
-					$trigger .= "\tFROM dual;\n";
-					$trigger .= "END;";
-
-					$statements[] = $trigger;
-				}
-			break;
-
-			case 'firebird':
-				if ($create_sequence)
-				{
-					$statements[] = "CREATE GENERATOR {$table_name}_gen;";
-					$statements[] = "SET GENERATOR {$table_name}_gen TO 0;";
-
-					$trigger = "CREATE TRIGGER t_$table_name FOR $table_name\n";
-					$trigger .= "BEFORE INSERT\nAS\nBEGIN\n";
-					$trigger .= "\tNEW.{$create_sequence} = GEN_ID({$table_name}_gen, 1);\nEND;";
-					$statements[] = $trigger;
-				}
-			break;
-		}
-
-		// Write Keys
-		if (isset($table_data['KEYS']))
-		{
-			foreach ($table_data['KEYS'] as $key_name => $key_data)
-			{
-				if (!is_array($key_data[1]))
-				{
-					$key_data[1] = array($key_data[1]);
-				}
-
-				$old_return_statements = $this->return_statements;
-				$this->return_statements = true;
-
-				$key_stmts = ($key_data[0] == 'UNIQUE') ? $this->sql_create_unique_index($table_name, $key_name, $key_data[1]) : $this->sql_create_index($table_name, $key_name, $key_data[1]);
-
-				foreach ($key_stmts as $key_stmt)
-				{
-					$statements[] = $key_stmt;
-				}
-
-				$this->return_statements = $old_return_statements;
-			}
-		}
-
-		// Commit Transaction
-		$statements[] = 'commit';
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Handle passed database update array.
-	* Expected structure...
-	* Key being one of the following
-	*	drop_tables: Drop tables
-	*	add_tables: Add tables
-	*	change_columns: Column changes (only type, not name)
-	*	add_columns: Add columns to a table
-	*	drop_keys: Dropping keys
-	*	drop_columns: Removing/Dropping columns
-	*	add_primary_keys: adding primary keys
-	*	add_unique_index: adding an unique index
-	*	add_index: adding an index (can be column:index_size if you need to provide size)
-	*
-	* The values are in this format:
-	*		{TABLE NAME}		=> array(
-	*			{COLUMN NAME}		=> array({COLUMN TYPE}, {DEFAULT VALUE}, {OPTIONAL VARIABLES}),
-	*			{KEY/INDEX NAME}	=> array({COLUMN NAMES}),
-	*		)
-	*
-	* For more information have a look at /develop/create_schema_files.php (only available through SVN)
-	*/
-	function perform_schema_changes($schema_changes)
-	{
-		if (empty($schema_changes))
-		{
-			return;
-		}
-
-		$statements = array();
-		$sqlite = false;
-
-		// For SQLite we need to perform the schema changes in a much more different way
-		if ($this->db->sql_layer == 'sqlite' && $this->return_statements)
-		{
-			$sqlite_data = array();
-			$sqlite = true;
-		}
-
-		// Drop tables?
-		if (!empty($schema_changes['drop_tables']))
-		{
-			foreach ($schema_changes['drop_tables'] as $table)
-			{
-				// only drop table if it exists
-				if ($this->sql_table_exists($table))
-				{
-					$result = $this->sql_table_drop($table);
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add tables?
-		if (!empty($schema_changes['add_tables']))
-		{
-			foreach ($schema_changes['add_tables'] as $table => $table_data)
-			{
-				$result = $this->sql_create_table($table, $table_data);
-				if ($this->return_statements)
-				{
-					$statements = array_merge($statements, $result);
-				}
-			}
-		}
-
-		// Change columns?
-		if (!empty($schema_changes['change_columns']))
-		{
-			foreach ($schema_changes['change_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column_name => $column_data)
-				{
-					// If the column exists we change it, else we add it ;)
-					if ($column_exists = $this->sql_column_exists($table, $column_name))
-					{
-						$result = $this->sql_column_change($table, $column_name, $column_data, true);
-					}
-					else
-					{
-						$result = $this->sql_column_add($table, $column_name, $column_data, true);
-					}
-
-					if ($sqlite)
-					{
-						if ($column_exists)
-						{
-							$sqlite_data[$table]['change_columns'][] = $result;
-						}
-						else
-						{
-							$sqlite_data[$table]['add_columns'][] = $result;
-						}
-					}
-					else if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add columns?
-		if (!empty($schema_changes['add_columns']))
-		{
-			foreach ($schema_changes['add_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column_name => $column_data)
-				{
-					// Only add the column if it does not exist yet
-					if ($column_exists = $this->sql_column_exists($table, $column_name))
-					{
-						continue;
-						// This is commented out here because it can take tremendous time on updates
-//						$result = $this->sql_column_change($table, $column_name, $column_data, true);
-					}
-					else
-					{
-						$result = $this->sql_column_add($table, $column_name, $column_data, true);
-					}
-
-					if ($sqlite)
-					{
-						if ($column_exists)
-						{
-							continue;
-//							$sqlite_data[$table]['change_columns'][] = $result;
-						}
-						else
-						{
-							$sqlite_data[$table]['add_columns'][] = $result;
-						}
-					}
-					else if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Remove keys?
-		if (!empty($schema_changes['drop_keys']))
-		{
-			foreach ($schema_changes['drop_keys'] as $table => $indexes)
-			{
-				foreach ($indexes as $index_name)
-				{
-					if (!$this->sql_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_index_drop($table, $index_name);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Drop columns?
-		if (!empty($schema_changes['drop_columns']))
-		{
-			foreach ($schema_changes['drop_columns'] as $table => $columns)
-			{
-				foreach ($columns as $column)
-				{
-					// Only remove the column if it exists...
-					if ($this->sql_column_exists($table, $column))
-					{
-						$result = $this->sql_column_remove($table, $column, true);
-
-						if ($sqlite)
-						{
-							$sqlite_data[$table]['drop_columns'][] = $result;
-						}
-						else if ($this->return_statements)
-						{
-							$statements = array_merge($statements, $result);
-						}
-					}
-				}
-			}
-		}
-
-		// Add primary keys?
-		if (!empty($schema_changes['add_primary_keys']))
-		{
-			foreach ($schema_changes['add_primary_keys'] as $table => $columns)
-			{
-				$result = $this->sql_create_primary_key($table, $columns, true);
-
-				if ($sqlite)
-				{
-					$sqlite_data[$table]['primary_key'] = $result;
-				}
-				else if ($this->return_statements)
-				{
-					$statements = array_merge($statements, $result);
-				}
-			}
-		}
-
-		// Add unqiue indexes?
-		if (!empty($schema_changes['add_unique_index']))
-		{
-			foreach ($schema_changes['add_unique_index'] as $table => $index_array)
-			{
-				foreach ($index_array as $index_name => $column)
-				{
-					if ($this->sql_unique_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_create_unique_index($table, $index_name, $column);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		// Add indexes?
-		if (!empty($schema_changes['add_index']))
-		{
-			foreach ($schema_changes['add_index'] as $table => $index_array)
-			{
-				foreach ($index_array as $index_name => $column)
-				{
-					if ($this->sql_index_exists($table, $index_name))
-					{
-						continue;
-					}
-
-					$result = $this->sql_create_index($table, $index_name, $column);
-
-					if ($this->return_statements)
-					{
-						$statements = array_merge($statements, $result);
-					}
-				}
-			}
-		}
-
-		if ($sqlite)
-		{
-			foreach ($sqlite_data as $table_name => $sql_schema_changes)
-			{
-				// Create temporary table with original data
-				$statements[] = 'begin';
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					continue;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				// Create a backup table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				// Get the columns...
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$plain_table_cols = trim($matches[1]);
-				$new_table_cols = preg_split('/,(?![\s\w]+\))/m', $plain_table_cols);
-				$column_list = array();
-
-				foreach ($new_table_cols as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-					$column_list[] = $entities[0];
-				}
-
-				// note down the primary key notation because sqlite only supports adding it to the end for the new table
-				$primary_key = false;
-				$_new_cols = array();
-
-				foreach ($new_table_cols as $key => $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						$primary_key = $declaration;
-						continue;
-					}
-					$_new_cols[] = $declaration;
-				}
-
-				$new_table_cols = $_new_cols;
-
-				// First of all... change columns
-				if (!empty($sql_schema_changes['change_columns']))
-				{
-					foreach ($sql_schema_changes['change_columns'] as $column_sql)
-					{
-						foreach ($new_table_cols as $key => $declaration)
-						{
-							$entities = preg_split('#\s+#', trim($declaration));
-							if (strpos($column_sql, $entities[0] . ' ') === 0)
-							{
-								$new_table_cols[$key] = $column_sql;
-							}
-						}
-					}
-				}
-
-				if (!empty($sql_schema_changes['add_columns']))
-				{
-					foreach ($sql_schema_changes['add_columns'] as $column_sql)
-					{
-						$new_table_cols[] = $column_sql;
-					}
-				}
-
-				// Now drop them...
-				if (!empty($sql_schema_changes['drop_columns']))
-				{
-					foreach ($sql_schema_changes['drop_columns'] as $column_name)
-					{
-						// Remove from column list...
-						$new_column_list = array();
-						foreach ($column_list as $key => $value)
-						{
-							if ($value === $column_name)
-							{
-								continue;
-							}
-
-							$new_column_list[] = $value;
-						}
-
-						$column_list = $new_column_list;
-
-						// Remove from table...
-						$_new_cols = array();
-						foreach ($new_table_cols as $key => $declaration)
-						{
-							$entities = preg_split('#\s+#', trim($declaration));
-							if (strpos($column_name . ' ', $entities[0] . ' ') === 0)
-							{
-								continue;
-							}
-							$_new_cols[] = $declaration;
-						}
-						$new_table_cols = $_new_cols;
-					}
-				}
-
-				// Primary key...
-				if (!empty($sql_schema_changes['primary_key']))
-				{
-					$new_table_cols[] = 'PRIMARY KEY (' . implode(', ', $sql_schema_changes['primary_key']) . ')';
-				}
-				// Add a new one or the old primary key
-				else if ($primary_key !== false)
-				{
-					$new_table_cols[] = $primary_key;
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $new_table_cols) . ');';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-			}
-		}
-
-		if ($this->return_statements)
-		{
-			return $statements;
-		}
-	}
-
-	/**
-	* Gets a list of columns of a table.
-	*
-	* @param string $table		Table name
-	*
-	* @return array				Array of column names (all lower case)
-	*/
-	function sql_list_columns($table)
-	{
-		$columns = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql = "SHOW COLUMNS FROM $table";
-			break;
-
-			// PostgreSQL has a way of doing this in a much simpler way but would
-			// not allow us to support all versions of PostgreSQL
-			case 'postgres':
-				$sql = "SELECT a.attname
-					FROM pg_class c, pg_attribute a
-					WHERE c.relname = '{$table}'
-						AND a.attnum > 0
-						AND a.attrelid = c.oid";
-			break;
-
-			// same deal with PostgreSQL, we must perform more complex operations than
-			// we technically could
-			case 'mssql':
-			case 'mssqlnative':
-				$sql = "SELECT c.name
-					FROM syscolumns c
-					LEFT JOIN sysobjects o ON c.id = o.id
-					WHERE o.name = '{$table}'";
-			break;
-
-			case 'oracle':
-				$sql = "SELECT column_name
-					FROM user_tab_columns
-					WHERE LOWER(table_name) = '" . strtolower($table) . "'";
-			break;
-
-			case 'firebird':
-				$sql = "SELECT RDB\$FIELD_NAME as FNAME
-					FROM RDB\$RELATION_FIELDS
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table) . "'";
-			break;
-
-			case 'sqlite':
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table}'";
-
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					return false;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$cols = trim($matches[1]);
-				$col_array = preg_split('/,(?![\s\w]+\))/m', $cols);
-
-				foreach ($col_array as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-
-					$column = strtolower($entities[0]);
-					$columns[$column] = $column;
-				}
-
-				return $columns;
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			$column = strtolower(current($row));
-			$columns[$column] = $column;
-		}
-		$this->db->sql_freeresult($result);
-
-		return $columns;
-	}
-
-	/**
-	* Check whether a specified column exist in a table
-	*
-	* @param string	$table			Table to check
-	* @param string	$column_name	Column to check
-	*
-	* @return bool		True if column exists, false otherwise
-	*/
-	function sql_column_exists($table, $column_name)
-	{
-		$columns = $this->sql_list_columns($table);
-
-		return isset($columns[$column_name]);
-	}
-
-	/**
-	* Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
-	*
-	* @param string	$table_name		Table to check the index at
-	* @param string	$index_name		The index name to check
-	*
-	* @return bool True if index exists, else false
-	*/
-	function sql_index_exists($table_name, $index_name)
-	{
-		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
-		{
-			$sql = "EXEC sp_statistics '$table_name'";
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if ($row['TYPE'] == 3)
-				{
-					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-			}
-			$this->db->sql_freeresult($result);
-
-			return false;
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
-					FROM RDB\$INDICES
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
-						AND RDB\$UNIQUE_FLAG IS NULL
-						AND RDB\$FOREIGN_KEY IS NULL";
-				$col = 'index_name';
-			break;
-
-			case 'postgres':
-				$sql = "SELECT ic.relname as index_name
-					FROM pg_class bc, pg_class ic, pg_index i
-					WHERE (bc.oid = i.indrelid)
-						AND (ic.oid = i.indexrelid)
-						AND (bc.relname = '" . $table_name . "')
-						AND (i.indisunique != 't')
-						AND (i.indisprimary != 't')";
-				$col = 'index_name';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql = 'SHOW KEYS
-					FROM ' . $table_name;
-				$col = 'Key_name';
-			break;
-
-			case 'oracle':
-				$sql = "SELECT index_name
-					FROM user_indexes
-					WHERE table_name = '" . strtoupper($table_name) . "'
-						AND generated = 'N'
-						AND uniqueness = 'NONUNIQUE'";
-				$col = 'index_name';
-			break;
-
-			case 'sqlite':
-				$sql = "PRAGMA index_list('" . $table_name . "');";
-				$col = 'name';
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
-			{
-				continue;
-			}
-
-			// These DBMS prefix index name with the table name
-			switch ($this->sql_layer)
-			{
-				case 'firebird':
-				case 'oracle':
-				case 'postgres':
-				case 'sqlite':
-					$row[$col] = substr($row[$col], strlen($table_name) + 1);
-				break;
-			}
-
-			if (strtolower($row[$col]) == strtolower($index_name))
-			{
-				$this->db->sql_freeresult($result);
-				return true;
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		return false;
-	}
-
-	/**
-	* Check if a specified index exists in table. Does not return PRIMARY KEY and UNIQUE indexes.
-	*
-	* @param string	$table_name		Table to check the index at
-	* @param string	$index_name		The index name to check
-	*
-	* @return bool True if index exists, else false
-	*/
-	function sql_unique_index_exists($table_name, $index_name)
-	{
-		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
-		{
-			$sql = "EXEC sp_statistics '$table_name'";
-			$result = $this->db->sql_query($sql);
-
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				// Usually NON_UNIQUE is the column we want to check, but we allow for both
-				if ($row['TYPE'] == 3)
-				{
-					if (strtolower($row['INDEX_NAME']) == strtolower($index_name))
-					{
-						$this->db->sql_freeresult($result);
-						return true;
-					}
-				}
-			}
-			$this->db->sql_freeresult($result);
-			return false;
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
-					FROM RDB\$INDICES
-					WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
-						AND RDB\$UNIQUE_FLAG IS NOT NULL
-						AND RDB\$FOREIGN_KEY IS NULL";
-				$col = 'index_name';
-			break;
-
-			case 'postgres':
-				$sql = "SELECT ic.relname as index_name, i.indisunique
-					FROM pg_class bc, pg_class ic, pg_index i
-					WHERE (bc.oid = i.indrelid)
-						AND (ic.oid = i.indexrelid)
-						AND (bc.relname = '" . $table_name . "')
-						AND (i.indisprimary != 't')";
-				$col = 'index_name';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql = 'SHOW KEYS
-					FROM ' . $table_name;
-				$col = 'Key_name';
-			break;
-
-			case 'oracle':
-				$sql = "SELECT index_name, table_owner
-					FROM user_indexes
-					WHERE table_name = '" . strtoupper($table_name) . "'
-						AND generated = 'N'
-						AND uniqueness = 'UNIQUE'";
-				$col = 'index_name';
-			break;
-
-			case 'sqlite':
-				$sql = "PRAGMA index_list('" . $table_name . "');";
-				$col = 'name';
-			break;
-		}
-
-		$result = $this->db->sql_query($sql);
-		while ($row = $this->db->sql_fetchrow($result))
-		{
-			if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && ($row['Non_unique'] || $row[$col] == 'PRIMARY'))
-			{
-				continue;
-			}
-
-			if ($this->sql_layer == 'sqlite' && !$row['unique'])
-			{
-				continue;
-			}
-
-			if ($this->sql_layer == 'postgres' && $row['indisunique'] != 't')
-			{
-				continue;
-			}
-
-			// These DBMS prefix index name with the table name
-			switch ($this->sql_layer)
-			{
-				case 'oracle':
-					// Two cases here... prefixed with U_[table_owner] and not prefixed with table_name
-					if (strpos($row[$col], 'U_') === 0)
-					{
-						$row[$col] = substr($row[$col], strlen('U_' . $row['table_owner']) + 1);
-					}
-					else if (strpos($row[$col], strtoupper($table_name)) === 0)
-					{
-						$row[$col] = substr($row[$col], strlen($table_name) + 1);
-					}
-				break;
-
-				case 'firebird':
-				case 'postgres':
-				case 'sqlite':
-					$row[$col] = substr($row[$col], strlen($table_name) + 1);
-				break;
-			}
-
-			if (strtolower($row[$col]) == strtolower($index_name))
-			{
-				$this->db->sql_freeresult($result);
-				return true;
-			}
-		}
-		$this->db->sql_freeresult($result);
-
-		return false;
-	}
-
-	/**
-	* Private method for performing sql statements (either execute them or return them)
-	* @access private
-	*/
-	function _sql_run_sql($statements)
-	{
-		if ($this->return_statements)
-		{
-			return $statements;
-		}
-
-		// We could add error handling here...
-		foreach ($statements as $sql)
-		{
-			if ($sql === 'begin')
-			{
-				$this->db->sql_transaction('begin');
-			}
-			else if ($sql === 'commit')
-			{
-				$this->db->sql_transaction('commit');
-			}
-			else
-			{
-				$this->db->sql_query($sql);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* Function to prepare some column information for better usage
-	* @access private
-	*/
-	function sql_prepare_column_data($table_name, $column_name, $column_data)
-	{
-		if (strlen($column_name) > 30)
-		{
-			trigger_error("Column name '$column_name' on table '$table_name' is too long. The maximum is 30 characters.", E_USER_ERROR);
-		}
-
-		// Get type
-		if (strpos($column_data[0], ':') !== false)
-		{
-			list($orig_column_type, $column_length) = explode(':', $column_data[0]);
-			if (!is_array($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']))
-			{
-				$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'], $column_length);
-			}
-			else
-			{
-				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule']))
-				{
-					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][0])
-					{
-						case 'div':
-							$column_length /= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][1];
-							$column_length = ceil($column_length);
-							$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
-						break;
-					}
-				}
-
-				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit']))
-				{
-					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][0])
-					{
-						case 'mult':
-							$column_length *= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][1];
-							if ($column_length > $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][2])
-							{
-								$column_type = $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][3];
-							}
-							else
-							{
-								$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
-							}
-						break;
-					}
-				}
-			}
-			$orig_column_type .= ':';
-		}
-		else
-		{
-			$orig_column_type = $column_data[0];
-			$column_type = $this->dbms_type_map[$this->sql_layer][$column_data[0]];
-		}
-
-		// Adjust default value if db-dependent specified
-		if (is_array($column_data[1]))
-		{
-			$column_data[1] = (isset($column_data[1][$this->sql_layer])) ? $column_data[1][$this->sql_layer] : $column_data[1]['default'];
-		}
-
-		$sql = '';
-
-		$return_array = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql .= " {$column_type} ";
-				$return_array['column_type_sql_type'] = " {$column_type} ";
-
-				if (!is_null($column_data[1]))
-				{
-					$sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
-					$return_array['column_type_sql_default'] = ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
-				}
-
-				$sql .= 'NOT NULL';
-
-				// This is a UNICODE column and thus should be given it's fair share
-				if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0]))
-				{
-					$sql .= ' COLLATE UNICODE';
-				}
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$return_array['auto_increment'] = true;
-				}
-
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$sql .= " {$column_type} ";
-				$sql_default = " {$column_type} ";
-
-				// For adding columns we need the default definition
-				if (!is_null($column_data[1]))
-				{
-					// For hexadecimal values do not use single quotes
-					if (strpos($column_data[1], '0x') === 0)
-					{
-						$return_array['default'] = 'DEFAULT (' . $column_data[1] . ') ';
-						$sql_default .= $return_array['default'];
-					}
-					else
-					{
-						$return_array['default'] = 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
-						$sql_default .= $return_array['default'];
-					}
-				}
-
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-//					$sql .= 'IDENTITY (1, 1) ';
-					$sql_default .= 'IDENTITY (1, 1) ';
-				}
-
-				$return_array['textimage'] = $column_type === '[text]';
-
-				$sql .= 'NOT NULL';
-				$sql_default .= 'NOT NULL';
-
-				$return_array['column_type_sql_default'] = $sql_default;
-
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$sql .= " {$column_type} ";
-
-				// For hexadecimal values do not use single quotes
-				if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
-				{
-					$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
-				}
-				$sql .= 'NOT NULL';
-
-				if (isset($column_data[2]))
-				{
-					if ($column_data[2] == 'auto_increment')
-					{
-						$sql .= ' auto_increment';
-					}
-					else if ($this->sql_layer === 'mysql_41' && $column_data[2] == 'true_sort')
-					{
-						$sql .= ' COLLATE utf8_unicode_ci';
-					}
-				}
-
-			break;
-
-			case 'oracle':
-				$sql .= " {$column_type} ";
-				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
-
-				// In Oracle empty strings ('') are treated as NULL.
-				// Therefore in oracle we allow NULL's for all DEFAULT '' entries
-				// Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields)
-				if (!preg_match('/number/i', $column_type))
-				{
-					$sql .= ($column_data[1] === '') ? '' : 'NOT NULL';
-				}
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$return_array['auto_increment'] = true;
-				}
-
-			break;
-
-			case 'postgres':
-				$return_array['column_type'] = $column_type;
-
-				$sql .= " {$column_type} ";
-
-				$return_array['auto_increment'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$default_val = "nextval('{$table_name}_seq')";
-					$return_array['auto_increment'] = true;
-				}
-				else if (!is_null($column_data[1]))
-				{
-					$default_val = "'" . $column_data[1] . "'";
-					$return_array['null'] = 'NOT NULL';
-					$sql .= 'NOT NULL ';
-				}
-
-				$return_array['default'] = $default_val;
-
-				$sql .= "DEFAULT {$default_val}";
-
-				// Unsigned? Then add a CHECK contraint
-				if (in_array($orig_column_type, $this->unsigned_types))
-				{
-					$return_array['constraint'] = "CHECK ({$column_name} >= 0)";
-					$sql .= " CHECK ({$column_name} >= 0)";
-				}
-
-			break;
-
-			case 'sqlite':
-				$return_array['primary_key_set'] = false;
-				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
-				{
-					$sql .= ' INTEGER PRIMARY KEY';
-					$return_array['primary_key_set'] = true;
-				}
-				else
-				{
-					$sql .= ' ' . $column_type;
-				}
-
-				$sql .= ' NOT NULL ';
-				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
-
-			break;
-		}
-
-		$return_array['column_type_sql'] = $sql;
-
-		return $return_array;
-	}
-
-	/**
-	* Add new column
-	*/
-	function sql_column_add($table_name, $column_name, $column_data, $inline = false)
-	{
-		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				// Does not support AFTER statement, only POSITION (and there you need the column position)
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD "' . strtoupper($column_name) . '" ' . $column_data['column_type_sql'];
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				// Does not support AFTER, only through temporary table
-				$statements[] = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default'];
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$after = (!empty($column_data['after'])) ? ' AFTER ' . $column_data['after'] : '';
-				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'] . $after;
-			break;
-
-			case 'oracle':
-				// Does not support AFTER, only through temporary table
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'postgres':
-				// Does not support AFTER, only through temporary table
-				if (version_compare($this->db->sql_server_info(true), '8.0', '>='))
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql'];
-				}
-				else
-				{
-					// old versions cannot add columns with default and null information
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type'] . ' ' . $column_data['constraint'];
-
-					if (isset($column_data['null']))
-					{
-						if ($column_data['null'] == 'NOT NULL')
-						{
-							$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET NOT NULL';
-						}
-					}
-
-					if (isset($column_data['default']))
-					{
-						$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
-					}
-				}
-
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name . ' ' . $column_data['column_type_sql'];
-				}
-
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
-				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
-
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					$statements[] = 'begin';
-
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
-
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
-
-					foreach ($old_table_cols as $declaration)
-					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY')
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
-					}
-
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols;
-
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-					$statements[] = 'commit';
-				}
-				else
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' [' . $column_data['column_type_sql'] . ']';
-				}
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop column
-	*/
-	function sql_column_remove($table_name, $column_name, $inline = false)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP "' . strtoupper($column_name) . '"';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				// remove default cosntraints first
-				// http://msdn.microsoft.com/en-us/library/aa175912%28v=sql.80%29.aspx
-				$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000)
-					SET @drop_default_name =
-						(SELECT so.name FROM sysobjects so
-						JOIN sysconstraints sc ON so.id = sc.constid
-						WHERE object_name(so.parent_obj) = '{$table_name}'
-							AND so.xtype = 'D'
-							AND sc.colid = (SELECT colid FROM syscolumns
-								WHERE id = object_id('{$table_name}')
-									AND name = '{$column_name}'))
-					IF @drop_default_name <> ''
-					BEGIN
-						SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']'
-						EXEC(@cmd)
-					END";
-				$statements[] = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`';
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
-			break;
-
-			case 'postgres':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN "' . $column_name . '"';
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name;
-				}
-
-				if (version_compare(sqlite_libversion(), '3.0') == -1)
-				{
-					$sql = "SELECT sql
-						FROM sqlite_master
-						WHERE type = 'table'
-							AND name = '{$table_name}'
-						ORDER BY type DESC, name;";
-					$result = $this->db->sql_query($sql);
-
-					if (!$result)
-					{
-						break;
-					}
-
-					$row = $this->db->sql_fetchrow($result);
-					$this->db->sql_freeresult($result);
-
-					$statements[] = 'begin';
-
-					// Create a backup table and populate it, destroy the existing one
-					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-					$statements[] = 'DROP TABLE ' . $table_name;
-
-					preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-					$new_table_cols = trim($matches[1]);
-					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-					$column_list = array();
-
-					foreach ($old_table_cols as $declaration)
-					{
-						$entities = preg_split('#\s+#', trim($declaration));
-						if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name)
-						{
-							continue;
-						}
-						$column_list[] = $entities[0];
-					}
-
-					$columns = implode(',', $column_list);
-
-					$new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols);
-
-					// create a new table and fill it up. destroy the temp one
-					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
-					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-					$statements[] = 'commit';
-				}
-				else
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
-				}
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop Index
-	*/
-	function sql_index_drop($table_name, $index_name)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'DROP INDEX ' . $table_name . '.' . $index_name;
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'DROP INDEX ' . $index_name . ' ON ' . $table_name;
-			break;
-
-			case 'firebird':
-			case 'oracle':
-			case 'postgres':
-			case 'sqlite':
-				$statements[] = 'DROP INDEX ' . $table_name . '_' . $index_name;
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Drop Table
-	*/
-	function sql_table_drop($table_name)
-	{
-		$statements = array();
-
-		if (!$this->sql_table_exists($table_name))
-		{
-			return $this->_sql_run_sql($statements);
-		}
-
-		// the most basic operation, get rid of the table
-		$statements[] = 'DROP TABLE ' . $table_name;
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				$sql = 'SELECT RDB$GENERATOR_NAME as gen
-					FROM RDB$GENERATORS
-					WHERE RDB$SYSTEM_FLAG = 0
-						AND RDB$GENERATOR_NAME = \'' . strtoupper($table_name) . "_GEN'";
-				$result = $this->db->sql_query($sql);
-
-				// does a generator exist?
-				if ($row = $this->db->sql_fetchrow($result))
-				{
-					$statements[] = "DROP GENERATOR {$row['gen']};";
-				}
-				$this->db->sql_freeresult($result);
-			break;
-
-			case 'oracle':
-				$sql = 'SELECT A.REFERENCED_NAME
-					FROM USER_DEPENDENCIES A, USER_TRIGGERS B
-					WHERE A.REFERENCED_TYPE = \'SEQUENCE\'
-						AND A.NAME = B.TRIGGER_NAME
-						AND B.TABLE_NAME = \'' . strtoupper($table_name) . "'";
-				$result = $this->db->sql_query($sql);
-
-				// any sequences ref'd to this table's triggers?
-				while ($row = $this->db->sql_fetchrow($result))
-				{
-					$statements[] = "DROP SEQUENCE {$row['referenced_name']}";
-				}
-				$this->db->sql_freeresult($result);
-			break;
-
-			case 'postgres':
-				// PGSQL does not "tightly" bind sequences and tables, we must guess...
-				$sql = "SELECT relname
-					FROM pg_class
-					WHERE relkind = 'S'
-						AND relname = '{$table_name}_seq'";
-				$result = $this->db->sql_query($sql);
-
-				// We don't even care about storing the results. We already know the answer if we get rows back.
-				if ($this->db->sql_fetchrow($result))
-				{
-					$statements[] =  "DROP SEQUENCE {$table_name}_seq;\n";
-				}
-				$this->db->sql_freeresult($result);
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add primary key
-	*/
-	function sql_create_primary_key($table_name, $column, $inline = false)
-	{
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD ";
-				$sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED (";
-				$sql .= '[' . implode("],\n\t\t[", $column) . ']';
-				$sql .= ') ON [PRIMARY]';
-
-				$statements[] = $sql;
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . 'add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')';
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column;
-				}
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					break;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$statements[] = 'begin';
-
-				// Create a backup table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$new_table_cols = trim($matches[1]);
-				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-				$column_list = array();
-
-				foreach ($old_table_cols as $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					if ($entities[0] == 'PRIMARY')
-					{
-						continue;
-					}
-					$column_list[] = $entities[0];
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add unique index
-	*/
-	function sql_create_unique_index($table_name, $index_name, $column)
-	{
-		$statements = array();
-
-		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
-		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
-		{
-			$max_length = strlen($table_prefix) + 24;
-			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'oracle':
-			case 'sqlite':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD UNIQUE INDEX ' . $index_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* Add index
-	*/
-	function sql_create_index($table_name, $index_name, $column)
-	{
-		$statements = array();
-
-		$table_prefix = substr(CONFIG_TABLE, 0, -6); // strlen(config)
-		if (strlen($table_name . $index_name) - strlen($table_prefix) > 24)
-		{
-			$max_length = strlen($table_prefix) + 24;
-			trigger_error("Index name '{$table_name}_$index_name' on table '$table_name' is too long. The maximum is $max_length characters.", E_USER_ERROR);
-		}
-
-		// remove index length unless MySQL4
-		if ('mysql_40' != $this->sql_layer)
-		{
-			$column = preg_replace('#:.*$#', '', $column);
-		}
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-			case 'postgres':
-			case 'oracle':
-			case 'sqlite':
-				$statements[] = 'CREATE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mysql_40':
-				// add index size to definition as required by MySQL4
-				foreach ($column as $i => $col)
-				{
-					if (false !== strpos($col, ':'))
-					{
-						list($col, $index_size) = explode(':', $col);
-						$column[$i] = "$col($index_size)";
-					}
-				}
-			// no break
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD INDEX ' . $index_name . '(' . implode(', ', $column) . ')';
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-
-	/**
-	* List all of the indices that belong to a table,
-	* does not count:
-	* * UNIQUE indices
-	* * PRIMARY keys
-	*/
-	function sql_list_index($table_name)
-	{
-		$index_array = array();
-
-		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
-		{
-			$sql = "EXEC sp_statistics '$table_name'";
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if ($row['TYPE'] == 3)
-				{
-					$index_array[] = $row['INDEX_NAME'];
-				}
-			}
-			$this->db->sql_freeresult($result);
-		}
-		else
-		{
-			switch ($this->sql_layer)
-			{
-				case 'firebird':
-					$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
-						FROM RDB\$INDICES
-						WHERE RDB\$RELATION_NAME = '" . strtoupper($table_name) . "'
-							AND RDB\$UNIQUE_FLAG IS NULL
-							AND RDB\$FOREIGN_KEY IS NULL";
-					$col = 'index_name';
-				break;
-
-				case 'postgres':
-					$sql = "SELECT ic.relname as index_name
-						FROM pg_class bc, pg_class ic, pg_index i
-						WHERE (bc.oid = i.indrelid)
-							AND (ic.oid = i.indexrelid)
-							AND (bc.relname = '" . $table_name . "')
-							AND (i.indisunique != 't')
-							AND (i.indisprimary != 't')";
-					$col = 'index_name';
-				break;
-
-				case 'mysql_40':
-				case 'mysql_41':
-					$sql = 'SHOW KEYS
-						FROM ' . $table_name;
-					$col = 'Key_name';
-				break;
-
-				case 'oracle':
-					$sql = "SELECT index_name
-						FROM user_indexes
-						WHERE table_name = '" . strtoupper($table_name) . "'
-							AND generated = 'N'
-							AND uniqueness = 'NONUNIQUE'";
-					$col = 'index_name';
-				break;
-
-				case 'sqlite':
-					$sql = "PRAGMA index_info('" . $table_name . "');";
-					$col = 'name';
-				break;
-			}
-
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
-				{
-					continue;
-				}
-
-				switch ($this->sql_layer)
-				{
-					case 'firebird':
-					case 'oracle':
-					case 'postgres':
-					case 'sqlite':
-						$row[$col] = substr($row[$col], strlen($table_name) + 1);
-					break;
-				}
-
-				$index_array[] = $row[$col];
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		return array_map('strtolower', $index_array);
-	}
-
-	/**
-	* Change column type (not name!)
-	*/
-	function sql_column_change($table_name, $column_name, $column_data, $inline = false)
-	{
-		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
-		$statements = array();
-
-		switch ($this->sql_layer)
-		{
-			case 'firebird':
-				// Change type...
-				if (!empty($column_data['column_type_sql_default']))
-				{
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" SET DEFAULT ' . ' ' . $column_data['column_type_sql_default'];
-				}
-				else
-				{
-					// TODO: try to change pkey without removing trigger, generator or constraints. ATM this query may fail.
-					$statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN "' . strtoupper($column_name) . '" TYPE ' . ' ' . $column_data['column_type_sql_type'];
-				}
-			break;
-
-			case 'mssql':
-			case 'mssqlnative':
-				$statements[] = 'ALTER TABLE [' . $table_name . '] ALTER COLUMN [' . $column_name . '] ' . $column_data['column_type_sql'];
-
-				if (!empty($column_data['default']))
-				{
-					// Using TRANSACT-SQL for this statement because we do not want to have colliding data if statements are executed at a later stage
-					$statements[] = "DECLARE @drop_default_name VARCHAR(100), @cmd VARCHAR(1000)
-						SET @drop_default_name =
-							(SELECT so.name FROM sysobjects so
-							JOIN sysconstraints sc ON so.id = sc.constid
-							WHERE object_name(so.parent_obj) = '{$table_name}'
-								AND so.xtype = 'D'
-								AND sc.colid = (SELECT colid FROM syscolumns
-									WHERE id = object_id('{$table_name}')
-										AND name = '{$column_name}'))
-						IF @drop_default_name <> ''
-						BEGIN
-							SET @cmd = 'ALTER TABLE [{$table_name}] DROP CONSTRAINT [' + @drop_default_name + ']'
-							EXEC(@cmd)
-						END
-						SET @cmd = 'ALTER TABLE [{$table_name}] ADD CONSTRAINT [DF_{$table_name}_{$column_name}_1] {$column_data['default']} FOR [{$column_name}]'
-						EXEC(@cmd)";
-				}
-			break;
-
-			case 'mysql_40':
-			case 'mysql_41':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` CHANGE `' . $column_name . '` `' . $column_name . '` ' . $column_data['column_type_sql'];
-			break;
-
-			case 'oracle':
-				$statements[] = 'ALTER TABLE ' . $table_name . ' MODIFY ' . $column_name . ' ' . $column_data['column_type_sql'];
-			break;
-
-			case 'postgres':
-				$sql = 'ALTER TABLE ' . $table_name . ' ';
-
-				$sql_array = array();
-				$sql_array[] = 'ALTER COLUMN ' . $column_name . ' TYPE ' . $column_data['column_type'];
-
-				if (isset($column_data['null']))
-				{
-					if ($column_data['null'] == 'NOT NULL')
-					{
-						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET NOT NULL';
-					}
-					else if ($column_data['null'] == 'NULL')
-					{
-						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' DROP NOT NULL';
-					}
-				}
-
-				if (isset($column_data['default']))
-				{
-					$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
-				}
-
-				// we don't want to double up on constraints if we change different number data types
-				if (isset($column_data['constraint']))
-				{
-					$constraint_sql = "SELECT consrc as constraint_data
-								FROM pg_constraint, pg_class bc
-								WHERE conrelid = bc.oid
-									AND bc.relname = '{$table_name}'
-									AND NOT EXISTS (
-										SELECT *
-											FROM pg_constraint as c, pg_inherits as i
-											WHERE i.inhrelid = pg_constraint.conrelid
-												AND c.conname = pg_constraint.conname
-												AND c.consrc = pg_constraint.consrc
-												AND c.conrelid = i.inhparent
-									)";
-
-					$constraint_exists = false;
-
-					$result = $this->db->sql_query($constraint_sql);
-					while ($row = $this->db->sql_fetchrow($result))
-					{
-						if (trim($row['constraint_data']) == trim($column_data['constraint']))
-						{
-							$constraint_exists = true;
-							break;
-						}
-					}
-					$this->db->sql_freeresult($result);
-
-					if (!$constraint_exists)
-					{
-						$sql_array[] = 'ADD ' . $column_data['constraint'];
-					}
-				}
-
-				$sql .= implode(', ', $sql_array);
-
-				$statements[] = $sql;
-			break;
-
-			case 'sqlite':
-
-				if ($inline && $this->return_statements)
-				{
-					return $column_name . ' ' . $column_data['column_type_sql'];
-				}
-
-				$sql = "SELECT sql
-					FROM sqlite_master
-					WHERE type = 'table'
-						AND name = '{$table_name}'
-					ORDER BY type DESC, name;";
-				$result = $this->db->sql_query($sql);
-
-				if (!$result)
-				{
-					break;
-				}
-
-				$row = $this->db->sql_fetchrow($result);
-				$this->db->sql_freeresult($result);
-
-				$statements[] = 'begin';
-
-				// Create a temp table and populate it, destroy the existing one
-				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
-				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
-				$statements[] = 'DROP TABLE ' . $table_name;
-
-				preg_match('#\((.*)\)#s', $row['sql'], $matches);
-
-				$new_table_cols = trim($matches[1]);
-				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
-				$column_list = array();
-
-				foreach ($old_table_cols as $key => $declaration)
-				{
-					$entities = preg_split('#\s+#', trim($declaration));
-					$column_list[] = $entities[0];
-					if ($entities[0] == $column_name)
-					{
-						$old_table_cols[$key] = $column_name . ' ' . $column_data['column_type_sql'];
-					}
-				}
-
-				$columns = implode(',', $column_list);
-
-				// create a new table and fill it up. destroy the temp one
-				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');';
-				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
-				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
-
-				$statements[] = 'commit';
-
-			break;
-		}
-
-		return $this->_sql_run_sql($statements);
-	}
-}
-- 
cgit v1.2.1


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

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

PHPBB3-11582
---
 phpBB/includes/acp/acp_permissions.php |   9 +-
 phpBB/includes/permissions.php         | 263 +++++++++++++++++++++++++++++++++
 2 files changed, 269 insertions(+), 3 deletions(-)
 create mode 100644 phpBB/includes/permissions.php

(limited to 'phpBB/includes')

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


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

PHPBB3-11582
---
 phpBB/includes/acp/acp_permission_roles.php |  7 +++++--
 phpBB/includes/acp/auth.php                 | 16 +++++++++++-----
 phpBB/includes/permissions.php              | 28 ++++++++++++++--------------
 3 files changed, 30 insertions(+), 21 deletions(-)

(limited to 'phpBB/includes')

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


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

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

(limited to 'phpBB/includes')

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


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

PHPBB3-11582
---
 phpBB/includes/permissions.php | 103 ++++++++++++++++++++++++-----------------
 1 file changed, 61 insertions(+), 42 deletions(-)

(limited to 'phpBB/includes')

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


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

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

(limited to 'phpBB/includes')

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


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

PHPBB3-11582
---
 phpBB/includes/acp/acp_permission_roles.php | 12 ++++----
 phpBB/includes/acp/acp_permissions.php      |  9 ++++--
 phpBB/includes/acp/auth.php                 | 13 +++++----
 phpBB/includes/permissions.php              | 44 ++++++++++++++++++++++-------
 4 files changed, 54 insertions(+), 24 deletions(-)

(limited to 'phpBB/includes')

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


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

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

(limited to 'phpBB/includes')

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


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

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

(limited to 'phpBB/includes')

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


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

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

(limited to 'phpBB/includes')

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


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

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

(limited to 'phpBB/includes')

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


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

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

(limited to 'phpBB/includes')

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


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

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

(limited to 'phpBB/includes')

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


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

PHPBB3-11582
---
 phpBB/includes/permissions.php | 340 -----------------------------------------
 1 file changed, 340 deletions(-)
 delete mode 100644 phpBB/includes/permissions.php

(limited to 'phpBB/includes')

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


From 8928240dc3fefd42d8e98132451e2de92ff7cbec Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 14 Jul 2013 15:40:09 -0400
Subject: [ticket/11574] Fix more issues in the updater

* Stupid mistake in phpbb_create_update_container
* Do not bootstrap extensions in installer/updater
* Fix template lookup in installer/updater
* Do not attempt to delete posts from bots

The latter is a really fun problem. Since deleting posts now depends
on a new db column that does not exist yet, we cannot call delete_post
from a migration, ever. By using retain, we can hack around the issue
for now.

PHPBB3-11574
---
 phpBB/includes/functions_container.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 5c6bd6dd8a..7cbfa17a0e 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -148,9 +148,11 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext)
 */
 function phpbb_create_update_container($phpbb_root_path, $php_ext, $config_path)
 {
+	$config_file = $phpbb_root_path . 'config.' . $php_ext;
 	return phpbb_create_compiled_container(
+		$config_file,
 		array(
-			new phpbb_di_extension_config($phpbb_root_path . 'config.' . $php_ext),
+			new phpbb_di_extension_config($config_file),
 			new phpbb_di_extension_core($config_path),
 		),
 		array(
@@ -173,11 +175,6 @@ function phpbb_create_update_container($phpbb_root_path, $php_ext, $config_path)
 */
 function phpbb_create_compiled_container($config_file, array $extensions, array $passes, $phpbb_root_path, $php_ext)
 {
-	$installed_exts = phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path);
-
-	// Now pass the enabled extension paths into the ext compiler extension
-	$extensions[] = new phpbb_di_extension_ext($installed_exts);
-
 	// Create the final container to be compiled and cached
 	$container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext);
 
@@ -258,11 +255,14 @@ function phpbb_create_dumped_container_unless_debug($config_file, array $extensi
 function phpbb_create_default_container($phpbb_root_path, $php_ext)
 {
 	$config_file = $phpbb_root_path . 'config.' . $php_ext;
+	$installed_exts = phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path);
+
 	return phpbb_create_dumped_container_unless_debug(
 		$config_file,
 		array(
 			new phpbb_di_extension_config($config_file),
 			new phpbb_di_extension_core($phpbb_root_path . 'config'),
+			new phpbb_di_extension_ext($installed_exts),
 		),
 		array(
 			new phpbb_di_pass_collection_pass(),
-- 
cgit v1.2.1


From f96f2a9e23b41106c6a8ed71ad3538141c648c2f Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Mon, 15 Jul 2013 20:06:54 +0100
Subject: [ticket/11639] generate_text_for_display on functions_posting.php

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

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index b9b518ad32..d277ef06a3 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1104,14 +1104,12 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 
 			$decoded_message = bbcode_nl2br($decoded_message);
 		}
-
-		if ($row['bbcode_bitfield'])
-		{
-			$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
-		}
-
-		$message = bbcode_nl2br($message);
-		$message = smiley_text($message, !$row['enable_smilies']);
+		$parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0);
+		$parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0);
+		
+		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags , false);
+		
+		unset($parse_flags);
 
 		if (!empty($attachments[$row['post_id']]))
 		{
-- 
cgit v1.2.1


From dde9a1fb27e6db3c1b4cd41d8848496a3ef8d363 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Mon, 15 Jul 2013 20:08:17 +0100
Subject: [ticket/11639] Added an useful comment.

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

PHPBB3-11639
---
 phpBB/includes/functions_posting.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index d277ef06a3..49fbe92256 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1104,9 +1104,10 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 
 			$decoded_message = bbcode_nl2br($decoded_message);
 		}
+		
 		$parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0);
 		$parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0);
-		
+		// Do not censor text because it has already been censored before
 		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags , false);
 		
 		unset($parse_flags);
-- 
cgit v1.2.1


From 5f19ca6a6f3ad6641954c58c44ef0c94d1609e5a Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Mon, 15 Jul 2013 20:09:59 +0100
Subject: [ticket/11639] Whitespace fixing

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

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 49fbe92256..ad75ed1079 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1104,12 +1104,12 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 
 			$decoded_message = bbcode_nl2br($decoded_message);
 		}
-		
+
 		$parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0);
 		$parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0);
 		// Do not censor text because it has already been censored before
 		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags , false);
-		
+
 		unset($parse_flags);
 
 		if (!empty($attachments[$row['post_id']]))
-- 
cgit v1.2.1


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

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

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

(limited to 'phpBB/includes')

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


From e1e8d4ed347cb1707ee4cfca8d05e679b575fe0c Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Tue, 16 Jul 2013 21:01:47 +0100
Subject: [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php

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

PHPBB3-11641
---
 phpBB/includes/mcp/mcp_pm_reports.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index 99ff397a66..dc953aae33 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -115,17 +115,8 @@ class mcp_pm_reports
 				}
 
 				// Process message, leave it uncensored
-				$message = $pm_info['message_text'];
+				$message = generate_text_for_display($pm_info['message_text'], $pm_info['bbcode_uid'], $pm_info['bbcode_bitfield'], ($pm_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
 
-				if ($pm_info['bbcode_bitfield'])
-				{
-					include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
-					$bbcode = new bbcode($pm_info['bbcode_bitfield']);
-					$bbcode->bbcode_second_pass($message, $pm_info['bbcode_uid'], $pm_info['bbcode_bitfield']);
-				}
-
-				$message = bbcode_nl2br($message);
-				$message = smiley_text($message);
 				$report['report_text'] = make_clickable(bbcode_nl2br($report['report_text']));
 
 				if ($pm_info['message_attachment'] && $auth->acl_get('u_pm_download'))
-- 
cgit v1.2.1


From e7bf3abd1ac79fabab7da925e55bd884aee0663d Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Tue, 16 Jul 2013 21:15:59 +0100
Subject: [ticket/11642] generate_text_for_display on mcp/mcp_post.php

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

PHPBB3-11642
---
 phpBB/includes/mcp/mcp_post.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 520c964228..235b2a44be 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -125,17 +125,7 @@ function mcp_post_details($id, $mode, $action)
 	$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;
 
 	// Process message, leave it uncensored
-	$message = $post_info['post_text'];
-
-	if ($post_info['bbcode_bitfield'])
-	{
-		include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
-		$bbcode = new bbcode($post_info['bbcode_bitfield']);
-		$bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']);
-	}
-
-	$message = bbcode_nl2br($message);
-	$message = smiley_text($message);
+	$message = generate_text_for_display($post_info['message_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
 
 	if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
 	{
-- 
cgit v1.2.1


From 596e9bb69df2f5d0c07c0b8201cc770bbe5253a0 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Tue, 16 Jul 2013 21:20:22 +0100
Subject: [ticket/11643] generate_text_for_display on mcp/mcp_queue.php

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

PHPBB3-11643
---
 phpBB/includes/mcp/mcp_queue.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 24afa1f210..14490343c2 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -132,17 +132,7 @@ class mcp_queue
 				$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;
 
 				// Process message, leave it uncensored
-				$message = $post_info['post_text'];
-
-				if ($post_info['bbcode_bitfield'])
-				{
-					include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
-					$bbcode = new bbcode($post_info['bbcode_bitfield']);
-					$bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']);
-				}
-
-				$message = bbcode_nl2br($message);
-				$message = smiley_text($message);
+				$message = generate_text_for_display($post_info['message_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
 
 				if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
 				{
-- 
cgit v1.2.1


From d183431894b85ca2ebc778ccb8fd52ecf91082fb Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Tue, 16 Jul 2013 21:28:06 +0100
Subject: [ticket/11653] generate_text_for_display on mcp/mcp_topic.php

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

PHPBB3-11653
---
 phpBB/includes/mcp/mcp_topic.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index e3dd5a6b57..3491f37bcb 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -213,13 +213,7 @@ function mcp_topic_view($id, $mode, $action)
 		$message = $row['post_text'];
 		$post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title'];
 
-		if ($row['bbcode_bitfield'])
-		{
-			$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
-		}
-
-		$message = bbcode_nl2br($message);
-		$message = smiley_text($message);
+		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
 
 		if (!empty($attachments[$row['post_id']]))
 		{
-- 
cgit v1.2.1


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

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

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

(limited to 'phpBB/includes')

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


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

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

PHPBB3-11713
---
 phpBB/includes/acp/acp_modules.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index a1e681b29c..7a1d30196d 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -379,6 +379,7 @@ class acp_modules
 				$json_response->send(array(
 					'MESSAGE_TITLE'	=> $user->lang('ERROR'),
 					'MESSAGE_TEXT'	=> implode('<br />', $errors),
+					'SUCCESS'	=> false,
 				));
 			}
 
-- 
cgit v1.2.1


From ef7a7cac6dc3f313960a70462b084fbeaff9d4bd Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Fri, 19 Jul 2013 18:27:25 +0100
Subject: [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php

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

PHPBB3-11655
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index b7d2dd6821..0a8a3d55ab 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -76,17 +76,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	$user_info = get_user_information($author_id, $message_row);
 
 	// Parse the message and subject
-	$message = censor_text($message_row['message_text']);
-
-	// Second parse bbcode here
-	if ($message_row['bbcode_bitfield'])
-	{
-		$bbcode->bbcode_second_pass($message, $message_row['bbcode_uid'], $message_row['bbcode_bitfield']);
-	}
-
-	// Always process smilies after parsing bbcodes
-	$message = bbcode_nl2br($message);
-	$message = smiley_text($message);
+	$message = generate_text_for_display($message_row['message_text'], $message_row['bbcode_uid'], $message_row['bbcode_bitfield'], ($message_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
 
 	// Replace naughty words such as farty pants
 	$message_row['message_subject'] = censor_text($message_row['message_subject']);
@@ -160,21 +150,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	// End signature parsing, only if needed
 	if ($signature)
 	{
-		$signature = censor_text($signature);
-
-		if ($user_info['user_sig_bbcode_bitfield'])
-		{
-			if ($bbcode === false)
-			{
-				include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
-				$bbcode = new bbcode($user_info['user_sig_bbcode_bitfield']);
-			}
-
-			$bbcode->bbcode_second_pass($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield']);
-		}
-
-		$signature = bbcode_nl2br($signature);
-		$signature = smiley_text($signature);
+		$signature = generate_text_for_display($signature, $user_info['bbcode_uid'], $user_info['bbcode_bitfield'], ($user_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
 	}
 
 	$url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm');
-- 
cgit v1.2.1


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

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

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 235b2a44be..e8768957e0 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -125,7 +125,7 @@ function mcp_post_details($id, $mode, $action)
 	$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;
 
 	// Process message, leave it uncensored
-	$message = generate_text_for_display($post_info['message_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
+	$message = generate_text_for_display($post_info['post_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
 
 	if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
 	{
-- 
cgit v1.2.1


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

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

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 14490343c2..2c95dc6a67 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -132,7 +132,7 @@ class mcp_queue
 				$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;
 
 				// Process message, leave it uncensored
-				$message = generate_text_for_display($post_info['message_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
+				$message = generate_text_for_display($post_info['post_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
 
 				if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
 				{
-- 
cgit v1.2.1


From 0ef1bcac2b3152bbf389b512fd373987a7d0edce Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 20 Jul 2013 16:31:08 +0100
Subject: [ticket/11639] Whitespace fixing

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

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index ad75ed1079..49a1797321 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1108,7 +1108,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 		$parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0);
 		$parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0);
 		// Do not censor text because it has already been censored before
-		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags , false);
+		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, false);
 
 		unset($parse_flags);
 
-- 
cgit v1.2.1


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

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

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

(limited to 'phpBB/includes')

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


From 43b172c8aabbfbcc5180a3f3ad5daede45fcc041 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 20 Jul 2013 16:44:24 +0100
Subject: [ticket/11655] wrong var names for the uid and for the bitfield

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

PHPBB3-11655
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 0a8a3d55ab..52a28e3552 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -150,7 +150,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	// End signature parsing, only if needed
 	if ($signature)
 	{
-		$signature = generate_text_for_display($signature, $user_info['bbcode_uid'], $user_info['bbcode_bitfield'], ($user_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
+		$signature = generate_text_for_display($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield'], ($user_info['user_sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
 	}
 
 	$url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm');
-- 
cgit v1.2.1


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

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

PHPBB3-11717
---
 phpBB/includes/functions_posting.php | 5 ++++-
 phpBB/includes/ucp/ucp_prefs.php     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 03565c27bb..f80736a6c4 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1995,6 +1995,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		}
 	}
 
+	$first_post_topic_info = ($post_mode == 'edit_first_post' && (($post_visibility == ITEM_DELETED && $data['topic_posts_softdeleted'] == 1) ||
+				($post_visibility == ITEM_UNAPPROVED && $data['topic_posts_unapproved'] == 1) ||
+				($post_visibility == ITEM_APPROVED && $data['topic_posts_approved'] == 1)));
 	// Fix the post's and topic's visibility and first/last post information, when the post is edited
 	if (($post_mode != 'post' && $post_mode != 'reply') && $data['post_visibility'] != $post_visibility)
 	{
@@ -2007,7 +2010,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		$phpbb_content_visibility = $phpbb_container->get('content.visibility');
 		$phpbb_content_visibility->set_post_visibility($post_visibility, $data['post_id'], $data['topic_id'], $data['forum_id'], $user->data['user_id'], time(), '', $is_starter, $is_latest);
 	}
-	else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies']))
+	else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || $first_post_topic_info)
 	{
 		if ($post_visibility == ITEM_APPROVED || $data['topic_visibility'] == $post_visibility)
 		{
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 7c3286c1d1..f24578da84 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -267,7 +267,7 @@ class ucp_prefs
 				$limit_topic_days = array(0 => $user->lang['ALL_TOPICS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
 
 				$sort_by_topic_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']);
-				$sort_by_topic_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views');
+				$sort_by_topic_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_posts_approved', 's' => 't.topic_title', 'v' => 't.topic_views');
 
 				// Post ordering options
 				$limit_post_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
-- 
cgit v1.2.1


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

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

(limited to 'phpBB/includes')

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


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

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

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

(limited to 'phpBB/includes')

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


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

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

(limited to 'phpBB/includes')

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


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

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

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

(limited to 'phpBB/includes')

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


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

PHPBB3-11731
---
 phpBB/includes/captcha/captcha_factory.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index 1ed8e119b5..fac45087e3 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -50,7 +50,8 @@ class phpbb_captcha_factory
 		{
 			include($phpbb_root_path . "includes/captcha/plugins/{$name}_plugin." . $phpEx);
 		}
-		call_user_func(array($name, 'garbage_collect'), 0);
+		$captcha = self::get_instance($name);
+		$captcha->garbage_collect(0);
 	}
 
 	/**
-- 
cgit v1.2.1


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

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

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

(limited to 'phpBB/includes')

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


From 1372b4f20801d6079798832f15caf38949fe9333 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Wed, 24 Jul 2013 10:33:06 +0100
Subject: [ticket/11639] Removed a non-needed unset

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

PHPBB3-11639
---
 phpBB/includes/functions_posting.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 49a1797321..acf0cc874b 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1110,8 +1110,6 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 		// Do not censor text because it has already been censored before
 		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, false);
 
-		unset($parse_flags);
-
 		if (!empty($attachments[$row['post_id']]))
 		{
 			$update_count = array();
-- 
cgit v1.2.1


From 98b385bc1c14a3155dd429f8d9118f4d7eb95556 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Jul 2013 11:59:21 -0500
Subject: [ticket/11628] Remove style resource locator

No longer used since Twig was implemented.

PHPBB3-11628
---
 phpBB/includes/bbcode.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index fd00728510..4ce6f17d90 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -132,10 +132,9 @@ class bbcode
 		{
 			$this->template_bitfield = new bitfield($user->style['bbcode_bitfield']);
 
-			$style_resource_locator = new phpbb_style_resource_locator();
 			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path);
 			$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager);
-			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template);
+			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_path_provider, $template);
 			$style->set_style();
 			$template->set_filenames(array('bbcode.html' => 'bbcode.html'));
 			$this->template_filename = $template->get_source_file_for_handle('bbcode.html');
-- 
cgit v1.2.1


From 44a82dd0837a4693b6a4a410c21c438f244094d3 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Jul 2013 12:05:04 -0500
Subject: [ticket/11628] Remove style path provider

No longer used since Twig was implemented.

PHPBB3-11628
---
 phpBB/includes/bbcode.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 4ce6f17d90..9b1939030a 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -132,9 +132,8 @@ class bbcode
 		{
 			$this->template_bitfield = new bitfield($user->style['bbcode_bitfield']);
 
-			$style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider(), $phpbb_root_path);
 			$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager);
-			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_path_provider, $template);
+			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $template);
 			$style->set_style();
 			$template->set_filenames(array('bbcode.html' => 'bbcode.html'));
 			$this->template_filename = $template->get_source_file_for_handle('bbcode.html');
-- 
cgit v1.2.1


From 5d1afb453211d42a8deacb66684c136385918192 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Jul 2013 12:24:35 -0500
Subject: [ticket/11628] Remove phpbb_style (move methods to phpbb_template)

PHPBB3-11628
---
 phpBB/includes/bbcode.php           | 3 +--
 phpBB/includes/functions_module.php | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 9b1939030a..2fa6a8b099 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -133,8 +133,7 @@ class bbcode
 			$this->template_bitfield = new bitfield($user->style['bbcode_bitfield']);
 
 			$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager);
-			$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $template);
-			$style->set_style();
+			$template->set_style();
 			$template->set_filenames(array('bbcode.html' => 'bbcode.html'));
 			$this->template_filename = $template->get_source_file_for_handle('bbcode.html');
 		}
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 99c24fcb19..a5ece1ecac 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -455,7 +455,7 @@ class p_master
 	*/
 	function load_active($mode = false, $module_url = false, $execute_module = true)
 	{
-		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $phpbb_style;
+		global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $template;
 
 		$module_path = $this->include_path . $this->p_class;
 		$icat = request_var('icat', '');
@@ -508,7 +508,7 @@ class p_master
 
 				if (is_dir($module_style_dir))
 				{
-					$phpbb_style->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'), array(), '');
+					$template->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'), array(), '');
 				}
 			}
 
@@ -537,7 +537,7 @@ class p_master
 
 				if (is_dir($phpbb_root_path . $module_style_dir))
 				{
-					$phpbb_style->set_style(array($module_style_dir, 'styles'));
+					$template->set_style(array($module_style_dir, 'styles'));
 				}
 			}
 
-- 
cgit v1.2.1


From 4b761f65758c40db4851983fa3a08d354da3323d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Jul 2013 12:55:41 -0500
Subject: [ticket/11628] Remove third parameter ($names) from set_custom_style

This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index a5ece1ecac..c84e02afe6 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -508,7 +508,7 @@ class p_master
 
 				if (is_dir($module_style_dir))
 				{
-					$template->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'), array(), '');
+					$template->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'), '');
 				}
 			}
 
-- 
cgit v1.2.1


From 863592a8bedbacf3e7bf6bee458797e819020e6f Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Jul 2013 13:19:20 -0500
Subject: [ticket/11628] Remove set_style_names function, moved to
 set_custom_style

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 0222a57bcc..89dd3c70fc 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -660,7 +660,7 @@ class messenger
 	{
 		$this->setup_template();
 
-		$this->template->set_style_names(array($path_name), $paths);
+		$this->template->set_custom_style($path_name, $paths, '');
 	}
 }
 
-- 
cgit v1.2.1


From 12c22585069066957cc3211136ebd480295d4758 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Jul 2013 13:25:20 -0500
Subject: [ticket/11628] Remove template_path option on set_custom_style

This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)

PHPBB3-11628
---
 phpBB/includes/functions_messenger.php | 2 +-
 phpBB/includes/functions_module.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 89dd3c70fc..3a9e1fa77b 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -660,7 +660,7 @@ class messenger
 	{
 		$this->setup_template();
 
-		$this->template->set_custom_style($path_name, $paths, '');
+		$this->template->set_custom_style($path_name, $paths);
 	}
 }
 
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index c84e02afe6..8f0f6a837a 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -508,7 +508,7 @@ class p_master
 
 				if (is_dir($module_style_dir))
 				{
-					$template->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'), '');
+					$template->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'));
 				}
 			}
 
-- 
cgit v1.2.1


From ffbc144a739740ad1901c9eaf481815c9ec2d918 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Jul 2013 13:38:12 -0500
Subject: [ticket/11628] Make get_template_vars protected

Remove all references to it and the hacky code in messenger that was using it

PHPBB3-11628
---
 phpBB/includes/functions_messenger.php | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 3a9e1fa77b..3bfc1a44f0 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 */
 class messenger
 {
-	var $vars, $msg, $extra_headers, $replyto, $from, $subject;
+	var $msg, $extra_headers, $replyto, $from, $subject;
 	var $addresses = array();
 
 	var $mail_priority = MAIL_NORMAL_PRIORITY;
@@ -53,7 +53,7 @@ class messenger
 	function reset()
 	{
 		$this->addresses = $this->extra_headers = array();
-		$this->vars = $this->msg = $this->replyto = $this->from = '';
+		$this->msg = $this->replyto = $this->from = '';
 		$this->mail_priority = MAIL_NORMAL_PRIORITY;
 	}
 
@@ -258,8 +258,6 @@ class messenger
 			'body'		=> $template_file . '.txt',
 		));
 
-		$this->vars = $this->template->get_template_vars();
-
 		return true;
 	}
 
@@ -288,26 +286,11 @@ class messenger
 		global $config, $user;
 
 		// We add some standard variables we always use, no need to specify them always
-		if (!isset($this->vars['U_BOARD']))
-		{
-			$this->assign_vars(array(
-				'U_BOARD'	=> generate_board_url(),
-			));
-		}
-
-		if (!isset($this->vars['EMAIL_SIG']))
-		{
-			$this->assign_vars(array(
-				'EMAIL_SIG'	=> str_replace('<br />', "\n", "-- \n" . htmlspecialchars_decode($config['board_email_sig'])),
-			));
-		}
-
-		if (!isset($this->vars['SITENAME']))
-		{
-			$this->assign_vars(array(
-				'SITENAME'	=> htmlspecialchars_decode($config['sitename']),
-			));
-		}
+		$this->assign_vars(array(
+			'U_BOARD'	=> generate_board_url(),
+			'EMAIL_SIG'	=> str_replace('<br />', "\n", "-- \n" . htmlspecialchars_decode($config['board_email_sig'])),
+			'SITENAME'	=> htmlspecialchars_decode($config['sitename']),
+		));
 
 		// Parse message through template
 		$this->msg = trim($this->template->assign_display('body'));
-- 
cgit v1.2.1


From 866e475f9644dd3575ed62bfb0e7dde0338fd5cc Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Thu, 25 Jul 2013 15:47:55 +0200
Subject: [ticket/10037] Apply attached patch with a few changes

PHPBB3-10037
---
 phpBB/includes/ucp/ucp_profile.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index d35d13b6c1..847311058b 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -548,6 +548,9 @@ class ucp_profile
 				// Build custom bbcodes array
 				display_custom_bbcodes();
 
+				// Generate smiley listing
+				generate_smilies('inline', 0);
+
 			break;
 
 			case 'avatar':
-- 
cgit v1.2.1


From 37ceb57d12b936d810da645b6eb49aa2b1d12a5e Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 26 Jul 2013 18:27:47 -0700
Subject: [ticket/11747] Add $phpbb_dispatcher to global

PHPBB3-11747
---
 phpBB/includes/ucp/ucp_prefs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index f24578da84..73b01deb22 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -26,7 +26,7 @@ class ucp_prefs
 
 	function main($id, $mode)
 	{
-		global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
+		global $config, $db, $user, $auth, $template, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
 
 		$submit = (isset($_POST['submit'])) ? true : false;
 		$error = $data = array();
-- 
cgit v1.2.1


From 79cd86bcbcfb2bf0f27d06fc475ea967ea38755b Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 26 Jul 2013 18:29:06 -0700
Subject: [ticket/11747] ucp_prefs_personal core events

PHPBB3-11747
---
 phpBB/includes/ucp/ucp_prefs.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 73b01deb22..8a92f22bba 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -55,6 +55,20 @@ class ucp_prefs
 					$data['notifymethod'] = NOTIFY_BOTH;
 				}
 
+				/**
+				* Add UCP edit global settings data before they are assigned to the template or submitted
+				*
+				* To assign data to the template, use $template->assign_vars()
+				*
+				* @event core.ucp_prefs_personal_data
+				* @var	bool	submit		Do we display the form only
+				*							or did the user press submit
+				* @var	array	data		Array with current ucp options data
+				* @since 3.1-A1
+				*/
+				$vars = array('submit', 'data');
+				extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_personal_data', compact($vars)));
+
 				if ($submit)
 				{
 					if ($config['override_user_style'])
@@ -93,6 +107,17 @@ class ucp_prefs
 							'user_style'			=> $data['style'],
 						);
 
+						/**
+						* Update UCP edit global settings data on form submit
+						*
+						* @event core.ucp_prefs_personal_update_data
+						* @var	array	data		Submitted display options data
+						* @var	array	sql_ary		Display options data we udpate
+						* @since 3.1-A1
+						*/
+						$vars = array('data', 'sql_ary');
+						extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_personal_update_data', compact($vars)));
+
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
 							WHERE user_id = ' . $user->data['user_id'];
-- 
cgit v1.2.1


From d3859aa87427a75cb7c9f7645de3317a834b00ee Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 26 Jul 2013 18:31:58 -0700
Subject: [ticket/11747] ucp_prefs_view core events

PHPBB3-11747
---
 phpBB/includes/ucp/ucp_prefs.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 8a92f22bba..31cf5a4447 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -234,6 +234,20 @@ class ucp_prefs
 					'wordcensor'	=> request_var('wordcensor', (bool) $user->optionget('viewcensors')),
 				);
 
+				/**
+				* Add UCP edit display options data before they are assigned to the template or submitted
+				*
+				* To assign data to the template, use $template->assign_vars()
+				*
+				* @event core.ucp_prefs_view_data
+				* @var	bool	submit		Do we display the form only
+				*							or did the user press submit
+				* @var	array	data		Array with current ucp options data
+				* @since 3.1-A1
+				*/
+				$vars = array('submit', 'data');
+				extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_view_data', compact($vars)));
+
 				if ($submit)
 				{
 					$error = validate_data($data, array(
@@ -272,6 +286,17 @@ class ucp_prefs
 							'user_post_show_days'	=> $data['post_st'],
 						);
 
+						/**
+						* Update UCP edit display options data on form submit
+						*
+						* @event core.ucp_prefs_view_update_data
+						* @var	array	data		Submitted display options data
+						* @var	array	sql_ary		Display options data we udpate
+						* @since 3.1-A1
+						*/
+						$vars = array('data', 'sql_ary');
+						extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_view_update_data', compact($vars)));
+
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
 							WHERE user_id = ' . $user->data['user_id'];
-- 
cgit v1.2.1


From 01e133f3563181e163aa0fc85e89a6fc35d31c0f Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 26 Jul 2013 18:33:27 -0700
Subject: [ticket/11747] ucp_prefs_post core events

PHPBB3-11747
---
 phpBB/includes/ucp/ucp_prefs.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 31cf5a4447..e80cc2dce3 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -385,6 +385,20 @@ class ucp_prefs
 				);
 				add_form_key('ucp_prefs_post');
 
+				/**
+				* Add UCP edit posting defaults data before they are assigned to the template or submitted
+				*
+				* To assign data to the template, use $template->assign_vars()
+				*
+				* @event core.ucp_prefs_post_data
+				* @var	bool	submit		Do we display the form only
+				*							or did the user press submit
+				* @var	array	data		Array with current ucp options data
+				* @since 3.1-A1
+				*/
+				$vars = array('submit', 'data');
+				extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_post_data', compact($vars)));
+
 				if ($submit)
 				{
 					if (check_form_key('ucp_prefs_post'))
@@ -398,6 +412,17 @@ class ucp_prefs
 							'user_notify'	=> $data['notify'],
 						);
 
+						/**
+						* Update UCP edit posting defaults data on form submit
+						*
+						* @event core.ucp_prefs_post_update_data
+						* @var	array	data		Submitted display options data
+						* @var	array	sql_ary		Display options data we udpate
+						* @since 3.1-A1
+						*/
+						$vars = array('data', 'sql_ary');
+						extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_post_update_data', compact($vars)));
+
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
 							WHERE user_id = ' . $user->data['user_id'];
-- 
cgit v1.2.1


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

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

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

(limited to 'phpBB/includes')

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


From c335edc038461449d86c2278cf414f304dcc735b Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 30 Jul 2013 12:21:34 +0300
Subject: [ticket/11754] Remove styleswitcher leftovers

PHPBB3-11754
---
 phpBB/includes/functions.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 49f2e469bc..3db843ffd1 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5390,8 +5390,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'T_UPLOAD'				=> $config['upload_path'],
 
 		'SITE_LOGO_IMG'			=> $user->img('site_logo'),
-
-		'A_COOKIE_SETTINGS'		=> addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')),
 	));
 
 	// application/xhtml+xml not used because of IE
-- 
cgit v1.2.1


From c2aff70cf561c1787be6cdaa193432d0cbdf432d Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 1 Aug 2013 10:03:04 +0100
Subject: [ticket/11655] Use $parse_flags

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

PHPBB3-11655
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 52a28e3552..8e7ae49fa4 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -76,7 +76,8 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	$user_info = get_user_information($author_id, $message_row);
 
 	// Parse the message and subject
-	$message = generate_text_for_display($message_row['message_text'], $message_row['bbcode_uid'], $message_row['bbcode_bitfield'], ($message_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
+	$parse_flags = ($message_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES
+	$message = generate_text_for_display($message_row['message_text'], $message_row['bbcode_uid'], $message_row['bbcode_bitfield'], $parse_flags, true);
 
 	// Replace naughty words such as farty pants
 	$message_row['message_subject'] = censor_text($message_row['message_subject']);
-- 
cgit v1.2.1


From 776773522ba129c0e7d0918b2f6beccd4c044dbe Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 1 Aug 2013 10:07:58 +0100
Subject: [ticket/11653] Use $parse_flags

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

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 3491f37bcb..5014879b02 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -213,7 +213,8 @@ function mcp_topic_view($id, $mode, $action)
 		$message = $row['post_text'];
 		$post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title'];
 
-		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
+		$parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, false);
 
 		if (!empty($attachments[$row['post_id']]))
 		{
-- 
cgit v1.2.1


From c806375828c01c011915f1438f718349aaaaf282 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 1 Aug 2013 10:09:11 +0100
Subject: [ticket/11653] Missing ";"

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

PHPBB3-11653
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 8e7ae49fa4..79c4297858 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -76,7 +76,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	$user_info = get_user_information($author_id, $message_row);
 
 	// Parse the message and subject
-	$parse_flags = ($message_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES
+	$parse_flags = ($message_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
 	$message = generate_text_for_display($message_row['message_text'], $message_row['bbcode_uid'], $message_row['bbcode_bitfield'], $parse_flags, true);
 
 	// Replace naughty words such as farty pants
-- 
cgit v1.2.1


From ea6938d3e518b636529238ab9ffd5b57b1a19241 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 1 Aug 2013 10:11:08 +0100
Subject: [ticket/11643] Use $parse_flags

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

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 2c95dc6a67..190fccab9a 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -132,7 +132,8 @@ class mcp_queue
 				$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;
 
 				// Process message, leave it uncensored
-				$message = generate_text_for_display($post_info['post_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
+				$parse_flags = ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+				$message = generate_text_for_display($post_info['post_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], $parse_flags, false);
 
 				if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
 				{
-- 
cgit v1.2.1


From a302a09ffbe174e6720ce250121d34ba8b6fd626 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 1 Aug 2013 10:12:58 +0100
Subject: [ticket/11642] Use $parse_flags

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

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index e8768957e0..e9f6ce0471 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -125,7 +125,8 @@ function mcp_post_details($id, $mode, $action)
 	$post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false;
 
 	// Process message, leave it uncensored
-	$message = generate_text_for_display($post_info['post_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
+	$parse_flags = ($post_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+	$message = generate_text_for_display($post_info['post_text'], $post_info['bbcode_uid'], $post_info['bbcode_bitfield'], $parse_flags, false);
 
 	if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
 	{
-- 
cgit v1.2.1


From 3ae33910fc600ae86f0036370958bd7ec19e7ab9 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 1 Aug 2013 10:14:34 +0100
Subject: [ticket/11653] Use $parse_flags

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

PHPBB3-11653
---
 phpBB/includes/ucp/ucp_pm_viewmessage.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 79c4297858..c7b4489daf 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -151,7 +151,8 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	// End signature parsing, only if needed
 	if ($signature)
 	{
-		$signature = generate_text_for_display($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield'], ($user_info['user_sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
+		$parse_flags = ($user_info['user_sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+		$signature = generate_text_for_display($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield'], $parse_flags, true);
 	}
 
 	$url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm');
-- 
cgit v1.2.1


From 2f251972790e7836d9c35eb2f5b49fda97f736d6 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 1 Aug 2013 10:16:33 +0100
Subject: [ticket/11641] Use $parse_flags

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

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index dc953aae33..cb61b25174 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -115,7 +115,8 @@ class mcp_pm_reports
 				}
 
 				// Process message, leave it uncensored
-				$message = generate_text_for_display($pm_info['message_text'], $pm_info['bbcode_uid'], $pm_info['bbcode_bitfield'], ($pm_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, false);
+				$parse_flags = ($pm_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+				$message = generate_text_for_display($pm_info['message_text'], $pm_info['bbcode_uid'], $pm_info['bbcode_bitfield'], $parse_flags, false);
 
 				$report['report_text'] = make_clickable(bbcode_nl2br($report['report_text']));
 
-- 
cgit v1.2.1


From ea8f584de9d572f8c58b26acd1fd7551c42ab59c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 1 Aug 2013 17:26:34 +0200
Subject: [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 0a853adb9b..09e1e50b8d 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.0.12-RC1');
+define('PHPBB_VERSION', '3.0.12-RC2');
 
 // QA-related
 // define('PHPBB_QA', 1);
-- 
cgit v1.2.1


From 8a02db317ef3c2d3c4e3dcfc5f8b85397f7ebb4a Mon Sep 17 00:00:00 2001
From: s9e <s9e.dev@gmail.com>
Date: Sat, 3 Aug 2013 12:20:52 +0200
Subject: [ticket/11762] Use the === operator to distinguish "0" from ""

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index b7650ecd6a..6213d2fd24 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -413,7 +413,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags)
 {
 	static $bbcode;
 
-	if (!$text)
+	if ($text === '')
 	{
 		return '';
 	}
@@ -459,7 +459,7 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb
 	$uid = $bitfield = '';
 	$flags = (($allow_bbcode) ? OPTION_FLAG_BBCODE : 0) + (($allow_smilies) ? OPTION_FLAG_SMILIES : 0) + (($allow_urls) ? OPTION_FLAG_LINKS : 0);
 
-	if (!$text)
+	if ($text === '')
 	{
 		return;
 	}
-- 
cgit v1.2.1


From 28a0a9e0b1cf77f1be64934f98e4c607d6098362 Mon Sep 17 00:00:00 2001
From: brunoais <brunoaiss@gmail.com>
Date: Sat, 3 Aug 2013 21:46:06 +0100
Subject: [ticket/11639] Changing how censorship is handled.

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

PHPBB3-11639
---
 phpBB/includes/functions_posting.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index acf0cc874b..c528d36fef 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1093,13 +1093,12 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 
 		$poster_id		= $row['user_id'];
 		$post_subject	= $row['post_subject'];
-		$message		= censor_text($row['post_text']);
 
 		$decoded_message = false;
 
 		if ($show_quote_button && $auth->acl_get('f_reply', $forum_id))
 		{
-			$decoded_message = $message;
+			$decoded_message = censor_text($row['post_text']);
 			decode_message($decoded_message, $row['bbcode_uid']);
 
 			$decoded_message = bbcode_nl2br($decoded_message);
@@ -1107,8 +1106,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 
 		$parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0);
 		$parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0);
-		// Do not censor text because it has already been censored before
-		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, false);
+		$message = generate_text_for_display($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, true);
 
 		if (!empty($attachments[$row['post_id']]))
 		{
-- 
cgit v1.2.1


From 91eccc708bb0ca4143ad670be6ecddef818b9316 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 8 Aug 2013 13:42:51 +0200
Subject: [ticket/11775] Fix error when moving the last post to another topic

PHPBB3-11775
---
 phpBB/includes/mcp/mcp_topic.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 76985488b7..8e0e89e3da 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -668,10 +668,10 @@ function merge_posts($topic_id, $to_topic_id)
 			}
 
 			// If the topic no longer exist, we will update the topic watch table.
-			phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
+			phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', array($topic_id), $to_topic_id);
 
 			// If the topic no longer exist, we will update the bookmarks table.
-			phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', $topic_id, $to_topic_id);
+			phpbb_update_rows_avoiding_duplicates($db, BOOKMARKS_TABLE, 'topic_id', array($topic_id), $to_topic_id);
 		}
 
 		// Link to the new topic
-- 
cgit v1.2.1


From 74559eb0d59d9b97d6769ef5d57a3b375a6b8507 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Thu, 8 Aug 2013 15:50:20 +0200
Subject: [ticket/11774] Fix constant to avoid PHP errors

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 72400ce623..3f48c58073 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -187,7 +187,7 @@ class mcp_reports
 					'S_CLOSE_ACTION'		=> append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&amp;mode=report_details&amp;f=' . $post_info['forum_id'] . '&amp;p=' . $post_id),
 					'S_CAN_VIEWIP'			=> $auth->acl_get('m_info', $post_info['forum_id']),
 					'S_POST_REPORTED'		=> $post_info['post_reported'],
-					'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == POST_UNAPPROVED),
+					'S_POST_UNAPPROVED'		=> ($post_info['post_visibility'] == ITEM_UNAPPROVED),
 					'S_POST_LOCKED'			=> $post_info['post_edit_locked'],
 					'S_USER_NOTES'			=> true,
 
-- 
cgit v1.2.1


From 5f81d66c2f666c1825950228e87e7ac6c6b4ca2c Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 23 Aug 2013 03:55:26 +0200
Subject: [ticket/11799] Send anti abuse headers in "new password" emails.

PHPBB3-11799
---
 phpBB/includes/ucp/ucp_remind.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index cb89ad99be..bcb21cbedc 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -98,6 +98,8 @@ class ucp_remind
 			$messenger->to($user_row['user_email'], $user_row['username']);
 			$messenger->im($user_row['user_jabber'], $user_row['username']);
 
+			$messenger->anti_abuse_headers($config, $user);
+
 			$messenger->assign_vars(array(
 				'USERNAME'		=> htmlspecialchars_decode($user_row['username']),
 				'PASSWORD'		=> htmlspecialchars_decode($user_password),
-- 
cgit v1.2.1


From 2845b153d8e86b80c6b9a8c0869474affb277516 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 23 Aug 2013 22:52:33 +0200
Subject: [ticket/11769] Correctly supply the post author's username in
 posting.php

Only supply the username, when it is a guest posting or we edit and it was
supplied, otherwise post_data might hold data of the post we quote, in which
case username is the original poster, not the current one.

PHPBB3-11769
---
 phpBB/includes/functions_posting.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 2e5130c5b8..aff7129fce 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2604,7 +2604,10 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	// Send Notifications
 	if (($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_approval)
 	{
-		$username = ($username) ? $username : $user->data['username'];
+		// If a username was supplied or the poster is a guest, we use the supplied username.
+		// This way we will use "...post by guest-username..." in notifications,
+		// when guest-username was supplied and ommit the username-part otherwise.
+		$username = ($username || !$user->data['is_registered']) ? $username : $user->data['username'];
 		user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id'], $username);
 	}
 
-- 
cgit v1.2.1


From d717203af1263e552886251fbee9b718be45f623 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 23 Aug 2013 23:49:11 +0200
Subject: [ticket/11769] Fix language issues in the doc blocks

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index aff7129fce..32206df868 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2604,9 +2604,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	// Send Notifications
 	if (($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_approval)
 	{
-		// If a username was supplied or the poster is a guest, we use the supplied username.
-		// This way we will use "...post by guest-username..." in notifications,
-		// when guest-username was supplied and ommit the username-part otherwise.
+		// If a username was supplied or the poster is a guest, we will use the supplied username.
+		// Doing it this way we can use "...post by guest-username..." in notifications when
+		// "guest-username" is supplied or ommit the username if it is not.
 		$username = ($username || !$user->data['is_registered']) ? $username : $user->data['username'];
 		user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id'], $username);
 	}
-- 
cgit v1.2.1


From ffee476047a996c1a138bd0050826a7a45c01a94 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 31 Aug 2013 14:31:50 -0700
Subject: [ticket/11215] Everything appears to be working...

PHPBB3-11215
---
 phpBB/includes/functions.php | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 428dcfec4a..d85606944f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2413,7 +2413,7 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 {
 	global $_SID, $_EXTRA_URL, $phpbb_hook;
 	global $phpbb_dispatcher;
-	global $symfony_request;
+	global $symfony_request, $phpbb_root_path;
 
 	if ($params === '' || (is_array($params) && empty($params)))
 	{
@@ -2421,10 +2421,10 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 		$params = false;
 	}
 
-	$corrected_root = $symfony_request !== null ? phpbb_get_web_root_path($symfony_request) : '';
-	if ($corrected_root)
+	$corrected_path = $symfony_request !== null ? phpbb_get_web_root_path($symfony_request, $phpbb_root_path) : '';
+	if ($corrected_path)
 	{
-		$url = $corrected_root . substr($url, strlen($phpbb_root_path));
+		$url = substr($corrected_path . $url, strlen($phpbb_root_path));
 	}
 
 	$append_sid_overwrite = false;
@@ -5218,7 +5218,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 	// This path is sent with the base template paths in the assign_vars()
 	// call below. We need to correct it in case we are accessing from a
 	// controller because the web paths will be incorrect otherwise.
-	$corrected_path = $symfony_request !== null ? phpbb_get_web_root_path($symfony_request) : '';
+	$corrected_path = $symfony_request !== null ? phpbb_get_web_root_path($symfony_request, $phpbb_root_path) : '';
 	$web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;
 
 	// Send a proper content-language to the output
@@ -5731,7 +5731,7 @@ function phpbb_create_symfony_request(phpbb_request $request)
 *
 * @param Request $symfony_request Symfony Request object
 */
-function phpbb_get_web_root_path(Request $symfony_request)
+function phpbb_get_web_root_path(Request $symfony_request, $phpbb_root_path = '')
 {
 	static $path;
 	if (null !== $path)
@@ -5740,23 +5740,13 @@ function phpbb_get_web_root_path(Request $symfony_request)
 	}
 
 	$path_info = $symfony_request->getPathInfo();
-
-	// When no path is given (i.e. REQUEST_URI = "./app.php") path info from
-	// the Symfony Request object is "/". However, that is the same as when
-	// the REQUEST_URI is "./app.php/". So we want to correct the path when
-	// we have a trailing slash in the REQUEST_URI, but not when we don't.
-	$request_uri = $symfony_request->server->get('REQUEST_URI');
-	$trailing_slash = substr($request_uri, -1) === '/';
-
-	// If pathinfo is / and we do not have a trailing slash in the REQUEST_URI
-	if (!$trailing_slash && '/' === $path_info)
+	if ($path_info === '/')
 	{
-		$path = '';
+		$path = $phpbb_root_path;
 		return $path;
 	}
 
 	$corrections = substr_count($path_info, '/');
-	$path = str_repeat('../', $corrections);
-
+	$path = $phpbb_root_path . str_repeat('../', $corrections);
 	return $path;
 }
-- 
cgit v1.2.1


From 42b9c3c479a28ba74c214676a17e7e783150e227 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 2 Sep 2013 01:11:40 +0200
Subject: [ticket/11769] Allow '0' as username

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 32206df868..11a5067ef9 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2607,7 +2607,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		// If a username was supplied or the poster is a guest, we will use the supplied username.
 		// Doing it this way we can use "...post by guest-username..." in notifications when
 		// "guest-username" is supplied or ommit the username if it is not.
-		$username = ($username || !$user->data['is_registered']) ? $username : $user->data['username'];
+		$username = ($username !== '' || !$user->data['is_registered']) ? $username : $user->data['username'];
 		user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id'], $username);
 	}
 
-- 
cgit v1.2.1


From 9d48ee446b10e492b83448c3778b48729839b788 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 2 Sep 2013 09:43:41 -0700
Subject: [ticket/11215] Add commented-out URL rewrite capability to .htaccess

PHPBB3-11215
---
 phpBB/includes/functions.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d85606944f..4d2d704a43 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5747,6 +5747,14 @@ function phpbb_get_web_root_path(Request $symfony_request, $phpbb_root_path = ''
 	}
 
 	$corrections = substr_count($path_info, '/');
+
+	// When URL Rewriting is enabled, app.php is optional. We have to
+	// correct for it not being there
+	if (strpos($symfony_request->getRequestUri(), $symfony_request->getScriptName()) === false)
+	{
+		$corrections -= 1;
+	}
+
 	$path = $phpbb_root_path . str_repeat('../', $corrections);
 	return $path;
 }
-- 
cgit v1.2.1


From 8ee86b75908141c28aa4d92ba93921337cde30c3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 28 Aug 2013 13:40:35 -0500
Subject: [ticket/11791] Load adm/ events from styles/adm/event/

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

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 8f0f6a837a..80477684a8 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -508,7 +508,7 @@ class p_master
 
 				if (is_dir($module_style_dir))
 				{
-					$template->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'));
+					$template->set_custom_style('adm', array($module_style_dir, $phpbb_admin_path . 'style'));
 				}
 			}
 
-- 
cgit v1.2.1


From 19074a3420029cfdf363a8afeb98443018a0e767 Mon Sep 17 00:00:00 2001
From: Dhruv <dhruv.goel92@gmail.com>
Date: Tue, 3 Sep 2013 19:44:07 +0530
Subject: [ticket/11825] Move schema_data.php into includes/ instead of phpbb/

PHPBB3-11825
---
 phpBB/includes/db/schema_data.php | 1194 +++++++++++++++++++++++++++++++++++++
 1 file changed, 1194 insertions(+)
 create mode 100644 phpBB/includes/db/schema_data.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/db/schema_data.php b/phpBB/includes/db/schema_data.php
new file mode 100644
index 0000000000..9940a9380f
--- /dev/null
+++ b/phpBB/includes/db/schema_data.php
@@ -0,0 +1,1194 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+$schema_data = array();
+
+/**
+* Define the basic structure
+* The format:
+*		array('{TABLE_NAME}' => {TABLE_DATA})
+*		{TABLE_DATA}:
+*			COLUMNS = array({column_name} = array({column_type}, {default}, {auto_increment}))
+*			PRIMARY_KEY = {column_name(s)}
+*			KEYS = array({key_name} = array({key_type}, {column_name(s)})),
+*
+*	Column Types:
+*	INT:x		=> SIGNED int(x)
+*	BINT		=> BIGINT
+*	UINT		=> mediumint(8) UNSIGNED
+*	UINT:x		=> int(x) UNSIGNED
+*	TINT:x		=> tinyint(x)
+*	USINT		=> smallint(4) UNSIGNED (for _order columns)
+*	BOOL		=> tinyint(1) UNSIGNED
+*	VCHAR		=> varchar(255)
+*	CHAR:x		=> char(x)
+*	XSTEXT_UNI	=> text for storing 100 characters (topic_title for example)
+*	STEXT_UNI	=> text for storing 255 characters (normal input field with a max of 255 single-byte chars) - same as VCHAR_UNI
+*	TEXT_UNI	=> text for storing 3000 characters (short text, descriptions, comments, etc.)
+*	MTEXT_UNI	=> mediumtext (post text, large text)
+*	VCHAR:x		=> varchar(x)
+*	TIMESTAMP	=> int(11) UNSIGNED
+*	DECIMAL		=> decimal number (5,2)
+*	DECIMAL:	=> decimal number (x,2)
+*	PDECIMAL	=> precision decimal number (6,3)
+*	PDECIMAL:	=> precision decimal number (x,3)
+*	VCHAR_UNI	=> varchar(255) BINARY
+*	VCHAR_CI	=> varchar_ci for postgresql, others VCHAR
+*/
+$schema_data['phpbb_attachments'] = array(
+	'COLUMNS'		=> array(
+		'attach_id'			=> array('UINT', NULL, 'auto_increment'),
+		'post_msg_id'		=> array('UINT', 0),
+		'topic_id'			=> array('UINT', 0),
+		'in_message'		=> array('BOOL', 0),
+		'poster_id'			=> array('UINT', 0),
+		'is_orphan'			=> array('BOOL', 1),
+		'physical_filename'	=> array('VCHAR', ''),
+		'real_filename'		=> array('VCHAR', ''),
+		'download_count'	=> array('UINT', 0),
+		'attach_comment'	=> array('TEXT_UNI', ''),
+		'extension'			=> array('VCHAR:100', ''),
+		'mimetype'			=> array('VCHAR:100', ''),
+		'filesize'			=> array('UINT:20', 0),
+		'filetime'			=> array('TIMESTAMP', 0),
+		'thumbnail'			=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'attach_id',
+	'KEYS'			=> array(
+		'filetime'			=> array('INDEX', 'filetime'),
+		'post_msg_id'		=> array('INDEX', 'post_msg_id'),
+		'topic_id'			=> array('INDEX', 'topic_id'),
+		'poster_id'			=> array('INDEX', 'poster_id'),
+		'is_orphan'			=> array('INDEX', 'is_orphan'),
+	),
+);
+
+$schema_data['phpbb_acl_groups'] = array(
+	'COLUMNS'		=> array(
+		'group_id'			=> array('UINT', 0),
+		'forum_id'			=> array('UINT', 0),
+		'auth_option_id'	=> array('UINT', 0),
+		'auth_role_id'		=> array('UINT', 0),
+		'auth_setting'		=> array('TINT:2', 0),
+	),
+	'KEYS'			=> array(
+		'group_id'		=> array('INDEX', 'group_id'),
+		'auth_opt_id'	=> array('INDEX', 'auth_option_id'),
+		'auth_role_id'	=> array('INDEX', 'auth_role_id'),
+	),
+);
+
+$schema_data['phpbb_acl_options'] = array(
+	'COLUMNS'		=> array(
+		'auth_option_id'	=> array('UINT', NULL, 'auto_increment'),
+		'auth_option'		=> array('VCHAR:50', ''),
+		'is_global'			=> array('BOOL', 0),
+		'is_local'			=> array('BOOL', 0),
+		'founder_only'		=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'auth_option_id',
+	'KEYS'			=> array(
+		'auth_option'		=> array('UNIQUE', 'auth_option'),
+	),
+);
+
+$schema_data['phpbb_acl_roles'] = array(
+	'COLUMNS'		=> array(
+		'role_id'			=> array('UINT', NULL, 'auto_increment'),
+		'role_name'			=> array('VCHAR_UNI', ''),
+		'role_description'	=> array('TEXT_UNI', ''),
+		'role_type'			=> array('VCHAR:10', ''),
+		'role_order'		=> array('USINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'role_id',
+	'KEYS'			=> array(
+		'role_type'			=> array('INDEX', 'role_type'),
+		'role_order'		=> array('INDEX', 'role_order'),
+	),
+);
+
+$schema_data['phpbb_acl_roles_data'] = array(
+	'COLUMNS'		=> array(
+		'role_id'			=> array('UINT', 0),
+		'auth_option_id'	=> array('UINT', 0),
+		'auth_setting'		=> array('TINT:2', 0),
+	),
+	'PRIMARY_KEY'	=> array('role_id', 'auth_option_id'),
+	'KEYS'			=> array(
+		'ath_op_id'			=> array('INDEX', 'auth_option_id'),
+	),
+);
+
+$schema_data['phpbb_acl_users'] = array(
+	'COLUMNS'		=> array(
+		'user_id'			=> array('UINT', 0),
+		'forum_id'			=> array('UINT', 0),
+		'auth_option_id'	=> array('UINT', 0),
+		'auth_role_id'		=> array('UINT', 0),
+		'auth_setting'		=> array('TINT:2', 0),
+	),
+	'KEYS'			=> array(
+		'user_id'			=> array('INDEX', 'user_id'),
+		'auth_option_id'	=> array('INDEX', 'auth_option_id'),
+		'auth_role_id'		=> array('INDEX', 'auth_role_id'),
+	),
+);
+
+$schema_data['phpbb_banlist'] = array(
+	'COLUMNS'		=> array(
+		'ban_id'			=> array('UINT', NULL, 'auto_increment'),
+		'ban_userid'		=> array('UINT', 0),
+		'ban_ip'			=> array('VCHAR:40', ''),
+		'ban_email'			=> array('VCHAR_UNI:100', ''),
+		'ban_start'			=> array('TIMESTAMP', 0),
+		'ban_end'			=> array('TIMESTAMP', 0),
+		'ban_exclude'		=> array('BOOL', 0),
+		'ban_reason'		=> array('VCHAR_UNI', ''),
+		'ban_give_reason'	=> array('VCHAR_UNI', ''),
+	),
+	'PRIMARY_KEY'			=> 'ban_id',
+	'KEYS'			=> array(
+		'ban_end'			=> array('INDEX', 'ban_end'),
+		'ban_user'			=> array('INDEX', array('ban_userid', 'ban_exclude')),
+		'ban_email'			=> array('INDEX', array('ban_email', 'ban_exclude')),
+		'ban_ip'			=> array('INDEX', array('ban_ip', 'ban_exclude')),
+	),
+);
+
+$schema_data['phpbb_bbcodes'] = array(
+	'COLUMNS'		=> array(
+		'bbcode_id'				=> array('USINT', 0),
+		'bbcode_tag'			=> array('VCHAR:16', ''),
+		'bbcode_helpline'		=> array('VCHAR_UNI', ''),
+		'display_on_posting'	=> array('BOOL', 0),
+		'bbcode_match'			=> array('TEXT_UNI', ''),
+		'bbcode_tpl'			=> array('MTEXT_UNI', ''),
+		'first_pass_match'		=> array('MTEXT_UNI', ''),
+		'first_pass_replace'	=> array('MTEXT_UNI', ''),
+		'second_pass_match'		=> array('MTEXT_UNI', ''),
+		'second_pass_replace'	=> array('MTEXT_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> 'bbcode_id',
+	'KEYS'			=> array(
+		'display_on_post'		=> array('INDEX', 'display_on_posting'),
+	),
+);
+
+$schema_data['phpbb_bookmarks'] = array(
+	'COLUMNS'		=> array(
+		'topic_id'			=> array('UINT', 0),
+		'user_id'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'			=> array('topic_id', 'user_id'),
+);
+
+$schema_data['phpbb_bots'] = array(
+	'COLUMNS'		=> array(
+		'bot_id'			=> array('UINT', NULL, 'auto_increment'),
+		'bot_active'		=> array('BOOL', 1),
+		'bot_name'			=> array('STEXT_UNI', ''),
+		'user_id'			=> array('UINT', 0),
+		'bot_agent'			=> array('VCHAR', ''),
+		'bot_ip'			=> array('VCHAR', ''),
+	),
+	'PRIMARY_KEY'	=> 'bot_id',
+	'KEYS'			=> array(
+		'bot_active'		=> array('INDEX', 'bot_active'),
+	),
+);
+
+$schema_data['phpbb_config'] = array(
+	'COLUMNS'		=> array(
+		'config_name'		=> array('VCHAR', ''),
+		'config_value'		=> array('VCHAR_UNI', ''),
+		'is_dynamic'		=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'config_name',
+	'KEYS'			=> array(
+		'is_dynamic'		=> array('INDEX', 'is_dynamic'),
+	),
+);
+
+$schema_data['phpbb_config_text'] = array(
+	'COLUMNS'		=> array(
+		'config_name'		=> array('VCHAR', ''),
+		'config_value'		=> array('MTEXT', ''),
+	),
+	'PRIMARY_KEY'	=> 'config_name',
+);
+
+$schema_data['phpbb_confirm'] = array(
+	'COLUMNS'		=> array(
+		'confirm_id'		=> array('CHAR:32', ''),
+		'session_id'		=> array('CHAR:32', ''),
+		'confirm_type'		=> array('TINT:3', 0),
+		'code'				=> array('VCHAR:8', ''),
+		'seed'				=> array('UINT:10', 0),
+		'attempts'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> array('session_id', 'confirm_id'),
+	'KEYS'			=> array(
+		'confirm_type'		=> array('INDEX', 'confirm_type'),
+	),
+);
+
+$schema_data['phpbb_disallow'] = array(
+	'COLUMNS'		=> array(
+		'disallow_id'		=> array('UINT', NULL, 'auto_increment'),
+		'disallow_username'	=> array('VCHAR_UNI:255', ''),
+	),
+	'PRIMARY_KEY'	=> 'disallow_id',
+);
+
+$schema_data['phpbb_drafts'] = array(
+	'COLUMNS'		=> array(
+		'draft_id'			=> array('UINT', NULL, 'auto_increment'),
+		'user_id'			=> array('UINT', 0),
+		'topic_id'			=> array('UINT', 0),
+		'forum_id'			=> array('UINT', 0),
+		'save_time'			=> array('TIMESTAMP', 0),
+		'draft_subject'		=> array('STEXT_UNI', ''),
+		'draft_message'		=> array('MTEXT_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> 'draft_id',
+	'KEYS'			=> array(
+		'save_time'			=> array('INDEX', 'save_time'),
+	),
+);
+
+$schema_data['phpbb_ext'] = array(
+	'COLUMNS'		=> array(
+		'ext_name'				=> array('VCHAR', ''),
+		'ext_active'			=> array('BOOL', 0),
+		'ext_state'				=> array('TEXT', ''),
+	),
+	'KEYS'			=> array(
+		'ext_name'				=> array('UNIQUE', 'ext_name'),
+	),
+);
+
+$schema_data['phpbb_extensions'] = array(
+	'COLUMNS'		=> array(
+		'extension_id'		=> array('UINT', NULL, 'auto_increment'),
+		'group_id'			=> array('UINT', 0),
+		'extension'			=> array('VCHAR:100', ''),
+	),
+	'PRIMARY_KEY'	=> 'extension_id',
+);
+
+$schema_data['phpbb_extension_groups'] = array(
+	'COLUMNS'		=> array(
+		'group_id'			=> array('UINT', NULL, 'auto_increment'),
+		'group_name'		=> array('VCHAR_UNI', ''),
+		'cat_id'			=> array('TINT:2', 0),
+		'allow_group'		=> array('BOOL', 0),
+		'download_mode'		=> array('BOOL', 1),
+		'upload_icon'		=> array('VCHAR', ''),
+		'max_filesize'		=> array('UINT:20', 0),
+		'allowed_forums'	=> array('TEXT', ''),
+		'allow_in_pm'		=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'group_id',
+);
+
+$schema_data['phpbb_forums'] = array(
+	'COLUMNS'		=> array(
+		'forum_id'				=> array('UINT', NULL, 'auto_increment'),
+		'parent_id'				=> array('UINT', 0),
+		'left_id'				=> array('UINT', 0),
+		'right_id'				=> array('UINT', 0),
+		'forum_parents'			=> array('MTEXT', ''),
+		'forum_name'			=> array('STEXT_UNI', ''),
+		'forum_desc'			=> array('TEXT_UNI', ''),
+		'forum_desc_bitfield'	=> array('VCHAR:255', ''),
+		'forum_desc_options'	=> array('UINT:11', 7),
+		'forum_desc_uid'		=> array('VCHAR:8', ''),
+		'forum_link'			=> array('VCHAR_UNI', ''),
+		'forum_password'		=> array('VCHAR_UNI:40', ''),
+		'forum_style'			=> array('UINT', 0),
+		'forum_image'			=> array('VCHAR', ''),
+		'forum_rules'			=> array('TEXT_UNI', ''),
+		'forum_rules_link'		=> array('VCHAR_UNI', ''),
+		'forum_rules_bitfield'	=> array('VCHAR:255', ''),
+		'forum_rules_options'	=> array('UINT:11', 7),
+		'forum_rules_uid'		=> array('VCHAR:8', ''),
+		'forum_topics_per_page'	=> array('TINT:4', 0),
+		'forum_type'			=> array('TINT:4', 0),
+		'forum_status'			=> array('TINT:4', 0),
+		'forum_posts_approved'		=> array('UINT', 0),
+		'forum_posts_unapproved'	=> array('UINT', 0),
+		'forum_posts_softdeleted'	=> array('UINT', 0),
+		'forum_topics_approved'		=> array('UINT', 0),
+		'forum_topics_unapproved'	=> array('UINT', 0),
+		'forum_topics_softdeleted'	=> array('UINT', 0),
+		'forum_last_post_id'	=> array('UINT', 0),
+		'forum_last_poster_id'	=> array('UINT', 0),
+		'forum_last_post_subject' => array('STEXT_UNI', ''),
+		'forum_last_post_time'	=> array('TIMESTAMP', 0),
+		'forum_last_poster_name'=> array('VCHAR_UNI', ''),
+		'forum_last_poster_colour'=> array('VCHAR:6', ''),
+		'forum_flags'			=> array('TINT:4', 32),
+		'forum_options'			=> array('UINT:20', 0),
+		'display_subforum_list'	=> array('BOOL', 1),
+		'display_on_index'		=> array('BOOL', 1),
+		'enable_indexing'		=> array('BOOL', 1),
+		'enable_icons'			=> array('BOOL', 1),
+		'enable_prune'			=> array('BOOL', 0),
+		'prune_next'			=> array('TIMESTAMP', 0),
+		'prune_days'			=> array('UINT', 0),
+		'prune_viewed'			=> array('UINT', 0),
+		'prune_freq'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'forum_id',
+	'KEYS'			=> array(
+		'left_right_id'			=> array('INDEX', array('left_id', 'right_id')),
+		'forum_lastpost_id'		=> array('INDEX', 'forum_last_post_id'),
+	),
+);
+
+$schema_data['phpbb_forums_access'] = array(
+	'COLUMNS'		=> array(
+		'forum_id'				=> array('UINT', 0),
+		'user_id'				=> array('UINT', 0),
+		'session_id'			=> array('CHAR:32', ''),
+	),
+	'PRIMARY_KEY'	=> array('forum_id', 'user_id', 'session_id'),
+);
+
+$schema_data['phpbb_forums_track'] = array(
+	'COLUMNS'		=> array(
+		'user_id'				=> array('UINT', 0),
+		'forum_id'				=> array('UINT', 0),
+		'mark_time'				=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> array('user_id', 'forum_id'),
+);
+
+$schema_data['phpbb_forums_watch'] = array(
+	'COLUMNS'		=> array(
+		'forum_id'				=> array('UINT', 0),
+		'user_id'				=> array('UINT', 0),
+		'notify_status'			=> array('BOOL', 0),
+	),
+	'KEYS'			=> array(
+		'forum_id'				=> array('INDEX', 'forum_id'),
+		'user_id'				=> array('INDEX', 'user_id'),
+		'notify_stat'			=> array('INDEX', 'notify_status'),
+	),
+);
+
+$schema_data['phpbb_groups'] = array(
+	'COLUMNS'		=> array(
+		'group_id'				=> array('UINT', NULL, 'auto_increment'),
+		'group_type'			=> array('TINT:4', 1),
+		'group_founder_manage'	=> array('BOOL', 0),
+		'group_skip_auth'		=> array('BOOL', 0),
+		'group_name'			=> array('VCHAR_CI', ''),
+		'group_desc'			=> array('TEXT_UNI', ''),
+		'group_desc_bitfield'	=> array('VCHAR:255', ''),
+		'group_desc_options'	=> array('UINT:11', 7),
+		'group_desc_uid'		=> array('VCHAR:8', ''),
+		'group_display'			=> array('BOOL', 0),
+		'group_avatar'			=> array('VCHAR', ''),
+		'group_avatar_type'		=> array('VCHAR:255', ''),
+		'group_avatar_width'	=> array('USINT', 0),
+		'group_avatar_height'	=> array('USINT', 0),
+		'group_rank'			=> array('UINT', 0),
+		'group_colour'			=> array('VCHAR:6', ''),
+		'group_sig_chars'		=> array('UINT', 0),
+		'group_receive_pm'		=> array('BOOL', 0),
+		'group_message_limit'	=> array('UINT', 0),
+		'group_max_recipients'	=> array('UINT', 0),
+		'group_legend'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'group_id',
+	'KEYS'			=> array(
+		'group_legend_name'		=> array('INDEX', array('group_legend', 'group_name')),
+	),
+);
+
+$schema_data['phpbb_icons'] = array(
+	'COLUMNS'		=> array(
+		'icons_id'				=> array('UINT', NULL, 'auto_increment'),
+		'icons_url'				=> array('VCHAR', ''),
+		'icons_width'			=> array('TINT:4', 0),
+		'icons_height'			=> array('TINT:4', 0),
+		'icons_order'			=> array('UINT', 0),
+		'display_on_posting'	=> array('BOOL', 1),
+	),
+	'PRIMARY_KEY'	=> 'icons_id',
+	'KEYS'			=> array(
+		'display_on_posting'	=> array('INDEX', 'display_on_posting'),
+	),
+);
+
+$schema_data['phpbb_lang'] = array(
+	'COLUMNS'		=> array(
+		'lang_id'				=> array('TINT:4', NULL, 'auto_increment'),
+		'lang_iso'				=> array('VCHAR:30', ''),
+		'lang_dir'				=> array('VCHAR:30', ''),
+		'lang_english_name'		=> array('VCHAR_UNI:100', ''),
+		'lang_local_name'		=> array('VCHAR_UNI:255', ''),
+		'lang_author'			=> array('VCHAR_UNI:255', ''),
+	),
+	'PRIMARY_KEY'	=> 'lang_id',
+	'KEYS'			=> array(
+		'lang_iso'				=> array('INDEX', 'lang_iso'),
+	),
+);
+
+$schema_data['phpbb_log'] = array(
+	'COLUMNS'		=> array(
+		'log_id'				=> array('UINT', NULL, 'auto_increment'),
+		'log_type'				=> array('TINT:4', 0),
+		'user_id'				=> array('UINT', 0),
+		'forum_id'				=> array('UINT', 0),
+		'topic_id'				=> array('UINT', 0),
+		'reportee_id'			=> array('UINT', 0),
+		'log_ip'				=> array('VCHAR:40', ''),
+		'log_time'				=> array('TIMESTAMP', 0),
+		'log_operation'			=> array('TEXT_UNI', ''),
+		'log_data'				=> array('MTEXT_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> 'log_id',
+	'KEYS'			=> array(
+		'log_type'				=> array('INDEX', 'log_type'),
+		'log_time'				=> array('INDEX', 'log_time'),
+		'forum_id'				=> array('INDEX', 'forum_id'),
+		'topic_id'				=> array('INDEX', 'topic_id'),
+		'reportee_id'			=> array('INDEX', 'reportee_id'),
+		'user_id'				=> array('INDEX', 'user_id'),
+	),
+);
+
+$schema_data['phpbb_login_attempts'] = array(
+	'COLUMNS'		=> array(
+		'attempt_ip'			=> array('VCHAR:40', ''),
+		'attempt_browser'		=> array('VCHAR:150', ''),
+		'attempt_forwarded_for'	=> array('VCHAR:255', ''),
+		'attempt_time'			=> array('TIMESTAMP', 0),
+		'user_id'				=> array('UINT', 0),
+		'username'				=> array('VCHAR_UNI:255', 0),
+		'username_clean'		=> array('VCHAR_CI', 0),
+	),
+	'KEYS'			=> array(
+		'att_ip'				=> array('INDEX', array('attempt_ip', 'attempt_time')),
+		'att_for'		=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+		'att_time'				=> array('INDEX', array('attempt_time')),
+		'user_id'					=> array('INDEX', 'user_id'),
+	),
+);
+
+$schema_data['phpbb_moderator_cache'] = array(
+	'COLUMNS'		=> array(
+		'forum_id'				=> array('UINT', 0),
+		'user_id'				=> array('UINT', 0),
+		'username'				=> array('VCHAR_UNI:255', ''),
+		'group_id'				=> array('UINT', 0),
+		'group_name'			=> array('VCHAR_UNI', ''),
+		'display_on_index'		=> array('BOOL', 1),
+	),
+	'KEYS'			=> array(
+		'disp_idx'				=> array('INDEX', 'display_on_index'),
+		'forum_id'				=> array('INDEX', 'forum_id'),
+	),
+);
+
+$schema_data['phpbb_migrations'] = array(
+	'COLUMNS'		=> array(
+		'migration_name'			=> array('VCHAR', ''),
+		'migration_depends_on'		=> array('TEXT', ''),
+		'migration_schema_done'		=> array('BOOL', 0),
+		'migration_data_done'		=> array('BOOL', 0),
+		'migration_data_state'		=> array('TEXT', ''),
+		'migration_start_time'		=> array('TIMESTAMP', 0),
+		'migration_end_time'		=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> 'migration_name',
+);
+
+$schema_data['phpbb_modules'] = array(
+	'COLUMNS'		=> array(
+		'module_id'				=> array('UINT', NULL, 'auto_increment'),
+		'module_enabled'		=> array('BOOL', 1),
+		'module_display'		=> array('BOOL', 1),
+		'module_basename'		=> array('VCHAR', ''),
+		'module_class'			=> array('VCHAR:10', ''),
+		'parent_id'				=> array('UINT', 0),
+		'left_id'				=> array('UINT', 0),
+		'right_id'				=> array('UINT', 0),
+		'module_langname'		=> array('VCHAR', ''),
+		'module_mode'			=> array('VCHAR', ''),
+		'module_auth'			=> array('VCHAR', ''),
+	),
+	'PRIMARY_KEY'	=> 'module_id',
+	'KEYS'			=> array(
+		'left_right_id'			=> array('INDEX', array('left_id', 'right_id')),
+		'module_enabled'		=> array('INDEX', 'module_enabled'),
+		'class_left_id'			=> array('INDEX', array('module_class', 'left_id')),
+	),
+);
+
+$schema_data['phpbb_notification_types'] = array(
+	'COLUMNS'			=> array(
+		'notification_type_id'		=> array('USINT', NULL, 'auto_increment'),
+		'notification_type_name'	=> array('VCHAR:255', ''),
+		'notification_type_enabled'	=> array('BOOL', 1),
+	),
+	'PRIMARY_KEY'		=> array('notification_type_id'),
+	'KEYS'				=> array(
+		'type'			=> array('UNIQUE', array('notification_type_name')),
+	),
+);
+
+$schema_data['phpbb_notifications'] = array(
+	'COLUMNS'			=> array(
+		'notification_id'				=> array('UINT:10', NULL, 'auto_increment'),
+		'notification_type_id'			=> array('USINT', 0),
+		'item_id'						=> array('UINT', 0),
+		'item_parent_id'				=> array('UINT', 0),
+		'user_id'						=> array('UINT', 0),
+		'notification_read'				=> array('BOOL', 0),
+		'notification_time'				=> array('TIMESTAMP', 1),
+		'notification_data'				=> array('TEXT_UNI', ''),
+	),
+	'PRIMARY_KEY'		=> 'notification_id',
+	'KEYS'				=> array(
+		'item_ident'		=> array('INDEX', array('notification_type_id', 'item_id')),
+		'user'				=> array('INDEX', array('user_id', 'notification_read')),
+	),
+);
+
+$schema_data['phpbb_poll_options'] = array(
+	'COLUMNS'		=> array(
+		'poll_option_id'		=> array('TINT:4', 0),
+		'topic_id'				=> array('UINT', 0),
+		'poll_option_text'		=> array('TEXT_UNI', ''),
+		'poll_option_total'		=> array('UINT', 0),
+	),
+	'KEYS'			=> array(
+		'poll_opt_id'			=> array('INDEX', 'poll_option_id'),
+		'topic_id'				=> array('INDEX', 'topic_id'),
+	),
+);
+
+$schema_data['phpbb_poll_votes'] = array(
+	'COLUMNS'		=> array(
+		'topic_id'				=> array('UINT', 0),
+		'poll_option_id'		=> array('TINT:4', 0),
+		'vote_user_id'			=> array('UINT', 0),
+		'vote_user_ip'			=> array('VCHAR:40', ''),
+	),
+	'KEYS'			=> array(
+		'topic_id'				=> array('INDEX', 'topic_id'),
+		'vote_user_id'			=> array('INDEX', 'vote_user_id'),
+		'vote_user_ip'			=> array('INDEX', 'vote_user_ip'),
+	),
+);
+
+$schema_data['phpbb_posts'] = array(
+	'COLUMNS'		=> array(
+		'post_id'				=> array('UINT', NULL, 'auto_increment'),
+		'topic_id'				=> array('UINT', 0),
+		'forum_id'				=> array('UINT', 0),
+		'poster_id'				=> array('UINT', 0),
+		'icon_id'				=> array('UINT', 0),
+		'poster_ip'				=> array('VCHAR:40', ''),
+		'post_time'				=> array('TIMESTAMP', 0),
+		'post_visibility'		=> array('TINT:3', 0),
+		'post_reported'			=> array('BOOL', 0),
+		'enable_bbcode'			=> array('BOOL', 1),
+		'enable_smilies'		=> array('BOOL', 1),
+		'enable_magic_url'		=> array('BOOL', 1),
+		'enable_sig'			=> array('BOOL', 1),
+		'post_username'			=> array('VCHAR_UNI:255', ''),
+		'post_subject'			=> array('STEXT_UNI', '', 'true_sort'),
+		'post_text'				=> array('MTEXT_UNI', ''),
+		'post_checksum'			=> array('VCHAR:32', ''),
+		'post_attachment'		=> array('BOOL', 0),
+		'bbcode_bitfield'		=> array('VCHAR:255', ''),
+		'bbcode_uid'			=> array('VCHAR:8', ''),
+		'post_postcount'		=> array('BOOL', 1),
+		'post_edit_time'		=> array('TIMESTAMP', 0),
+		'post_edit_reason'		=> array('STEXT_UNI', ''),
+		'post_edit_user'		=> array('UINT', 0),
+		'post_edit_count'		=> array('USINT', 0),
+		'post_edit_locked'		=> array('BOOL', 0),
+		'post_delete_time'		=> array('TIMESTAMP', 0),
+		'post_delete_reason'	=> array('STEXT_UNI', ''),
+		'post_delete_user'		=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'post_id',
+	'KEYS'			=> array(
+		'forum_id'				=> array('INDEX', 'forum_id'),
+		'topic_id'				=> array('INDEX', 'topic_id'),
+		'poster_ip'				=> array('INDEX', 'poster_ip'),
+		'poster_id'				=> array('INDEX', 'poster_id'),
+		'post_visibility'		=> array('INDEX', 'post_visibility'),
+		'post_username'			=> array('INDEX', 'post_username'),
+		'tid_post_time'			=> array('INDEX', array('topic_id', 'post_time')),
+	),
+);
+
+$schema_data['phpbb_privmsgs'] = array(
+	'COLUMNS'		=> array(
+		'msg_id'				=> array('UINT', NULL, 'auto_increment'),
+		'root_level'			=> array('UINT', 0),
+		'author_id'				=> array('UINT', 0),
+		'icon_id'				=> array('UINT', 0),
+		'author_ip'				=> array('VCHAR:40', ''),
+		'message_time'			=> array('TIMESTAMP', 0),
+		'enable_bbcode'			=> array('BOOL', 1),
+		'enable_smilies'		=> array('BOOL', 1),
+		'enable_magic_url'		=> array('BOOL', 1),
+		'enable_sig'			=> array('BOOL', 1),
+		'message_subject'		=> array('STEXT_UNI', ''),
+		'message_text'			=> array('MTEXT_UNI', ''),
+		'message_edit_reason'	=> array('STEXT_UNI', ''),
+		'message_edit_user'		=> array('UINT', 0),
+		'message_attachment'	=> array('BOOL', 0),
+		'bbcode_bitfield'		=> array('VCHAR:255', ''),
+		'bbcode_uid'			=> array('VCHAR:8', ''),
+		'message_edit_time'		=> array('TIMESTAMP', 0),
+		'message_edit_count'	=> array('USINT', 0),
+		'to_address'			=> array('TEXT_UNI', ''),
+		'bcc_address'			=> array('TEXT_UNI', ''),
+		'message_reported'		=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'msg_id',
+	'KEYS'			=> array(
+		'author_ip'				=> array('INDEX', 'author_ip'),
+		'message_time'			=> array('INDEX', 'message_time'),
+		'author_id'				=> array('INDEX', 'author_id'),
+		'root_level'			=> array('INDEX', 'root_level'),
+	),
+);
+
+$schema_data['phpbb_privmsgs_folder'] = array(
+	'COLUMNS'		=> array(
+		'folder_id'				=> array('UINT', NULL, 'auto_increment'),
+		'user_id'				=> array('UINT', 0),
+		'folder_name'			=> array('VCHAR_UNI', ''),
+		'pm_count'				=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'folder_id',
+	'KEYS'			=> array(
+		'user_id'				=> array('INDEX', 'user_id'),
+	),
+);
+
+$schema_data['phpbb_privmsgs_rules'] = array(
+	'COLUMNS'		=> array(
+		'rule_id'				=> array('UINT', NULL, 'auto_increment'),
+		'user_id'				=> array('UINT', 0),
+		'rule_check'			=> array('UINT', 0),
+		'rule_connection'		=> array('UINT', 0),
+		'rule_string'			=> array('VCHAR_UNI', ''),
+		'rule_user_id'			=> array('UINT', 0),
+		'rule_group_id'			=> array('UINT', 0),
+		'rule_action'			=> array('UINT', 0),
+		'rule_folder_id'		=> array('INT:11', 0),
+	),
+	'PRIMARY_KEY'	=> 'rule_id',
+	'KEYS'			=> array(
+		'user_id'				=> array('INDEX', 'user_id'),
+	),
+);
+
+$schema_data['phpbb_privmsgs_to'] = array(
+	'COLUMNS'		=> array(
+		'msg_id'				=> array('UINT', 0),
+		'user_id'				=> array('UINT', 0),
+		'author_id'				=> array('UINT', 0),
+		'pm_deleted'			=> array('BOOL', 0),
+		'pm_new'				=> array('BOOL', 1),
+		'pm_unread'				=> array('BOOL', 1),
+		'pm_replied'			=> array('BOOL', 0),
+		'pm_marked'				=> array('BOOL', 0),
+		'pm_forwarded'			=> array('BOOL', 0),
+		'folder_id'				=> array('INT:11', 0),
+	),
+	'KEYS'			=> array(
+		'msg_id'				=> array('INDEX', 'msg_id'),
+		'author_id'				=> array('INDEX', 'author_id'),
+		'usr_flder_id'			=> array('INDEX', array('user_id', 'folder_id')),
+	),
+);
+
+$schema_data['phpbb_profile_fields'] = array(
+	'COLUMNS'		=> array(
+		'field_id'				=> array('UINT', NULL, 'auto_increment'),
+		'field_name'			=> array('VCHAR_UNI', ''),
+		'field_type'			=> array('TINT:4', 0),
+		'field_ident'			=> array('VCHAR:20', ''),
+		'field_length'			=> array('VCHAR:20', ''),
+		'field_minlen'			=> array('VCHAR', ''),
+		'field_maxlen'			=> array('VCHAR', ''),
+		'field_novalue'			=> array('VCHAR_UNI', ''),
+		'field_default_value'	=> array('VCHAR_UNI', ''),
+		'field_validation'		=> array('VCHAR_UNI:20', ''),
+		'field_required'		=> array('BOOL', 0),
+		'field_show_novalue'	=> array('BOOL', 0),
+		'field_show_on_reg'		=> array('BOOL', 0),
+		'field_show_on_pm'		=> array('BOOL', 0),
+		'field_show_on_vt'		=> array('BOOL', 0),
+		'field_show_profile'	=> array('BOOL', 0),
+		'field_hide'			=> array('BOOL', 0),
+		'field_no_view'			=> array('BOOL', 0),
+		'field_active'			=> array('BOOL', 0),
+		'field_order'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'field_id',
+	'KEYS'			=> array(
+		'fld_type'			=> array('INDEX', 'field_type'),
+		'fld_ordr'			=> array('INDEX', 'field_order'),
+	),
+);
+
+$schema_data['phpbb_profile_fields_data'] = array(
+	'COLUMNS'		=> array(
+		'user_id'				=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'user_id',
+);
+
+$schema_data['phpbb_profile_fields_lang'] = array(
+	'COLUMNS'		=> array(
+		'field_id'				=> array('UINT', 0),
+		'lang_id'				=> array('UINT', 0),
+		'option_id'				=> array('UINT', 0),
+		'field_type'			=> array('TINT:4', 0),
+		'lang_value'			=> array('VCHAR_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> array('field_id', 'lang_id', 'option_id'),
+);
+
+$schema_data['phpbb_profile_lang'] = array(
+	'COLUMNS'		=> array(
+		'field_id'				=> array('UINT', 0),
+		'lang_id'				=> array('UINT', 0),
+		'lang_name'				=> array('VCHAR_UNI', ''),
+		'lang_explain'			=> array('TEXT_UNI', ''),
+		'lang_default_value'	=> array('VCHAR_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> array('field_id', 'lang_id'),
+);
+
+$schema_data['phpbb_ranks'] = array(
+	'COLUMNS'		=> array(
+		'rank_id'				=> array('UINT', NULL, 'auto_increment'),
+		'rank_title'			=> array('VCHAR_UNI', ''),
+		'rank_min'				=> array('UINT', 0),
+		'rank_special'			=> array('BOOL', 0),
+		'rank_image'			=> array('VCHAR', ''),
+	),
+	'PRIMARY_KEY'	=> 'rank_id',
+);
+
+$schema_data['phpbb_reports'] = array(
+	'COLUMNS'		=> array(
+		'report_id'							=> array('UINT', NULL, 'auto_increment'),
+		'reason_id'							=> array('USINT', 0),
+		'post_id'							=> array('UINT', 0),
+		'pm_id'								=> array('UINT', 0),
+		'user_id'							=> array('UINT', 0),
+		'user_notify'						=> array('BOOL', 0),
+		'report_closed'						=> array('BOOL', 0),
+		'report_time'						=> array('TIMESTAMP', 0),
+		'report_text'						=> array('MTEXT_UNI', ''),
+		'reported_post_text'				=> array('MTEXT_UNI', ''),
+		'reported_post_uid'					=> array('VCHAR:8', ''),
+		'reported_post_bitfield'			=> array('VCHAR:255', ''),
+		'reported_post_enable_magic_url'	=> array('BOOL', 1),
+		'reported_post_enable_smilies'		=> array('BOOL', 1),
+		'reported_post_enable_bbcode'		=> array('BOOL', 1)
+	),
+	'PRIMARY_KEY'	=> 'report_id',
+	'KEYS'			=> array(
+		'post_id'			=> array('INDEX', 'post_id'),
+		'pm_id'				=> array('INDEX', 'pm_id'),
+	),
+);
+
+$schema_data['phpbb_reports_reasons'] = array(
+	'COLUMNS'		=> array(
+		'reason_id'				=> array('USINT', NULL, 'auto_increment'),
+		'reason_title'			=> array('VCHAR_UNI', ''),
+		'reason_description'	=> array('MTEXT_UNI', ''),
+		'reason_order'			=> array('USINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'reason_id',
+);
+
+$schema_data['phpbb_search_results'] = array(
+	'COLUMNS'		=> array(
+		'search_key'			=> array('VCHAR:32', ''),
+		'search_time'			=> array('TIMESTAMP', 0),
+		'search_keywords'		=> array('MTEXT_UNI', ''),
+		'search_authors'		=> array('MTEXT', ''),
+	),
+	'PRIMARY_KEY'	=> 'search_key',
+);
+
+$schema_data['phpbb_search_wordlist'] = array(
+	'COLUMNS'		=> array(
+		'word_id'			=> array('UINT', NULL, 'auto_increment'),
+		'word_text'			=> array('VCHAR_UNI', ''),
+		'word_common'		=> array('BOOL', 0),
+		'word_count'		=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'word_id',
+	'KEYS'			=> array(
+		'wrd_txt'			=> array('UNIQUE', 'word_text'),
+		'wrd_cnt'			=> array('INDEX', 'word_count'),
+	),
+);
+
+$schema_data['phpbb_search_wordmatch'] = array(
+	'COLUMNS'		=> array(
+		'post_id'			=> array('UINT', 0),
+		'word_id'			=> array('UINT', 0),
+		'title_match'		=> array('BOOL', 0),
+	),
+	'KEYS'			=> array(
+		'unq_mtch'			=> array('UNIQUE', array('word_id', 'post_id', 'title_match')),
+		'word_id'			=> array('INDEX', 'word_id'),
+		'post_id'			=> array('INDEX', 'post_id'),
+	),
+);
+
+$schema_data['phpbb_sessions'] = array(
+	'COLUMNS'		=> array(
+		'session_id'			=> array('CHAR:32', ''),
+		'session_user_id'		=> array('UINT', 0),
+		'session_forum_id'		=> array('UINT', 0),
+		'session_last_visit'	=> array('TIMESTAMP', 0),
+		'session_start'			=> array('TIMESTAMP', 0),
+		'session_time'			=> array('TIMESTAMP', 0),
+		'session_ip'			=> array('VCHAR:40', ''),
+		'session_browser'		=> array('VCHAR:150', ''),
+		'session_forwarded_for'	=> array('VCHAR:255', ''),
+		'session_page'			=> array('VCHAR_UNI', ''),
+		'session_viewonline'	=> array('BOOL', 1),
+		'session_autologin'		=> array('BOOL', 0),
+		'session_admin'			=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'session_id',
+	'KEYS'			=> array(
+		'session_time'		=> array('INDEX', 'session_time'),
+		'session_user_id'	=> array('INDEX', 'session_user_id'),
+		'session_fid'		=> array('INDEX', 'session_forum_id'),
+	),
+);
+
+$schema_data['phpbb_sessions_keys'] = array(
+	'COLUMNS'		=> array(
+		'key_id'			=> array('CHAR:32', ''),
+		'user_id'			=> array('UINT', 0),
+		'last_ip'			=> array('VCHAR:40', ''),
+		'last_login'		=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> array('key_id', 'user_id'),
+	'KEYS'			=> array(
+		'last_login'		=> array('INDEX', 'last_login'),
+	),
+);
+
+$schema_data['phpbb_sitelist'] = array(
+	'COLUMNS'		=> array(
+		'site_id'		=> array('UINT', NULL, 'auto_increment'),
+		'site_ip'		=> array('VCHAR:40', ''),
+		'site_hostname'	=> array('VCHAR', ''),
+		'ip_exclude'	=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'		=> 'site_id',
+);
+
+$schema_data['phpbb_smilies'] = array(
+	'COLUMNS'		=> array(
+		'smiley_id'			=> array('UINT', NULL, 'auto_increment'),
+		// We may want to set 'code' to VCHAR:50 or check if unicode support is possible... at the moment only ASCII characters are allowed.
+		'code'				=> array('VCHAR_UNI:50', ''),
+		'emotion'			=> array('VCHAR_UNI:50', ''),
+		'smiley_url'		=> array('VCHAR:50', ''),
+		'smiley_width'		=> array('USINT', 0),
+		'smiley_height'		=> array('USINT', 0),
+		'smiley_order'		=> array('UINT', 0),
+		'display_on_posting'=> array('BOOL', 1),
+	),
+	'PRIMARY_KEY'	=> 'smiley_id',
+	'KEYS'			=> array(
+		'display_on_post'		=> array('INDEX', 'display_on_posting'),
+	),
+);
+
+$schema_data['phpbb_styles'] = array(
+	'COLUMNS'		=> array(
+		'style_id'				=> array('UINT', NULL, 'auto_increment'),
+		'style_name'			=> array('VCHAR_UNI:255', ''),
+		'style_copyright'		=> array('VCHAR_UNI', ''),
+		'style_active'			=> array('BOOL', 1),
+		'style_path'			=> array('VCHAR:100', ''),
+		'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+		'style_parent_id'		=> array('UINT:4', 0),
+		'style_parent_tree'		=> array('TEXT', ''),
+	),
+	'PRIMARY_KEY'	=> 'style_id',
+	'KEYS'			=> array(
+		'style_name'		=> array('UNIQUE', 'style_name'),
+	),
+);
+
+$schema_data['phpbb_teampage'] = array(
+	'COLUMNS'		=> array(
+		'teampage_id'		=> array('UINT', NULL, 'auto_increment'),
+		'group_id'			=> array('UINT', 0),
+		'teampage_name'		=> array('VCHAR_UNI:255', ''),
+		'teampage_position'	=> array('UINT', 0),
+		'teampage_parent'	=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'teampage_id',
+);
+
+$schema_data['phpbb_topics'] = array(
+	'COLUMNS'		=> array(
+		'topic_id'					=> array('UINT', NULL, 'auto_increment'),
+		'forum_id'					=> array('UINT', 0),
+		'icon_id'					=> array('UINT', 0),
+		'topic_attachment'			=> array('BOOL', 0),
+		'topic_visibility'			=> array('TINT:3', 0),
+		'topic_reported'			=> array('BOOL', 0),
+		'topic_title'				=> array('STEXT_UNI', '', 'true_sort'),
+		'topic_poster'				=> array('UINT', 0),
+		'topic_time'				=> array('TIMESTAMP', 0),
+		'topic_time_limit'			=> array('TIMESTAMP', 0),
+		'topic_views'				=> array('UINT', 0),
+		'topic_posts_approved'		=> array('UINT', 0),
+		'topic_posts_unapproved'	=> array('UINT', 0),
+		'topic_posts_softdeleted'	=> array('UINT', 0),
+		'topic_status'				=> array('TINT:3', 0),
+		'topic_type'				=> array('TINT:3', 0),
+		'topic_first_post_id'		=> array('UINT', 0),
+		'topic_first_poster_name'	=> array('VCHAR_UNI', ''),
+		'topic_first_poster_colour'	=> array('VCHAR:6', ''),
+		'topic_last_post_id'		=> array('UINT', 0),
+		'topic_last_poster_id'		=> array('UINT', 0),
+		'topic_last_poster_name'	=> array('VCHAR_UNI', ''),
+		'topic_last_poster_colour'	=> array('VCHAR:6', ''),
+		'topic_last_post_subject'	=> array('STEXT_UNI', ''),
+		'topic_last_post_time'		=> array('TIMESTAMP', 0),
+		'topic_last_view_time'		=> array('TIMESTAMP', 0),
+		'topic_moved_id'			=> array('UINT', 0),
+		'topic_bumped'				=> array('BOOL', 0),
+		'topic_bumper'				=> array('UINT', 0),
+		'poll_title'				=> array('STEXT_UNI', ''),
+		'poll_start'				=> array('TIMESTAMP', 0),
+		'poll_length'				=> array('TIMESTAMP', 0),
+		'poll_max_options'			=> array('TINT:4', 1),
+		'poll_last_vote'			=> array('TIMESTAMP', 0),
+		'poll_vote_change'			=> array('BOOL', 0),
+		'topic_delete_time'			=> array('TIMESTAMP', 0),
+		'topic_delete_reason'		=> array('STEXT_UNI', ''),
+		'topic_delete_user'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'topic_id',
+	'KEYS'			=> array(
+		'forum_id'			=> array('INDEX', 'forum_id'),
+		'forum_id_type'		=> array('INDEX', array('forum_id', 'topic_type')),
+		'last_post_time'	=> array('INDEX', 'topic_last_post_time'),
+		'topic_visibility'	=> array('INDEX', 'topic_visibility'),
+		'forum_appr_last'	=> array('INDEX', array('forum_id', 'topic_visibility', 'topic_last_post_id')),
+		'fid_time_moved'	=> array('INDEX', array('forum_id', 'topic_last_post_time', 'topic_moved_id')),
+	),
+);
+
+$schema_data['phpbb_topics_track'] = array(
+	'COLUMNS'		=> array(
+		'user_id'			=> array('UINT', 0),
+		'topic_id'			=> array('UINT', 0),
+		'forum_id'			=> array('UINT', 0),
+		'mark_time'			=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> array('user_id', 'topic_id'),
+	'KEYS'			=> array(
+		'topic_id'			=> array('INDEX', 'topic_id'),
+		'forum_id'			=> array('INDEX', 'forum_id'),
+	),
+);
+
+$schema_data['phpbb_topics_posted'] = array(
+	'COLUMNS'		=> array(
+		'user_id'			=> array('UINT', 0),
+		'topic_id'			=> array('UINT', 0),
+		'topic_posted'		=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> array('user_id', 'topic_id'),
+);
+
+$schema_data['phpbb_topics_watch'] = array(
+	'COLUMNS'		=> array(
+		'topic_id'			=> array('UINT', 0),
+		'user_id'			=> array('UINT', 0),
+		'notify_status'		=> array('BOOL', 0),
+	),
+	'KEYS'			=> array(
+		'topic_id'			=> array('INDEX', 'topic_id'),
+		'user_id'			=> array('INDEX', 'user_id'),
+		'notify_stat'		=> array('INDEX', 'notify_status'),
+	),
+);
+
+$schema_data['phpbb_user_notifications'] = array(
+	'COLUMNS'		=> array(
+		'item_type'			=> array('VCHAR:255', ''),
+		'item_id'			=> array('UINT', 0),
+		'user_id'			=> array('UINT', 0),
+		'method'			=> array('VCHAR:255', ''),
+		'notify'			=> array('BOOL', 1),
+	),
+);
+
+$schema_data['phpbb_user_group'] = array(
+	'COLUMNS'		=> array(
+		'group_id'			=> array('UINT', 0),
+		'user_id'			=> array('UINT', 0),
+		'group_leader'		=> array('BOOL', 0),
+		'user_pending'		=> array('BOOL', 1),
+	),
+	'KEYS'			=> array(
+		'group_id'			=> array('INDEX', 'group_id'),
+		'user_id'			=> array('INDEX', 'user_id'),
+		'group_leader'		=> array('INDEX', 'group_leader'),
+	),
+);
+
+$schema_data['phpbb_users'] = array(
+	'COLUMNS'		=> array(
+		'user_id'					=> array('UINT', NULL, 'auto_increment'),
+		'user_type'					=> array('TINT:2', 0),
+		'group_id'					=> array('UINT', 3),
+		'user_permissions'			=> array('MTEXT', ''),
+		'user_perm_from'			=> array('UINT', 0),
+		'user_ip'					=> array('VCHAR:40', ''),
+		'user_regdate'				=> array('TIMESTAMP', 0),
+		'username'					=> array('VCHAR_CI', ''),
+		'username_clean'			=> array('VCHAR_CI', ''),
+		'user_password'				=> array('VCHAR_UNI:40', ''),
+		'user_passchg'				=> array('TIMESTAMP', 0),
+		'user_pass_convert'			=> array('BOOL', 0),
+		'user_email'				=> array('VCHAR_UNI:100', ''),
+		'user_email_hash'			=> array('BINT', 0),
+		'user_birthday'				=> array('VCHAR:10', ''),
+		'user_lastvisit'			=> array('TIMESTAMP', 0),
+		'user_lastmark'				=> array('TIMESTAMP', 0),
+		'user_lastpost_time'		=> array('TIMESTAMP', 0),
+		'user_lastpage'				=> array('VCHAR_UNI:200', ''),
+		'user_last_confirm_key'		=> array('VCHAR:10', ''),
+		'user_last_search'			=> array('TIMESTAMP', 0),
+		'user_warnings'				=> array('TINT:4', 0),
+		'user_last_warning'			=> array('TIMESTAMP', 0),
+		'user_login_attempts'		=> array('TINT:4', 0),
+		'user_inactive_reason'		=> array('TINT:2', 0),
+		'user_inactive_time'		=> array('TIMESTAMP', 0),
+		'user_posts'				=> array('UINT', 0),
+		'user_lang'					=> array('VCHAR:30', ''),
+		'user_timezone'				=> array('VCHAR:100', 'UTC'),
+		'user_dateformat'			=> array('VCHAR_UNI:30', 'd M Y H:i'),
+		'user_style'				=> array('UINT', 0),
+		'user_rank'					=> array('UINT', 0),
+		'user_colour'				=> array('VCHAR:6', ''),
+		'user_new_privmsg'			=> array('INT:4', 0),
+		'user_unread_privmsg'		=> array('INT:4', 0),
+		'user_last_privmsg'			=> array('TIMESTAMP', 0),
+		'user_message_rules'		=> array('BOOL', 0),
+		'user_full_folder'			=> array('INT:11', -3),
+		'user_emailtime'			=> array('TIMESTAMP', 0),
+		'user_topic_show_days'		=> array('USINT', 0),
+		'user_topic_sortby_type'	=> array('VCHAR:1', 't'),
+		'user_topic_sortby_dir'		=> array('VCHAR:1', 'd'),
+		'user_post_show_days'		=> array('USINT', 0),
+		'user_post_sortby_type'		=> array('VCHAR:1', 't'),
+		'user_post_sortby_dir'		=> array('VCHAR:1', 'a'),
+		'user_notify'				=> array('BOOL', 0),
+		'user_notify_pm'			=> array('BOOL', 1),
+		'user_notify_type'			=> array('TINT:4', 0),
+		'user_allow_pm'				=> array('BOOL', 1),
+		'user_allow_viewonline'		=> array('BOOL', 1),
+		'user_allow_viewemail'		=> array('BOOL', 1),
+		'user_allow_massemail'		=> array('BOOL', 1),
+		'user_options'				=> array('UINT:11', 230271),
+		'user_avatar'				=> array('VCHAR', ''),
+		'user_avatar_type'			=> array('VCHAR:255', ''),
+		'user_avatar_width'			=> array('USINT', 0),
+		'user_avatar_height'		=> array('USINT', 0),
+		'user_sig'					=> array('MTEXT_UNI', ''),
+		'user_sig_bbcode_uid'		=> array('VCHAR:8', ''),
+		'user_sig_bbcode_bitfield'	=> array('VCHAR:255', ''),
+		'user_from'					=> array('VCHAR_UNI:100', ''),
+		'user_icq'					=> array('VCHAR:15', ''),
+		'user_aim'					=> array('VCHAR_UNI', ''),
+		'user_yim'					=> array('VCHAR_UNI', ''),
+		'user_msnm'					=> array('VCHAR_UNI', ''),
+		'user_jabber'				=> array('VCHAR_UNI', ''),
+		'user_website'				=> array('VCHAR_UNI:200', ''),
+		'user_occ'					=> array('TEXT_UNI', ''),
+		'user_interests'			=> array('TEXT_UNI', ''),
+		'user_actkey'				=> array('VCHAR:32', ''),
+		'user_newpasswd'			=> array('VCHAR_UNI:40', ''),
+		'user_form_salt'			=> array('VCHAR_UNI:32', ''),
+		'user_new'					=> array('BOOL', 1),
+		'user_reminded'				=> array('TINT:4', 0),
+		'user_reminded_time'		=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> 'user_id',
+	'KEYS'			=> array(
+		'user_birthday'				=> array('INDEX', 'user_birthday'),
+		'user_email_hash'			=> array('INDEX', 'user_email_hash'),
+		'user_type'					=> array('INDEX', 'user_type'),
+		'username_clean'			=> array('UNIQUE', 'username_clean'),
+	),
+);
+
+$schema_data['phpbb_warnings'] = array(
+	'COLUMNS'		=> array(
+		'warning_id'			=> array('UINT', NULL, 'auto_increment'),
+		'user_id'				=> array('UINT', 0),
+		'post_id'				=> array('UINT', 0),
+		'log_id'				=> array('UINT', 0),
+		'warning_time'			=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> 'warning_id',
+);
+
+$schema_data['phpbb_words'] = array(
+	'COLUMNS'		=> array(
+		'word_id'				=> array('UINT', NULL, 'auto_increment'),
+		'word'					=> array('VCHAR_UNI', ''),
+		'replacement'			=> array('VCHAR_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> 'word_id',
+);
+
+$schema_data['phpbb_zebra'] = array(
+	'COLUMNS'		=> array(
+		'user_id'				=> array('UINT', 0),
+		'zebra_id'				=> array('UINT', 0),
+		'friend'				=> array('BOOL', 0),
+		'foe'					=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> array('user_id', 'zebra_id'),
+);
-- 
cgit v1.2.1